diff --git a/assets/js/binary.js b/assets/js/binary.js
index a5ccd8c..f7dd152 100644
--- a/assets/js/binary.js
+++ b/assets/js/binary.js
@@ -1,5 +1,5 @@
-// meta={"simUrl":"https://trg-arcade.userpxt.io/v1.2.10/---simulator","cdnUrl":"https://pxt.azureedge.net","version":"1.2.8","target":"arcade","targetVersion":"1.2.10","repo":"unsignedarduino/fishy-fishy-cross-my-ocean"}
-// total=2257961 new=11.19% cached=84.27% other=4.54%
+// meta={"simUrl":"https://trg-arcade.userpxt.io/v1.2.10/---simulator","cdnUrl":"https://pxt.azureedge.net","version":"1.2.9","target":"arcade","targetVersion":"1.2.10","repo":"unsignedarduino/fishy-fishy-cross-my-ocean"}
+// total=2278715 new=11.14% cached=84.34% other=4.52%
 (function (ectx) {
 'use strict';
 const runtime = ectx.runtime;
@@ -27,14 +27,8 @@ const __this = runtime;
 const pxtrt = pxsim.pxtrt;
 let yieldSteps = 1;
 ectx.setupYield(function() { yieldSteps = 100; })
-pxsim.setTitle("Fishy Fishy Cross my Ocean! v1.2.2 attempt 3");
-pxsim.setConfigData({
- "37": 160,
- "38": 120
-}, {
- "DISPLAY_WIDTH": 37,
- "DISPLAY_HEIGHT": 38
-});
+pxsim.setTitle("Fishy Fishy Cross my Ocean! v1.2.2 atte");
+pxsim.setConfigData({}, {});
 pxtrt.mapKeyNames = [
  "",
  "__draw",
@@ -604,7 +598,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P47772(s) {
+function _main___P99099(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -614,232 +608,208 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___3997 = (undefined);
-    globals._pollEventQueue___4006 = (undefined);
-    globals.minPriority___364 = (1);
+    globals._intervals___33532 = (undefined);
+    globals._pollEventQueue___33541 = (undefined);
+    globals.minPriority___29899 = (1);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, inline__P4009);
-    globals.listeners___4010 = (s.tmp_0);
-    globals.freqs___4059 = (_hex4058);
-    globals.globalVolume___4063 = (null);
-    globals.playToneID___4070 = (0);
-    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C1598_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = music_Melody_constructor__P1601_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = "~15 e3:3 r:1 d#:3 r:1 d:4 r:1 c#:8";
-    s.callLocIdx = 0; s.pc = 29; return s.tmp_1;
-  case 29:
-    r0 = s.retval;
-    globals.wawawawaa___1615 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C1598_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = music_Melody_constructor__P1601_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = "g4:1 c5 e g:2 e:1 g:3";
-    s.callLocIdx = 1; s.pc = 30; return s.tmp_1;
-  case 30:
-    r0 = s.retval;
-    globals.powerUp___1618 = (s.tmp_0);
-    globals.brightness___1724 = (100);
+    r0 = pxsim_Array__push(s.tmp_0, inline__P33544);
+    globals.listeners___33545 = (s.tmp_0);
+    globals.brightness___31142 = (100);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "charWidth", 6);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "charHeight", 8);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex8834);
-    globals.font8___1745 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex38371);
+    globals.font8___31163 = (s.tmp_0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "charWidth", 12);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "charHeight", 12);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex9177);
-    globals.font12___1746 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex38714);
+    globals.font12___31164 = (s.tmp_0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "charWidth", 6);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "charHeight", 5);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex21798);
-    globals.font5___1750 = (s.tmp_0);
-    globals.__updated___4107 = (false);
-    r0 = pxsim.control.runInParallel(inline__P4110);
-    r0 = pxsim_pxtcore.setPalette(_hex4121);
-    r0 = pxsim.image.create(160, 120);
-    globals.screen___1802 = (r0);
-    s.tmp_0 = control___screen_setupUpdate__P1764_mk(s);
-    s.tmp_0.arg0 = inline__P4128;
-    s.callLocIdx = 4; s.pc = 31; return s.tmp_0;
-  case 31:
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex51373);
+    globals.font5___31168 = (s.tmp_0);
+    globals.__updated___33611 = (false);
+    r0 = pxsim.control.runInParallel(inline__P33614);
+    r0 = pxsim_pxtcore.setPalette(_hex33625);
+    s.tmp_0 = _screen_internal_createScreen__P31224_mk(s);
+    s.callLocIdx = 2; s.pc = 29; return s.tmp_0;
+  case 29:
     r0 = s.retval;
-    globals.control_EventContext_onStats___387 = (inline__P4133);
-    globals.RUN_KEY___4138 = ("#run");
-    globals.SCOPE_KEY___4139 = ("#scope");
-    s.tmp_0 = settings_initScopes__P4150_mk(s);
-    s.callLocIdx = 5; s.pc = 32; return s.tmp_0;
-  case 32:
+    globals.screen___31220 = (r0);
+    globals.RUN_KEY___33631 = ("#run");
+    globals.SCOPE_KEY___33632 = ("#scope");
+    s.tmp_0 = settings_initScopes__P33643_mk(s);
+    s.callLocIdx = 3; s.pc = 30; return s.tmp_0;
+  case 30:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 5;
     s.tmp_1.arg2 = 4;
-    s.callLocIdx = 6; s.pc = 33; return s.tmp_1;
-  case 33:
+    s.callLocIdx = 4; s.pc = 31; return s.tmp_1;
+  case 31:
     r0 = s.retval;
-    globals.A___1877 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    globals.A___31296 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 6;
     s.tmp_1.arg2 = 5;
-    s.callLocIdx = 7; s.pc = 34; return s.tmp_1;
-  case 34:
+    s.callLocIdx = 5; s.pc = 32; return s.tmp_1;
+  case 32:
     r0 = s.retval;
-    globals.B___1878 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    globals.B___31297 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.tmp_1.arg2 = 47;
-    s.callLocIdx = 8; s.pc = 35; return s.tmp_1;
-  case 35:
+    s.callLocIdx = 6; s.pc = 33; return s.tmp_1;
+  case 33:
     r0 = s.retval;
-    globals.left___1879 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    globals.left___31298 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 2;
     s.tmp_1.arg2 = 49;
-    s.callLocIdx = 9; s.pc = 36; return s.tmp_1;
-  case 36:
+    s.callLocIdx = 7; s.pc = 34; return s.tmp_1;
+  case 34:
     r0 = s.retval;
-    globals.up___1880 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    globals.up___31299 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 3;
     s.tmp_1.arg2 = 48;
-    s.callLocIdx = 10; s.pc = 37; return s.tmp_1;
-  case 37:
+    s.callLocIdx = 8; s.pc = 35; return s.tmp_1;
+  case 35:
     r0 = s.retval;
-    globals.right___1881 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    globals.right___31300 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 4;
     s.tmp_1.arg2 = 50;
-    s.callLocIdx = 11; s.pc = 38; return s.tmp_1;
-  case 38:
+    s.callLocIdx = 9; s.pc = 36; return s.tmp_1;
+  case 36:
     r0 = s.retval;
-    globals.down___1882 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    globals.down___31301 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 7;
     s.tmp_1.arg2 = 51;
-    s.callLocIdx = 12; s.pc = 39; return s.tmp_1;
-  case 39:
+    s.callLocIdx = 10; s.pc = 37; return s.tmp_1;
+  case 37:
     r0 = s.retval;
-    globals.menu___1883 = (s.tmp_0);
-    globals._userEventsEnabled___4177 = (true);
-    globals.defaultRepeatDelay___4179 = (500);
-    globals.defaultRepeatInterval___4181 = (30);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_AnyButton__C4187_VT);
+    globals.menu___31302 = (s.tmp_0);
+    globals._userEventsEnabled___33670 = (true);
+    globals.defaultRepeatDelay___33672 = (500);
+    globals.defaultRepeatInterval___33674 = (30);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_AnyButton__C33680_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_1 = controller_Button_constructor__P31328_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 0;
     s.tmp_1.arg2 = -1;
-    s.callLocIdx = 13; s.pc = 40; return s.tmp_1;
+    s.callLocIdx = 11; s.pc = 38; return s.tmp_1;
+  case 38:
+    r0 = s.retval;
+    globals.anyButton___31376 = (s.tmp_0);
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
+    s.callLocIdx = 12; s.pc = 39; return s.tmp_0;
+  case 39:
+    r0 = s.retval;
+    globals.Player___31547 = (r0);
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
+    s.callLocIdx = 13; s.pc = 40; return s.tmp_0;
   case 40:
     r0 = s.retval;
-    globals.anyButton___1957 = (s.tmp_0);
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    globals.Food___31549 = (r0);
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
     s.callLocIdx = 14; s.pc = 41; return s.tmp_0;
   case 41:
     r0 = s.retval;
-    globals.Player___2128 = (r0);
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
-    s.callLocIdx = 15; s.pc = 42; return s.tmp_0;
-  case 42:
-    r0 = s.retval;
-    globals.Food___2130 = (r0);
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
-    s.callLocIdx = 16; s.pc = 43; return s.tmp_0;
-  case 43:
-    r0 = s.retval;
-    globals.Enemy___2131 = (r0);
+    globals.Enemy___31550 = (r0);
     r0 = (100 * 256);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    globals.MAX_TIME_STEP___2168 = (r0);
+    globals.MAX_TIME_STEP___31587 = (r0);
     r0 = (0.1 * 256);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    globals.MIN_MOVE_GAP___2170 = (r0);
-    globals.infoState___4230 = (undefined);
-    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
-    s.tmp_0.arg0 = inline__P4234;
-    s.callLocIdx = 19; s.pc = 44; return s.tmp_0;
-  case 44:
+    globals.MIN_MOVE_GAP___31589 = (r0);
+    globals.infoState___33723 = (undefined);
+    s.tmp_0 = game_addScenePushHandler__P31968_mk(s);
+    s.tmp_0.arg0 = inline__P33727;
+    s.callLocIdx = 17; s.pc = 42; return s.tmp_0;
+  case 42:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
-    s.tmp_0.arg0 = inline__P4249;
-    s.callLocIdx = 23; s.pc = 45; return s.tmp_0;
-  case 45:
+    s.tmp_0 = game_addScenePopHandler__P31970_mk(s);
+    s.tmp_0.arg0 = inline__P33742;
+    s.callLocIdx = 21; s.pc = 43; return s.tmp_0;
+  case 43:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerInfo__C2226_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerInfo__C31645_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = info_PlayerInfo_constructor__P2238_mk(s);
+    s.tmp_1 = info_PlayerInfo_constructor__P31657_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
-    s.callLocIdx = 24; s.pc = 46; return s.tmp_1;
-  case 46:
+    s.callLocIdx = 22; s.pc = 44; return s.tmp_1;
+  case 44:
     r0 = s.retval;
-    globals.player1___2257 = (s.tmp_0);
+    globals.player1___31676 = (s.tmp_0);
     r0 = pxsim_Array__mk();
-    globals.scene_Scene_initializers___2439 = (r0);
-    globals.debug___2528 = (false);
-    globals.stats___2529 = (false);
-    globals.winEffect___2530 = (undefined);
-    globals.loseEffect___2531 = (undefined);
-    globals.loseSound___4345 = (undefined);
-    globals.winSound___4347 = (undefined);
-    globals.__isOver___4355 = (false);
-    globals.foreverRunning___4359 = (false);
-    globals.font___4483 = (globals.font8___1745);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    globals.scene_Scene_initializers___31858 = (r0);
+    globals.debug___31947 = (false);
+    globals.stats___31948 = (false);
+    globals.winEffect___31949 = (undefined);
+    globals.loseEffect___31950 = (undefined);
+    globals.loseSound___33838 = (undefined);
+    globals.winSound___33840 = (undefined);
+    globals.__isOver___33848 = (false);
+    globals.foreverRunning___33852 = (false);
+    globals.font___33976 = (globals.font8___31163);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 80);
-    globals.CONTENT_WIDTH___4503 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    globals.CONTENT_WIDTH___33996 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 8);
-    globals.CONTENT_HEIGHT___4506 = (r0);
-    r0 = (globals.CONTENT_HEIGHT___4506 / 8);
+    globals.CONTENT_HEIGHT___33999 = (r0);
+    r0 = (globals.CONTENT_HEIGHT___33999 / 8);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    globals.CELL_HEIGHT___4512 = (r0);
-    globals.CELL_WIDTH___4514 = (globals.CELL_HEIGHT___4512);
-    s.tmp_2 = r0 = globals.CELL_WIDTH___4514;
+    globals.CELL_HEIGHT___34005 = (r0);
+    globals.CELL_WIDTH___34007 = (globals.CELL_HEIGHT___34005);
+    s.tmp_2 = r0 = globals.CELL_WIDTH___34007;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.font___4483;
+    s.tmp_4.arg0 = globals.font___33976;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charWidth");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 25; s.pc = 47; return s.tmp_4; }
+     else { s.callLocIdx = 23; s.pc = 45; return s.tmp_4; }
     }
-  case 47:
+  case 45:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
@@ -847,19 +817,19 @@ switch (step) {
     r0 = (s.tmp_1 / 2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    globals.LETTER_OFFSET_X___4518 = (r0);
-    s.tmp_2 = r0 = globals.CELL_HEIGHT___4512;
+    globals.LETTER_OFFSET_X___34011 = (r0);
+    s.tmp_2 = r0 = globals.CELL_HEIGHT___34005;
     s.tmp_4 = if_charHeight_1_mk(s);
-    s.tmp_4.arg0 = globals.font___4483;
+    s.tmp_4.arg0 = globals.font___33976;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charHeight");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charHeight"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charHeight"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 26; s.pc = 48; return s.tmp_4; }
+     else { s.callLocIdx = 24; s.pc = 46; return s.tmp_4; }
     }
-  case 48:
+  case 46:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
@@ -867,13 +837,13 @@ switch (step) {
     r0 = (s.tmp_1 / 2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    globals.LETTER_OFFSET_Y___4522 = (r0);
-    r0 = (globals.CELL_WIDTH___4514 / 2);
+    globals.LETTER_OFFSET_Y___34015 = (r0);
+    r0 = (globals.CELL_WIDTH___34007 / 2);
     s.tmp_1 = r0;
     r0 = (40 + s.tmp_1);
     s.tmp_0 = r0;
-    s.tmp_5 = r0 = globals.CONTENT_WIDTH___4503;
-    r0 = (globals.CELL_WIDTH___4514 * 3);
+    s.tmp_5 = r0 = globals.CONTENT_WIDTH___33996;
+    r0 = (globals.CELL_WIDTH___34007 * 3);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 - s.tmp_6);
     s.tmp_4 = r0;
@@ -882,60 +852,60 @@ switch (step) {
     r0 = pxsim.Math_.floor(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_0 + s.tmp_2);
-    globals.ROW_LEFT___4530 = (r0);
-    r0 = (8 + globals.CELL_HEIGHT___4512);
-    globals.BOTTOM_BAR_HEIGHT___4538 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    globals.ROW_LEFT___34023 = (r0);
+    r0 = (8 + globals.CELL_HEIGHT___34005);
+    globals.BOTTOM_BAR_HEIGHT___34031 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___4538);
-    globals.BOTTOM_BAR_TOP___4541 = (r0);
+    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___34031);
+    globals.BOTTOM_BAR_TOP___34034 = (r0);
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = globals.font___4483;
+    s.tmp_2.arg0 = globals.font___33976;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 27; s.pc = 49; return s.tmp_2; }
+     else { s.callLocIdx = 25; s.pc = 47; return s.tmp_2; }
     }
-  case 49:
+  case 47:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 3);
     s.tmp_0 = r0;
     r0 = (80 + s.tmp_0);
-    globals.BOTTOM_BAR_BUTTON_WIDTH___4548 = (r0);
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_HEIGHT___4538;
+    globals.BOTTOM_BAR_BUTTON_WIDTH___34041 = (r0);
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_HEIGHT___34031;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = globals.font___4483;
+    s.tmp_3.arg0 = globals.font___33976;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 28; s.pc = 50; return s.tmp_3; }
+     else { s.callLocIdx = 26; s.pc = 48; return s.tmp_3; }
     }
-  case 50:
+  case 48:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    globals.BOTTOM_BAR_TEXT_Y___4551 = (r0);
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_BUTTON_WIDTH___4548;
+    globals.BOTTOM_BAR_TEXT_Y___34044 = (r0);
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_BUTTON_WIDTH___34041;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.font___4483;
+    s.tmp_4.arg0 = globals.font___33976;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charWidth");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 29; s.pc = 51; return s.tmp_4; }
+     else { s.callLocIdx = 27; s.pc = 49; return s.tmp_4; }
     }
-  case 51:
+  case 49:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_3 * 2);
@@ -943,75 +913,75 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    globals.BOTTOM_BAR_CONFIRM_X___4554 = (r0);
-    r0 = (4 * globals.CELL_HEIGHT___4512);
-    globals.NUMPAD_HEIGHT___4558 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    globals.BOTTOM_BAR_CONFIRM_X___34047 = (r0);
+    r0 = (4 * globals.CELL_HEIGHT___34005);
+    globals.NUMPAD_HEIGHT___34051 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - globals.NUMPAD_HEIGHT___4558);
+    r0 = (s.tmp_1 - globals.NUMPAD_HEIGHT___34051);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___4538);
-    globals.NUMPAD_TOP___4562 = (r0);
-    r0 = (1 * globals.CELL_HEIGHT___4512);
-    globals.INPUT_HEIGHT___4568 = (r0);
-    r0 = (globals.NUMPAD_TOP___4562 - globals.INPUT_HEIGHT___4568);
+    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___34031);
+    globals.NUMPAD_TOP___34055 = (r0);
+    r0 = (1 * globals.CELL_HEIGHT___34005);
+    globals.INPUT_HEIGHT___34061 = (r0);
+    r0 = (globals.NUMPAD_TOP___34055 - globals.INPUT_HEIGHT___34061);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    globals.INPUT_TOP___4572 = (r0);
-    r0 = (globals.INPUT_TOP___4572 - 4);
-    globals.PROMPT_HEIGHT___4577 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    globals.INPUT_TOP___34065 = (r0);
+    r0 = (globals.INPUT_TOP___34065 - 4);
+    globals.PROMPT_HEIGHT___34070 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 6);
-    globals.PROMPT_WIDTH___4580 = (r0);
-    globals.confirmText___4581 = ("OK");
-    s.tmp_0 = scene_systemMenu_initVolume__P4614_mk(s);
-    s.callLocIdx = 30; s.pc = 52; return s.tmp_0;
-  case 52:
+    globals.PROMPT_WIDTH___34073 = (r0);
+    globals.confirmText___34074 = ("OK");
+    s.tmp_0 = scene_systemMenu_initVolume__P34107_mk(s);
+    s.callLocIdx = 28; s.pc = 50; return s.tmp_0;
+  case 50:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_initScreen__P4615_mk(s);
-    s.callLocIdx = 31; s.pc = 53; return s.tmp_0;
-  case 53:
+    s.tmp_0 = scene_systemMenu_initScreen__P34108_mk(s);
+    s.callLocIdx = 29; s.pc = 51; return s.tmp_0;
+  case 51:
     r0 = s.retval;
-    r0 = pxsim_Array__push(globals.scene_Scene_initializers___2439, scene_systemMenu_register__P2633);
-    r0 = pxsim.image.ofBuffer(_hex4622);
-    globals.CARD_NORMAL___2638 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4624);
-    globals.CARD_SELECTED___2639 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4626);
-    globals.CARD_ACTIVE___2640 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4628);
-    globals.VOLUME_UP_ICON___2641 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4630);
-    globals.BRIGHTNESS_DOWN_ICON___2642 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4632);
-    globals.CLOSE_MENU_ICON___2643 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4634);
-    globals.VOLUME_DOWN_ICON___2644 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4636);
-    globals.SLEEP_ICON___2645 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4638);
-    globals.CONSOLE_ICON___2646 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4640);
-    globals.BRIGHTNESS_UP_ICON___2647 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex4642);
-    globals.STATS_ICON___2648 = (r0);
-    globals.consoleColor___4645 = (1);
-    globals.tabSize___4648 = (8);
-    globals.consoleFont___4654 = (globals.font5___1750);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_Array__push(globals.scene_Scene_initializers___31858, scene_systemMenu_register__P32052);
+    r0 = pxsim.image.ofBuffer(_hex34115);
+    globals.CARD_NORMAL___32057 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34117);
+    globals.CARD_SELECTED___32058 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34119);
+    globals.CARD_ACTIVE___32059 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34121);
+    globals.VOLUME_UP_ICON___32060 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34123);
+    globals.BRIGHTNESS_DOWN_ICON___32061 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34125);
+    globals.CLOSE_MENU_ICON___32062 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34127);
+    globals.VOLUME_DOWN_ICON___32063 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34129);
+    globals.SLEEP_ICON___32064 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34131);
+    globals.CONSOLE_ICON___32065 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34133);
+    globals.BRIGHTNESS_UP_ICON___32066 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34135);
+    globals.STATS_ICON___32067 = (r0);
+    globals.consoleColor___34138 = (1);
+    globals.tabSize___34141 = (8);
+    globals.consoleFont___34147 = (globals.font5___31168);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_2 = r0;
     s.tmp_5 = if_charHeight_1_mk(s);
-    s.tmp_5.arg0 = globals.consoleFont___4654;
+    s.tmp_5.arg0 = globals.consoleFont___34147;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "charHeight");
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 32; s.pc = 54; return s.tmp_5; }
+     else { s.callLocIdx = 30; s.pc = 52; return s.tmp_5; }
     }
-  case 54:
+  case 52:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 2);
@@ -1021,420 +991,441 @@ switch (step) {
     r0 = pxsim.Math_.floor(s.tmp_1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    globals.consoleLines___4659 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    globals.consoleLines___34152 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 8);
     s.tmp_1 = r0;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.consoleFont___4654;
+    s.tmp_4.arg0 = globals.consoleFont___34147;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charWidth");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 33; s.pc = 55; return s.tmp_4; }
+     else { s.callLocIdx = 31; s.pc = 53; return s.tmp_4; }
     }
-  case 55:
+  case 53:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_1 / s.tmp_3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    globals.consoleColumns___4669 = (r0);
-    s.tmp_0 = console_addListener__P372_mk(s);
-    s.tmp_0.arg0 = game_consoleOverlay_listener__P4681;
-    s.callLocIdx = 34; s.pc = 56; return s.tmp_0;
-  case 56:
+    globals.consoleColumns___34162 = (r0);
+    s.tmp_0 = console_addListener__P29907_mk(s);
+    s.tmp_0.arg0 = game_consoleOverlay_listener__P34174;
+    s.callLocIdx = 32; s.pc = 54; return s.tmp_0;
+  case 54:
     r0 = s.retval;
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = inline__P4685;
+    s.tmp_0.argL = inline__P34178;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 36; s.pc = 57; return s.tmp_0;
-  case 57:
+    s.callLocIdx = 34; s.pc = 55; return s.tmp_0;
+  case 55:
     r0 = s.retval;
-    globals.MAX_SOURCES___4683 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C2718_VT);
+    globals.MAX_SOURCES___34176 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C32137_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_SprayFactory_constructor__P2719_mk(s);
+    s.tmp_1 = particles_SprayFactory_constructor__P32138_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 20;
     s.tmp_1.arg2 = 0;
     s.tmp_1.arg3 = 60;
-    s.callLocIdx = 37; s.pc = 58; return s.tmp_1;
-  case 58:
+    s.callLocIdx = 35; s.pc = 56; return s.tmp_1;
+  case 56:
     r0 = s.retval;
-    globals.defaultFactory___2698 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C2586_VT);
+    globals.defaultFactory___32117 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C32005_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P2588_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P32007_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 38; s.pc = 59; return s.tmp_1;
-  case 59:
+    s.callLocIdx = 36; s.pc = 57; return s.tmp_1;
+  case 57:
     r0 = s.retval;
-    globals.galois___4718 = (s.tmp_0);
-    globals.angleSlice___4726 = (0.06283185307179587);
-    s.tmp_0 = effects_createEffect__P4753_mk(s);
+    globals.galois___34211 = (s.tmp_0);
+    globals.angleSlice___34219 = (0.06283185307179587);
+    s.tmp_0 = effects_createEffect__P34246_mk(s);
     s.tmp_0.arg0 = 20;
     s.tmp_0.arg1 = 2000;
-    s.tmp_0.arg2 = inline__P17195;
-    s.callLocIdx = 40; s.pc = 60; return s.tmp_0;
-  case 60:
+    s.tmp_0.arg2 = inline__P46690;
+    s.callLocIdx = 38; s.pc = 58; return s.tmp_0;
+  case 58:
     r0 = s.retval;
-    globals.spray___2798 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ScreenEffect__C2793_VT);
+    globals.spray___32217 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ScreenEffect__C32212_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_ScreenEffect_constructor__P2794_mk(s);
+    s.tmp_1 = effects_ScreenEffect_constructor__P32213_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 10;
     s.tmp_1.arg2 = 40;
     s.tmp_1.arg3 = 4000;
-    s.tmp_1.arg4 = inline__P9339;
-    s.callLocIdx = 46; s.pc = 61; return s.tmp_1;
-  case 61:
+    s.tmp_1.arg4 = inline__P38876;
+    s.callLocIdx = 44; s.pc = 59; return s.tmp_1;
+  case 59:
     r0 = s.retval;
-    globals.confetti___2801 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C2816_VT);
+    globals.confetti___32220 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C32235_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_ImageEffect_constructor__P2817_mk(s);
+    s.tmp_1 = effects_ImageEffect_constructor__P32236_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 100;
-    s.tmp_1.arg2 = inline__P17335;
-    s.callLocIdx = 52; s.pc = 62; return s.tmp_1;
-  case 62:
+    s.tmp_1.arg2 = inline__P46831;
+    s.callLocIdx = 50; s.pc = 60; return s.tmp_1;
+  case 60:
     r0 = s.retval;
-    globals.dissolve___2821 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C2816_VT);
+    globals.dissolve___32240 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C32235_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_ImageEffect_constructor__P2817_mk(s);
+    s.tmp_1 = effects_ImageEffect_constructor__P32236_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 125;
-    s.tmp_1.arg2 = inline__P9231;
-    s.callLocIdx = 55; s.pc = 63; return s.tmp_1;
+    s.tmp_1.arg2 = inline__P38768;
+    s.callLocIdx = 53; s.pc = 61; return s.tmp_1;
+  case 61:
+    r0 = s.retval;
+    globals.melt___32241 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C32250_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = texteffects_TextEffect_constructor__P32252_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.tmp_1.arg1 = inline__P34270;
+    s.callLocIdx = 54; s.pc = 62; return s.tmp_1;
+  case 62:
+    r0 = s.retval;
+    globals.shake___32253 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C32250_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = texteffects_TextEffect_constructor__P32252_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.tmp_1.arg1 = inline__P34283;
+    s.callLocIdx = 64; s.pc = 63; return s.tmp_1;
   case 63:
     r0 = s.retval;
-    globals.melt___2822 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C2831_VT);
+    globals.wave___32254 = (s.tmp_0);
+    globals.freqs___34324 = (_hex34323);
+    globals.globalVolume___34328 = (null);
+    globals.playToneID___34335 = (0);
+    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C32278_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = texteffects_TextEffect_constructor__P2833_mk(s);
+    s.tmp_1 = music_Melody_constructor__P32281_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = inline__P4777;
-    s.callLocIdx = 56; s.pc = 64; return s.tmp_1;
+    s.tmp_1.arg1 = "~15 e3:3 r:1 d#:3 r:1 d:4 r:1 c#:8";
+    s.callLocIdx = 65; s.pc = 64; return s.tmp_1;
   case 64:
     r0 = s.retval;
-    globals.shake___2834 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C2831_VT);
+    globals.wawawawaa___32295 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C32278_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = texteffects_TextEffect_constructor__P2833_mk(s);
+    s.tmp_1 = music_Melody_constructor__P32281_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = inline__P4790;
+    s.tmp_1.arg1 = "g4:1 c5 e g:2 e:1 g:3";
     s.callLocIdx = 66; s.pc = 65; return s.tmp_1;
   case 65:
     r0 = s.retval;
-    globals.wave___2835 = (s.tmp_0);
-    r0 = pxsim.image.ofBuffer(_hex5177);
-    globals.coral0___3048 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex5179);
-    globals.coral1___3049 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex5181);
-    globals.coral2___3050 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex5185);
-    globals.coral4___3052 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex5187);
-    globals.coral5___3053 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex5493);
-    globals.oceanSand6___3206 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex5823);
-    globals.hazardWater___3375 = (r0);
-    s.tmp_0 = game_setWaitAnyButton__P2533_mk(s);
-    s.tmp_0.arg0 = controller_pauseUntilAnyButtonIsPressed__P1953;
+    globals.powerUp___32298 = (s.tmp_0);
+    r0 = pxsim.image.ofBuffer(_hex34699);
+    globals.coral0___32582 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34701);
+    globals.coral1___32583 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34703);
+    globals.coral2___32584 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34707);
+    globals.coral4___32586 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex34709);
+    globals.coral5___32587 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35015);
+    globals.oceanSand6___32740 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35345);
+    globals.hazardWater___32909 = (r0);
+    s.tmp_0 = game_setWaitAnyButton__P31952_mk(s);
+    s.tmp_0.arg0 = controller_pauseUntilAnyButtonIsPressed__P31372;
     s.callLocIdx = 67; s.pc = 66; return s.tmp_0;
   case 66:
     r0 = s.retval;
-    s.tmp_0 = game_eventContext__P2535_mk(s);
+    s.tmp_0 = game_eventContext__P31954_mk(s);
     s.callLocIdx = 68; s.pc = 67; return s.tmp_0;
   case 67:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
-    s.tmp_0.arg0 = inline__P5987;
+    s.tmp_0 = game_addScenePushHandler__P31968_mk(s);
+    s.tmp_0.arg0 = inline__P35509;
     s.callLocIdx = 70; s.pc = 68; return s.tmp_0;
   case 68:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
-    s.tmp_0.arg0 = inline__P6005;
+    s.tmp_0 = game_addScenePopHandler__P31970_mk(s);
+    s.tmp_0.arg0 = inline__P35527;
     s.callLocIdx = 72; s.pc = 69; return s.tmp_0;
   case 69:
     r0 = s.retval;
-    s.tmp_0 = color_bufferToPalette__P3544_mk(s);
-    s.tmp_0.arg0 = _hex6039;
+    s.tmp_0 = color_bufferToPalette__P33078_mk(s);
+    s.tmp_0.arg0 = _hex35561;
     s.callLocIdx = 73; s.pc = 70; return s.tmp_0;
   case 70:
     r0 = s.retval;
-    globals.originalPalette___3574 = (r0);
-    s.tmp_0 = color_bufferToPalette__P3544_mk(s);
-    s.tmp_0.arg0 = _hex6061;
+    globals.originalPalette___33108 = (r0);
+    s.tmp_0 = color_bufferToPalette__P33078_mk(s);
+    s.tmp_0.arg0 = _hex35583;
     s.callLocIdx = 74; s.pc = 71; return s.tmp_0;
   case 71:
     r0 = s.retval;
-    globals.Black___3585 = (r0);
+    globals.Black___33119 = (r0);
     r0 = pxsim_pxtrt.mkMap();
-    globals.decounceTimeouts___6070 = (r0);
+    globals.decounceTimeouts___35592 = (r0);
     r0 = pxsim_pxtrt.mkMap();
-    globals.throttleTimeouts___6072 = (r0);
-    globals.PATH_FOLLOW_KEY___6088 = ("A_STAR_PATH_FOLLOW");
-    globals.PATH_COMPLETION_KEY___6089 = ("A_STAR_PATH_COMPLETION_HANDLER");
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    globals.throttleTimeouts___35594 = (r0);
+    globals.PATH_FOLLOW_KEY___35610 = ("A_STAR_PATH_FOLLOW");
+    globals.PATH_COMPLETION_KEY___35611 = ("A_STAR_PATH_COMPLETION_HANDLER");
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
     s.callLocIdx = 75; s.pc = 72; return s.tmp_0;
   case 72:
     r0 = s.retval;
-    globals._TileSprite___3760 = (r0);
-    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    globals._TileSprite___33294 = (r0);
+    s.tmp_0 = ConnectionKind_create__P33336_mk(s);
     s.callLocIdx = 76; s.pc = 73; return s.tmp_0;
   case 73:
     r0 = s.retval;
-    globals.Door1___3803 = (r0);
-    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    globals.Door1___33337 = (r0);
+    s.tmp_0 = ConnectionKind_create__P33336_mk(s);
     s.callLocIdx = 77; s.pc = 74; return s.tmp_0;
   case 74:
     r0 = s.retval;
-    globals.Door2___3804 = (r0);
-    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    globals.Door2___33338 = (r0);
+    s.tmp_0 = ConnectionKind_create__P33336_mk(s);
     s.callLocIdx = 78; s.pc = 75; return s.tmp_0;
   case 75:
     r0 = s.retval;
-    globals.Ladder1___3805 = (r0);
-    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    globals.Ladder1___33339 = (r0);
+    s.tmp_0 = ConnectionKind_create__P33336_mk(s);
     s.callLocIdx = 79; s.pc = 76; return s.tmp_0;
   case 76:
     r0 = s.retval;
-    globals.Pipe1___3806 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6278);
-    globals.transparency16___3933 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6282);
-    globals.tile1___3934 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6286);
-    globals.tile2___3935 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6290);
-    globals.tile3___3936 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6294);
-    globals.tile4___3937 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6298);
-    globals.tile5___3938 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6302);
-    globals.tile6___3939 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6306);
-    globals.tile7___3940 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6310);
-    globals.tile8___3941 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6314);
-    globals.tile9___3942 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6318);
-    globals.tile10___3943 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6322);
-    globals.tile11___3944 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6326);
-    globals.tile12___3945 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6330);
-    globals.tile14___3946 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6334);
-    globals.tile13___3947 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6338);
-    globals.tile15___3948 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex6342);
-    globals.tile16___3949 = (r0);
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    globals.Pipe1___33340 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35800);
+    globals.transparency16___33468 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35804);
+    globals.tile1___33469 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35808);
+    globals.tile2___33470 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35812);
+    globals.tile3___33471 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35816);
+    globals.tile4___33472 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35820);
+    globals.tile5___33473 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35824);
+    globals.tile6___33474 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35828);
+    globals.tile7___33475 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35832);
+    globals.tile8___33476 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35836);
+    globals.tile9___33477 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35840);
+    globals.tile10___33478 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35844);
+    globals.tile11___33479 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35848);
+    globals.tile12___33480 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35852);
+    globals.tile14___33481 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35856);
+    globals.tile13___33482 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35860);
+    globals.tile15___33483 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex35864);
+    globals.tile16___33484 = (r0);
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
     s.callLocIdx = 80; s.pc = 77; return s.tmp_0;
   case 77:
     r0 = s.retval;
-    globals.NPC___45888 = (r0);
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    globals.NPC___97745 = (r0);
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
     s.callLocIdx = 81; s.pc = 78; return s.tmp_0;
   case 78:
     r0 = s.retval;
-    globals.Map___45891 = (r0);
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    globals.Map___97748 = (r0);
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
     s.callLocIdx = 82; s.pc = 79; return s.tmp_0;
   case 79:
     r0 = s.retval;
-    globals.SurvivedPlayer___45894 = (r0);
-    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    globals.SurvivedPlayer___97751 = (r0);
+    s.tmp_0 = SpriteKind_create__P31546_mk(s);
     s.callLocIdx = 83; s.pc = 80; return s.tmp_0;
   case 80:
     r0 = s.retval;
-    globals.SurvivedNPC___45897 = (r0);
-    s.tmp_0 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_0.arg0 = globals.B___1878;
+    globals.SurvivedNPC___97754 = (r0);
+    s.tmp_0 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_0.arg0 = globals.B___31297;
     s.tmp_0.arg1 = 2049;
-    s.tmp_0.arg2 = inline__P45902;
+    s.tmp_0.arg2 = inline__P97759;
     s.callLocIdx = 85; s.pc = 81; return s.tmp_0;
   case 81:
     r0 = s.retval;
-    s.tmp_0 = spriteutils_createRenderable__P3638_mk(s);
+    s.tmp_0 = spriteutils_createRenderable__P33172_mk(s);
     s.tmp_0.arg0 = 200;
-    s.tmp_0.arg1 = inline__P45920;
+    s.tmp_0.arg1 = inline__P97905;
     s.callLocIdx = 117; s.pc = 82; return s.tmp_0;
   case 82:
     r0 = s.retval;
-    s.tmp_0 = scene_onOverlapTile__P2108_mk(s);
-    s.tmp_0.arg0 = globals.NPC___45888;
-    s.tmp_0.arg1 = globals.tile12___3945;
-    s.tmp_0.arg2 = inline__P45962;
+    s.tmp_0 = scene_onOverlapTile__P31527_mk(s);
+    s.tmp_0.arg0 = globals.NPC___97745;
+    s.tmp_0.arg1 = globals.tile12___33480;
+    s.tmp_0.arg2 = inline__P97947;
     s.callLocIdx = 122; s.pc = 83; return s.tmp_0;
   case 83:
     r0 = s.retval;
-    s.tmp_0 = info_onCountdownEnd__P2215_mk(s);
-    s.tmp_0.arg0 = inline__P45981;
+    s.tmp_0 = info_onCountdownEnd__P31634_mk(s);
+    s.tmp_0.arg0 = inline__P97979;
     s.callLocIdx = 135; s.pc = 84; return s.tmp_0;
   case 84:
     r0 = s.retval;
-    s.tmp_0 = scene_onOverlapTile__P2108_mk(s);
-    s.tmp_0.arg0 = globals.Player___2128;
-    s.tmp_0.arg1 = globals.tile12___3945;
-    s.tmp_0.arg2 = inline__P46024;
+    s.tmp_0 = scene_onOverlapTile__P31527_mk(s);
+    s.tmp_0.arg0 = globals.Player___31547;
+    s.tmp_0.arg1 = globals.tile12___33480;
+    s.tmp_0.arg2 = inline__P98025;
     s.callLocIdx = 143; s.pc = 85; return s.tmp_0;
   case 85:
     r0 = s.retval;
-    s.tmp_0 = sprites_onOverlap__P2106_mk(s);
-    s.tmp_0.arg0 = globals.NPC___45888;
-    s.tmp_0.arg1 = globals.Enemy___2131;
-    s.tmp_0.arg2 = inline__P46043;
-    s.callLocIdx = 155; s.pc = 86; return s.tmp_0;
+    s.tmp_0 = sprites_onOverlap__P31525_mk(s);
+    s.tmp_0.arg0 = globals.NPC___97745;
+    s.tmp_0.arg1 = globals.Enemy___31550;
+    s.tmp_0.arg2 = inline__P98044;
+    s.callLocIdx = 154; s.pc = 86; return s.tmp_0;
   case 86:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_onMenuOptionSelected__P3687_mk(s);
-    s.tmp_0.arg0 = inline__P46084;
-    s.callLocIdx = 202; s.pc = 87; return s.tmp_0;
+    s.tmp_0 = blockMenu_onMenuOptionSelected__P33221_mk(s);
+    s.tmp_0.arg0 = inline__P98372;
+    s.callLocIdx = 209; s.pc = 87; return s.tmp_0;
   case 87:
     r0 = s.retval;
-    s.tmp_0 = sprites_onOverlap__P2106_mk(s);
-    s.tmp_0.arg0 = globals.Player___2128;
-    s.tmp_0.arg1 = globals.Enemy___2131;
-    s.tmp_0.arg2 = inline__P46093;
-    s.callLocIdx = 218; s.pc = 88; return s.tmp_0;
+    s.tmp_0 = sprites_onOverlap__P31525_mk(s);
+    s.tmp_0.arg0 = globals.Player___31547;
+    s.tmp_0.arg1 = globals.Enemy___31550;
+    s.tmp_0.arg2 = inline__P98382;
+    s.callLocIdx = 224; s.pc = 88; return s.tmp_0;
   case 88:
     r0 = s.retval;
-    globals.sprite_closest_sprite___46137 = (null);
-    globals.shortest_distance___46139 = (0);
-    globals.last_score_time___46141 = (0);
-    globals.sprite_shark___46143 = (null);
-    globals.map___46145 = (null);
-    globals.sprite_player_fish___46147 = (null);
-    globals.selected_option___46088 = (false);
-    globals.location___46149 = (null);
-    globals.sprite_fish___46151 = (null);
-    globals.local_choice___46153 = (0);
+    globals.sprite_closest_sprite___98425 = (null);
+    globals.shortest_distance___98427 = (0);
+    globals.last_score_time___98429 = (0);
+    globals.sprite_shark___98307 = (null);
+    globals.map___98269 = (null);
+    globals.sprite_player_fish___98248 = (null);
+    globals.selected_option___97970 = (false);
+    globals.location___97864 = (null);
+    globals.sprite_fish___97817 = (null);
+    globals.local_choice___97809 = (0);
     r0 = pxsim_Array__mk();
-    globals.right_fish_animations___46154 = (r0);
+    globals.right_fish_animations___97794 = (r0);
     r0 = pxsim_Array__mk();
-    globals.left_fish_animations___46155 = (r0);
-    globals.sprite_map___45914 = (null);
-    globals.show_minimap___45907 = (false);
+    globals.left_fish_animations___97779 = (r0);
+    globals.sprite_map___97771 = (null);
+    globals.show_minimap___97764 = (false);
     r0 = pxsim_String_.mkEmpty();
-    globals.message___45955 = (r0);
-    globals.loading___45924 = (0);
+    globals.message___97940 = (r0);
+    globals.loading___97909 = (0);
     r0 = pxsim_Array__mk();
-    globals.paths___46005 = (r0);
-    globals.last_15___45971 = (false);
-    globals.player_made_it___46018 = (false);
-    globals.in_game___45904 = (false);
-    globals.user_shark_count___46157 = (0);
-    globals.user_fish_count___46159 = (0);
-    s.tmp_1 = blockSettings_exists__P3756_mk(s);
+    globals.paths___97881 = (r0);
+    globals.last_15___97956 = (false);
+    globals.player_made_it___98015 = (false);
+    globals.in_game___97761 = (false);
+    globals.user_shark_count___98134 = (0);
+    globals.user_fish_count___98177 = (0);
+    s.tmp_1 = blockSettings_exists__P33290_mk(s);
     s.tmp_1.arg0 = "fish_count";
-    s.callLocIdx = 219; s.pc = 89; return s.tmp_1;
+    s.callLocIdx = 225; s.pc = 89; return s.tmp_1;
   case 89:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = blockSettings_readNumber__P3750_mk(s);
+    s.tmp_2 = blockSettings_readNumber__P33284_mk(s);
     s.tmp_2.arg0 = "fish_count";
-    s.callLocIdx = 220; s.pc = 90; return s.tmp_2;
+    s.callLocIdx = 226; s.pc = 90; return s.tmp_2;
   case 90:
     r0 = s.retval;
-    globals.user_fish_count___46159 = (r0);
+    globals.user_fish_count___98177 = (r0);
     { step = 2; continue; }
   case 1:
-    globals.user_fish_count___46159 = (31);
+    globals.user_fish_count___98177 = (31);
   case 2:
-    s.tmp_1 = blockSettings_exists__P3756_mk(s);
+    s.tmp_1 = blockSettings_exists__P33290_mk(s);
     s.tmp_1.arg0 = "shark_count";
-    s.callLocIdx = 221; s.pc = 91; return s.tmp_1;
+    s.callLocIdx = 227; s.pc = 91; return s.tmp_1;
   case 91:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = blockSettings_readNumber__P3750_mk(s);
+    s.tmp_2 = blockSettings_readNumber__P33284_mk(s);
     s.tmp_2.arg0 = "shark_count";
-    s.callLocIdx = 222; s.pc = 92; return s.tmp_2;
+    s.callLocIdx = 228; s.pc = 92; return s.tmp_2;
   case 92:
     r0 = s.retval;
-    globals.user_shark_count___46157 = (r0);
+    globals.user_shark_count___98134 = (r0);
     { step = 4; continue; }
   case 3:
-    globals.user_shark_count___46157 = (2);
+    globals.user_shark_count___98134 = (2);
   case 4:
-    globals.in_game___45904 = (false);
-    globals.player_made_it___46018 = (false);
-    globals.last_15___45971 = (false);
-    globals.in_menu___46172 = (true);
+    globals.in_game___97761 = (false);
+    globals.player_made_it___98015 = (false);
+    globals.last_15___97956 = (false);
+    globals.in_menu___98445 = (true);
     r0 = pxsim_Array__mk();
-    globals.paths___46005 = (r0);
-    globals.loading___45924 = (-1);
+    globals.paths___97881 = (r0);
+    globals.loading___97909 = (-1);
     r0 = pxsim_String_.mkEmpty();
-    globals.message___45955 = (r0);
-    s.tmp_0 = scene_setBackgroundColor__P2457_mk(s);
+    globals.message___97940 = (r0);
+    s.tmp_0 = scene_setBackgroundColor__P31876_mk(s);
     s.tmp_0.arg0 = 9;
-    s.callLocIdx = 223; s.pc = 93; return s.tmp_0;
+    s.callLocIdx = 229; s.pc = 93; return s.tmp_0;
   case 93:
     r0 = s.retval;
-    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
-    r0 = pxsim.image.ofBuffer(_hex46182);
+    s.tmp_0 = scene_setBackgroundImage__P31878_mk(s);
+    r0 = pxsim.image.ofBuffer(_hex98455);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 224; s.pc = 94; return s.tmp_0;
+    s.callLocIdx = 230; s.pc = 94; return s.tmp_0;
   case 94:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___3933);
-    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___3206);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___3048);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___3050);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___3049);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___3935);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___3936);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___3937);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___3941);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___3942);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___3944);
-    s.tmp_1 = tiles_setTilemap__P2341_mk(s);
-    s.tmp_2 = tiles_createTilemap__P2340_mk(s);
-    s.tmp_2.arg0 = _hex46186;
-    r0 = pxsim.image.ofBuffer(_hex46188);
+    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___33468);
+    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___32740);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___32582);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___32584);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___32583);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___33470);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___33471);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___33472);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___33476);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___33477);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___33479);
+    s.tmp_1 = tiles_setTilemap__P31760_mk(s);
+    s.tmp_2 = tiles_createTilemap__P31759_mk(s);
+    s.tmp_2.arg0 = _hex98459;
+    r0 = pxsim.image.ofBuffer(_hex98461);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = s.tmp_0;
     s.tmp_2.arg3 = 4;
-    s.callLocIdx = 225; s.pc = 96; return s.tmp_2;
+    s.callLocIdx = 231; s.pc = 96; return s.tmp_2;
   case 96:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 226; s.pc = 95; return s.tmp_1;
+    s.callLocIdx = 232; s.pc = 95; return s.tmp_1;
   case 95:
     r0 = s.retval;
-    s.tmp_0 = fade_out__P45978_mk(s);
-    s.callLocIdx = 227; s.pc = 97; return s.tmp_0;
+    s.tmp_0 = fade_out__P97963_mk(s);
+    s.callLocIdx = 233; s.pc = 97; return s.tmp_0;
   case 97:
     r0 = s.retval;
   case 5:
-    r0 = pxsim_numops_toBoolDecr(globals.in_menu___46172);
+    r0 = pxsim_numops_toBoolDecr(globals.in_menu___98445);
     if (!r0) { step = 28; continue; }
-    s.tmp_0 = blockMenu_setColors__P3683_mk(s);
+    s.tmp_0 = blockMenu_setColors__P33217_mk(s);
     s.tmp_0.arg0 = 9;
     s.tmp_0.arg1 = 8;
-    s.callLocIdx = 228; s.pc = 98; return s.tmp_0;
+    s.callLocIdx = 234; s.pc = 98; return s.tmp_0;
   case 98:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
@@ -1444,19 +1435,19 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_0, "Set fish count");
     r0 = pxsim_Array__push(s.tmp_0, "Set shark count");
     r0 = pxsim_Array__push(s.tmp_0, "Default options");
-    s.tmp_1 = blockMenu_showMenu__P3681_mk(s);
+    s.tmp_1 = blockMenu_showMenu__P33215_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.tmp_1.arg2 = 4;
-    s.callLocIdx = 229; s.pc = 99; return s.tmp_1;
+    s.callLocIdx = 235; s.pc = 99; return s.tmp_1;
   case 99:
     r0 = s.retval;
-    s.tmp_0 = wait_for_select_and_close__P45979_mk(s);
-    s.callLocIdx = 230; s.pc = 100; return s.tmp_0;
+    s.tmp_0 = wait_for_select_and_close__P97968_mk(s);
+    s.callLocIdx = 236; s.pc = 100; return s.tmp_0;
   case 100:
     r0 = s.retval;
-    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
-    s.callLocIdx = 231; s.pc = 101; return s.tmp_2;
+    s.tmp_2 = blockMenu_selectedMenuIndex__P33219_mk(s);
+    s.callLocIdx = 237; s.pc = 101; return s.tmp_2;
   case 101:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -1464,13 +1455,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_3 = game_showLongText__P2521_mk(s);
-    if ((globals.user_fish_count___46159) && (globals.user_fish_count___46159).vtable) {
+    s.tmp_3 = game_showLongText__P31940_mk(s);
+    if ((globals.user_fish_count___98177) && (globals.user_fish_count___98177).vtable) {
     setupResume(s, 103);
-    pxsim_String__stringConv(globals.user_fish_count___46159);
+    pxsim_String__stringConv(globals.user_fish_count___98177);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_fish_count___46159) + ""; }
+    } else { s.retval = (globals.user_fish_count___98177) + ""; }
   case 103:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -1496,12 +1487,12 @@ switch (step) {
   case 105:
     r0 = s.retval;
     s.tmp_6 = r0;
-    if ((globals.user_shark_count___46157) && (globals.user_shark_count___46157).vtable) {
+    if ((globals.user_shark_count___98134) && (globals.user_shark_count___98134).vtable) {
     setupResume(s, 106);
-    pxsim_String__stringConv(globals.user_shark_count___46157);
+    pxsim_String__stringConv(globals.user_shark_count___98134);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_shark_count___46157) + ""; }
+    } else { s.retval = (globals.user_shark_count___98134) + ""; }
   case 106:
     r0 = s.retval;
     s.tmp_11 = r0;
@@ -1519,25 +1510,25 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_4, " shark(s)\\n");
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 0;
-    s.callLocIdx = 232; s.pc = 102; return s.tmp_3;
+    s.callLocIdx = 238; s.pc = 102; return s.tmp_3;
   case 102:
     r0 = s.retval;
-    s.tmp_1 = game_ask__P2582_mk(s);
+    s.tmp_1 = game_ask__P32001_mk(s);
     s.tmp_1.arg0 = "Continue with these";
     s.tmp_1.arg1 = "options?";
-    s.callLocIdx = 233; s.pc = 108; return s.tmp_1;
+    s.callLocIdx = 239; s.pc = 108; return s.tmp_1;
   case 108:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    globals.in_menu___46172 = (false);
+    globals.in_menu___98445 = (false);
   case 6:
   case 7:
     { step = 27; continue; }
   case 8:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
-    s.callLocIdx = 234; s.pc = 109; return s.tmp_2;
+    s.tmp_2 = blockMenu_selectedMenuIndex__P33219_mk(s);
+    s.callLocIdx = 240; s.pc = 109; return s.tmp_2;
   case 109:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -1545,13 +1536,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_3 = game_showLongText__P2521_mk(s);
+    s.tmp_3 = game_showLongText__P31940_mk(s);
     s.tmp_3.arg0 = "Hello there! Welcome to Fishy Fishy Cross My Ocean!";
     s.tmp_3.arg1 = 0;
-    s.callLocIdx = 235; s.pc = 110; return s.tmp_3;
+    s.callLocIdx = 241; s.pc = 110; return s.tmp_3;
   case 110:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P2521_mk(s);
+    s.tmp_0 = game_showLongText__P31940_mk(s);
     r0 = pxsim_String__concat("In this game, all you have to do is guide your fish ", "(Using the arrow keys or W, A, S, and D - If you figured ");
     s.tmp_6 = r0;
     if ((s.tmp_6) && (s.tmp_6).vtable) {
@@ -1590,10 +1581,10 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_7);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 236; s.pc = 111; return s.tmp_0;
+    s.callLocIdx = 242; s.pc = 111; return s.tmp_0;
   case 111:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P2521_mk(s);
+    s.tmp_0 = game_showLongText__P31940_mk(s);
     r0 = pxsim_String__concat("Unfortunately for you, no.\\n", "There will be some sharks patrolling the waters. And they ");
     s.tmp_6 = r0;
     if ((s.tmp_6) && (s.tmp_6).vtable) {
@@ -1634,10 +1625,10 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_8);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 237; s.pc = 115; return s.tmp_0;
+    s.callLocIdx = 243; s.pc = 115; return s.tmp_0;
   case 115:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P2521_mk(s);
+    s.tmp_0 = game_showLongText__P31940_mk(s);
     r0 = pxsim_String__concat("Just try to swim around them. You might have to sacrifice a couple ", "AI fish to get around them, because in this game, the sharks are ");
     s.tmp_6 = r0;
     if ((s.tmp_6) && (s.tmp_6).vtable) {
@@ -1674,19 +1665,19 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_1, "this in real life, and you'll be fine.");
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 238; s.pc = 119; return s.tmp_0;
+    s.callLocIdx = 244; s.pc = 119; return s.tmp_0;
   case 119:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P2521_mk(s);
+    s.tmp_0 = game_showLongText__P31940_mk(s);
     s.tmp_0.arg0 = "Good luck, and hope you don't become a shark's breakfast!";
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 239; s.pc = 123; return s.tmp_0;
+    s.callLocIdx = 245; s.pc = 123; return s.tmp_0;
   case 123:
     r0 = s.retval;
     { step = 26; continue; }
   case 9:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
-    s.callLocIdx = 240; s.pc = 124; return s.tmp_2;
+    s.tmp_2 = blockMenu_selectedMenuIndex__P33219_mk(s);
+    s.callLocIdx = 246; s.pc = 124; return s.tmp_2;
   case 124:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -1694,59 +1685,59 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.tmp_3 = game_askForNumber__P2573_mk(s);
+    s.tmp_3 = game_askForNumber__P31992_mk(s);
     s.tmp_3.arg0 = "Please input the amount of fish you want:";
     s.tmp_3.arg1 = 2;
-    s.callLocIdx = 241; s.pc = 125; return s.tmp_3;
+    s.callLocIdx = 247; s.pc = 125; return s.tmp_3;
   case 125:
     r0 = s.retval;
-    globals.user_fish_count___46159 = (r0);
-    r0 = (globals.user_fish_count___46159 > 31);
+    globals.user_fish_count___98177 = (r0);
+    r0 = (globals.user_fish_count___98177 > 31);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.tmp_1 = game_showLongText__P2521_mk(s);
+    s.tmp_1 = game_showLongText__P31940_mk(s);
     s.tmp_1.arg0 = "31 is the maximum amount of fish! (Fish count is now 31)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 242; s.pc = 126; return s.tmp_1;
+    s.callLocIdx = 248; s.pc = 126; return s.tmp_1;
   case 126:
     r0 = s.retval;
-    globals.user_fish_count___46159 = (31);
+    globals.user_fish_count___98177 = (31);
     { step = 15; continue; }
   case 10:
-    r0 = (globals.user_fish_count___46159 < 1);
+    r0 = (globals.user_fish_count___98177 < 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = game_showLongText__P2521_mk(s);
+    s.tmp_1 = game_showLongText__P31940_mk(s);
     s.tmp_1.arg0 = "1 is the minimum amount of fish! (Fish count is now 1)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 243; s.pc = 127; return s.tmp_1;
+    s.callLocIdx = 249; s.pc = 127; return s.tmp_1;
   case 127:
     r0 = s.retval;
-    globals.user_fish_count___46159 = (1);
+    globals.user_fish_count___98177 = (1);
     { step = 14; continue; }
   case 11:
-    r0 = (globals.user_fish_count___46159 != globals.user_fish_count___46159);
+    r0 = (globals.user_fish_count___98177 != globals.user_fish_count___98177);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
-    s.tmp_1 = game_showLongText__P2521_mk(s);
+    s.tmp_1 = game_showLongText__P31940_mk(s);
     s.tmp_1.arg0 = "That's not a number! (Fish count is now 31)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 244; s.pc = 128; return s.tmp_1;
+    s.callLocIdx = 250; s.pc = 128; return s.tmp_1;
   case 128:
     r0 = s.retval;
-    globals.user_fish_count___46159 = (31);
+    globals.user_fish_count___98177 = (31);
     { step = 13; continue; }
   case 12:
-    s.tmp_0 = game_showLongText__P2521_mk(s);
-    if ((globals.user_fish_count___46159) && (globals.user_fish_count___46159).vtable) {
+    s.tmp_0 = game_showLongText__P31940_mk(s);
+    if ((globals.user_fish_count___98177) && (globals.user_fish_count___98177).vtable) {
     setupResume(s, 130);
-    pxsim_String__stringConv(globals.user_fish_count___46159);
+    pxsim_String__stringConv(globals.user_fish_count___98177);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_fish_count___46159) + ""; }
+    } else { s.retval = (globals.user_fish_count___98177) + ""; }
   case 130:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -1764,7 +1755,7 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_1, "!");
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 245; s.pc = 129; return s.tmp_0;
+    s.callLocIdx = 251; s.pc = 129; return s.tmp_0;
   case 129:
     r0 = s.retval;
   case 13:
@@ -1772,8 +1763,8 @@ switch (step) {
   case 15:
     { step = 25; continue; }
   case 16:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
-    s.callLocIdx = 246; s.pc = 132; return s.tmp_2;
+    s.tmp_2 = blockMenu_selectedMenuIndex__P33219_mk(s);
+    s.callLocIdx = 252; s.pc = 132; return s.tmp_2;
   case 132:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -1781,46 +1772,46 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 21; continue; }
-    s.tmp_3 = game_askForNumber__P2573_mk(s);
+    s.tmp_3 = game_askForNumber__P31992_mk(s);
     s.tmp_3.arg0 = "Please input the amount of sharks you want:";
     s.tmp_3.arg1 = 1;
-    s.callLocIdx = 247; s.pc = 133; return s.tmp_3;
+    s.callLocIdx = 253; s.pc = 133; return s.tmp_3;
   case 133:
     r0 = s.retval;
-    globals.user_shark_count___46157 = (r0);
-    r0 = (globals.user_shark_count___46157 < 1);
+    globals.user_shark_count___98134 = (r0);
+    r0 = (globals.user_shark_count___98134 < 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
-    s.tmp_1 = game_showLongText__P2521_mk(s);
+    s.tmp_1 = game_showLongText__P31940_mk(s);
     s.tmp_1.arg0 = "1 is the minimum amount of sharks! (Shark count is now 1)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 248; s.pc = 134; return s.tmp_1;
+    s.callLocIdx = 254; s.pc = 134; return s.tmp_1;
   case 134:
     r0 = s.retval;
-    globals.user_shark_count___46157 = (1);
+    globals.user_shark_count___98134 = (1);
     { step = 20; continue; }
   case 17:
-    r0 = (globals.user_shark_count___46157 != globals.user_shark_count___46157);
+    r0 = (globals.user_shark_count___98134 != globals.user_shark_count___98134);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.tmp_1 = game_showLongText__P2521_mk(s);
+    s.tmp_1 = game_showLongText__P31940_mk(s);
     s.tmp_1.arg0 = "That's not a number! (Shark count is now 2)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 249; s.pc = 135; return s.tmp_1;
+    s.callLocIdx = 255; s.pc = 135; return s.tmp_1;
   case 135:
     r0 = s.retval;
-    globals.user_shark_count___46157 = (2);
+    globals.user_shark_count___98134 = (2);
     { step = 19; continue; }
   case 18:
-    s.tmp_0 = game_showLongText__P2521_mk(s);
-    if ((globals.user_shark_count___46157) && (globals.user_shark_count___46157).vtable) {
+    s.tmp_0 = game_showLongText__P31940_mk(s);
+    if ((globals.user_shark_count___98134) && (globals.user_shark_count___98134).vtable) {
     setupResume(s, 137);
-    pxsim_String__stringConv(globals.user_shark_count___46157);
+    pxsim_String__stringConv(globals.user_shark_count___98134);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_shark_count___46157) + ""; }
+    } else { s.retval = (globals.user_shark_count___98134) + ""; }
   case 137:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -1838,15 +1829,15 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_1, "!");
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 250; s.pc = 136; return s.tmp_0;
+    s.callLocIdx = 256; s.pc = 136; return s.tmp_0;
   case 136:
     r0 = s.retval;
   case 19:
   case 20:
     { step = 24; continue; }
   case 21:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
-    s.callLocIdx = 251; s.pc = 139; return s.tmp_2;
+    s.tmp_2 = blockMenu_selectedMenuIndex__P33219_mk(s);
+    s.callLocIdx = 257; s.pc = 139; return s.tmp_2;
   case 139:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -1854,14 +1845,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    s.tmp_3 = game_showLongText__P2521_mk(s);
+    s.tmp_3 = game_showLongText__P31940_mk(s);
     s.tmp_3.arg0 = "Default options set!";
     s.tmp_3.arg1 = 0;
-    s.callLocIdx = 252; s.pc = 140; return s.tmp_3;
+    s.callLocIdx = 258; s.pc = 140; return s.tmp_3;
   case 140:
     r0 = s.retval;
-    globals.user_fish_count___46159 = (31);
-    globals.user_shark_count___46157 = (2);
+    globals.user_fish_count___98177 = (31);
+    globals.user_shark_count___98134 = (2);
   case 22:
   case 23:
   case 24:
@@ -1870,48 +1861,48 @@ switch (step) {
   case 27:
     { step = 5; continue; }
   case 28:
-    s.tmp_0 = fade_in__P46020_mk(s);
-    s.callLocIdx = 253; s.pc = 141; return s.tmp_0;
+    s.tmp_0 = fade_in__P98017_mk(s);
+    s.callLocIdx = 259; s.pc = 141; return s.tmp_0;
   case 141:
     r0 = s.retval;
-    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
-    r0 = pxsim.image.ofBuffer(_hex46368);
+    s.tmp_0 = scene_setBackgroundImage__P31878_mk(s);
+    r0 = pxsim.image.ofBuffer(_hex98641);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 254; s.pc = 142; return s.tmp_0;
+    s.callLocIdx = 260; s.pc = 142; return s.tmp_0;
   case 142:
     r0 = s.retval;
-    globals.loading___45924 = (0);
-    s.tmp_0 = blockSettings_writeNumber__P3749_mk(s);
+    globals.loading___97909 = (0);
+    s.tmp_0 = blockSettings_writeNumber__P33283_mk(s);
     s.tmp_0.arg0 = "fish_count";
-    s.tmp_0.arg1 = globals.user_fish_count___46159;
-    s.callLocIdx = 255; s.pc = 143; return s.tmp_0;
+    s.tmp_0.arg1 = globals.user_fish_count___98177;
+    s.callLocIdx = 261; s.pc = 143; return s.tmp_0;
   case 143:
     r0 = s.retval;
-    s.tmp_0 = blockSettings_writeNumber__P3749_mk(s);
+    s.tmp_0 = blockSettings_writeNumber__P33283_mk(s);
     s.tmp_0.arg0 = "shark_count";
-    s.tmp_0.arg1 = globals.user_shark_count___46157;
-    s.callLocIdx = 256; s.pc = 144; return s.tmp_0;
+    s.tmp_0.arg1 = globals.user_shark_count___98134;
+    s.callLocIdx = 262; s.pc = 144; return s.tmp_0;
   case 144:
     r0 = s.retval;
-    s.tmp_0 = fade_out__P45978_mk(s);
-    s.callLocIdx = 257; s.pc = 145; return s.tmp_0;
+    s.tmp_0 = fade_out__P97963_mk(s);
+    s.callLocIdx = 263; s.pc = 145; return s.tmp_0;
   case 145:
     r0 = s.retval;
-    s.tmp_0 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 258; s.pc = 146; return s.tmp_0;
+    s.tmp_0 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 264; s.pc = 146; return s.tmp_0;
   case 146:
     r0 = s.retval;
-    globals.loading_start_time___46376 = (r0);
-    s.tmp_0 = initilize_map__P46079_mk(s);
-    s.callLocIdx = 259; s.pc = 147; return s.tmp_0;
+    globals.loading_start_time___98649 = (r0);
+    s.tmp_0 = initilize_map__P98095_mk(s);
+    s.callLocIdx = 265; s.pc = 147; return s.tmp_0;
   case 147:
     r0 = s.retval;
-    s.tmp_6 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 260; s.pc = 148; return s.tmp_6;
+    s.tmp_6 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 266; s.pc = 148; return s.tmp_6;
   case 148:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - globals.loading_start_time___46376);
+    r0 = (s.tmp_5 - globals.loading_start_time___98649);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 / 1000);
     s.tmp_3 = r0;
@@ -1936,60 +1927,60 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, " seconds");
-    globals.message___45955 = (r0);
-    s.tmp_0 = fade_in__P46020_mk(s);
-    s.callLocIdx = 261; s.pc = 151; return s.tmp_0;
+    globals.message___97940 = (r0);
+    s.tmp_0 = fade_in__P98017_mk(s);
+    s.callLocIdx = 267; s.pc = 151; return s.tmp_0;
   case 151:
     r0 = s.retval;
-    globals.loading___45924 = (-1);
-    s.tmp_0 = create_minimap__P46082_mk(s);
-    s.callLocIdx = 262; s.pc = 152; return s.tmp_0;
+    globals.loading___97909 = (-1);
+    s.tmp_0 = create_minimap__P98351_mk(s);
+    s.callLocIdx = 268; s.pc = 152; return s.tmp_0;
   case 152:
     r0 = s.retval;
-    s.tmp_0 = start_game__P46078_mk(s);
-    s.callLocIdx = 263; s.pc = 153; return s.tmp_0;
+    s.tmp_0 = start_game__P98078_mk(s);
+    s.callLocIdx = 269; s.pc = 153; return s.tmp_0;
   case 153:
     r0 = s.retval;
-    s.tmp_0 = fade_out__P45978_mk(s);
-    s.callLocIdx = 264; s.pc = 154; return s.tmp_0;
+    s.tmp_0 = fade_out__P97963_mk(s);
+    s.callLocIdx = 270; s.pc = 154; return s.tmp_0;
   case 154:
     r0 = s.retval;
-    s.tmp_0 = forever__P1847_mk(s);
-    s.tmp_0.arg0 = inline__P46402;
-    s.callLocIdx = 270; s.pc = 155; return s.tmp_0;
+    s.tmp_0 = forever__P31266_mk(s);
+    s.tmp_0.arg0 = inline__P98675;
+    s.callLocIdx = 273; s.pc = 155; return s.tmp_0;
   case 155:
     r0 = s.retval;
-    s.tmp_0 = forever__P1847_mk(s);
-    s.tmp_0.arg0 = inline__P46414;
-    s.callLocIdx = 273; s.pc = 156; return s.tmp_0;
+    s.tmp_0 = forever__P31266_mk(s);
+    s.tmp_0.arg0 = inline__P98680;
+    s.callLocIdx = 279; s.pc = 156; return s.tmp_0;
   case 156:
     r0 = s.retval;
-    s.tmp_0 = forever__P1847_mk(s);
-    s.tmp_0.arg0 = inline__P46419;
-    s.callLocIdx = 279; s.pc = 157; return s.tmp_0;
+    s.tmp_0 = forever__P31266_mk(s);
+    s.tmp_0.arg0 = inline__P98692;
+    s.callLocIdx = 285; s.pc = 157; return s.tmp_0;
   case 157:
     r0 = s.retval;
-    s.tmp_0 = forever__P1847_mk(s);
-    s.tmp_0.arg0 = inline__P46430;
-    s.callLocIdx = 298; s.pc = 158; return s.tmp_0;
+    s.tmp_0 = forever__P31266_mk(s);
+    s.tmp_0.arg0 = inline__P98703;
+    s.callLocIdx = 304; s.pc = 158; return s.tmp_0;
   case 158:
     r0 = s.retval;
-    s.tmp_0 = forever__P1847_mk(s);
-    s.tmp_0.arg0 = inline__P46483;
-    s.callLocIdx = 311; s.pc = 159; return s.tmp_0;
+    s.tmp_0 = forever__P31266_mk(s);
+    s.tmp_0.arg0 = inline__P98756;
+    s.callLocIdx = 317; s.pc = 159; return s.tmp_0;
   case 159:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P47772.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/Timers/main.ts","functionName":"<main>","argumentNames":[]}
-_main___P47772.continuations = [ 103,104,105,106,107,112,113,114,116,117,118,120,121,122,130,131,137,138,149,150 ]
+_main___P99099.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/Timers/main.ts","functionName":"<main>","argumentNames":[]}
+_main___P99099.continuations = [ 103,104,105,106,107,112,113,114,116,117,118,120,121,122,130,131,137,138,149,150 ]
 
-function _main___P47772_mk(s) {
+function _main___P99099_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P47772, depth: s.depth + 1,
+        parent: s, fn: _main___P99099, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2005,57 +1996,57 @@ function _main___P47772_mk(s) {
   tmp_11: undefined,
 } }
 
-const _hex4058 = pxsim.BufferMethods.createBufferFromHex("1f00210023002500270029002c002e003100340037003a003e004100450049004e00520057005c00620068006e0075007b0083008b0093009c00a500af00b900c400d000dc00e900f70006011501260137014a015d01720188019f01b801d201ee010b022a024b026e029302ba02e40210033f037003a403dc03170455049704dd0427057505c80520067d06e0064907b8072d08a9082d09b9094d0aea0a900b400cfa0cc00d910e6f0f5a1053115b1272139a14d41520178018f519801b231dde1e")
-const _hex8834 = pxsim.BufferMethods.createBufferFromHex("2000000000000000210000005e0000002200000e000e0000230028fe28fe280024004c92ff926400250002651248a64026006c92926ca000270000000e000000280000007c82000029000000827c00002a005438103854002b0010107c1010002c000000907000002d001010101010002e000000606000002f000060100806003000003c42423c00310000447e4000003200004462524c00330000424a4e320034003028247e20003500004e4a4a32003600003c4a4a30003700000262120e00380000344a4a34003900000c52523c003a0000006c6c00003b000000967600003c001028284444003d002828282828003e004444282810003f0000025909060040003c425a560800410078141214780042007e4a4a4a34004300003c424224004400007e42423c004500007e4a4a42004600007e0a0a02004700003c425234004800007e08087e00490000427e4200004a002040423e02004b00007e081462004c00007e404040004d007e0418047e004e00007e04087e004f003c4242423c005000007e12120c005100003c5262bc005200007e12126c00530000244a522400540002027e0202005500003e40403e005600001e70701e0057007e2018207e00580042241824420059000608700806005a000062524a46005b00007e424200005c000006081060005d000042427e00005e000804020408005f00808080808000600000000204000061000030484878006200007e4848300063000030484848006400003048487e006500003068585000660000107c12040067000018a4a478006800007e08087000690000487a4000006a000040847d00006b00007e102840006c0000427e4000006d007808300870006e000078080870006f00003048483000700000fc24241800710000182424fc0072000078100810007300005058682800740000083e48200075000038404078007600001860601800770038403040380078000048303048007900005ca0a07c007a000048685848007b000008364100007c000000fe0000007d000041360800007e00000804080400a000000000000000a10000007a000000a200003048fc4800a30090fc92928400a400542844285400a5002a2c782c2a00a6000000ee000000a7000094aaaa5200a800000200020000a9003e414955413eaa0000242a2e0000ab00102854284400ac00001010107000ad00001010101000ae003e415d45413eaf00000202020200b000000814140800b1008888be888800b2000024322c0000b30000222a140000b400000004020000b50000f840207800b6000c1e7e027e00b700000010000000b800000080400000b90000243e200000ba0000242a240000bb00442854281000bc00025f70f84000bd00021f90c8b000be0011557af84000bf000030484d2000c000601916186000c100601816196000c200601a151a6000c300601a151a6100c400601914196000c500601a151a6000c6007c0a7e4a4200c700001ea1611200c800007c55564400c900007c56554400ca00007c56554600cb00007c55544500cc0000457e440000cd0000447e450000ce0000467d460000cf0000457c450000d000087e4a423c00d100007e09127d00d200003845463800d300003846453800d400003846453a00d500003a45463900d600003845443900d700442810284400d80000fc724e3f00d900003c41423c00da00003c42413c00db00003c42413e00dc00003c41403d00dd00040872090400de00007e24241800df00007c025a2400e0000030494a7800e10000304a497800e20000304a497a00e3000032494a7900e40000304a487a00e50000304a4d7a00e600304878685000e7000018a4642400e8000030695a5000e90000306a595000ea0000306a595200eb0000306a585200ec0000497a400000ed0000487a410000ee00004a79420000ef00004a78420000f00000304a4b3d00f100007a090a7100f2000030494a3000f30000304a493000f40000304a493200f5000032494a3100f60000304a483200f700101054101000f800007068583800f900003841427800fa00003842417800fb00003842417a00fc00003842407a00fd0000b84241f800fe0000ff24241800ff00005ca1a07d000001601915196000010100304a4a7a000201611a16196000030100314a4a790004013c0a094abc00050100182464bc000601003846452800070100304a4948000801003846452a00090100304a494a000a010038444528000b010030484a48000c010038454629000d010030494a49000e01007c454639000f0100314a497e001001087e4a423c00110130484c7e04001201007d55554500130100326a5a52001401007d56564500150100316a5a51001601007c55544400170100306a5850001801003f65a521001901001874ac28001a01007c555645001b010030695a51001c010038465536001d0100304a49f2001e010039465635001f0100314a4af100200100384455340021010018a4a578002201001ea1691a0023010018a6a578002401007812117a0025017e080a7102002601047e147e04002701047e0c08700028010002457e450029010002497a41002a0100457d4500002b01004a7a4200002c0100014a7a49002d0100014a7a41002e0100217fa100002f0100247da00000300100447d440000310100487840000032017e0022423e0033013d0040847d0034012040463d0600350100800af90200360100bf440a3100370100bf4814200038010078102848003901007c404241003a0100467d4000003b01003fa06020003c0100a17f2000003d01007c414241003e0100457e4100003f01007e40484000400100427e4008004101107e48404000420100527e4800004301007c0a117c00440100780a097000450100bf42043f00460100bc440438004701007c09127d00480100790a09700049010a06780870004a01003f02847f004b01003c048478004c013945454539004d0100324a4a32004e013946464639004f0100314a4a310050013a4544463900510132494832010052013c427e4a420053013048306850005401007c163548005501007812091000560100bf49093600570100bc480408005801007d1635480059010079120910005a010048565524005b0100505a6928005c010048565526005d0100505a692a005e010012a56912005f010028ac741400600100485556250061010050596a290062010101bf410100630100049f641000640104057e050400650100083d4a2100660102127e120200670100183e5820006801003a414239006901003a414279006a01003d41413d006b01003a42427a006c010039424239006d010039424279006e01003a45453a006f01003a45457a0070013a41403a010071013a41407a01007201001f60a01f007301001c60a03c00740178221122780075013842314238007601081261120800770100b84241fa00780104097009040079010064564d44007a0100486a5948007b010064544d44007c010048685a48007d010064554e45007e010048695a49007f0100087c0204008f01003452523c00920100887e090200a0013c42423c0806a101003048483008af01003e403e0806b001003840781008b501006a5a4a4e00b601005878585800d101003845463900d2010030494a3100e601003845563500e7010030494af100fa0100742a750000fb0100304c4a7d00fc0178147e554400fd0130487a695000fe010078744e3d00ff0100706a59380018020012a569120019020028ac7414001a020101bf4101001b0200049f641000bb0200000c0a0000bc0200000a060000bd020000060a0000c602000201020000c702000102010000c902000202020000d802000102020100d902000002000000da02000205020000db02000040800000dc02000201020100dd02020100020100740300000201000075030000804000007a030000c08000007e03000096760000840300000300000085030200030002008603037c12127c008703000010000000880303007e4a4200890303007e087e008a030300427e42008c03033c42423c008e0303000e700e008f03035c62625c00900302003b400200910378141214780092037e4a4a4a34009303007e0202020094036058465860009503007e4a4a420096030062524a46009703007e08087e0098033c4a4a4a3c00990300427e4200009a03007e081462009b036018061860009c037e0418047e009d03007e04087e009e0300424a4a42009f033c4242423c00a003007e02027e00a103007e12120c00a30300665a424200a40302027e020200a503060870080600a60318247e241800a703422418244200a8030e107e100e00a9035c6202625c00aa0300457c450000ab03040970090400ac030030484a7900ad030030685a5100ae0378100a09f000af03003a41200000b0033a4043403a00b103003048487800b20300fe25251a00b3030c30c0300c00b403344a4a4a3000b503003068585000b603021aa6a24200b7033c080404f800b803003c4a4a3c00b903003840200000ba03007820504800bb03641212227c00bc03fc2020103c00bd03182040201800be03112d2ba94100bf03003048483000c003087808780800c103f82424241800c2031824a4a44800c303304848582800c403000838482800c503384040403800c6031c20f8241800c703c4281028c400c8031c20fc201c00c903304820483000ca03000238422000cb03384240423800cc0330484a493000cd03384042413800ce03304822493000d0033c52525c2000d10310344a3c0800d203067804020400d303120a7c020400d4030d7009040800d5031824ff241800d603384828483800d70348302221d800da031c2221a14200db031824a4a44200dc037e1212020200dd0300fc24240400de033e2010087c00df030c0ac9281800e003700c621c7000e10301092516f800e2039ea0bea07e00e30398a0b8a07800e4030c1214107e00e503001028207800e603be9088887000e70348544e443800e803245252524c00e903285454544800ea0364524c526400eb03086458640800ec03385454542200ed03306848682400ee03184a7e4a1800ef031848ff0a0800f003483020205800f10378a4a4a49800f203304848485000f303006080847d00f4033c4a4a4a3c00f5030030585848000004007c555644000104007c55544500020401013f8579000304007c0605040004043c4a4a422400050400244a522400060400427e420000070400457c45000008042040423e020009047c027e4830000a047e087e4830000b0402027e0a72000c04007c102a45000d047c2112087c000e040c5152523d000f043f20e0203f00100478141214780011047e4a4a4a300012047e4a4a4a34001304007e020202001404c07c427ec0001504007e4a4a4200160476087e087600170424424a4a34001804007e08047e001904007d120a7d001a04007e081462001b04403c02027e001c047e0418047e001d04007e08087e001e043c4242423c001f047e0202027e002004007e12120c002104003c42422400220402027e02020023040e5050503e00240418247e241800250442241824420026043f2020bf600027040e1010107e0028047e407e407e0029043f203fa07f002a04027e484830002b047e4848307e002c04007e484830002d0424424a4a3c002e047e183c423c002f04006c12127e0030043048487840003104003c4a4a3100320400786850200033040078080808003404c0704878c000350430686850000036044830783048003704004058683000380478402010780039047942221279003a040078203048003b044030080878003c047810201078003d047810101078003e043048484830003f047808080878004004fc24242418004104304848485000420408087808080043041ca0a0a07c0044041824ff241800450400483030480046043c2020bc60004704182020207800480478407840780049043c203ca07c004a040878505020004b047850502078004c040078505020004d044858683000004e047830304830004f0450282878000050040030696a500051040032686a50005204023f0a887000530400780a09080054040030685848005504005058682800560400487a4000005704004a784200005804004080847d0059047008785020005a047810785020005b04047e141060005c040078223148005d047841221078005e0418a1a2a279005f043c20e0203c006204027f4a4830006304087e5850200070040e107e100e00710418207820180072043c4a4a4a3c0073043068586830007404001e70180c0075040018603010009004007e020203009104007808080c009204087e0a0a0200930420782808080096043b043f043be0970424183c1824c09a04003f040a31c09b04003c101824c0ae04060870080600af040c10e0100c00b004161870181600b1042c30e0302c00b20421120c1221c0b3040024181824c0ba047e0808087000bb04007e08087000d804003452523c00d904002868583000e20400457d450000e304004a7a420000e8043c4a4a4a3c00e904003058583000ee04003d41413d00ef04003a42427a00d005681020285000d105484848784000d205004830600000d305080808780800d405680808087800d505000008780000d605080818680800d705087808087800d805784050487800d905000008180000da0504040404fc00db05484848483800dc050e4848281800dd05087848487800de05582010487000df05000004fc0000e005004040487800e105000878483800e205487840281800e305041c0404fc00e405485848483800e50504f820140800e605485060685000e705f40424241c00e805080808087000e905785058403800ea05487808087800f005087800087800f105081800087800f205081800081800f305000010080000f405100800100800021e7c5455542800031e007e484930000a1e007c454438000b1e003049487e001e1e007c151404001f1e001079140800401e7e0419047e00411e780832087000561e007c15140800571e00fc25241800601e004854552400611e0050586a28006a1e04047d0404006b1e00083d482000801e7c2112207c00811e384132403800821e7c2012217c00831e384032413800841e7c2110217c00851e384230423800f21e040972080400f31e00b84142f800a3207e0a7a120a00a420a8fcaa828400a720087e2a1c0800ab200098a4a6bf02ac20183c5a5a4200af20627f224438009021103854101000912108047e0408009221101054381000932110207e201000942110381010381095212844fe442800")
-const _hex9177 = pxsim.BufferMethods.createBufferFromHex("20000000000000000000000000000000000000000000000000002100000000000006fc0000000000000000000000000000000000220000001c00000000001c0000000000000000000000000000002300a000f807a000f807a00000000000000000000000000000002400000018022404460c8803000000000000000000000000000025003802c4017800200390040803000000000000000000000000260080037804a4041803800340040000000000000000000000002700000000001c00000000000000000000000000000000000000280000000000f8010606010800000000000000000000000000002900000001080606f801000000000000000000000000000000002a00040014000e001400040000000000000000000000000000002b0040004000f8034000400000000000000000000000000000002c000000000000090006000000000000000000000000000000002d000000800080008000000000000000000000000000000000002e000000000000060000000000000000000000000000000000002f00000c800360001c000300000000000000000000000000000030000000f80304040404f80300000000000000000000000000003100000004040404fc07000400040000000000000000000000003200000008060405c4043804000000000000000000000000000033000000080244044404b803000000000000000000000000000034000000800170010801fc070001000000000000000000000000350000023c0424042404c403000000000000000000000000000036000000f0034804440488030000000000000000000000000000370000000400c40734000c00000000000000000000000000000038000000b80344044404b803000000000000000000000000000039000000780284048802f00100000000000000000000000000003a000000000030060000000000000000000000000000000000003b000000000018090006000000000000000000000000000000003c004000a000a000a000100100000000000000000000000000003d002001200120012001200100000000000000000000000000003e0000001001a000a000a00040000000000000000000000000003f000000080084066400180000000000000000000000000000004000f0030c04c20822092409f80900000000000000000000000041000007f8008400f8000007000000000000000000000000000042000000fc0744044404b803000000000000000000000000000043000000f001080204040404080200000000000000000000000044000000fc0704040802f001000000000000000000000000000045000000fc07440444044404000000000000000000000000000046000000fc07440044004400000000000000000000000000000047000000f00108024404c803000000000000000000000000000048000000fc0740004000fc070000000000000000000000000000490000000404fc070404040400000000000000000000000000004a000000000200040004fc0300000000000000000000000000004b000000fc074000f0000c0304040000000000000000000000004c000000fc0700040004000400000000000000000000000000004d000000fc0738007000fc0700000000000000000000000000004e000000fc073800c003fc0700000000000000000000000000004f000000f80304040404f803000000000000000000000000000050000000fc07840084004400780000000000000000000000000051000000fc0102020206fc09000000000000000000000000000052000000fc074400c4013806000000000000000000000000000053000000180224044404880300000000000000000000000000005400000004000400fc070400040000000000000000000000000055000000fc0300040004fc03000000000000000000000000000056000c00f0030004f0030c00000000000000000000000000000057007c008007e001f0010007fc0000000000000000000000000058000404b8034000b80304040000000000000000000000000000590004003800c00730000c0000000000000000000000000000005a0004040407e4041c04040400000000000000000000000000005b0000000000ff0f0108010800000000000000000000000000005c0003001c0060008003000c00000000000000000000000000005d00000001080108ff0f000000000000000000000000000000005e004000380004003800400000000000000000000000000000005f00000800080008000800080000000000000000000000000000600000000000020004000000000000000000000000000000000061000000200390049004e007000000000000000000000000000062000000fc0710041004e003000000000000000000000000000063000000c001200210043004000200000000000000000000000064000000e00310041004fc07000000000000000000000000000065000000e00390049004e0040000000000000000000000000000660000001000f80714001400000000000000000000000000000067000000b806440944093c09040600000000000000000000000068000000fc0710001000e0070000000000000000000000000000690000000000f4070000000000000000000000000000000000006a00000800080008fd07000000000000000000000000000000006b000000fe078000e001100610040000000000000000000000006c0000000000fc030004000400000000000000000000000000006d00f00710001000e0071000e0070000000000000000000000006e000000f00710001000e00700000000000000000000000000006f000000e00310041004e003000000000000000000000000000070000000fc0f04010401f800000000000000000000000000000071000000f80004010401fc0f000000000000000000000000000072000000f00720001000100000000000000000000000000000007300000060029004900420030000000000000000000000000000740000001000fc0310041004000000000000000000000000000075000000f00300040004f007000000000000000000000000000076003000c0030004c003300000000000000000000000000000007700f0000007e003c0010007f000000000000000000000000000780010046003800060031004000000000000000000000000000079000c0870088007f0000c0000000000000000000000000000007a000000000410079004700410040000000000000000000000007b0000004000be070108010800000000000000000000000000007c0000000000ff0f0000000000000000000000000000000000007d00000001080108be07400000000000000000000000000000007e00800040004000800080004000000000000000000000000000")
-const _hex21798 = pxsim.BufferMethods.createBufferFromHex("20000000000000002100001700000000220000030003000023000a1f0a1f0a0024000a17151d0a00250013090412190026000a15150a100027000003000000002800000e11000000290000110e0000002a00000a040a00002b0000040e0400002c000010080000002d000004040400002e000008000000002f0010080402010030000e11110e0000310000121f100000320019151512000033000911150b000034000c0a091f080035001715151509003600081416150800370011090503010038000a1515150a00390002150d0502003a00000a000000003b0000100a0000003c0000040a1100003d00000a0a0a00003e0000110a0400003f0002011505020040000e1115090e0041001e05051e000042001f15150a000043000e111111000044001f11110e000045001f151511000046001f050501000047000e1111150c0048001f04041f00004900111f110000004a000911110f01004b001f040a1100004c001f10101000004d001f0204021f004e001f0204081f004f000e11110e000050001f0505020000510006091916000052001f05050a10005300121515090000540001011f01010055000f10100f0000560007081008070057001f0804081f0058001b04041b0000590001021c0201005a001915131100005b00001f111100005c000102040810005d000011111f00005e000002010200005f00101010101000600000010200000061000c12121e100062001f141408000063000c121212000064000814141f000065000e15151200006600041e0501000067000215150f000068001f04041800006900001d000000006a000010100d00006b001f040a1000006c00000f101000006d001e0204021e006e001e02021c00006f000c12120c000070001e0a0a0400007100040a0a1e000072001c0202020000730010140a0200007400000f1414100075000e10101e1000760006081008060077001e1008101e007800120c0c12000079001214080402007a00121a161200007b0000041f1100007c00001f000000007d00111f040000007e00000404080800d3000c1213130c00f3000c12130d000004010e05051e100005010609191f080006010c121313120007010c121313000018010f0b1b19000019010e151d1a000041011f14121000004201100f1412000043011f0205081f0044011e03031c00005a0110140b0302005b0110140b0300007901121a171300007a01121a171300007b01121b171200007c01121b17120000")
-const _hex4121 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
-const _hex4622 = pxsim.BufferMethods.createBufferFromHex("8704240024000000001111111111111111111111111111111100000010313333333333333333333333333333130100001113111111111111111111111111111131110000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000111311111111111111111111111111113111000010313333333333333333333333333333130100000011111111111111111111111111111111000000")
-const _hex4624 = pxsim.BufferMethods.createBufferFromHex("8704240024000000002222222222222222222222222222222200000020323333333333333333333333333333230200002223222222222222222222222222222232220000322211111111111111111111111111112223000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003222111111111111111111111111111122230000222322222222222222222222222222223222000020323333333333333333333333333333230200000022222222222222222222222222222222000000")
-const _hex4626 = pxsim.BufferMethods.createBufferFromHex("8704240024000000004444444444444444444444444444444400000040343333333333333333333333333333430400004443444444444444444444444444444434440000344411111111111111111111111111114443000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003444111111111111111111111111111144430000444344444444444444444444444444443444000040343333333333333333333333333333430400000044444444444444444444444444444444000000")
-const _hex4628 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d00000000000000000000000070666607000000000000000000000000006776000000000000000000000000660700007066000000000000000000006766777766760000000000000000000060666666660600000000000000000066006766667600660000000000000000667600000000676600000000000000006766767777676676000000000000000060666666666666060000000000000000006766666666760000000000000000000000676666760000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex4630 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0bb000000000000000000000000b000404500b0000000000000000000005b0b000400540b0000000000000000b0550400000054b5000000000000000000440040bb0040040000000000000000000040d4ddbb0000000000000000000000004055ddbd000000000000000000004b005455d5dd0b400b000000000000005b045411d5dd0b540b000000000000004b005411d5dd0b400b0000000000000000004055ddbd00000000000000000000000040d4ddbb0000000000000000000000440040bb0040040000000000000000b0550400000054b50000000000000000005b04000400540b000000000000000000b000404500b0000000000000000000000000b0bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex4632 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020020000000000002002000000000000202200000000000022020000000000000022020000000020220000000000000000202200000000220200000000000000000022020000202200000000000000000000202200002202000000000000000000000022022022000000000000000000000000202222020000000000000000000000000022220000000000000000000000000000222200000000000000000000000000202222020000000000000000000000002202202200000000000000000000002022000022020000000000000000000022020000202200000000000000000020220000000022020000000000000000220200000000202200000000000000202200000000000022020000000000002002000000000000200200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex4634 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d0000000000000000000000007066660700000000000000000000000000677600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex4636 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0cbcc0c0000000000000000000000b0db55d5cd0c00000000000000000000db555555ddcd000000000000000000b055555555d59d0b0000000000000000db55555555d59db900000000000000005b55555555d5ddb900000000000000b05db5cccc5bdddd990b000000000000b055ccccccccdddd9d0b000000000000b0b5ccccccccdbdd9d0b000000000000b0c5ccccccccdcdd9d0b000000000000b0c5ccdccbccdcdd9d0c000000000000b0cdcc5b55ccdcdd9d0c00000000000000ccdc55b5ccdcddc90000000000000000cccc5b55ccdbddc90000000000000000c0ccdccbccdd9d0c000000000000000000ccccccdbddcd00000000000000000000c0dcddddcd0c0000000000000000000000c0cccc0c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex4638 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc00000000000000b0bbbbbbbbcb00c0cd000000000000001bddddddddbd0c1ccd000000000000b011cbccccccbc0c1ccd000000000000b01d6c666666bc0cbccd000000000000b01d6c616661bc0c1ccd000000000000b01d6c161666bccc1bcd000000000000b01d6c666166bcccbbcd000000000000b01d6c666666bccc1bcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666661bcccbbcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666666bc0c1ccd000000000000b01dcbccccccbc0cbccd000000000000c0b1bbbbbbbbbb0cdccb000000000000c0bbbbbbbbbbcb00dc0c00000000000000cccccccccc0c00cc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex4640 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004004000000000000000000000000000054450000000000000000000000440b00bbbb00b0440000000000000040550b00000000b0550400000000000040b5000044bb00005b04000000000000b00b0044ddddbb00b00b0000000000000000405d55d5dd0b00000000000000000000d4555555ddbd0000000000000000000054555555d5bd0000000000000000b44055555555d5dd0b4b000000000040b54055555555d5dd0b5b040000000040b54055555555d5dd0b5b040000000000b44055115555d5dd0b4b000000000000000054115555d5bd00000000000000000000d4555555ddbd00000000000000000000405d55d5dd0b0000000000000000b00b0044ddddbb00b00b00000000000040b5000044bb00005b0400000000000040550b00000000b0550400000000000000440b00bbbb00b0440000000000000000000000544500000000000000000000000000004004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex4642 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bbbb00000000000000000000000000b055bb00bbbbbb000000000000000000b0b5bdbcbbbbddcb0000000000000000b0dbcb5b5555bbdd0c00000000000000b0cbdcbdbb5b55dbcd0000000000000000c0dddb11d15bb5bd0c00000000000000bbbd111111b155bb0c00000000000000db1b111111115bb5cb00000000000000db1bb11d1199b9d5cb00000000000000db1b11bb9199b955cb000000000000005b1b11b19b99995bcb000000000000005b1d1111bb99995ccb00000000000000b0b511bbbb99995ccb00000000000000b0d51d919999d95b0b00000000000000005bdb919999c9d50b0000000000000000b0d51b99d9bcb5000000000000000000005bd5bbbc550b00000000000000000000b05b5555bd000000000000000000000000b0bbbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex5177 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
-const _hex5179 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
-const _hex5181 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
-const _hex5185 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
-const _hex5187 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
-const _hex5493 = pxsim.BufferMethods.createBufferFromHex("8704100010000000d3dd1ddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dd1d3d3dd3bdbbd3dddddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dddd3d3dd3bdbb")
-const _hex5823 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c689696999999998c689696999999998c886696999999998c866696999999998c866699999999998c666699999999998c686699999999998c689696999999998c689696999999998c669696999999998c669699999999998c866699999999998c866699999999998c886699999999998c889699999999998c68969999999999")
-const _hex6039 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
-const _hex6061 = pxsim.BufferMethods.createBufferFromHex("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex6278 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex6282 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999bbcccc99999999bbddddbbcc9999b9ddddddbdcb9999dbddbbddbdcb99b9dbbd33ddddbb99b9ddbd33ddddbb993cb33b33dbbdbb993c3333333b33bb99bc3d33333333bc99bcd3333333cbbb99bc3b3333c3bbbb99c9333333bcbbcb99c933d333bcbbcc993933cc3db3cbcc9999c9bb3bb3ddcb999999ccccdbddbd")
-const _hex6286 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999c9ddddbd99999999c9ddddbd99999999b9ddddbc9999999999dbcdbb9999999999ccbccb9999999999c9bccc999999999999cccc999999999999c9cc99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
-const _hex6290 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999c9cccc99999999ccbccccc999999ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb9dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb9ccccdcddcdcdcc9999ccccddcbcbcc999999c9cccccccc")
-const _hex6294 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999996688889988999969557777986898995667667687898688675777677699686676658877679989765588686688999969866666869999999999888898999999999999999999999999999999999999999999999999999999999999999999")
-const _hex6298 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999998888889999999988577577889999897777556677989978778888776687896688999988776689869999999968666898999999998988689899999999687788999999998977679999999999788668999999998987989999999999899899999999999999999999")
-const _hex6302 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988889999999999887777889999998966666677989999688688767687998966989968676799898899888867769999998988887666989999688888787786888886886886766866668886668888676866667887668876658868777686996757757766779899787566667787999989567577879899999969868898999999")
-const _hex6306 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988c8cccc99999988ccbccccc999989ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb8dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb8ccccdcddcdcdcc8956ccccddcbcbcc996986c8cccccccc")
-const _hex6310 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999889999999999999968989999999999998986999999999999996888999999896899896688888868779999886666767777999999886666668699999999888888989999999999999999999999999999999999999999999999999999999999999999")
-const _hex6314 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999898888999999996868666699999968778688889999897786686676996976666666888899566577868899996655768798999988776655969999887766556699998977667766999999786667669999998867679899999988688698999999999999999999999999999999999999999999999999999999999999999999")
-const _hex6318 = pxsim.BufferMethods.createBufferFromHex("87041000100000008888999999999999777786989999999968667787989999997767667786999999687767667798999988687766768799997766787766779899666686766776879987886668776677889899688878676677899689888877676689679988786677879978665567886686998977668866669899997857756688999999896866889999")
-const _hex6322 = pxsim.BufferMethods.createBufferFromHex("870410001000000088889999bbcccc99777786bbddddbbcc6866b7ddddddbdcb7767dbddbbddbdcb68b7dbbd33ddddbb88b8ddbd33ddddbb773cb33b33dbbdbb663c3333333b33bb87bc3d33333333bc08bcd3333333cbbb89bc3b3333c3bbbb89c7333333bcbbcb99c833d333bcbbcc993933cc3db3cbcc9999c8bb3bb3ddcb999989ccccdbddbd")
-const _hex6326 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff11111111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
-const _hex6330 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c68f6f61111ffff8c68f6f61111ffff8c8866f61111ffff8c8666f61111ffff8c866611ffff11118c666611ffff11118c686611ffff11118c681616ffff11118c68f6f61111ffff8c66f6f61111ffff8c66f6ff1111ffff8c8666ff1111ffff8c866611ffff11118c886611ffff11118c881611ffff11118c681611ffff1111")
-const _hex6334 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999889898888999989898989899999998999989998889999999999999999999989999989999999998988888988889999899999899999999999999999999999999988889999999999898999999999999999888899999999999999999999999999999999999999999999999999999999999999999999999999")
-const _hex6338 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
-const _hex6342 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff818888ff1111ffff81818fff1111ffff81818fff1111ffffffff1111ffff11118f888811ffff1111fff81111ffff1111ff8f1111ffff1111818888ff1111ffff1111ffff1111ffff818888ff1111ffff81118fff1111ffffff881811ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
-const _hex46182 = pxsim.BufferMethods.createBufferFromHex("8704a0007800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666666666060066666666666666060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086886666666686880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080880080880000000080880000000080880080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066060000000066060066666666666666060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086886666666686880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086880000000086880000000086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086880000000086880000000086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880080886666660086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888808608888880086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888808608888880086880000000086880000000000000000000000000000000000000000000000000000000000000000000080880000000080880080888808008888880080880000000080880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666060066060066666666666666060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880086880086880086880000000086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086880086880086880000000086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086880086880086886666666686880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086888888880086888888888888880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086888888880086888888888888880086880086880086880000000000000000000000000000000000000000000000000000000000000000000080880080888888880080888888888888880080880080880080880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666666666060066666666060066060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080888888888888880086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000000000066666686886666060086880086880086880086886686886666060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080888888888888880080880080888888880080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666060000000066666666060066060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888880000000086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888880000000086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080888888886666060086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000086888888880086880086880086880000608808000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880086880086880086880000608808000000000000000000000000000000000000000000000000000000000000000000000000000066666686888888880086880086880086880000008868660000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000086880086888888880000000086880000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000086880086888888880000000086880000000000000000000000000000000000000000000000000000000000000000000000000080888888880000000080880080888888880066666686886666060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666666666060066666666666666060066666666060066060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888880086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888880086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880080888888888888880080888888880080880000000000000000000000000000000000000000000000000000000000000000000086880086880000000000608808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880086880000000000608808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880086880000000000008868660000000080888800008088880000000000000000000000000000000000000000000000000000000000000000000086880086880000000000000086880000000000000000008080800000000000000000000000000000000000000000000000000000000000000000000086880086880000000000000086880000000000008000000008080000000000000000000000000000000000000000000000000000000000000000000080880080880000000000606686880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000608808000000000080808800008088000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000608808000000000080808000000080880000000000000000000000000000000000000000000000000000000000000000000066060000000066060066668868666666060080888000008088000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880000008000000000000000000000000000000000000000000000000000000000000000000000000000000086886666666686880080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000080888800008088880000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000080808000000000800000000000000000000000000000000000000000000000000000000000000000000086888888888888880066666666060000000080888800008088880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888880000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000080880000000080880080888888886666060000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000008088880000000000000000000000000000000000000000000000000000000000000000000066666666060066060066666686888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888880000000000000000008088800000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888880000000000000000008080800000000000000000000000000000000000000000000000000000000000000000000086888888880086880080888888880000000000000000008080880000000000000000000000000000000000000000000000000000000000000000000086880086880086880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880086880086880000000000000000000000000000008000800000000000000000000000000000000000000000000000000000000000000000000086880086880086880000000000000000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000086880086888888880000000000000000cc000000ff00008000800000000000000000000000000000000000000000000000000000000000000000000086880086888888880000000000000000bc0c00fffb00000000000000000000000000000000000000000000000000000000000000000000000000000080880080888888880000000000000000bcccffbcfb00008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dccbccbb0f00008000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dcbdccfb0000008080800000000000000000000000000000000000000000000000000000000000000000000066666666666666060000000000000000c0bdfb0f0000008080880000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000f0cccf000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000cfccbc0c00000080888800000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000f0ccccbccd00000000080000000000000000000000000000000000000000000000000000000000000000000000000000868800000000000000000000cfccccccdd0c00000080000000000000000000000000000000000000000000000000000000000000000000000000000086880000000000000000ff00cfccccccdd0c00008088880000000000000000000000000000000000000000000000000000000000000000000066666686886666060000000000bfffccbbcbccddff00000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000bffbbbccbbccfdfb00008088880000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000bcbfcbbbbbcbbffb00008080800000000000000000000000000000000000000000000000000000000000000000000080888888888888880000000000bcbfbbccbbbbbbfd00008080800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0bbcbbbbbbbdbfb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0bbbbbbbbbbbb0f00008088880000000000000000000000000000000000000000000000000000000000000000000066666666060000000000000000f0fbbfbb1bc1fc0f00008000800000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000bffb1f111111110f00000088080000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000bf1bc1c3cc1c110c00000000000000000000000000000000000000000000000000000000000000000000000000000080888888886666060000000000bf111c3333c1110c00000000800000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000bf11cc333333110c00000000800000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000bf111c3c3313c10000000000800000000000000000000000000000000000000000000000000000000000000000000066666686888888880000000000bf1bccccccccc10000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000bfbbf10f00cc0c0000008088880000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000f0ffff000000000000008080000000000000000000000000000000000000000000000000000000000000000000000080888888880000000000000000000000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fcffff0000000000000080800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c44f40000000000000080088800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccfff40fc00c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0ddcc1111fdbfcd00000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0dd1c4d44d4dccd00000000800080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4d444444c4cd00000000008808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4444ff4f440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc44444cc4440f000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000fc00000000cc4444c4c4440f000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000dc0f000000c044111141440f0000000080888800000000000000000000000000000000000000000000000000000000000000000000000000000000c0dc0f000000c01c444414f40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccddf1000000004c444444fd00000000008000800000000000000000000000000000000000000000000000000000000000000000000000000000cc11dd1d110f0000004c444f440f00000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000bc111111110f000000c04444f400000000000080008000000000000000000000000000000000000000000000000000000000000000000000000000c0b511c11111f1000000004c440f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b51b111111510f000000f0ff0000000000000080888800000000000000000000000000000000000000000000000000000000000000000000000000c0b5bbbb1b115b0f000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000005cb5111111bb5b0f000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000005cb51b11bbbb550f000000000000000000000000808888000000000000000000000000000000000000000000000000000000000000000000000000005c551b1111b1550f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c55ccbcb5ffff0f00000000000000000000000080888800000000000000000000000000000000000000000000000000000000000000000000000000cc550cbbb500000000000000000000000000000080008000000000000000000000000000000000000000000000000000000000000000000000000000c0ccc055c5000000000000000000000000000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000c0cccc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex46186 = pxsim.BufferMethods.createBufferFromHex("0a00080000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000090000000000000000020a0500070004030601010101010101010101")
-const _hex46188 = pxsim.BufferMethods.createBufferFromHex("87040a000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex46368 = pxsim.BufferMethods.createBufferFromHex("8704a00078000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex38371 = pxsim.BufferMethods.createBufferFromHex("2000000000000000210000005e0000002200000e000e0000230028fe28fe280024004c92ff926400250002651248a64026006c92926ca000270000000e000000280000007c82000029000000827c00002a005438103854002b0010107c1010002c000000907000002d001010101010002e000000606000002f000060100806003000003c42423c00310000447e4000003200004462524c00330000424a4e320034003028247e20003500004e4a4a32003600003c4a4a30003700000262120e00380000344a4a34003900000c52523c003a0000006c6c00003b000000967600003c001028284444003d002828282828003e004444282810003f0000025909060040003c425a560800410078141214780042007e4a4a4a34004300003c424224004400007e42423c004500007e4a4a42004600007e0a0a02004700003c425234004800007e08087e00490000427e4200004a002040423e02004b00007e081462004c00007e404040004d007e0418047e004e00007e04087e004f003c4242423c005000007e12120c005100003c5262bc005200007e12126c00530000244a522400540002027e0202005500003e40403e005600001e70701e0057007e2018207e00580042241824420059000608700806005a000062524a46005b00007e424200005c000006081060005d000042427e00005e000804020408005f00808080808000600000000204000061000030484878006200007e4848300063000030484848006400003048487e006500003068585000660000107c12040067000018a4a478006800007e08087000690000487a4000006a000040847d00006b00007e102840006c0000427e4000006d007808300870006e000078080870006f00003048483000700000fc24241800710000182424fc0072000078100810007300005058682800740000083e48200075000038404078007600001860601800770038403040380078000048303048007900005ca0a07c007a000048685848007b000008364100007c000000fe0000007d000041360800007e00000804080400a000000000000000a10000007a000000a200003048fc4800a30090fc92928400a400542844285400a5002a2c782c2a00a6000000ee000000a7000094aaaa5200a800000200020000a9003e414955413eaa0000242a2e0000ab00102854284400ac00001010107000ad00001010101000ae003e415d45413eaf00000202020200b000000814140800b1008888be888800b2000024322c0000b30000222a140000b400000004020000b50000f840207800b6000c1e7e027e00b700000010000000b800000080400000b90000243e200000ba0000242a240000bb00442854281000bc00025f70f84000bd00021f90c8b000be0011557af84000bf000030484d2000c000601916186000c100601816196000c200601a151a6000c300601a151a6100c400601914196000c500601a151a6000c6007c0a7e4a4200c700001ea1611200c800007c55564400c900007c56554400ca00007c56554600cb00007c55544500cc0000457e440000cd0000447e450000ce0000467d460000cf0000457c450000d000087e4a423c00d100007e09127d00d200003845463800d300003846453800d400003846453a00d500003a45463900d600003845443900d700442810284400d80000fc724e3f00d900003c41423c00da00003c42413c00db00003c42413e00dc00003c41403d00dd00040872090400de00007e24241800df00007c025a2400e0000030494a7800e10000304a497800e20000304a497a00e3000032494a7900e40000304a487a00e50000304a4d7a00e600304878685000e7000018a4642400e8000030695a5000e90000306a595000ea0000306a595200eb0000306a585200ec0000497a400000ed0000487a410000ee00004a79420000ef00004a78420000f00000304a4b3d00f100007a090a7100f2000030494a3000f30000304a493000f40000304a493200f5000032494a3100f60000304a483200f700101054101000f800007068583800f900003841427800fa00003842417800fb00003842417a00fc00003842407a00fd0000b84241f800fe0000ff24241800ff00005ca1a07d000001601915196000010100304a4a7a000201611a16196000030100314a4a790004013c0a094abc00050100182464bc000601003846452800070100304a4948000801003846452a00090100304a494a000a010038444528000b010030484a48000c010038454629000d010030494a49000e01007c454639000f0100314a497e001001087e4a423c00110130484c7e04001201007d55554500130100326a5a52001401007d56564500150100316a5a51001601007c55544400170100306a5850001801003f65a521001901001874ac28001a01007c555645001b010030695a51001c010038465536001d0100304a49f2001e010039465635001f0100314a4af100200100384455340021010018a4a578002201001ea1691a0023010018a6a578002401007812117a0025017e080a7102002601047e147e04002701047e0c08700028010002457e450029010002497a41002a0100457d4500002b01004a7a4200002c0100014a7a49002d0100014a7a41002e0100217fa100002f0100247da00000300100447d440000310100487840000032017e0022423e0033013d0040847d0034012040463d0600350100800af90200360100bf440a3100370100bf4814200038010078102848003901007c404241003a0100467d4000003b01003fa06020003c0100a17f2000003d01007c414241003e0100457e4100003f01007e40484000400100427e4008004101107e48404000420100527e4800004301007c0a117c00440100780a097000450100bf42043f00460100bc440438004701007c09127d00480100790a09700049010a06780870004a01003f02847f004b01003c048478004c013945454539004d0100324a4a32004e013946464639004f0100314a4a310050013a4544463900510132494832010052013c427e4a420053013048306850005401007c163548005501007812091000560100bf49093600570100bc480408005801007d1635480059010079120910005a010048565524005b0100505a6928005c010048565526005d0100505a692a005e010012a56912005f010028ac741400600100485556250061010050596a290062010101bf410100630100049f641000640104057e050400650100083d4a2100660102127e120200670100183e5820006801003a414239006901003a414279006a01003d41413d006b01003a42427a006c010039424239006d010039424279006e01003a45453a006f01003a45457a0070013a41403a010071013a41407a01007201001f60a01f007301001c60a03c00740178221122780075013842314238007601081261120800770100b84241fa00780104097009040079010064564d44007a0100486a5948007b010064544d44007c010048685a48007d010064554e45007e010048695a49007f0100087c0204008f01003452523c00920100887e090200a0013c42423c0806a101003048483008af01003e403e0806b001003840781008b501006a5a4a4e00b601005878585800d101003845463900d2010030494a3100e601003845563500e7010030494af100fa0100742a750000fb0100304c4a7d00fc0178147e554400fd0130487a695000fe010078744e3d00ff0100706a59380018020012a569120019020028ac7414001a020101bf4101001b0200049f641000bb0200000c0a0000bc0200000a060000bd020000060a0000c602000201020000c702000102010000c902000202020000d802000102020100d902000002000000da02000205020000db02000040800000dc02000201020100dd02020100020100740300000201000075030000804000007a030000c08000007e03000096760000840300000300000085030200030002008603037c12127c008703000010000000880303007e4a4200890303007e087e008a030300427e42008c03033c42423c008e0303000e700e008f03035c62625c00900302003b400200910378141214780092037e4a4a4a34009303007e0202020094036058465860009503007e4a4a420096030062524a46009703007e08087e0098033c4a4a4a3c00990300427e4200009a03007e081462009b036018061860009c037e0418047e009d03007e04087e009e0300424a4a42009f033c4242423c00a003007e02027e00a103007e12120c00a30300665a424200a40302027e020200a503060870080600a60318247e241800a703422418244200a8030e107e100e00a9035c6202625c00aa0300457c450000ab03040970090400ac030030484a7900ad030030685a5100ae0378100a09f000af03003a41200000b0033a4043403a00b103003048487800b20300fe25251a00b3030c30c0300c00b403344a4a4a3000b503003068585000b603021aa6a24200b7033c080404f800b803003c4a4a3c00b903003840200000ba03007820504800bb03641212227c00bc03fc2020103c00bd03182040201800be03112d2ba94100bf03003048483000c003087808780800c103f82424241800c2031824a4a44800c303304848582800c403000838482800c503384040403800c6031c20f8241800c703c4281028c400c8031c20fc201c00c903304820483000ca03000238422000cb03384240423800cc0330484a493000cd03384042413800ce03304822493000d0033c52525c2000d10310344a3c0800d203067804020400d303120a7c020400d4030d7009040800d5031824ff241800d603384828483800d70348302221d800da031c2221a14200db031824a4a44200dc037e1212020200dd0300fc24240400de033e2010087c00df030c0ac9281800e003700c621c7000e10301092516f800e2039ea0bea07e00e30398a0b8a07800e4030c1214107e00e503001028207800e603be9088887000e70348544e443800e803245252524c00e903285454544800ea0364524c526400eb03086458640800ec03385454542200ed03306848682400ee03184a7e4a1800ef031848ff0a0800f003483020205800f10378a4a4a49800f203304848485000f303006080847d00f4033c4a4a4a3c00f5030030585848000004007c555644000104007c55544500020401013f8579000304007c0605040004043c4a4a422400050400244a522400060400427e420000070400457c45000008042040423e020009047c027e4830000a047e087e4830000b0402027e0a72000c04007c102a45000d047c2112087c000e040c5152523d000f043f20e0203f00100478141214780011047e4a4a4a300012047e4a4a4a34001304007e020202001404c07c427ec0001504007e4a4a4200160476087e087600170424424a4a34001804007e08047e001904007d120a7d001a04007e081462001b04403c02027e001c047e0418047e001d04007e08087e001e043c4242423c001f047e0202027e002004007e12120c002104003c42422400220402027e02020023040e5050503e00240418247e241800250442241824420026043f2020bf600027040e1010107e0028047e407e407e0029043f203fa07f002a04027e484830002b047e4848307e002c04007e484830002d0424424a4a3c002e047e183c423c002f04006c12127e0030043048487840003104003c4a4a3100320400786850200033040078080808003404c0704878c000350430686850000036044830783048003704004058683000380478402010780039047942221279003a040078203048003b044030080878003c047810201078003d047810101078003e043048484830003f047808080878004004fc24242418004104304848485000420408087808080043041ca0a0a07c0044041824ff241800450400483030480046043c2020bc60004704182020207800480478407840780049043c203ca07c004a040878505020004b047850502078004c040078505020004d044858683000004e047830304830004f0450282878000050040030696a500051040032686a50005204023f0a887000530400780a09080054040030685848005504005058682800560400487a4000005704004a784200005804004080847d0059047008785020005a047810785020005b04047e141060005c040078223148005d047841221078005e0418a1a2a279005f043c20e0203c006204027f4a4830006304087e5850200070040e107e100e00710418207820180072043c4a4a4a3c0073043068586830007404001e70180c0075040018603010009004007e020203009104007808080c009204087e0a0a0200930420782808080096043b043f043be0970424183c1824c09a04003f040a31c09b04003c101824c0ae04060870080600af040c10e0100c00b004161870181600b1042c30e0302c00b20421120c1221c0b3040024181824c0ba047e0808087000bb04007e08087000d804003452523c00d904002868583000e20400457d450000e304004a7a420000e8043c4a4a4a3c00e904003058583000ee04003d41413d00ef04003a42427a00d005681020285000d105484848784000d205004830600000d305080808780800d405680808087800d505000008780000d605080818680800d705087808087800d805784050487800d905000008180000da0504040404fc00db05484848483800dc050e4848281800dd05087848487800de05582010487000df05000004fc0000e005004040487800e105000878483800e205487840281800e305041c0404fc00e405485848483800e50504f820140800e605485060685000e705f40424241c00e805080808087000e905785058403800ea05487808087800f005087800087800f105081800087800f205081800081800f305000010080000f405100800100800021e7c5455542800031e007e484930000a1e007c454438000b1e003049487e001e1e007c151404001f1e001079140800401e7e0419047e00411e780832087000561e007c15140800571e00fc25241800601e004854552400611e0050586a28006a1e04047d0404006b1e00083d482000801e7c2112207c00811e384132403800821e7c2012217c00831e384032413800841e7c2110217c00851e384230423800f21e040972080400f31e00b84142f800a3207e0a7a120a00a420a8fcaa828400a720087e2a1c0800ab200098a4a6bf02ac20183c5a5a4200af20627f224438009021103854101000912108047e0408009221101054381000932110207e201000942110381010381095212844fe442800")
+const _hex38714 = pxsim.BufferMethods.createBufferFromHex("20000000000000000000000000000000000000000000000000002100000000000006fc0000000000000000000000000000000000220000001c00000000001c0000000000000000000000000000002300a000f807a000f807a00000000000000000000000000000002400000018022404460c8803000000000000000000000000000025003802c4017800200390040803000000000000000000000000260080037804a4041803800340040000000000000000000000002700000000001c00000000000000000000000000000000000000280000000000f8010606010800000000000000000000000000002900000001080606f801000000000000000000000000000000002a00040014000e001400040000000000000000000000000000002b0040004000f8034000400000000000000000000000000000002c000000000000090006000000000000000000000000000000002d000000800080008000000000000000000000000000000000002e000000000000060000000000000000000000000000000000002f00000c800360001c000300000000000000000000000000000030000000f80304040404f80300000000000000000000000000003100000004040404fc07000400040000000000000000000000003200000008060405c4043804000000000000000000000000000033000000080244044404b803000000000000000000000000000034000000800170010801fc070001000000000000000000000000350000023c0424042404c403000000000000000000000000000036000000f0034804440488030000000000000000000000000000370000000400c40734000c00000000000000000000000000000038000000b80344044404b803000000000000000000000000000039000000780284048802f00100000000000000000000000000003a000000000030060000000000000000000000000000000000003b000000000018090006000000000000000000000000000000003c004000a000a000a000100100000000000000000000000000003d002001200120012001200100000000000000000000000000003e0000001001a000a000a00040000000000000000000000000003f000000080084066400180000000000000000000000000000004000f0030c04c20822092409f80900000000000000000000000041000007f8008400f8000007000000000000000000000000000042000000fc0744044404b803000000000000000000000000000043000000f001080204040404080200000000000000000000000044000000fc0704040802f001000000000000000000000000000045000000fc07440444044404000000000000000000000000000046000000fc07440044004400000000000000000000000000000047000000f00108024404c803000000000000000000000000000048000000fc0740004000fc070000000000000000000000000000490000000404fc070404040400000000000000000000000000004a000000000200040004fc0300000000000000000000000000004b000000fc074000f0000c0304040000000000000000000000004c000000fc0700040004000400000000000000000000000000004d000000fc0738007000fc0700000000000000000000000000004e000000fc073800c003fc0700000000000000000000000000004f000000f80304040404f803000000000000000000000000000050000000fc07840084004400780000000000000000000000000051000000fc0102020206fc09000000000000000000000000000052000000fc074400c4013806000000000000000000000000000053000000180224044404880300000000000000000000000000005400000004000400fc070400040000000000000000000000000055000000fc0300040004fc03000000000000000000000000000056000c00f0030004f0030c00000000000000000000000000000057007c008007e001f0010007fc0000000000000000000000000058000404b8034000b80304040000000000000000000000000000590004003800c00730000c0000000000000000000000000000005a0004040407e4041c04040400000000000000000000000000005b0000000000ff0f0108010800000000000000000000000000005c0003001c0060008003000c00000000000000000000000000005d00000001080108ff0f000000000000000000000000000000005e004000380004003800400000000000000000000000000000005f00000800080008000800080000000000000000000000000000600000000000020004000000000000000000000000000000000061000000200390049004e007000000000000000000000000000062000000fc0710041004e003000000000000000000000000000063000000c001200210043004000200000000000000000000000064000000e00310041004fc07000000000000000000000000000065000000e00390049004e0040000000000000000000000000000660000001000f80714001400000000000000000000000000000067000000b806440944093c09040600000000000000000000000068000000fc0710001000e0070000000000000000000000000000690000000000f4070000000000000000000000000000000000006a00000800080008fd07000000000000000000000000000000006b000000fe078000e001100610040000000000000000000000006c0000000000fc030004000400000000000000000000000000006d00f00710001000e0071000e0070000000000000000000000006e000000f00710001000e00700000000000000000000000000006f000000e00310041004e003000000000000000000000000000070000000fc0f04010401f800000000000000000000000000000071000000f80004010401fc0f000000000000000000000000000072000000f00720001000100000000000000000000000000000007300000060029004900420030000000000000000000000000000740000001000fc0310041004000000000000000000000000000075000000f00300040004f007000000000000000000000000000076003000c0030004c003300000000000000000000000000000007700f0000007e003c0010007f000000000000000000000000000780010046003800060031004000000000000000000000000000079000c0870088007f0000c0000000000000000000000000000007a000000000410079004700410040000000000000000000000007b0000004000be070108010800000000000000000000000000007c0000000000ff0f0000000000000000000000000000000000007d00000001080108be07400000000000000000000000000000007e00800040004000800080004000000000000000000000000000")
+const _hex51373 = pxsim.BufferMethods.createBufferFromHex("20000000000000002100001700000000220000030003000023000a1f0a1f0a0024000a17151d0a00250013090412190026000a15150a100027000003000000002800000e11000000290000110e0000002a00000a040a00002b0000040e0400002c000010080000002d000004040400002e000008000000002f0010080402010030000e11110e0000310000121f100000320019151512000033000911150b000034000c0a091f080035001715151509003600081416150800370011090503010038000a1515150a00390002150d0502003a00000a000000003b0000100a0000003c0000040a1100003d00000a0a0a00003e0000110a0400003f0002011505020040000e1115090e0041001e05051e000042001f15150a000043000e111111000044001f11110e000045001f151511000046001f050501000047000e1111150c0048001f04041f00004900111f110000004a000911110f01004b001f040a1100004c001f10101000004d001f0204021f004e001f0204081f004f000e11110e000050001f0505020000510006091916000052001f05050a10005300121515090000540001011f01010055000f10100f0000560007081008070057001f0804081f0058001b04041b0000590001021c0201005a001915131100005b00001f111100005c000102040810005d000011111f00005e000002010200005f00101010101000600000010200000061000c12121e100062001f141408000063000c121212000064000814141f000065000e15151200006600041e0501000067000215150f000068001f04041800006900001d000000006a000010100d00006b001f040a1000006c00000f101000006d001e0204021e006e001e02021c00006f000c12120c000070001e0a0a0400007100040a0a1e000072001c0202020000730010140a0200007400000f1414100075000e10101e1000760006081008060077001e1008101e007800120c0c12000079001214080402007a00121a161200007b0000041f1100007c00001f000000007d00111f040000007e00000404080800d3000c1213130c00f3000c12130d000004010e05051e100005010609191f080006010c121313120007010c121313000018010f0b1b19000019010e151d1a000041011f14121000004201100f1412000043011f0205081f0044011e03031c00005a0110140b0302005b0110140b0300007901121a171300007a01121a171300007b01121b171200007c01121b17120000")
+const _hex33625 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
+const _hex34115 = pxsim.BufferMethods.createBufferFromHex("8704240024000000001111111111111111111111111111111100000010313333333333333333333333333333130100001113111111111111111111111111111131110000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000111311111111111111111111111111113111000010313333333333333333333333333333130100000011111111111111111111111111111111000000")
+const _hex34117 = pxsim.BufferMethods.createBufferFromHex("8704240024000000002222222222222222222222222222222200000020323333333333333333333333333333230200002223222222222222222222222222222232220000322211111111111111111111111111112223000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003222111111111111111111111111111122230000222322222222222222222222222222223222000020323333333333333333333333333333230200000022222222222222222222222222222222000000")
+const _hex34119 = pxsim.BufferMethods.createBufferFromHex("8704240024000000004444444444444444444444444444444400000040343333333333333333333333333333430400004443444444444444444444444444444434440000344411111111111111111111111111114443000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003444111111111111111111111111111144430000444344444444444444444444444444443444000040343333333333333333333333333333430400000044444444444444444444444444444444000000")
+const _hex34121 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d00000000000000000000000070666607000000000000000000000000006776000000000000000000000000660700007066000000000000000000006766777766760000000000000000000060666666660600000000000000000066006766667600660000000000000000667600000000676600000000000000006766767777676676000000000000000060666666666666060000000000000000006766666666760000000000000000000000676666760000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34123 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0bb000000000000000000000000b000404500b0000000000000000000005b0b000400540b0000000000000000b0550400000054b5000000000000000000440040bb0040040000000000000000000040d4ddbb0000000000000000000000004055ddbd000000000000000000004b005455d5dd0b400b000000000000005b045411d5dd0b540b000000000000004b005411d5dd0b400b0000000000000000004055ddbd00000000000000000000000040d4ddbb0000000000000000000000440040bb0040040000000000000000b0550400000054b50000000000000000005b04000400540b000000000000000000b000404500b0000000000000000000000000b0bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34125 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020020000000000002002000000000000202200000000000022020000000000000022020000000020220000000000000000202200000000220200000000000000000022020000202200000000000000000000202200002202000000000000000000000022022022000000000000000000000000202222020000000000000000000000000022220000000000000000000000000000222200000000000000000000000000202222020000000000000000000000002202202200000000000000000000002022000022020000000000000000000022020000202200000000000000000020220000000022020000000000000000220200000000202200000000000000202200000000000022020000000000002002000000000000200200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34127 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d0000000000000000000000007066660700000000000000000000000000677600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34129 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0cbcc0c0000000000000000000000b0db55d5cd0c00000000000000000000db555555ddcd000000000000000000b055555555d59d0b0000000000000000db55555555d59db900000000000000005b55555555d5ddb900000000000000b05db5cccc5bdddd990b000000000000b055ccccccccdddd9d0b000000000000b0b5ccccccccdbdd9d0b000000000000b0c5ccccccccdcdd9d0b000000000000b0c5ccdccbccdcdd9d0c000000000000b0cdcc5b55ccdcdd9d0c00000000000000ccdc55b5ccdcddc90000000000000000cccc5b55ccdbddc90000000000000000c0ccdccbccdd9d0c000000000000000000ccccccdbddcd00000000000000000000c0dcddddcd0c0000000000000000000000c0cccc0c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34131 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc00000000000000b0bbbbbbbbcb00c0cd000000000000001bddddddddbd0c1ccd000000000000b011cbccccccbc0c1ccd000000000000b01d6c666666bc0cbccd000000000000b01d6c616661bc0c1ccd000000000000b01d6c161666bccc1bcd000000000000b01d6c666166bcccbbcd000000000000b01d6c666666bccc1bcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666661bcccbbcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666666bc0c1ccd000000000000b01dcbccccccbc0cbccd000000000000c0b1bbbbbbbbbb0cdccb000000000000c0bbbbbbbbbbcb00dc0c00000000000000cccccccccc0c00cc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34133 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004004000000000000000000000000000054450000000000000000000000440b00bbbb00b0440000000000000040550b00000000b0550400000000000040b5000044bb00005b04000000000000b00b0044ddddbb00b00b0000000000000000405d55d5dd0b00000000000000000000d4555555ddbd0000000000000000000054555555d5bd0000000000000000b44055555555d5dd0b4b000000000040b54055555555d5dd0b5b040000000040b54055555555d5dd0b5b040000000000b44055115555d5dd0b4b000000000000000054115555d5bd00000000000000000000d4555555ddbd00000000000000000000405d55d5dd0b0000000000000000b00b0044ddddbb00b00b00000000000040b5000044bb00005b0400000000000040550b00000000b0550400000000000000440b00bbbb00b0440000000000000000000000544500000000000000000000000000004004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34135 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bbbb00000000000000000000000000b055bb00bbbbbb000000000000000000b0b5bdbcbbbbddcb0000000000000000b0dbcb5b5555bbdd0c00000000000000b0cbdcbdbb5b55dbcd0000000000000000c0dddb11d15bb5bd0c00000000000000bbbd111111b155bb0c00000000000000db1b111111115bb5cb00000000000000db1bb11d1199b9d5cb00000000000000db1b11bb9199b955cb000000000000005b1b11b19b99995bcb000000000000005b1d1111bb99995ccb00000000000000b0b511bbbb99995ccb00000000000000b0d51d919999d95b0b00000000000000005bdb919999c9d50b0000000000000000b0d51b99d9bcb5000000000000000000005bd5bbbc550b00000000000000000000b05b5555bd000000000000000000000000b0bbbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex34323 = pxsim.BufferMethods.createBufferFromHex("1f00210023002500270029002c002e003100340037003a003e004100450049004e00520057005c00620068006e0075007b0083008b0093009c00a500af00b900c400d000dc00e900f70006011501260137014a015d01720188019f01b801d201ee010b022a024b026e029302ba02e40210033f037003a403dc03170455049704dd0427057505c80520067d06e0064907b8072d08a9082d09b9094d0aea0a900b400cfa0cc00d910e6f0f5a1053115b1272139a14d41520178018f519801b231dde1e")
+const _hex34699 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
+const _hex34701 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
+const _hex34703 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
+const _hex34707 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
+const _hex34709 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
+const _hex35015 = pxsim.BufferMethods.createBufferFromHex("8704100010000000d3dd1ddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dd1d3d3dd3bdbbd3dddddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dddd3d3dd3bdbb")
+const _hex35345 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c689696999999998c689696999999998c886696999999998c866696999999998c866699999999998c666699999999998c686699999999998c689696999999998c689696999999998c669696999999998c669699999999998c866699999999998c866699999999998c886699999999998c889699999999998c68969999999999")
+const _hex35561 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
+const _hex35583 = pxsim.BufferMethods.createBufferFromHex("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex35800 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex35804 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999bbcccc99999999bbddddbbcc9999b9ddddddbdcb9999dbddbbddbdcb99b9dbbd33ddddbb99b9ddbd33ddddbb993cb33b33dbbdbb993c3333333b33bb99bc3d33333333bc99bcd3333333cbbb99bc3b3333c3bbbb99c9333333bcbbcb99c933d333bcbbcc993933cc3db3cbcc9999c9bb3bb3ddcb999999ccccdbddbd")
+const _hex35808 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999c9ddddbd99999999c9ddddbd99999999b9ddddbc9999999999dbcdbb9999999999ccbccb9999999999c9bccc999999999999cccc999999999999c9cc99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
+const _hex35812 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999c9cccc99999999ccbccccc999999ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb9dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb9ccccdcddcdcdcc9999ccccddcbcbcc999999c9cccccccc")
+const _hex35816 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999996688889988999969557777986898995667667687898688675777677699686676658877679989765588686688999969866666869999999999888898999999999999999999999999999999999999999999999999999999999999999999")
+const _hex35820 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999998888889999999988577577889999897777556677989978778888776687896688999988776689869999999968666898999999998988689899999999687788999999998977679999999999788668999999998987989999999999899899999999999999999999")
+const _hex35824 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988889999999999887777889999998966666677989999688688767687998966989968676799898899888867769999998988887666989999688888787786888886886886766866668886668888676866667887668876658868777686996757757766779899787566667787999989567577879899999969868898999999")
+const _hex35828 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988c8cccc99999988ccbccccc999989ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb8dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb8ccccdcddcdcdcc8956ccccddcbcbcc996986c8cccccccc")
+const _hex35832 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999889999999999999968989999999999998986999999999999996888999999896899896688888868779999886666767777999999886666668699999999888888989999999999999999999999999999999999999999999999999999999999999999")
+const _hex35836 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999898888999999996868666699999968778688889999897786686676996976666666888899566577868899996655768798999988776655969999887766556699998977667766999999786667669999998867679899999988688698999999999999999999999999999999999999999999999999999999999999999999")
+const _hex35840 = pxsim.BufferMethods.createBufferFromHex("87041000100000008888999999999999777786989999999968667787989999997767667786999999687767667798999988687766768799997766787766779899666686766776879987886668776677889899688878676677899689888877676689679988786677879978665567886686998977668866669899997857756688999999896866889999")
+const _hex35844 = pxsim.BufferMethods.createBufferFromHex("870410001000000088889999bbcccc99777786bbddddbbcc6866b7ddddddbdcb7767dbddbbddbdcb68b7dbbd33ddddbb88b8ddbd33ddddbb773cb33b33dbbdbb663c3333333b33bb87bc3d33333333bc08bcd3333333cbbb89bc3b3333c3bbbb89c7333333bcbbcb99c833d333bcbbcc993933cc3db3cbcc9999c8bb3bb3ddcb999989ccccdbddbd")
+const _hex35848 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff11111111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
+const _hex35852 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c68f6f61111ffff8c68f6f61111ffff8c8866f61111ffff8c8666f61111ffff8c866611ffff11118c666611ffff11118c686611ffff11118c681616ffff11118c68f6f61111ffff8c66f6f61111ffff8c66f6ff1111ffff8c8666ff1111ffff8c866611ffff11118c886611ffff11118c881611ffff11118c681611ffff1111")
+const _hex35856 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999889898888999989898989899999998999989998889999999999999999999989999989999999998988888988889999899999899999999999999999999999999988889999999999898999999999999999888899999999999999999999999999999999999999999999999999999999999999999999999999")
+const _hex35860 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
+const _hex35864 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff818888ff1111ffff81818fff1111ffff81818fff1111ffffffff1111ffff11118f888811ffff1111fff81111ffff1111ff8f1111ffff1111818888ff1111ffff1111ffff1111ffff818888ff1111ffff81118fff1111ffffff881811ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
+const _hex98455 = pxsim.BufferMethods.createBufferFromHex("8704a0007800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666666666060066666666666666060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086886666666686880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880086880000000086880000000086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080880080880000000080880000000080880080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066060000000066060066666666666666060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086886666666686880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086880000000086880000000086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086880000000086880000000086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880080886666660086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888808608888880086880000000086880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888808608888880086880000000086880000000000000000000000000000000000000000000000000000000000000000000080880000000080880080888808008888880080880000000080880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666060066060066666666666666060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086880086880086880086880000000086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086880086880086880000000086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086880086880086886666666686880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086888888880086888888888888880086880086880086880000000000000000000000000000000000000000000000000000000000000000000086880086888888880086888888888888880086880086880086880000000000000000000000000000000000000000000000000000000000000000000080880080888888880080888888888888880080880080880080880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666666666060066666666060066060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080888888888888880086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086880086880086880086880000000000000000000000000000000000000000000000000000000000000000000000000066666686886666060086880086880086880086886686886666060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086880086888888880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080888888888888880080880080888888880080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666060000000066666666060066060066666666666666060000000000000000000000000000000000000000000000000000000000000000000086888888880000000086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000086888888880000000086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000080888888886666060086888888880086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000086888888880086880086880086880000608808000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880086880086880086880000608808000000000000000000000000000000000000000000000000000000000000000000000000000066666686888888880086880086880086880000008868660000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000086880086888888880000000086880000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000086880086888888880000000086880000000000000000000000000000000000000000000000000000000000000000000000000080888888880000000080880080888888880066666686886666060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000066666666666666060066666666666666060066666666060066060000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888880086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880086888888888888880086888888880086880000000000000000000000000000000000000000000000000000000000000000000086888888888888880080888888888888880080888888880080880000000000000000000000000000000000000000000000000000000000000000000086880086880000000000608808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880086880000000000608808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880086880000000000008868660000000080888800008088880000000000000000000000000000000000000000000000000000000000000000000086880086880000000000000086880000000000000000008080800000000000000000000000000000000000000000000000000000000000000000000086880086880000000000000086880000000000008000000008080000000000000000000000000000000000000000000000000000000000000000000080880080880000000000606686880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000608808000000000080808800008088000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000608808000000000080808000000080880000000000000000000000000000000000000000000000000000000000000000000066060000000066060066668868666666060080888000008088000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888888888880000008000000000000000000000000000000000000000000000000000000000000000000000000000000086886666666686880080888888888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000080888000008088880000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000000080808000000000800000000000000000000000000000000000000000000000000000000000000000000086888888888888880066666666060000000080888800008088880000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880000000086880086888888880000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000080880000000080880080888888886666060000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000008088880000000000000000000000000000000000000000000000000000000000000000000066666666060066060066666686888888880000000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888880000000000000000008088800000000000000000000000000000000000000000000000000000000000000000000086888888880086880086888888880000000000000000008080800000000000000000000000000000000000000000000000000000000000000000000086888888880086880080888888880000000000000000008080880000000000000000000000000000000000000000000000000000000000000000000086880086880086880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086880086880086880000000000000000000000000000008000800000000000000000000000000000000000000000000000000000000000000000000086880086880086880000000000000000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000086880086888888880000000000000000cc000000ff00008000800000000000000000000000000000000000000000000000000000000000000000000086880086888888880000000000000000bc0c00fffb00000000000000000000000000000000000000000000000000000000000000000000000000000080880080888888880000000000000000bcccffbcfb00008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dccbccbb0f00008000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dcbdccfb0000008080800000000000000000000000000000000000000000000000000000000000000000000066666666666666060000000000000000c0bdfb0f0000008080880000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000f0cccf000000000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000000000cfccbc0c00000080888800000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000f0ccccbccd00000000080000000000000000000000000000000000000000000000000000000000000000000000000000868800000000000000000000cfccccccdd0c00000080000000000000000000000000000000000000000000000000000000000000000000000000000086880000000000000000ff00cfccccccdd0c00008088880000000000000000000000000000000000000000000000000000000000000000000066666686886666060000000000bfffccbbcbccddff00000000000000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000bffbbbccbbccfdfb00008088880000000000000000000000000000000000000000000000000000000000000000000086888888888888880000000000bcbfcbbbbbcbbffb00008080800000000000000000000000000000000000000000000000000000000000000000000080888888888888880000000000bcbfbbccbbbbbbfd00008080800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0bbcbbbbbbbdbfb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0bbbbbbbbbbbb0f00008088880000000000000000000000000000000000000000000000000000000000000000000066666666060000000000000000f0fbbfbb1bc1fc0f00008000800000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000bffb1f111111110f00000088080000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000bf1bc1c3cc1c110c00000000000000000000000000000000000000000000000000000000000000000000000000000080888888886666060000000000bf111c3333c1110c00000000800000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000bf11cc333333110c00000000800000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000bf111c3c3313c10000000000800000000000000000000000000000000000000000000000000000000000000000000066666686888888880000000000bf1bccccccccc10000000000000000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000bfbbf10f00cc0c0000008088880000000000000000000000000000000000000000000000000000000000000000000086888888880000000000000000f0ffff000000000000008080000000000000000000000000000000000000000000000000000000000000000000000080888888880000000000000000000000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fcffff0000000000000080800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c44f40000000000000080088800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccfff40fc00c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0ddcc1111fdbfcd00000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0dd1c4d44d4dccd00000000800080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4d444444c4cd00000000008808000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4444ff4f440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc44444cc4440f000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000000000fc00000000cc4444c4c4440f000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000dc0f000000c044111141440f0000000080888800000000000000000000000000000000000000000000000000000000000000000000000000000000c0dc0f000000c01c444414f40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccddf1000000004c444444fd00000000008000800000000000000000000000000000000000000000000000000000000000000000000000000000cc11dd1d110f0000004c444f440f00000000008088880000000000000000000000000000000000000000000000000000000000000000000000000000bc111111110f000000c04444f400000000000080008000000000000000000000000000000000000000000000000000000000000000000000000000c0b511c11111f1000000004c440f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b51b111111510f000000f0ff0000000000000080888800000000000000000000000000000000000000000000000000000000000000000000000000c0b5bbbb1b115b0f000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000005cb5111111bb5b0f000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000005cb51b11bbbb550f000000000000000000000000808888000000000000000000000000000000000000000000000000000000000000000000000000005c551b1111b1550f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c55ccbcb5ffff0f00000000000000000000000080888800000000000000000000000000000000000000000000000000000000000000000000000000cc550cbbb500000000000000000000000000000080008000000000000000000000000000000000000000000000000000000000000000000000000000c0ccc055c5000000000000000000000000000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000c0cccc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex98459 = pxsim.BufferMethods.createBufferFromHex("0a00080000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000090000000000000000020a0500070004030601010101010101010101")
+const _hex98461 = pxsim.BufferMethods.createBufferFromHex("87040a000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex98641 = pxsim.BufferMethods.createBufferFromHex("8704a00078000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
 
 
 
 
-function inline__P4110(s) {
+function inline__P33614(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2068,23 +2059,23 @@ switch (step) {
   case 1:
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 4; continue; }
-    globals.__updated___4107 = (false);
-    s.tmp_0 = pause__P402_mk(s);
+    globals.__updated___33611 = (false);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 200;
-    s.callLocIdx = 2; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 0; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.__updated___4107);
+    r0 = pxsim_numops_toBoolDecr(globals.__updated___33611);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = control___screen_update__P1763_mk(s);
-    s.callLocIdx = 3; s.pc = 6; return s.tmp_2;
+    s.tmp_2 = control___screen_update__P31181_mk(s);
+    s.callLocIdx = 1; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
-    globals.__updated___4107 = (true);
+    globals.__updated___33611 = (true);
   case 2:
   case 3:
     { step = 1; continue; }
@@ -2093,12 +2084,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P4110.info = {"start":396,"length":211,"line":17,"column":26,"endLine":26,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"inline","argumentNames":[]}
+inline__P33614.info = {"start":396,"length":211,"line":17,"column":26,"endLine":26,"endColumn":5,"fileName":"pxt_modules/screen---st7735/frame.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P4110_mk(s) {
+function inline__P33614_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P4110, depth: s.depth + 1,
+        parent: s, fn: inline__P33614, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2109,35 +2100,7 @@ function inline__P4110_mk(s) {
 
 
 
-function inline__P4128(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    r0 = pxsim_pxtcore.updateScreen(globals.screen___1802);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P4128.info = {"start":753,"length":26,"line":22,"column":33,"endLine":22,"endColumn":59,"fileName":"pxt_modules/screen/targetoverrides.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P4128_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P4128, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-} }
-
-
-
-
-
-function inline__P4133(s) {
+function inline__P33727(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2151,69 +2114,36 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore.updateStats(s.arg0);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P4133.info = {"start":816,"length":56,"line":23,"column":35,"endLine":25,"endColumn":5,"fileName":"pxt_modules/screen/targetoverrides.ts","functionName":"inline","argumentNames":["msg"]}
-
-function inline__P4133_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P4133, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function inline__P4234(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim_numops_toBoolDecr(globals.infoState___4230);
+    r0 = pxsim_numops_toBoolDecr(globals.infoState___33723);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_numops_toBoolDecr(globals.infoStateStack___4232);
+    r0 = pxsim_numops_toBoolDecr(globals.infoStateStack___33725);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals.infoStateStack___4232 = (r0);
+    globals.infoStateStack___33725 = (r0);
   case 1:
   case 2:
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "state", globals.infoState___4230);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "state", globals.infoState___33723);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "scene", s.arg0);
-    r0 = pxsim_Array__push(globals.infoStateStack___4232, s.tmp_0);
-    globals.infoState___4230 = (undefined);
+    r0 = pxsim_Array__push(globals.infoStateStack___33725, s.tmp_0);
+    globals.infoState___33723 = (undefined);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P4234.info = {"start":1920,"length":259,"line":73,"column":29,"endLine":82,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P33727.info = {"start":1920,"length":259,"line":73,"column":29,"endLine":82,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P4234_mk(s) {
+function inline__P33727_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P4234, depth: s.depth + 1,
+        parent: s, fn: inline__P33727, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2224,7 +2154,7 @@ function inline__P4234_mk(s) {
 
 
 
-function inline__P4249(s) {
+function inline__P33742(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2234,61 +2164,61 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___4250 = undefined;
-    s.nextState___4259 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 20; s.pc = 7; return s.tmp_0;
+    s.scene___33743 = undefined;
+    s.nextState___33752 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 18; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.scene___4250 = (r0);
-    globals.infoState___4230 = (undefined);
-    s.tmp_0 = r0 = globals.infoStateStack___4232;
+    s.scene___33743 = (r0);
+    globals.infoState___33723 = (undefined);
+    s.tmp_0 = r0 = globals.infoStateStack___33725;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(globals.infoStateStack___4232);
+    r0 = pxsim_Array__length(globals.infoStateStack___33725);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array_.pop(globals.infoStateStack___4232);
-    s.nextState___4259 = (r0);
+    r0 = pxsim_Array_.pop(globals.infoStateStack___33725);
+    s.nextState___33752 = (r0);
     s.tmp_2 = if_scene_1_mk(s);
-    s.tmp_2.arg0 = s.nextState___4259;
+    s.tmp_2.arg0 = s.nextState___33752;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "scene");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["scene"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["scene"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 21; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 19; s.pc = 8; return s.tmp_2; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.scene___4250);
+    r0 = (s.tmp_1 == s.scene___33743);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     s.tmp_3 = if_state_1_mk(s);
-    s.tmp_3.arg0 = s.nextState___4259;
+    s.tmp_3.arg0 = s.nextState___33752;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "state");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["state"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["state"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 22; s.pc = 9; return s.tmp_3; }
+     else { s.callLocIdx = 20; s.pc = 9; return s.tmp_3; }
     }
   case 9:
     r0 = s.retval;
-    globals.infoState___4230 = (r0);
+    globals.infoState___33723 = (r0);
     { step = 4; continue; }
   case 3:
-    r0 = pxsim_Array__push(globals.infoStateStack___4232, s.nextState___4259);
+    r0 = pxsim_Array__push(globals.infoStateStack___33725, s.nextState___33752);
   case 4:
   case 5:
   case 6:
@@ -2296,26 +2226,26 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P4249.info = {"start":2211,"length":376,"line":84,"column":28,"endLine":95,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":[]}
+inline__P33742.info = {"start":2211,"length":376,"line":84,"column":28,"endLine":95,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P4249_mk(s) {
+function inline__P33742_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P4249, depth: s.depth + 1,
+        parent: s, fn: inline__P33742, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  scene___4250: undefined,
-  nextState___4259: undefined,
+  scene___33743: undefined,
+  nextState___33752: undefined,
 } }
 
 
 
 
 
-function inline__P4685(s) {
+function inline__P34178(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2325,13 +2255,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sz___4686 = undefined;
-    s.tmp_0 = control_ramSize__P335_mk(s);
-    s.callLocIdx = 35; s.pc = 6; return s.tmp_0;
+    s.sz___34179 = undefined;
+    s.tmp_0 = control_ramSize__P29870_mk(s);
+    s.callLocIdx = 33; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.sz___4686 = (r0);
-    r0 = (s.sz___4686 <= 102400);
+    s.sz___34179 = (r0);
+    r0 = (s.sz___34179 <= 102400);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -2339,7 +2269,7 @@ switch (step) {
     { step = 5; continue; }
     { step = 4; continue; }
   case 1:
-    r0 = (s.sz___4686 <= 204800);
+    r0 = (s.sz___34179 <= 204800);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 2; continue; }
@@ -2356,23 +2286,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P4685.info = {"start":223,"length":217,"line":8,"column":25,"endLine":17,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":[]}
+inline__P34178.info = {"start":223,"length":217,"line":8,"column":25,"endLine":17,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P4685_mk(s) {
+function inline__P34178_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P4685, depth: s.depth + 1,
+        parent: s, fn: inline__P34178, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  sz___4686: undefined,
+  sz___34179: undefined,
 } }
 
 
 
 
 
-function inline__P4777(s) {
+function inline__P34270(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2402,12 +2332,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P4777.info = {"start":860,"length":117,"line":31,"column":40,"endLine":34,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":[]}
+inline__P34270.info = {"start":860,"length":117,"line":31,"column":40,"endLine":34,"endColumn":5,"fileName":"pxt_modules/game---hw/texteffects.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P4777_mk(s) {
+function inline__P34270_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P4777, depth: s.depth + 1,
+        parent: s, fn: inline__P34270, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2422,7 +2352,7 @@ function inline__P4777_mk(s) {
 
 
 
-function inline__P4790(s) {
+function inline__P34283(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2451,10 +2381,10 @@ switch (step) {
     r0 = (s.tmp_4 * 2);
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_2, "yOffset", s.tmp_3);
-    s.tmp_7 = Math_sign__P124_mk(s);
+    s.tmp_7 = Math_sign__P29659_mk(s);
     r0 = pxsim.Math_.sin(s.arg0);
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 57; s.pc = 7; return s.tmp_7;
+    s.callLocIdx = 55; s.pc = 7; return s.tmp_7;
   case 7:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -2472,7 +2402,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["up"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["up"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 58; s.pc = 8; return s.tmp_1; }
+     else { s.callLocIdx = 56; s.pc = 8; return s.tmp_1; }
     }
   case 8:
     r0 = s.retval;
@@ -2497,7 +2427,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["yOffset"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["yOffset"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 59; s.pc = 10; return s.tmp_6; }
+     else { s.callLocIdx = 57; s.pc = 10; return s.tmp_6; }
     }
   case 10:
     r0 = s.retval;
@@ -2512,11 +2442,11 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["set/yOffset"];
       if (s.tmp_3.fn === null) { s.tmp_3.arg0.fields["yOffset"] = s.tmp_3.arg1; }
       else if (s.tmp_3.fn === undefined) { failedCast(s.tmp_3.arg0) } 
-     else { s.callLocIdx = 60; s.pc = 9; return s.tmp_3; }
+     else { s.callLocIdx = 58; s.pc = 9; return s.tmp_3; }
     }
   case 9:
     r0 = s.retval;
-    s.tmp_2 = Math_abs__P123_mk(s);
+    s.tmp_2 = Math_abs__P29658_mk(s);
     s.tmp_3 = if_yOffset_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -2525,12 +2455,12 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["yOffset"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["yOffset"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 61; s.pc = 12; return s.tmp_3; }
+     else { s.callLocIdx = 59; s.pc = 12; return s.tmp_3; }
     }
   case 12:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 62; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 60; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -2546,7 +2476,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["up"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["up"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 63; s.pc = 13; return s.tmp_6; }
+     else { s.callLocIdx = 61; s.pc = 13; return s.tmp_6; }
     }
   case 13:
     r0 = s.retval;
@@ -2564,7 +2494,7 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["up"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["up"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 64; s.pc = 14; return s.tmp_7; }
+     else { s.callLocIdx = 62; s.pc = 14; return s.tmp_7; }
     }
   case 14:
     r0 = s.retval;
@@ -2580,7 +2510,7 @@ switch (step) {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["set/up"];
       if (s.tmp_9.fn === null) { s.tmp_9.arg0.fields["up"] = s.tmp_9.arg1; }
       else if (s.tmp_9.fn === undefined) { failedCast(s.tmp_9.arg0) } 
-     else { s.callLocIdx = 65; s.pc = 15; return s.tmp_9; }
+     else { s.callLocIdx = 63; s.pc = 15; return s.tmp_9; }
     }
   case 15:
     r0 = s.retval;
@@ -2588,12 +2518,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P4790.info = {"start":1127,"length":417,"line":42,"column":39,"endLine":55,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["index","state"]}
+inline__P34283.info = {"start":1127,"length":417,"line":42,"column":39,"endLine":55,"endColumn":5,"fileName":"pxt_modules/game---hw/texteffects.ts","functionName":"inline","argumentNames":["index","state"]}
 
-function inline__P4790_mk(s) {
+function inline__P34283_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P4790, depth: s.depth + 1,
+        parent: s, fn: inline__P34283, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2613,7 +2543,7 @@ function inline__P4790_mk(s) {
 
 
 
-function inline__P5987(s) {
+function inline__P35509(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2623,42 +2553,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.currentScene___5984);
+    r0 = pxsim_numops_toBoolDecr(globals.currentScene___35506);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_numops_toBoolDecr(globals.FadeStack___5985);
+    r0 = pxsim_numops_toBoolDecr(globals.FadeStack___35507);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals.FadeStack___5985 = (r0);
+    globals.FadeStack___35507 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(color_FadeState__C5981_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_FadeState__C35503_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_FadeState_constructor__P5982_mk(s);
+    s.tmp_1 = color_FadeState_constructor__P35504_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.activeFade___5983;
-    s.tmp_1.arg2 = globals.currentScene___5984;
+    s.tmp_1.arg1 = globals.activeFade___35505;
+    s.tmp_1.arg2 = globals.currentScene___35506;
     s.callLocIdx = 69; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_Array__push(globals.FadeStack___5985, s.tmp_0);
-    globals.activeFade___5983 = (undefined);
-    globals.currentScene___5984 = (undefined);
+    r0 = pxsim_Array__push(globals.FadeStack___35507, s.tmp_0);
+    globals.activeFade___35505 = (undefined);
+    globals.currentScene___35506 = (undefined);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P5987.info = {"start":5238,"length":328,"line":184,"column":29,"endLine":198,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P35509.info = {"start":5238,"length":328,"line":184,"column":29,"endLine":198,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P5987_mk(s) {
+function inline__P35509_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P5987, depth: s.depth + 1,
+        parent: s, fn: inline__P35509, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2668,7 +2598,7 @@ function inline__P5987_mk(s) {
 
 
 
-function inline__P6005(s) {
+function inline__P35527(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2678,42 +2608,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___6006 = undefined;
-    s.nextState___6017 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.scene___35528 = undefined;
+    s.nextState___35539 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
     s.callLocIdx = 71; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.scene___6006 = (r0);
-    globals.currentScene___5984 = (undefined);
-    globals.activeFade___5983 = (undefined);
-    s.tmp_0 = r0 = globals.FadeStack___5985;
+    s.scene___35528 = (r0);
+    globals.currentScene___35506 = (undefined);
+    globals.activeFade___35505 = (undefined);
+    s.tmp_0 = r0 = globals.FadeStack___35507;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(globals.FadeStack___5985);
+    r0 = pxsim_Array__length(globals.FadeStack___35507);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array_.pop(globals.FadeStack___5985);
-    s.nextState___6017 = (r0);
-    r0 = s.nextState___6017.fields["scene"];
+    r0 = pxsim_Array_.pop(globals.FadeStack___35507);
+    s.nextState___35539 = (r0);
+    r0 = s.nextState___35539.fields["scene"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 === s.scene___6006);
+    r0 = (s.tmp_1 === s.scene___35528);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = s.nextState___6017.fields["state"];
-    globals.activeFade___5983 = (r0);
-    r0 = s.nextState___6017.fields["scene"];
-    globals.currentScene___5984 = (r0);
+    r0 = s.nextState___35539.fields["state"];
+    globals.activeFade___35505 = (r0);
+    r0 = s.nextState___35539.fields["scene"];
+    globals.currentScene___35506 = (r0);
     { step = 4; continue; }
   case 3:
-    r0 = pxsim_Array__push(globals.FadeStack___5985, s.nextState___6017);
+    r0 = pxsim_Array__push(globals.FadeStack___35507, s.nextState___35539);
   case 4:
   case 5:
   case 6:
@@ -2721,24 +2651,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P6005.info = {"start":5598,"length":442,"line":200,"column":28,"endLine":214,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P35527.info = {"start":5598,"length":442,"line":200,"column":28,"endLine":214,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P6005_mk(s) {
+function inline__P35527_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P6005, depth: s.depth + 1,
+        parent: s, fn: inline__P35527, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  scene___6006: undefined,
-  nextState___6017: undefined,
+  scene___35528: undefined,
+  nextState___35539: undefined,
 } }
 
 
 
 
 
-function inline__P45902(s) {
+function inline__P97759(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2748,16 +2678,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___45904);
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___97761);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_numops_toBoolDecr(globals.show_minimap___45907);
+    r0 = pxsim_numops_toBoolDecr(globals.show_minimap___97764);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    globals.show_minimap___45907 = (r0);
-    s.tmp_0 = Sprite_setFlag__P2079_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___45914;
+    globals.show_minimap___97764 = (r0);
+    s.tmp_0 = Sprite_setFlag__P31498_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___97771;
     s.tmp_0.arg1 = 128;
-    s.tmp_0.arg2 = globals.show_minimap___45907;
+    s.tmp_0.arg2 = globals.show_minimap___97764;
     s.callLocIdx = 84; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
@@ -2767,12 +2697,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P45902.info = {"start":268,"length":142,"line":6,"column":52,"endLine":11,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P97759.info = {"start":268,"length":142,"line":6,"column":52,"endLine":11,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P45902_mk(s) {
+function inline__P97759_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P45902, depth: s.depth + 1,
+        parent: s, fn: inline__P97759, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -2781,7 +2711,7 @@ function inline__P45902_mk(s) {
 
 
 
-function inline__P45920(s) {
+function inline__P97905(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2795,20 +2725,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = (globals.loading___45924 >= 0);
+    r0 = (globals.loading___97909 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_ImageMethods.fill(s.arg0, 15);
-    s.tmp_0 = helpers_imageDrawRect__P1731_mk(s);
+    s.tmp_0 = helpers_imageDrawRect__P31149_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 50);
     s.tmp_0.arg1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 / 2);
     s.tmp_3 = r0;
@@ -2820,22 +2750,22 @@ switch (step) {
     s.callLocIdx = 110; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 48);
     s.tmp_0.arg1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 / 2);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_5 = Math_map__P271_mk(s);
-    r0 = (globals.loading___45924 * 100);
+    s.tmp_5 = Math_map__P29806_mk(s);
+    r0 = (globals.loading___97909 * 100);
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = 0;
     s.tmp_5.arg2 = 100;
@@ -2850,10 +2780,10 @@ switch (step) {
     s.callLocIdx = 114; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = images_printCenter__P3645_mk(s);
+    s.tmp_0 = images_printCenter__P33179_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.message___45955;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.tmp_0.arg1 = globals.message___97940;
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 0.55);
     s.tmp_0.arg2 = r0;
@@ -2867,12 +2797,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P45920.info = {"start":7349,"length":381,"line":183,"column":34,"endLine":190,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["screen2"]}
+inline__P97905.info = {"start":7349,"length":381,"line":183,"column":34,"endLine":190,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["screen2"]}
 
-function inline__P45920_mk(s) {
+function inline__P97905_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P45920, depth: s.depth + 1,
+        parent: s, fn: inline__P97905, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2887,7 +2817,7 @@ function inline__P45920_mk(s) {
 
 
 
-function inline__P45962(s) {
+function inline__P97947(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2902,26 +2832,26 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Sprite_setKind__P2071_mk(s);
+    s.tmp_0 = Sprite_setKind__P31490_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.SurvivedNPC___45897;
+    s.tmp_0.arg1 = globals.SurvivedNPC___97754;
     s.callLocIdx = 118; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.last_15___45971);
+    r0 = pxsim_numops_toBoolDecr(globals.last_15___97956);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.last_15___45971 = (true);
-    s.tmp_0 = info_stopCountdown__P2214_mk(s);
+    globals.last_15___97956 = (true);
+    s.tmp_0 = info_stopCountdown__P31633_mk(s);
     s.callLocIdx = 119; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = timer_after__P3594_mk(s);
+    s.tmp_0 = timer_after__P33128_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P45976;
+    s.tmp_0.arg1 = inline__P97961;
     s.callLocIdx = 121; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
@@ -2931,12 +2861,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P45962.info = {"start":7784,"length":240,"line":191,"column":52,"endLine":200,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
+inline__P97947.info = {"start":7784,"length":240,"line":191,"column":52,"endLine":200,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
 
-function inline__P45962_mk(s) {
+function inline__P97947_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P45962, depth: s.depth + 1,
+        parent: s, fn: inline__P97947, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2948,7 +2878,7 @@ function inline__P45962_mk(s) {
 
 
 
-function inline__P45976(s) {
+function inline__P97961(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2958,7 +2888,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P2213_mk(s);
+    s.tmp_0 = info_startCountdown__P31632_mk(s);
     s.tmp_0.arg0 = 15;
     s.callLocIdx = 120; s.pc = 1; return s.tmp_0;
   case 1:
@@ -2967,12 +2897,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P45976.info = {"start":7956,"length":59,"line":196,"column":25,"endLine":198,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P97961.info = {"start":7956,"length":59,"line":196,"column":25,"endLine":198,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P45976_mk(s) {
+function inline__P97961_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P45976, depth: s.depth + 1,
+        parent: s, fn: inline__P97961, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -2981,7 +2911,7 @@ function inline__P45976_mk(s) {
 
 
 
-function inline__P45981(s) {
+function inline__P97979(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2991,26 +2921,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___45985 = undefined;
-    s.sprite___45997 = undefined;
-    s.unnamed1500___U2 = undefined;
-    s.unnamed1501___U3 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___45904);
+    s.index___97983 = undefined;
+    s.sprite___97995 = undefined;
+    s.unnamed3540___U2 = undefined;
+    s.unnamed3541___U3 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___97761);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.index___45985 = (0);
+    s.index___97983 = (0);
   case 1:
-    r0 = (s.index___45985 <= 9);
+    r0 = (s.index___97983 <= 9);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = tiles_setWallAt__P2343_mk(s);
-    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
+    s.tmp_1 = tiles_setWallAt__P31762_mk(s);
+    s.tmp_2 = tiles_getTileLocation__P31763_mk(s);
     s.tmp_2.arg0 = 3;
-    r0 = (s.index___45985 + 1);
+    r0 = (s.index___97983 + 1);
     s.tmp_2.arg1 = r0;
     s.callLocIdx = 127; s.pc = 8; return s.tmp_2;
   case 8:
@@ -3020,31 +2950,31 @@ switch (step) {
     s.callLocIdx = 128; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = (s.index___45985 + 1);
-    s.index___45985 = (r0);
+    r0 = (s.index___97983 + 1);
+    s.index___97983 = (r0);
     { step = 1; continue; }
   case 2:
-    s.sprite___45997 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.NPC___45888;
+    s.sprite___97995 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.NPC___97745;
     s.callLocIdx = 129; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.unnamed1500___U2 = (r0);
-    s.unnamed1501___U3 = (0);
+    s.unnamed3540___U2 = (r0);
+    s.unnamed3541___U3 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed1501___U3;
-    r0 = pxsim_Array__length(s.unnamed1500___U2);
+    s.tmp_0 = r0 = s.unnamed3541___U3;
+    r0 = pxsim_Array__length(s.unnamed3540___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1500___U2, s.unnamed1501___U3);
-    s.sprite___45997 = (r0);
-    s.tmp_2 = scene_followPath__P3659_mk(s);
-    s.tmp_2.arg0 = s.sprite___45997;
-    s.tmp_3 = r0 = globals.paths___46005;
-    s.tmp_5 = sprites_readDataNumber__P3621_mk(s);
-    s.tmp_5.arg0 = s.sprite___45997;
+    r0 = pxsim_Array__getAt(s.unnamed3540___U2, s.unnamed3541___U3);
+    s.sprite___97995 = (r0);
+    s.tmp_2 = scene_followPath__P33193_mk(s);
+    s.tmp_2.arg0 = s.sprite___97995;
+    s.tmp_3 = r0 = globals.paths___97881;
+    s.tmp_5 = sprites_readDataNumber__P33155_mk(s);
+    s.tmp_5.arg0 = s.sprite___97995;
     s.tmp_5.arg1 = "path_index";
     s.callLocIdx = 130; s.pc = 11; return s.tmp_5;
   case 11:
@@ -3057,23 +2987,23 @@ switch (step) {
     s.callLocIdx = 131; s.pc = 10; return s.tmp_2;
   case 10:
     r0 = s.retval;
-    r0 = (s.unnamed1501___U3 + 1);
-    s.unnamed1501___U3 = (r0);
+    r0 = (s.unnamed3541___U3 + 1);
+    s.unnamed3541___U3 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed1500___U2 = (undefined);
-    globals.in_game___45904 = (true);
-    s.tmp_0 = timer_after__P3594_mk(s);
+    s.unnamed3540___U2 = (undefined);
+    globals.in_game___97761 = (true);
+    s.tmp_0 = timer_after__P33128_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P46012;
+    s.tmp_0.arg1 = inline__P98009;
     s.callLocIdx = 133; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    globals.in_game___45904 = (false);
-    s.tmp_0 = game_over__P2542_mk(s);
-    s.tmp_0.arg0 = globals.player_made_it___46018;
+    globals.in_game___97761 = (false);
+    s.tmp_0 = game_over__P31961_mk(s);
+    s.tmp_0.arg0 = globals.player_made_it___98015;
     s.tmp_0.arg1 = undefined;
     s.callLocIdx = 134; s.pc = 13; return s.tmp_0;
   case 13:
@@ -3083,12 +3013,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P45981.info = {"start":8318,"length":537,"line":212,"column":20,"endLine":228,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P97979.info = {"start":8318,"length":537,"line":212,"column":20,"endLine":228,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P45981_mk(s) {
+function inline__P97979_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P45981, depth: s.depth + 1,
+        parent: s, fn: inline__P97979, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3096,17 +3026,17 @@ function inline__P45981_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  index___45985: undefined,
-  sprite___45997: undefined,
-  unnamed1500___U2: undefined,
-  unnamed1501___U3: undefined,
+  index___97983: undefined,
+  sprite___97995: undefined,
+  unnamed3540___U2: undefined,
+  unnamed3541___U3: undefined,
 } }
 
 
 
 
 
-function inline__P46012(s) {
+function inline__P98009(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3116,7 +3046,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P2213_mk(s);
+    s.tmp_0 = info_startCountdown__P31632_mk(s);
     s.tmp_0.arg0 = 60;
     s.callLocIdx = 132; s.pc = 1; return s.tmp_0;
   case 1:
@@ -3125,12 +3055,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46012.info = {"start":8716,"length":59,"line":221,"column":25,"endLine":223,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98009.info = {"start":8716,"length":59,"line":221,"column":25,"endLine":223,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46012_mk(s) {
+function inline__P98009_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46012, depth: s.depth + 1,
+        parent: s, fn: inline__P98009, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3139,7 +3069,7 @@ function inline__P46012_mk(s) {
 
 
 
-function inline__P46024(s) {
+function inline__P98025(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3154,31 +3084,31 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    globals.player_made_it___46018 = (true);
-    s.tmp_0 = Sprite_setKind__P2071_mk(s);
+    globals.player_made_it___98015 = (true);
+    s.tmp_0 = Sprite_setKind__P31490_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.SurvivedPlayer___45894;
+    s.tmp_0.arg1 = globals.SurvivedPlayer___97751;
     s.callLocIdx = 138; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.last_15___45971);
+    r0 = pxsim_numops_toBoolDecr(globals.last_15___97956);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.last_15___45971 = (true);
-    s.tmp_0 = info_stopCountdown__P2214_mk(s);
+    globals.last_15___97956 = (true);
+    s.tmp_0 = info_stopCountdown__P31633_mk(s);
     s.callLocIdx = 139; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = timer_after__P3594_mk(s);
+    s.tmp_0 = timer_after__P33128_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P46037;
+    s.tmp_0.arg1 = inline__P98038;
     s.callLocIdx = 141; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = info_changeScoreBy__P2207_mk(s);
+    s.tmp_0 = info_changeScoreBy__P31626_mk(s);
     s.tmp_0.arg0 = 10000;
     s.callLocIdx = 142; s.pc = 6; return s.tmp_0;
   case 6:
@@ -3189,12 +3119,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46024.info = {"start":9029,"length":303,"line":233,"column":55,"endLine":244,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
+inline__P98025.info = {"start":9029,"length":303,"line":233,"column":55,"endLine":244,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
 
-function inline__P46024_mk(s) {
+function inline__P98025_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46024, depth: s.depth + 1,
+        parent: s, fn: inline__P98025, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3206,7 +3136,7 @@ function inline__P46024_mk(s) {
 
 
 
-function inline__P46037(s) {
+function inline__P98038(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3216,7 +3146,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P2213_mk(s);
+    s.tmp_0 = info_startCountdown__P31632_mk(s);
     s.tmp_0.arg0 = 15;
     s.callLocIdx = 140; s.pc = 1; return s.tmp_0;
   case 1:
@@ -3225,12 +3155,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46037.info = {"start":9230,"length":59,"line":239,"column":25,"endLine":241,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98038.info = {"start":9230,"length":59,"line":239,"column":25,"endLine":241,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46037_mk(s) {
+function inline__P98038_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46037, depth: s.depth + 1,
+        parent: s, fn: inline__P98038, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3239,7 +3169,7 @@ function inline__P46037_mk(s) {
 
 
 
-function inline__P46043(s) {
+function inline__P98044(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3254,30 +3184,30 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Sprite_destroy__P2087_mk(s);
+    s.tmp_0 = Sprite_destroy__P31506_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.spray___2798;
+    s.tmp_0.arg1 = globals.spray___32217;
     s.tmp_0.arg2 = 100;
     s.callLocIdx = 144; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
+    s.tmp_0 = sprites_changeDataNumberBy__P33154_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = -16;
     s.callLocIdx = 145; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P46054);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P98055);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P3594_mk(s);
+    s.tmp_1 = timer_after__P33128_mk(s);
     s.tmp_1.arg0 = 500;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 147; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P33276_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = false;
     s.callLocIdx = 148; s.pc = 6; return s.tmp_0;
@@ -3285,281 +3215,48 @@ switch (step) {
     r0 = s.retval;
     r0 = s.arg1.fields["_image"];
     s.tmp_1 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46064);
+    r0 = pxsim.image.ofBuffer(_hex98065);
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.equals(s.tmp_1, s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = Sprite_setImage__P2056_mk(s);
+    s.tmp_3 = Sprite_setImage__P31475_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex46068);
+    r0 = pxsim.image.ofBuffer(_hex98069);
     s.tmp_3.arg1 = r0;
     s.callLocIdx = 150; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex46072);
+    r0 = pxsim.image.ofBuffer(_hex98073);
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 151; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 2:
-    s.tmp_0 = pause__P402_mk(s);
-    s.tmp_0.arg0 = 5;
-    s.callLocIdx = 152; s.pc = 9; return s.tmp_0;
-  case 9:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P46075);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P98075);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P3594_mk(s);
+    s.tmp_1 = timer_after__P33128_mk(s);
     s.tmp_1.arg0 = 100;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 154; s.pc = 10; return s.tmp_1;
-  case 10:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P46043.info = {"start":9386,"length":2821,"line":245,"column":52,"endLine":312,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
-
-function inline__P46043_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P46043, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-const _hex46064 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex46068 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex46072 = pxsim.BufferMethods.createBufferFromHex("87042400100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110cbf111c3c3313c100bf1bccccccccc100bfbbf10f00cc0c00f0ffff0000000000")
-
-
-
-
-function inline__P46054(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
-    s.tmp_0.arg0 = s.caps[0];
-    s.tmp_0.arg1 = "speed_dif";
-    s.tmp_0.arg2 = 18;
-    s.callLocIdx = 146; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P46054.info = {"start":9541,"length":84,"line":248,"column":21,"endLine":250,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P46054_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P46054, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-} }
-
-
-
-
-
-function inline__P46075(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
-    s.tmp_0.arg0 = s.caps[0];
-    s.tmp_0.arg1 = true;
-    s.callLocIdx = 153; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P46075.info = {"start":12118,"length":86,"line":309,"column":21,"endLine":311,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P46075_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P46075, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-} }
-
-
-
-
-
-function inline__P46084(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    globals.selected_option___46088 = (true);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P46084.info = {"start":22589,"length":55,"line":465,"column":31,"endLine":467,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["option","index"]}
-
-function inline__P46084_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P46084, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function inline__P46093(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim_numops_toBoolDecr(true);
-    if (!r0) { step = 1; continue; }
-    s.tmp_0 = Sprite_destroy__P2087_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.spray___2798;
-    s.tmp_0.arg2 = 100;
-    s.callLocIdx = 203; s.pc = 5; return s.tmp_0;
-  case 5:
-    r0 = s.retval;
-  case 1:
-  case 2:
-    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = "speed_dif";
-    s.tmp_0.arg2 = -16;
-    s.callLocIdx = 204; s.pc = 6; return s.tmp_0;
-  case 6:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P46104);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P3594_mk(s);
-    s.tmp_1.arg0 = 500;
-    s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 206; s.pc = 7; return s.tmp_1;
-  case 7:
-    r0 = s.retval;
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = false;
-    s.callLocIdx = 207; s.pc = 8; return s.tmp_0;
-  case 8:
-    r0 = s.retval;
-    r0 = s.arg1.fields["_image"];
-    s.tmp_1 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46114);
-    s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.equals(s.tmp_1, s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 3; continue; }
-    s.tmp_3 = Sprite_setImage__P2056_mk(s);
-    s.tmp_3.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex46118);
-    s.tmp_3.arg1 = r0;
-    s.callLocIdx = 209; s.pc = 9; return s.tmp_3;
+    s.callLocIdx = 153; s.pc = 9; return s.tmp_1;
   case 9:
-    r0 = s.retval;
-    { step = 4; continue; }
-  case 3:
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex46122);
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 210; s.pc = 10; return s.tmp_0;
-  case 10:
-    r0 = s.retval;
-  case 4:
-    s.tmp_0 = pause__P402_mk(s);
-    s.tmp_0.arg0 = 5;
-    s.callLocIdx = 211; s.pc = 11; return s.tmp_0;
-  case 11:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P46125);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P3594_mk(s);
-    s.tmp_1.arg0 = 100;
-    s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 213; s.pc = 12; return s.tmp_1;
-  case 12:
-    r0 = s.retval;
-    s.tmp_0 = scene_cameraFollowSprite__P2464_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 214; s.pc = 13; return s.tmp_0;
-  case 13:
-    r0 = s.retval;
-    s.tmp_0 = timer_after__P3594_mk(s);
-    s.tmp_0.arg0 = 4500;
-    s.tmp_0.arg1 = inline__P46131;
-    s.callLocIdx = 217; s.pc = 14; return s.tmp_0;
-  case 14:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46093.info = {"start":22701,"length":2936,"line":468,"column":55,"endLine":543,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
+inline__P98044.info = {"start":9386,"length":2808,"line":245,"column":52,"endLine":311,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
 
-function inline__P46093_mk(s) {
+function inline__P98044_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46093, depth: s.depth + 1,
+        parent: s, fn: inline__P98044, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3569,14 +3266,14 @@ function inline__P46093_mk(s) {
   arg1: undefined,
 } }
 
-const _hex46114 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex46118 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex46122 = pxsim.BufferMethods.createBufferFromHex("87042000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110c")
+const _hex98065 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex98069 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex98073 = pxsim.BufferMethods.createBufferFromHex("87042400100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110cbf111c3c3313c100bf1bccccccccc100bfbbf10f00cc0c00f0ffff0000000000")
 
 
 
 
-function inline__P46104(s) {
+function inline__P98055(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3586,23 +3283,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
+    s.tmp_0 = sprites_changeDataNumberBy__P33154_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = 18;
-    s.callLocIdx = 205; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 146; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46104.info = {"start":22882,"length":84,"line":473,"column":21,"endLine":475,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98055.info = {"start":9541,"length":84,"line":248,"column":21,"endLine":250,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46104_mk(s) {
+function inline__P98055_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46104, depth: s.depth + 1,
+        parent: s, fn: inline__P98055, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3611,7 +3308,7 @@ function inline__P46104_mk(s) {
 
 
 
-function inline__P46125(s) {
+function inline__P98075(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3621,22 +3318,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P33276_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 212; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 152; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46125.info = {"start":25395,"length":86,"line":534,"column":21,"endLine":536,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98075.info = {"start":12105,"length":86,"line":308,"column":21,"endLine":310,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46125_mk(s) {
+function inline__P98075_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46125, depth: s.depth + 1,
+        parent: s, fn: inline__P98075, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3645,7 +3342,7 @@ function inline__P46125_mk(s) {
 
 
 
-function inline__P46131(s) {
+function inline__P98372(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3655,37 +3352,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals.in_game___45904 = (false);
-    s.tmp_0 = pause__P402_mk(s);
-    s.tmp_0.arg0 = 500;
-    s.callLocIdx = 215; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    s.tmp_0 = game_over__P2542_mk(s);
-    s.tmp_0.arg0 = false;
-    s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 216; s.pc = 2; return s.tmp_0;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    globals.selected_option___97970 = (true);
+    s.tmp_0 = music_playTone__P32274_mk(s);
+    s.tmp_0.arg0 = 294;
+    s.tmp_1 = music_beat__P32379_mk(s);
+    s.tmp_1.arg0 = 4;
+    s.callLocIdx = 207; s.pc = 2; return s.tmp_1;
   case 2:
+    r0 = s.retval;
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 208; s.pc = 1; return s.tmp_0;
+  case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46131.info = {"start":25547,"length":87,"line":538,"column":22,"endLine":542,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98372.info = {"start":22827,"length":113,"line":471,"column":31,"endLine":474,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["option","index"]}
 
-function inline__P46131_mk(s) {
+function inline__P98372_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46131, depth: s.depth + 1,
+        parent: s, fn: inline__P98372, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
+  arg0: undefined,
+  arg1: undefined,
 } }
 
 
 
 
 
-function inline__P46402(s) {
+function inline__P98382(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3695,72 +3400,116 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_3.arg0 = globals.NPC___45888;
-    s.callLocIdx = 265; s.pc = 5; return s.tmp_3;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim_numops_toBoolDecr(true);
+    if (!r0) { step = 1; continue; }
+    s.tmp_0 = Sprite_destroy__P31506_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = globals.spray___32217;
+    s.tmp_0.arg2 = 100;
+    s.callLocIdx = 210; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_2 = r0;
-    r0 = pxsim_Array__length(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 == 0);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
   case 1:
-    r0 = globals.player_made_it___46018;
   case 2:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
-    if (!r0) { step = 3; continue; }
-    s.tmp_5 = info_stopCountdown__P2214_mk(s);
-    s.callLocIdx = 266; s.pc = 6; return s.tmp_5;
+    s.tmp_0 = sprites_changeDataNumberBy__P33154_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.tmp_0.arg1 = "speed_dif";
+    s.tmp_0.arg2 = -16;
+    s.callLocIdx = 211; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
-    s.tmp_0.arg0 = 1000;
-    s.callLocIdx = 267; s.pc = 7; return s.tmp_0;
+    r0 = pxsim_pxtcore_mkAction(1, inline__P98393);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
+    s.tmp_1 = timer_after__P33128_mk(s);
+    s.tmp_1.arg0 = 500;
+    s.tmp_1.arg1 = s.tmp_0;
+    s.callLocIdx = 213; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = info_startCountdown__P2213_mk(s);
-    s.tmp_0.arg0 = 0;
-    s.callLocIdx = 268; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P33276_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.tmp_0.arg1 = false;
+    s.callLocIdx = 214; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
+    r0 = s.arg1.fields["_image"];
+    s.tmp_1 = r0;
+    r0 = pxsim.image.ofBuffer(_hex98403);
+    s.tmp_2 = r0;
+    r0 = pxsim_ImageMethods.equals(s.tmp_1, s.tmp_2);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 3; continue; }
+    s.tmp_3 = Sprite_setImage__P31475_mk(s);
+    s.tmp_3.arg0 = s.arg1;
+    r0 = pxsim.image.ofBuffer(_hex98407);
+    s.tmp_3.arg1 = r0;
+    s.callLocIdx = 216; s.pc = 9; return s.tmp_3;
+  case 9:
+    r0 = s.retval;
+    { step = 4; continue; }
   case 3:
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    r0 = pxsim.image.ofBuffer(_hex98411);
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 217; s.pc = 10; return s.tmp_0;
+  case 10:
+    r0 = s.retval;
   case 4:
-    s.tmp_0 = pause__P402_mk(s);
-    s.tmp_0.arg0 = 100;
-    s.callLocIdx = 269; s.pc = 9; return s.tmp_0;
-  case 9:
+    r0 = pxsim_pxtcore_mkAction(1, inline__P98413);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
+    s.tmp_1 = timer_after__P33128_mk(s);
+    s.tmp_1.arg0 = 100;
+    s.tmp_1.arg1 = s.tmp_0;
+    s.callLocIdx = 219; s.pc = 11; return s.tmp_1;
+  case 11:
+    r0 = s.retval;
+    s.tmp_0 = scene_cameraFollowSprite__P31883_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.callLocIdx = 220; s.pc = 12; return s.tmp_0;
+  case 12:
+    r0 = s.retval;
+    s.tmp_0 = timer_after__P33128_mk(s);
+    s.tmp_0.arg0 = 4500;
+    s.tmp_0.arg1 = inline__P98419;
+    s.callLocIdx = 223; s.pc = 13; return s.tmp_0;
+  case 13:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46402.info = {"start":70744,"length":191,"line":902,"column":8,"endLine":909,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98382.info = {"start":22997,"length":2923,"line":475,"column":55,"endLine":549,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
 
-function inline__P46402_mk(s) {
+function inline__P98382_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46402, depth: s.depth + 1,
+        parent: s, fn: inline__P98382, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
+  arg0: undefined,
+  arg1: undefined,
 } }
 
+const _hex98403 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex98407 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex98411 = pxsim.BufferMethods.createBufferFromHex("87042000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110c")
 
 
 
 
-function inline__P46414(s) {
+function inline__P98393(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3770,9 +3519,118 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___45914;
-    s.tmp_1 = update_minimap__P46080_mk(s);
+    s.tmp_0 = sprites_changeDataNumberBy__P33154_mk(s);
+    s.tmp_0.arg0 = s.caps[0];
+    s.tmp_0.arg1 = "speed_dif";
+    s.tmp_0.arg2 = 18;
+    s.callLocIdx = 212; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P98393.info = {"start":23178,"length":84,"line":480,"column":21,"endLine":482,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+
+function inline__P98393_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P98393, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function inline__P98413(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P33276_mk(s);
+    s.tmp_0.arg0 = s.caps[0];
+    s.tmp_0.arg1 = true;
+    s.callLocIdx = 218; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P98413.info = {"start":25678,"length":86,"line":540,"column":21,"endLine":542,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+
+function inline__P98413_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P98413, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function inline__P98419(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    globals.in_game___97761 = (false);
+    s.tmp_0 = pause__P29937_mk(s);
+    s.tmp_0.arg0 = 500;
+    s.callLocIdx = 221; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    s.tmp_0 = game_over__P31961_mk(s);
+    s.tmp_0.arg0 = false;
+    s.tmp_0.arg1 = undefined;
+    s.callLocIdx = 222; s.pc = 2; return s.tmp_0;
+  case 2:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P98419.info = {"start":25830,"length":87,"line":544,"column":22,"endLine":548,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+
+function inline__P98419_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P98419, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function inline__P98675(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___97771;
+    s.tmp_1 = update_minimap__P98267_mk(s);
     s.callLocIdx = 271; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
@@ -3784,22 +3642,97 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46414.info = {"start":70945,"length":57,"line":910,"column":8,"endLine":912,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98675.info = {"start":71027,"length":57,"line":908,"column":8,"endLine":910,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+
+function inline__P98675_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P98675, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+} }
+
+
+
+
+
+function inline__P98680(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.tmp_3 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_3.arg0 = globals.NPC___97745;
+    s.callLocIdx = 274; s.pc = 5; return s.tmp_3;
+  case 5:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = pxsim_Array__length(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 == 0);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 1; continue; }
+    r0 = s.tmp_0;
+    { step = 2; continue; }
+  case 1:
+    r0 = globals.player_made_it___98015;
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
+    if (!r0) { step = 3; continue; }
+    s.tmp_5 = info_stopCountdown__P31633_mk(s);
+    s.callLocIdx = 275; s.pc = 6; return s.tmp_5;
+  case 6:
+    r0 = s.retval;
+    s.tmp_0 = pause__P29937_mk(s);
+    s.tmp_0.arg0 = 1000;
+    s.callLocIdx = 276; s.pc = 7; return s.tmp_0;
+  case 7:
+    r0 = s.retval;
+    s.tmp_0 = info_startCountdown__P31632_mk(s);
+    s.tmp_0.arg0 = 0;
+    s.callLocIdx = 277; s.pc = 8; return s.tmp_0;
+  case 8:
+    r0 = s.retval;
+  case 3:
+  case 4:
+    s.tmp_0 = pause__P29937_mk(s);
+    s.tmp_0.arg0 = 100;
+    s.callLocIdx = 278; s.pc = 9; return s.tmp_0;
+  case 9:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P98680.info = {"start":71094,"length":191,"line":911,"column":8,"endLine":918,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46414_mk(s) {
+function inline__P98680_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46414, depth: s.depth + 1,
+        parent: s, fn: inline__P98680, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
 } }
 
 
 
 
 
-function inline__P46419(s) {
+function inline__P98692(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3809,35 +3742,35 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___45904);
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___97761);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 274; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 280; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.last_score_time___46141 = (r0);
-    s.tmp_0 = pause__P402_mk(s);
+    globals.last_score_time___98429 = (r0);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 275; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 281; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = info_changeScoreBy__P2207_mk(s);
-    s.tmp_1 = r0 = globals.last_score_time___46141;
-    s.tmp_3 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 276; s.pc = 6; return s.tmp_3;
+    s.tmp_0 = info_changeScoreBy__P31626_mk(s);
+    s.tmp_1 = r0 = globals.last_score_time___98429;
+    s.tmp_3 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 282; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 277; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 283; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 278; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 284; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 2:
@@ -3845,12 +3778,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46419.info = {"start":71012,"length":193,"line":913,"column":8,"endLine":921,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98692.info = {"start":71295,"length":193,"line":919,"column":8,"endLine":927,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46419_mk(s) {
+function inline__P98692_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46419, depth: s.depth + 1,
+        parent: s, fn: inline__P98692, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3862,7 +3795,7 @@ function inline__P46419_mk(s) {
 
 
 
-function inline__P46430(s) {
+function inline__P98703(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3872,50 +3805,50 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sprite_fish___46433 = undefined;
-    s.unnamed1510___U1 = undefined;
-    s.unnamed1511___U2 = undefined;
-    s.sprite_shark___46438 = undefined;
-    s.unnamed1512___U4 = undefined;
-    s.unnamed1513___U5 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___45904);
+    s.sprite_fish___98706 = undefined;
+    s.unnamed3550___U1 = undefined;
+    s.unnamed3551___U2 = undefined;
+    s.sprite_shark___98711 = undefined;
+    s.unnamed3552___U4 = undefined;
+    s.unnamed3553___U5 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___97761);
     if (!r0) { step = 11; continue; }
-    s.sprite_fish___46433 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.NPC___45888;
-    s.callLocIdx = 280; s.pc = 13; return s.tmp_0;
+    s.sprite_fish___98706 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.NPC___97745;
+    s.callLocIdx = 286; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.unnamed1510___U1 = (r0);
-    s.unnamed1511___U2 = (0);
+    s.unnamed3550___U1 = (r0);
+    s.unnamed3551___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed1511___U2;
-    r0 = pxsim_Array__length(s.unnamed1510___U1);
+    s.tmp_0 = r0 = s.unnamed3551___U2;
+    r0 = pxsim_Array__length(s.unnamed3550___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1510___U1, s.unnamed1511___U2);
-    s.sprite_fish___46433 = (r0);
-    s.sprite_shark___46438 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.Enemy___2131;
-    s.callLocIdx = 281; s.pc = 14; return s.tmp_0;
+    r0 = pxsim_Array__getAt(s.unnamed3550___U1, s.unnamed3551___U2);
+    s.sprite_fish___98706 = (r0);
+    s.sprite_shark___98711 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.Enemy___31550;
+    s.callLocIdx = 287; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.unnamed1512___U4 = (r0);
-    s.unnamed1513___U5 = (0);
+    s.unnamed3552___U4 = (r0);
+    s.unnamed3553___U5 = (0);
   case 2:
-    s.tmp_0 = r0 = s.unnamed1513___U5;
-    r0 = pxsim_Array__length(s.unnamed1512___U4);
+    s.tmp_0 = r0 = s.unnamed3553___U5;
+    r0 = pxsim_Array__length(s.unnamed3552___U4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1512___U4, s.unnamed1513___U5);
-    s.sprite_shark___46438 = (r0);
-    s.tmp_4 = spriteutils_distanceBetween__P3632_mk(s);
-    s.tmp_4.arg0 = s.sprite_fish___46433;
-    s.tmp_4.arg1 = s.sprite_shark___46438;
-    s.callLocIdx = 282; s.pc = 15; return s.tmp_4;
+    r0 = pxsim_Array__getAt(s.unnamed3552___U4, s.unnamed3553___U5);
+    s.sprite_shark___98711 = (r0);
+    s.tmp_4 = spriteutils_distanceBetween__P33166_mk(s);
+    s.tmp_4.arg0 = s.sprite_fish___98706;
+    s.tmp_4.arg1 = s.sprite_shark___98711;
+    s.callLocIdx = 288; s.pc = 15; return s.tmp_4;
   case 15:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -3926,10 +3859,10 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 4; continue; }
   case 3:
-    s.tmp_7 = sprites_readDataBoolean__P3625_mk(s);
-    s.tmp_7.arg0 = s.sprite_fish___46433;
+    s.tmp_7 = sprites_readDataBoolean__P33159_mk(s);
+    s.tmp_7.arg0 = s.sprite_fish___98706;
     s.tmp_7.arg1 = "running_away";
-    s.callLocIdx = 283; s.pc = 16; return s.tmp_7;
+    s.callLocIdx = 289; s.pc = 16; return s.tmp_7;
   case 16:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -3941,84 +3874,84 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 7; continue; }
-    s.tmp_9 = scene_followPath__P3659_mk(s);
-    s.tmp_9.arg0 = s.sprite_fish___46433;
-    s.tmp_10 = r0 = globals.paths___46005;
-    s.tmp_12 = sprites_readDataNumber__P3621_mk(s);
-    s.tmp_12.arg0 = s.sprite_fish___46433;
+    s.tmp_9 = scene_followPath__P33193_mk(s);
+    s.tmp_9.arg0 = s.sprite_fish___98706;
+    s.tmp_10 = r0 = globals.paths___97881;
+    s.tmp_12 = sprites_readDataNumber__P33155_mk(s);
+    s.tmp_12.arg0 = s.sprite_fish___98706;
     s.tmp_12.arg1 = "path_index";
-    s.callLocIdx = 284; s.pc = 18; return s.tmp_12;
+    s.callLocIdx = 290; s.pc = 18; return s.tmp_12;
   case 18:
     r0 = s.retval;
     s.tmp_11 = r0;
     r0 = pxsim_Array__getAt(s.tmp_10, s.tmp_11);
     s.tmp_9.arg1 = r0;
     s.tmp_9.arg2 = 0;
-    s.callLocIdx = 285; s.pc = 17; return s.tmp_9;
+    s.callLocIdx = 291; s.pc = 17; return s.tmp_9;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = spriteutils_setVelocityAtAngle__P3635_mk(s);
-    s.tmp_0.arg0 = s.sprite_fish___46433;
-    s.tmp_1 = spriteutils_angleFrom__P3633_mk(s);
-    s.tmp_1.arg0 = s.sprite_shark___46438;
-    s.tmp_1.arg1 = s.sprite_fish___46433;
-    s.callLocIdx = 286; s.pc = 20; return s.tmp_1;
+    s.tmp_0 = spriteutils_setVelocityAtAngle__P33169_mk(s);
+    s.tmp_0.arg0 = s.sprite_fish___98706;
+    s.tmp_1 = spriteutils_angleFrom__P33167_mk(s);
+    s.tmp_1.arg0 = s.sprite_shark___98711;
+    s.tmp_1.arg1 = s.sprite_fish___98706;
+    s.callLocIdx = 292; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 70;
-    s.callLocIdx = 287; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 293; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataBoolean__P3624_mk(s);
-    s.tmp_0.arg0 = s.sprite_fish___46433;
+    s.tmp_0 = sprites_setDataBoolean__P33158_mk(s);
+    s.tmp_0.arg0 = s.sprite_fish___98706;
     s.tmp_0.arg1 = "running_away";
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 288; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 294; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P46466);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P98739);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite_fish___46433);
-    s.tmp_1 = timer_after__P3594_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite_fish___98706);
+    s.tmp_1 = timer_after__P33128_mk(s);
     s.tmp_1.arg0 = 500;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 296; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 302; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
   case 5:
   case 6:
   case 7:
   case 8:
-    r0 = (s.unnamed1513___U5 + 1);
-    s.unnamed1513___U5 = (r0);
+    r0 = (s.unnamed3553___U5 + 1);
+    s.unnamed3553___U5 = (r0);
     { step = 2; continue; }
   case 9:
-    s.unnamed1512___U4 = (undefined);
-    s.tmp_0 = pause__P402_mk(s);
+    s.unnamed3552___U4 = (undefined);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 50;
-    s.callLocIdx = 297; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 303; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    r0 = (s.unnamed1511___U2 + 1);
-    s.unnamed1511___U2 = (r0);
+    r0 = (s.unnamed3551___U2 + 1);
+    s.unnamed3551___U2 = (r0);
     { step = 1; continue; }
   case 10:
-    s.unnamed1510___U1 = (undefined);
+    s.unnamed3550___U1 = (undefined);
   case 11:
   case 12:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46430.info = {"start":71215,"length":1171,"line":922,"column":8,"endLine":941,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98703.info = {"start":71498,"length":1171,"line":928,"column":8,"endLine":947,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46430_mk(s) {
+function inline__P98703_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46430, depth: s.depth + 1,
+        parent: s, fn: inline__P98703, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4033,19 +3966,19 @@ function inline__P46430_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  sprite_fish___46433: undefined,
-  unnamed1510___U1: undefined,
-  unnamed1511___U2: undefined,
-  sprite_shark___46438: undefined,
-  unnamed1512___U4: undefined,
-  unnamed1513___U5: undefined,
+  sprite_fish___98706: undefined,
+  unnamed3550___U1: undefined,
+  unnamed3551___U2: undefined,
+  sprite_shark___98711: undefined,
+  unnamed3552___U4: undefined,
+  unnamed3553___U5: undefined,
 } }
 
 
 
 
 
-function inline__P46466(s) {
+function inline__P98739(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4055,61 +3988,61 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_followPath__P3659_mk(s);
+    s.tmp_0 = scene_followPath__P33193_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = scene_aStar__P3655_mk(s);
-    s.tmp_2 = tiles_locationOfSprite__P3775_mk(s);
+    s.tmp_1 = scene_aStar__P33189_mk(s);
+    s.tmp_2 = tiles_locationOfSprite__P33309_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 289; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 295; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_3 = tiles_getTileLocation__P2344_mk(s);
-    s.tmp_4 = sprites_readDataNumber__P3621_mk(s);
+    s.tmp_3 = tiles_getTileLocation__P31763_mk(s);
+    s.tmp_4 = sprites_readDataNumber__P33155_mk(s);
     s.tmp_4.arg0 = s.caps[0];
     s.tmp_4.arg1 = "target_col";
-    s.callLocIdx = 290; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 296; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3.arg0 = r0;
-    s.tmp_5 = sprites_readDataNumber__P3621_mk(s);
+    s.tmp_5 = sprites_readDataNumber__P33155_mk(s);
     s.tmp_5.arg0 = s.caps[0];
     s.tmp_5.arg1 = "target_row";
-    s.callLocIdx = 291; s.pc = 6; return s.tmp_5;
+    s.callLocIdx = 297; s.pc = 6; return s.tmp_5;
   case 6:
     r0 = s.retval;
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 292; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 298; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = null;
-    s.callLocIdx = 293; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 299; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
     r0 = pxsim.Math_.randomRange(40, 80);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 294; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 300; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataBoolean__P3624_mk(s);
+    s.tmp_0 = sprites_setDataBoolean__P33158_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = "running_away";
     s.tmp_0.arg2 = false;
-    s.callLocIdx = 295; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 301; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46466.info = {"start":71915,"length":376,"line":931,"column":41,"endLine":934,"endColumn":25,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98739.info = {"start":72198,"length":376,"line":937,"column":41,"endLine":940,"endColumn":25,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46466_mk(s) {
+function inline__P98739_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46466, depth: s.depth + 1,
+        parent: s, fn: inline__P98739, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4123,7 +4056,7 @@ function inline__P46466_mk(s) {
 
 
 
-function inline__P46483(s) {
+function inline__P98756(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4133,179 +4066,179 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sprite_shark___46486 = undefined;
-    s.unnamed1514___U1 = undefined;
-    s.unnamed1515___U2 = undefined;
-    s.sprite___46492 = undefined;
-    s.unnamed1516___U4 = undefined;
-    s.unnamed1517___U5 = undefined;
-    s.sprite___46509 = undefined;
-    s.unnamed1518___U7 = undefined;
-    s.unnamed1519___U8 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___45904);
+    s.sprite_shark___98759 = undefined;
+    s.unnamed3554___U1 = undefined;
+    s.unnamed3555___U2 = undefined;
+    s.sprite___98765 = undefined;
+    s.unnamed3556___U4 = undefined;
+    s.unnamed3557___U5 = undefined;
+    s.sprite___98782 = undefined;
+    s.unnamed3558___U7 = undefined;
+    s.unnamed3559___U8 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___97761);
     if (!r0) { step = 15; continue; }
-    s.sprite_shark___46486 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.Enemy___2131;
-    s.callLocIdx = 299; s.pc = 17; return s.tmp_0;
+    s.sprite_shark___98759 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.Enemy___31550;
+    s.callLocIdx = 305; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
-    s.unnamed1514___U1 = (r0);
-    s.unnamed1515___U2 = (0);
+    s.unnamed3554___U1 = (r0);
+    s.unnamed3555___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed1515___U2;
-    r0 = pxsim_Array__length(s.unnamed1514___U1);
+    s.tmp_0 = r0 = s.unnamed3555___U2;
+    r0 = pxsim_Array__length(s.unnamed3554___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 14; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1514___U1, s.unnamed1515___U2);
-    s.sprite_shark___46486 = (r0);
-    globals.shortest_distance___46139 = (9999999999);
-    s.sprite___46492 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.NPC___45888;
-    s.callLocIdx = 300; s.pc = 18; return s.tmp_0;
+    r0 = pxsim_Array__getAt(s.unnamed3554___U1, s.unnamed3555___U2);
+    s.sprite_shark___98759 = (r0);
+    globals.shortest_distance___98427 = (9999999999);
+    s.sprite___98765 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.NPC___97745;
+    s.callLocIdx = 306; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.unnamed1516___U4 = (r0);
-    s.unnamed1517___U5 = (0);
+    s.unnamed3556___U4 = (r0);
+    s.unnamed3557___U5 = (0);
   case 2:
-    s.tmp_0 = r0 = s.unnamed1517___U5;
-    r0 = pxsim_Array__length(s.unnamed1516___U4);
+    s.tmp_0 = r0 = s.unnamed3557___U5;
+    r0 = pxsim_Array__length(s.unnamed3556___U4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1516___U4, s.unnamed1517___U5);
-    s.sprite___46492 = (r0);
-    s.tmp_4 = spriteutils_distanceBetween__P3632_mk(s);
-    s.tmp_4.arg0 = s.sprite_shark___46486;
-    s.tmp_4.arg1 = s.sprite___46492;
-    s.callLocIdx = 301; s.pc = 19; return s.tmp_4;
+    r0 = pxsim_Array__getAt(s.unnamed3556___U4, s.unnamed3557___U5);
+    s.sprite___98765 = (r0);
+    s.tmp_4 = spriteutils_distanceBetween__P33166_mk(s);
+    s.tmp_4.arg0 = s.sprite_shark___98759;
+    s.tmp_4.arg1 = s.sprite___98765;
+    s.callLocIdx = 307; s.pc = 19; return s.tmp_4;
   case 19:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 < globals.shortest_distance___46139);
+    r0 = (s.tmp_3 < globals.shortest_distance___98427);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    s.tmp_5 = spriteutils_distanceBetween__P3632_mk(s);
-    s.tmp_5.arg0 = s.sprite_shark___46486;
-    s.tmp_5.arg1 = s.sprite___46492;
-    s.callLocIdx = 302; s.pc = 20; return s.tmp_5;
+    s.tmp_5 = spriteutils_distanceBetween__P33166_mk(s);
+    s.tmp_5.arg0 = s.sprite_shark___98759;
+    s.tmp_5.arg1 = s.sprite___98765;
+    s.callLocIdx = 308; s.pc = 20; return s.tmp_5;
   case 20:
     r0 = s.retval;
-    globals.shortest_distance___46139 = (r0);
-    globals.sprite_closest_sprite___46137 = (s.sprite___46492);
+    globals.shortest_distance___98427 = (r0);
+    globals.sprite_closest_sprite___98425 = (s.sprite___98765);
   case 3:
   case 4:
-    r0 = (s.unnamed1517___U5 + 1);
-    s.unnamed1517___U5 = (r0);
+    r0 = (s.unnamed3557___U5 + 1);
+    s.unnamed3557___U5 = (r0);
     { step = 2; continue; }
   case 5:
-    s.unnamed1516___U4 = (undefined);
-    s.sprite___46509 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.Player___2128;
-    s.callLocIdx = 303; s.pc = 21; return s.tmp_0;
+    s.unnamed3556___U4 = (undefined);
+    s.sprite___98782 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.Player___31547;
+    s.callLocIdx = 309; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.unnamed1518___U7 = (r0);
-    s.unnamed1519___U8 = (0);
+    s.unnamed3558___U7 = (r0);
+    s.unnamed3559___U8 = (0);
   case 6:
-    s.tmp_0 = r0 = s.unnamed1519___U8;
-    r0 = pxsim_Array__length(s.unnamed1518___U7);
+    s.tmp_0 = r0 = s.unnamed3559___U8;
+    r0 = pxsim_Array__length(s.unnamed3558___U7);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1518___U7, s.unnamed1519___U8);
-    s.sprite___46509 = (r0);
-    s.tmp_4 = spriteutils_distanceBetween__P3632_mk(s);
-    s.tmp_4.arg0 = s.sprite_shark___46486;
-    s.tmp_4.arg1 = s.sprite___46509;
-    s.callLocIdx = 304; s.pc = 22; return s.tmp_4;
+    r0 = pxsim_Array__getAt(s.unnamed3558___U7, s.unnamed3559___U8);
+    s.sprite___98782 = (r0);
+    s.tmp_4 = spriteutils_distanceBetween__P33166_mk(s);
+    s.tmp_4.arg0 = s.sprite_shark___98759;
+    s.tmp_4.arg1 = s.sprite___98782;
+    s.callLocIdx = 310; s.pc = 22; return s.tmp_4;
   case 22:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 < globals.shortest_distance___46139);
+    r0 = (s.tmp_3 < globals.shortest_distance___98427);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 7; continue; }
-    s.tmp_5 = spriteutils_distanceBetween__P3632_mk(s);
-    s.tmp_5.arg0 = s.sprite_shark___46486;
-    s.tmp_5.arg1 = s.sprite___46509;
-    s.callLocIdx = 305; s.pc = 23; return s.tmp_5;
+    s.tmp_5 = spriteutils_distanceBetween__P33166_mk(s);
+    s.tmp_5.arg0 = s.sprite_shark___98759;
+    s.tmp_5.arg1 = s.sprite___98782;
+    s.callLocIdx = 311; s.pc = 23; return s.tmp_5;
   case 23:
     r0 = s.retval;
-    globals.shortest_distance___46139 = (r0);
-    globals.sprite_closest_sprite___46137 = (s.sprite___46509);
+    globals.shortest_distance___98427 = (r0);
+    globals.sprite_closest_sprite___98425 = (s.sprite___98782);
   case 7:
   case 8:
-    r0 = (s.unnamed1519___U8 + 1);
-    s.unnamed1519___U8 = (r0);
+    r0 = (s.unnamed3559___U8 + 1);
+    s.unnamed3559___U8 = (r0);
     { step = 6; continue; }
   case 9:
-    s.unnamed1518___U7 = (undefined);
-    r0 = globals.sprite_closest_sprite___46137.fields["_kind"];
+    s.unnamed3558___U7 = (undefined);
+    r0 = globals.sprite_closest_sprite___98425.fields["_kind"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == globals.NPC___45888);
+    r0 = (s.tmp_1 == globals.NPC___97745);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 10; continue; }
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 10:
-    r0 = globals.sprite_closest_sprite___46137.fields["_kind"];
+    r0 = globals.sprite_closest_sprite___98425.fields["_kind"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 == globals.Player___2128);
+    r0 = (s.tmp_2 == globals.Player___31547);
   case 11:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 12; continue; }
-    s.tmp_4 = Sprite_follow__P2089_mk(s);
-    s.tmp_4.arg0 = s.sprite_shark___46486;
-    s.tmp_4.arg1 = globals.sprite_closest_sprite___46137;
-    s.tmp_6 = sprites_readDataNumber__P3621_mk(s);
-    s.tmp_6.arg0 = s.sprite_shark___46486;
+    s.tmp_4 = Sprite_follow__P31508_mk(s);
+    s.tmp_4.arg0 = s.sprite_shark___98759;
+    s.tmp_4.arg1 = globals.sprite_closest_sprite___98425;
+    s.tmp_6 = sprites_readDataNumber__P33155_mk(s);
+    s.tmp_6.arg0 = s.sprite_shark___98759;
     s.tmp_6.arg1 = "speed_dif";
-    s.callLocIdx = 308; s.pc = 25; return s.tmp_6;
+    s.callLocIdx = 314; s.pc = 25; return s.tmp_6;
   case 25:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = (48 + s.tmp_5);
     s.tmp_4.arg2 = r0;
     s.tmp_4.arg3 = 400;
-    s.callLocIdx = 309; s.pc = 24; return s.tmp_4;
+    s.callLocIdx = 315; s.pc = 24; return s.tmp_4;
   case 24:
     r0 = s.retval;
     { step = 13; continue; }
   case 12:
-    s.tmp_0 = Sprite_follow__P2089_mk(s);
-    s.tmp_0.arg0 = s.sprite_shark___46486;
-    s.tmp_0.arg1 = globals.sprite_closest_sprite___46137;
+    s.tmp_0 = Sprite_follow__P31508_mk(s);
+    s.tmp_0.arg0 = s.sprite_shark___98759;
+    s.tmp_0.arg1 = globals.sprite_closest_sprite___98425;
     s.tmp_0.arg2 = 0;
     s.tmp_0.arg3 = 400;
-    s.callLocIdx = 310; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 316; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
   case 13:
-    r0 = (s.unnamed1515___U2 + 1);
-    s.unnamed1515___U2 = (r0);
+    r0 = (s.unnamed3555___U2 + 1);
+    s.unnamed3555___U2 = (r0);
     { step = 1; continue; }
   case 14:
-    s.unnamed1514___U1 = (undefined);
+    s.unnamed3554___U1 = (undefined);
   case 15:
   case 16:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46483.info = {"start":72396,"length":1167,"line":942,"column":8,"endLine":965,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P98756.info = {"start":72679,"length":1167,"line":948,"column":8,"endLine":971,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46483_mk(s) {
+function inline__P98756_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46483, depth: s.depth + 1,
+        parent: s, fn: inline__P98756, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4314,22 +4247,22 @@ function inline__P46483_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  sprite_shark___46486: undefined,
-  unnamed1514___U1: undefined,
-  unnamed1515___U2: undefined,
-  sprite___46492: undefined,
-  unnamed1516___U4: undefined,
-  unnamed1517___U5: undefined,
-  sprite___46509: undefined,
-  unnamed1518___U7: undefined,
-  unnamed1519___U8: undefined,
+  sprite_shark___98759: undefined,
+  unnamed3554___U1: undefined,
+  unnamed3555___U2: undefined,
+  sprite___98765: undefined,
+  unnamed3556___U4: undefined,
+  unnamed3557___U5: undefined,
+  sprite___98782: undefined,
+  unnamed3558___U7: undefined,
+  unnamed3559___U8: undefined,
 } }
 
 
 
 
 
-function Sprite_follow__P2089(s) {
+function Sprite_follow__P31508(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4339,9 +4272,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sc___7361 = undefined;
-    s.lastTime___7370 = undefined;
-    s.fs___7513 = undefined;
+    s.sc___36898 = undefined;
+    s.lastTime___36907 = undefined;
+    s.fs___37050 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -4350,7 +4283,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = (s.arg1 === s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -4358,12 +4291,12 @@ switch (step) {
     { step = 13; continue; }
   case 1:
   case 2:
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 443; s.pc = 14; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 400; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
-    s.sc___7361 = (r0);
-    r0 = s.sc___7361.fields["followingSprites"];
+    s.sc___36898 = (r0);
+    r0 = s.sc___36898.fields["followingSprites"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -4371,44 +4304,44 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = r0 = s.sc___7361;
+    s.tmp_3 = r0 = s.sc___36898;
     r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
     r0 = (s.tmp_3).fields["followingSprites"] = (s.tmp_4);
     r0 = pxsim_pxtrt.mklocRef();
-    s.lastTime___7370 = (r0);
-    s.tmp_0 = r0 = s.lastTime___7370;
-    s.tmp_2 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 444; s.pc = 15; return s.tmp_2;
+    s.lastTime___36907 = (r0);
+    s.tmp_0 = r0 = s.lastTime___36907;
+    s.tmp_2 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 401; s.pc = 15; return s.tmp_2;
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P7376);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P36913);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.lastTime___7370);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.sc___7361);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
-    r0 = s.sc___7361.fields["eventContext"];
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.lastTime___36907);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.sc___36898);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P29927_mk(s);
+    r0 = s.sc___36898.fields["eventContext"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 14;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 470; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 427; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P7515);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P37052);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFind__P109_mk(s);
-    r0 = s.sc___7361.fields["followingSprites"];
+    s.tmp_1 = helpers_arrayFind__P29644_mk(s);
+    r0 = s.sc___36898.fields["followingSprites"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 471; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 428; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    s.fs___7513 = (r0);
+    s.fs___37050 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -4426,52 +4359,52 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.fs___7513);
+    r0 = pxsim_numops_toBoolDecr(s.fs___37050);
     if (!r0) { step = 7; continue; }
-    r0 = s.sc___7361.fields["followingSprites"];
+    r0 = s.sc___36898.fields["followingSprites"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array_.removeElement(s.tmp_4, s.fs___7513);
-    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    r0 = pxsim_Array_.removeElement(s.tmp_4, s.fs___37050);
+    s.tmp_0 = Sprite_vx__P31449_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 472; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 429; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 473; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 430; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
   case 7:
   case 8:
     { step = 12; continue; }
   case 9:
-    r0 = pxsim_numops_toBoolDecr(s.fs___7513);
+    r0 = pxsim_numops_toBoolDecr(s.fs___37050);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_FollowingSprite__C1972_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_FollowingSprite__C31391_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = sprites_FollowingSprite_constructor__P1973_mk(s);
+    s.tmp_3 = sprites_FollowingSprite_constructor__P31392_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
     s.tmp_3.arg1 = s.arg0;
     s.tmp_3.arg2 = s.arg1;
     s.tmp_3.arg3 = s.arg2;
     s.tmp_3.arg4 = s.arg3;
-    s.callLocIdx = 474; s.pc = 20; return s.tmp_3;
+    s.callLocIdx = 431; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
-    r0 = s.sc___7361.fields["followingSprites"];
+    r0 = s.sc___36898.fields["followingSprites"];
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_4, s.tmp_2);
     { step = 11; continue; }
   case 10:
-    r0 = (s.fs___7513).fields["target"] = (s.arg1);
-    r0 = (s.fs___7513).fields["rate"] = (s.arg2);
-    r0 = (s.fs___7513).fields["turnRate"] = (s.arg3);
+    r0 = (s.fs___37050).fields["target"] = (s.arg1);
+    r0 = (s.fs___37050).fields["rate"] = (s.arg2);
+    r0 = (s.fs___37050).fields["turnRate"] = (s.arg3);
   case 11:
   case 12:
   case 13:
@@ -4479,21 +4412,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_follow__P2089.info = {"start":30060,"length":3128,"line":899,"column":4,"endLine":978,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"follow","argumentNames":["this","target","speed","turnRate"]}
+Sprite_follow__P31508.info = {"start":30060,"length":3128,"line":899,"column":4,"endLine":978,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"follow","argumentNames":["this","target","speed","turnRate"]}
 
-function Sprite_follow__P2089_mk(s) {
+function Sprite_follow__P31508_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_follow__P2089, depth: s.depth + 1,
+        parent: s, fn: Sprite_follow__P31508, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  sc___7361: undefined,
-  lastTime___7370: undefined,
-  fs___7513: undefined,
+  sc___36898: undefined,
+  lastTime___36907: undefined,
+  fs___37050: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -4504,7 +4437,7 @@ function Sprite_follow__P2089_mk(s) {
 
 
 
-function inline__P7376(s) {
+function inline__P36913(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4514,46 +4447,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currTime___7377 = undefined;
-    s.timeDiff___7380 = undefined;
-    s.destroyedSprites___7386 = undefined;
-    s.tmp_0 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 445; s.pc = 3; return s.tmp_0;
+    s.currTime___36914 = undefined;
+    s.timeDiff___36917 = undefined;
+    s.destroyedSprites___36923 = undefined;
+    s.tmp_0 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 402; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.currTime___7377 = (r0);
-    s.tmp_1 = r0 = s.currTime___7377;
+    s.currTime___36914 = (r0);
+    s.tmp_1 = r0 = s.currTime___36914;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 1000);
-    s.timeDiff___7380 = (r0);
+    s.timeDiff___36917 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.destroyedSprites___7386 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.destroyedSprites___7386, false);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P7390);
+    s.destroyedSprites___36923 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.destroyedSprites___36923, false);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P36927);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.destroyedSprites___7386);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.timeDiff___7380);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.destroyedSprites___36923);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.timeDiff___36917);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
     r0 = s.caps[1].fields["followingSprites"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 468; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 425; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.caps[0], s.currTime___7377);
-    r0 = pxsim_pxtrt_ldlocRef(s.destroyedSprites___7386);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[0], s.currTime___36914);
+    r0 = pxsim_pxtrt_ldlocRef(s.destroyedSprites___36923);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     s.tmp_1 = r0 = s.caps[1];
-    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P29643_mk(s);
     r0 = s.caps[1].fields["followingSprites"];
     s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = inline__P7497;
-    s.callLocIdx = 469; s.pc = 5; return s.tmp_3;
+    s.tmp_3.arg1 = inline__P37034;
+    s.callLocIdx = 426; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -4564,27 +4497,27 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P7376.info = {"start":30389,"length":2197,"line":907,"column":79,"endLine":955,"endColumn":13,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":[]}
+inline__P36913.info = {"start":30389,"length":2197,"line":907,"column":79,"endLine":955,"endColumn":13,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P7376_mk(s) {
+function inline__P36913_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P7376, depth: s.depth + 1,
+        parent: s, fn: inline__P36913, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  currTime___7377: undefined,
-  timeDiff___7380: undefined,
-  destroyedSprites___7386: undefined,
+  currTime___36914: undefined,
+  timeDiff___36917: undefined,
+  destroyedSprites___36923: undefined,
 } }
 
 
 
 
 
-function inline__P7390(s) {
+function inline__P36927(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4594,18 +4527,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.target___7393 = undefined;
-    s.self___7394 = undefined;
-    s.turnRate___7395 = undefined;
-    s.rate___7396 = undefined;
-    s.dx___7410 = undefined;
-    s.dy___7416 = undefined;
-    s.maxMomentumDiff___7435 = undefined;
-    s.angleToTarget___7442 = undefined;
-    s.targetTrajectoryVx___7447 = undefined;
-    s.targetTrajectoryVy___7453 = undefined;
-    s.diffVx___7459 = undefined;
-    s.diffVy___7464 = undefined;
+    s.target___36930 = undefined;
+    s.self___36931 = undefined;
+    s.turnRate___36932 = undefined;
+    s.rate___36933 = undefined;
+    s.dx___36947 = undefined;
+    s.dy___36953 = undefined;
+    s.maxMomentumDiff___36972 = undefined;
+    s.angleToTarget___36979 = undefined;
+    s.targetTrajectoryVx___36984 = undefined;
+    s.targetTrajectoryVy___36990 = undefined;
+    s.diffVx___36996 = undefined;
+    s.diffVy___37001 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -4619,11 +4552,11 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["target"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["target"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 446; s.pc = 8; return s.tmp_0; }
+     else { s.callLocIdx = 403; s.pc = 8; return s.tmp_0; }
     }
   case 8:
     r0 = s.retval;
-    s.target___7393 = (r0);
+    s.target___36930 = (r0);
     s.tmp_2 = if_self_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -4632,11 +4565,11 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["self"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["self"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 447; s.pc = 9; return s.tmp_2; }
+     else { s.callLocIdx = 404; s.pc = 9; return s.tmp_2; }
     }
   case 9:
     r0 = s.retval;
-    s.self___7394 = (r0);
+    s.self___36931 = (r0);
     s.tmp_3 = if_turnRate_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -4645,11 +4578,11 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["turnRate"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["turnRate"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 448; s.pc = 10; return s.tmp_3; }
+     else { s.callLocIdx = 405; s.pc = 10; return s.tmp_3; }
     }
   case 10:
     r0 = s.retval;
-    s.turnRate___7395 = (r0);
+    s.turnRate___36932 = (r0);
     s.tmp_4 = if_rate_1_mk(s);
     s.tmp_4.arg0 = s.tmp_1;
     if (!s.tmp_4.arg0.vtable.iface) {
@@ -4658,14 +4591,14 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["rate"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["rate"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 449; s.pc = 11; return s.tmp_4; }
+     else { s.callLocIdx = 406; s.pc = 11; return s.tmp_4; }
     }
   case 11:
     r0 = s.retval;
-    s.rate___7396 = (r0);
-    r0 = s.self___7394.fields["flags"];
+    s.rate___36933 = (r0);
+    r0 = s.self___36931.fields["flags"];
     s.tmp_2 = r0;
-    r0 = s.target___7393.fields["flags"];
+    r0 = s.target___36930.fields["flags"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 | s.tmp_3);
     s.tmp_1 = r0;
@@ -4673,53 +4606,53 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_4 = Sprite_vx__P2030_mk(s);
-    s.tmp_4.arg0 = s.self___7394;
+    s.tmp_4 = Sprite_vx__P31449_mk(s);
+    s.tmp_4.arg0 = s.self___36931;
     s.tmp_4.arg1 = 0;
-    s.callLocIdx = 450; s.pc = 12; return s.tmp_4;
+    s.callLocIdx = 407; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
-    s.tmp_0.arg0 = s.self___7394;
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
+    s.tmp_0.arg0 = s.self___36931;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 451; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 408; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = pxsim_pxtrt_stlocRef(s.caps[0], true);
     { step = 7; continue; }
   case 1:
   case 2:
-    s.tmp_1 = Sprite_x__P2025_mk(s);
-    s.tmp_1.arg0 = s.target___7393;
-    s.callLocIdx = 452; s.pc = 14; return s.tmp_1;
+    s.tmp_1 = Sprite_x__P31444_mk(s);
+    s.tmp_1.arg0 = s.target___36930;
+    s.callLocIdx = 409; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_x__P2025_mk(s);
-    s.tmp_3.arg0 = s.self___7394;
-    s.callLocIdx = 453; s.pc = 15; return s.tmp_3;
+    s.tmp_3 = Sprite_x__P31444_mk(s);
+    s.tmp_3.arg0 = s.self___36931;
+    s.callLocIdx = 410; s.pc = 15; return s.tmp_3;
   case 15:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dx___7410 = (r0);
-    s.tmp_1 = Sprite_y__P2027_mk(s);
-    s.tmp_1.arg0 = s.target___7393;
-    s.callLocIdx = 454; s.pc = 16; return s.tmp_1;
+    s.dx___36947 = (r0);
+    s.tmp_1 = Sprite_y__P31446_mk(s);
+    s.tmp_1.arg0 = s.target___36930;
+    s.callLocIdx = 411; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_y__P2027_mk(s);
-    s.tmp_3.arg0 = s.self___7394;
-    s.callLocIdx = 455; s.pc = 17; return s.tmp_3;
+    s.tmp_3 = Sprite_y__P31446_mk(s);
+    s.tmp_3.arg0 = s.self___36931;
+    s.callLocIdx = 412; s.pc = 17; return s.tmp_3;
   case 17:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dy___7416 = (r0);
-    s.tmp_2 = Math_abs__P123_mk(s);
-    s.tmp_2.arg0 = s.dx___7410;
-    s.callLocIdx = 456; s.pc = 18; return s.tmp_2;
+    s.dy___36953 = (r0);
+    s.tmp_2 = Math_abs__P29658_mk(s);
+    s.tmp_2.arg0 = s.dx___36947;
+    s.callLocIdx = 413; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -4730,9 +4663,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    s.tmp_4 = Math_abs__P123_mk(s);
-    s.tmp_4.arg0 = s.dy___7416;
-    s.callLocIdx = 457; s.pc = 19; return s.tmp_4;
+    s.tmp_4 = Math_abs__P29658_mk(s);
+    s.tmp_4.arg0 = s.dy___36953;
+    s.callLocIdx = 414; s.pc = 19; return s.tmp_4;
   case 19:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -4742,99 +4675,99 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
-    s.tmp_6 = Sprite_vx__P2030_mk(s);
-    s.tmp_6.arg0 = s.self___7394;
+    s.tmp_6 = Sprite_vx__P31449_mk(s);
+    s.tmp_6.arg0 = s.self___36931;
     s.tmp_6.arg1 = 0;
-    s.callLocIdx = 458; s.pc = 20; return s.tmp_6;
+    s.callLocIdx = 415; s.pc = 20; return s.tmp_6;
   case 20:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
-    s.tmp_0.arg0 = s.self___7394;
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
+    s.tmp_0.arg0 = s.self___36931;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 459; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 416; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     { step = 7; continue; }
   case 5:
   case 6:
-    r0 = (s.caps[1] * s.turnRate___7395);
+    r0 = (s.caps[1] * s.turnRate___36932);
     s.tmp_0 = r0;
-    r0 = (s.rate___7396 / 50);
+    r0 = (s.rate___36933 / 50);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.maxMomentumDiff___7435 = (r0);
-    r0 = pxsim.Math_.atan2(s.dy___7416, s.dx___7410);
-    s.angleToTarget___7442 = (r0);
-    r0 = pxsim.Math_.cos(s.angleToTarget___7442);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.rate___7396);
-    s.targetTrajectoryVx___7447 = (r0);
-    r0 = pxsim.Math_.sin(s.angleToTarget___7442);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.rate___7396);
-    s.targetTrajectoryVy___7453 = (r0);
-    s.tmp_0 = r0 = s.targetTrajectoryVx___7447;
-    s.tmp_2 = Sprite_vx__P2029_mk(s);
-    s.tmp_2.arg0 = s.self___7394;
-    s.callLocIdx = 460; s.pc = 22; return s.tmp_2;
+    s.maxMomentumDiff___36972 = (r0);
+    r0 = pxsim.Math_.atan2(s.dy___36953, s.dx___36947);
+    s.angleToTarget___36979 = (r0);
+    r0 = pxsim.Math_.cos(s.angleToTarget___36979);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 * s.rate___36933);
+    s.targetTrajectoryVx___36984 = (r0);
+    r0 = pxsim.Math_.sin(s.angleToTarget___36979);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 * s.rate___36933);
+    s.targetTrajectoryVy___36990 = (r0);
+    s.tmp_0 = r0 = s.targetTrajectoryVx___36984;
+    s.tmp_2 = Sprite_vx__P31448_mk(s);
+    s.tmp_2.arg0 = s.self___36931;
+    s.callLocIdx = 417; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.diffVx___7459 = (r0);
-    s.tmp_0 = r0 = s.targetTrajectoryVy___7453;
-    s.tmp_2 = Sprite_vy__P2031_mk(s);
-    s.tmp_2.arg0 = s.self___7394;
-    s.callLocIdx = 461; s.pc = 23; return s.tmp_2;
+    s.diffVx___36996 = (r0);
+    s.tmp_0 = r0 = s.targetTrajectoryVy___36990;
+    s.tmp_2 = Sprite_vy__P31450_mk(s);
+    s.tmp_2.arg0 = s.self___36931;
+    s.callLocIdx = 418; s.pc = 23; return s.tmp_2;
   case 23:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.diffVy___7464 = (r0);
-    s.tmp_0 = Sprite_vx__P2030_mk(s);
-    s.tmp_1 = r0 = s.self___7394;
+    s.diffVy___37001 = (r0);
+    s.tmp_0 = Sprite_vx__P31449_mk(s);
+    s.tmp_1 = r0 = s.self___36931;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = Sprite_vx__P2029_mk(s);
+    s.tmp_3 = Sprite_vx__P31448_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 463; s.pc = 25; return s.tmp_3;
+    s.callLocIdx = 420; s.pc = 25; return s.tmp_3;
   case 25:
     r0 = s.retval;
     s.tmp_2 = r0;
-    s.tmp_5 = Math_clamp__P122_mk(s);
-    r0 = (0 - s.maxMomentumDiff___7435);
+    s.tmp_5 = Math_clamp__P29657_mk(s);
+    r0 = (0 - s.maxMomentumDiff___36972);
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = s.maxMomentumDiff___7435;
-    s.tmp_5.arg2 = s.diffVx___7459;
-    s.callLocIdx = 462; s.pc = 26; return s.tmp_5;
+    s.tmp_5.arg1 = s.maxMomentumDiff___36972;
+    s.tmp_5.arg2 = s.diffVx___36996;
+    s.callLocIdx = 419; s.pc = 26; return s.tmp_5;
   case 26:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 464; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 421; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
-    s.tmp_1 = r0 = s.self___7394;
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
+    s.tmp_1 = r0 = s.self___36931;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = Sprite_vy__P2031_mk(s);
+    s.tmp_3 = Sprite_vy__P31450_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 466; s.pc = 28; return s.tmp_3;
+    s.callLocIdx = 423; s.pc = 28; return s.tmp_3;
   case 28:
     r0 = s.retval;
     s.tmp_2 = r0;
-    s.tmp_5 = Math_clamp__P122_mk(s);
-    r0 = (0 - s.maxMomentumDiff___7435);
+    s.tmp_5 = Math_clamp__P29657_mk(s);
+    r0 = (0 - s.maxMomentumDiff___36972);
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = s.maxMomentumDiff___7435;
-    s.tmp_5.arg2 = s.diffVy___7464;
-    s.callLocIdx = 465; s.pc = 29; return s.tmp_5;
+    s.tmp_5.arg1 = s.maxMomentumDiff___36972;
+    s.tmp_5.arg2 = s.diffVy___37001;
+    s.callLocIdx = 422; s.pc = 29; return s.tmp_5;
   case 29:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 467; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 424; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
   case 7:
@@ -4842,12 +4775,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P7390.info = {"start":30600,"length":1635,"line":912,"column":44,"endLine":946,"endColumn":17,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
+inline__P36927.info = {"start":30600,"length":1635,"line":912,"column":44,"endLine":946,"endColumn":17,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["fs"]}
 
-function inline__P7390_mk(s) {
+function inline__P36927_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P7390, depth: s.depth + 1,
+        parent: s, fn: inline__P36927, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4856,18 +4789,18 @@ function inline__P7390_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  target___7393: undefined,
-  self___7394: undefined,
-  turnRate___7395: undefined,
-  rate___7396: undefined,
-  dx___7410: undefined,
-  dy___7416: undefined,
-  maxMomentumDiff___7435: undefined,
-  angleToTarget___7442: undefined,
-  targetTrajectoryVx___7447: undefined,
-  targetTrajectoryVy___7453: undefined,
-  diffVx___7459: undefined,
-  diffVy___7464: undefined,
+  target___36930: undefined,
+  self___36931: undefined,
+  turnRate___36932: undefined,
+  rate___36933: undefined,
+  dx___36947: undefined,
+  dy___36953: undefined,
+  maxMomentumDiff___36972: undefined,
+  angleToTarget___36979: undefined,
+  targetTrajectoryVx___36984: undefined,
+  targetTrajectoryVy___36990: undefined,
+  diffVx___36996: undefined,
+  diffVy___37001: undefined,
   arg0: undefined,
 } }
 
@@ -4875,7 +4808,7 @@ function inline__P7390_mk(s) {
 
 
 
-function inline__P7497(s) {
+function inline__P37034(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4905,12 +4838,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P7497.info = {"start":32485,"length":67,"line":953,"column":32,"endLine":953,"endColumn":99,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
+inline__P37034.info = {"start":32485,"length":67,"line":953,"column":32,"endLine":953,"endColumn":99,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["fs"]}
 
-function inline__P7497_mk(s) {
+function inline__P37034_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P7497, depth: s.depth + 1,
+        parent: s, fn: inline__P37034, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4924,7 +4857,7 @@ function inline__P7497_mk(s) {
 
 
 
-function inline__P7515(s) {
+function inline__P37052(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4947,12 +4880,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P7515.info = {"start":32644,"length":27,"line":958,"column":44,"endLine":958,"endColumn":71,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
+inline__P37052.info = {"start":32644,"length":27,"line":958,"column":44,"endLine":958,"endColumn":71,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["fs"]}
 
-function inline__P7515_mk(s) {
+function inline__P37052_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P7515, depth: s.depth + 1,
+        parent: s, fn: inline__P37052, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4963,7 +4896,7 @@ function inline__P7515_mk(s) {
 
 
 
-function Sprite_vy__P2032(s) {
+function Sprite_vy__P31451(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4979,7 +4912,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -4990,12 +4923,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_vy__P2032.info = {"start":2705,"length":51,"line":108,"column":4,"endLine":110,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this","v"]}
+Sprite_vy__P31451.info = {"start":2705,"length":51,"line":108,"column":4,"endLine":110,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"vy","argumentNames":["this","v"]}
 
-function Sprite_vy__P2032_mk(s) {
+function Sprite_vy__P31451_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vy__P2032, depth: s.depth + 1,
+        parent: s, fn: Sprite_vy__P31451, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5008,7 +4941,7 @@ function Sprite_vy__P2032_mk(s) {
 
 
 
-function Sprite_vy__P2031(s) {
+function Sprite_vy__P31450(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5023,20 +4956,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_vy"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_vy__P2031.info = {"start":2543,"length":60,"line":103,"column":4,"endLine":105,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this"]}
-Sprite_vy__P2031.isGetter = true;
+Sprite_vy__P31450.info = {"start":2543,"length":60,"line":103,"column":4,"endLine":105,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"vy","argumentNames":["this"]}
+Sprite_vy__P31450.isGetter = true;
 
-function Sprite_vy__P2031_mk(s) {
+function Sprite_vy__P31450_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vy__P2031, depth: s.depth + 1,
+        parent: s, fn: Sprite_vy__P31450, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -5046,7 +4979,7 @@ function Sprite_vy__P2031_mk(s) {
 
 
 
-function Fx_toFloat__P166(s) {
+function Fx_toFloat__P29701(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5064,12 +4997,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toFloat__P166.info = {"start":2235,"length":81,"line":71,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toFloat","argumentNames":["v"]}
+Fx_toFloat__P29701.info = {"start":2235,"length":81,"line":71,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toFloat","argumentNames":["v"]}
 
-function Fx_toFloat__P166_mk(s) {
+function Fx_toFloat__P29701_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toFloat__P166, depth: s.depth + 1,
+        parent: s, fn: Fx_toFloat__P29701, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -5078,7 +5011,7 @@ function Fx_toFloat__P166_mk(s) {
 
 
 
-function Sprite_vx__P2030(s) {
+function Sprite_vx__P31449(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5094,7 +5027,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -5105,12 +5038,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_vx__P2030.info = {"start":2374,"length":51,"line":97,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this","v"]}
+Sprite_vx__P31449.info = {"start":2374,"length":51,"line":97,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"vx","argumentNames":["this","v"]}
 
-function Sprite_vx__P2030_mk(s) {
+function Sprite_vx__P31449_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vx__P2030, depth: s.depth + 1,
+        parent: s, fn: Sprite_vx__P31449, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5123,7 +5056,7 @@ function Sprite_vx__P2030_mk(s) {
 
 
 
-function Sprite_vx__P2029(s) {
+function Sprite_vx__P31448(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5138,20 +5071,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_vx"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_vx__P2029.info = {"start":2212,"length":60,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this"]}
-Sprite_vx__P2029.isGetter = true;
+Sprite_vx__P31448.info = {"start":2212,"length":60,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"vx","argumentNames":["this"]}
+Sprite_vx__P31448.isGetter = true;
 
-function Sprite_vx__P2029_mk(s) {
+function Sprite_vx__P31448_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vx__P2029, depth: s.depth + 1,
+        parent: s, fn: Sprite_vx__P31448, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -5161,7 +5094,7 @@ function Sprite_vx__P2029_mk(s) {
 
 
 
-function Sprite_y__P2027(s) {
+function Sprite_y__P31446(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5176,7 +5109,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_y"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 256);
@@ -5191,13 +5124,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_y__P2027.info = {"start":1849,"length":85,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this"]}
-Sprite_y__P2027.isGetter = true;
+Sprite_y__P31446.info = {"start":1849,"length":85,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"y","argumentNames":["this"]}
+Sprite_y__P31446.isGetter = true;
 
-function Sprite_y__P2027_mk(s) {
+function Sprite_y__P31446_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_y__P2027, depth: s.depth + 1,
+        parent: s, fn: Sprite_y__P31446, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5211,7 +5144,7 @@ function Sprite_y__P2027_mk(s) {
 
 
 
-function Sprite_x__P2025(s) {
+function Sprite_x__P31444(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5226,7 +5159,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_x"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 256);
@@ -5241,13 +5174,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_x__P2025.info = {"start":1501,"length":84,"line":70,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this"]}
-Sprite_x__P2025.isGetter = true;
+Sprite_x__P31444.info = {"start":1501,"length":84,"line":70,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"x","argumentNames":["this"]}
+Sprite_x__P31444.isGetter = true;
 
-function Sprite_x__P2025_mk(s) {
+function Sprite_x__P31444_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_x__P2025, depth: s.depth + 1,
+        parent: s, fn: Sprite_x__P31444, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5261,7 +5194,7 @@ function Sprite_x__P2025_mk(s) {
 
 
 
-function sprites_FollowingSprite_constructor__P1973(s) {
+function sprites_FollowingSprite_constructor__P31392(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5280,7 +5213,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_FollowingSprite__C1972_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_FollowingSprite__C31391_VT)) failedCast(r0);
     r0 = (s.arg0).fields["self"] = (s.arg1);
     r0 = (s.arg0).fields["target"] = (s.arg2);
     r0 = (s.arg0).fields["rate"] = (s.arg3);
@@ -5289,12 +5222,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_FollowingSprite_constructor__P1973.info = {"start":401,"length":163,"line":18,"column":8,"endLine":23,"endColumn":13,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["this","self","target","rate","turnRate"]}
+sprites_FollowingSprite_constructor__P31392.info = {"start":401,"length":163,"line":18,"column":8,"endLine":23,"endColumn":13,"fileName":"pxt_modules/game---hw/sprites.ts","functionName":"inline","argumentNames":["this","self","target","rate","turnRate"]}
 
-function sprites_FollowingSprite_constructor__P1973_mk(s) {
+function sprites_FollowingSprite_constructor__P31392_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_FollowingSprite_constructor__P1973, depth: s.depth + 1,
+        parent: s, fn: sprites_FollowingSprite_constructor__P31392, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -5307,7 +5240,7 @@ function sprites_FollowingSprite_constructor__P1973_mk(s) {
 
 
 
-function control_EventContext_registerFrameHandler__P392(s) {
+function control_EventContext_registerFrameHandler__P29927(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5317,8 +5250,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fn___7695 = undefined;
-    s.i___7704 = undefined;
+    s.fn___37232 = undefined;
+    s.i___37241 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -5326,7 +5259,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -5339,20 +5272,20 @@ switch (step) {
     r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
     r0 = (s.tmp_3).fields["frameCallbacks"] = (s.tmp_4);
-    s.tmp_0 = control_EventContext_registerFrameCallbacks__P4030_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameCallbacks__P33565_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 59; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(control_FrameCallback__C381_VT);
-    s.fn___7695 = (r0);
-    r0 = (s.fn___7695).fields["order"] = (s.arg1);
-    r0 = (s.fn___7695).fields["handler"] = (s.arg2);
-    s.i___7704 = (0);
+    r0 = pxsim_pxtcore_mkClassInstance(control_FrameCallback__C29916_VT);
+    s.fn___37232 = (r0);
+    r0 = (s.fn___37232).fields["order"] = (s.arg1);
+    r0 = (s.fn___37232).fields["handler"] = (s.arg2);
+    s.i___37241 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___7704;
+    s.tmp_1 = r0 = s.i___37241;
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -5363,7 +5296,7 @@ switch (step) {
     if (!r0) { step = 6; continue; }
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_6 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_6, s.i___7704);
+    r0 = pxsim_Array__getAt(s.tmp_6, s.i___37241);
     r0 = r0.fields["order"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > s.arg1);
@@ -5372,29 +5305,29 @@ switch (step) {
     if (!r0) { step = 4; continue; }
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_7 = r0;
-    r0 = pxsim_Array_.insertAt(s.tmp_7, s.i___7704, s.fn___7695);
-    r0 = s.fn___7695;
+    r0 = pxsim_Array_.insertAt(s.tmp_7, s.i___37241, s.fn___37232);
+    r0 = s.fn___37232;
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.i___7704 + 1);
-    s.i___7704 = (r0);
+    r0 = (s.i___37241 + 1);
+    s.i___37241 = (r0);
     { step = 3; continue; }
   case 6:
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.fn___7695);
-    r0 = s.fn___7695;
+    r0 = pxsim_Array__push(s.tmp_0, s.fn___37232);
+    r0 = s.fn___37232;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameHandler__P392.info = {"start":4675,"length":643,"line":143,"column":8,"endLine":160,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameHandler","argumentNames":["this","order","handler"]}
+control_EventContext_registerFrameHandler__P29927.info = {"start":4675,"length":643,"line":143,"column":8,"endLine":160,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameHandler","argumentNames":["this","order","handler"]}
 
-function control_EventContext_registerFrameHandler__P392_mk(s) {
+function control_EventContext_registerFrameHandler__P29927_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerFrameHandler__P392, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerFrameHandler__P29927, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5404,8 +5337,8 @@ function control_EventContext_registerFrameHandler__P392_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  fn___7695: undefined,
-  i___7704: undefined,
+  fn___37232: undefined,
+  i___37241: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -5415,7 +5348,7 @@ function control_EventContext_registerFrameHandler__P392_mk(s) {
 
 
 
-function control_EventContext_registerFrameCallbacks__P4030(s) {
+function control_EventContext_registerFrameCallbacks__P33565(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5425,13 +5358,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.worker___7738 = undefined;
+    s.worker___37275 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -5444,28 +5377,28 @@ switch (step) {
   case 1:
   case 2:
     r0 = s.arg0.fields["frameWorker"];
-    s.worker___7738 = (r0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P7744);
+    s.worker___37275 = (r0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P37281);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.worker___7738);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.worker___37275);
     r0 = pxsim.control.runInParallel(s.tmp_0);
   case 3:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks__P4030.info = {"start":3481,"length":895,"line":105,"column":8,"endLine":129,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameCallbacks","argumentNames":["this"]}
+control_EventContext_registerFrameCallbacks__P33565.info = {"start":3481,"length":895,"line":105,"column":8,"endLine":129,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameCallbacks","argumentNames":["this"]}
 
-function control_EventContext_registerFrameCallbacks__P4030_mk(s) {
+function control_EventContext_registerFrameCallbacks__P33565_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerFrameCallbacks__P4030, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerFrameCallbacks__P33565, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  worker___7738: undefined,
+  worker___37275: undefined,
   arg0: undefined,
 } }
 
@@ -5473,7 +5406,7 @@ function control_EventContext_registerFrameCallbacks__P4030_mk(s) {
 
 
 
-function inline__P7744(s) {
+function inline__P37281(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5483,15 +5416,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.delay___7774 = undefined;
+    s.delay___37311 = undefined;
     r0 = s.caps[0].fields["runningCallbacks"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P7750);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P37287);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.caps[0]);
-    s.tmp_2 = pauseUntil__P356_mk(s);
+    s.tmp_2 = pauseUntil__P29891_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     s.tmp_2.arg1 = undefined;
     s.callLocIdx = 53; s.pc = 5; return s.tmp_2;
@@ -5514,14 +5447,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = control_EventContext_runCallbacks__P4029_mk(s);
+    s.tmp_2 = control_EventContext_runCallbacks__P33564_mk(s);
     s.tmp_2.arg0 = s.caps[0];
     s.callLocIdx = 54; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
-    s.delay___7774 = (r0);
-    s.tmp_0 = pause__P402_mk(s);
-    s.tmp_0.arg0 = s.delay___7774;
+    s.delay___37311 = (r0);
+    s.tmp_0 = pause__P29937_mk(s);
+    s.tmp_0.arg0 = s.delay___37311;
     s.callLocIdx = 55; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
@@ -5532,24 +5465,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P7744.info = {"start":3642,"length":723,"line":109,"column":34,"endLine":128,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+inline__P37281.info = {"start":3642,"length":723,"line":109,"column":34,"endLine":128,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P7744_mk(s) {
+function inline__P37281_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P7744, depth: s.depth + 1,
+        parent: s, fn: inline__P37281, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  delay___7774: undefined,
+  delay___37311: undefined,
 } }
 
 
 
 
 
-function inline__P7750(s) {
+function inline__P37287(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5567,12 +5500,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P7750.info = {"start":3873,"length":28,"line":113,"column":31,"endLine":113,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+inline__P37287.info = {"start":3873,"length":28,"line":113,"column":31,"endLine":113,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P7750_mk(s) {
+function inline__P37287_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P7750, depth: s.depth + 1,
+        parent: s, fn: inline__P37287, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5582,7 +5515,7 @@ function inline__P7750_mk(s) {
 
 
 
-function control_EventContext_runCallbacks__P4029(s) {
+function control_EventContext_runCallbacks__P33564(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5592,42 +5525,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.loopStart___7783 = undefined;
-    s.f___7796 = undefined;
-    s.unnamed88___U2 = undefined;
-    s.unnamed89___U3 = undefined;
-    s.runtime___7801 = undefined;
-    s.fps___7821 = undefined;
-    s.delay___7883 = undefined;
+    s.loopStart___37320 = undefined;
+    s.f___37333 = undefined;
+    s.unnamed928___U2 = undefined;
+    s.unnamed929___U3 = undefined;
+    s.runtime___37338 = undefined;
+    s.fps___37358 = undefined;
+    s.delay___37420 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
     r0 = pxsim.control.millis();
-    s.loopStart___7783 = (r0);
+    s.loopStart___37320 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["prevTimeMillis"];
     s.tmp_2 = r0;
-    r0 = (s.loopStart___7783 - s.tmp_2);
+    r0 = (s.loopStart___37320 - s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["deltaTimeMillis"] = (s.tmp_1);
-    r0 = (s.arg0).fields["prevTimeMillis"] = (s.loopStart___7783);
-    s.f___7796 = (undefined);
+    r0 = (s.arg0).fields["prevTimeMillis"] = (s.loopStart___37320);
+    s.f___37333 = (undefined);
     r0 = s.arg0.fields["frameCallbacks"];
-    s.unnamed88___U2 = (r0);
-    s.unnamed89___U3 = (0);
+    s.unnamed928___U2 = (r0);
+    s.unnamed929___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed89___U3;
-    r0 = pxsim_Array__length(s.unnamed88___U2);
+    s.tmp_0 = r0 = s.unnamed929___U3;
+    r0 = pxsim_Array__length(s.unnamed928___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed88___U2, s.unnamed89___U3);
-    s.f___7796 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed928___U2, s.unnamed929___U3);
+    s.f___37333 = (r0);
     s.tmp_2 = if_handler_1_mk(s);
-    s.tmp_2.arg0 = s.f___7796;
+    s.tmp_2.arg0 = s.f___37333;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "handler"), 1);
       s.callLocIdx = 50; s.pc = 13; return s.tmp_2;
@@ -5639,19 +5572,19 @@ switch (step) {
     }
   case 13:
     r0 = s.retval;
-    r0 = (s.unnamed89___U3 + 1);
-    s.unnamed89___U3 = (r0);
+    r0 = (s.unnamed929___U3 + 1);
+    s.unnamed929___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed88___U2 = (undefined);
+    s.unnamed928___U2 = (undefined);
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.loopStart___7783);
-    s.runtime___7801 = (r0);
+    r0 = (s.tmp_0 - s.loopStart___37320);
+    s.runtime___37338 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["timeInSample"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.runtime___7801);
+    r0 = (s.tmp_2 + s.runtime___37338);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["timeInSample"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
@@ -5684,8 +5617,8 @@ switch (step) {
     r0 = (s.tmp_6 / 1000);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 / s.tmp_5);
-    s.fps___7821 = (r0);
-    r0 = pxsim.Math_.round(s.fps___7821);
+    s.fps___37358 = (r0);
+    r0 = pxsim.Math_.round(s.fps___37358);
     s.tmp_1 = r0;
     if ((s.tmp_1) && (s.tmp_1).vtable) {
     setupResume(s, 14);
@@ -5697,21 +5630,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat("fps:", s.tmp_0);
-    globals.control_EventContext_lastStats___386 = (r0);
-    r0 = (s.fps___7821 < 99);
+    globals.control_EventContext_lastStats___29921 = (r0);
+    r0 = (s.fps___37358 < 99);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    if ((globals.control_EventContext_lastStats___386) && (globals.control_EventContext_lastStats___386).vtable) {
+    if ((globals.control_EventContext_lastStats___29921) && (globals.control_EventContext_lastStats___29921).vtable) {
     setupResume(s, 15);
-    pxsim_String__stringConv(globals.control_EventContext_lastStats___386);
+    pxsim_String__stringConv(globals.control_EventContext_lastStats___29921);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.control_EventContext_lastStats___386) + ""; }
+    } else { s.retval = (globals.control_EventContext_lastStats___29921) + ""; }
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.fps___7821 * 10);
+    r0 = (s.fps___37358 * 10);
     s.tmp_7 = r0;
     r0 = pxsim.Math_.round(s.tmp_7);
     s.tmp_6 = r0;
@@ -5738,10 +5671,10 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_2);
-    globals.control_EventContext_lastStats___386 = (r0);
+    globals.control_EventContext_lastStats___29921 = (r0);
   case 5:
   case 6:
-    s.tmp_2 = control_ramSize__P335_mk(s);
+    s.tmp_2 = control_ramSize__P29870_mk(s);
     s.callLocIdx = 51; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
@@ -5761,7 +5694,7 @@ switch (step) {
     if (!r0) { step = 9; continue; }
     r0 = pxsim_String_.mkEmpty();
     s.tmp_8 = r0;
-    r0 = (s.fps___7821 * 100);
+    r0 = (s.fps___37358 * 100);
     s.tmp_11 = r0;
     r0 = (s.tmp_11 | 0);
     s.tmp_10 = r0;
@@ -5802,24 +5735,24 @@ switch (step) {
     r0 = (s.arg0).fields["framesInSample"] = (0);
   case 11:
   case 12:
-    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0 = Math_max__P29660_mk(s);
     s.tmp_0.arg0 = 1;
-    r0 = (20 - s.runtime___7801);
+    r0 = (20 - s.runtime___37338);
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 52; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.delay___7883 = (r0);
-    r0 = s.delay___7883;
+    s.delay___37420 = (r0);
+    r0 = s.delay___37420;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_runCallbacks__P4029.info = {"start":2182,"length":1246,"line":74,"column":8,"endLine":102,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
+control_EventContext_runCallbacks__P33564.info = {"start":2182,"length":1246,"line":74,"column":8,"endLine":102,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
 
-function control_EventContext_runCallbacks__P4029_mk(s) {
+function control_EventContext_runCallbacks__P33564_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_runCallbacks__P4029, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_runCallbacks__P33564, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5835,13 +5768,13 @@ function control_EventContext_runCallbacks__P4029_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  loopStart___7783: undefined,
-  f___7796: undefined,
-  unnamed88___U2: undefined,
-  unnamed89___U3: undefined,
-  runtime___7801: undefined,
-  fps___7821: undefined,
-  delay___7883: undefined,
+  loopStart___37320: undefined,
+  f___37333: undefined,
+  unnamed928___U2: undefined,
+  unnamed929___U3: undefined,
+  runtime___37338: undefined,
+  fps___37358: undefined,
+  delay___37420: undefined,
   arg0: undefined,
 } }
 
@@ -5849,7 +5782,7 @@ function control_EventContext_runCallbacks__P4029_mk(s) {
 
 
 
-function Math_max__P125(s) {
+function Math_max__P29660(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5877,12 +5810,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_max__P125.info = {"start":15575,"length":105,"line":529,"column":4,"endLine":532,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"max","argumentNames":["a","b"]}
+Math_max__P29660.info = {"start":15575,"length":105,"line":529,"column":4,"endLine":532,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"max","argumentNames":["a","b"]}
 
-function Math_max__P125_mk(s) {
+function Math_max__P29660_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_max__P125, depth: s.depth + 1,
+        parent: s, fn: Math_max__P29660, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -5893,7 +5826,7 @@ function Math_max__P125_mk(s) {
 
 
 
-function pauseUntil__P356(s) {
+function pauseUntil__P29891(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5940,7 +5873,7 @@ switch (step) {
     s.arg1 = (0);
   case 5:
   case 6:
-    s.tmp_0 = control___queuePollEvent__P355_mk(s);
+    s.tmp_0 = control___queuePollEvent__P29890_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = undefined;
@@ -5952,12 +5885,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pauseUntil__P356.info = {"start":2205,"length":227,"line":73,"column":0,"endLine":77,"endColumn":1,"fileName":"pxt_modules/base/poll.ts","functionName":"pauseUntil","argumentNames":["condition","timeOut"]}
+pauseUntil__P29891.info = {"start":2205,"length":227,"line":73,"column":0,"endLine":77,"endColumn":1,"fileName":"pxt_modules/base/poll.ts","functionName":"pauseUntil","argumentNames":["condition","timeOut"]}
 
-function pauseUntil__P356_mk(s) {
+function pauseUntil__P29891_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pauseUntil__P356, depth: s.depth + 1,
+        parent: s, fn: pauseUntil__P29891, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5973,7 +5906,7 @@ function pauseUntil__P356_mk(s) {
 
 
 
-function control___queuePollEvent__P355(s) {
+function control___queuePollEvent__P29890(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5983,16 +5916,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ev___7905 = undefined;
+    s.ev___37442 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(control_PollEvent__C4003_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_PollEvent__C33538_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_PollEvent_constructor__P4004_mk(s);
+    s.tmp_1 = control_PollEvent_constructor__P33539_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = pxsim.control.allocateNotifyEvent();
     s.tmp_1.arg1 = r0;
@@ -6008,8 +5941,8 @@ switch (step) {
     s.callLocIdx = 35; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.ev___7905 = (s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(globals._pollEventQueue___4006);
+    s.ev___37442 = (s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(globals._pollEventQueue___33541);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -6017,19 +5950,19 @@ switch (step) {
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
     s.tmp_2 = r0;
-    r0 = pxsim_Array__push(s.tmp_2, s.ev___7905);
-    globals._pollEventQueue___4006 = (s.tmp_2);
-    r0 = pxsim.control.runInParallel(control_pollEvents__P4007);
+    r0 = pxsim_Array__push(s.tmp_2, s.ev___37442);
+    globals._pollEventQueue___33541 = (s.tmp_2);
+    r0 = pxsim.control.runInParallel(control_pollEvents__P33542);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__push(globals._pollEventQueue___4006, s.ev___7905);
+    r0 = pxsim_Array__push(globals._pollEventQueue___33541, s.ev___37442);
   case 2:
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = control_onEvent__P380_mk(s);
-    r0 = s.ev___7905.fields["eid"];
+    s.tmp_0 = control_onEvent__P29915_mk(s);
+    r0 = s.ev___37442.fields["eid"];
     s.tmp_0.arg0 = r0;
-    r0 = s.ev___7905.fields["vid"];
+    r0 = s.ev___37442.fields["vid"];
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = 16;
@@ -6038,9 +5971,9 @@ switch (step) {
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    r0 = s.ev___7905.fields["eid"];
+    r0 = s.ev___37442.fields["eid"];
     s.tmp_0 = r0;
-    r0 = s.ev___7905.fields["vid"];
+    r0 = s.ev___37442.fields["vid"];
     s.tmp_1 = r0;
     setupResume(s, 7);
     pxsim.control.waitForEvent(s.tmp_0, s.tmp_1);
@@ -6053,17 +5986,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control___queuePollEvent__P355.info = {"start":1262,"length":739,"line":39,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"__queuePollEvent","argumentNames":["timeOut","condition","handler"]}
+control___queuePollEvent__P29890.info = {"start":1262,"length":739,"line":39,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"__queuePollEvent","argumentNames":["timeOut","condition","handler"]}
 
-function control___queuePollEvent__P355_mk(s) {
+function control___queuePollEvent__P29890_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control___queuePollEvent__P355, depth: s.depth + 1,
+        parent: s, fn: control___queuePollEvent__P29890, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  ev___7905: undefined,
+  ev___37442: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -6073,7 +6006,7 @@ function control___queuePollEvent__P355_mk(s) {
 
 
 
-function control_pollEvents__P4007(s) {
+function control_pollEvents__P33542(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6083,31 +6016,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.now___8031 = undefined;
-    s.i___8034 = undefined;
-    s.ev___8040 = undefined;
+    s.now___37568 = undefined;
+    s.i___37571 = undefined;
+    s.ev___37577 = undefined;
   case 1:
-    r0 = pxsim_Array__length(globals._pollEventQueue___4006);
+    r0 = pxsim_Array__length(globals._pollEventQueue___33541);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
     r0 = pxsim.control.millis();
-    s.now___8031 = (r0);
-    s.i___8034 = (0);
+    s.now___37568 = (r0);
+    s.i___37571 = (0);
   case 2:
-    s.tmp_1 = r0 = s.i___8034;
-    r0 = pxsim_Array__length(globals._pollEventQueue___4006);
+    s.tmp_1 = r0 = s.i___37571;
+    r0 = pxsim_Array__length(globals._pollEventQueue___33541);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = pxsim_Array__getAt(globals._pollEventQueue___4006, s.i___8034);
-    s.ev___8040 = (r0);
+    r0 = pxsim_Array__getAt(globals._pollEventQueue___33541, s.i___37571);
+    s.ev___37577 = (r0);
     s.tmp_1 = if_condition_1_mk(s);
-    s.tmp_1.arg0 = s.ev___8040;
+    s.tmp_1.arg0 = s.ev___37577;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "condition"), 1);
       s.callLocIdx = 32; s.pc = 13; return s.tmp_1;
@@ -6125,7 +6058,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 3:
-    r0 = s.ev___8040.fields["timeOut"];
+    r0 = s.ev___37577.fields["timeOut"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 > 0);
     s.tmp_2 = r0;
@@ -6134,11 +6067,11 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 5; continue; }
   case 4:
-    r0 = s.ev___8040.fields["start"];
+    r0 = s.ev___37577.fields["start"];
     s.tmp_5 = r0;
-    r0 = (s.now___8031 - s.tmp_5);
+    r0 = (s.now___37568 - s.tmp_5);
     s.tmp_4 = r0;
-    r0 = s.ev___8040.fields["timeOut"];
+    r0 = s.ev___37577.fields["timeOut"];
     s.tmp_6 = r0;
     r0 = (s.tmp_4 > s.tmp_6);
   case 5:
@@ -6150,50 +6083,50 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 9; continue; }
-    r0 = s.ev___8040.fields["eid"];
+    r0 = s.ev___37577.fields["eid"];
     s.tmp_9 = r0;
-    r0 = s.ev___8040.fields["vid"];
+    r0 = s.ev___37577.fields["vid"];
     s.tmp_10 = r0;
     r0 = pxsim.control.raiseEvent(s.tmp_9, s.tmp_10);
-    r0 = s.ev___8040.fields["once"];
+    r0 = s.ev___37577.fields["once"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = helpers_arraySplice__P98_mk(s);
-    s.tmp_1.arg0 = globals._pollEventQueue___4006;
-    s.tmp_1.arg1 = s.i___8034;
+    s.tmp_1 = helpers_arraySplice__P29633_mk(s);
+    s.tmp_1.arg0 = globals._pollEventQueue___33541;
+    s.tmp_1.arg1 = s.i___37571;
     s.tmp_1.arg2 = 1;
     s.callLocIdx = 33; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
-    r0 = (s.i___8034 - 1);
-    s.i___8034 = (r0);
+    r0 = (s.i___37571 - 1);
+    s.i___37571 = (r0);
   case 7:
   case 8:
   case 9:
   case 10:
-    r0 = (s.i___8034 + 1);
-    s.i___8034 = (r0);
+    r0 = (s.i___37571 + 1);
+    s.i___37571 = (r0);
     { step = 2; continue; }
   case 11:
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 50;
     s.callLocIdx = 34; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     { step = 1; continue; }
   case 12:
-    globals._pollEventQueue___4006 = (undefined);
+    globals._pollEventQueue___33541 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_pollEvents__P4007.info = {"start":618,"length":638,"line":20,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"pollEvents","argumentNames":[]}
+control_pollEvents__P33542.info = {"start":618,"length":638,"line":20,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"pollEvents","argumentNames":[]}
 
-function control_pollEvents__P4007_mk(s) {
+function control_pollEvents__P33542_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_pollEvents__P4007, depth: s.depth + 1,
+        parent: s, fn: control_pollEvents__P33542, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6206,16 +6139,16 @@ function control_pollEvents__P4007_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  now___8031: undefined,
-  i___8034: undefined,
-  ev___8040: undefined,
+  now___37568: undefined,
+  i___37571: undefined,
+  ev___37577: undefined,
 } }
 
 
 
 
 
-function helpers_arraySplice__P98(s) {
+function helpers_arraySplice__P29633(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6225,7 +6158,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___8088 = undefined;
+    s.i___37625 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -6239,15 +6172,15 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.i___8088 = (0);
+    s.i___37625 = (0);
   case 3:
-    r0 = (s.i___8088 < s.arg2);
+    r0 = (s.i___37625 < s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
     r0 = pxsim_Array_.removeAt(s.arg0, s.arg1);
-    r0 = (s.i___8088 + 1);
-    s.i___8088 = (r0);
+    r0 = (s.i___37625 + 1);
+    s.i___37625 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -6255,15 +6188,15 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySplice__P98.info = {"start":3642,"length":213,"line":137,"column":4,"endLine":144,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySplice","argumentNames":["arr","start","len"]}
+helpers_arraySplice__P29633.info = {"start":3642,"length":213,"line":137,"column":4,"endLine":144,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySplice","argumentNames":["arr","start","len"]}
 
-function helpers_arraySplice__P98_mk(s) {
+function helpers_arraySplice__P29633_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySplice__P98, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySplice__P29633, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  i___8088: undefined,
+  i___37625: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -6273,7 +6206,7 @@ function helpers_arraySplice__P98_mk(s) {
 
 
 
-function control_PollEvent_constructor__P4004(s) {
+function control_PollEvent_constructor__P33539(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6294,7 +6227,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_PollEvent__C4003_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_PollEvent__C33538_VT)) failedCast(r0);
     r0 = (s.arg0).fields["eid"] = (s.arg1);
     r0 = (s.arg0).fields["vid"] = (s.arg2);
     r0 = (s.arg0).fields["start"] = (s.arg3);
@@ -6305,12 +6238,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_PollEvent_constructor__P4004.info = {"start":239,"length":316,"line":8,"column":8,"endLine":15,"endColumn":9,"fileName":"pxt_modules/base/poll.ts","functionName":"inline","argumentNames":["this","eid","vid","start","timeOut","condition","once"]}
+control_PollEvent_constructor__P33539.info = {"start":239,"length":316,"line":8,"column":8,"endLine":15,"endColumn":9,"fileName":"pxt_modules/base/poll.ts","functionName":"inline","argumentNames":["this","eid","vid","start","timeOut","condition","once"]}
 
-function control_PollEvent_constructor__P4004_mk(s) {
+function control_PollEvent_constructor__P33539_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_PollEvent_constructor__P4004, depth: s.depth + 1,
+        parent: s, fn: control_PollEvent_constructor__P33539, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -6325,7 +6258,7 @@ function control_PollEvent_constructor__P4004_mk(s) {
 
 
 
-function control_onEvent__P380(s) {
+function control_onEvent__P29915(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6335,7 +6268,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___7947 = undefined;
+    s.ctx___37484 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -6343,12 +6276,12 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = control_eventContext__P397_mk(s);
+    s.tmp_0 = control_eventContext__P29932_mk(s);
     s.callLocIdx = 47; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.ctx___7947 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___7947);
+    s.ctx___37484 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___37484);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -6357,8 +6290,8 @@ switch (step) {
     r0 = pxsim.control.internalOnEvent(s.arg0, s.arg1, s.arg2, s.arg3);
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = control_EventContext_registerHandler__P394_mk(s);
-    s.tmp_0.arg0 = s.ctx___7947;
+    s.tmp_0 = control_EventContext_registerHandler__P29929_mk(s);
+    s.tmp_0.arg0 = s.ctx___37484;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg2;
@@ -6371,16 +6304,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_onEvent__P380.info = {"start":336,"length":325,"line":9,"column":4,"endLine":15,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"onEvent","argumentNames":["src","value","handler","flags"]}
+control_onEvent__P29915.info = {"start":336,"length":325,"line":9,"column":4,"endLine":15,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"onEvent","argumentNames":["src","value","handler","flags"]}
 
-function control_onEvent__P380_mk(s) {
+function control_onEvent__P29915_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_onEvent__P380, depth: s.depth + 1,
+        parent: s, fn: control_onEvent__P29915, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  ctx___7947: undefined,
+  ctx___37484: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -6391,7 +6324,7 @@ function control_onEvent__P380_mk(s) {
 
 
 
-function control_eventContext__P397(s) {
+function control_eventContext__P29932(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6401,10 +6334,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___4032);
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___33567);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = r0 = globals.eventContexts___4032;
-    r0 = pxsim_Array__length(globals.eventContexts___4032);
+    s.tmp_0 = r0 = globals.eventContexts___33567;
+    r0 = pxsim_Array__length(globals.eventContexts___33567);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_1 = r0;
@@ -6419,12 +6352,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_eventContext__P397.info = {"start":6907,"length":136,"line":209,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
+control_eventContext__P29932.info = {"start":6907,"length":136,"line":209,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
 
-function control_eventContext__P397_mk(s) {
+function control_eventContext__P29932_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_eventContext__P397, depth: s.depth + 1,
+        parent: s, fn: control_eventContext__P29932, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6436,7 +6369,7 @@ function control_eventContext__P397_mk(s) {
 
 
 
-function control_EventContext_registerHandler__P394(s) {
+function control_EventContext_registerHandler__P29929(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6446,10 +6379,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___7970 = undefined;
-    s.unnamed94___U1 = undefined;
-    s.unnamed95___U2 = undefined;
-    s.hn___7993 = undefined;
+    s.h___37507 = undefined;
+    s.unnamed934___U1 = undefined;
+    s.unnamed935___U2 = undefined;
+    s.hn___37530 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -6459,20 +6392,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
-    s.h___7970 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
+    s.h___37507 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed94___U1 = (r0);
-    s.unnamed95___U2 = (0);
+    s.unnamed934___U1 = (r0);
+    s.unnamed935___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed95___U2;
-    r0 = pxsim_Array__length(s.unnamed94___U1);
+    s.tmp_0 = r0 = s.unnamed935___U2;
+    r0 = pxsim_Array__length(s.unnamed934___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed94___U1, s.unnamed95___U2);
-    s.h___7970 = (r0);
-    r0 = s.h___7970.fields["src"];
+    r0 = pxsim_Array__getAt(s.unnamed934___U1, s.unnamed935___U2);
+    s.h___37507 = (r0);
+    r0 = s.h___37507.fields["src"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 == s.arg1);
     s.tmp_2 = r0;
@@ -6481,7 +6414,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    r0 = s.h___7970.fields["value"];
+    r0 = s.h___37507.fields["value"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 == s.arg2);
   case 3:
@@ -6489,19 +6422,19 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 4; continue; }
-    r0 = (s.h___7970).fields["flags"] = (s.arg4);
-    r0 = (s.h___7970).fields["handler"] = (s.arg3);
+    r0 = (s.h___37507).fields["flags"] = (s.arg4);
+    r0 = (s.h___37507).fields["handler"] = (s.arg3);
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed95___U2 + 1);
-    s.unnamed95___U2 = (r0);
+    r0 = (s.unnamed935___U2 + 1);
+    s.unnamed935___U2 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed94___U1 = (undefined);
-    r0 = pxsim_pxtcore_mkClassInstance(control_EventHandler__C4024_VT);
+    s.unnamed934___U1 = (undefined);
+    r0 = pxsim_pxtcore_mkClassInstance(control_EventHandler__C33559_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_EventHandler_constructor__P4027_mk(s);
+    s.tmp_1 = control_EventHandler_constructor__P33562_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
@@ -6510,12 +6443,12 @@ switch (step) {
     s.callLocIdx = 60; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.hn___7993 = (s.tmp_0);
+    s.hn___37530 = (s.tmp_0);
     r0 = s.arg0.fields["handlers"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.hn___7993);
-    s.tmp_0 = control_EventHandler_register__P4025_mk(s);
-    s.tmp_0.arg0 = s.hn___7993;
+    r0 = pxsim_Array__push(s.tmp_0, s.hn___37530);
+    s.tmp_0 = control_EventHandler_register__P33560_mk(s);
+    s.tmp_0.arg0 = s.hn___37530;
     s.callLocIdx = 61; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
@@ -6524,12 +6457,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerHandler__P394.info = {"start":5573,"length":525,"line":169,"column":8,"endLine":182,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerHandler","argumentNames":["this","src","value","handler","flags"]}
+control_EventContext_registerHandler__P29929.info = {"start":5573,"length":525,"line":169,"column":8,"endLine":182,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerHandler","argumentNames":["this","src","value","handler","flags"]}
 
-function control_EventContext_registerHandler__P394_mk(s) {
+function control_EventContext_registerHandler__P29929_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerHandler__P394, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerHandler__P29929, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6537,10 +6470,10 @@ function control_EventContext_registerHandler__P394_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  h___7970: undefined,
-  unnamed94___U1: undefined,
-  unnamed95___U2: undefined,
-  hn___7993: undefined,
+  h___37507: undefined,
+  unnamed934___U1: undefined,
+  unnamed935___U2: undefined,
+  hn___37530: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -6552,7 +6485,7 @@ function control_EventContext_registerHandler__P394_mk(s) {
 
 
 
-function control_EventHandler_constructor__P4027(s) {
+function control_EventHandler_constructor__P33562(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6571,7 +6504,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C4024_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventHandler__C33559_VT)) failedCast(r0);
     r0 = (s.arg0).fields["src"] = (s.arg1);
     r0 = (s.arg0).fields["value"] = (s.arg2);
     r0 = (s.arg0).fields["handler"] = (s.arg3);
@@ -6580,12 +6513,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_constructor__P4027.info = {"start":786,"length":165,"line":23,"column":8,"endLine":28,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this","src","value","handler","flags"]}
+control_EventHandler_constructor__P33562.info = {"start":786,"length":165,"line":23,"column":8,"endLine":28,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this","src","value","handler","flags"]}
 
-function control_EventHandler_constructor__P4027_mk(s) {
+function control_EventHandler_constructor__P33562_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_constructor__P4027, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_constructor__P33562, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -6598,7 +6531,7 @@ function control_EventHandler_constructor__P4027_mk(s) {
 
 
 
-function control_EventHandler_register__P4025(s) {
+function control_EventHandler_register__P33560(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6613,8 +6546,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C4024_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8014);
+    if (!checkSubtype(r0, control_EventHandler__C33559_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P37551);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = s.arg0.fields["src"];
@@ -6628,12 +6561,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_register__P4025.info = {"start":961,"length":165,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
+control_EventHandler_register__P33560.info = {"start":961,"length":165,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
 
-function control_EventHandler_register__P4025_mk(s) {
+function control_EventHandler_register__P33560_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_register__P4025, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_register__P33560, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6646,7 +6579,7 @@ function control_EventHandler_register__P4025_mk(s) {
 
 
 
-function inline__P8014(s) {
+function inline__P37551(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6679,12 +6612,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8014.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+inline__P37551.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8014_mk(s) {
+function inline__P37551_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8014, depth: s.depth + 1,
+        parent: s, fn: inline__P37551, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6694,7 +6627,7 @@ function inline__P8014_mk(s) {
 
 
 
-function Math_clamp__P122(s) {
+function Math_clamp__P29657(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6710,9 +6643,9 @@ switch (step) {
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_min__P126_mk(s);
+    s.tmp_0 = Math_min__P29661_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_1 = Math_max__P125_mk(s);
+    s.tmp_1 = Math_max__P29660_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg2;
     s.callLocIdx = 16; s.pc = 2; return s.tmp_1;
@@ -6725,12 +6658,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_clamp__P122.info = {"start":14654,"length":130,"line":501,"column":4,"endLine":503,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"clamp","argumentNames":["min","max","value"]}
+Math_clamp__P29657.info = {"start":14654,"length":130,"line":501,"column":4,"endLine":503,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"clamp","argumentNames":["min","max","value"]}
 
-function Math_clamp__P122_mk(s) {
+function Math_clamp__P29657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_clamp__P122, depth: s.depth + 1,
+        parent: s, fn: Math_clamp__P29657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6743,7 +6676,7 @@ function Math_clamp__P122_mk(s) {
 
 
 
-function Math_min__P126(s) {
+function Math_min__P29661(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6771,12 +6704,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_min__P126.info = {"start":15790,"length":105,"line":538,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"min","argumentNames":["a","b"]}
+Math_min__P29661.info = {"start":15790,"length":105,"line":538,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"min","argumentNames":["a","b"]}
 
-function Math_min__P126_mk(s) {
+function Math_min__P29661_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_min__P126, depth: s.depth + 1,
+        parent: s, fn: Math_min__P29661, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -6787,7 +6720,7 @@ function Math_min__P126_mk(s) {
 
 
 
-function helpers_arrayFind__P109(s) {
+function helpers_arrayFind__P29644(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6797,28 +6730,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___7564 = undefined;
-    s.i___7567 = undefined;
-    s.v___7572 = undefined;
+    s.len___37101 = undefined;
+    s.i___37104 = undefined;
+    s.v___37109 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__length(s.arg0);
-    s.len___7564 = (r0);
-    s.i___7567 = (0);
+    s.len___37101 = (r0);
+    s.i___37104 = (0);
   case 1:
-    r0 = (s.i___7567 < s.len___7564);
+    r0 = (s.i___37104 < s.len___37101);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.arg0, s.i___7567);
-    s.v___7572 = (r0);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___37104);
+    s.v___37109 = (r0);
     s.tmp_1 = lambda_3_mk(s);
     s.tmp_1.argL = s.arg1;
-    s.tmp_1.arg0 = s.v___7572;
-    s.tmp_1.arg1 = s.i___7567;
+    s.tmp_1.arg0 = s.v___37109;
+    s.tmp_1.arg1 = s.i___37104;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 8; s.pc = 6; return s.tmp_1;
   case 6:
@@ -6826,12 +6759,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = s.v___7572;
+    r0 = s.v___37109;
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___7567 + 1);
-    s.i___7567 = (r0);
+    r0 = (s.i___37104 + 1);
+    s.i___37104 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
@@ -6839,18 +6772,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayFind__P109.info = {"start":8018,"length":292,"line":271,"column":4,"endLine":278,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayFind","argumentNames":["arr","callbackfn"]}
+helpers_arrayFind__P29644.info = {"start":8018,"length":292,"line":271,"column":4,"endLine":278,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayFind","argumentNames":["arr","callbackfn"]}
 
-function helpers_arrayFind__P109_mk(s) {
+function helpers_arrayFind__P29644_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayFind__P109, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayFind__P29644, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___7564: undefined,
-  i___7567: undefined,
-  v___7572: undefined,
+  len___37101: undefined,
+  i___37104: undefined,
+  v___37109: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -6859,7 +6792,7 @@ function helpers_arrayFind__P109_mk(s) {
 
 
 
-function helpers_arrayFilter__P108(s) {
+function helpers_arrayFilter__P29643(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6869,31 +6802,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___7585 = undefined;
-    s.len___7587 = undefined;
-    s.i___7590 = undefined;
-    s.v___7595 = undefined;
+    s.res___37122 = undefined;
+    s.len___37124 = undefined;
+    s.i___37127 = undefined;
+    s.v___37132 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___7585 = (r0);
+    s.res___37122 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___7587 = (r0);
-    s.i___7590 = (0);
+    s.len___37124 = (r0);
+    s.i___37127 = (0);
   case 1:
-    r0 = (s.i___7590 < s.len___7587);
+    r0 = (s.i___37127 < s.len___37124);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.arg0, s.i___7590);
-    s.v___7595 = (r0);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___37127);
+    s.v___37132 = (r0);
     s.tmp_1 = lambda_3_mk(s);
     s.tmp_1.argL = s.arg1;
-    s.tmp_1.arg0 = s.v___7595;
-    s.tmp_1.arg1 = s.i___7590;
+    s.tmp_1.arg0 = s.v___37132;
+    s.tmp_1.arg1 = s.i___37127;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 7; s.pc = 5; return s.tmp_1;
   case 5:
@@ -6901,30 +6834,30 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__push(s.res___7585, s.v___7595);
+    r0 = pxsim_Array__push(s.res___37122, s.v___37132);
   case 2:
   case 3:
-    r0 = (s.i___7590 + 1);
-    s.i___7590 = (r0);
+    r0 = (s.i___37127 + 1);
+    s.i___37127 = (r0);
     { step = 1; continue; }
   case 4:
-    r0 = s.res___7585;
+    r0 = s.res___37122;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayFilter__P108.info = {"start":7695,"length":317,"line":261,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayFilter","argumentNames":["arr","callbackfn"]}
+helpers_arrayFilter__P29643.info = {"start":7695,"length":317,"line":261,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayFilter","argumentNames":["arr","callbackfn"]}
 
-function helpers_arrayFilter__P108_mk(s) {
+function helpers_arrayFilter__P29643_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayFilter__P108, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayFilter__P29643, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  res___7585: undefined,
-  len___7587: undefined,
-  i___7590: undefined,
-  v___7595: undefined,
+  res___37122: undefined,
+  len___37124: undefined,
+  i___37127: undefined,
+  v___37132: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -6933,7 +6866,7 @@ function helpers_arrayFilter__P108_mk(s) {
 
 
 
-function helpers_arrayForEach__P107(s) {
+function helpers_arrayForEach__P29642(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6943,49 +6876,49 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___7669 = undefined;
-    s.i___7672 = undefined;
+    s.len___37206 = undefined;
+    s.i___37209 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__length(s.arg0);
-    s.len___7669 = (r0);
-    s.i___7672 = (0);
+    s.len___37206 = (r0);
+    s.i___37209 = (0);
   case 1:
-    r0 = (s.i___7672 < s.len___7669);
+    r0 = (s.i___37209 < s.len___37206);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
     s.tmp_1 = lambda_3_mk(s);
     s.tmp_1.argL = s.arg1;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___7672);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___37209);
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.i___7672;
+    s.tmp_1.arg1 = s.i___37209;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 6; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    r0 = (s.i___7672 + 1);
-    s.i___7672 = (r0);
+    r0 = (s.i___37209 + 1);
+    s.i___37209 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayForEach__P107.info = {"start":7439,"length":250,"line":254,"column":4,"endLine":259,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayForEach","argumentNames":["arr","callbackfn"]}
+helpers_arrayForEach__P29642.info = {"start":7439,"length":250,"line":254,"column":4,"endLine":259,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayForEach","argumentNames":["arr","callbackfn"]}
 
-function helpers_arrayForEach__P107_mk(s) {
+function helpers_arrayForEach__P29642_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayForEach__P107, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayForEach__P29642, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___7669: undefined,
-  i___7672: undefined,
+  len___37206: undefined,
+  i___37209: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -6994,7 +6927,7 @@ function helpers_arrayForEach__P107_mk(s) {
 
 
 
-function Sprite_kind__P2070(s) {
+function Sprite_kind__P31489(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7009,17 +6942,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_kind"];
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_kind__P2070.info = {"start":10604,"length":41,"line":387,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"kind","argumentNames":["this"]}
+Sprite_kind__P31489.info = {"start":10604,"length":41,"line":387,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"kind","argumentNames":["this"]}
 
-function Sprite_kind__P2070_mk(s) {
+function Sprite_kind__P31489_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_kind__P2070, depth: s.depth + 1,
+        parent: s, fn: Sprite_kind__P31489, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -7028,7 +6961,7 @@ function Sprite_kind__P2070_mk(s) {
 
 
 
-function tiles_locationOfSprite__P3775(s) {
+function tiles_locationOfSprite__P33309(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7042,41 +6975,41 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
-    s.tmp_1 = tiles_screenCoordinateToTile__P3797_mk(s);
-    s.tmp_2 = Sprite_x__P2025_mk(s);
+    s.tmp_0 = tiles_getTileLocation__P31763_mk(s);
+    s.tmp_1 = tiles_screenCoordinateToTile__P33331_mk(s);
+    s.tmp_2 = Sprite_x__P31444_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 2097; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 2102; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 2098; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 2103; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = tiles_screenCoordinateToTile__P3797_mk(s);
-    s.tmp_4 = Sprite_y__P2027_mk(s);
+    s.tmp_3 = tiles_screenCoordinateToTile__P33331_mk(s);
+    s.tmp_4 = Sprite_y__P31446_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 2099; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 2104; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 2100; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 2105; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2101; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2106; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_locationOfSprite__P3775.info = {"start":9471,"length":165,"line":260,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationOfSprite","argumentNames":["s"]}
+tiles_locationOfSprite__P33309.info = {"start":9471,"length":165,"line":260,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationOfSprite","argumentNames":["s"]}
 
-function tiles_locationOfSprite__P3775_mk(s) {
+function tiles_locationOfSprite__P33309_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_locationOfSprite__P3775, depth: s.depth + 1,
+        parent: s, fn: tiles_locationOfSprite__P33309, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7090,7 +7023,7 @@ function tiles_locationOfSprite__P3775_mk(s) {
 
 
 
-function tiles_screenCoordinateToTile__P3797(s) {
+function tiles_screenCoordinateToTile__P33331(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7100,18 +7033,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___20887 = undefined;
+    s.tm___50383 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 2118; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 2123; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___20887 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___20887);
+    s.tm___50383 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___50383);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -7122,25 +7055,25 @@ switch (step) {
   case 1:
   case 2:
     s.tmp_2 = r0 = s.arg0;
-    r0 = s.tm___20887.fields["_scale"];
+    r0 = s.tm___50383.fields["_scale"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 >> s.tmp_3);
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_screenCoordinateToTile__P3797.info = {"start":14355,"length":380,"line":413,"column":4,"endLine":420,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
+tiles_screenCoordinateToTile__P33331.info = {"start":14355,"length":380,"line":413,"column":4,"endLine":420,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
 
-function tiles_screenCoordinateToTile__P3797_mk(s) {
+function tiles_screenCoordinateToTile__P33331_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_screenCoordinateToTile__P3797, depth: s.depth + 1,
+        parent: s, fn: tiles_screenCoordinateToTile__P33331, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tm___20887: undefined,
+  tm___50383: undefined,
   arg0: undefined,
 } }
 
@@ -7148,7 +7081,7 @@ function tiles_screenCoordinateToTile__P3797_mk(s) {
 
 
 
-function tiles_TileMap_scale__P2319(s) {
+function tiles_TileMap_scale__P31738(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7163,18 +7096,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_scale"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_scale__P2319.info = {"start":6125,"length":55,"line":220,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this"]}
-tiles_TileMap_scale__P2319.isGetter = true;
+tiles_TileMap_scale__P31738.info = {"start":6125,"length":55,"line":220,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"scale","argumentNames":["this"]}
+tiles_TileMap_scale__P31738.isGetter = true;
 
-function tiles_TileMap_scale__P2319_mk(s) {
+function tiles_TileMap_scale__P31738_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_scale__P2319, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_scale__P31738, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -7183,7 +7116,7 @@ function tiles_TileMap_scale__P2319_mk(s) {
 
 
 
-function scene_aStar__P3655(s) {
+function scene_aStar__P33189(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7193,24 +7126,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___20917 = undefined;
+    s.tm___50413 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1797; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1802; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___20917 = (r0);
-    s.tmp_3 = scene_isWalkable__P6087_mk(s);
+    s.tm___50413 = (r0);
+    s.tmp_3 = scene_isWalkable__P35609_mk(s);
     s.tmp_3.arg0 = s.arg1;
     s.tmp_3.arg1 = s.arg2;
-    s.tmp_3.arg2 = s.tm___20917;
-    s.callLocIdx = 1798; s.pc = 5; return s.tmp_3;
+    s.tmp_3.arg2 = s.tm___50413;
+    s.callLocIdx = 1803; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -7224,31 +7157,31 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P20932);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P50428);
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.arg1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P20937);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P50433);
     s.tmp_5 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.arg1);
-    s.tmp_6 = scene_generalAStar__P3657_mk(s);
-    s.tmp_6.arg0 = s.tm___20917;
+    s.tmp_6 = scene_generalAStar__P33191_mk(s);
+    s.tmp_6.arg0 = s.tm___50413;
     s.tmp_6.arg1 = s.arg0;
     s.tmp_6.arg2 = s.arg2;
     s.tmp_6.arg3 = s.tmp_4;
     s.tmp_6.arg4 = s.tmp_5;
-    s.callLocIdx = 1804; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 1809; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-scene_aStar__P3655.info = {"start":937,"length":377,"line":31,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"aStar","argumentNames":["start","end","onTilesOf"]}
+scene_aStar__P33189.info = {"start":937,"length":377,"line":31,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"aStar","argumentNames":["start","end","onTilesOf"]}
 
-function scene_aStar__P3655_mk(s) {
+function scene_aStar__P33189_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_aStar__P3655, depth: s.depth + 1,
+        parent: s, fn: scene_aStar__P33189, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7257,7 +7190,7 @@ function scene_aStar__P3655_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  tm___20917: undefined,
+  tm___50413: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -7267,7 +7200,7 @@ function scene_aStar__P3655_mk(s) {
 
 
 
-function inline__P20932(s) {
+function inline__P50428(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7281,21 +7214,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_tileLocationHeuristic__P6083_mk(s);
+    s.tmp_0 = scene_tileLocationHeuristic__P35605_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.caps[0];
-    s.callLocIdx = 1799; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1804; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P20932.info = {"start":1221,"length":34,"line":37,"column":12,"endLine":37,"endColumn":46,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["t"]}
+inline__P50428.info = {"start":1221,"length":34,"line":37,"column":12,"endLine":37,"endColumn":46,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["t"]}
 
-function inline__P20932_mk(s) {
+function inline__P50428_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P20932, depth: s.depth + 1,
+        parent: s, fn: inline__P50428, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -7305,7 +7238,7 @@ function inline__P20932_mk(s) {
 
 
 
-function inline__P20937(s) {
+function inline__P50433(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7319,15 +7252,15 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = tiles_Location_x__P2293_mk(s);
+    s.tmp_2 = tiles_Location_x__P31712_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1800; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1805; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = tiles_Location_x__P2293_mk(s);
+    s.tmp_4 = tiles_Location_x__P31712_mk(s);
     s.tmp_4.arg0 = s.caps[0];
-    s.callLocIdx = 1801; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 1806; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -7338,15 +7271,15 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_6 = tiles_Location_y__P2294_mk(s);
+    s.tmp_6 = tiles_Location_y__P31713_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 1802; s.pc = 5; return s.tmp_6;
+    s.callLocIdx = 1807; s.pc = 5; return s.tmp_6;
   case 5:
     r0 = s.retval;
     s.tmp_5 = r0;
-    s.tmp_8 = tiles_Location_y__P2294_mk(s);
+    s.tmp_8 = tiles_Location_y__P31713_mk(s);
     s.tmp_8.arg0 = s.caps[0];
-    s.callLocIdx = 1803; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 1808; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -7358,12 +7291,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P20937.info = {"start":1270,"length":35,"line":38,"column":12,"endLine":38,"endColumn":47,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["l"]}
+inline__P50433.info = {"start":1270,"length":35,"line":38,"column":12,"endLine":38,"endColumn":47,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["l"]}
 
-function inline__P20937_mk(s) {
+function inline__P50433_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P20937, depth: s.depth + 1,
+        parent: s, fn: inline__P50433, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7382,7 +7315,7 @@ function inline__P20937_mk(s) {
 
 
 
-function scene_isWalkable__P6087(s) {
+function scene_isWalkable__P35609(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7392,17 +7325,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.img___19346 = undefined;
+    s.img___48842 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = scene_isWall__P6086_mk(s);
+    s.tmp_1 = scene_isWall__P35608_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg2;
-    s.callLocIdx = 1850; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1855; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -7422,33 +7355,33 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_4 = tiles_TileMap_getTileImage__P2339_mk(s);
+    s.tmp_4 = tiles_TileMap_getTileImage__P31758_mk(s);
     s.tmp_4.arg0 = s.arg2;
-    s.tmp_5 = tiles_TileMap_getTileIndex__P2330_mk(s);
+    s.tmp_5 = tiles_TileMap_getTileIndex__P31749_mk(s);
     s.tmp_5.arg0 = s.arg2;
     r0 = s.arg0.fields["_col"];
     s.tmp_5.arg1 = r0;
     r0 = s.arg0.fields["_row"];
     s.tmp_5.arg2 = r0;
-    s.callLocIdx = 1853; s.pc = 8; return s.tmp_5;
+    s.callLocIdx = 1858; s.pc = 8; return s.tmp_5;
   case 8:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 1854; s.pc = 7; return s.tmp_4;
+    s.callLocIdx = 1859; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
-    s.img___19346 = (r0);
-    r0 = pxsim_ImageMethods.equals(s.img___19346, s.arg1);
+    s.img___48842 = (r0);
+    r0 = pxsim_ImageMethods.equals(s.img___48842, s.arg1);
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-scene_isWalkable__P6087.info = {"start":7750,"length":280,"line":226,"column":4,"endLine":231,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWalkable","argumentNames":["l","onTilesOf","tm"]}
+scene_isWalkable__P35609.info = {"start":7750,"length":280,"line":226,"column":4,"endLine":231,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWalkable","argumentNames":["l","onTilesOf","tm"]}
 
-function scene_isWalkable__P6087_mk(s) {
+function scene_isWalkable__P35609_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_isWalkable__P6087, depth: s.depth + 1,
+        parent: s, fn: scene_isWalkable__P35609, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7456,7 +7389,7 @@ function scene_isWalkable__P6087_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  img___19346: undefined,
+  img___48842: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -7466,7 +7399,7 @@ function scene_isWalkable__P6087_mk(s) {
 
 
 
-function scene_isWall__P6086(s) {
+function scene_isWall__P35608(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7476,45 +7409,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___19125 = undefined;
-    s.c___19129 = undefined;
+    s.r___48621 = undefined;
+    s.c___48625 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    s.tmp_0 = scene_locationRow__P35606_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1847; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1852; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.r___19125 = (r0);
-    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    s.r___48621 = (r0);
+    s.tmp_0 = scene_locationCol__P35607_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1848; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1853; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.c___19129 = (r0);
-    s.tmp_0 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.c___48625 = (r0);
+    s.tmp_0 = tiles_TileMap_isObstacle__P31755_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.c___19129;
-    s.tmp_0.arg2 = s.r___19125;
-    s.callLocIdx = 1849; s.pc = 3; return s.tmp_0;
+    s.tmp_0.arg1 = s.c___48625;
+    s.tmp_0.arg2 = s.r___48621;
+    s.callLocIdx = 1854; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_isWall__P6086.info = {"start":7573,"length":169,"line":220,"column":4,"endLine":224,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWall","argumentNames":["l","tm"]}
+scene_isWall__P35608.info = {"start":7573,"length":169,"line":220,"column":4,"endLine":224,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWall","argumentNames":["l","tm"]}
 
-function scene_isWall__P6086_mk(s) {
+function scene_isWall__P35608_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_isWall__P6086, depth: s.depth + 1,
+        parent: s, fn: scene_isWall__P35608, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  r___19125: undefined,
-  c___19129: undefined,
+  r___48621: undefined,
+  c___48625: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -7523,7 +7456,7 @@ function scene_isWall__P6086_mk(s) {
 
 
 
-function scene_locationCol__P6085(s) {
+function scene_locationCol__P35607(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7537,9 +7470,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = tiles_Location_x__P2293_mk(s);
+    s.tmp_1 = tiles_Location_x__P31712_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1846; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1851; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -7547,12 +7480,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_locationCol__P6085.info = {"start":7483,"length":82,"line":216,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationCol","argumentNames":["l"]}
+scene_locationCol__P35607.info = {"start":7483,"length":82,"line":216,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationCol","argumentNames":["l"]}
 
-function scene_locationCol__P6085_mk(s) {
+function scene_locationCol__P35607_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_locationCol__P6085, depth: s.depth + 1,
+        parent: s, fn: scene_locationCol__P35607, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7563,7 +7496,7 @@ function scene_locationCol__P6085_mk(s) {
 
 
 
-function scene_locationRow__P6084(s) {
+function scene_locationRow__P35606(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7577,9 +7510,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = tiles_Location_y__P2294_mk(s);
+    s.tmp_1 = tiles_Location_y__P31713_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1845; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1850; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -7587,12 +7520,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_locationRow__P6084.info = {"start":7393,"length":82,"line":212,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationRow","argumentNames":["l"]}
+scene_locationRow__P35606.info = {"start":7393,"length":82,"line":212,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationRow","argumentNames":["l"]}
 
-function scene_locationRow__P6084_mk(s) {
+function scene_locationRow__P35606_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_locationRow__P6084, depth: s.depth + 1,
+        parent: s, fn: scene_locationRow__P35606, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7603,7 +7536,7 @@ function scene_locationRow__P6084_mk(s) {
 
 
 
-function tiles_TileMap_isObstacle__P2336(s) {
+function tiles_TileMap_isObstacle__P31755(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7620,7 +7553,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
@@ -7641,12 +7574,12 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_8 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    s.tmp_8 = tiles_TileMapData_isOutsideMap__P31735_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_8.arg0 = r0;
     s.tmp_8.arg1 = s.arg1;
     s.tmp_8.arg2 = s.arg2;
-    s.callLocIdx = 951; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 908; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -7667,12 +7600,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isObstacle__P2336.info = {"start":12421,"length":211,"line":404,"column":8,"endLine":409,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isObstacle","argumentNames":["this","col","row"]}
+tiles_TileMap_isObstacle__P31755.info = {"start":12421,"length":211,"line":404,"column":8,"endLine":409,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"isObstacle","argumentNames":["this","col","row"]}
 
-function tiles_TileMap_isObstacle__P2336_mk(s) {
+function tiles_TileMap_isObstacle__P31755_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isObstacle__P2336, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isObstacle__P31755, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7695,7 +7628,7 @@ function tiles_TileMap_isObstacle__P2336_mk(s) {
 
 
 
-function tiles_TileMap_enabled__P2327(s) {
+function tiles_TileMap_enabled__P31746(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7710,7 +7643,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
@@ -7723,13 +7656,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_enabled__P2327.info = {"start":7107,"length":66,"line":261,"column":8,"endLine":263,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"enabled","argumentNames":["this"]}
-tiles_TileMap_enabled__P2327.isGetter = true;
+tiles_TileMap_enabled__P31746.info = {"start":7107,"length":66,"line":261,"column":8,"endLine":263,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"enabled","argumentNames":["this"]}
+tiles_TileMap_enabled__P31746.isGetter = true;
 
-function tiles_TileMap_enabled__P2327_mk(s) {
+function tiles_TileMap_enabled__P31746_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_enabled__P2327, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_enabled__P31746, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7742,7 +7675,7 @@ function tiles_TileMap_enabled__P2327_mk(s) {
 
 
 
-function tiles_TileMapData_isOutsideMap__P2316(s) {
+function tiles_TileMapData_isOutsideMap__P31735(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7759,7 +7692,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = (s.arg1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -7799,12 +7732,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_isOutsideMap__P2316.info = {"start":5580,"length":132,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isOutsideMap","argumentNames":["this","col","row"]}
+tiles_TileMapData_isOutsideMap__P31735.info = {"start":5580,"length":132,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"isOutsideMap","argumentNames":["this","col","row"]}
 
-function tiles_TileMapData_isOutsideMap__P2316_mk(s) {
+function tiles_TileMapData_isOutsideMap__P31735_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_isOutsideMap__P2316, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_isOutsideMap__P31735, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7823,7 +7756,7 @@ function tiles_TileMapData_isOutsideMap__P2316_mk(s) {
 
 
 
-function tiles_TileMapData_height__P2307(s) {
+function tiles_TileMapData_height__P31726(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7838,18 +7771,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = s.arg0.fields["_height"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_height__P2307.info = {"start":3734,"length":65,"line":139,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"height","argumentNames":["this"]}
-tiles_TileMapData_height__P2307.isGetter = true;
+tiles_TileMapData_height__P31726.info = {"start":3734,"length":65,"line":139,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"height","argumentNames":["this"]}
+tiles_TileMapData_height__P31726.isGetter = true;
 
-function tiles_TileMapData_height__P2307_mk(s) {
+function tiles_TileMapData_height__P31726_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_height__P2307, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_height__P31726, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -7858,7 +7791,7 @@ function tiles_TileMapData_height__P2307_mk(s) {
 
 
 
-function tiles_TileMapData_width__P2306(s) {
+function tiles_TileMapData_width__P31725(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7873,18 +7806,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = s.arg0.fields["_width"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_width__P2306.info = {"start":3661,"length":63,"line":135,"column":8,"endLine":137,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"width","argumentNames":["this"]}
-tiles_TileMapData_width__P2306.isGetter = true;
+tiles_TileMapData_width__P31725.info = {"start":3661,"length":63,"line":135,"column":8,"endLine":137,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"width","argumentNames":["this"]}
+tiles_TileMapData_width__P31725.isGetter = true;
 
-function tiles_TileMapData_width__P2306_mk(s) {
+function tiles_TileMapData_width__P31725_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_width__P2306, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_width__P31725, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -7893,7 +7826,7 @@ function tiles_TileMapData_width__P2306_mk(s) {
 
 
 
-function tiles_TileMapData_isWall__P2315(s) {
+function tiles_TileMapData_isWall__P31734(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7910,7 +7843,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = s.arg0.fields["layers"];
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_1, s.arg1, s.arg2);
@@ -7919,12 +7852,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_isWall__P2315.info = {"start":5463,"length":107,"line":195,"column":8,"endLine":197,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isWall","argumentNames":["this","col","row"]}
+tiles_TileMapData_isWall__P31734.info = {"start":5463,"length":107,"line":195,"column":8,"endLine":197,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"isWall","argumentNames":["this","col","row"]}
 
-function tiles_TileMapData_isWall__P2315_mk(s) {
+function tiles_TileMapData_isWall__P31734_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_isWall__P2315, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_isWall__P31734, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7937,7 +7870,7 @@ function tiles_TileMapData_isWall__P2315_mk(s) {
 
 
 
-function tiles_TileMap_getTileImage__P2339(s) {
+function tiles_TileMap_getTileImage__P31758(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7953,23 +7886,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P2313_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P31732_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 974; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 931; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTileImage__P2339.info = {"start":13699,"length":96,"line":442,"column":8,"endLine":444,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
+tiles_TileMap_getTileImage__P31758.info = {"start":13699,"length":96,"line":442,"column":8,"endLine":444,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
 
-function tiles_TileMap_getTileImage__P2339_mk(s) {
+function tiles_TileMap_getTileImage__P31758_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTileImage__P2339, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTileImage__P31758, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -7980,7 +7913,7 @@ function tiles_TileMap_getTileImage__P2339_mk(s) {
 
 
 
-function tiles_TileMap_data__P4292(s) {
+function tiles_TileMap_data__P33785(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7995,18 +7928,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_data__P4292.info = {"start":6344,"length":75,"line":231,"column":8,"endLine":233,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"data","argumentNames":["this"]}
-tiles_TileMap_data__P4292.isGetter = true;
+tiles_TileMap_data__P33785.info = {"start":6344,"length":75,"line":231,"column":8,"endLine":233,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"data","argumentNames":["this"]}
+tiles_TileMap_data__P33785.isGetter = true;
 
-function tiles_TileMap_data__P4292_mk(s) {
+function tiles_TileMap_data__P33785_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_data__P4292, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_data__P33785, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -8015,7 +7948,7 @@ function tiles_TileMap_data__P4292_mk(s) {
 
 
 
-function tiles_TileMapData_getTileImage__P2313(s) {
+function tiles_TileMapData_getTileImage__P31732(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8025,25 +7958,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.size___14726 = undefined;
-    s.cachedImage___14730 = undefined;
-    s.originalImage___14737 = undefined;
+    s.size___44221 = undefined;
+    s.cachedImage___44225 = undefined;
+    s.originalImage___44232 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = s.arg0.fields["_scale"];
     s.tmp_0 = r0;
     r0 = (1 << s.tmp_0);
-    s.size___14726 = (r0);
+    s.size___44221 = (r0);
     r0 = s.arg0.fields["cachedTileView"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.arg1);
-    s.cachedImage___14730 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.cachedImage___14730);
+    s.cachedImage___44225 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.cachedImage___44225);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8052,58 +7985,58 @@ switch (step) {
     r0 = s.arg0.fields["tileset"];
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.arg1);
-    s.originalImage___14737 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.originalImage___14737);
+    s.originalImage___44232 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.originalImage___44232);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_ImageMethods.width(s.originalImage___14737);
+    r0 = pxsim_ImageMethods.width(s.originalImage___44232);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.size___14726);
+    r0 = (s.tmp_1 <= s.size___44221);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_ImageMethods.height(s.originalImage___14737);
+    r0 = pxsim_ImageMethods.height(s.originalImage___44232);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 <= s.size___14726);
+    r0 = (s.tmp_2 <= s.size___44221);
   case 2:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.cachedImage___14730 = (s.originalImage___14737);
+    s.cachedImage___44225 = (s.originalImage___44232);
     { step = 4; continue; }
   case 3:
-    r0 = pxsim.image.create(s.size___14726, s.size___14726);
-    s.cachedImage___14730 = (r0);
-    r0 = pxsim_ImageMethods.drawImage(s.cachedImage___14730, s.originalImage___14737, 0, 0);
+    r0 = pxsim.image.create(s.size___44221, s.size___44221);
+    s.cachedImage___44225 = (r0);
+    r0 = pxsim_ImageMethods.drawImage(s.cachedImage___44225, s.originalImage___44232, 0, 0);
   case 4:
     r0 = s.arg0.fields["cachedTileView"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_0, s.arg1, s.cachedImage___14730);
+    r0 = pxsim_Array_.setAt(s.tmp_0, s.arg1, s.cachedImage___44225);
   case 5:
   case 6:
   case 7:
   case 8:
-    r0 = s.cachedImage___14730;
+    r0 = s.cachedImage___44225;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTileImage__P2313.info = {"start":4599,"length":717,"line":172,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
+tiles_TileMapData_getTileImage__P31732.info = {"start":4599,"length":717,"line":172,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
 
-function tiles_TileMapData_getTileImage__P2313_mk(s) {
+function tiles_TileMapData_getTileImage__P31732_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTileImage__P2313, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_getTileImage__P31732, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  size___14726: undefined,
-  cachedImage___14730: undefined,
-  originalImage___14737: undefined,
+  size___44221: undefined,
+  cachedImage___44225: undefined,
+  originalImage___44232: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -8112,7 +8045,7 @@ function tiles_TileMapData_getTileImage__P2313_mk(s) {
 
 
 
-function tiles_TileMapData_scale__P2308(s) {
+function tiles_TileMapData_scale__P31727(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8127,18 +8060,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = s.arg0.fields["_scale"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_scale__P2308.info = {"start":3809,"length":66,"line":143,"column":8,"endLine":145,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this"]}
-tiles_TileMapData_scale__P2308.isGetter = true;
+tiles_TileMapData_scale__P31727.info = {"start":3809,"length":66,"line":143,"column":8,"endLine":145,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"scale","argumentNames":["this"]}
+tiles_TileMapData_scale__P31727.isGetter = true;
 
-function tiles_TileMapData_scale__P2308_mk(s) {
+function tiles_TileMapData_scale__P31727_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_scale__P2308, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_scale__P31727, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -8147,7 +8080,7 @@ function tiles_TileMapData_scale__P2308_mk(s) {
 
 
 
-function tiles_TileMap_getTileIndex__P2330(s) {
+function tiles_TileMap_getTileIndex__P31749(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8164,24 +8097,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMapData_getTile__P2310_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMapData_getTile__P31729_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
-    s.callLocIdx = 909; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 866; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTileIndex__P2330.info = {"start":7380,"length":105,"line":273,"column":8,"endLine":275,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileIndex","argumentNames":["this","col","row"]}
+tiles_TileMap_getTileIndex__P31749.info = {"start":7380,"length":105,"line":273,"column":8,"endLine":275,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTileIndex","argumentNames":["this","col","row"]}
 
-function tiles_TileMap_getTileIndex__P2330_mk(s) {
+function tiles_TileMap_getTileIndex__P31749_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTileIndex__P2330, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTileIndex__P31749, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -8193,7 +8126,7 @@ function tiles_TileMap_getTileIndex__P2330_mk(s) {
 
 
 
-function tiles_TileMapData_getTile__P2310(s) {
+function tiles_TileMapData_getTile__P31729(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8210,12 +8143,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P31735_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 886; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 843; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -8244,12 +8177,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTile__P2310.info = {"start":3997,"length":200,"line":152,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTile","argumentNames":["this","col","row"]}
+tiles_TileMapData_getTile__P31729.info = {"start":3997,"length":200,"line":152,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTile","argumentNames":["this","col","row"]}
 
-function tiles_TileMapData_getTile__P2310_mk(s) {
+function tiles_TileMapData_getTile__P31729_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTile__P2310, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_getTile__P31729, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8269,7 +8202,7 @@ function tiles_TileMapData_getTile__P2310_mk(s) {
 
 
 
-function tiles_Location_row__P2291(s) {
+function tiles_Location_row__P31710(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8284,18 +8217,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C31708_VT)) failedCast(r0);
     r0 = s.arg0.fields["_row"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_row__P2291.info = {"start":467,"length":51,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"row","argumentNames":["this"]}
-tiles_Location_row__P2291.isGetter = true;
+tiles_Location_row__P31710.info = {"start":467,"length":51,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"row","argumentNames":["this"]}
+tiles_Location_row__P31710.isGetter = true;
 
-function tiles_Location_row__P2291_mk(s) {
+function tiles_Location_row__P31710_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_row__P2291, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_row__P31710, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -8304,7 +8237,7 @@ function tiles_Location_row__P2291_mk(s) {
 
 
 
-function tiles_Location_col__P2290(s) {
+function tiles_Location_col__P31709(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8319,18 +8252,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C31708_VT)) failedCast(r0);
     r0 = s.arg0.fields["_col"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_col__P2290.info = {"start":406,"length":51,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"col","argumentNames":["this"]}
-tiles_Location_col__P2290.isGetter = true;
+tiles_Location_col__P31709.info = {"start":406,"length":51,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"col","argumentNames":["this"]}
+tiles_Location_col__P31709.isGetter = true;
 
-function tiles_Location_col__P2290_mk(s) {
+function tiles_Location_col__P31709_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_col__P2290, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_col__P31709, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -8339,7 +8272,7 @@ function tiles_Location_col__P2290_mk(s) {
 
 
 
-function scene_tileLocationHeuristic__P6083(s) {
+function scene_tileLocationHeuristic__P35605(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8349,44 +8282,44 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.startCol___20952 = undefined;
-    s.startRow___20956 = undefined;
-    s.endCol___20960 = undefined;
-    s.endRow___20964 = undefined;
+    s.startCol___50448 = undefined;
+    s.startRow___50452 = undefined;
+    s.endCol___50456 = undefined;
+    s.endRow___50460 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    s.tmp_0 = scene_locationCol__P35607_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1841; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1846; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.startCol___20952 = (r0);
-    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    s.startCol___50448 = (r0);
+    s.tmp_0 = scene_locationRow__P35606_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1842; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1847; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.startRow___20956 = (r0);
-    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    s.startRow___50452 = (r0);
+    s.tmp_0 = scene_locationCol__P35607_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 1843; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1848; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.endCol___20960 = (r0);
-    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    s.endCol___50456 = (r0);
+    s.tmp_0 = scene_locationRow__P35606_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 1844; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1849; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.endRow___20964 = (r0);
-    r0 = (s.startCol___20952 - s.endCol___20960);
+    s.endRow___50460 = (r0);
+    r0 = (s.startCol___50448 - s.endCol___50456);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.pow(s.tmp_1, 2);
     s.tmp_0 = r0;
-    r0 = (s.startRow___20956 - s.endRow___20964);
+    r0 = (s.startRow___50452 - s.endRow___50460);
     s.tmp_3 = r0;
     r0 = pxsim.Math_.pow(s.tmp_3, 2);
     s.tmp_2 = r0;
@@ -8394,21 +8327,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_tileLocationHeuristic__P6083.info = {"start":6929,"length":350,"line":200,"column":4,"endLine":208,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"tileLocationHeuristic","argumentNames":["tile","target"]}
+scene_tileLocationHeuristic__P35605.info = {"start":6929,"length":350,"line":200,"column":4,"endLine":208,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"tileLocationHeuristic","argumentNames":["tile","target"]}
 
-function scene_tileLocationHeuristic__P6083_mk(s) {
+function scene_tileLocationHeuristic__P35605_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_tileLocationHeuristic__P6083, depth: s.depth + 1,
+        parent: s, fn: scene_tileLocationHeuristic__P35605, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  startCol___20952: undefined,
-  startRow___20956: undefined,
-  endCol___20960: undefined,
-  endRow___20964: undefined,
+  startCol___50448: undefined,
+  startRow___50452: undefined,
+  endCol___50456: undefined,
+  endRow___50460: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -8417,7 +8350,7 @@ function scene_tileLocationHeuristic__P6083_mk(s) {
 
 
 
-function scene_generalAStar__P3657(s) {
+function scene_generalAStar__P33191(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8427,40 +8360,40 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.consideredTiles___18760 = undefined;
-    s.encountedLocations___18782 = undefined;
-    s.updateOrFillLocation___18785 = undefined;
-    s.end___18855 = undefined;
-    s.currLocation___18861 = undefined;
-    s.row___18872 = undefined;
-    s.col___18877 = undefined;
-    s.dataForCurrLocation___18882 = undefined;
-    s.neighbors___18894 = undefined;
-    s.corners___18896 = undefined;
-    s.left___18898 = undefined;
-    s.right___18904 = undefined;
-    s.top___18911 = undefined;
-    s.bottom___18917 = undefined;
-    s.leftIsWall___18924 = undefined;
-    s.rightIsWall___18931 = undefined;
-    s.topIsWall___18938 = undefined;
-    s.bottomIsWall___18945 = undefined;
-    s.topLeft___18960 = undefined;
-    s.bottomLeft___18978 = undefined;
-    s.topRight___19003 = undefined;
-    s.bottomRight___19022 = undefined;
-    s.neighborCost___19052 = undefined;
-    s.node___19058 = undefined;
-    s.unnamed120___U24 = undefined;
-    s.unnamed121___U25 = undefined;
-    s.cornerCost___19068 = undefined;
-    s.corner___19074 = undefined;
-    s.unnamed122___U28 = undefined;
-    s.unnamed123___U29 = undefined;
-    s.endCol___19080 = undefined;
-    s.endDataNode___19087 = undefined;
-    s.curr___19100 = undefined;
-    s.output___19102 = undefined;
+    s.consideredTiles___48256 = undefined;
+    s.encountedLocations___48278 = undefined;
+    s.updateOrFillLocation___48281 = undefined;
+    s.end___48351 = undefined;
+    s.currLocation___48357 = undefined;
+    s.row___48368 = undefined;
+    s.col___48373 = undefined;
+    s.dataForCurrLocation___48378 = undefined;
+    s.neighbors___48390 = undefined;
+    s.corners___48392 = undefined;
+    s.left___48394 = undefined;
+    s.right___48400 = undefined;
+    s.top___48407 = undefined;
+    s.bottom___48413 = undefined;
+    s.leftIsWall___48420 = undefined;
+    s.rightIsWall___48427 = undefined;
+    s.topIsWall___48434 = undefined;
+    s.bottomIsWall___48441 = undefined;
+    s.topLeft___48456 = undefined;
+    s.bottomLeft___48474 = undefined;
+    s.topRight___48499 = undefined;
+    s.bottomRight___48518 = undefined;
+    s.neighborCost___48548 = undefined;
+    s.node___48554 = undefined;
+    s.unnamed960___U24 = undefined;
+    s.unnamed961___U25 = undefined;
+    s.cornerCost___48564 = undefined;
+    s.corner___48570 = undefined;
+    s.unnamed962___U28 = undefined;
+    s.unnamed963___U29 = undefined;
+    s.endCol___48576 = undefined;
+    s.endDataNode___48583 = undefined;
+    s.curr___48596 = undefined;
+    s.output___48598 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -8469,11 +8402,11 @@ switch (step) {
       s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
-    s.tmp_3 = scene_isWalkable__P6087_mk(s);
+    s.tmp_3 = scene_isWalkable__P35609_mk(s);
     s.tmp_3.arg0 = s.arg1;
     s.tmp_3.arg1 = s.arg2;
     s.tmp_3.arg2 = s.arg0;
-    s.callLocIdx = 1805; s.pc = 52; return s.tmp_3;
+    s.callLocIdx = 1810; s.pc = 52; return s.tmp_3;
   case 52:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -8487,40 +8420,40 @@ switch (step) {
     { step = 51; continue; }
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(Heap__C3646_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(Heap__C33180_VT);
     s.tmp_4 = r0;
-    s.tmp_5 = Heap_constructor__P3647_mk(s);
+    s.tmp_5 = Heap_constructor__P33181_mk(s);
     s.tmp_5.arg0 = s.tmp_4;
-    s.tmp_5.arg1 = inline__P18763;
-    s.callLocIdx = 1806; s.pc = 53; return s.tmp_5;
+    s.tmp_5.arg1 = inline__P48259;
+    s.callLocIdx = 1811; s.pc = 53; return s.tmp_5;
   case 53:
     r0 = s.retval;
-    s.consideredTiles___18760 = (s.tmp_4);
+    s.consideredTiles___48256 = (s.tmp_4);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.encountedLocations___18782 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(4, updateOrFillLocation__P18785);
+    s.encountedLocations___48278 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(4, updateOrFillLocation__P48281);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.encountedLocations___18782);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.encountedLocations___48278);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg3);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.consideredTiles___18760);
-    s.updateOrFillLocation___18785 = (s.tmp_0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.consideredTiles___48256);
+    s.updateOrFillLocation___48281 = (s.tmp_0);
     s.tmp_1 = lambda_4_mk(s);
-    s.tmp_1.argL = s.updateOrFillLocation___18785;
+    s.tmp_1.argL = s.updateOrFillLocation___48281;
     s.tmp_1.arg0 = s.arg1;
     s.tmp_1.arg1 = null;
     s.tmp_1.arg2 = 0;
     setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 1814; s.pc = 54; return s.tmp_1;
+    s.callLocIdx = 1819; s.pc = 54; return s.tmp_1;
   case 54:
     r0 = s.retval;
-    s.end___18855 = (null);
+    s.end___48351 = (null);
   case 3:
-    r0 = s.consideredTiles___18760.fields["store"];
+    r0 = s.consideredTiles___48256.fields["store"];
     s.tmp_2 = r0;
     r0 = pxsim_Array__length(s.tmp_2);
     s.tmp_1 = r0;
@@ -8528,53 +8461,53 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 40; continue; }
-    s.tmp_3 = Heap_pop__P3649_mk(s);
-    s.tmp_3.arg0 = s.consideredTiles___18760;
-    s.callLocIdx = 1816; s.pc = 55; return s.tmp_3;
+    s.tmp_3 = Heap_pop__P33183_mk(s);
+    s.tmp_3.arg0 = s.consideredTiles___48256;
+    s.callLocIdx = 1821; s.pc = 55; return s.tmp_3;
   case 55:
     r0 = s.retval;
-    s.currLocation___18861 = (r0);
+    s.currLocation___48357 = (r0);
     s.tmp_1 = lambda_2_mk(s);
     s.tmp_1.argL = s.arg4;
-    r0 = s.currLocation___18861.fields["loc"];
+    r0 = s.currLocation___48357.fields["loc"];
     s.tmp_1.arg0 = r0;
     setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 1817; s.pc = 56; return s.tmp_1;
+    s.callLocIdx = 1822; s.pc = 56; return s.tmp_1;
   case 56:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = s.currLocation___18861.fields["loc"];
-    s.end___18855 = (r0);
+    r0 = s.currLocation___48357.fields["loc"];
+    s.end___48351 = (r0);
     { step = 40; continue; }
   case 4:
   case 5:
-    s.tmp_0 = scene_locationRow__P6084_mk(s);
-    r0 = s.currLocation___18861.fields["loc"];
+    s.tmp_0 = scene_locationRow__P35606_mk(s);
+    r0 = s.currLocation___48357.fields["loc"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1818; s.pc = 57; return s.tmp_0;
+    s.callLocIdx = 1823; s.pc = 57; return s.tmp_0;
   case 57:
     r0 = s.retval;
-    s.row___18872 = (r0);
-    s.tmp_0 = scene_locationCol__P6085_mk(s);
-    r0 = s.currLocation___18861.fields["loc"];
+    s.row___48368 = (r0);
+    s.tmp_0 = scene_locationCol__P35607_mk(s);
+    r0 = s.currLocation___48357.fields["loc"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1819; s.pc = 58; return s.tmp_0;
+    s.callLocIdx = 1824; s.pc = 58; return s.tmp_0;
   case 58:
     r0 = s.retval;
-    s.col___18877 = (r0);
-    r0 = pxsim_Array__getAt(s.encountedLocations___18782, s.col___18877);
+    s.col___48373 = (r0);
+    r0 = pxsim_Array__getAt(s.encountedLocations___48278, s.col___48373);
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.row___18872);
-    s.dataForCurrLocation___18882 = (r0);
-    s.tmp_0 = r0 = s.dataForCurrLocation___18882;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.row___48368);
+    s.dataForCurrLocation___48378 = (r0);
+    s.tmp_0 = r0 = s.dataForCurrLocation___48378;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 6; continue; }
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 6:
-    r0 = s.dataForCurrLocation___18882.fields["visited"];
+    r0 = s.dataForCurrLocation___48378.fields["visited"];
   case 7:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -8583,117 +8516,117 @@ switch (step) {
     { step = 3; continue; }
   case 8:
   case 9:
-    r0 = (s.dataForCurrLocation___18882).fields["visited"] = (true);
+    r0 = (s.dataForCurrLocation___48378).fields["visited"] = (true);
     r0 = pxsim_Array__mk();
-    s.neighbors___18894 = (r0);
+    s.neighbors___48390 = (r0);
     r0 = pxsim_Array__mk();
-    s.corners___18896 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
-    r0 = (s.col___18877 - 1);
+    s.corners___48392 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P31763_mk(s);
+    r0 = (s.col___48373 - 1);
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.row___18872;
-    s.callLocIdx = 1820; s.pc = 59; return s.tmp_0;
+    s.tmp_0.arg1 = s.row___48368;
+    s.callLocIdx = 1825; s.pc = 59; return s.tmp_0;
   case 59:
     r0 = s.retval;
-    s.left___18898 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
-    r0 = (s.col___18877 + 1);
+    s.left___48394 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P31763_mk(s);
+    r0 = (s.col___48373 + 1);
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.row___18872;
-    s.callLocIdx = 1821; s.pc = 60; return s.tmp_0;
+    s.tmp_0.arg1 = s.row___48368;
+    s.callLocIdx = 1826; s.pc = 60; return s.tmp_0;
   case 60:
     r0 = s.retval;
-    s.right___18904 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
-    s.tmp_0.arg0 = s.col___18877;
-    r0 = (s.row___18872 - 1);
+    s.right___48400 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P31763_mk(s);
+    s.tmp_0.arg0 = s.col___48373;
+    r0 = (s.row___48368 - 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1822; s.pc = 61; return s.tmp_0;
+    s.callLocIdx = 1827; s.pc = 61; return s.tmp_0;
   case 61:
     r0 = s.retval;
-    s.top___18911 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
-    s.tmp_0.arg0 = s.col___18877;
-    r0 = (s.row___18872 + 1);
+    s.top___48407 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P31763_mk(s);
+    s.tmp_0.arg0 = s.col___48373;
+    r0 = (s.row___48368 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1823; s.pc = 62; return s.tmp_0;
+    s.callLocIdx = 1828; s.pc = 62; return s.tmp_0;
   case 62:
     r0 = s.retval;
-    s.bottom___18917 = (r0);
-    s.tmp_2 = scene_isWalkable__P6087_mk(s);
-    s.tmp_2.arg0 = s.left___18898;
+    s.bottom___48413 = (r0);
+    s.tmp_2 = scene_isWalkable__P35609_mk(s);
+    s.tmp_2.arg0 = s.left___48394;
     s.tmp_2.arg1 = s.arg2;
     s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1824; s.pc = 63; return s.tmp_2;
+    s.callLocIdx = 1829; s.pc = 63; return s.tmp_2;
   case 63:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.leftIsWall___18924 = (r0);
-    s.tmp_2 = scene_isWalkable__P6087_mk(s);
-    s.tmp_2.arg0 = s.right___18904;
+    s.leftIsWall___48420 = (r0);
+    s.tmp_2 = scene_isWalkable__P35609_mk(s);
+    s.tmp_2.arg0 = s.right___48400;
     s.tmp_2.arg1 = s.arg2;
     s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1825; s.pc = 64; return s.tmp_2;
+    s.callLocIdx = 1830; s.pc = 64; return s.tmp_2;
   case 64:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.rightIsWall___18931 = (r0);
-    s.tmp_2 = scene_isWalkable__P6087_mk(s);
-    s.tmp_2.arg0 = s.top___18911;
+    s.rightIsWall___48427 = (r0);
+    s.tmp_2 = scene_isWalkable__P35609_mk(s);
+    s.tmp_2.arg0 = s.top___48407;
     s.tmp_2.arg1 = s.arg2;
     s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1826; s.pc = 65; return s.tmp_2;
+    s.callLocIdx = 1831; s.pc = 65; return s.tmp_2;
   case 65:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.topIsWall___18938 = (r0);
-    s.tmp_2 = scene_isWalkable__P6087_mk(s);
-    s.tmp_2.arg0 = s.bottom___18917;
+    s.topIsWall___48434 = (r0);
+    s.tmp_2 = scene_isWalkable__P35609_mk(s);
+    s.tmp_2.arg0 = s.bottom___48413;
     s.tmp_2.arg1 = s.arg2;
     s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1827; s.pc = 66; return s.tmp_2;
+    s.callLocIdx = 1832; s.pc = 66; return s.tmp_2;
   case 66:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.bottomIsWall___18945 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.leftIsWall___18924);
+    s.bottomIsWall___48441 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.leftIsWall___48420);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    r0 = pxsim_Array__push(s.neighbors___18894, s.left___18898);
-    r0 = pxsim_numops_toBoolDecr(s.topIsWall___18938);
+    r0 = pxsim_Array__push(s.neighbors___48390, s.left___48394);
+    r0 = pxsim_numops_toBoolDecr(s.topIsWall___48434);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
-    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
-    r0 = (s.col___18877 - 1);
+    s.tmp_2 = tiles_getTileLocation__P31763_mk(s);
+    r0 = (s.col___48373 - 1);
     s.tmp_2.arg0 = r0;
-    r0 = (s.row___18872 - 1);
+    r0 = (s.row___48368 - 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1828; s.pc = 67; return s.tmp_2;
+    s.callLocIdx = 1833; s.pc = 67; return s.tmp_2;
   case 67:
     r0 = s.retval;
-    s.topLeft___18960 = (r0);
-    s.tmp_3 = scene_isWall__P6086_mk(s);
-    s.tmp_3.arg0 = s.topLeft___18960;
+    s.topLeft___48456 = (r0);
+    s.tmp_3 = scene_isWall__P35608_mk(s);
+    s.tmp_3.arg0 = s.topLeft___48456;
     s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1829; s.pc = 68; return s.tmp_3;
+    s.callLocIdx = 1834; s.pc = 68; return s.tmp_3;
   case 68:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -8703,30 +8636,30 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__push(s.corners___18896, s.topLeft___18960);
+    r0 = pxsim_Array__push(s.corners___48392, s.topLeft___48456);
   case 10:
   case 11:
   case 12:
   case 13:
-    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___18945);
+    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___48441);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
-    r0 = (s.col___18877 - 1);
+    s.tmp_2 = tiles_getTileLocation__P31763_mk(s);
+    r0 = (s.col___48373 - 1);
     s.tmp_2.arg0 = r0;
-    r0 = (s.row___18872 + 1);
+    r0 = (s.row___48368 + 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1830; s.pc = 69; return s.tmp_2;
+    s.callLocIdx = 1835; s.pc = 69; return s.tmp_2;
   case 69:
     r0 = s.retval;
-    s.bottomLeft___18978 = (r0);
-    s.tmp_3 = scene_isWall__P6086_mk(s);
-    s.tmp_3.arg0 = s.bottomLeft___18978;
+    s.bottomLeft___48474 = (r0);
+    s.tmp_3 = scene_isWall__P35608_mk(s);
+    s.tmp_3.arg0 = s.bottomLeft___48474;
     s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1831; s.pc = 70; return s.tmp_3;
+    s.callLocIdx = 1836; s.pc = 70; return s.tmp_3;
   case 70:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -8736,39 +8669,39 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = pxsim_Array__push(s.corners___18896, s.bottomLeft___18978);
+    r0 = pxsim_Array__push(s.corners___48392, s.bottomLeft___48474);
   case 14:
   case 15:
   case 16:
   case 17:
   case 18:
   case 19:
-    r0 = pxsim_numops_toBoolDecr(s.rightIsWall___18931);
+    r0 = pxsim_numops_toBoolDecr(s.rightIsWall___48427);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 28; continue; }
-    r0 = pxsim_Array__push(s.neighbors___18894, s.right___18904);
-    r0 = pxsim_numops_toBoolDecr(s.topIsWall___18938);
+    r0 = pxsim_Array__push(s.neighbors___48390, s.right___48400);
+    r0 = pxsim_numops_toBoolDecr(s.topIsWall___48434);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
-    r0 = (s.col___18877 + 1);
+    s.tmp_2 = tiles_getTileLocation__P31763_mk(s);
+    r0 = (s.col___48373 + 1);
     s.tmp_2.arg0 = r0;
-    r0 = (s.row___18872 - 1);
+    r0 = (s.row___48368 - 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1832; s.pc = 71; return s.tmp_2;
+    s.callLocIdx = 1837; s.pc = 71; return s.tmp_2;
   case 71:
     r0 = s.retval;
-    s.topRight___19003 = (r0);
-    s.tmp_3 = scene_isWall__P6086_mk(s);
-    s.tmp_3.arg0 = s.topRight___19003;
+    s.topRight___48499 = (r0);
+    s.tmp_3 = scene_isWall__P35608_mk(s);
+    s.tmp_3.arg0 = s.topRight___48499;
     s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1833; s.pc = 72; return s.tmp_3;
+    s.callLocIdx = 1838; s.pc = 72; return s.tmp_3;
   case 72:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -8778,30 +8711,30 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__push(s.corners___18896, s.topRight___19003);
+    r0 = pxsim_Array__push(s.corners___48392, s.topRight___48499);
   case 20:
   case 21:
   case 22:
   case 23:
-    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___18945);
+    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___48441);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
-    r0 = (s.col___18877 + 1);
+    s.tmp_2 = tiles_getTileLocation__P31763_mk(s);
+    r0 = (s.col___48373 + 1);
     s.tmp_2.arg0 = r0;
-    r0 = (s.row___18872 + 1);
+    r0 = (s.row___48368 + 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1834; s.pc = 73; return s.tmp_2;
+    s.callLocIdx = 1839; s.pc = 73; return s.tmp_2;
   case 73:
     r0 = s.retval;
-    s.bottomRight___19022 = (r0);
-    s.tmp_3 = scene_isWall__P6086_mk(s);
-    s.tmp_3.arg0 = s.bottomRight___19022;
+    s.bottomRight___48518 = (r0);
+    s.tmp_3 = scene_isWall__P35608_mk(s);
+    s.tmp_3.arg0 = s.bottomRight___48518;
     s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1835; s.pc = 74; return s.tmp_3;
+    s.callLocIdx = 1840; s.pc = 74; return s.tmp_3;
   case 74:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -8811,107 +8744,107 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 24; continue; }
-    r0 = pxsim_Array__push(s.corners___18896, s.bottomRight___19022);
+    r0 = pxsim_Array__push(s.corners___48392, s.bottomRight___48518);
   case 24:
   case 25:
   case 26:
   case 27:
   case 28:
   case 29:
-    r0 = pxsim_numops_toBoolDecr(s.topIsWall___18938);
+    r0 = pxsim_numops_toBoolDecr(s.topIsWall___48434);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 30; continue; }
-    r0 = pxsim_Array__push(s.neighbors___18894, s.top___18911);
+    r0 = pxsim_Array__push(s.neighbors___48390, s.top___48407);
   case 30:
   case 31:
-    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___18945);
+    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___48441);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
-    r0 = pxsim_Array__push(s.neighbors___18894, s.bottom___18917);
+    r0 = pxsim_Array__push(s.neighbors___48390, s.bottom___48413);
   case 32:
   case 33:
-    r0 = s.currLocation___18861.fields["cost"];
+    r0 = s.currLocation___48357.fields["cost"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.neighborCost___19052 = (r0);
-    s.node___19058 = (undefined);
-    s.unnamed120___U24 = (s.neighbors___18894);
-    s.unnamed121___U25 = (0);
+    s.neighborCost___48548 = (r0);
+    s.node___48554 = (undefined);
+    s.unnamed960___U24 = (s.neighbors___48390);
+    s.unnamed961___U25 = (0);
   case 34:
-    s.tmp_0 = r0 = s.unnamed121___U25;
-    r0 = pxsim_Array__length(s.unnamed120___U24);
+    s.tmp_0 = r0 = s.unnamed961___U25;
+    r0 = pxsim_Array__length(s.unnamed960___U24);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 35; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed120___U24, s.unnamed121___U25);
-    s.node___19058 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed960___U24, s.unnamed961___U25);
+    s.node___48554 = (r0);
     s.tmp_2 = lambda_4_mk(s);
-    s.tmp_2.argL = s.updateOrFillLocation___18785;
-    s.tmp_2.arg0 = s.node___19058;
-    s.tmp_2.arg1 = s.dataForCurrLocation___18882;
-    s.tmp_2.arg2 = s.neighborCost___19052;
+    s.tmp_2.argL = s.updateOrFillLocation___48281;
+    s.tmp_2.arg0 = s.node___48554;
+    s.tmp_2.arg1 = s.dataForCurrLocation___48378;
+    s.tmp_2.arg2 = s.neighborCost___48548;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1836; s.pc = 75; return s.tmp_2;
+    s.callLocIdx = 1841; s.pc = 75; return s.tmp_2;
   case 75:
     r0 = s.retval;
-    r0 = (s.unnamed121___U25 + 1);
-    s.unnamed121___U25 = (r0);
+    r0 = (s.unnamed961___U25 + 1);
+    s.unnamed961___U25 = (r0);
     { step = 34; continue; }
   case 35:
-    s.unnamed120___U24 = (undefined);
-    r0 = pxsim_Array__length(s.corners___18896);
+    s.unnamed960___U24 = (undefined);
+    r0 = pxsim_Array__length(s.corners___48392);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 38; continue; }
-    r0 = s.currLocation___18861.fields["cost"];
+    r0 = s.currLocation___48357.fields["cost"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1.414213562373095);
-    s.cornerCost___19068 = (r0);
-    s.corner___19074 = (undefined);
-    s.unnamed122___U28 = (s.corners___18896);
-    s.unnamed123___U29 = (0);
+    s.cornerCost___48564 = (r0);
+    s.corner___48570 = (undefined);
+    s.unnamed962___U28 = (s.corners___48392);
+    s.unnamed963___U29 = (0);
   case 36:
-    s.tmp_0 = r0 = s.unnamed123___U29;
-    r0 = pxsim_Array__length(s.unnamed122___U28);
+    s.tmp_0 = r0 = s.unnamed963___U29;
+    r0 = pxsim_Array__length(s.unnamed962___U28);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 37; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed122___U28, s.unnamed123___U29);
-    s.corner___19074 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed962___U28, s.unnamed963___U29);
+    s.corner___48570 = (r0);
     s.tmp_2 = lambda_4_mk(s);
-    s.tmp_2.argL = s.updateOrFillLocation___18785;
-    s.tmp_2.arg0 = s.corner___19074;
-    s.tmp_2.arg1 = s.dataForCurrLocation___18882;
-    s.tmp_2.arg2 = s.cornerCost___19068;
+    s.tmp_2.argL = s.updateOrFillLocation___48281;
+    s.tmp_2.arg0 = s.corner___48570;
+    s.tmp_2.arg1 = s.dataForCurrLocation___48378;
+    s.tmp_2.arg2 = s.cornerCost___48564;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1837; s.pc = 76; return s.tmp_2;
+    s.callLocIdx = 1842; s.pc = 76; return s.tmp_2;
   case 76:
     r0 = s.retval;
-    r0 = (s.unnamed123___U29 + 1);
-    s.unnamed123___U29 = (r0);
+    r0 = (s.unnamed963___U29 + 1);
+    s.unnamed963___U29 = (r0);
     { step = 36; continue; }
   case 37:
-    s.unnamed122___U28 = (undefined);
+    s.unnamed962___U28 = (undefined);
   case 38:
   case 39:
     { step = 3; continue; }
   case 40:
-    s.tmp_0 = r0 = s.end___18855;
+    s.tmp_0 = r0 = s.end___48351;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 41; continue; }
     r0 = s.tmp_0;
     { step = 42; continue; }
   case 41:
-    s.tmp_1 = r0 = s.encountedLocations___18782;
-    s.tmp_3 = scene_locationCol__P6085_mk(s);
-    s.tmp_3.arg0 = s.end___18855;
-    s.callLocIdx = 1838; s.pc = 77; return s.tmp_3;
+    s.tmp_1 = r0 = s.encountedLocations___48278;
+    s.tmp_3 = scene_locationCol__P35607_mk(s);
+    s.tmp_3.arg0 = s.end___48351;
+    s.callLocIdx = 1843; s.pc = 77; return s.tmp_3;
   case 77:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -8919,17 +8852,17 @@ switch (step) {
   case 42:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.endCol___19080 = (s.tmp_4);
-    s.tmp_0 = r0 = s.endCol___19080;
+    s.endCol___48576 = (s.tmp_4);
+    s.tmp_0 = r0 = s.endCol___48576;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 43; continue; }
     r0 = s.tmp_0;
     { step = 44; continue; }
   case 43:
-    s.tmp_1 = r0 = s.endCol___19080;
-    s.tmp_3 = scene_locationRow__P6084_mk(s);
-    s.tmp_3.arg0 = s.end___18855;
-    s.callLocIdx = 1839; s.pc = 78; return s.tmp_3;
+    s.tmp_1 = r0 = s.endCol___48576;
+    s.tmp_3 = scene_locationRow__P35606_mk(s);
+    s.tmp_3.arg0 = s.end___48351;
+    s.callLocIdx = 1844; s.pc = 78; return s.tmp_3;
   case 78:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -8937,8 +8870,8 @@ switch (step) {
   case 44:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.endDataNode___19087 = (s.tmp_4);
-    r0 = pxsim_numops_toBoolDecr(s.end___18855);
+    s.endDataNode___48583 = (s.tmp_4);
+    r0 = pxsim_numops_toBoolDecr(s.end___48351);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8947,7 +8880,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 46; continue; }
   case 45:
-    r0 = pxsim_numops_toBoolDecr(s.endDataNode___19087);
+    r0 = pxsim_numops_toBoolDecr(s.endDataNode___48583);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
   case 46:
@@ -8959,34 +8892,34 @@ switch (step) {
     { step = 51; continue; }
   case 47:
   case 48:
-    s.curr___19100 = (s.endDataNode___19087);
+    s.curr___48596 = (s.endDataNode___48583);
     r0 = pxsim_Array__mk();
-    s.output___19102 = (r0);
+    s.output___48598 = (r0);
   case 49:
-    r0 = pxsim_numops_toBoolDecr(s.curr___19100);
+    r0 = pxsim_numops_toBoolDecr(s.curr___48596);
     if (!r0) { step = 50; continue; }
-    s.tmp_0 = helpers_arrayUnshift__P102_mk(s);
-    s.tmp_0.arg0 = s.output___19102;
-    r0 = s.curr___19100.fields["l"];
+    s.tmp_0 = helpers_arrayUnshift__P29637_mk(s);
+    s.tmp_0.arg0 = s.output___48598;
+    r0 = s.curr___48596.fields["l"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1840; s.pc = 79; return s.tmp_0;
+    s.callLocIdx = 1845; s.pc = 79; return s.tmp_0;
   case 79:
     r0 = s.retval;
-    r0 = s.curr___19100.fields["parent"];
-    s.curr___19100 = (r0);
+    r0 = s.curr___48596.fields["parent"];
+    s.curr___48596 = (r0);
     { step = 49; continue; }
   case 50:
-    r0 = s.output___19102;
+    r0 = s.output___48598;
   case 51:
     return leave(s, r0)
   default: oops()
 } } }
-scene_generalAStar__P3657.info = {"start":1723,"length":5198,"line":53,"column":4,"endLine":198,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"generalAStar","argumentNames":["tm","start","onTilesOf","heuristic","isEnd"]}
+scene_generalAStar__P33191.info = {"start":1723,"length":5198,"line":53,"column":4,"endLine":198,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"generalAStar","argumentNames":["tm","start","onTilesOf","heuristic","isEnd"]}
 
-function scene_generalAStar__P3657_mk(s) {
+function scene_generalAStar__P33191_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_generalAStar__P3657, depth: s.depth + 1,
+        parent: s, fn: scene_generalAStar__P33191, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8994,40 +8927,40 @@ function scene_generalAStar__P3657_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  consideredTiles___18760: undefined,
-  encountedLocations___18782: undefined,
-  updateOrFillLocation___18785: undefined,
-  end___18855: undefined,
-  currLocation___18861: undefined,
-  row___18872: undefined,
-  col___18877: undefined,
-  dataForCurrLocation___18882: undefined,
-  neighbors___18894: undefined,
-  corners___18896: undefined,
-  left___18898: undefined,
-  right___18904: undefined,
-  top___18911: undefined,
-  bottom___18917: undefined,
-  leftIsWall___18924: undefined,
-  rightIsWall___18931: undefined,
-  topIsWall___18938: undefined,
-  bottomIsWall___18945: undefined,
-  topLeft___18960: undefined,
-  bottomLeft___18978: undefined,
-  topRight___19003: undefined,
-  bottomRight___19022: undefined,
-  neighborCost___19052: undefined,
-  node___19058: undefined,
-  unnamed120___U24: undefined,
-  unnamed121___U25: undefined,
-  cornerCost___19068: undefined,
-  corner___19074: undefined,
-  unnamed122___U28: undefined,
-  unnamed123___U29: undefined,
-  endCol___19080: undefined,
-  endDataNode___19087: undefined,
-  curr___19100: undefined,
-  output___19102: undefined,
+  consideredTiles___48256: undefined,
+  encountedLocations___48278: undefined,
+  updateOrFillLocation___48281: undefined,
+  end___48351: undefined,
+  currLocation___48357: undefined,
+  row___48368: undefined,
+  col___48373: undefined,
+  dataForCurrLocation___48378: undefined,
+  neighbors___48390: undefined,
+  corners___48392: undefined,
+  left___48394: undefined,
+  right___48400: undefined,
+  top___48407: undefined,
+  bottom___48413: undefined,
+  leftIsWall___48420: undefined,
+  rightIsWall___48427: undefined,
+  topIsWall___48434: undefined,
+  bottomIsWall___48441: undefined,
+  topLeft___48456: undefined,
+  bottomLeft___48474: undefined,
+  topRight___48499: undefined,
+  bottomRight___48518: undefined,
+  neighborCost___48548: undefined,
+  node___48554: undefined,
+  unnamed960___U24: undefined,
+  unnamed961___U25: undefined,
+  cornerCost___48564: undefined,
+  corner___48570: undefined,
+  unnamed962___U28: undefined,
+  unnamed963___U29: undefined,
+  endCol___48576: undefined,
+  endDataNode___48583: undefined,
+  curr___48596: undefined,
+  output___48598: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -9039,7 +8972,7 @@ function scene_generalAStar__P3657_mk(s) {
 
 
 
-function inline__P18763(s) {
+function inline__P48259(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9074,12 +9007,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P18763.info = {"start":2110,"length":67,"line":62,"column":12,"endLine":62,"endColumn":79,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P48259.info = {"start":2110,"length":67,"line":62,"column":12,"endLine":62,"endColumn":79,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P18763_mk(s) {
+function inline__P48259_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P18763, depth: s.depth + 1,
+        parent: s, fn: inline__P48259, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -9097,7 +9030,7 @@ function inline__P18763_mk(s) {
 
 
 
-function updateOrFillLocation__P18785(s) {
+function updateOrFillLocation__P48281(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9107,34 +9040,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.row___18789 = undefined;
-    s.col___18793 = undefined;
-    s.colData___18801 = undefined;
-    s.lData___18811 = undefined;
-    s.h___18842 = undefined;
+    s.row___48285 = undefined;
+    s.col___48289 = undefined;
+    s.colData___48297 = undefined;
+    s.lData___48307 = undefined;
+    s.h___48338 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    s.tmp_0 = scene_locationRow__P35606_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1807; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1812; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.row___18789 = (r0);
-    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    s.row___48285 = (r0);
+    s.tmp_0 = scene_locationCol__P35607_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1808; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1813; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.col___18793 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.col___48289 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P31755_mk(s);
     s.tmp_1.arg0 = s.caps[0];
-    s.tmp_1.arg1 = s.col___18793;
-    s.tmp_1.arg2 = s.row___18789;
-    s.callLocIdx = 1809; s.pc = 14; return s.tmp_1;
+    s.tmp_1.arg1 = s.col___48289;
+    s.tmp_1.arg2 = s.row___48285;
+    s.callLocIdx = 1814; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -9143,7 +9076,7 @@ switch (step) {
     { step = 11; continue; }
   case 1:
   case 2:
-    r0 = pxsim_Array__getAt(s.caps[1], s.col___18793);
+    r0 = pxsim_Array__getAt(s.caps[1], s.col___48289);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (!r0) { step = 3; continue; }
@@ -9151,7 +9084,7 @@ switch (step) {
     { step = 4; continue; }
   case 3:
     s.tmp_3 = r0 = s.caps[1];
-    s.tmp_4 = r0 = s.col___18793;
+    s.tmp_4 = r0 = s.col___48289;
     r0 = pxsim_Array__mk();
     s.tmp_5 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_3, s.tmp_4, s.tmp_5);
@@ -9159,29 +9092,29 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    s.colData___18801 = (s.tmp_6);
-    r0 = pxsim_Array__getAt(s.colData___18801, s.row___18789);
-    s.lData___18811 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.lData___18811);
+    s.colData___48297 = (s.tmp_6);
+    r0 = pxsim_Array__getAt(s.colData___48297, s.row___48285);
+    s.lData___48307 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.lData___48307);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(scene_LocationNode__C6081_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_LocationNode__C35603_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = scene_LocationNode_constructor__P6082_mk(s);
+    s.tmp_3 = scene_LocationNode_constructor__P35604_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
     s.tmp_3.arg1 = s.arg0;
     s.tmp_3.arg2 = s.arg1;
     s.tmp_3.arg3 = s.arg2;
-    s.callLocIdx = 1810; s.pc = 15; return s.tmp_3;
+    s.callLocIdx = 1815; s.pc = 15; return s.tmp_3;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_Array_.setAt(s.colData___18801, s.row___18789, s.tmp_2);
+    r0 = pxsim_Array_.setAt(s.colData___48297, s.row___48285, s.tmp_2);
     { step = 10; continue; }
   case 5:
-    r0 = s.lData___18811.fields["visited"];
+    r0 = s.lData___48307.fields["visited"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -9192,7 +9125,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 6:
-    r0 = s.lData___18811.fields["lastCost"];
+    r0 = s.lData___48307.fields["lastCost"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 > s.arg2);
   case 7:
@@ -9200,8 +9133,8 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 8; continue; }
-    r0 = (s.lData___18811).fields["lastCost"] = (s.arg2);
-    r0 = (s.lData___18811).fields["parent"] = (s.arg1);
+    r0 = (s.lData___48307).fields["lastCost"] = (s.arg2);
+    r0 = (s.lData___48307).fields["parent"] = (s.arg1);
     { step = 9; continue; }
   case 8:
     { step = 11; continue; }
@@ -9211,24 +9144,24 @@ switch (step) {
     s.tmp_0.argL = s.caps[2];
     s.tmp_0.arg0 = s.arg0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1811; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1816; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.h___18842 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_PrioritizedLocation__C6079_VT);
+    s.h___48338 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_PrioritizedLocation__C35601_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_PrioritizedLocation_constructor__P6080_mk(s);
+    s.tmp_1 = scene_PrioritizedLocation_constructor__P35602_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg2;
-    s.tmp_1.arg3 = s.h___18842;
-    s.callLocIdx = 1812; s.pc = 17; return s.tmp_1;
+    s.tmp_1.arg3 = s.h___48338;
+    s.callLocIdx = 1817; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    s.tmp_2 = Heap_push__P3648_mk(s);
+    s.tmp_2 = Heap_push__P33182_mk(s);
     s.tmp_2.arg0 = s.caps[3];
     s.tmp_2.arg1 = s.tmp_0;
-    s.callLocIdx = 1813; s.pc = 18; return s.tmp_2;
+    s.callLocIdx = 1818; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
   case 11:
@@ -9236,12 +9169,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-updateOrFillLocation__P18785.info = {"start":2261,"length":1162,"line":66,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"updateOrFillLocation","argumentNames":["l","parent","cost"]}
+updateOrFillLocation__P48281.info = {"start":2261,"length":1162,"line":66,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"updateOrFillLocation","argumentNames":["l","parent","cost"]}
 
-function updateOrFillLocation__P18785_mk(s) {
+function updateOrFillLocation__P48281_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: updateOrFillLocation__P18785, depth: s.depth + 1,
+        parent: s, fn: updateOrFillLocation__P48281, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -9250,11 +9183,11 @@ function updateOrFillLocation__P18785_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  row___18789: undefined,
-  col___18793: undefined,
-  colData___18801: undefined,
-  lData___18811: undefined,
-  h___18842: undefined,
+  row___48285: undefined,
+  col___48289: undefined,
+  colData___48297: undefined,
+  lData___48307: undefined,
+  h___48338: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -9264,7 +9197,7 @@ function updateOrFillLocation__P18785_mk(s) {
 
 
 
-function scene_LocationNode_constructor__P6082(s) {
+function scene_LocationNode_constructor__P35604(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9282,7 +9215,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_LocationNode__C6081_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_LocationNode__C35603_VT)) failedCast(r0);
     r0 = (s.arg0).fields["l"] = (s.arg1);
     r0 = (s.arg0).fields["parent"] = (s.arg2);
     r0 = (s.arg0).fields["lastCost"] = (s.arg3);
@@ -9291,12 +9224,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_LocationNode_constructor__P6082.info = {"start":317,"length":189,"line":13,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","l","parent","lastCost"]}
+scene_LocationNode_constructor__P35604.info = {"start":317,"length":189,"line":13,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","l","parent","lastCost"]}
 
-function scene_LocationNode_constructor__P6082_mk(s) {
+function scene_LocationNode_constructor__P35604_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_LocationNode_constructor__P6082, depth: s.depth + 1,
+        parent: s, fn: scene_LocationNode_constructor__P35604, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -9308,7 +9241,7 @@ function scene_LocationNode_constructor__P6082_mk(s) {
 
 
 
-function scene_PrioritizedLocation_constructor__P6080(s) {
+function scene_PrioritizedLocation_constructor__P35602(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9326,7 +9259,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_PrioritizedLocation__C6079_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_PrioritizedLocation__C35601_VT)) failedCast(r0);
     r0 = (s.arg0).fields["loc"] = (s.arg1);
     r0 = (s.arg0).fields["cost"] = (s.arg2);
     r0 = (s.arg0).fields["extraCost"] = (s.arg3);
@@ -9334,12 +9267,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_PrioritizedLocation_constructor__P6080.info = {"start":60,"length":176,"line":2,"column":8,"endLine":7,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","loc","cost","extraCost"]}
+scene_PrioritizedLocation_constructor__P35602.info = {"start":60,"length":176,"line":2,"column":8,"endLine":7,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","loc","cost","extraCost"]}
 
-function scene_PrioritizedLocation_constructor__P6080_mk(s) {
+function scene_PrioritizedLocation_constructor__P35602_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_PrioritizedLocation_constructor__P6080, depth: s.depth + 1,
+        parent: s, fn: scene_PrioritizedLocation_constructor__P35602, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -9351,7 +9284,7 @@ function scene_PrioritizedLocation_constructor__P6080_mk(s) {
 
 
 
-function Heap_length__P3651(s) {
+function Heap_length__P33185(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9366,20 +9299,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__length(s.tmp_0);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Heap_length__P3651.info = {"start":1832,"length":54,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"length","argumentNames":["this"]}
-Heap_length__P3651.isGetter = true;
+Heap_length__P33185.info = {"start":1832,"length":54,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"length","argumentNames":["this"]}
+Heap_length__P33185.isGetter = true;
 
-function Heap_length__P3651_mk(s) {
+function Heap_length__P33185_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_length__P3651, depth: s.depth + 1,
+        parent: s, fn: Heap_length__P33185, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -9389,7 +9322,7 @@ function Heap_length__P3651_mk(s) {
 
 
 
-function Heap_pop__P3649(s) {
+function Heap_pop__P33183(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9399,22 +9332,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.output___19138 = undefined;
-    s.nextRoot___19143 = undefined;
+    s.output___48634 = undefined;
+    s.nextRoot___48639 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, 0);
-    s.output___19138 = (r0);
+    s.output___48634 = (r0);
     r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.pop(s.tmp_0);
-    s.nextRoot___19143 = (r0);
+    s.nextRoot___48639 = (r0);
     r0 = s.arg0.fields["store"];
     s.tmp_2 = r0;
     r0 = pxsim_Array__length(s.tmp_2);
@@ -9425,32 +9358,32 @@ switch (step) {
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["store"];
     s.tmp_3 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_3, 0, s.nextRoot___19143);
-    s.tmp_0 = Heap_percolateDown__P6074_mk(s);
+    r0 = pxsim_Array_.setAt(s.tmp_3, 0, s.nextRoot___48639);
+    s.tmp_0 = Heap_percolateDown__P35596_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1796; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1801; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = s.output___19138;
+    r0 = s.output___48634;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_pop__P3649.info = {"start":1536,"length":236,"line":61,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"pop","argumentNames":["this"]}
+Heap_pop__P33183.info = {"start":1536,"length":236,"line":61,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"pop","argumentNames":["this"]}
 
-function Heap_pop__P3649_mk(s) {
+function Heap_pop__P33183_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_pop__P3649, depth: s.depth + 1,
+        parent: s, fn: Heap_pop__P33183, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  output___19138: undefined,
-  nextRoot___19143: undefined,
+  output___48634: undefined,
+  nextRoot___48639: undefined,
   arg0: undefined,
 } }
 
@@ -9458,7 +9391,7 @@ function Heap_pop__P3649_mk(s) {
 
 
 
-function Heap_percolateDown__P6074(s) {
+function Heap_percolateDown__P35596(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9468,39 +9401,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.data___19158 = undefined;
-    s.max___19161 = undefined;
-    s.left___19169 = undefined;
-    s.right___19173 = undefined;
-    s.curr___19177 = undefined;
+    s.data___48654 = undefined;
+    s.max___48657 = undefined;
+    s.left___48665 = undefined;
+    s.right___48669 = undefined;
+    s.curr___48673 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = s.arg0.fields["store"];
-    s.data___19158 = (r0);
+    s.data___48654 = (r0);
     r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__length(s.tmp_0);
-    s.max___19161 = (r0);
+    s.max___48657 = (r0);
   case 1:
-    r0 = (s.arg1 < s.max___19161);
+    r0 = (s.arg1 < s.max___48657);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
     r0 = (s.arg1 << 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
-    s.left___19169 = (r0);
+    s.left___48665 = (r0);
     r0 = (s.arg1 << 1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 2);
-    s.right___19173 = (r0);
-    s.curr___19177 = (s.arg1);
-    r0 = (s.left___19169 < s.max___19161);
+    s.right___48669 = (r0);
+    s.curr___48673 = (s.arg1);
+    r0 = (s.left___48665 < s.max___48657);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 2; continue; }
@@ -9509,18 +9442,18 @@ switch (step) {
   case 2:
     s.tmp_2 = if_comparator_3_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.data___19158, s.curr___19177);
+    r0 = pxsim_Array__getAt(s.data___48654, s.curr___48673);
     s.tmp_2.arg1 = r0;
-    r0 = pxsim_Array__getAt(s.data___19158, s.left___19169);
+    r0 = pxsim_Array__getAt(s.data___48654, s.left___48665);
     s.tmp_2.arg2 = r0;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
-      s.callLocIdx = 1790; s.pc = 13; return s.tmp_2;
+      s.callLocIdx = 1795; s.pc = 13; return s.tmp_2;
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1790; s.pc = 13; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1790; s.pc = 13; return s.tmp_2;; }
-     else { s.callLocIdx = 1790; s.pc = 13; return s.tmp_2; }
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1795; s.pc = 13; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1795; s.pc = 13; return s.tmp_2;; }
+     else { s.callLocIdx = 1795; s.pc = 13; return s.tmp_2; }
     }
   case 13:
     r0 = s.retval;
@@ -9531,10 +9464,10 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 4; continue; }
-    s.curr___19177 = (s.left___19169);
+    s.curr___48673 = (s.left___48665);
   case 4:
   case 5:
-    r0 = (s.right___19173 < s.max___19161);
+    r0 = (s.right___48669 < s.max___48657);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 6; continue; }
@@ -9543,18 +9476,18 @@ switch (step) {
   case 6:
     s.tmp_2 = if_comparator_3_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.data___19158, s.curr___19177);
+    r0 = pxsim_Array__getAt(s.data___48654, s.curr___48673);
     s.tmp_2.arg1 = r0;
-    r0 = pxsim_Array__getAt(s.data___19158, s.right___19173);
+    r0 = pxsim_Array__getAt(s.data___48654, s.right___48669);
     s.tmp_2.arg2 = r0;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
-      s.callLocIdx = 1791; s.pc = 14; return s.tmp_2;
+      s.callLocIdx = 1796; s.pc = 14; return s.tmp_2;
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1791; s.pc = 14; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1791; s.pc = 14; return s.tmp_2;; }
-     else { s.callLocIdx = 1791; s.pc = 14; return s.tmp_2; }
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1796; s.pc = 14; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1796; s.pc = 14; return s.tmp_2;; }
+     else { s.callLocIdx = 1796; s.pc = 14; return s.tmp_2; }
     }
   case 14:
     r0 = s.retval;
@@ -9565,45 +9498,45 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 8; continue; }
-    s.curr___19177 = (s.right___19173);
+    s.curr___48673 = (s.right___48669);
   case 8:
   case 9:
-    r0 = (s.curr___19177 == s.arg1);
+    r0 = (s.curr___48673 == s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
     { step = 12; continue; }
   case 10:
   case 11:
-    r0 = pxsim_Array__getAt(s.data___19158, s.arg1);
+    r0 = pxsim_Array__getAt(s.data___48654, s.arg1);
     s.tmp_1 = r0;
-    r0 = pxsim_Array__getAt(s.data___19158, s.curr___19177);
+    r0 = pxsim_Array__getAt(s.data___48654, s.curr___48673);
     s.tmp_2 = r0;
-    r0 = pxsim_Array_.setAt(s.data___19158, s.curr___19177, s.tmp_1);
-    r0 = pxsim_Array_.setAt(s.data___19158, s.arg1, s.tmp_2);
-    s.arg1 = (s.curr___19177);
+    r0 = pxsim_Array_.setAt(s.data___48654, s.curr___48673, s.tmp_1);
+    r0 = pxsim_Array_.setAt(s.data___48654, s.arg1, s.tmp_2);
+    s.arg1 = (s.curr___48673);
     { step = 1; continue; }
   case 12:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_percolateDown__P6074.info = {"start":367,"length":645,"line":13,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateDown","argumentNames":["this","i"]}
+Heap_percolateDown__P35596.info = {"start":367,"length":645,"line":13,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateDown","argumentNames":["this","i"]}
 
-function Heap_percolateDown__P6074_mk(s) {
+function Heap_percolateDown__P35596_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_percolateDown__P6074, depth: s.depth + 1,
+        parent: s, fn: Heap_percolateDown__P35596, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  data___19158: undefined,
-  max___19161: undefined,
-  left___19169: undefined,
-  right___19173: undefined,
-  curr___19177: undefined,
+  data___48654: undefined,
+  max___48657: undefined,
+  left___48665: undefined,
+  right___48669: undefined,
+  curr___48673: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -9612,7 +9545,7 @@ function Heap_percolateDown__P6074_mk(s) {
 
 
 
-function Heap_rightChild__P6078(s) {
+function Heap_rightChild__P35600(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9628,19 +9561,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = (s.arg1 << 1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 2);
     return leave(s, r0)
   default: oops()
 } } }
-Heap_rightChild__P6078.info = {"start":2435,"length":68,"line":110,"column":4,"endLine":112,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"rightChild","argumentNames":["this","i"]}
+Heap_rightChild__P35600.info = {"start":2435,"length":68,"line":110,"column":4,"endLine":112,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"rightChild","argumentNames":["this","i"]}
 
-function Heap_rightChild__P6078_mk(s) {
+function Heap_rightChild__P35600_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_rightChild__P6078, depth: s.depth + 1,
+        parent: s, fn: Heap_rightChild__P35600, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -9651,7 +9584,7 @@ function Heap_rightChild__P6078_mk(s) {
 
 
 
-function Heap_leftChild__P6077(s) {
+function Heap_leftChild__P35599(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9667,19 +9600,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = (s.arg1 << 1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
     return leave(s, r0)
   default: oops()
 } } }
-Heap_leftChild__P6077.info = {"start":2362,"length":67,"line":106,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"leftChild","argumentNames":["this","i"]}
+Heap_leftChild__P35599.info = {"start":2362,"length":67,"line":106,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"leftChild","argumentNames":["this","i"]}
 
-function Heap_leftChild__P6077_mk(s) {
+function Heap_leftChild__P35599_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_leftChild__P6077, depth: s.depth + 1,
+        parent: s, fn: Heap_leftChild__P35599, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -9690,7 +9623,7 @@ function Heap_leftChild__P6077_mk(s) {
 
 
 
-function Heap_push__P3648(s) {
+function Heap_push__P33182(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9706,25 +9639,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
-    s.tmp_0 = Heap_percolateUp__P6075_mk(s);
+    s.tmp_0 = Heap_percolateUp__P35597_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1794; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1799; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_push__P3648.info = {"start":1456,"length":74,"line":56,"column":4,"endLine":59,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"push","argumentNames":["this","v"]}
+Heap_push__P33182.info = {"start":1456,"length":74,"line":56,"column":4,"endLine":59,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"push","argumentNames":["this","v"]}
 
-function Heap_push__P3648_mk(s) {
+function Heap_push__P33182_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_push__P3648, depth: s.depth + 1,
+        parent: s, fn: Heap_push__P33182, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -9735,7 +9668,7 @@ function Heap_push__P3648_mk(s) {
 
 
 
-function Heap_percolateUp__P6075(s) {
+function Heap_percolateUp__P35597(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9745,51 +9678,51 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___19252 = undefined;
-    s.curr___19260 = undefined;
-    s.parentIndex___19265 = undefined;
-    s.parent___19269 = undefined;
+    s.i___48748 = undefined;
+    s.curr___48756 = undefined;
+    s.parentIndex___48761 = undefined;
+    s.parent___48765 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = s.arg0.fields["store"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.tmp_1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.i___19252 = (r0);
+    s.i___48748 = (r0);
   case 1:
-    r0 = (s.i___19252 > 0);
+    r0 = (s.i___48748 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
     r0 = s.arg0.fields["store"];
     s.tmp_1 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_1, s.i___19252);
-    s.curr___19260 = (r0);
-    r0 = (s.i___19252 - 1);
+    r0 = pxsim_Array__getAt(s.tmp_1, s.i___48748);
+    s.curr___48756 = (r0);
+    r0 = (s.i___48748 - 1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.parentIndex___19265 = (r0);
+    s.parentIndex___48761 = (r0);
     r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.parentIndex___19265);
-    s.parent___19269 = (r0);
+    r0 = pxsim_Array__getAt(s.tmp_0, s.parentIndex___48761);
+    s.parent___48765 = (r0);
     s.tmp_2 = if_comparator_3_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.parent___19269;
-    s.tmp_2.arg2 = s.curr___19260;
+    s.tmp_2.arg1 = s.parent___48765;
+    s.tmp_2.arg2 = s.curr___48756;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
-      s.callLocIdx = 1793; s.pc = 5; return s.tmp_2;
+      s.callLocIdx = 1798; s.pc = 5; return s.tmp_2;
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1793; s.pc = 5; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1793; s.pc = 5; return s.tmp_2;; }
-     else { s.callLocIdx = 1793; s.pc = 5; return s.tmp_2; }
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1798; s.pc = 5; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1798; s.pc = 5; return s.tmp_2;; }
+     else { s.callLocIdx = 1798; s.pc = 5; return s.tmp_2; }
     }
   case 5:
     r0 = s.retval;
@@ -9803,32 +9736,32 @@ switch (step) {
   case 3:
     r0 = s.arg0.fields["store"];
     s.tmp_3 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_3, s.i___19252, s.parent___19269);
+    r0 = pxsim_Array_.setAt(s.tmp_3, s.i___48748, s.parent___48765);
     r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_0, s.parentIndex___19265, s.curr___19260);
-    s.i___19252 = (s.parentIndex___19265);
+    r0 = pxsim_Array_.setAt(s.tmp_0, s.parentIndex___48761, s.curr___48756);
+    s.i___48748 = (s.parentIndex___48761);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_percolateUp__P6075.info = {"start":1018,"length":432,"line":38,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateUp","argumentNames":["this"]}
+Heap_percolateUp__P35597.info = {"start":1018,"length":432,"line":38,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateUp","argumentNames":["this"]}
 
-function Heap_percolateUp__P6075_mk(s) {
+function Heap_percolateUp__P35597_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_percolateUp__P6075, depth: s.depth + 1,
+        parent: s, fn: Heap_percolateUp__P35597, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  i___19252: undefined,
-  curr___19260: undefined,
-  parentIndex___19265: undefined,
-  parent___19269: undefined,
+  i___48748: undefined,
+  curr___48756: undefined,
+  parentIndex___48761: undefined,
+  parent___48765: undefined,
   arg0: undefined,
 } }
 
@@ -9836,7 +9769,7 @@ function Heap_percolateUp__P6075_mk(s) {
 
 
 
-function Heap_parent__P6076(s) {
+function Heap_parent__P35598(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9852,19 +9785,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = (s.arg1 - 1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
     return leave(s, r0)
   default: oops()
 } } }
-Heap_parent__P6076.info = {"start":2292,"length":64,"line":102,"column":4,"endLine":104,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"parent","argumentNames":["this","i"]}
+Heap_parent__P35598.info = {"start":2292,"length":64,"line":102,"column":4,"endLine":104,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"parent","argumentNames":["this","i"]}
 
-function Heap_parent__P6076_mk(s) {
+function Heap_parent__P35598_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_parent__P6076, depth: s.depth + 1,
+        parent: s, fn: Heap_parent__P35598, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -9875,7 +9808,7 @@ function Heap_parent__P6076_mk(s) {
 
 
 
-function Heap_constructor__P3647(s) {
+function Heap_constructor__P33181(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9891,7 +9824,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Heap__C33180_VT)) failedCast(r0);
     r0 = (s.arg0).fields["comparator"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
@@ -9901,12 +9834,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Heap_constructor__P3647.info = {"start":257,"length":104,"line":7,"column":4,"endLine":11,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"inline","argumentNames":["this","comparator"]}
+Heap_constructor__P33181.info = {"start":257,"length":104,"line":7,"column":4,"endLine":11,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"inline","argumentNames":["this","comparator"]}
 
-function Heap_constructor__P3647_mk(s) {
+function Heap_constructor__P33181_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_constructor__P3647, depth: s.depth + 1,
+        parent: s, fn: Heap_constructor__P33181, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -9918,7 +9851,7 @@ function Heap_constructor__P3647_mk(s) {
 
 
 
-function helpers_arrayUnshift__P102(s) {
+function helpers_arrayUnshift__P29637(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9938,12 +9871,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayUnshift__P102.info = {"start":4898,"length":126,"line":180,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayUnshift","argumentNames":["arr","value"]}
+helpers_arrayUnshift__P29637.info = {"start":4898,"length":126,"line":180,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayUnshift","argumentNames":["arr","value"]}
 
-function helpers_arrayUnshift__P102_mk(s) {
+function helpers_arrayUnshift__P29637_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayUnshift__P102, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayUnshift__P29637, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -9953,7 +9886,7 @@ function helpers_arrayUnshift__P102_mk(s) {
 
 
 
-function tiles_Location_y__P2294(s) {
+function tiles_Location_y__P31713(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9963,22 +9896,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___19722 = undefined;
+    s.scale___49218 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C31708_VT)) failedCast(r0);
     r0 = s.arg0.fields["tileMap"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_scale"];
-    s.scale___19722 = (r0);
+    s.scale___49218 = (r0);
     r0 = s.arg0.fields["_row"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 << s.scale___19722);
+    r0 = (s.tmp_1 << s.scale___49218);
     s.tmp_0 = r0;
-    r0 = (s.scale___19722 - 1);
+    r0 = (s.scale___49218 - 1);
     s.tmp_3 = r0;
     r0 = (1 << s.tmp_3);
     s.tmp_2 = r0;
@@ -9986,19 +9919,19 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_y__P2294.info = {"start":836,"length":135,"line":38,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"y","argumentNames":["this"]}
-tiles_Location_y__P2294.isGetter = true;
+tiles_Location_y__P31713.info = {"start":836,"length":135,"line":38,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"y","argumentNames":["this"]}
+tiles_Location_y__P31713.isGetter = true;
 
-function tiles_Location_y__P2294_mk(s) {
+function tiles_Location_y__P31713_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_y__P2294, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_y__P31713, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  scale___19722: undefined,
+  scale___49218: undefined,
   arg0: undefined,
 } }
 
@@ -10006,7 +9939,7 @@ function tiles_Location_y__P2294_mk(s) {
 
 
 
-function tiles_Location_x__P2293(s) {
+function tiles_Location_x__P31712(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10016,22 +9949,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___19740 = undefined;
+    s.scale___49236 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C31708_VT)) failedCast(r0);
     r0 = s.arg0.fields["tileMap"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_scale"];
-    s.scale___19740 = (r0);
+    s.scale___49236 = (r0);
     r0 = s.arg0.fields["_col"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 << s.scale___19740);
+    r0 = (s.tmp_1 << s.scale___49236);
     s.tmp_0 = r0;
-    r0 = (s.scale___19740 - 1);
+    r0 = (s.scale___49236 - 1);
     s.tmp_3 = r0;
     r0 = (1 << s.tmp_3);
     s.tmp_2 = r0;
@@ -10039,19 +9972,19 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_x__P2293.info = {"start":691,"length":135,"line":33,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"x","argumentNames":["this"]}
-tiles_Location_x__P2293.isGetter = true;
+tiles_Location_x__P31712.info = {"start":691,"length":135,"line":33,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"x","argumentNames":["this"]}
+tiles_Location_x__P31712.isGetter = true;
 
-function tiles_Location_x__P2293_mk(s) {
+function tiles_Location_x__P31712_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_x__P2293, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_x__P31712, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  scale___19740: undefined,
+  scale___49236: undefined,
   arg0: undefined,
 } }
 
@@ -10059,7 +9992,7 @@ function tiles_Location_x__P2293_mk(s) {
 
 
 
-function sprites_setDataBoolean__P3624(s) {
+function sprites_setDataBoolean__P33158(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10069,7 +10002,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___20816 = undefined;
+    s.d___50312 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -10096,13 +10029,13 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P2041_mk(s);
+    s.tmp_4 = Sprite_data__P31460_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1775; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1780; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    s.d___20816 = (r0);
-    s.tmp_0 = r0 = s.d___20816;
+    s.d___50312 = (r0);
+    s.tmp_0 = r0 = s.d___50312;
     s.tmp_1 = r0 = s.arg1;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     s.tmp_5 = r0;
@@ -10118,12 +10051,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_setDataBoolean__P3624.info = {"start":2275,"length":180,"line":73,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataBoolean","argumentNames":["sprite","name","value"]}
+sprites_setDataBoolean__P33158.info = {"start":2275,"length":180,"line":73,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataBoolean","argumentNames":["sprite","name","value"]}
 
-function sprites_setDataBoolean__P3624_mk(s) {
+function sprites_setDataBoolean__P33158_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_setDataBoolean__P3624, depth: s.depth + 1,
+        parent: s, fn: sprites_setDataBoolean__P33158, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10131,7 +10064,7 @@ function sprites_setDataBoolean__P3624_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  d___20816: undefined,
+  d___50312: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -10141,7 +10074,7 @@ function sprites_setDataBoolean__P3624_mk(s) {
 
 
 
-function Sprite_data__P2041(s) {
+function Sprite_data__P31460(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10156,7 +10089,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_data"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -10175,13 +10108,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_data__P2041.info = {"start":4194,"length":92,"line":160,"column":4,"endLine":163,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this"]}
-Sprite_data__P2041.isGetter = true;
+Sprite_data__P31460.info = {"start":4194,"length":92,"line":160,"column":4,"endLine":163,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"data","argumentNames":["this"]}
+Sprite_data__P31460.isGetter = true;
 
-function Sprite_data__P2041_mk(s) {
+function Sprite_data__P31460_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_data__P2041, depth: s.depth + 1,
+        parent: s, fn: Sprite_data__P31460, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10195,7 +10128,7 @@ function Sprite_data__P2041_mk(s) {
 
 
 
-function spriteutils_angleFrom__P3633(s) {
+function spriteutils_angleFrom__P33167(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10231,29 +10164,29 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_6 = Sprite_y__P2027_mk(s);
+    s.tmp_6 = Sprite_y__P31446_mk(s);
     s.tmp_6.arg0 = s.arg1;
-    s.callLocIdx = 1781; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 1786; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
     s.tmp_5 = r0;
-    s.tmp_8 = Sprite_y__P2027_mk(s);
+    s.tmp_8 = Sprite_y__P31446_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1782; s.pc = 7; return s.tmp_8;
+    s.callLocIdx = 1787; s.pc = 7; return s.tmp_8;
   case 7:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = (s.tmp_5 - s.tmp_7);
     s.tmp_4 = r0;
-    s.tmp_11 = Sprite_x__P2025_mk(s);
+    s.tmp_11 = Sprite_x__P31444_mk(s);
     s.tmp_11.arg0 = s.arg1;
-    s.callLocIdx = 1783; s.pc = 8; return s.tmp_11;
+    s.callLocIdx = 1788; s.pc = 8; return s.tmp_11;
   case 8:
     r0 = s.retval;
     s.tmp_10 = r0;
-    s.tmp_13 = Sprite_x__P2025_mk(s);
+    s.tmp_13 = Sprite_x__P31444_mk(s);
     s.tmp_13.arg0 = s.arg0;
-    s.callLocIdx = 1784; s.pc = 9; return s.tmp_13;
+    s.callLocIdx = 1789; s.pc = 9; return s.tmp_13;
   case 9:
     r0 = s.retval;
     s.tmp_12 = r0;
@@ -10264,12 +10197,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_angleFrom__P3633.info = {"start":1673,"length":178,"line":54,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"angleFrom","argumentNames":["a","b"]}
+spriteutils_angleFrom__P33167.info = {"start":1673,"length":178,"line":54,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"angleFrom","argumentNames":["a","b"]}
 
-function spriteutils_angleFrom__P3633_mk(s) {
+function spriteutils_angleFrom__P33167_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_angleFrom__P3633, depth: s.depth + 1,
+        parent: s, fn: spriteutils_angleFrom__P33167, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10293,7 +10226,7 @@ function spriteutils_angleFrom__P3633_mk(s) {
 
 
 
-function spriteutils_setVelocityAtAngle__P3635(s) {
+function spriteutils_setVelocityAtAngle__P33169(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10318,7 +10251,7 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = Sprite_setVelocity__P2073_mk(s);
+    s.tmp_2 = Sprite_setVelocity__P31492_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = pxsim.Math_.cos(s.arg1);
     s.tmp_3 = r0;
@@ -10328,7 +10261,7 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 * s.arg2);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 1785; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1790; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
   case 3:
@@ -10336,12 +10269,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_setVelocityAtAngle__P3635.info = {"start":3148,"length":270,"line":95,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"setVelocityAtAngle","argumentNames":["target","angleInRadians","speed"]}
+spriteutils_setVelocityAtAngle__P33169.info = {"start":3148,"length":270,"line":95,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"setVelocityAtAngle","argumentNames":["target","angleInRadians","speed"]}
 
-function spriteutils_setVelocityAtAngle__P3635_mk(s) {
+function spriteutils_setVelocityAtAngle__P33169_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_setVelocityAtAngle__P3635, depth: s.depth + 1,
+        parent: s, fn: spriteutils_setVelocityAtAngle__P33169, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10357,7 +10290,7 @@ function spriteutils_setVelocityAtAngle__P3635_mk(s) {
 
 
 
-function Sprite_setVelocity__P2073(s) {
+function Sprite_setVelocity__P31492(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10374,29 +10307,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_vx__P31449_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 346; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 303; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 347; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 304; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setVelocity__P2073.info = {"start":12526,"length":93,"line":450,"column":4,"endLine":453,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setVelocity","argumentNames":["this","vx","vy"]}
+Sprite_setVelocity__P31492.info = {"start":12526,"length":93,"line":450,"column":4,"endLine":453,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"setVelocity","argumentNames":["this","vx","vy"]}
 
-function Sprite_setVelocity__P2073_mk(s) {
+function Sprite_setVelocity__P31492_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setVelocity__P2073, depth: s.depth + 1,
+        parent: s, fn: Sprite_setVelocity__P31492, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10408,7 +10341,7 @@ function Sprite_setVelocity__P2073_mk(s) {
 
 
 
-function sprites_readDataBoolean__P3625(s) {
+function sprites_readDataBoolean__P33159(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10418,7 +10351,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___8178 = undefined;
+    s.d___37715 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -10445,13 +10378,13 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P2041_mk(s);
+    s.tmp_4 = Sprite_data__P31460_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1776; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1781; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    s.d___8178 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.d___8178, s.arg1);
+    s.d___37715 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.d___37715, s.arg1);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -10464,19 +10397,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_readDataBoolean__P3625.info = {"start":2670,"length":179,"line":86,"column":4,"endLine":90,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataBoolean","argumentNames":["sprite","name"]}
+sprites_readDataBoolean__P33159.info = {"start":2670,"length":179,"line":86,"column":4,"endLine":90,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataBoolean","argumentNames":["sprite","name"]}
 
-function sprites_readDataBoolean__P3625_mk(s) {
+function sprites_readDataBoolean__P33159_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_readDataBoolean__P3625, depth: s.depth + 1,
+        parent: s, fn: sprites_readDataBoolean__P33159, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___8178: undefined,
+  d___37715: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -10485,7 +10418,7 @@ function sprites_readDataBoolean__P3625_mk(s) {
 
 
 
-function spriteutils_distanceBetween__P3632(s) {
+function spriteutils_distanceBetween__P33166(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10521,15 +10454,15 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = Sprite_x__P2025_mk(s);
+    s.tmp_8 = Sprite_x__P31444_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1777; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 1782; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     s.tmp_7 = r0;
-    s.tmp_10 = Sprite_x__P2025_mk(s);
+    s.tmp_10 = Sprite_x__P31444_mk(s);
     s.tmp_10.arg0 = s.arg1;
-    s.callLocIdx = 1778; s.pc = 7; return s.tmp_10;
+    s.callLocIdx = 1783; s.pc = 7; return s.tmp_10;
   case 7:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -10537,15 +10470,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim.Math_.pow(s.tmp_6, 2);
     s.tmp_5 = r0;
-    s.tmp_14 = Sprite_y__P2027_mk(s);
+    s.tmp_14 = Sprite_y__P31446_mk(s);
     s.tmp_14.arg0 = s.arg0;
-    s.callLocIdx = 1779; s.pc = 8; return s.tmp_14;
+    s.callLocIdx = 1784; s.pc = 8; return s.tmp_14;
   case 8:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_16 = Sprite_y__P2027_mk(s);
+    s.tmp_16 = Sprite_y__P31446_mk(s);
     s.tmp_16.arg0 = s.arg1;
-    s.callLocIdx = 1780; s.pc = 9; return s.tmp_16;
+    s.callLocIdx = 1785; s.pc = 9; return s.tmp_16;
   case 9:
     r0 = s.retval;
     s.tmp_15 = r0;
@@ -10560,12 +10493,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_distanceBetween__P3632.info = {"start":1088,"length":168,"line":36,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"distanceBetween","argumentNames":["a","b"]}
+spriteutils_distanceBetween__P33166.info = {"start":1088,"length":168,"line":36,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"distanceBetween","argumentNames":["a","b"]}
 
-function spriteutils_distanceBetween__P3632_mk(s) {
+function spriteutils_distanceBetween__P33166_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_distanceBetween__P3632, depth: s.depth + 1,
+        parent: s, fn: spriteutils_distanceBetween__P33166, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10592,7 +10525,7 @@ function spriteutils_distanceBetween__P3632_mk(s) {
 
 
 
-function update_minimap__P46080(s) {
+function update_minimap__P98267(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10602,148 +10535,148 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sprite___46551 = undefined;
-    s.unnamed1504___U1 = undefined;
-    s.unnamed1505___U2 = undefined;
-    s.sprite___46560 = undefined;
-    s.unnamed1506___U4 = undefined;
-    s.unnamed1507___U5 = undefined;
-    s.sprite___46569 = undefined;
-    s.unnamed1508___U7 = undefined;
-    s.unnamed1509___U8 = undefined;
-    s.tmp_0 = minimap_minimap__P3615_mk(s);
+    s.sprite___98274 = undefined;
+    s.unnamed3544___U1 = undefined;
+    s.unnamed3545___U2 = undefined;
+    s.sprite___98283 = undefined;
+    s.unnamed3546___U4 = undefined;
+    s.unnamed3547___U5 = undefined;
+    s.sprite___98292 = undefined;
+    s.unnamed3548___U7 = undefined;
+    s.unnamed3549___U8 = undefined;
+    s.tmp_0 = minimap_minimap__P33149_mk(s);
     s.tmp_0.arg0 = 3;
     s.tmp_0.arg1 = 2;
     s.tmp_0.arg2 = 11;
-    s.callLocIdx = 175; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 180; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    globals.map___46145 = (r0);
-    s.sprite___46551 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.NPC___45888;
-    s.callLocIdx = 176; s.pc = 8; return s.tmp_0;
+    globals.map___98269 = (r0);
+    s.sprite___98274 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.NPC___97745;
+    s.callLocIdx = 181; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.unnamed1504___U1 = (r0);
-    s.unnamed1505___U2 = (0);
+    s.unnamed3544___U1 = (r0);
+    s.unnamed3545___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed1505___U2;
-    r0 = pxsim_Array__length(s.unnamed1504___U1);
+    s.tmp_0 = r0 = s.unnamed3545___U2;
+    r0 = pxsim_Array__length(s.unnamed3544___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1504___U1, s.unnamed1505___U2);
-    s.sprite___46551 = (r0);
-    s.tmp_2 = minimap_includeSprite__P3617_mk(s);
-    s.tmp_2.arg0 = globals.map___46145;
-    s.tmp_2.arg1 = s.sprite___46551;
+    r0 = pxsim_Array__getAt(s.unnamed3544___U1, s.unnamed3545___U2);
+    s.sprite___98274 = (r0);
+    s.tmp_2 = minimap_includeSprite__P33151_mk(s);
+    s.tmp_2.arg0 = globals.map___98269;
+    s.tmp_2.arg1 = s.sprite___98274;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 177; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 182; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
-    r0 = (s.unnamed1505___U2 + 1);
-    s.unnamed1505___U2 = (r0);
+    r0 = (s.unnamed3545___U2 + 1);
+    s.unnamed3545___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed1504___U1 = (undefined);
-    s.sprite___46560 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.SurvivedNPC___45897;
-    s.callLocIdx = 178; s.pc = 10; return s.tmp_0;
+    s.unnamed3544___U1 = (undefined);
+    s.sprite___98283 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.SurvivedNPC___97754;
+    s.callLocIdx = 183; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.unnamed1506___U4 = (r0);
-    s.unnamed1507___U5 = (0);
+    s.unnamed3546___U4 = (r0);
+    s.unnamed3547___U5 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed1507___U5;
-    r0 = pxsim_Array__length(s.unnamed1506___U4);
+    s.tmp_0 = r0 = s.unnamed3547___U5;
+    r0 = pxsim_Array__length(s.unnamed3546___U4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1506___U4, s.unnamed1507___U5);
-    s.sprite___46560 = (r0);
-    s.tmp_2 = minimap_includeSprite__P3617_mk(s);
-    s.tmp_2.arg0 = globals.map___46145;
-    s.tmp_2.arg1 = s.sprite___46560;
+    r0 = pxsim_Array__getAt(s.unnamed3546___U4, s.unnamed3547___U5);
+    s.sprite___98283 = (r0);
+    s.tmp_2 = minimap_includeSprite__P33151_mk(s);
+    s.tmp_2.arg0 = globals.map___98269;
+    s.tmp_2.arg1 = s.sprite___98283;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 179; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 184; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
-    r0 = (s.unnamed1507___U5 + 1);
-    s.unnamed1507___U5 = (r0);
+    r0 = (s.unnamed3547___U5 + 1);
+    s.unnamed3547___U5 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed1506___U4 = (undefined);
-    s.sprite___46569 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
-    s.tmp_0.arg0 = globals.Enemy___2131;
-    s.callLocIdx = 180; s.pc = 12; return s.tmp_0;
+    s.unnamed3546___U4 = (undefined);
+    s.sprite___98292 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P31394_mk(s);
+    s.tmp_0.arg0 = globals.Enemy___31550;
+    s.callLocIdx = 185; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.unnamed1508___U7 = (r0);
-    s.unnamed1509___U8 = (0);
+    s.unnamed3548___U7 = (r0);
+    s.unnamed3549___U8 = (0);
   case 5:
-    s.tmp_0 = r0 = s.unnamed1509___U8;
-    r0 = pxsim_Array__length(s.unnamed1508___U7);
+    s.tmp_0 = r0 = s.unnamed3549___U8;
+    r0 = pxsim_Array__length(s.unnamed3548___U7);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1508___U7, s.unnamed1509___U8);
-    s.sprite___46569 = (r0);
-    s.tmp_2 = minimap_includeSprite__P3617_mk(s);
-    s.tmp_2.arg0 = globals.map___46145;
-    s.tmp_2.arg1 = s.sprite___46569;
+    r0 = pxsim_Array__getAt(s.unnamed3548___U7, s.unnamed3549___U8);
+    s.sprite___98292 = (r0);
+    s.tmp_2 = minimap_includeSprite__P33151_mk(s);
+    s.tmp_2.arg0 = globals.map___98269;
+    s.tmp_2.arg1 = s.sprite___98292;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 181; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 186; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
-    r0 = (s.unnamed1509___U8 + 1);
-    s.unnamed1509___U8 = (r0);
+    r0 = (s.unnamed3549___U8 + 1);
+    s.unnamed3549___U8 = (r0);
     { step = 5; continue; }
   case 6:
-    s.unnamed1508___U7 = (undefined);
-    s.tmp_0 = minimap_includeSprite__P3617_mk(s);
-    s.tmp_0.arg0 = globals.map___46145;
-    s.tmp_0.arg1 = globals.sprite_player_fish___46147;
+    s.unnamed3548___U7 = (undefined);
+    s.tmp_0 = minimap_includeSprite__P33151_mk(s);
+    s.tmp_0.arg0 = globals.map___98269;
+    s.tmp_0.arg1 = globals.sprite_player_fish___98248;
     s.tmp_0.arg2 = 0;
-    s.callLocIdx = 182; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 187; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = minimap_getImage__P3616_mk(s);
-    s.tmp_0.arg0 = globals.map___46145;
-    s.callLocIdx = 183; s.pc = 15; return s.tmp_0;
+    s.tmp_0 = minimap_getImage__P33150_mk(s);
+    s.tmp_0.arg0 = globals.map___98269;
+    s.callLocIdx = 188; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-update_minimap__P46080.info = {"start":19043,"length":637,"line":372,"column":0,"endLine":385,"endColumn":1,"fileName":"main.ts","functionName":"update_minimap","argumentNames":[]}
+update_minimap__P98267.info = {"start":19281,"length":637,"line":378,"column":0,"endLine":391,"endColumn":1,"fileName":"main.ts","functionName":"update_minimap","argumentNames":[]}
 
-function update_minimap__P46080_mk(s) {
+function update_minimap__P98267_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: update_minimap__P46080, depth: s.depth + 1,
+        parent: s, fn: update_minimap__P98267, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  sprite___46551: undefined,
-  unnamed1504___U1: undefined,
-  unnamed1505___U2: undefined,
-  sprite___46560: undefined,
-  unnamed1506___U4: undefined,
-  unnamed1507___U5: undefined,
-  sprite___46569: undefined,
-  unnamed1508___U7: undefined,
-  unnamed1509___U8: undefined,
+  sprite___98274: undefined,
+  unnamed3544___U1: undefined,
+  unnamed3545___U2: undefined,
+  sprite___98283: undefined,
+  unnamed3546___U4: undefined,
+  unnamed3547___U5: undefined,
+  sprite___98292: undefined,
+  unnamed3548___U7: undefined,
+  unnamed3549___U8: undefined,
 } }
 
 
 
 
 
-function minimap_getImage__P3616(s) {
+function minimap_getImage__P33150(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10765,19 +10698,19 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["image"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["image"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 1758; s.pc = 1; return s.tmp_0; }
+     else { s.callLocIdx = 1763; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-minimap_getImage__P3616.info = {"start":2905,"length":86,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"getImage","argumentNames":["minimap"]}
+minimap_getImage__P33150.info = {"start":2905,"length":86,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"getImage","argumentNames":["minimap"]}
 
-function minimap_getImage__P3616_mk(s) {
+function minimap_getImage__P33150_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_getImage__P3616, depth: s.depth + 1,
+        parent: s, fn: minimap_getImage__P33150, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10787,7 +10720,7 @@ function minimap_getImage__P3616_mk(s) {
 
 
 
-function minimap_includeSprite__P3617(s) {
+function minimap_includeSprite__P33151(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10797,16 +10730,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___14499 = undefined;
-    s.x___14506 = undefined;
-    s.y___14523 = undefined;
+    s.scale___43994 = undefined;
+    s.x___44001 = undefined;
+    s.y___44018 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0 = Math_max__P29660_mk(s);
     s.tmp_2 = if_scale_1_mk(s);
     s.tmp_2.arg0 = s.arg0;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -10815,7 +10748,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["scale"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["scale"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1759; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 1764; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -10823,13 +10756,13 @@ switch (step) {
     r0 = (s.tmp_1 - s.arg2);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1760; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1765; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scale___14499 = (r0);
-    s.tmp_3 = Sprite_x__P2025_mk(s);
+    s.scale___43994 = (r0);
+    s.tmp_3 = Sprite_x__P31444_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 1761; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1766; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -10841,7 +10774,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["scale"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["scale"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1762; s.pc = 4; return s.tmp_5; }
+     else { s.callLocIdx = 1767; s.pc = 4; return s.tmp_5; }
     }
   case 4:
     r0 = s.retval;
@@ -10854,7 +10787,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 / 2);
     s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> s.scale___14499);
+    r0 = (s.tmp_7 >> s.scale___43994);
     s.tmp_6 = r0;
     r0 = (s.tmp_1 - s.tmp_6);
     s.tmp_0 = r0;
@@ -10866,16 +10799,16 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["borderWidth"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["borderWidth"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 1764; s.pc = 5; return s.tmp_11; }
+     else { s.callLocIdx = 1769; s.pc = 5; return s.tmp_11; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = (s.tmp_0 + s.tmp_10);
-    s.x___14506 = (r0);
-    s.tmp_3 = Sprite_y__P2027_mk(s);
+    s.x___44001 = (r0);
+    s.tmp_3 = Sprite_y__P31446_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 1765; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1770; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -10887,7 +10820,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["scale"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["scale"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1766; s.pc = 7; return s.tmp_5; }
+     else { s.callLocIdx = 1771; s.pc = 7; return s.tmp_5; }
     }
   case 7:
     r0 = s.retval;
@@ -10900,7 +10833,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 / 2);
     s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> s.scale___14499);
+    r0 = (s.tmp_7 >> s.scale___43994);
     s.tmp_6 = r0;
     r0 = (s.tmp_1 - s.tmp_6);
     s.tmp_0 = r0;
@@ -10912,14 +10845,14 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["borderWidth"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["borderWidth"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 1768; s.pc = 8; return s.tmp_11; }
+     else { s.callLocIdx = 1773; s.pc = 8; return s.tmp_11; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = (s.tmp_0 + s.tmp_10);
-    s.y___14523 = (r0);
-    s.tmp_0 = minimap_renderScaledImage__P6073_mk(s);
+    s.y___44018 = (r0);
+    s.tmp_0 = minimap_renderScaledImage__P35595_mk(s);
     r0 = s.arg1.fields["_image"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_image_1_mk(s);
@@ -10930,27 +10863,27 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["image"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["image"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1770; s.pc = 10; return s.tmp_1; }
+     else { s.callLocIdx = 1775; s.pc = 10; return s.tmp_1; }
     }
   case 10:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.x___14506;
-    s.tmp_0.arg3 = s.y___14523;
-    s.tmp_0.arg4 = s.scale___14499;
-    s.callLocIdx = 1771; s.pc = 9; return s.tmp_0;
+    s.tmp_0.arg2 = s.x___44001;
+    s.tmp_0.arg3 = s.y___44018;
+    s.tmp_0.arg4 = s.scale___43994;
+    s.callLocIdx = 1776; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-minimap_includeSprite__P3617.info = {"start":3241,"length":451,"line":102,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"includeSprite","argumentNames":["minimap","sprite","spriteScale"]}
+minimap_includeSprite__P33151.info = {"start":3241,"length":451,"line":102,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"includeSprite","argumentNames":["minimap","sprite","spriteScale"]}
 
-function minimap_includeSprite__P3617_mk(s) {
+function minimap_includeSprite__P33151_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_includeSprite__P3617, depth: s.depth + 1,
+        parent: s, fn: minimap_includeSprite__P33151, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10964,9 +10897,9 @@ function minimap_includeSprite__P3617_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  scale___14499: undefined,
-  x___14506: undefined,
-  y___14523: undefined,
+  scale___43994: undefined,
+  x___44001: undefined,
+  y___44018: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -10976,7 +10909,7 @@ function minimap_includeSprite__P3617_mk(s) {
 
 
 
-function minimap_renderScaledImage__P6073(s) {
+function minimap_renderScaledImage__P35595(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10986,9 +10919,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tile___14553 = undefined;
-    s.i___14555 = undefined;
-    s.j___14561 = undefined;
+    s.tile___44048 = undefined;
+    s.i___44050 = undefined;
+    s.j___44056 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -10997,26 +10930,26 @@ switch (step) {
       s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
-    s.tile___14553 = (s.arg0);
-    s.i___14555 = (0);
+    s.tile___44048 = (s.arg0);
+    s.i___44050 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___14555;
+    s.tmp_1 = r0 = s.i___44050;
     r0 = pxsim_ImageMethods.width(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.j___14561 = (0);
+    s.j___44056 = (0);
   case 2:
-    s.tmp_1 = r0 = s.j___14561;
+    s.tmp_1 = r0 = s.j___44056;
     r0 = pxsim_ImageMethods.height(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___14555, s.j___14561);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___44050, s.j___44056);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 != 0);
     s.tmp_3 = r0;
@@ -11024,44 +10957,44 @@ switch (step) {
     if (!r0) { step = 3; continue; }
     s.tmp_5 = r0 = s.arg1;
     s.tmp_7 = r0 = s.arg2;
-    r0 = (s.i___14555 >> s.arg4);
+    r0 = (s.i___44050 >> s.arg4);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6 = r0;
     s.tmp_10 = r0 = s.arg3;
-    r0 = (s.j___14561 >> s.arg4);
+    r0 = (s.j___44056 >> s.arg4);
     s.tmp_11 = r0;
     r0 = (s.tmp_10 + s.tmp_11);
     s.tmp_9 = r0;
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___14555, s.j___14561);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___44050, s.j___44056);
     s.tmp_12 = r0;
     r0 = pxsim_ImageMethods.setPixel(s.tmp_5, s.tmp_6, s.tmp_9, s.tmp_12);
   case 3:
   case 4:
-    s.tmp_0 = r0 = s.j___14561;
+    s.tmp_0 = r0 = s.j___44056;
     r0 = (1 << s.arg4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.j___14561 = (r0);
+    s.j___44056 = (r0);
     { step = 2; continue; }
   case 5:
-    s.tmp_0 = r0 = s.i___14555;
+    s.tmp_0 = r0 = s.i___44050;
     r0 = (1 << s.arg4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.i___14555 = (r0);
+    s.i___44050 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-minimap_renderScaledImage__P6073.info = {"start":544,"length":459,"line":26,"column":4,"endLine":35,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"renderScaledImage","argumentNames":["source","destination","x","y","scale"]}
+minimap_renderScaledImage__P35595.info = {"start":544,"length":459,"line":26,"column":4,"endLine":35,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"renderScaledImage","argumentNames":["source","destination","x","y","scale"]}
 
-function minimap_renderScaledImage__P6073_mk(s) {
+function minimap_renderScaledImage__P35595_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_renderScaledImage__P6073, depth: s.depth + 1,
+        parent: s, fn: minimap_renderScaledImage__P35595, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11076,9 +11009,9 @@ function minimap_renderScaledImage__P6073_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  tile___14553: undefined,
-  i___14555: undefined,
-  j___14561: undefined,
+  tile___44048: undefined,
+  i___44050: undefined,
+  j___44056: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -11090,7 +11023,7 @@ function minimap_renderScaledImage__P6073_mk(s) {
 
 
 
-function Sprite_height__P2061(s) {
+function Sprite_height__P31480(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11105,20 +11038,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_0);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_height__P2061.info = {"start":8639,"length":54,"line":314,"column":4,"endLine":316,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"height","argumentNames":["this"]}
-Sprite_height__P2061.isGetter = true;
+Sprite_height__P31480.info = {"start":8639,"length":54,"line":314,"column":4,"endLine":316,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"height","argumentNames":["this"]}
+Sprite_height__P31480.isGetter = true;
 
-function Sprite_height__P2061_mk(s) {
+function Sprite_height__P31480_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_height__P2061, depth: s.depth + 1,
+        parent: s, fn: Sprite_height__P31480, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11128,7 +11061,7 @@ function Sprite_height__P2061_mk(s) {
 
 
 
-function Sprite_width__P2060(s) {
+function Sprite_width__P31479(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11143,20 +11076,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_0);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_width__P2060.info = {"start":8494,"length":52,"line":309,"column":4,"endLine":311,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"width","argumentNames":["this"]}
-Sprite_width__P2060.isGetter = true;
+Sprite_width__P31479.info = {"start":8494,"length":52,"line":309,"column":4,"endLine":311,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"width","argumentNames":["this"]}
+Sprite_width__P31479.isGetter = true;
 
-function Sprite_width__P2060_mk(s) {
+function Sprite_width__P31479_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_width__P2060, depth: s.depth + 1,
+        parent: s, fn: Sprite_width__P31479, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11166,7 +11099,7 @@ function Sprite_width__P2060_mk(s) {
 
 
 
-function minimap_minimap__P3615(s) {
+function minimap_minimap__P33149(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11176,30 +11109,30 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tilemap___14608 = undefined;
-    s.numRows___14619 = undefined;
-    s.numCols___14626 = undefined;
-    s.tileWidth___14633 = undefined;
-    s.minimap___14638 = undefined;
-    s.r___14665 = undefined;
-    s.c___14670 = undefined;
-    s.idx___14675 = undefined;
-    s.tile___14681 = undefined;
-    s.nx___14686 = undefined;
-    s.ny___14695 = undefined;
+    s.tilemap___44103 = undefined;
+    s.numRows___44114 = undefined;
+    s.numCols___44121 = undefined;
+    s.tileWidth___44128 = undefined;
+    s.minimap___44133 = undefined;
+    s.r___44160 = undefined;
+    s.c___44165 = undefined;
+    s.idx___44170 = undefined;
+    s.tile___44176 = undefined;
+    s.nx___44181 = undefined;
+    s.ny___44190 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1749; s.pc = 10; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1754; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tilemap___14608 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tilemap___14608);
+    s.tilemap___44103 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tilemap___44103);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -11217,31 +11150,31 @@ switch (step) {
     { step = 9; continue; }
   case 1:
   case 2:
-    s.tmp_5 = tiles_TileMap_areaHeight__P2324_mk(s);
-    s.tmp_5.arg0 = s.tilemap___14608;
-    s.callLocIdx = 1750; s.pc = 11; return s.tmp_5;
+    s.tmp_5 = tiles_TileMap_areaHeight__P31743_mk(s);
+    s.tmp_5.arg0 = s.tilemap___44103;
+    s.callLocIdx = 1755; s.pc = 11; return s.tmp_5;
   case 11:
     r0 = s.retval;
     s.tmp_4 = r0;
-    r0 = s.tilemap___14608.fields["_scale"];
+    r0 = s.tilemap___44103.fields["_scale"];
     s.tmp_6 = r0;
     r0 = (s.tmp_4 >> s.tmp_6);
-    s.numRows___14619 = (r0);
-    s.tmp_1 = tiles_TileMap_areaWidth__P2323_mk(s);
-    s.tmp_1.arg0 = s.tilemap___14608;
-    s.callLocIdx = 1752; s.pc = 12; return s.tmp_1;
+    s.numRows___44114 = (r0);
+    s.tmp_1 = tiles_TileMap_areaWidth__P31742_mk(s);
+    s.tmp_1.arg0 = s.tilemap___44103;
+    s.callLocIdx = 1757; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = s.tilemap___14608.fields["_scale"];
+    r0 = s.tilemap___44103.fields["_scale"];
     s.tmp_2 = r0;
     r0 = (s.tmp_0 >> s.tmp_2);
-    s.numCols___14626 = (r0);
-    r0 = s.tilemap___14608.fields["_scale"];
+    s.numCols___44121 = (r0);
+    r0 = s.tilemap___44103.fields["_scale"];
     s.tmp_0 = r0;
     r0 = (1 << s.tmp_0);
-    s.tileWidth___14633 = (r0);
-    r0 = (s.numCols___14626 * s.tileWidth___14633);
+    s.tileWidth___44128 = (r0);
+    r0 = (s.numCols___44121 * s.tileWidth___44128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> s.arg0);
     s.tmp_1 = r0;
@@ -11249,7 +11182,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_1 + s.tmp_3);
     s.tmp_0 = r0;
-    r0 = (s.numRows___14619 * s.tileWidth___14633);
+    r0 = (s.numRows___44114 * s.tileWidth___44128);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 >> s.arg0);
     s.tmp_5 = r0;
@@ -11258,73 +11191,73 @@ switch (step) {
     r0 = (s.tmp_5 + s.tmp_7);
     s.tmp_4 = r0;
     r0 = pxsim.image.create(s.tmp_0, s.tmp_4);
-    s.minimap___14638 = (r0);
+    s.minimap___44133 = (r0);
     r0 = (s.arg1 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_ImageMethods.fill(s.minimap___14638, s.arg2);
+    r0 = pxsim_ImageMethods.fill(s.minimap___44133, s.arg2);
   case 3:
   case 4:
-    s.r___14665 = (0);
+    s.r___44160 = (0);
   case 5:
-    r0 = (s.r___14665 < s.numRows___14619);
+    r0 = (s.r___44160 < s.numRows___44114);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.c___14670 = (0);
+    s.c___44165 = (0);
   case 6:
-    r0 = (s.c___14670 < s.numCols___14626);
+    r0 = (s.c___44165 < s.numCols___44121);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = tiles_TileMap_getTileIndex__P2330_mk(s);
-    s.tmp_1.arg0 = s.tilemap___14608;
-    s.tmp_1.arg1 = s.c___14670;
-    s.tmp_1.arg2 = s.r___14665;
-    s.callLocIdx = 1755; s.pc = 13; return s.tmp_1;
+    s.tmp_1 = tiles_TileMap_getTileIndex__P31749_mk(s);
+    s.tmp_1.arg0 = s.tilemap___44103;
+    s.tmp_1.arg1 = s.c___44165;
+    s.tmp_1.arg2 = s.r___44160;
+    s.callLocIdx = 1760; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    s.idx___14675 = (r0);
-    s.tmp_0 = tiles_TileMap_getTileImage__P2339_mk(s);
-    s.tmp_0.arg0 = s.tilemap___14608;
-    s.tmp_0.arg1 = s.idx___14675;
-    s.callLocIdx = 1756; s.pc = 14; return s.tmp_0;
+    s.idx___44170 = (r0);
+    s.tmp_0 = tiles_TileMap_getTileImage__P31758_mk(s);
+    s.tmp_0.arg0 = s.tilemap___44103;
+    s.tmp_0.arg1 = s.idx___44170;
+    s.callLocIdx = 1761; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tile___14681 = (r0);
-    r0 = (s.c___14670 * s.tileWidth___14633);
+    s.tile___44176 = (r0);
+    r0 = (s.c___44165 * s.tileWidth___44128);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >> s.arg0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + s.arg1);
-    s.nx___14686 = (r0);
-    r0 = (s.r___14665 * s.tileWidth___14633);
+    s.nx___44181 = (r0);
+    r0 = (s.r___44160 * s.tileWidth___44128);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >> s.arg0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + s.arg1);
-    s.ny___14695 = (r0);
-    s.tmp_0 = minimap_renderScaledImage__P6073_mk(s);
-    s.tmp_0.arg0 = s.tile___14681;
-    s.tmp_0.arg1 = s.minimap___14638;
-    s.tmp_0.arg2 = s.nx___14686;
-    s.tmp_0.arg3 = s.ny___14695;
+    s.ny___44190 = (r0);
+    s.tmp_0 = minimap_renderScaledImage__P35595_mk(s);
+    s.tmp_0.arg0 = s.tile___44176;
+    s.tmp_0.arg1 = s.minimap___44133;
+    s.tmp_0.arg2 = s.nx___44181;
+    s.tmp_0.arg3 = s.ny___44190;
     s.tmp_0.arg4 = s.arg0;
-    s.callLocIdx = 1757; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1762; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = (s.c___14670 + 1);
-    s.c___14670 = (r0);
+    r0 = (s.c___44165 + 1);
+    s.c___44165 = (r0);
     { step = 6; continue; }
   case 7:
-    r0 = (s.r___14665 + 1);
-    s.r___14665 = (r0);
+    r0 = (s.r___44160 + 1);
+    s.r___44160 = (r0);
     { step = 5; continue; }
   case 8:
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "image", s.minimap___14638);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "image", s.minimap___44133);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "scale", s.arg0);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "borderWidth", s.arg1);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "borderColor", s.arg2);
@@ -11333,12 +11266,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-minimap_minimap__P3615.info = {"start":1349,"length":1436,"line":45,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"minimap","argumentNames":["scale","borderWidth","borderColor"]}
+minimap_minimap__P33149.info = {"start":1349,"length":1436,"line":45,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"minimap","argumentNames":["scale","borderWidth","borderColor"]}
 
-function minimap_minimap__P3615_mk(s) {
+function minimap_minimap__P33149_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_minimap__P3615, depth: s.depth + 1,
+        parent: s, fn: minimap_minimap__P33149, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11348,17 +11281,17 @@ function minimap_minimap__P3615_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  tilemap___14608: undefined,
-  numRows___14619: undefined,
-  numCols___14626: undefined,
-  tileWidth___14633: undefined,
-  minimap___14638: undefined,
-  r___14665: undefined,
-  c___14670: undefined,
-  idx___14675: undefined,
-  tile___14681: undefined,
-  nx___14686: undefined,
-  ny___14695: undefined,
+  tilemap___44103: undefined,
+  numRows___44114: undefined,
+  numCols___44121: undefined,
+  tileWidth___44128: undefined,
+  minimap___44133: undefined,
+  r___44160: undefined,
+  c___44165: undefined,
+  idx___44170: undefined,
+  tile___44176: undefined,
+  nx___44181: undefined,
+  ny___44190: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -11368,7 +11301,7 @@ function minimap_minimap__P3615_mk(s) {
 
 
 
-function tiles_TileMap_areaHeight__P2324(s) {
+function tiles_TileMap_areaHeight__P31743(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11383,7 +11316,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -11405,12 +11338,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_areaHeight__P2324.info = {"start":6794,"length":93,"line":247,"column":8,"endLine":249,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"areaHeight","argumentNames":["this"]}
+tiles_TileMap_areaHeight__P31743.info = {"start":6794,"length":93,"line":247,"column":8,"endLine":249,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"areaHeight","argumentNames":["this"]}
 
-function tiles_TileMap_areaHeight__P2324_mk(s) {
+function tiles_TileMap_areaHeight__P31743_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_areaHeight__P2324, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_areaHeight__P31743, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11424,7 +11357,7 @@ function tiles_TileMap_areaHeight__P2324_mk(s) {
 
 
 
-function tiles_TileMap_areaWidth__P2323(s) {
+function tiles_TileMap_areaWidth__P31742(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11439,7 +11372,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -11461,12 +11394,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_areaWidth__P2323.info = {"start":6693,"length":91,"line":243,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"areaWidth","argumentNames":["this"]}
+tiles_TileMap_areaWidth__P31742.info = {"start":6693,"length":91,"line":243,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"areaWidth","argumentNames":["this"]}
 
-function tiles_TileMap_areaWidth__P2323_mk(s) {
+function tiles_TileMap_areaWidth__P31742_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_areaWidth__P2323, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_areaWidth__P31742, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11480,7 +11413,7 @@ function tiles_TileMap_areaWidth__P2323_mk(s) {
 
 
 
-function forever__P1847(s) {
+function forever__P31266(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11494,21 +11427,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_forever__P2545_mk(s);
+    s.tmp_0 = game_forever__P31964_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 169; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 126; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-forever__P1847.info = {"start":264,"length":62,"line":6,"column":0,"endLine":8,"endColumn":1,"fileName":"pxt_modules/game/gameoverrides.ts","functionName":"forever","argumentNames":["a"]}
+forever__P31266.info = {"start":264,"length":62,"line":6,"column":0,"endLine":8,"endColumn":1,"fileName":"pxt_modules/game---hw/gameoverrides.ts","functionName":"forever","argumentNames":["a"]}
 
-function forever__P1847_mk(s) {
+function forever__P31266_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: forever__P1847, depth: s.depth + 1,
+        parent: s, fn: forever__P31266, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11518,7 +11451,7 @@ function forever__P1847_mk(s) {
 
 
 
-function game_forever__P2545(s) {
+function game_forever__P31964(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11532,26 +11465,26 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals.foreverRunning___4359);
+    r0 = pxsim_numops_toBoolDecr(globals.foreverRunning___33852);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.foreverRunning___4359 = (true);
-    r0 = pxsim.control.runInParallel(inline__P8230);
+    globals.foreverRunning___33852 = (true);
+    r0 = pxsim.control.runInParallel(inline__P37767);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_GameForeverHandler__C2398_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_GameForeverHandler__C31817_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_GameForeverHandler_constructor__P2400_mk(s);
+    s.tmp_1 = scene_GameForeverHandler_constructor__P31819_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 1222; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1179; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.tmp_3 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1221; s.pc = 4; return s.tmp_3;
+    s.tmp_3 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1178; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["gameForeverHandlers"];
@@ -11561,12 +11494,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_forever__P2545.info = {"start":8610,"length":820,"line":277,"column":4,"endLine":300,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"forever","argumentNames":["action"]}
+game_forever__P31964.info = {"start":8610,"length":820,"line":277,"column":4,"endLine":300,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"forever","argumentNames":["action"]}
 
-function game_forever__P2545_mk(s) {
+function game_forever__P31964_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_forever__P2545, depth: s.depth + 1,
+        parent: s, fn: game_forever__P31964, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11579,7 +11512,7 @@ function game_forever__P2545_mk(s) {
 
 
 
-function inline__P8230(s) {
+function inline__P37767(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11589,25 +11522,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.handlers___8232 = undefined;
+    s.handlers___37769 = undefined;
   case 1:
     r0 = pxsim_numops_toBoolDecr(1);
     if (!r0) { step = 2; continue; }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1217; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1174; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = r0.fields["gameForeverHandlers"];
-    s.handlers___8232 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_0.arg0 = s.handlers___8232;
-    s.tmp_0.arg1 = inline__P8238;
-    s.callLocIdx = 1219; s.pc = 4; return s.tmp_0;
+    s.handlers___37769 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_0.arg0 = s.handlers___37769;
+    s.tmp_0.arg1 = inline__P37775;
+    s.callLocIdx = 1176; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 20;
-    s.callLocIdx = 1220; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1177; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     { step = 1; continue; }
@@ -11616,22 +11549,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8230.info = {"start":8762,"length":535,"line":280,"column":34,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
+inline__P37767.info = {"start":8762,"length":535,"line":280,"column":34,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8230_mk(s) {
+function inline__P37767_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8230, depth: s.depth + 1,
+        parent: s, fn: inline__P37767, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  handlers___8232: undefined,
+  handlers___37769: undefined,
 } }
 
 
 
 
 
-function inline__P8238(s) {
+function inline__P37775(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11654,7 +11587,7 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["lock"] = (true);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8247);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P37784);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim.control.runInParallel(s.tmp_0);
@@ -11664,12 +11597,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8238.info = {"start":8913,"length":319,"line":283,"column":37,"endLine":291,"endColumn":21,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["h"]}
+inline__P37775.info = {"start":8913,"length":319,"line":283,"column":37,"endLine":291,"endColumn":21,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P8238_mk(s) {
+function inline__P37775_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8238, depth: s.depth + 1,
+        parent: s, fn: inline__P37775, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11681,7 +11614,7 @@ function inline__P8238_mk(s) {
 
 
 
-function inline__P8247(s) {
+function inline__P37784(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11695,12 +11628,12 @@ switch (step) {
     s.tmp_0.arg0 = s.caps[0];
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 1);
-      s.callLocIdx = 1218; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 1175; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 1); s.callLocIdx = 1218; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1218; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1218; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 1); s.callLocIdx = 1175; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1175; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 1175; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -11709,12 +11642,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8247.info = {"start":9052,"length":130,"line":286,"column":50,"endLine":289,"endColumn":29,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
+inline__P37784.info = {"start":9052,"length":130,"line":286,"column":50,"endLine":289,"endColumn":29,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8247_mk(s) {
+function inline__P37784_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8247, depth: s.depth + 1,
+        parent: s, fn: inline__P37784, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -11723,7 +11656,7 @@ function inline__P8247_mk(s) {
 
 
 
-function scene_GameForeverHandler_constructor__P2400(s) {
+function scene_GameForeverHandler_constructor__P31819(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11739,18 +11672,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_GameForeverHandler__C2398_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_GameForeverHandler__C31817_VT)) failedCast(r0);
     r0 = (s.arg0).fields["handler"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_GameForeverHandler_constructor__P2400.info = {"start":1340,"length":65,"line":47,"column":8,"endLine":49,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","handler"]}
+scene_GameForeverHandler_constructor__P31819.info = {"start":1340,"length":65,"line":47,"column":8,"endLine":49,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":["this","handler"]}
 
-function scene_GameForeverHandler_constructor__P2400_mk(s) {
+function scene_GameForeverHandler_constructor__P31819_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_GameForeverHandler_constructor__P2400, depth: s.depth + 1,
+        parent: s, fn: scene_GameForeverHandler_constructor__P31819, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -11760,7 +11693,7 @@ function scene_GameForeverHandler_constructor__P2400_mk(s) {
 
 
 
-function start_game__P46078(s) {
+function start_game__P98078(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11770,30 +11703,175 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P2213_mk(s);
+    s.tmp_0 = info_startCountdown__P31632_mk(s);
     s.tmp_0.arg0 = 5;
-    s.callLocIdx = 156; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 155; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    s.tmp_0 = timer_background__P33129_mk(s);
+    s.tmp_0.arg0 = inline__P98081;
+    s.callLocIdx = 161; s.pc = 2; return s.tmp_0;
+  case 2:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+start_game__P98078.info = {"start":12196,"length":304,"line":312,"column":0,"endLine":321,"endColumn":1,"fileName":"main.ts","functionName":"start_game","argumentNames":[]}
+
+function start_game__P98078_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: start_game__P98078, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function inline__P98081(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.index___98082 = undefined;
+    s.index___98082 = (0);
+  case 1:
+    r0 = (s.index___98082 < 4);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    s.tmp_1 = music_playTone__P32274_mk(s);
+    s.tmp_1.arg0 = 392;
+    s.tmp_2 = music_beat__P32379_mk(s);
+    s.tmp_2.arg0 = 4;
+    s.callLocIdx = 156; s.pc = 4; return s.tmp_2;
+  case 4:
+    r0 = s.retval;
+    s.tmp_1.arg1 = r0;
+    s.callLocIdx = 157; s.pc = 3; return s.tmp_1;
+  case 3:
+    r0 = s.retval;
+    s.tmp_0 = pause__P29937_mk(s);
+    s.tmp_0.arg0 = 1000;
+    s.callLocIdx = 158; s.pc = 5; return s.tmp_0;
+  case 5:
+    r0 = s.retval;
+    r0 = (s.index___98082 + 1);
+    s.index___98082 = (r0);
+    { step = 1; continue; }
+  case 2:
+    s.tmp_0 = music_playTone__P32274_mk(s);
+    s.tmp_0.arg0 = 587;
+    s.tmp_1 = music_beat__P32379_mk(s);
+    s.tmp_1.arg0 = 2;
+    s.callLocIdx = 159; s.pc = 7; return s.tmp_1;
+  case 7:
+    r0 = s.retval;
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 160; s.pc = 6; return s.tmp_0;
+  case 6:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P98081.info = {"start":12269,"length":228,"line":314,"column":21,"endLine":320,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+
+function inline__P98081_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P98081, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  index___98082: undefined,
+} }
+
+
+
+
+
+function timer_background__P33129(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_0 = control_runInBackground__P29814_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1753; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-start_game__P46078.info = {"start":12209,"length":53,"line":313,"column":0,"endLine":315,"endColumn":1,"fileName":"main.ts","functionName":"start_game","argumentNames":[]}
+timer_background__P33129.info = {"start":665,"length":90,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"background","argumentNames":["then"]}
 
-function start_game__P46078_mk(s) {
+function timer_background__P33129_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: start_game__P46078, depth: s.depth + 1,
+        parent: s, fn: timer_background__P33129, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function control_runInBackground__P29814(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim.control.runInParallel(s.arg0);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+control_runInBackground__P29814.info = {"start":384,"length":88,"line":10,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"runInBackground","argumentNames":["a"]}
+
+function control_runInBackground__P29814_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: control_runInBackground__P29814, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
 } }
 
 
 
 
 
-function create_minimap__P46082(s) {
+function create_minimap__P98351(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11803,37 +11881,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    s.tmp_1 = update_minimap__P46080_mk(s);
-    s.callLocIdx = 194; s.pc = 2; return s.tmp_1;
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    s.tmp_1 = update_minimap__P98267_mk(s);
+    s.callLocIdx = 199; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.Map___45891;
-    s.callLocIdx = 195; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = globals.Map___97748;
+    s.callLocIdx = 200; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    globals.sprite_map___45914 = (r0);
-    s.tmp_0 = Sprite_bottom__P2069_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___45914;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    globals.sprite_map___97771 = (r0);
+    s.tmp_0 = Sprite_bottom__P31488_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___97771;
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 197; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 202; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_x__P2026_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___45914;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0 = Sprite_x__P31445_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___97771;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 199; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 204; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     s.tmp_0 = if_z_2_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___45914;
+    s.tmp_0.arg0 = globals.sprite_map___97771;
     s.tmp_0.arg1 = 50;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapSetByString(s.tmp_0.arg0, "z", s.tmp_0.arg1);
@@ -11841,27 +11919,27 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 200; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 205; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setFlag__P2079_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___45914;
+    s.tmp_0 = Sprite_setFlag__P31498_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___97771;
     s.tmp_0.arg1 = 512;
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 201; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 206; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-create_minimap__P46082.info = {"start":22289,"length":268,"line":458,"column":0,"endLine":464,"endColumn":1,"fileName":"main.ts","functionName":"create_minimap","argumentNames":[]}
+create_minimap__P98351.info = {"start":22527,"length":268,"line":464,"column":0,"endLine":470,"endColumn":1,"fileName":"main.ts","functionName":"create_minimap","argumentNames":[]}
 
-function create_minimap__P46082_mk(s) {
+function create_minimap__P98351_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: create_minimap__P46082, depth: s.depth + 1,
+        parent: s, fn: create_minimap__P98351, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11871,7 +11949,7 @@ function create_minimap__P46082_mk(s) {
 
 
 
-function Sprite_x__P2026(s) {
+function Sprite_x__P31445(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11887,8 +11965,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P2063_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P31482_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -11899,19 +11977,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 274; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 231; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_x__P2026.info = {"start":1673,"length":72,"line":75,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this","v"]}
+Sprite_x__P31445.info = {"start":1673,"length":72,"line":75,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"x","argumentNames":["this","v"]}
 
-function Sprite_x__P2026_mk(s) {
+function Sprite_x__P31445_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_x__P2026, depth: s.depth + 1,
+        parent: s, fn: Sprite_x__P31445, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11926,7 +12004,7 @@ function Sprite_x__P2026_mk(s) {
 
 
 
-function Sprite_left__P2063(s) {
+function Sprite_left__P31482(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11936,22 +12014,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___12068 = undefined;
+    s.physics___41594 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 321; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 278; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___12068 = (r0);
-    s.tmp_0 = PhysicsEngine__C2159_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___12068;
+    s.physics___41594 = (r0);
+    s.tmp_0 = PhysicsEngine__C31578_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___41594;
     s.tmp_0.arg1 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -11962,7 +12040,7 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_3);
     s.tmp_0.arg2 = r0;
     s.tmp_0.arg3 = 0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C31578_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.moveSprite;
     s.pc = 2; return s.tmp_0;
   case 2:
@@ -11971,18 +12049,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_left__P2063.info = {"start":8929,"length":257,"line":325,"column":4,"endLine":335,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this","value"]}
+Sprite_left__P31482.info = {"start":8929,"length":257,"line":325,"column":4,"endLine":335,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"left","argumentNames":["this","value"]}
 
-function Sprite_left__P2063_mk(s) {
+function Sprite_left__P31482_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_left__P2063, depth: s.depth + 1,
+        parent: s, fn: Sprite_left__P31482, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  physics___12068: undefined,
+  physics___41594: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -11991,7 +12069,7 @@ function Sprite_left__P2063_mk(s) {
 
 
 
-function PhysicsEngine_moveSprite__P2163(s) {
+function PhysicsEngine_moveSprite__P31582(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12009,17 +12087,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C31578_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_moveSprite__P2163.info = {"start":230,"length":43,"line":13,"column":4,"endLine":13,"endColumn":47,"fileName":"pxt_modules/game/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
+PhysicsEngine_moveSprite__P31582.info = {"start":230,"length":43,"line":13,"column":4,"endLine":13,"endColumn":47,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
 
-function PhysicsEngine_moveSprite__P2163_mk(s) {
+function PhysicsEngine_moveSprite__P31582_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_moveSprite__P2163, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_moveSprite__P31582, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12031,7 +12109,7 @@ function PhysicsEngine_moveSprite__P2163_mk(s) {
 
 
 
-function Fx_sub__P154(s) {
+function Fx_sub__P29689(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12050,12 +12128,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_sub__P154.info = {"start":749,"length":118,"line":26,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"sub","argumentNames":["a","b"]}
+Fx_sub__P29689.info = {"start":749,"length":118,"line":26,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"sub","argumentNames":["a","b"]}
 
-function Fx_sub__P154_mk(s) {
+function Fx_sub__P29689_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_sub__P154, depth: s.depth + 1,
+        parent: s, fn: Fx_sub__P29689, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12065,7 +12143,7 @@ function Fx_sub__P154_mk(s) {
 
 
 
-function Sprite_left__P2062(s) {
+function Sprite_left__P31481(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12080,20 +12158,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_left__P2062.info = {"start":8785,"length":53,"line":320,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this"]}
-Sprite_left__P2062.isGetter = true;
+Sprite_left__P31481.info = {"start":8785,"length":53,"line":320,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"left","argumentNames":["this"]}
+Sprite_left__P31481.isGetter = true;
 
-function Sprite_left__P2062_mk(s) {
+function Sprite_left__P31481_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_left__P2062, depth: s.depth + 1,
+        parent: s, fn: Sprite_left__P31481, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12103,7 +12181,7 @@ function Sprite_left__P2062_mk(s) {
 
 
 
-function Sprite_bottom__P2069(s) {
+function Sprite_bottom__P31488(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12119,8 +12197,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P2067_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P31486_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -12129,19 +12207,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 335; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 292; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_bottom__P2069.info = {"start":10235,"length":73,"line":374,"column":4,"endLine":376,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this","value"]}
+Sprite_bottom__P31488.info = {"start":10235,"length":73,"line":374,"column":4,"endLine":376,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"bottom","argumentNames":["this","value"]}
 
-function Sprite_bottom__P2069_mk(s) {
+function Sprite_bottom__P31488_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_bottom__P2069, depth: s.depth + 1,
+        parent: s, fn: Sprite_bottom__P31488, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12155,7 +12233,7 @@ function Sprite_bottom__P2069_mk(s) {
 
 
 
-function Sprite_top__P2067(s) {
+function Sprite_top__P31486(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12165,22 +12243,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___11864 = undefined;
+    s.physics___41398 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 329; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 286; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___11864 = (r0);
-    s.tmp_0 = PhysicsEngine__C2159_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___11864;
+    s.physics___41398 = (r0);
+    s.tmp_0 = PhysicsEngine__C31578_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___41398;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = 0;
     r0 = (s.arg1 * 256);
@@ -12191,7 +12269,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_1 - s.tmp_3);
     s.tmp_0.arg3 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C31578_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.moveSprite;
     s.pc = 2; return s.tmp_0;
   case 2:
@@ -12200,18 +12278,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_top__P2067.info = {"start":9733,"length":256,"line":355,"column":4,"endLine":365,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this","value"]}
+Sprite_top__P31486.info = {"start":9733,"length":256,"line":355,"column":4,"endLine":365,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"top","argumentNames":["this","value"]}
 
-function Sprite_top__P2067_mk(s) {
+function Sprite_top__P31486_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_top__P2067, depth: s.depth + 1,
+        parent: s, fn: Sprite_top__P31486, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  physics___11864: undefined,
+  physics___41398: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -12220,7 +12298,7 @@ function Sprite_top__P2067_mk(s) {
 
 
 
-function Sprite_top__P2066(s) {
+function Sprite_top__P31485(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12235,20 +12313,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_y"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_top__P2066.info = {"start":9590,"length":53,"line":350,"column":4,"endLine":352,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this"]}
-Sprite_top__P2066.isGetter = true;
+Sprite_top__P31485.info = {"start":9590,"length":53,"line":350,"column":4,"endLine":352,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"top","argumentNames":["this"]}
+Sprite_top__P31485.isGetter = true;
 
-function Sprite_top__P2066_mk(s) {
+function Sprite_top__P31485_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_top__P2066, depth: s.depth + 1,
+        parent: s, fn: Sprite_top__P31485, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12258,7 +12336,7 @@ function Sprite_top__P2066_mk(s) {
 
 
 
-function Sprite_bottom__P2068(s) {
+function Sprite_bottom__P31487(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12273,10 +12351,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_top__P2066_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_top__P31485_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 332; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 289; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -12288,13 +12366,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_bottom__P2068.info = {"start":10083,"length":59,"line":369,"column":4,"endLine":371,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this"]}
-Sprite_bottom__P2068.isGetter = true;
+Sprite_bottom__P31487.info = {"start":10083,"length":59,"line":369,"column":4,"endLine":371,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"bottom","argumentNames":["this"]}
+Sprite_bottom__P31487.isGetter = true;
 
-function Sprite_bottom__P2068_mk(s) {
+function Sprite_bottom__P31487_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_bottom__P2068, depth: s.depth + 1,
+        parent: s, fn: Sprite_bottom__P31487, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12307,7 +12385,7 @@ function Sprite_bottom__P2068_mk(s) {
 
 
 
-function sprites_create__P1974(s) {
+function sprites_create__P31393(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12317,78 +12395,78 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___21539 = undefined;
-    s.sprite___21542 = undefined;
+    s.scene___51035 = undefined;
+    s.sprite___51038 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 265; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 222; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___21539 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(Sprite__C2016_VT);
+    s.scene___51035 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(Sprite__C31435_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Sprite_constructor__P2053_mk(s);
+    s.tmp_1 = Sprite_constructor__P31472_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 266; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 223; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    s.sprite___21542 = (s.tmp_0);
-    s.tmp_0 = Sprite_setKind__P2071_mk(s);
-    s.tmp_0.arg0 = s.sprite___21542;
+    s.sprite___51038 = (s.tmp_0);
+    s.tmp_0 = Sprite_setKind__P31490_mk(s);
+    s.tmp_0.arg0 = s.sprite___51038;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 267; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 224; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = PhysicsEngine__C2159_v0_2_mk(s);
-    r0 = s.scene___21539.fields["physicsEngine"];
+    s.tmp_0 = PhysicsEngine__C31578_v0_2_mk(s);
+    r0 = s.scene___51035.fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.sprite___21542;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.sprite___51038;
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C31578_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.addSprite;
     s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21557);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51053);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21563);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51059);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.sprite___21542);
-    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
-    r0 = s.scene___21539.fields["createdHandlers"];
+    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.sprite___51038);
+    s.tmp_2 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P29643_mk(s);
+    r0 = s.scene___51035.fields["createdHandlers"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 268; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 225; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 270; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 227; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    r0 = s.sprite___21542;
+    r0 = s.sprite___51038;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_create__P1974.info = {"start":890,"length":400,"line":35,"column":4,"endLine":47,"endColumn":5,"fileName":"pxt_modules/game/sprites.ts","functionName":"create","argumentNames":["img","kind"]}
+sprites_create__P31393.info = {"start":890,"length":400,"line":35,"column":4,"endLine":47,"endColumn":5,"fileName":"pxt_modules/game---hw/sprites.ts","functionName":"create","argumentNames":["img","kind"]}
 
-function sprites_create__P1974_mk(s) {
+function sprites_create__P31393_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_create__P1974, depth: s.depth + 1,
+        parent: s, fn: sprites_create__P31393, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  scene___21539: undefined,
-  sprite___21542: undefined,
+  scene___51035: undefined,
+  sprite___51038: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -12397,7 +12475,7 @@ function sprites_create__P1974_mk(s) {
 
 
 
-function inline__P21557(s) {
+function inline__P51053(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12417,12 +12495,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21557.info = {"start":1195,"length":19,"line":43,"column":20,"endLine":43,"endColumn":39,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["h"]}
+inline__P51053.info = {"start":1195,"length":19,"line":43,"column":20,"endLine":43,"endColumn":39,"fileName":"pxt_modules/game---hw/sprites.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P21557_mk(s) {
+function inline__P51053_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21557, depth: s.depth + 1,
+        parent: s, fn: inline__P51053, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12432,7 +12510,7 @@ function inline__P21557_mk(s) {
 
 
 
-function inline__P21563(s) {
+function inline__P51059(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12451,12 +12529,12 @@ switch (step) {
     s.tmp_0.arg1 = s.caps[0];
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 2);
-      s.callLocIdx = 269; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 226; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 2); s.callLocIdx = 269; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 269; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 269; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 2); s.callLocIdx = 226; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 226; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 226; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -12464,12 +12542,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21563.info = {"start":1237,"length":22,"line":44,"column":21,"endLine":44,"endColumn":43,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["h"]}
+inline__P51059.info = {"start":1237,"length":22,"line":44,"column":21,"endLine":44,"endColumn":43,"fileName":"pxt_modules/game---hw/sprites.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P21563_mk(s) {
+function inline__P51059_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21563, depth: s.depth + 1,
+        parent: s, fn: inline__P51059, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12479,7 +12557,7 @@ function inline__P21563_mk(s) {
 
 
 
-function PhysicsEngine_addSprite__P2161(s) {
+function PhysicsEngine_addSprite__P31580(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12495,17 +12573,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C31578_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_addSprite__P2161.info = {"start":124,"length":29,"line":8,"column":4,"endLine":8,"endColumn":33,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
+PhysicsEngine_addSprite__P31580.info = {"start":124,"length":29,"line":8,"column":4,"endLine":8,"endColumn":33,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function PhysicsEngine_addSprite__P2161_mk(s) {
+function PhysicsEngine_addSprite__P31580_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_addSprite__P2161, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_addSprite__P31580, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12515,7 +12593,7 @@ function PhysicsEngine_addSprite__P2161_mk(s) {
 
 
 
-function Sprite_constructor__P2053(s) {
+function Sprite_constructor__P31472(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12531,15 +12609,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P31279_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 291; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 248; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.arg1);
     s.tmp_5 = r0;
@@ -12553,7 +12631,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_x"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.height(s.arg1);
     s.tmp_5 = r0;
@@ -12572,53 +12650,53 @@ switch (step) {
     r0 = s.arg0.fields["_y"];
     s.tmp_0 = r0;
     r0 = (s.arg0).fields["_lastY"] = (s.tmp_0);
-    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    s.tmp_0 = Sprite_vx__P31449_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 294; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 251; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 295; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 252; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_ax__P2034_mk(s);
+    s.tmp_0 = Sprite_ax__P31453_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 296; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 253; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = Sprite_ay__P2036_mk(s);
+    s.tmp_0 = Sprite_ay__P31455_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 297; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 254; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = Sprite_fx__P2038_mk(s);
+    s.tmp_0 = Sprite_fx__P31457_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 298; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 255; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_fy__P2040_mk(s);
+    s.tmp_0 = Sprite_fy__P31459_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 299; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 256; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = (s.arg0).fields["flags"] = (0);
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 300; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 257; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setKind__P2071_mk(s);
+    s.tmp_0 = Sprite_setKind__P31490_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 301; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 258; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = (s.arg0).fields["layer"] = (1);
@@ -12635,12 +12713,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_constructor__P2053.info = {"start":5178,"length":618,"line":202,"column":4,"endLine":222,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["this","img"]}
+Sprite_constructor__P31472.info = {"start":5178,"length":618,"line":202,"column":4,"endLine":222,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["this","img"]}
 
-function Sprite_constructor__P2053_mk(s) {
+function Sprite_constructor__P31472_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_constructor__P2053, depth: s.depth + 1,
+        parent: s, fn: Sprite_constructor__P31472, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12657,7 +12735,7 @@ function Sprite_constructor__P2053_mk(s) {
 
 
 
-function Sprite_fy__P2040(s) {
+function Sprite_fy__P31459(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12673,12 +12751,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = Math_max__P125_mk(s);
+    s.tmp_3 = Math_max__P29660_mk(s);
     s.tmp_3.arg0 = 0;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 289; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 246; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -12691,12 +12769,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_fy__P2040.info = {"start":4057,"length":64,"line":151,"column":4,"endLine":153,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this","v"]}
+Sprite_fy__P31459.info = {"start":4057,"length":64,"line":151,"column":4,"endLine":153,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"fy","argumentNames":["this","v"]}
 
-function Sprite_fy__P2040_mk(s) {
+function Sprite_fy__P31459_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fy__P2040, depth: s.depth + 1,
+        parent: s, fn: Sprite_fy__P31459, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12711,7 +12789,7 @@ function Sprite_fy__P2040_mk(s) {
 
 
 
-function Sprite_fy__P2039(s) {
+function Sprite_fy__P31458(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12726,20 +12804,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_fy"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_fy__P2039.info = {"start":3895,"length":60,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this"]}
-Sprite_fy__P2039.isGetter = true;
+Sprite_fy__P31458.info = {"start":3895,"length":60,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"fy","argumentNames":["this"]}
+Sprite_fy__P31458.isGetter = true;
 
-function Sprite_fy__P2039_mk(s) {
+function Sprite_fy__P31458_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fy__P2039, depth: s.depth + 1,
+        parent: s, fn: Sprite_fy__P31458, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12749,7 +12827,7 @@ function Sprite_fy__P2039_mk(s) {
 
 
 
-function Sprite_fx__P2038(s) {
+function Sprite_fx__P31457(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12765,12 +12843,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = Math_max__P125_mk(s);
+    s.tmp_3 = Math_max__P29660_mk(s);
     s.tmp_3.arg0 = 0;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 286; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 243; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -12783,12 +12861,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_fx__P2038.info = {"start":3714,"length":64,"line":141,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this","v"]}
+Sprite_fx__P31457.info = {"start":3714,"length":64,"line":141,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"fx","argumentNames":["this","v"]}
 
-function Sprite_fx__P2038_mk(s) {
+function Sprite_fx__P31457_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fx__P2038, depth: s.depth + 1,
+        parent: s, fn: Sprite_fx__P31457, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12803,7 +12881,7 @@ function Sprite_fx__P2038_mk(s) {
 
 
 
-function Sprite_fx__P2037(s) {
+function Sprite_fx__P31456(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12818,20 +12896,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_fx"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_fx__P2037.info = {"start":3552,"length":60,"line":136,"column":4,"endLine":138,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this"]}
-Sprite_fx__P2037.isGetter = true;
+Sprite_fx__P31456.info = {"start":3552,"length":60,"line":136,"column":4,"endLine":138,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"fx","argumentNames":["this"]}
+Sprite_fx__P31456.isGetter = true;
 
-function Sprite_fx__P2037_mk(s) {
+function Sprite_fx__P31456_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fx__P2037, depth: s.depth + 1,
+        parent: s, fn: Sprite_fx__P31456, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12841,7 +12919,7 @@ function Sprite_fx__P2037_mk(s) {
 
 
 
-function Sprite_ay__P2036(s) {
+function Sprite_ay__P31455(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12857,7 +12935,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -12868,12 +12946,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_ay__P2036.info = {"start":3383,"length":51,"line":130,"column":4,"endLine":132,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this","v"]}
+Sprite_ay__P31455.info = {"start":3383,"length":51,"line":130,"column":4,"endLine":132,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"ay","argumentNames":["this","v"]}
 
-function Sprite_ay__P2036_mk(s) {
+function Sprite_ay__P31455_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ay__P2036, depth: s.depth + 1,
+        parent: s, fn: Sprite_ay__P31455, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12886,7 +12964,7 @@ function Sprite_ay__P2036_mk(s) {
 
 
 
-function Sprite_ay__P2035(s) {
+function Sprite_ay__P31454(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12901,20 +12979,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_ay"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_ay__P2035.info = {"start":3217,"length":60,"line":125,"column":4,"endLine":127,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this"]}
-Sprite_ay__P2035.isGetter = true;
+Sprite_ay__P31454.info = {"start":3217,"length":60,"line":125,"column":4,"endLine":127,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"ay","argumentNames":["this"]}
+Sprite_ay__P31454.isGetter = true;
 
-function Sprite_ay__P2035_mk(s) {
+function Sprite_ay__P31454_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ay__P2035, depth: s.depth + 1,
+        parent: s, fn: Sprite_ay__P31454, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12924,7 +13002,7 @@ function Sprite_ay__P2035_mk(s) {
 
 
 
-function Sprite_ax__P2034(s) {
+function Sprite_ax__P31453(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12940,7 +13018,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -12951,12 +13029,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_ax__P2034.info = {"start":3044,"length":51,"line":119,"column":4,"endLine":121,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this","v"]}
+Sprite_ax__P31453.info = {"start":3044,"length":51,"line":119,"column":4,"endLine":121,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"ax","argumentNames":["this","v"]}
 
-function Sprite_ax__P2034_mk(s) {
+function Sprite_ax__P31453_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ax__P2034, depth: s.depth + 1,
+        parent: s, fn: Sprite_ax__P31453, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12969,7 +13047,7 @@ function Sprite_ax__P2034_mk(s) {
 
 
 
-function Sprite_ax__P2033(s) {
+function Sprite_ax__P31452(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12984,20 +13062,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_ax"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_ax__P2033.info = {"start":2878,"length":60,"line":114,"column":4,"endLine":116,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this"]}
-Sprite_ax__P2033.isGetter = true;
+Sprite_ax__P31452.info = {"start":2878,"length":60,"line":114,"column":4,"endLine":116,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"ax","argumentNames":["this"]}
+Sprite_ax__P31452.isGetter = true;
 
-function Sprite_ax__P2033_mk(s) {
+function Sprite_ax__P31452_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ax__P2033, depth: s.depth + 1,
+        parent: s, fn: Sprite_ax__P31452, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -13007,7 +13085,7 @@ function Sprite_ax__P2033_mk(s) {
 
 
 
-function sprites_BaseSprite_constructor__P1860(s) {
+function sprites_BaseSprite_constructor__P31279(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13023,33 +13101,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_z__P1863_mk(s);
+    if (!checkSubtype(r0, sprites_BaseSprite__C31277_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_z__P31282_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 170; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 127; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = scene_Scene_addSprite__P2444_mk(s);
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 171; s.pc = 3; return s.tmp_1;
+    s.tmp_0 = scene_Scene_addSprite__P31863_mk(s);
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 128; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 172; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 129; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_constructor__P1860.info = {"start":344,"length":170,"line":15,"column":8,"endLine":20,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"inline","argumentNames":["this","z"]}
+sprites_BaseSprite_constructor__P31279.info = {"start":344,"length":170,"line":15,"column":8,"endLine":20,"endColumn":9,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"inline","argumentNames":["this","z"]}
 
-function sprites_BaseSprite_constructor__P1860_mk(s) {
+function sprites_BaseSprite_constructor__P31279_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_constructor__P1860, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_constructor__P31279, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13061,7 +13139,7 @@ function sprites_BaseSprite_constructor__P1860_mk(s) {
 
 
 
-function scene_Scene_addSprite__P2444(s) {
+function scene_Scene_addSprite__P31863(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13077,7 +13155,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C31838_VT)) failedCast(r0);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
@@ -13096,7 +13174,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["set/id"];
       if (s.tmp_3.fn === null) { s.tmp_3.arg0.fields["id"] = s.tmp_3.arg1; }
       else if (s.tmp_3.fn === undefined) { failedCast(s.tmp_3.arg0) } 
-     else { s.callLocIdx = 1046; s.pc = 1; return s.tmp_3; }
+     else { s.callLocIdx = 1003; s.pc = 1; return s.tmp_3; }
     }
   case 1:
     r0 = s.retval;
@@ -13104,12 +13182,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_addSprite__P2444.info = {"start":6859,"length":128,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
+scene_Scene_addSprite__P31863.info = {"start":6859,"length":128,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function scene_Scene_addSprite__P2444_mk(s) {
+function scene_Scene_addSprite__P31863_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_addSprite__P2444, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_addSprite__P31863, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13123,7 +13201,7 @@ function scene_Scene_addSprite__P2444_mk(s) {
 
 
 
-function sprites_BaseSprite_z__P1863(s) {
+function sprites_BaseSprite_z__P31282(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13139,7 +13217,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C31277_VT)) failedCast(r0);
     r0 = s.arg0.fields["_z"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== s.arg1);
@@ -13147,8 +13225,8 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["_z"] = (s.arg1);
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 173; s.pc = 3; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 130; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -13163,12 +13241,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_z__P1863.info = {"start":656,"length":174,"line":30,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"z","argumentNames":["this","v"]}
+sprites_BaseSprite_z__P31282.info = {"start":656,"length":174,"line":30,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"z","argumentNames":["this","v"]}
 
-function sprites_BaseSprite_z__P1863_mk(s) {
+function sprites_BaseSprite_z__P31282_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_z__P1863, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_z__P31282, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13182,7 +13260,7 @@ function sprites_BaseSprite_z__P1863_mk(s) {
 
 
 
-function sprites_BaseSprite_z__P1862(s) {
+function sprites_BaseSprite_z__P31281(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13197,18 +13275,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C31277_VT)) failedCast(r0);
     r0 = s.arg0.fields["_z"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_z__P1862.info = {"start":591,"length":55,"line":26,"column":8,"endLine":28,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"z","argumentNames":["this"]}
-sprites_BaseSprite_z__P1862.isGetter = true;
+sprites_BaseSprite_z__P31281.info = {"start":591,"length":55,"line":26,"column":8,"endLine":28,"endColumn":9,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"z","argumentNames":["this"]}
+sprites_BaseSprite_z__P31281.isGetter = true;
 
-function sprites_BaseSprite_z__P1862_mk(s) {
+function sprites_BaseSprite_z__P31281_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_z__P1862, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_z__P31281, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -13217,7 +13295,7 @@ function sprites_BaseSprite_z__P1862_mk(s) {
 
 
 
-function initilize_map__P46079(s) {
+function initilize_map__P98095(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13227,74 +13305,74 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___46635 = undefined;
-    s.index___46675 = undefined;
-    s.location___46759 = undefined;
-    s.unnamed1502___U3 = undefined;
-    s.unnamed1503___U4 = undefined;
-    s.tmp_0 = scene_setBackgroundColor__P2457_mk(s);
+    s.index___98128 = undefined;
+    s.index___98171 = undefined;
+    s.location___98259 = undefined;
+    s.unnamed3542___U3 = undefined;
+    s.unnamed3543___U4 = undefined;
+    s.tmp_0 = scene_setBackgroundColor__P31876_mk(s);
     s.tmp_0.arg0 = 9;
-    s.callLocIdx = 157; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 162; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___3933);
-    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___3206);
-    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___3375);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___3048);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___3052);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___3053);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___3050);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___3049);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___3934);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___3935);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___3936);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___3937);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___3938);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___3939);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___3940);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___3941);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___3942);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___3943);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___3944);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___3946);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___3947);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___3948);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile16___3949);
-    s.tmp_1 = tiles_setTilemap__P2341_mk(s);
-    s.tmp_2 = tiles_createTilemap__P2340_mk(s);
-    s.tmp_2.arg0 = _hex46607;
-    r0 = pxsim.image.ofBuffer(_hex46609);
+    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___33468);
+    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___32740);
+    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___32909);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___32582);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___32586);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___32587);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___32584);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___32583);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___33469);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___33470);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___33471);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___33472);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___33473);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___33474);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___33475);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___33476);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___33477);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___33478);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___33479);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___33481);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___33482);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___33483);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile16___33484);
+    s.tmp_1 = tiles_setTilemap__P31760_mk(s);
+    s.tmp_2 = tiles_createTilemap__P31759_mk(s);
+    s.tmp_2.arg0 = _hex98100;
+    r0 = pxsim.image.ofBuffer(_hex98102);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = s.tmp_0;
     s.tmp_2.arg3 = 4;
-    s.callLocIdx = 158; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 163; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 159; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 164; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.index___46635 = (0);
+    s.index___98128 = (0);
   case 1:
-    s.tmp_1 = r0 = s.index___46635;
-    r0 = (globals.user_shark_count___46157 - 1);
+    s.tmp_1 = r0 = s.index___98128;
+    r0 = (globals.user_shark_count___98134 - 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_3 = summon_shark__P46081_mk(s);
-    s.callLocIdx = 160; s.pc = 10; return s.tmp_3;
+    s.tmp_3 = summon_shark__P98137_mk(s);
+    s.callLocIdx = 165; s.pc = 10; return s.tmp_3;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.loading___45924;
-    r0 = (1 / globals.user_shark_count___46157);
+    s.tmp_0 = r0 = globals.loading___97909;
+    r0 = (1 / globals.user_shark_count___98134);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    globals.loading___45924 = (r0);
-    r0 = (s.index___46635 + 1);
+    globals.loading___97909 = (r0);
+    r0 = (s.index___98128 + 1);
     s.tmp_7 = r0;
     if ((s.tmp_7) && (s.tmp_7).vtable) {
     setupResume(s, 11);
@@ -13327,12 +13405,12 @@ switch (step) {
   case 13:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((globals.user_shark_count___46157) && (globals.user_shark_count___46157).vtable) {
+    if ((globals.user_shark_count___98134) && (globals.user_shark_count___98134).vtable) {
     setupResume(s, 14);
-    pxsim_String__stringConv(globals.user_shark_count___46157);
+    pxsim_String__stringConv(globals.user_shark_count___98134);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_shark_count___46157) + ""; }
+    } else { s.retval = (globals.user_shark_count___98134) + ""; }
   case 14:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -13348,46 +13426,46 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, ")");
-    globals.message___45955 = (r0);
-    s.tmp_0 = pause__P402_mk(s);
+    globals.message___97940 = (r0);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 20;
-    s.callLocIdx = 161; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 166; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    r0 = (s.index___46635 + 1);
-    s.index___46635 = (r0);
+    r0 = (s.index___98128 + 1);
+    s.index___98128 = (r0);
     { step = 1; continue; }
   case 2:
-    globals.loading___45924 = (1);
-    s.tmp_0 = pause__P402_mk(s);
+    globals.loading___97909 = (1);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 162; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 167; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
-    globals.loading___45924 = (0);
-    s.index___46675 = (0);
+    globals.loading___97909 = (0);
+    s.index___98171 = (0);
   case 3:
-    s.tmp_1 = r0 = s.index___46675;
-    r0 = (globals.user_fish_count___46159 - 2);
+    s.tmp_1 = r0 = s.index___98171;
+    r0 = (globals.user_fish_count___98177 - 2);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_3 = summon_fish__P45918_mk(s);
+    s.tmp_3 = summon_fish__P97775_mk(s);
     s.tmp_3.arg0 = true;
     s.tmp_3.arg1 = true;
-    s.callLocIdx = 163; s.pc = 18; return s.tmp_3;
+    s.callLocIdx = 168; s.pc = 18; return s.tmp_3;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.loading___45924;
-    r0 = (globals.user_fish_count___46159 - 1);
+    s.tmp_0 = r0 = globals.loading___97909;
+    r0 = (globals.user_fish_count___98177 - 1);
     s.tmp_2 = r0;
     r0 = (1 / s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    globals.loading___45924 = (r0);
-    r0 = (s.index___46675 + 1);
+    globals.loading___97909 = (r0);
+    r0 = (s.index___98171 + 1);
     s.tmp_7 = r0;
     if ((s.tmp_7) && (s.tmp_7).vtable) {
     setupResume(s, 19);
@@ -13420,7 +13498,7 @@ switch (step) {
   case 21:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = (globals.user_fish_count___46159 - 1);
+    r0 = (globals.user_fish_count___98177 - 1);
     s.tmp_9 = r0;
     if ((s.tmp_9) && (s.tmp_9).vtable) {
     setupResume(s, 22);
@@ -13443,128 +13521,128 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, ")");
-    globals.message___45955 = (r0);
-    s.tmp_0 = pause__P402_mk(s);
+    globals.message___97940 = (r0);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 20;
-    s.callLocIdx = 164; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 169; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    r0 = (s.index___46675 + 1);
-    s.index___46675 = (r0);
+    r0 = (s.index___98171 + 1);
+    s.index___98171 = (r0);
     { step = 3; continue; }
   case 4:
-    globals.loading___45924 = (1);
-    s.tmp_0 = pause__P402_mk(s);
+    globals.loading___97909 = (1);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 165; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 170; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___3933);
-    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___3206);
-    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___3375);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___3048);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___3052);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___3053);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___3050);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___3049);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___3934);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___3935);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___3936);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___3937);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___3938);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___3939);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___3940);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___3941);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___3942);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___3943);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___3944);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___3946);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___3947);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___3948);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile12___3945);
-    s.tmp_1 = tiles_setTilemap__P2341_mk(s);
-    s.tmp_2 = tiles_createTilemap__P2340_mk(s);
-    s.tmp_2.arg0 = _hex46721;
-    r0 = pxsim.image.ofBuffer(_hex46723);
+    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___33468);
+    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___32740);
+    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___32909);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___32582);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___32586);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___32587);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___32584);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___32583);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___33469);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___33470);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___33471);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___33472);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___33473);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___33474);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___33475);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___33476);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___33477);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___33478);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___33479);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___33481);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___33482);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___33483);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile12___33480);
+    s.tmp_1 = tiles_setTilemap__P31760_mk(s);
+    s.tmp_2 = tiles_createTilemap__P31759_mk(s);
+    s.tmp_2.arg0 = _hex98219;
+    r0 = pxsim.image.ofBuffer(_hex98221);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = s.tmp_0;
     s.tmp_2.arg3 = 4;
-    s.callLocIdx = 166; s.pc = 27; return s.tmp_2;
+    s.callLocIdx = 171; s.pc = 27; return s.tmp_2;
   case 27:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 167; s.pc = 26; return s.tmp_1;
+    s.callLocIdx = 172; s.pc = 26; return s.tmp_1;
   case 26:
     r0 = s.retval;
-    s.tmp_0 = summon_fish__P45918_mk(s);
+    s.tmp_0 = summon_fish__P97775_mk(s);
     s.tmp_0.arg0 = false;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 168; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 173; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    globals.sprite_player_fish___46147 = (r0);
-    s.tmp_0 = Sprite_setKind__P2071_mk(s);
-    s.tmp_0.arg0 = globals.sprite_player_fish___46147;
-    s.tmp_0.arg1 = globals.Player___2128;
-    s.callLocIdx = 169; s.pc = 29; return s.tmp_0;
+    globals.sprite_player_fish___98248 = (r0);
+    s.tmp_0 = Sprite_setKind__P31490_mk(s);
+    s.tmp_0.arg0 = globals.sprite_player_fish___98248;
+    s.tmp_0.arg1 = globals.Player___31547;
+    s.callLocIdx = 174; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
-    s.tmp_0 = controller_moveSprite__P1952_mk(s);
-    s.tmp_0.arg0 = globals.sprite_player_fish___46147;
+    s.tmp_0 = controller_moveSprite__P31371_mk(s);
+    s.tmp_0.arg0 = globals.sprite_player_fish___98248;
     s.tmp_0.arg1 = 64;
     s.tmp_0.arg2 = 64;
-    s.callLocIdx = 170; s.pc = 30; return s.tmp_0;
+    s.callLocIdx = 175; s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
-    s.tmp_0 = scene_cameraFollowSprite__P2464_mk(s);
-    s.tmp_0.arg0 = globals.sprite_player_fish___46147;
-    s.callLocIdx = 171; s.pc = 31; return s.tmp_0;
+    s.tmp_0 = scene_cameraFollowSprite__P31883_mk(s);
+    s.tmp_0.arg0 = globals.sprite_player_fish___98248;
+    s.callLocIdx = 176; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
-    s.location___46759 = (undefined);
-    s.tmp_0 = tiles_getTilesByType__P2350_mk(s);
-    s.tmp_0.arg0 = globals.tile13___3947;
-    s.callLocIdx = 172; s.pc = 32; return s.tmp_0;
+    s.location___98259 = (undefined);
+    s.tmp_0 = tiles_getTilesByType__P31769_mk(s);
+    s.tmp_0.arg0 = globals.tile13___33482;
+    s.callLocIdx = 177; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
-    s.unnamed1502___U3 = (r0);
-    s.unnamed1503___U4 = (0);
+    s.unnamed3542___U3 = (r0);
+    s.unnamed3543___U4 = (0);
   case 5:
-    s.tmp_0 = r0 = s.unnamed1503___U4;
-    r0 = pxsim_Array__length(s.unnamed1502___U3);
+    s.tmp_0 = r0 = s.unnamed3543___U4;
+    r0 = pxsim_Array__length(s.unnamed3542___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed1502___U3, s.unnamed1503___U4);
-    s.location___46759 = (r0);
-    s.tmp_2 = tiles_setTileAt__P2342_mk(s);
-    s.tmp_2.arg0 = s.location___46759;
-    s.tmp_2.arg1 = globals.tile15___3948;
-    s.callLocIdx = 173; s.pc = 33; return s.tmp_2;
+    r0 = pxsim_Array__getAt(s.unnamed3542___U3, s.unnamed3543___U4);
+    s.location___98259 = (r0);
+    s.tmp_2 = tiles_setTileAt__P31761_mk(s);
+    s.tmp_2.arg0 = s.location___98259;
+    s.tmp_2.arg1 = globals.tile15___33483;
+    s.callLocIdx = 178; s.pc = 33; return s.tmp_2;
   case 33:
     r0 = s.retval;
-    r0 = (s.unnamed1503___U4 + 1);
-    s.unnamed1503___U4 = (r0);
+    r0 = (s.unnamed3543___U4 + 1);
+    s.unnamed3543___U4 = (r0);
     { step = 5; continue; }
   case 6:
-    s.unnamed1502___U3 = (undefined);
-    s.tmp_0 = info_setScore__P2206_mk(s);
+    s.unnamed3542___U3 = (undefined);
+    s.tmp_0 = info_setScore__P31625_mk(s);
     s.tmp_0.arg0 = 60000;
-    s.callLocIdx = 174; s.pc = 34; return s.tmp_0;
+    s.callLocIdx = 179; s.pc = 34; return s.tmp_0;
   case 34:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-initilize_map__P46079.info = {"start":12263,"length":6779,"line":316,"column":0,"endLine":371,"endColumn":1,"fileName":"main.ts","functionName":"initilize_map","argumentNames":[]}
+initilize_map__P98095.info = {"start":12501,"length":6779,"line":322,"column":0,"endLine":377,"endColumn":1,"fileName":"main.ts","functionName":"initilize_map","argumentNames":[]}
 
-function initilize_map__P46079_mk(s) {
+function initilize_map__P98095_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: initilize_map__P46079, depth: s.depth + 1,
+        parent: s, fn: initilize_map__P98095, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13576,22 +13654,22 @@ function initilize_map__P46079_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  index___46635: undefined,
-  index___46675: undefined,
-  location___46759: undefined,
-  unnamed1502___U3: undefined,
-  unnamed1503___U4: undefined,
+  index___98128: undefined,
+  index___98171: undefined,
+  location___98259: undefined,
+  unnamed3542___U3: undefined,
+  unnamed3543___U4: undefined,
 } }
 
-const _hex46607 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
-const _hex46609 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
-const _hex46721 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
-const _hex46723 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000002222222222220000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
+const _hex98100 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
+const _hex98102 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
+const _hex98219 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
+const _hex98221 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000002222222222220000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
 
 
 
 
-function info_setScore__P2206(s) {
+function info_setScore__P31625(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13605,22 +13683,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_setScore__P2242_mk(s);
-    s.tmp_0.arg0 = globals.player1___2257;
+    s.tmp_0 = info_PlayerInfo_setScore__P31661_mk(s);
+    s.tmp_0.arg0 = globals.player1___31676;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 805; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 762; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_setScore__P2206.info = {"start":7362,"length":80,"line":251,"column":4,"endLine":253,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"setScore","argumentNames":["value"]}
+info_setScore__P31625.info = {"start":7362,"length":80,"line":251,"column":4,"endLine":253,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"setScore","argumentNames":["value"]}
 
-function info_setScore__P2206_mk(s) {
+function info_setScore__P31625_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_setScore__P2206, depth: s.depth + 1,
+        parent: s, fn: info_setScore__P31625, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -13630,7 +13708,7 @@ function info_setScore__P2206_mk(s) {
 
 
 
-function info_PlayerInfo_constructor__P2238(s) {
+function info_PlayerInfo_constructor__P31657(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13646,7 +13724,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_player"] = (s.arg1);
     r0 = (s.arg0).fields["border"] = (1);
     r0 = (s.arg0).fields["fc"] = (1);
@@ -13662,7 +13740,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 1; continue; }
@@ -13682,7 +13760,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 4; continue; }
@@ -13695,7 +13773,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.arg0).fields["bg"] = (s.tmp_2);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["x"] = (s.tmp_1);
     r0 = (s.arg0).fields["y"] = (0);
@@ -13706,7 +13784,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
@@ -13720,13 +13798,13 @@ switch (step) {
     r0 = (s.arg0).fields["bg"] = (s.tmp_2);
     r0 = (s.arg0).fields["x"] = (0);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["y"] = (s.tmp_1);
     r0 = (s.arg0).fields["up"] = (true);
     { step = 12; continue; }
   case 9:
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
@@ -13739,11 +13817,11 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.arg0).fields["bg"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["x"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["y"] = (s.tmp_1);
     r0 = (s.arg0).fields["left"] = (true);
@@ -13751,17 +13829,17 @@ switch (step) {
   case 12:
   case 13:
   case 14:
-    r0 = pxsim_numops_toBoolDecr(globals.players___4231);
+    r0 = pxsim_numops_toBoolDecr(globals.players___33724);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
     r0 = pxsim_Array__mk();
-    globals.players___4231 = (r0);
+    globals.players___33724 = (r0);
   case 15:
   case 16:
-    s.tmp_0 = r0 = globals.players___4231;
+    s.tmp_0 = r0 = globals.players___33724;
     r0 = s.arg0.fields["_player"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
@@ -13771,12 +13849,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_constructor__P2238.info = {"start":15446,"length":1370,"line":515,"column":8,"endLine":552,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this","player"]}
+info_PlayerInfo_constructor__P31657.info = {"start":15446,"length":1370,"line":515,"column":8,"endLine":552,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["this","player"]}
 
-function info_PlayerInfo_constructor__P2238_mk(s) {
+function info_PlayerInfo_constructor__P31657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_constructor__P2238, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_constructor__P31657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13790,7 +13868,7 @@ function info_PlayerInfo_constructor__P2238_mk(s) {
 
 
 
-function info_PlayerInfo_setScore__P2242(s) {
+function info_PlayerInfo_setScore__P31661(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13800,32 +13878,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___14918 = undefined;
+    s.state___44413 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 831; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 788; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___14918 = (r0);
-    s.tmp_0 = info_updateFlag__P4280_mk(s);
+    s.state___44413 = (r0);
+    s.tmp_0 = info_updateFlag__P33773_mk(s);
     s.tmp_0.arg0 = 2;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 832; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 789; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = info_PlayerInfo_score__P2241_mk(s);
+    s.tmp_0 = info_PlayerInfo_score__P31660_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 833; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 790; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.state___14918;
+    s.tmp_0 = r0 = s.state___44413;
     r0 = (s.arg1 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["score"] = (s.tmp_1);
@@ -13833,16 +13911,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_setScore__P2242.info = {"start":18028,"length":220,"line":596,"column":8,"endLine":602,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"setScore","argumentNames":["this","value"]}
+info_PlayerInfo_setScore__P31661.info = {"start":18028,"length":220,"line":596,"column":8,"endLine":602,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"setScore","argumentNames":["this","value"]}
 
-function info_PlayerInfo_setScore__P2242_mk(s) {
+function info_PlayerInfo_setScore__P31661_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_setScore__P2242, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_setScore__P31661, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  state___14918: undefined,
+  state___44413: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -13851,7 +13929,7 @@ function info_PlayerInfo_setScore__P2242_mk(s) {
 
 
 
-function info_updateFlag__P4280(s) {
+function info_updateFlag__P33773(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13866,13 +13944,13 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_initHUD__P4276_mk(s);
-    s.callLocIdx = 812; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = info_initHUD__P33769_mk(s);
+    s.callLocIdx = 769; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = r0 = globals.infoState___4230;
+    s.tmp_0 = r0 = globals.infoState___33723;
     r0 = s.tmp_0.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | s.arg0);
@@ -13880,8 +13958,8 @@ switch (step) {
     r0 = (s.tmp_0).fields["visibilityFlag"] = (s.tmp_1);
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = r0 = globals.infoState___4230;
-    r0 = globals.infoState___4230.fields["visibilityFlag"];
+    s.tmp_0 = r0 = globals.infoState___33723;
+    r0 = globals.infoState___33723.fields["visibilityFlag"];
     s.tmp_4 = r0;
     r0 = (~ s.tmp_4);
     s.tmp_3 = r0;
@@ -13895,12 +13973,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_updateFlag__P4280.info = {"start":11455,"length":204,"line":393,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"updateFlag","argumentNames":["flag","on"]}
+info_updateFlag__P33773.info = {"start":11455,"length":204,"line":393,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"updateFlag","argumentNames":["flag","on"]}
 
-function info_updateFlag__P4280_mk(s) {
+function info_updateFlag__P33773_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_updateFlag__P4280, depth: s.depth + 1,
+        parent: s, fn: info_updateFlag__P33773, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13915,7 +13993,7 @@ function info_updateFlag__P4280_mk(s) {
 
 
 
-function info_initHUD__P4276(s) {
+function info_initHUD__P33769(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13925,24 +14003,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.infoState___4230);
+    r0 = pxsim_numops_toBoolDecr(globals.infoState___33723);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(info_InfoState__C4227_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(info_InfoState__C33720_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = info_InfoState_constructor__P4228_mk(s);
+    s.tmp_1 = info_InfoState_constructor__P33721_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 779; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 736; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    globals.infoState___4230 = (s.tmp_0);
-    s.tmp_0 = scene_createRenderable__P2383_mk(s);
+    globals.infoState___33723 = (s.tmp_0);
+    s.tmp_0 = scene_createRenderable__P31802_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P14978;
+    s.tmp_0.arg1 = inline__P44473;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 795; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 752; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 3:
@@ -13950,12 +14028,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_initHUD__P4276.info = {"start":2595,"length":2080,"line":97,"column":4,"endLine":147,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"initHUD","argumentNames":[]}
+info_initHUD__P33769.info = {"start":2595,"length":2080,"line":97,"column":4,"endLine":147,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"initHUD","argumentNames":[]}
 
-function info_initHUD__P4276_mk(s) {
+function info_initHUD__P33769_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_initHUD__P4276, depth: s.depth + 1,
+        parent: s, fn: info_initHUD__P33769, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13965,7 +14043,7 @@ function info_initHUD__P4276_mk(s) {
 
 
 
-function inline__P14978(s) {
+function inline__P44473(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13975,12 +14053,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ps___14987 = undefined;
-    s.p___15008 = undefined;
-    s.scene___15042 = undefined;
-    s.elapsed___15045 = undefined;
-    s.t___15053 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.infoState___4230);
+    s.ps___44482 = undefined;
+    s.p___44503 = undefined;
+    s.scene___44537 = undefined;
+    s.elapsed___44540 = undefined;
+    s.t___44548 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.infoState___33723);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -13989,37 +14067,37 @@ switch (step) {
     { step = 23; continue; }
   case 1:
   case 2:
-    r0 = globals.infoState___4230.fields["visibilityFlag"];
+    r0 = globals.infoState___33723.fields["visibilityFlag"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 16);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_2.arg0 = globals.players___4231;
-    s.tmp_2.arg1 = inline__P14989;
-    s.callLocIdx = 780; s.pc = 24; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_2.arg0 = globals.players___33724;
+    s.tmp_2.arg1 = inline__P44484;
+    s.callLocIdx = 737; s.pc = 24; return s.tmp_2;
   case 24:
     r0 = s.retval;
-    s.ps___14987 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_0.arg0 = s.ps___14987;
-    s.tmp_0.arg1 = inline__P14998;
-    s.callLocIdx = 782; s.pc = 25; return s.tmp_0;
+    s.ps___44482 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_0.arg0 = s.ps___44482;
+    s.tmp_0.arg1 = inline__P44493;
+    s.callLocIdx = 739; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_0.arg0 = s.ps___14987;
-    s.tmp_0.arg1 = inline__P15004;
-    s.callLocIdx = 784; s.pc = 26; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_0.arg0 = s.ps___44482;
+    s.tmp_0.arg1 = inline__P44499;
+    s.callLocIdx = 741; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
     { step = 12; continue; }
   case 3:
-    s.p___15008 = (globals.player1___2257);
-    s.tmp_1 = info_PlayerInfo_hasScore__P2244_mk(s);
-    s.tmp_1.arg0 = s.p___15008;
-    s.callLocIdx = 785; s.pc = 27; return s.tmp_1;
+    s.p___44503 = (globals.player1___31676);
+    s.tmp_1 = info_PlayerInfo_hasScore__P31663_mk(s);
+    s.tmp_1.arg0 = s.p___44503;
+    s.callLocIdx = 742; s.pc = 27; return s.tmp_1;
   case 27:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -14028,7 +14106,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 4:
-    r0 = globals.infoState___4230.fields["visibilityFlag"];
+    r0 = globals.infoState___33723.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 2);
   case 5:
@@ -14036,16 +14114,16 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 6; continue; }
-    s.tmp_4 = info_PlayerInfo_drawScore__P2252_mk(s);
-    s.tmp_4.arg0 = s.p___15008;
-    s.callLocIdx = 786; s.pc = 28; return s.tmp_4;
+    s.tmp_4 = info_PlayerInfo_drawScore__P31671_mk(s);
+    s.tmp_4.arg0 = s.p___44503;
+    s.callLocIdx = 743; s.pc = 28; return s.tmp_4;
   case 28:
     r0 = s.retval;
   case 6:
   case 7:
-    s.tmp_1 = info_PlayerInfo_hasLife__P2248_mk(s);
-    s.tmp_1.arg0 = s.p___15008;
-    s.callLocIdx = 787; s.pc = 29; return s.tmp_1;
+    s.tmp_1 = info_PlayerInfo_hasLife__P31667_mk(s);
+    s.tmp_1.arg0 = s.p___44503;
+    s.callLocIdx = 744; s.pc = 29; return s.tmp_1;
   case 29:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -14054,7 +14132,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 9; continue; }
   case 8:
-    r0 = globals.infoState___4230.fields["visibilityFlag"];
+    r0 = globals.infoState___33723.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 4);
   case 9:
@@ -14062,21 +14140,21 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 10; continue; }
-    s.tmp_4 = info_PlayerInfo_drawLives__P2253_mk(s);
-    s.tmp_4.arg0 = s.p___15008;
-    s.callLocIdx = 788; s.pc = 30; return s.tmp_4;
+    s.tmp_4 = info_PlayerInfo_drawLives__P31672_mk(s);
+    s.tmp_4.arg0 = s.p___44503;
+    s.callLocIdx = 745; s.pc = 30; return s.tmp_4;
   case 30:
     r0 = s.retval;
   case 10:
   case 11:
-    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P2250_mk(s);
-    s.tmp_0.arg0 = s.p___15008;
+    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P31669_mk(s);
+    s.tmp_0.arg0 = s.p___44503;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 789; s.pc = 31; return s.tmp_0;
+    s.callLocIdx = 746; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
   case 12:
-    r0 = globals.infoState___4230.fields["gameEnd"];
+    r0 = globals.infoState___33723.fields["gameEnd"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
     s.tmp_0 = r0;
@@ -14085,7 +14163,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 14; continue; }
   case 13:
-    r0 = globals.infoState___4230.fields["visibilityFlag"];
+    r0 = globals.infoState___33723.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 1);
   case 14:
@@ -14093,30 +14171,30 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 21; continue; }
-    s.tmp_4 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 790; s.pc = 32; return s.tmp_4;
+    s.tmp_4 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 747; s.pc = 32; return s.tmp_4;
   case 32:
     r0 = s.retval;
-    s.scene___15042 = (r0);
-    r0 = globals.infoState___4230.fields["gameEnd"];
+    s.scene___44537 = (r0);
+    r0 = globals.infoState___33723.fields["gameEnd"];
     s.tmp_0 = r0;
-    r0 = s.scene___15042.fields["_millis"];
+    r0 = s.scene___44537.fields["_millis"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.elapsed___15045 = (r0);
-    s.tmp_0 = info_drawTimer__P4281_mk(s);
-    s.tmp_0.arg0 = s.elapsed___15045;
-    s.callLocIdx = 792; s.pc = 33; return s.tmp_0;
+    s.elapsed___44540 = (r0);
+    s.tmp_0 = info_drawTimer__P33774_mk(s);
+    s.tmp_0.arg0 = s.elapsed___44540;
+    s.callLocIdx = 749; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    r0 = (s.elapsed___15045 / 1000);
-    s.t___15053 = (r0);
-    r0 = (s.t___15053 <= 0);
+    r0 = (s.elapsed___44540 / 1000);
+    s.t___44548 = (r0);
+    r0 = (s.t___44548 <= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    s.t___15053 = (0);
-    r0 = globals.infoState___4230.fields["countdownExpired"];
+    s.t___44548 = (0);
+    r0 = globals.infoState___33723.fields["countdownExpired"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -14124,31 +14202,31 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
-    r0 = (globals.infoState___4230).fields["countdownExpired"] = (true);
-    r0 = (globals.infoState___4230).fields["gameEnd"] = (undefined);
-    r0 = globals.infoState___4230.fields["countdownEndHandler"];
+    r0 = (globals.infoState___33723).fields["countdownExpired"] = (true);
+    r0 = (globals.infoState___33723).fields["gameEnd"] = (undefined);
+    r0 = globals.infoState___33723.fields["countdownEndHandler"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
     s.tmp_1 = if_countdownEndHandler_1_mk(s);
-    s.tmp_1.arg0 = globals.infoState___4230;
+    s.tmp_1.arg0 = globals.infoState___33723;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "countdownEndHandler"), 1);
-      s.callLocIdx = 793; s.pc = 34; return s.tmp_1;
+      s.callLocIdx = 750; s.pc = 34; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["countdownEndHandler"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["countdownEndHandler"], 1); s.callLocIdx = 793; s.pc = 34; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 793; s.pc = 34; return s.tmp_1;; }
-     else { s.callLocIdx = 793; s.pc = 34; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["countdownEndHandler"], 1); s.callLocIdx = 750; s.pc = 34; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 750; s.pc = 34; return s.tmp_1;; }
+     else { s.callLocIdx = 750; s.pc = 34; return s.tmp_1; }
     }
   case 34:
     r0 = s.retval;
     { step = 16; continue; }
   case 15:
-    s.tmp_0 = game_over__P2542_mk(s);
+    s.tmp_0 = game_over__P31961_mk(s);
     s.tmp_0.arg0 = false;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 794; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 751; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
   case 16:
@@ -14163,30 +14241,30 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P14978.info = {"start":2755,"length":1903,"line":104,"column":12,"endLine":145,"endColumn":13,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":[]}
+inline__P44473.info = {"start":2755,"length":1903,"line":104,"column":12,"endLine":145,"endColumn":13,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P14978_mk(s) {
+function inline__P44473_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P14978, depth: s.depth + 1,
+        parent: s, fn: inline__P44473, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  ps___14987: undefined,
-  p___15008: undefined,
-  scene___15042: undefined,
-  elapsed___15045: undefined,
-  t___15053: undefined,
+  ps___44482: undefined,
+  p___44503: undefined,
+  scene___44537: undefined,
+  elapsed___44540: undefined,
+  t___44548: undefined,
 } }
 
 
 
 
 
-function inline__P14989(s) {
+function inline__P44484(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14210,12 +14288,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P14989.info = {"start":3003,"length":8,"line":109,"column":46,"endLine":109,"endColumn":54,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P44484.info = {"start":3003,"length":8,"line":109,"column":46,"endLine":109,"endColumn":54,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P14989_mk(s) {
+function inline__P44484_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P14989, depth: s.depth + 1,
+        parent: s, fn: inline__P44484, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14227,7 +14305,7 @@ function inline__P14989_mk(s) {
 
 
 
-function inline__P14998(s) {
+function inline__P44493(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14241,21 +14319,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_drawPlayer__P2251_mk(s);
+    s.tmp_0 = info_PlayerInfo_drawPlayer__P31670_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 781; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 738; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P14998.info = {"start":3087,"length":19,"line":111,"column":31,"endLine":111,"endColumn":50,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P44493.info = {"start":3087,"length":19,"line":111,"column":31,"endLine":111,"endColumn":50,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P14998_mk(s) {
+function inline__P44493_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P14998, depth: s.depth + 1,
+        parent: s, fn: inline__P44493, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -14265,7 +14343,7 @@ function inline__P14998_mk(s) {
 
 
 
-function inline__P15004(s) {
+function inline__P44499(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14279,22 +14357,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P2250_mk(s);
+    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P31669_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 783; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 740; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P15004.info = {"start":3189,"length":27,"line":113,"column":31,"endLine":113,"endColumn":58,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P44499.info = {"start":3189,"length":27,"line":113,"column":31,"endLine":113,"endColumn":58,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P15004_mk(s) {
+function inline__P44499_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P15004, depth: s.depth + 1,
+        parent: s, fn: inline__P44499, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -14304,7 +14382,7 @@ function inline__P15004_mk(s) {
 
 
 
-function info_drawTimer__P4281(s) {
+function info_drawTimer__P33774(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14314,18 +14392,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.font___15082 = undefined;
-    s.smallFont___15084 = undefined;
-    s.seconds___15086 = undefined;
-    s.width___15090 = undefined;
-    s.left___15095 = undefined;
-    s.color1___15105 = undefined;
-    s.color2___15109 = undefined;
-    s.temp___15122 = undefined;
-    s.remainder___15158 = undefined;
-    s.decimalLeft___15177 = undefined;
-    s.minutes___15195 = undefined;
-    s.remainder___15199 = undefined;
+    s.font___44577 = undefined;
+    s.smallFont___44579 = undefined;
+    s.seconds___44581 = undefined;
+    s.width___44585 = undefined;
+    s.left___44590 = undefined;
+    s.color1___44600 = undefined;
+    s.color2___44604 = undefined;
+    s.temp___44617 = undefined;
+    s.remainder___44653 = undefined;
+    s.decimalLeft___44672 = undefined;
+    s.minutes___44690 = undefined;
+    s.remainder___44694 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -14339,19 +14417,19 @@ switch (step) {
   case 2:
     r0 = (s.arg0 | 0);
     s.arg0 = (r0);
-    s.font___15082 = (globals.font8___1745);
-    s.smallFont___15084 = (globals.font5___1750);
+    s.font___44577 = (globals.font8___31163);
+    s.smallFont___44579 = (globals.font5___31168);
     r0 = pxsim.Math_.idiv(s.arg0, 1000);
-    s.seconds___15086 = (r0);
+    s.seconds___44581 = (r0);
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.font___15082;
+    s.tmp_2.arg0 = s.font___44577;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 813; s.pc = 11; return s.tmp_2; }
+     else { s.callLocIdx = 770; s.pc = 11; return s.tmp_2; }
     }
   case 11:
     r0 = s.retval;
@@ -14359,29 +14437,29 @@ switch (step) {
     r0 = (s.tmp_1 * 5);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 2);
-    s.width___15090 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.width___44585 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
-    r0 = (s.width___15090 >> 1);
+    r0 = (s.width___44585 >> 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_1 - s.tmp_3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.left___15095 = (r0);
-    r0 = globals.infoState___4230.fields["fontColor"];
-    s.color1___15105 = (r0);
-    r0 = globals.infoState___4230.fields["bgColor"];
-    s.color2___15109 = (r0);
-    r0 = (s.seconds___15086 < 10);
+    s.left___44590 = (r0);
+    r0 = globals.infoState___33723.fields["fontColor"];
+    s.color1___44600 = (r0);
+    r0 = globals.infoState___33723.fields["bgColor"];
+    s.color2___44604 = (r0);
+    r0 = (s.seconds___44581 < 10);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = (s.seconds___15086 & 1);
+    r0 = (s.seconds___44581 & 1);
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -14390,7 +14468,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 6; continue; }
   case 5:
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -14400,77 +14478,77 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 7; continue; }
-    s.temp___15122 = (s.color1___15105);
-    s.color1___15105 = (s.color2___15109);
-    s.color2___15109 = (s.temp___15122);
+    s.temp___44617 = (s.color1___44600);
+    s.color1___44600 = (s.color2___44604);
+    s.color2___44604 = (s.temp___44617);
   case 7:
   case 8:
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    r0 = (s.left___15095 - 3);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    r0 = (s.left___44590 - 3);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = (s.width___15090 + 6);
+    r0 = (s.width___44585 + 6);
     s.tmp_0.arg3 = r0;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___15082;
+    s.tmp_2.arg0 = s.font___44577;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charHeight");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charHeight"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charHeight"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 814; s.pc = 13; return s.tmp_2; }
+     else { s.callLocIdx = 771; s.pc = 13; return s.tmp_2; }
     }
   case 13:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___4230.fields["borderColor"];
+    r0 = globals.infoState___33723.fields["borderColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 815; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 772; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    r0 = (s.left___15095 - 2);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    r0 = (s.left___44590 - 2);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = (s.width___15090 + 4);
+    r0 = (s.width___44585 + 4);
     s.tmp_0.arg3 = r0;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___15082;
+    s.tmp_2.arg0 = s.font___44577;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charHeight");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charHeight"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charHeight"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 816; s.pc = 15; return s.tmp_2; }
+     else { s.callLocIdx = 773; s.pc = 15; return s.tmp_2; }
     }
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.color2___15109;
-    s.callLocIdx = 817; s.pc = 14; return s.tmp_0;
+    s.tmp_0.arg5 = s.color2___44604;
+    s.callLocIdx = 774; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    r0 = (s.seconds___15086 < 60);
+    r0 = (s.seconds___44581 < 60);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
     r0 = (s.arg0 % 1000);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 10);
-    s.remainder___15158 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_3 = info_formatDecimal__P4283_mk(s);
-    s.tmp_3.arg0 = s.seconds___15086;
-    s.callLocIdx = 818; s.pc = 17; return s.tmp_3;
+    s.remainder___44653 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_3 = info_formatDecimal__P33776_mk(s);
+    s.tmp_3.arg0 = s.seconds___44581;
+    s.callLocIdx = 775; s.pc = 17; return s.tmp_3;
   case 17:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -14485,24 +14563,24 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, ".");
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.left___15095;
+    s.tmp_0.arg2 = s.left___44590;
     s.tmp_0.arg3 = 1;
-    s.tmp_0.arg4 = s.color1___15105;
-    s.tmp_0.arg5 = s.font___15082;
+    s.tmp_0.arg4 = s.color1___44600;
+    s.tmp_0.arg5 = s.font___44577;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 819; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 776; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.left___15095;
+    s.tmp_0 = r0 = s.left___44590;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___15082;
+    s.tmp_3.arg0 = s.font___44577;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 820; s.pc = 19; return s.tmp_3; }
+     else { s.callLocIdx = 777; s.pc = 19; return s.tmp_3; }
     }
   case 19:
     r0 = s.retval;
@@ -14510,34 +14588,34 @@ switch (step) {
     r0 = (3 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.decimalLeft___15177 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_1 = info_formatDecimal__P4283_mk(s);
-    s.tmp_1.arg0 = s.remainder___15158;
-    s.callLocIdx = 821; s.pc = 21; return s.tmp_1;
+    s.decimalLeft___44672 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_1 = info_formatDecimal__P33776_mk(s);
+    s.tmp_1.arg0 = s.remainder___44653;
+    s.callLocIdx = 778; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.decimalLeft___15177;
+    s.tmp_0.arg2 = s.decimalLeft___44672;
     s.tmp_0.arg3 = 3;
-    s.tmp_0.arg4 = s.color1___15105;
-    s.tmp_0.arg5 = s.smallFont___15084;
+    s.tmp_0.arg4 = s.color1___44600;
+    s.tmp_0.arg5 = s.smallFont___44579;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 822; s.pc = 20; return s.tmp_0;
+    s.callLocIdx = 779; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     { step = 10; continue; }
   case 9:
-    r0 = pxsim.Math_.idiv(s.seconds___15086, 60);
-    s.minutes___15195 = (r0);
-    r0 = (s.seconds___15086 % 60);
-    s.remainder___15199 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_5 = info_formatDecimal__P4283_mk(s);
-    s.tmp_5.arg0 = s.minutes___15195;
-    s.callLocIdx = 823; s.pc = 23; return s.tmp_5;
+    r0 = pxsim.Math_.idiv(s.seconds___44581, 60);
+    s.minutes___44690 = (r0);
+    r0 = (s.seconds___44581 % 60);
+    s.remainder___44694 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_5 = info_formatDecimal__P33776_mk(s);
+    s.tmp_5.arg0 = s.minutes___44690;
+    s.callLocIdx = 780; s.pc = 23; return s.tmp_5;
   case 23:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -14561,9 +14639,9 @@ switch (step) {
   case 25:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_8 = info_formatDecimal__P4283_mk(s);
-    s.tmp_8.arg0 = s.remainder___15199;
-    s.callLocIdx = 824; s.pc = 26; return s.tmp_8;
+    s.tmp_8 = info_formatDecimal__P33776_mk(s);
+    s.tmp_8.arg0 = s.remainder___44694;
+    s.callLocIdx = 781; s.pc = 26; return s.tmp_8;
   case 26:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -14578,12 +14656,12 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_6);
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.left___15095;
+    s.tmp_0.arg2 = s.left___44590;
     s.tmp_0.arg3 = 1;
-    s.tmp_0.arg4 = s.color1___15105;
-    s.tmp_0.arg5 = s.font___15082;
+    s.tmp_0.arg4 = s.color1___44600;
+    s.tmp_0.arg5 = s.font___44577;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 825; s.pc = 22; return s.tmp_0;
+    s.callLocIdx = 782; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
   case 10:
@@ -14591,12 +14669,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_drawTimer__P4281.info = {"start":13488,"length":1328,"line":462,"column":4,"endLine":497,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"drawTimer","argumentNames":["millis"]}
+info_drawTimer__P33774.info = {"start":13488,"length":1328,"line":462,"column":4,"endLine":497,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"drawTimer","argumentNames":["millis"]}
 
-function info_drawTimer__P4281_mk(s) {
+function info_drawTimer__P33774_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_drawTimer__P4281, depth: s.depth + 1,
+        parent: s, fn: info_drawTimer__P33774, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14607,18 +14685,18 @@ function info_drawTimer__P4281_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  font___15082: undefined,
-  smallFont___15084: undefined,
-  seconds___15086: undefined,
-  width___15090: undefined,
-  left___15095: undefined,
-  color1___15105: undefined,
-  color2___15109: undefined,
-  temp___15122: undefined,
-  remainder___15158: undefined,
-  decimalLeft___15177: undefined,
-  minutes___15195: undefined,
-  remainder___15199: undefined,
+  font___44577: undefined,
+  smallFont___44579: undefined,
+  seconds___44581: undefined,
+  width___44585: undefined,
+  left___44590: undefined,
+  color1___44600: undefined,
+  color2___44604: undefined,
+  temp___44617: undefined,
+  remainder___44653: undefined,
+  decimalLeft___44672: undefined,
+  minutes___44690: undefined,
+  remainder___44694: undefined,
   arg0: undefined,
 } }
 
@@ -14626,7 +14704,7 @@ function info_drawTimer__P4281_mk(s) {
 
 
 
-function info_formatDecimal__P4283(s) {
+function info_formatDecimal__P33776(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14664,12 +14742,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_formatDecimal__P4283.info = {"start":28426,"length":156,"line":916,"column":4,"endLine":922,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"formatDecimal","argumentNames":["val"]}
+info_formatDecimal__P33776.info = {"start":28426,"length":156,"line":916,"column":4,"endLine":922,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"formatDecimal","argumentNames":["val"]}
 
-function info_formatDecimal__P4283_mk(s) {
+function info_formatDecimal__P33776_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_formatDecimal__P4283, depth: s.depth + 1,
+        parent: s, fn: info_formatDecimal__P33776, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14680,7 +14758,7 @@ function info_formatDecimal__P4283_mk(s) {
 
 
 
-function helpers_imagePrint__P1760(s) {
+function helpers_imagePrint__P31178(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14690,31 +14768,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x0___8866 = undefined;
-    s.cp___8868 = undefined;
-    s.mult___8869 = undefined;
-    s.dataW___8874 = undefined;
-    s.dataH___8880 = undefined;
-    s.byteHeight___8886 = undefined;
-    s.charSize___8892 = undefined;
-    s.dataSize___8896 = undefined;
-    s.fontdata___8900 = undefined;
-    s.lastchar___8903 = undefined;
-    s.imgBuf___8910 = undefined;
-    s.xOffset___8934 = undefined;
-    s.yOffset___8935 = undefined;
-    s.ch___8950 = undefined;
-    s.l___8969 = undefined;
-    s.r___8970 = undefined;
-    s.off___8972 = undefined;
-    s.guess___8973 = undefined;
-    s.m___8992 = undefined;
-    s.v___9001 = undefined;
-    s.i___9057 = undefined;
-    s.j___9062 = undefined;
-    s.mask___9063 = undefined;
-    s.c___9064 = undefined;
-    s.n___9081 = undefined;
+    s.x0___38403 = undefined;
+    s.cp___38405 = undefined;
+    s.mult___38406 = undefined;
+    s.dataW___38411 = undefined;
+    s.dataH___38417 = undefined;
+    s.byteHeight___38423 = undefined;
+    s.charSize___38429 = undefined;
+    s.dataSize___38433 = undefined;
+    s.fontdata___38437 = undefined;
+    s.lastchar___38440 = undefined;
+    s.imgBuf___38447 = undefined;
+    s.xOffset___38471 = undefined;
+    s.yOffset___38472 = undefined;
+    s.ch___38487 = undefined;
+    s.l___38506 = undefined;
+    s.r___38507 = undefined;
+    s.off___38509 = undefined;
+    s.guess___38510 = undefined;
+    s.m___38529 = undefined;
+    s.v___38538 = undefined;
+    s.i___38594 = undefined;
+    s.j___38599 = undefined;
+    s.mask___38600 = undefined;
+    s.c___38601 = undefined;
+    s.n___38618 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -14735,9 +14813,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = image_getFontForText__P1747_mk(s);
+    s.tmp_2 = image_getFontForText__P31165_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 139; s.pc = 39; return s.tmp_2;
+    s.callLocIdx = 91; s.pc = 39; return s.tmp_2;
   case 39:
     r0 = s.retval;
     s.arg5 = (r0);
@@ -14752,8 +14830,8 @@ switch (step) {
     s.arg4 = (1);
   case 3:
   case 4:
-    s.x0___8866 = (s.arg2);
-    s.cp___8868 = (0);
+    s.x0___38403 = (s.arg2);
+    s.cp___38405 = (0);
     s.tmp_1 = if_multiplier_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -14762,7 +14840,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["multiplier"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["multiplier"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 140; s.pc = 40; return s.tmp_1; }
+     else { s.callLocIdx = 92; s.pc = 40; return s.tmp_1; }
     }
   case 40:
     r0 = s.retval;
@@ -14777,7 +14855,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["multiplier"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["multiplier"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 141; s.pc = 41; return s.tmp_2; }
+     else { s.callLocIdx = 93; s.pc = 41; return s.tmp_2; }
     }
   case 41:
     r0 = s.retval;
@@ -14787,7 +14865,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.mult___8869 = (s.tmp_3);
+    s.mult___38406 = (s.tmp_3);
     s.tmp_1 = if_charWidth_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -14796,13 +14874,13 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["charWidth"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["charWidth"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 142; s.pc = 42; return s.tmp_1; }
+     else { s.callLocIdx = 94; s.pc = 42; return s.tmp_1; }
     }
   case 42:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___8869);
-    s.dataW___8874 = (r0);
+    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___38406);
+    s.dataW___38411 = (r0);
     s.tmp_1 = if_charHeight_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -14811,21 +14889,21 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["charHeight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["charHeight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 143; s.pc = 43; return s.tmp_1; }
+     else { s.callLocIdx = 95; s.pc = 43; return s.tmp_1; }
     }
   case 43:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___8869);
-    s.dataH___8880 = (r0);
-    r0 = (s.dataH___8880 + 7);
+    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___38406);
+    s.dataH___38417 = (r0);
+    r0 = (s.dataH___38417 + 7);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 3);
-    s.byteHeight___8886 = (r0);
-    r0 = (s.byteHeight___8886 * s.dataW___8874);
-    s.charSize___8892 = (r0);
-    r0 = (2 + s.charSize___8892);
-    s.dataSize___8896 = (r0);
+    s.byteHeight___38423 = (r0);
+    r0 = (s.byteHeight___38423 * s.dataW___38411);
+    s.charSize___38429 = (r0);
+    r0 = (2 + s.charSize___38429);
+    s.dataSize___38433 = (r0);
     s.tmp_0 = if_data_1_mk(s);
     s.tmp_0.arg0 = s.arg5;
     if (!s.tmp_0.arg0.vtable.iface) {
@@ -14834,48 +14912,48 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["data"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["data"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 144; s.pc = 44; return s.tmp_0; }
+     else { s.callLocIdx = 96; s.pc = 44; return s.tmp_0; }
     }
   case 44:
     r0 = s.retval;
-    s.fontdata___8900 = (r0);
-    r0 = pxsim.BufferMethods.length(s.fontdata___8900);
+    s.fontdata___38437 = (r0);
+    r0 = pxsim.BufferMethods.length(s.fontdata___38437);
     s.tmp_1 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_1, s.dataSize___8896);
+    r0 = pxsim.Math_.idiv(s.tmp_1, s.dataSize___38433);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.lastchar___8903 = (r0);
-    r0 = (s.mult___8869 == 1);
+    s.lastchar___38440 = (r0);
+    r0 = (s.mult___38406 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = (8 + s.charSize___8892);
+    r0 = (8 + s.charSize___38429);
     s.tmp_1 = r0;
     r0 = pxsim.control.createBuffer(s.tmp_1);
-    s.imgBuf___8910 = (r0);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8910, 0, 135);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8910, 1, 1);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8910, 2, s.dataW___8874);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8910, 4, s.dataH___8880);
+    s.imgBuf___38447 = (r0);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___38447, 0, 135);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___38447, 1, 1);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___38447, 2, s.dataW___38411);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___38447, 4, s.dataH___38417);
   case 7:
   case 8:
   case 9:
-    s.tmp_1 = r0 = s.cp___8868;
+    s.tmp_1 = r0 = s.cp___38405;
     r0 = pxsim_String_.length(s.arg1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 38; continue; }
-    s.xOffset___8934 = (0);
-    s.yOffset___8935 = (0);
+    s.xOffset___38471 = (0);
+    s.yOffset___38472 = (0);
     s.tmp_0 = r0 = s.arg6;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 10; continue; }
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 10:
-    s.tmp_1 = r0 = s.cp___8868;
+    s.tmp_1 = r0 = s.cp___38405;
     r0 = pxsim_Array__length(s.arg6);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
@@ -14885,7 +14963,7 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 12; continue; }
     s.tmp_4 = if_xOffset_1_mk(s);
-    r0 = pxsim_Array__getAt(s.arg6, s.cp___8868);
+    r0 = pxsim_Array__getAt(s.arg6, s.cp___38405);
     s.tmp_4.arg0 = r0;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "xOffset");
@@ -14893,13 +14971,13 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["xOffset"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["xOffset"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 145; s.pc = 45; return s.tmp_4; }
+     else { s.callLocIdx = 97; s.pc = 45; return s.tmp_4; }
     }
   case 45:
     r0 = s.retval;
-    s.xOffset___8934 = (r0);
+    s.xOffset___38471 = (r0);
     s.tmp_0 = if_yOffset_1_mk(s);
-    r0 = pxsim_Array__getAt(s.arg6, s.cp___8868);
+    r0 = pxsim_Array__getAt(s.arg6, s.cp___38405);
     s.tmp_0.arg0 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "yOffset");
@@ -14907,19 +14985,19 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["yOffset"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["yOffset"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 146; s.pc = 46; return s.tmp_0; }
+     else { s.callLocIdx = 98; s.pc = 46; return s.tmp_0; }
     }
   case 46:
     r0 = s.retval;
-    s.yOffset___8935 = (r0);
+    s.yOffset___38472 = (r0);
   case 12:
   case 13:
-    s.tmp_0 = r0 = s.cp___8868;
+    s.tmp_0 = r0 = s.cp___38405;
     r0 = (s.tmp_0 + 1);
-    s.cp___8868 = (r0);
+    s.cp___38405 = (r0);
     r0 = pxsim_String_.charCodeAt(s.arg1, s.tmp_0);
-    s.ch___8950 = (r0);
-    r0 = (s.ch___8950 == 10);
+    s.ch___38487 = (r0);
+    r0 = (s.ch___38487 == 10);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
@@ -14932,7 +15010,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charHeight"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charHeight"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 147; s.pc = 47; return s.tmp_4; }
+     else { s.callLocIdx = 99; s.pc = 47; return s.tmp_4; }
     }
   case 47:
     r0 = s.retval;
@@ -14941,92 +15019,92 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.arg3 = (r0);
-    s.arg2 = (s.x0___8866);
+    s.arg2 = (s.x0___38403);
   case 14:
   case 15:
-    r0 = (s.ch___8950 < 32);
+    r0 = (s.ch___38487 < 32);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
     { step = 9; continue; }
   case 16:
   case 17:
-    s.l___8969 = (0);
-    s.r___8970 = (s.lastchar___8903);
-    s.off___8972 = (0);
-    r0 = (s.ch___8950 - 32);
+    s.l___38506 = (0);
+    s.r___38507 = (s.lastchar___38440);
+    s.off___38509 = (0);
+    r0 = (s.ch___38487 - 32);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.dataSize___8896);
-    s.guess___8973 = (r0);
-    r0 = pxsim.BufferMethods.getNumber(s.fontdata___8900, 4, s.guess___8973);
+    r0 = (s.tmp_0 * s.dataSize___38433);
+    s.guess___38510 = (r0);
+    r0 = pxsim.BufferMethods.getNumber(s.fontdata___38437, 4, s.guess___38510);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.ch___8950);
+    r0 = (s.tmp_1 == s.ch___38487);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.off___8972 = (s.guess___8973);
+    s.off___38509 = (s.guess___38510);
     { step = 25; continue; }
   case 18:
   case 19:
-    r0 = (s.l___8969 <= s.r___8970);
+    r0 = (s.l___38506 <= s.r___38507);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 24; continue; }
-    s.tmp_1 = r0 = s.l___8969;
-    r0 = (s.r___8970 - s.l___8969);
+    s.tmp_1 = r0 = s.l___38506;
+    r0 = (s.r___38507 - s.l___38506);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
-    s.m___8992 = (r0);
-    s.tmp_0 = r0 = s.fontdata___8900;
-    r0 = (s.m___8992 * s.dataSize___8896);
+    s.m___38529 = (r0);
+    s.tmp_0 = r0 = s.fontdata___38437;
+    r0 = (s.m___38529 * s.dataSize___38433);
     s.tmp_1 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_0, 4, s.tmp_1);
-    s.v___9001 = (r0);
-    r0 = (s.v___9001 == s.ch___8950);
+    s.v___38538 = (r0);
+    r0 = (s.v___38538 == s.ch___38487);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = (s.m___8992 * s.dataSize___8896);
-    s.off___8972 = (r0);
+    r0 = (s.m___38529 * s.dataSize___38433);
+    s.off___38509 = (r0);
     { step = 24; continue; }
   case 20:
   case 21:
-    r0 = (s.v___9001 < s.ch___8950);
+    r0 = (s.v___38538 < s.ch___38487);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = (s.m___8992 + 1);
-    s.l___8969 = (r0);
+    r0 = (s.m___38529 + 1);
+    s.l___38506 = (r0);
     { step = 23; continue; }
   case 22:
-    r0 = (s.m___8992 - 1);
-    s.r___8970 = (r0);
+    r0 = (s.m___38529 - 1);
+    s.r___38507 = (r0);
   case 23:
     { step = 19; continue; }
   case 24:
   case 25:
-    r0 = (s.mult___8869 == 1);
+    r0 = (s.mult___38406 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    s.tmp_1 = r0 = s.imgBuf___8910;
-    s.tmp_3 = r0 = s.fontdata___8900;
-    r0 = (s.off___8972 + 2);
+    s.tmp_1 = r0 = s.imgBuf___38447;
+    s.tmp_3 = r0 = s.fontdata___38437;
+    r0 = (s.off___38509 + 2);
     s.tmp_4 = r0;
-    r0 = pxsim.BufferMethods.slice(s.tmp_3, s.tmp_4, s.charSize___8892);
+    r0 = pxsim.BufferMethods.slice(s.tmp_3, s.tmp_4, s.charSize___38429);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.write(s.tmp_1, 8, s.tmp_2);
-    s.tmp_0 = helpers_imageDrawIcon__P1727_mk(s);
+    s.tmp_0 = helpers_imageDrawIcon__P31145_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.imgBuf___8910;
-    r0 = (s.arg2 + s.xOffset___8934);
+    s.tmp_0.arg1 = s.imgBuf___38447;
+    r0 = (s.arg2 + s.xOffset___38471);
     s.tmp_0.arg2 = r0;
-    r0 = (s.arg3 + s.yOffset___8935);
+    r0 = (s.arg3 + s.yOffset___38472);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg4;
-    s.callLocIdx = 148; s.pc = 48; return s.tmp_0;
+    s.callLocIdx = 100; s.pc = 48; return s.tmp_0;
   case 48:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg2;
@@ -15038,7 +15116,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 149; s.pc = 49; return s.tmp_2; }
+     else { s.callLocIdx = 101; s.pc = 49; return s.tmp_2; }
     }
   case 49:
     r0 = s.retval;
@@ -15047,88 +15125,88 @@ switch (step) {
     s.arg2 = (r0);
     { step = 37; continue; }
   case 26:
-    r0 = (s.off___8972 + 2);
-    s.off___8972 = (r0);
-    s.i___9057 = (0);
+    r0 = (s.off___38509 + 2);
+    s.off___38509 = (r0);
+    s.i___38594 = (0);
   case 27:
-    r0 = (s.i___9057 < s.dataW___8874);
+    r0 = (s.i___38594 < s.dataW___38411);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 36; continue; }
-    s.j___9062 = (0);
-    s.mask___9063 = (1);
-    s.tmp_0 = r0 = s.off___8972;
+    s.j___38599 = (0);
+    s.mask___38600 = (1);
+    s.tmp_0 = r0 = s.off___38509;
     r0 = (s.tmp_0 + 1);
-    s.off___8972 = (r0);
-    r0 = pxsim.BufferMethods.getByte(s.fontdata___8900, s.tmp_0);
-    s.c___9064 = (r0);
+    s.off___38509 = (r0);
+    r0 = pxsim.BufferMethods.getByte(s.fontdata___38437, s.tmp_0);
+    s.c___38601 = (r0);
   case 28:
-    r0 = (s.j___9062 < s.dataH___8880);
+    r0 = (s.j___38599 < s.dataH___38417);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 35; continue; }
-    r0 = (s.mask___9063 == 256);
+    r0 = (s.mask___38600 == 256);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 29; continue; }
-    s.tmp_2 = r0 = s.off___8972;
+    s.tmp_2 = r0 = s.off___38509;
     r0 = (s.tmp_2 + 1);
-    s.off___8972 = (r0);
-    r0 = pxsim.BufferMethods.getByte(s.fontdata___8900, s.tmp_2);
-    s.c___9064 = (r0);
-    s.mask___9063 = (1);
+    s.off___38509 = (r0);
+    r0 = pxsim.BufferMethods.getByte(s.fontdata___38437, s.tmp_2);
+    s.c___38601 = (r0);
+    s.mask___38600 = (1);
   case 29:
   case 30:
-    s.n___9081 = (0);
+    s.n___38618 = (0);
   case 31:
-    r0 = (s.c___9064 & s.mask___9063);
+    r0 = (s.c___38601 & s.mask___38600);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
-    r0 = (s.n___9081 + 1);
-    s.n___9081 = (r0);
-    r0 = (s.mask___9063 << 1);
-    s.mask___9063 = (r0);
+    r0 = (s.n___38618 + 1);
+    s.n___38618 = (r0);
+    r0 = (s.mask___38600 << 1);
+    s.mask___38600 = (r0);
     { step = 31; continue; }
   case 32:
-    r0 = pxsim_numops_toBoolDecr(s.n___9081);
+    r0 = pxsim_numops_toBoolDecr(s.n___38618);
     if (!r0) { step = 33; continue; }
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg2;
-    r0 = (s.xOffset___8934 * s.mult___8869);
+    r0 = (s.xOffset___38471 * s.mult___38406);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
     s.tmp_3 = r0 = s.arg3;
-    r0 = (s.j___9062 + s.yOffset___8935);
+    r0 = (s.j___38599 + s.yOffset___38472);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 * s.mult___8869);
+    r0 = (s.tmp_5 * s.mult___38406);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.mult___8869;
-    r0 = (s.mult___8869 * s.n___9081);
+    s.tmp_0.arg3 = s.mult___38406;
+    r0 = (s.mult___38406 * s.n___38618);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = s.arg4;
-    s.callLocIdx = 150; s.pc = 50; return s.tmp_0;
+    s.callLocIdx = 102; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    r0 = (s.j___9062 + s.n___9081);
-    s.j___9062 = (r0);
+    r0 = (s.j___38599 + s.n___38618);
+    s.j___38599 = (r0);
     { step = 34; continue; }
   case 33:
-    r0 = (s.mask___9063 << 1);
-    s.mask___9063 = (r0);
-    r0 = (s.j___9062 + 1);
-    s.j___9062 = (r0);
+    r0 = (s.mask___38600 << 1);
+    s.mask___38600 = (r0);
+    r0 = (s.j___38599 + 1);
+    s.j___38599 = (r0);
   case 34:
     { step = 28; continue; }
   case 35:
-    r0 = (s.arg2 + s.mult___8869);
+    r0 = (s.arg2 + s.mult___38406);
     s.arg2 = (r0);
-    r0 = (s.i___9057 + 1);
-    s.i___9057 = (r0);
+    r0 = (s.i___38594 + 1);
+    s.i___38594 = (r0);
     { step = 27; continue; }
   case 36:
   case 37:
@@ -15138,12 +15216,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imagePrint__P1760.info = {"start":15326,"length":3300,"line":213,"column":4,"endLine":306,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"imagePrint","argumentNames":["img","text","x","y","color","font","offsets"]}
+helpers_imagePrint__P31178.info = {"start":15326,"length":3300,"line":213,"column":4,"endLine":306,"endColumn":5,"fileName":"pxt_modules/screen---st7735/text.ts","functionName":"imagePrint","argumentNames":["img","text","x","y","color","font","offsets"]}
 
-function helpers_imagePrint__P1760_mk(s) {
+function helpers_imagePrint__P31178_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imagePrint__P1760, depth: s.depth + 1,
+        parent: s, fn: helpers_imagePrint__P31178, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15151,31 +15229,31 @@ function helpers_imagePrint__P1760_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  x0___8866: undefined,
-  cp___8868: undefined,
-  mult___8869: undefined,
-  dataW___8874: undefined,
-  dataH___8880: undefined,
-  byteHeight___8886: undefined,
-  charSize___8892: undefined,
-  dataSize___8896: undefined,
-  fontdata___8900: undefined,
-  lastchar___8903: undefined,
-  imgBuf___8910: undefined,
-  xOffset___8934: undefined,
-  yOffset___8935: undefined,
-  ch___8950: undefined,
-  l___8969: undefined,
-  r___8970: undefined,
-  off___8972: undefined,
-  guess___8973: undefined,
-  m___8992: undefined,
-  v___9001: undefined,
-  i___9057: undefined,
-  j___9062: undefined,
-  mask___9063: undefined,
-  c___9064: undefined,
-  n___9081: undefined,
+  x0___38403: undefined,
+  cp___38405: undefined,
+  mult___38406: undefined,
+  dataW___38411: undefined,
+  dataH___38417: undefined,
+  byteHeight___38423: undefined,
+  charSize___38429: undefined,
+  dataSize___38433: undefined,
+  fontdata___38437: undefined,
+  lastchar___38440: undefined,
+  imgBuf___38447: undefined,
+  xOffset___38471: undefined,
+  yOffset___38472: undefined,
+  ch___38487: undefined,
+  l___38506: undefined,
+  r___38507: undefined,
+  off___38509: undefined,
+  guess___38510: undefined,
+  m___38529: undefined,
+  v___38538: undefined,
+  i___38594: undefined,
+  j___38599: undefined,
+  mask___38600: undefined,
+  c___38601: undefined,
+  n___38618: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -15189,7 +15267,7 @@ function helpers_imagePrint__P1760_mk(s) {
 
 
 
-function image_getFontForText__P1747(s) {
+function image_getFontForText__P31165(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15199,52 +15277,52 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___9160 = undefined;
+    s.i___38697 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.i___9160 = (0);
+    s.i___38697 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___9160;
+    s.tmp_1 = r0 = s.i___38697;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___9160);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___38697);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 > 8192);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 2; continue; }
-    r0 = globals.font12___1746;
+    r0 = globals.font12___31164;
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___9160 + 1);
-    s.i___9160 = (r0);
+    r0 = (s.i___38697 + 1);
+    s.i___38697 = (r0);
     { step = 1; continue; }
   case 4:
-    r0 = globals.font8___1745;
+    r0 = globals.font8___31163;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-image_getFontForText__P1747.info = {"start":11713,"length":259,"line":136,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"getFontForText","argumentNames":["text"]}
+image_getFontForText__P31165.info = {"start":11713,"length":259,"line":136,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/screen---st7735/text.ts","functionName":"getFontForText","argumentNames":["text"]}
 
-function image_getFontForText__P1747_mk(s) {
+function image_getFontForText__P31165_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_getFontForText__P1747, depth: s.depth + 1,
+        parent: s, fn: image_getFontForText__P31165, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  i___9160: undefined,
+  i___38697: undefined,
   arg0: undefined,
 } }
 
@@ -15252,7 +15330,7 @@ function image_getFontForText__P1747_mk(s) {
 
 
 
-function helpers_imageDrawIcon__P1727(s) {
+function helpers_imageDrawIcon__P31145(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15272,10 +15350,10 @@ switch (step) {
     }
     s.tmp_0 = r0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = helpers_pack__P4100_mk(s);
+    s.tmp_3 = helpers_pack__P33604_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg3;
-    s.callLocIdx = 120; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 72; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -15284,12 +15362,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawIcon__P1727.info = {"start":3500,"length":145,"line":128,"column":4,"endLine":130,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawIcon","argumentNames":["img","icon","x","y","c"]}
+helpers_imageDrawIcon__P31145.info = {"start":3500,"length":145,"line":128,"column":4,"endLine":130,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"imageDrawIcon","argumentNames":["img","icon","x","y","c"]}
 
-function helpers_imageDrawIcon__P1727_mk(s) {
+function helpers_imageDrawIcon__P31145_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawIcon__P1727, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawIcon__P31145, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15306,7 +15384,7 @@ function helpers_imageDrawIcon__P1727_mk(s) {
 
 
 
-function helpers_pack__P4100(s) {
+function helpers_pack__P33604(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15321,23 +15399,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = Math_clamp__P122_mk(s);
+    s.tmp_2 = Math_clamp__P29657_mk(s);
     s.tmp_2.arg0 = -30000;
     s.tmp_2.arg1 = 30000;
     r0 = (s.arg0 | 0);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 118; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 70; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 65535);
     s.tmp_0 = r0;
-    s.tmp_5 = Math_clamp__P122_mk(s);
+    s.tmp_5 = Math_clamp__P29657_mk(s);
     s.tmp_5.arg0 = -30000;
     s.tmp_5.arg1 = 30000;
     r0 = (s.arg1 | 0);
     s.tmp_5.arg2 = r0;
-    s.callLocIdx = 119; s.pc = 2; return s.tmp_5;
+    s.callLocIdx = 71; s.pc = 2; return s.tmp_5;
   case 2:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -15347,12 +15425,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_pack__P4100.info = {"start":3152,"length":145,"line":120,"column":4,"endLine":122,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"pack","argumentNames":["x","y"]}
+helpers_pack__P33604.info = {"start":3152,"length":145,"line":120,"column":4,"endLine":122,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"pack","argumentNames":["x","y"]}
 
-function helpers_pack__P4100_mk(s) {
+function helpers_pack__P33604_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_pack__P4100, depth: s.depth + 1,
+        parent: s, fn: helpers_pack__P33604, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15368,7 +15446,7 @@ function helpers_pack__P4100_mk(s) {
 
 
 
-function info_InfoState_constructor__P4228(s) {
+function info_InfoState_constructor__P33721(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15383,24 +15461,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_InfoState__C4227_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_InfoState__C33720_VT)) failedCast(r0);
     r0 = (s.arg0).fields["visibilityFlag"] = (8);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["playerStates"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = info_defaultHeartImage__P4278_mk(s);
-    s.callLocIdx = 773; s.pc = 7; return s.tmp_2;
+    s.tmp_2 = info_defaultHeartImage__P33771_mk(s);
+    s.callLocIdx = 730; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["heartImage"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim.image.ofBuffer(_hex15873);
+    r0 = pxsim.image.ofBuffer(_hex45368);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["multiplierImage"] = (s.tmp_1);
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -15412,7 +15490,7 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = (s.arg0).fields["bgColor"] = (s.tmp_1);
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -15424,7 +15502,7 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = (s.arg0).fields["borderColor"] = (s.tmp_1);
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -15447,12 +15525,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_InfoState_constructor__P4228.info = {"start":1045,"length":674,"line":43,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this"]}
+info_InfoState_constructor__P33721.info = {"start":1045,"length":674,"line":43,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["this"]}
 
-function info_InfoState_constructor__P4228_mk(s) {
+function info_InfoState_constructor__P33721_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_InfoState_constructor__P4228, depth: s.depth + 1,
+        parent: s, fn: info_InfoState_constructor__P33721, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15460,12 +15538,12 @@ function info_InfoState_constructor__P4228_mk(s) {
   arg0: undefined,
 } }
 
-const _hex15873 = pxsim.BufferMethods.createBufferFromHex("87040500050000000100010010100000000100001010000001000100")
+const _hex45368 = pxsim.BufferMethods.createBufferFromHex("87040500050000000100010010100000000100001010000001000100")
 
 
 
 
-function info_defaultHeartImage__P4278(s) {
+function info_defaultHeartImage__P33771(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15475,14 +15553,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex15901);
+    r0 = pxsim.image.ofBuffer(_hex45396);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex15903);
+    r0 = pxsim.image.ofBuffer(_hex45398);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -15490,24 +15568,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_defaultHeartImage__P4278.info = {"start":5080,"length":592,"line":162,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"defaultHeartImage","argumentNames":[]}
+info_defaultHeartImage__P33771.info = {"start":5080,"length":592,"line":162,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"defaultHeartImage","argumentNames":[]}
 
-function info_defaultHeartImage__P4278_mk(s) {
+function info_defaultHeartImage__P33771_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_defaultHeartImage__P4278, depth: s.depth + 1,
+        parent: s, fn: info_defaultHeartImage__P33771, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex15901 = pxsim.BufferMethods.createBufferFromHex("87040800070000001011000001000100010010001000000101001000010001001011000000000000")
-const _hex15903 = pxsim.BufferMethods.createBufferFromHex("8704080007000000c0cc00002c220c002222c2002222220c20222202222422004222020020220000")
+const _hex45396 = pxsim.BufferMethods.createBufferFromHex("87040800070000001011000001000100010010001000000101001000010001001011000000000000")
+const _hex45398 = pxsim.BufferMethods.createBufferFromHex("8704080007000000c0cc00002c220c002222c2002222220c20222202222422004222020020220000")
 
 
 
 
-function scene_Scene_millis__P2443(s) {
+function scene_Scene_millis__P31862(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15522,17 +15600,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C31838_VT)) failedCast(r0);
     r0 = s.arg0.fields["_millis"];
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_millis__P2443.info = {"start":6788,"length":61,"line":189,"column":8,"endLine":191,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"millis","argumentNames":["this"]}
+scene_Scene_millis__P31862.info = {"start":6788,"length":61,"line":189,"column":8,"endLine":191,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"millis","argumentNames":["this"]}
 
-function scene_Scene_millis__P2443_mk(s) {
+function scene_Scene_millis__P31862_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_millis__P2443, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_millis__P31862, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -15541,7 +15619,7 @@ function scene_Scene_millis__P2443_mk(s) {
 
 
 
-function scene_createRenderable__P2383(s) {
+function scene_createRenderable__P31802(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15551,14 +15629,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.renderable___15844 = undefined;
+    s.renderable___45339 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(scene_Renderable__C2378_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Renderable__C31797_VT);
     s.tmp_0 = r0;
     s.tmp_1 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_1);
@@ -15566,35 +15644,35 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 2; continue; }
   case 1:
-    r0 = inline__P15850;
+    r0 = inline__P45345;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.tmp_3 = scene_Renderable_constructor__P2379_mk(s);
+    s.tmp_3 = scene_Renderable_constructor__P31798_mk(s);
     s.tmp_3.arg0 = s.tmp_0;
     s.tmp_3.arg1 = s.arg1;
     s.tmp_3.arg2 = s.tmp_2;
     s.tmp_3.arg3 = s.arg0;
-    s.callLocIdx = 1022; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 979; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
-    s.renderable___15844 = (s.tmp_0);
-    r0 = s.renderable___15844;
+    s.renderable___45339 = (s.tmp_0);
+    r0 = s.renderable___45339;
     return leave(s, r0)
   default: oops()
 } } }
-scene_createRenderable__P2383.info = {"start":608,"length":339,"line":24,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/game/renderable.ts","functionName":"createRenderable","argumentNames":["z","handler","shouldBeVisible"]}
+scene_createRenderable__P31802.info = {"start":608,"length":339,"line":24,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/game---hw/renderable.ts","functionName":"createRenderable","argumentNames":["z","handler","shouldBeVisible"]}
 
-function scene_createRenderable__P2383_mk(s) {
+function scene_createRenderable__P31802_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_createRenderable__P2383, depth: s.depth + 1,
+        parent: s, fn: scene_createRenderable__P31802, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  renderable___15844: undefined,
+  renderable___45339: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -15604,7 +15682,7 @@ function scene_createRenderable__P2383_mk(s) {
 
 
 
-function inline__P15850(s) {
+function inline__P45345(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15618,12 +15696,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P15850.info = {"start":875,"length":10,"line":31,"column":32,"endLine":31,"endColumn":42,"fileName":"pxt_modules/game/renderable.ts","functionName":"inline","argumentNames":[]}
+inline__P45345.info = {"start":875,"length":10,"line":31,"column":32,"endLine":31,"endColumn":42,"fileName":"pxt_modules/game---hw/renderable.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P15850_mk(s) {
+function inline__P45345_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P15850, depth: s.depth + 1,
+        parent: s, fn: inline__P45345, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -15631,7 +15709,7 @@ function inline__P15850_mk(s) {
 
 
 
-function scene_Renderable_constructor__P2379(s) {
+function scene_Renderable_constructor__P31798(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15649,25 +15727,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C2378_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C31797_VT)) failedCast(r0);
     r0 = (s.arg0).fields["handler"] = (s.arg1);
     r0 = (s.arg0).fields["shouldBeVisible"] = (s.arg2);
-    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
+    s.tmp_0 = sprites_BaseSprite_constructor__P31279_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg3;
-    s.callLocIdx = 1019; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 976; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable_constructor__P2379.info = {"start":83,"length":212,"line":2,"column":8,"endLine":8,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"inline","argumentNames":["this","handler","shouldBeVisible","z"]}
+scene_Renderable_constructor__P31798.info = {"start":83,"length":212,"line":2,"column":8,"endLine":8,"endColumn":9,"fileName":"pxt_modules/game---hw/renderable.ts","functionName":"inline","argumentNames":["this","handler","shouldBeVisible","z"]}
 
-function scene_Renderable_constructor__P2379_mk(s) {
+function scene_Renderable_constructor__P31798_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable_constructor__P2379, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable_constructor__P31798, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -15680,7 +15758,7 @@ function scene_Renderable_constructor__P2379_mk(s) {
 
 
 
-function info_PlayerInfo_drawLives__P2253(s) {
+function info_PlayerInfo_drawLives__P31672(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15690,25 +15768,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___15236 = undefined;
-    s.font___15242 = undefined;
-    s.i___15286 = undefined;
-    s.num___15308 = undefined;
-    s.textWidth___15315 = undefined;
-    s.mult___15368 = undefined;
+    s.state___44731 = undefined;
+    s.font___44737 = undefined;
+    s.i___44781 = undefined;
+    s.num___44803 = undefined;
+    s.textWidth___44810 = undefined;
+    s.mult___44863 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 865; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 822; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.state___15236 = (r0);
-    r0 = s.state___15236.fields["life"];
+    s.state___44731 = (r0);
+    r0 = s.state___44731.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -15717,20 +15795,20 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    s.font___15242 = (globals.font8___1745);
-    r0 = s.state___15236.fields["life"];
+    s.font___44737 = (globals.font8___31163);
+    r0 = s.state___44731.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 <= 4);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
+    s.tmp_2 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = 0;
-    r0 = s.state___15236.fields["life"];
+    r0 = s.state___44731.fields["life"];
     s.tmp_4 = r0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_7);
     s.tmp_6 = r0;
@@ -15740,24 +15818,24 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 3);
     s.tmp_2.arg3 = r0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_9 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_9);
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 4);
     s.tmp_2.arg4 = r0;
-    r0 = globals.infoState___4230.fields["borderColor"];
+    r0 = globals.infoState___33723.fields["borderColor"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 866; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 823; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    r0 = s.state___15236.fields["life"];
+    r0 = s.state___44731.fields["life"];
     s.tmp_2 = r0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
@@ -15767,30 +15845,30 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg3 = r0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_7);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___4230.fields["bgColor"];
+    r0 = globals.infoState___33723.fields["bgColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 867; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 824; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.i___15286 = (0);
+    s.i___44781 = (0);
   case 3:
-    r0 = s.state___15236.fields["life"];
+    r0 = s.state___44731.fields["life"];
     s.tmp_1 = r0;
-    r0 = (s.i___15286 < s.tmp_1);
+    r0 = (s.i___44781 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = r0 = globals.screen___1802;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    s.tmp_2 = r0 = globals.screen___31220;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_3 = r0;
-    s.tmp_6 = r0 = s.i___15286;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    s.tmp_6 = r0 = s.i___44781;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_9 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_9);
     s.tmp_8 = r0;
@@ -15801,13 +15879,13 @@ switch (step) {
     r0 = (1 + s.tmp_5);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_2, s.tmp_3, s.tmp_4, 1);
-    r0 = (s.i___15286 + 1);
-    s.i___15286 = (r0);
+    r0 = (s.i___44781 + 1);
+    s.i___44781 = (r0);
     { step = 3; continue; }
   case 4:
     { step = 6; continue; }
   case 5:
-    r0 = s.state___15236.fields["life"];
+    r0 = s.state___44731.fields["life"];
     s.tmp_1 = r0;
     if ((s.tmp_1) && (s.tmp_1).vtable) {
     setupResume(s, 11);
@@ -15821,18 +15899,18 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_2);
-    s.num___15308 = (r0);
-    r0 = pxsim_String_.length(s.num___15308);
+    s.num___44803 = (r0);
+    r0 = pxsim_String_.length(s.num___44803);
     s.tmp_1 = r0;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___15242;
+    s.tmp_3.arg0 = s.font___44737;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 868; s.pc = 12; return s.tmp_3; }
+     else { s.callLocIdx = 825; s.pc = 12; return s.tmp_3; }
     }
   case 12:
     r0 = s.retval;
@@ -15840,97 +15918,97 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.textWidth___15315 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.textWidth___44810 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_6 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_3 + s.tmp_5);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.textWidth___15315);
+    r0 = (s.tmp_2 + s.textWidth___44810);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 5);
     s.tmp_0.arg3 = r0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_8 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_8);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 4);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___4230.fields["borderColor"];
+    r0 = globals.infoState___33723.fields["borderColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 869; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 826; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_6 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_3 + s.tmp_5);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.textWidth___15315);
+    r0 = (s.tmp_2 + s.textWidth___44810);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 4);
     s.tmp_0.arg3 = r0;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_8 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_8);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___4230.fields["bgColor"];
+    r0 = globals.infoState___33723.fields["bgColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 870; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 827; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, s.tmp_0, 1, 1);
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___31220, s.tmp_0, 1, 1);
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_0);
-    s.mult___15368 = (r0);
-    r0 = globals.infoState___4230.fields["fontColor"];
+    s.mult___44863 = (r0);
+    r0 = globals.infoState___33723.fields["fontColor"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.replace(s.mult___15368, 1, s.tmp_0);
-    s.tmp_0 = r0 = globals.screen___1802;
-    s.tmp_1 = r0 = s.mult___15368;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = pxsim_ImageMethods.replace(s.mult___44863, 1, s.tmp_0);
+    s.tmp_0 = r0 = globals.screen___31220;
+    s.tmp_1 = r0 = s.mult___44863;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_2 = r0;
     s.tmp_8 = if_charHeight_1_mk(s);
-    s.tmp_8.arg0 = s.font___15242;
+    s.tmp_8.arg0 = s.font___44737;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "charHeight");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["charHeight"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["charHeight"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 871; s.pc = 15; return s.tmp_8; }
+     else { s.callLocIdx = 828; s.pc = 15; return s.tmp_8; }
     }
   case 15:
     r0 = s.retval;
     s.tmp_7 = r0;
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_10 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_10);
     s.tmp_9 = r0;
@@ -15939,27 +16017,27 @@ switch (step) {
     r0 = (s.tmp_6 - 1);
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_0, s.tmp_1, s.tmp_2, s.tmp_5);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_0.arg1 = s.num___15308;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_0.arg1 = s.num___44803;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 3);
     s.tmp_1 = r0;
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_1 + s.tmp_4);
     s.tmp_0.arg2 = r0;
     s.tmp_0.arg3 = 1;
-    r0 = globals.infoState___4230.fields["fontColor"];
+    r0 = globals.infoState___33723.fields["fontColor"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___15242;
+    s.tmp_0.arg5 = s.font___44737;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 872; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 829; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
   case 6:
@@ -15968,12 +16046,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_drawLives__P2253.info = {"start":25956,"length":2458,"line":847,"column":8,"endLine":913,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawLives","argumentNames":["this"]}
+info_PlayerInfo_drawLives__P31672.info = {"start":25956,"length":2458,"line":847,"column":8,"endLine":913,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"drawLives","argumentNames":["this"]}
 
-function info_PlayerInfo_drawLives__P2253_mk(s) {
+function info_PlayerInfo_drawLives__P31672_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_drawLives__P2253, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_drawLives__P31672, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15986,12 +16064,12 @@ function info_PlayerInfo_drawLives__P2253_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  state___15236: undefined,
-  font___15242: undefined,
-  i___15286: undefined,
-  num___15308: undefined,
-  textWidth___15315: undefined,
-  mult___15368: undefined,
+  state___44731: undefined,
+  font___44737: undefined,
+  i___44781: undefined,
+  num___44803: undefined,
+  textWidth___44810: undefined,
+  mult___44863: undefined,
   arg0: undefined,
 } }
 
@@ -15999,7 +16077,7 @@ function info_PlayerInfo_drawLives__P2253_mk(s) {
 
 
 
-function info_PlayerInfo_drawScore__P2252(s) {
+function info_PlayerInfo_drawScore__P31671(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16009,153 +16087,153 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___15424 = undefined;
-    s.font___15428 = undefined;
-    s.offsetY___15429 = undefined;
-    s.num___15438 = undefined;
-    s.width___15442 = undefined;
+    s.s___44919 = undefined;
+    s.font___44923 = undefined;
+    s.offsetY___44924 = undefined;
+    s.num___44933 = undefined;
+    s.width___44937 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_1 = info_PlayerInfo_score__P2241_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_1 = info_PlayerInfo_score__P31660_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 858; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 815; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    s.s___15424 = (r0);
-    r0 = (s.s___15424 >= 1000000);
+    s.s___44919 = (r0);
+    r0 = (s.s___44919 >= 1000000);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.offsetY___15429 = (2);
-    s.font___15428 = (globals.font5___1750);
+    s.offsetY___44924 = (2);
+    s.font___44923 = (globals.font5___31168);
     { step = 2; continue; }
   case 1:
-    s.offsetY___15429 = (1);
-    s.font___15428 = (globals.font8___1745);
+    s.offsetY___44924 = (1);
+    s.font___44923 = (globals.font8___31163);
   case 2:
-    r0 = pxsim_numops.toString(s.s___15424);
-    s.num___15438 = (r0);
-    r0 = pxsim_String_.length(s.num___15438);
+    r0 = pxsim_numops.toString(s.s___44919);
+    s.num___44933 = (r0);
+    r0 = pxsim_String_.length(s.num___44933);
     s.tmp_0 = r0;
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.font___15428;
+    s.tmp_2.arg0 = s.font___44923;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 859; s.pc = 4; return s.tmp_2; }
+     else { s.callLocIdx = 816; s.pc = 4; return s.tmp_2; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.width___15442 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.width___44937 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.width___15442);
+    r0 = (s.tmp_2 - s.width___44937);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
     s.tmp_4 = if_charHeight_1_mk(s);
-    s.tmp_4.arg0 = globals.font8___1745;
+    s.tmp_4.arg0 = globals.font8___31163;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charHeight");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charHeight"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charHeight"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 860; s.pc = 6; return s.tmp_4; }
+     else { s.callLocIdx = 817; s.pc = 6; return s.tmp_4; }
     }
   case 6:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___4230.fields["borderColor"];
+    r0 = globals.infoState___33723.fields["borderColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 861; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 818; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.width___15442);
+    r0 = (s.tmp_2 - s.width___44937);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
     s.tmp_4 = if_charHeight_1_mk(s);
-    s.tmp_4.arg0 = globals.font8___1745;
+    s.tmp_4.arg0 = globals.font8___31163;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charHeight");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charHeight"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charHeight"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 862; s.pc = 8; return s.tmp_4; }
+     else { s.callLocIdx = 819; s.pc = 8; return s.tmp_4; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___4230.fields["bgColor"];
+    r0 = globals.infoState___33723.fields["bgColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 863; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 820; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_0.arg1 = s.num___15438;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_0.arg1 = s.num___44933;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___15442);
+    r0 = (s.tmp_1 - s.width___44937);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.offsetY___15429;
-    r0 = globals.infoState___4230.fields["fontColor"];
+    s.tmp_0.arg3 = s.offsetY___44924;
+    r0 = globals.infoState___33723.fields["fontColor"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___15428;
+    s.tmp_0.arg5 = s.font___44923;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 864; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 821; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_drawScore__P2252.info = {"start":24898,"length":1048,"line":807,"column":8,"endLine":845,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawScore","argumentNames":["this"]}
+info_PlayerInfo_drawScore__P31671.info = {"start":24898,"length":1048,"line":807,"column":8,"endLine":845,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"drawScore","argumentNames":["this"]}
 
-function info_PlayerInfo_drawScore__P2252_mk(s) {
+function info_PlayerInfo_drawScore__P31671_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_drawScore__P2252, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_drawScore__P31671, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  s___15424: undefined,
-  font___15428: undefined,
-  offsetY___15429: undefined,
-  num___15438: undefined,
-  width___15442: undefined,
+  s___44919: undefined,
+  font___44923: undefined,
+  offsetY___44924: undefined,
+  num___44933: undefined,
+  width___44937: undefined,
   arg0: undefined,
 } }
 
@@ -16163,7 +16241,7 @@ function info_PlayerInfo_drawScore__P2252_mk(s) {
 
 
 
-function info_PlayerInfo_drawPlayer__P2251(s) {
+function info_PlayerInfo_drawPlayer__P31670(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16173,44 +16251,44 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___15522 = undefined;
-    s.font___15525 = undefined;
-    s.score___15527 = undefined;
-    s.life___15528 = undefined;
-    s.height___15529 = undefined;
-    s.scoreWidth___15530 = undefined;
-    s.lifeWidth___15531 = undefined;
-    s.offsetY___15534 = undefined;
-    s.showScore___15535 = undefined;
-    s.showLife___15543 = undefined;
-    s.width___15611 = undefined;
-    s.x___15621 = undefined;
-    s.y___15628 = undefined;
-    s.bump___15661 = undefined;
-    s.xLoc___15686 = undefined;
-    s.mult___15697 = undefined;
-    s.pNum___15759 = undefined;
-    s.iconWidth___15766 = undefined;
-    s.iconHeight___15774 = undefined;
-    s.iconX___15782 = undefined;
-    s.iconY___15794 = undefined;
+    s.state___45017 = undefined;
+    s.font___45020 = undefined;
+    s.score___45022 = undefined;
+    s.life___45023 = undefined;
+    s.height___45024 = undefined;
+    s.scoreWidth___45025 = undefined;
+    s.lifeWidth___45026 = undefined;
+    s.offsetY___45029 = undefined;
+    s.showScore___45030 = undefined;
+    s.showLife___45038 = undefined;
+    s.width___45106 = undefined;
+    s.x___45116 = undefined;
+    s.y___45123 = undefined;
+    s.bump___45156 = undefined;
+    s.xLoc___45181 = undefined;
+    s.mult___45192 = undefined;
+    s.pNum___45254 = undefined;
+    s.iconWidth___45261 = undefined;
+    s.iconHeight___45269 = undefined;
+    s.iconX___45277 = undefined;
+    s.iconY___45289 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 841; s.pc = 43; return s.tmp_0;
+    s.callLocIdx = 798; s.pc = 43; return s.tmp_0;
   case 43:
     r0 = s.retval;
-    s.state___15522 = (r0);
-    s.font___15525 = (globals.font5___1750);
-    s.height___15529 = (4);
-    s.scoreWidth___15530 = (0);
-    s.lifeWidth___15531 = (0);
-    s.offsetY___15534 = (2);
+    s.state___45017 = (r0);
+    s.font___45020 = (globals.font5___31168);
+    s.height___45024 = (4);
+    s.scoreWidth___45025 = (0);
+    s.lifeWidth___45026 = (0);
+    s.offsetY___45029 = (2);
     r0 = s.arg0.fields["showScore"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -16218,13 +16296,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.state___15522.fields["score"];
+    r0 = s.state___45017.fields["score"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.showScore___15535 = (s.tmp_2);
+    s.showScore___45030 = (s.tmp_2);
     r0 = s.arg0.fields["showLife"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -16232,18 +16310,18 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = s.state___15522.fields["life"];
+    r0 = s.state___45017.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.showLife___15543 = (s.tmp_2);
-    r0 = pxsim_numops_toBoolDecr(s.showScore___15535);
+    s.showLife___45038 = (s.tmp_2);
+    r0 = pxsim_numops_toBoolDecr(s.showScore___45030);
     if (!r0) { step = 5; continue; }
     r0 = pxsim_String_.mkEmpty();
     s.tmp_0 = r0;
-    r0 = s.state___15522.fields["score"];
+    r0 = s.state___45017.fields["score"];
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 44);
@@ -16255,18 +16333,18 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.score___15527 = (r0);
-    r0 = pxsim_String_.length(s.score___15527);
+    s.score___45022 = (r0);
+    r0 = pxsim_String_.length(s.score___45022);
     s.tmp_1 = r0;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___15525;
+    s.tmp_3.arg0 = s.font___45020;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 842; s.pc = 45; return s.tmp_3; }
+     else { s.callLocIdx = 799; s.pc = 45; return s.tmp_3; }
     }
   case 45:
     r0 = s.retval;
@@ -16274,33 +16352,33 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 3);
-    s.scoreWidth___15530 = (r0);
-    s.tmp_0 = r0 = s.height___15529;
+    s.scoreWidth___45025 = (r0);
+    s.tmp_0 = r0 = s.height___45024;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___15525;
+    s.tmp_2.arg0 = s.font___45020;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charHeight");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charHeight"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charHeight"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 843; s.pc = 46; return s.tmp_2; }
+     else { s.callLocIdx = 800; s.pc = 46; return s.tmp_2; }
     }
   case 46:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.height___15529 = (r0);
-    s.tmp_0 = r0 = s.offsetY___15534;
+    s.height___45024 = (r0);
+    s.tmp_0 = r0 = s.offsetY___45029;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.font___15525;
+    s.tmp_3.arg0 = s.font___45020;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 844; s.pc = 47; return s.tmp_3; }
+     else { s.callLocIdx = 801; s.pc = 47; return s.tmp_3; }
     }
   case 47:
     r0 = s.retval;
@@ -16308,12 +16386,12 @@ switch (step) {
     r0 = (s.tmp_2 + 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.offsetY___15534 = (r0);
+    s.offsetY___45029 = (r0);
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(s.showLife___15543);
+    r0 = pxsim_numops_toBoolDecr(s.showLife___45038);
     if (!r0) { step = 9; continue; }
-    r0 = s.state___15522.fields["life"];
+    r0 = s.state___45017.fields["life"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 7; continue; }
@@ -16336,28 +16414,28 @@ switch (step) {
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_String__concat(s.tmp_2, s.tmp_3);
-    s.life___15528 = (r0);
-    r0 = globals.infoState___4230.fields["heartImage"];
+    s.life___45023 = (r0);
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_3);
     s.tmp_2 = r0;
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_1 = r0;
-    r0 = pxsim_String_.length(s.life___15528);
+    r0 = pxsim_String_.length(s.life___45023);
     s.tmp_7 = r0;
     s.tmp_9 = if_charWidth_1_mk(s);
-    s.tmp_9.arg0 = s.font___15525;
+    s.tmp_9.arg0 = s.font___45020;
     if (!s.tmp_9.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_9.arg0, "charWidth");
     } else {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["charWidth"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["charWidth"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 845; s.pc = 49; return s.tmp_9; }
+     else { s.callLocIdx = 802; s.pc = 49; return s.tmp_9; }
     }
   case 49:
     r0 = s.retval;
@@ -16367,44 +16445,44 @@ switch (step) {
     r0 = (s.tmp_1 + s.tmp_6);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 3);
-    s.lifeWidth___15531 = (r0);
-    s.tmp_0 = r0 = s.height___15529;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    s.lifeWidth___45026 = (r0);
+    s.tmp_0 = r0 = s.height___45024;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.height___15529 = (r0);
+    s.height___45024 = (r0);
   case 9:
   case 10:
-    s.tmp_0 = Math_max__P125_mk(s);
-    s.tmp_0.arg0 = s.scoreWidth___15530;
-    s.tmp_0.arg1 = s.lifeWidth___15531;
-    s.callLocIdx = 846; s.pc = 50; return s.tmp_0;
+    s.tmp_0 = Math_max__P29660_mk(s);
+    s.tmp_0.arg0 = s.scoreWidth___45025;
+    s.tmp_0.arg1 = s.lifeWidth___45026;
+    s.callLocIdx = 803; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    s.width___15611 = (r0);
-    s.tmp_0 = r0 = s.showScore___15535;
+    s.width___45106 = (r0);
+    s.tmp_0 = r0 = s.showScore___45030;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    r0 = s.showLife___15543;
+    r0 = s.showLife___45038;
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 13; continue; }
-    r0 = (s.height___15529 + 1);
-    s.height___15529 = (r0);
+    r0 = (s.height___45024 + 1);
+    s.height___45024 = (r0);
   case 13:
   case 14:
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = s.width___15611;
+    r0 = s.width___45106;
     { step = 16; continue; }
   case 15:
     r0 = 0;
@@ -16414,12 +16492,12 @@ switch (step) {
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - s.tmp_1);
-    s.x___15621 = (r0);
+    s.x___45116 = (r0);
     r0 = s.arg0.fields["up"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
-    r0 = s.height___15529;
+    r0 = s.height___45024;
     { step = 18; continue; }
   case 17:
     r0 = 0;
@@ -16429,139 +16507,139 @@ switch (step) {
     r0 = s.arg0.fields["y"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - s.tmp_1);
-    s.y___15628 = (r0);
-    s.tmp_0 = r0 = s.showScore___15535;
+    s.y___45123 = (r0);
+    s.tmp_0 = r0 = s.showScore___45030;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 19; continue; }
     r0 = s.tmp_0;
     { step = 20; continue; }
   case 19:
-    r0 = s.showLife___15543;
+    r0 = s.showLife___45038;
   case 20:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 21; continue; }
-    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
-    s.tmp_2.arg1 = s.x___15621;
-    s.tmp_2.arg2 = s.y___15628;
-    s.tmp_2.arg3 = s.width___15611;
-    s.tmp_2.arg4 = s.height___15529;
+    s.tmp_2 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
+    s.tmp_2.arg1 = s.x___45116;
+    s.tmp_2.arg2 = s.y___45123;
+    s.tmp_2.arg3 = s.width___45106;
+    s.tmp_2.arg4 = s.height___45024;
     r0 = s.arg0.fields["border"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 847; s.pc = 51; return s.tmp_2;
+    s.callLocIdx = 804; s.pc = 51; return s.tmp_2;
   case 51:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    r0 = (s.x___15621 + 1);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    r0 = (s.x___45116 + 1);
     s.tmp_0.arg1 = r0;
-    r0 = (s.y___15628 + 1);
+    r0 = (s.y___45123 + 1);
     s.tmp_0.arg2 = r0;
-    r0 = (s.width___15611 - 2);
+    r0 = (s.width___45106 - 2);
     s.tmp_0.arg3 = r0;
-    r0 = (s.height___15529 - 2);
+    r0 = (s.height___45024 - 2);
     s.tmp_0.arg4 = r0;
     r0 = s.arg0.fields["bg"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 848; s.pc = 52; return s.tmp_0;
+    s.callLocIdx = 805; s.pc = 52; return s.tmp_0;
   case 52:
     r0 = s.retval;
   case 21:
   case 22:
-    r0 = pxsim_numops_toBoolDecr(s.showScore___15535);
+    r0 = pxsim_numops_toBoolDecr(s.showScore___45030);
     if (!r0) { step = 25; continue; }
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 23; continue; }
-    r0 = (s.width___15611 - s.scoreWidth___15530);
+    r0 = (s.width___45106 - s.scoreWidth___45025);
     { step = 24; continue; }
   case 23:
     r0 = 0;
   case 24:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.bump___15661 = (s.tmp_1);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_0.arg1 = s.score___15527;
-    r0 = (s.x___15621 + 1);
+    s.bump___45156 = (s.tmp_1);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_0.arg1 = s.score___45022;
+    r0 = (s.x___45116 + 1);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.bump___15661);
+    r0 = (s.tmp_2 + s.bump___45156);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     s.tmp_0.arg2 = r0;
-    r0 = (s.y___15628 + 2);
+    r0 = (s.y___45123 + 2);
     s.tmp_0.arg3 = r0;
     r0 = s.arg0.fields["fc"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___15525;
+    s.tmp_0.arg5 = s.font___45020;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 849; s.pc = 53; return s.tmp_0;
+    s.callLocIdx = 806; s.pc = 53; return s.tmp_0;
   case 53:
     r0 = s.retval;
   case 25:
   case 26:
-    r0 = pxsim_numops_toBoolDecr(s.showLife___15543);
+    r0 = pxsim_numops_toBoolDecr(s.showLife___45038);
     if (!r0) { step = 29; continue; }
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 27; continue; }
-    r0 = (s.width___15611 - s.lifeWidth___15531);
+    r0 = (s.width___45106 - s.lifeWidth___45026);
     { step = 28; continue; }
   case 27:
     r0 = 0;
   case 28:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.x___15621 + 1);
+    r0 = (s.x___45116 + 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + s.tmp_1);
-    s.xLoc___15686 = (r0);
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    s.xLoc___45181 = (r0);
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_0);
-    s.mult___15697 = (r0);
+    s.mult___45192 = (r0);
     r0 = s.arg0.fields["fc"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.replace(s.mult___15697, 1, s.tmp_0);
-    s.tmp_0 = r0 = globals.screen___1802;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    r0 = pxsim_ImageMethods.replace(s.mult___45192, 1, s.tmp_0);
+    s.tmp_0 = r0 = globals.screen___31220;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_1 = r0;
-    s.tmp_2 = r0 = s.xLoc___15686;
-    r0 = (s.y___15628 + s.offsetY___15534);
+    s.tmp_2 = r0 = s.xLoc___45181;
+    r0 = (s.y___45123 + s.offsetY___45029);
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_0, s.tmp_1, s.tmp_2, s.tmp_3);
-    s.tmp_0 = r0 = globals.screen___1802;
-    s.tmp_1 = r0 = s.mult___15697;
-    s.tmp_3 = r0 = s.xLoc___15686;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    s.tmp_0 = r0 = globals.screen___31220;
+    s.tmp_1 = r0 = s.mult___45192;
+    s.tmp_3 = r0 = s.xLoc___45181;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
-    r0 = (s.y___15628 + s.offsetY___15534);
+    r0 = (s.y___45123 + s.offsetY___45029);
     s.tmp_9 = r0;
     s.tmp_11 = if_charHeight_1_mk(s);
-    s.tmp_11.arg0 = s.font___15525;
+    s.tmp_11.arg0 = s.font___45020;
     if (!s.tmp_11.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_11.arg0, "charHeight");
     } else {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["charHeight"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["charHeight"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 850; s.pc = 54; return s.tmp_11; }
+     else { s.callLocIdx = 807; s.pc = 54; return s.tmp_11; }
     }
   case 54:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = (s.tmp_9 + s.tmp_10);
     s.tmp_8 = r0;
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_13 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_13);
     s.tmp_12 = r0;
@@ -16570,17 +16648,17 @@ switch (step) {
     r0 = (s.tmp_7 - 1);
     s.tmp_6 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_0, s.tmp_1, s.tmp_2, s.tmp_6);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_0.arg1 = s.life___15528;
-    s.tmp_3 = r0 = s.xLoc___15686;
-    r0 = globals.infoState___4230.fields["heartImage"];
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_0.arg1 = s.life___45023;
+    s.tmp_3 = r0 = s.xLoc___45181;
+    r0 = globals.infoState___33723.fields["heartImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
-    r0 = globals.infoState___4230.fields["multiplierImage"];
+    r0 = globals.infoState___33723.fields["multiplierImage"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_7);
     s.tmp_6 = r0;
@@ -16588,13 +16666,13 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     s.tmp_0.arg2 = r0;
-    r0 = (s.y___15628 + s.offsetY___15534);
+    r0 = (s.y___45123 + s.offsetY___45029);
     s.tmp_0.arg3 = r0;
     r0 = s.arg0.fields["fc"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___15525;
+    s.tmp_0.arg5 = s.font___45020;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 851; s.pc = 55; return s.tmp_0;
+    s.callLocIdx = 808; s.pc = 55; return s.tmp_0;
   case 55:
     r0 = s.retval;
   case 29:
@@ -16617,18 +16695,18 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_2);
-    s.pNum___15759 = (r0);
-    r0 = pxsim_String_.length(s.pNum___15759);
+    s.pNum___45254 = (r0);
+    r0 = pxsim_String_.length(s.pNum___45254);
     s.tmp_1 = r0;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___15525;
+    s.tmp_3.arg0 = s.font___45020;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 852; s.pc = 57; return s.tmp_3; }
+     else { s.callLocIdx = 809; s.pc = 57; return s.tmp_3; }
     }
   case 57:
     r0 = s.retval;
@@ -16636,46 +16714,46 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.iconWidth___15766 = (r0);
-    s.tmp_0 = Math_max__P125_mk(s);
-    s.tmp_0.arg0 = s.height___15529;
+    s.iconWidth___45261 = (r0);
+    s.tmp_0 = Math_max__P29660_mk(s);
+    s.tmp_0.arg0 = s.height___45024;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___15525;
+    s.tmp_2.arg0 = s.font___45020;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charHeight");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charHeight"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charHeight"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 853; s.pc = 59; return s.tmp_2; }
+     else { s.callLocIdx = 810; s.pc = 59; return s.tmp_2; }
     }
   case 59:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 854; s.pc = 58; return s.tmp_0;
+    s.callLocIdx = 811; s.pc = 58; return s.tmp_0;
   case 58:
     r0 = s.retval;
-    s.iconHeight___15774 = (r0);
+    s.iconHeight___45269 = (r0);
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 31; continue; }
-    r0 = (s.x___15621 - s.iconWidth___15766);
+    r0 = (s.x___45116 - s.iconWidth___45261);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     { step = 32; continue; }
   case 31:
-    r0 = (s.x___15621 + s.width___15611);
+    r0 = (s.x___45116 + s.width___45106);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
   case 32:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.iconX___15782 = (s.tmp_3);
-    s.iconY___15794 = (s.y___15628);
-    r0 = pxsim_numops_toBoolDecr(s.showScore___15535);
+    s.iconX___45277 = (s.tmp_3);
+    s.iconY___45289 = (s.y___45123);
+    r0 = pxsim_numops_toBoolDecr(s.showScore___45030);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -16684,7 +16762,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 34; continue; }
   case 33:
-    r0 = pxsim_numops_toBoolDecr(s.showLife___15543);
+    r0 = pxsim_numops_toBoolDecr(s.showLife___45038);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
   case 34:
@@ -16703,48 +16781,48 @@ switch (step) {
   case 36:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    r0 = (s.iconX___15782 + s.tmp_5);
-    s.iconX___15782 = (r0);
+    r0 = (s.iconX___45277 + s.tmp_5);
+    s.iconX___45277 = (r0);
     r0 = s.arg0.fields["up"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 37; continue; }
-    r0 = (s.iconY___15794 - 3);
-    s.iconY___15794 = (r0);
+    r0 = (s.iconY___45289 - 3);
+    s.iconY___45289 = (r0);
   case 37:
   case 38:
   case 39:
   case 40:
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_0.arg1 = s.iconX___15782;
-    s.tmp_0.arg2 = s.iconY___15794;
-    s.tmp_0.arg3 = s.iconWidth___15766;
-    s.tmp_0.arg4 = s.iconHeight___15774;
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_0.arg1 = s.iconX___45277;
+    s.tmp_0.arg2 = s.iconY___45289;
+    s.tmp_0.arg3 = s.iconWidth___45261;
+    s.tmp_0.arg4 = s.iconHeight___45269;
     r0 = s.arg0.fields["border"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 855; s.pc = 60; return s.tmp_0;
+    s.callLocIdx = 812; s.pc = 60; return s.tmp_0;
   case 60:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_0.arg1 = s.pNum___15759;
-    r0 = (s.iconX___15782 + 1);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_0.arg1 = s.pNum___45254;
+    r0 = (s.iconX___45277 + 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_2 = r0 = s.iconY___15794;
-    r0 = (s.iconHeight___15774 >> 1);
+    s.tmp_2 = r0 = s.iconY___45289;
+    r0 = (s.iconHeight___45269 >> 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     s.tmp_6 = if_charHeight_1_mk(s);
-    s.tmp_6.arg0 = s.font___15525;
+    s.tmp_6.arg0 = s.font___45020;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "charHeight");
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["charHeight"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["charHeight"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 856; s.pc = 62; return s.tmp_6; }
+     else { s.callLocIdx = 813; s.pc = 62; return s.tmp_6; }
     }
   case 62:
     r0 = s.retval;
@@ -16755,9 +16833,9 @@ switch (step) {
     s.tmp_0.arg3 = r0;
     r0 = s.arg0.fields["bg"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___15525;
+    s.tmp_0.arg5 = s.font___45020;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 857; s.pc = 61; return s.tmp_0;
+    s.callLocIdx = 814; s.pc = 61; return s.tmp_0;
   case 61:
     r0 = s.retval;
   case 41:
@@ -16766,12 +16844,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_drawPlayer__P2251.info = {"start":21253,"length":3635,"line":702,"column":8,"endLine":805,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawPlayer","argumentNames":["this"]}
+info_PlayerInfo_drawPlayer__P31670.info = {"start":21253,"length":3635,"line":702,"column":8,"endLine":805,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"drawPlayer","argumentNames":["this"]}
 
-function info_PlayerInfo_drawPlayer__P2251_mk(s) {
+function info_PlayerInfo_drawPlayer__P31670_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_drawPlayer__P2251, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_drawPlayer__P31670, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16787,27 +16865,27 @@ function info_PlayerInfo_drawPlayer__P2251_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  state___15522: undefined,
-  font___15525: undefined,
-  score___15527: undefined,
-  life___15528: undefined,
-  height___15529: undefined,
-  scoreWidth___15530: undefined,
-  lifeWidth___15531: undefined,
-  offsetY___15534: undefined,
-  showScore___15535: undefined,
-  showLife___15543: undefined,
-  width___15611: undefined,
-  x___15621: undefined,
-  y___15628: undefined,
-  bump___15661: undefined,
-  xLoc___15686: undefined,
-  mult___15697: undefined,
-  pNum___15759: undefined,
-  iconWidth___15766: undefined,
-  iconHeight___15774: undefined,
-  iconX___15782: undefined,
-  iconY___15794: undefined,
+  state___45017: undefined,
+  font___45020: undefined,
+  score___45022: undefined,
+  life___45023: undefined,
+  height___45024: undefined,
+  scoreWidth___45025: undefined,
+  lifeWidth___45026: undefined,
+  offsetY___45029: undefined,
+  showScore___45030: undefined,
+  showLife___45038: undefined,
+  width___45106: undefined,
+  x___45116: undefined,
+  y___45123: undefined,
+  bump___45156: undefined,
+  xLoc___45181: undefined,
+  mult___45192: undefined,
+  pNum___45254: undefined,
+  iconWidth___45261: undefined,
+  iconHeight___45269: undefined,
+  iconX___45277: undefined,
+  iconY___45289: undefined,
   arg0: undefined,
 } }
 
@@ -16815,7 +16893,7 @@ function info_PlayerInfo_drawPlayer__P2251_mk(s) {
 
 
 
-function info_PlayerInfo_raiseLifeZero__P2250(s) {
+function info_PlayerInfo_raiseLifeZero__P31669(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16825,21 +16903,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___15500 = undefined;
+    s.state___44995 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 838; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 795; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.state___15500 = (r0);
-    r0 = s.state___15500.fields["life"];
+    s.state___44995 = (r0);
+    r0 = s.state___44995.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== null);
     s.tmp_0 = r0;
@@ -16848,7 +16926,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.state___15500.fields["life"];
+    r0 = s.state___44995.fields["life"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 <= 0);
   case 2:
@@ -16856,21 +16934,21 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
-    r0 = (s.state___15500).fields["life"] = (null);
-    r0 = s.state___15500.fields["lifeZeroHandler"];
+    r0 = (s.state___44995).fields["life"] = (null);
+    r0 = s.state___44995.fields["lifeZeroHandler"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     s.tmp_1 = if_lifeZeroHandler_1_mk(s);
-    s.tmp_1.arg0 = s.state___15500;
+    s.tmp_1.arg0 = s.state___44995;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "lifeZeroHandler"), 1);
-      s.callLocIdx = 839; s.pc = 10; return s.tmp_1;
+      s.callLocIdx = 796; s.pc = 10; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["lifeZeroHandler"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["lifeZeroHandler"], 1); s.callLocIdx = 839; s.pc = 10; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 839; s.pc = 10; return s.tmp_1;; }
-     else { s.callLocIdx = 839; s.pc = 10; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["lifeZeroHandler"], 1); s.callLocIdx = 796; s.pc = 10; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 796; s.pc = 10; return s.tmp_1;; }
+     else { s.callLocIdx = 796; s.pc = 10; return s.tmp_1; }
     }
   case 10:
     r0 = s.retval;
@@ -16878,10 +16956,10 @@ switch (step) {
   case 3:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 4; continue; }
-    s.tmp_0 = game_over__P2542_mk(s);
+    s.tmp_0 = game_over__P31961_mk(s);
     s.tmp_0.arg0 = false;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 840; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 797; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
   case 4:
@@ -16893,18 +16971,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_raiseLifeZero__P2250.info = {"start":20869,"length":374,"line":690,"column":8,"endLine":700,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"raiseLifeZero","argumentNames":["this","gameOver"]}
+info_PlayerInfo_raiseLifeZero__P31669.info = {"start":20869,"length":374,"line":690,"column":8,"endLine":700,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"raiseLifeZero","argumentNames":["this","gameOver"]}
 
-function info_PlayerInfo_raiseLifeZero__P2250_mk(s) {
+function info_PlayerInfo_raiseLifeZero__P31669_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_raiseLifeZero__P2250, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_raiseLifeZero__P31669, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  state___15500: undefined,
+  state___44995: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -16913,7 +16991,7 @@ function info_PlayerInfo_raiseLifeZero__P2250_mk(s) {
 
 
 
-function info_PlayerInfo_hasLife__P2248(s) {
+function info_PlayerInfo_hasLife__P31667(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16923,20 +17001,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___15411 = undefined;
+    s.state___44906 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 837; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 794; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.state___15411 = (r0);
-    r0 = s.state___15411.fields["life"];
+    s.state___44906 = (r0);
+    r0 = s.state___44906.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
     s.tmp_0 = r0;
@@ -16945,7 +17023,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.state___15411.fields["life"];
+    r0 = s.state___44906.fields["life"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 !== null);
   case 2:
@@ -16955,18 +17033,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_hasLife__P2248.info = {"start":20346,"length":141,"line":673,"column":8,"endLine":676,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"hasLife","argumentNames":["this"]}
+info_PlayerInfo_hasLife__P31667.info = {"start":20346,"length":141,"line":673,"column":8,"endLine":676,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"hasLife","argumentNames":["this"]}
 
-function info_PlayerInfo_hasLife__P2248_mk(s) {
+function info_PlayerInfo_hasLife__P31667_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_hasLife__P2248, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_hasLife__P31667, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  state___15411: undefined,
+  state___44906: undefined,
   arg0: undefined,
 } }
 
@@ -16974,7 +17052,7 @@ function info_PlayerInfo_hasLife__P2248_mk(s) {
 
 
 
-function info_PlayerInfo_hasScore__P2244(s) {
+function info_PlayerInfo_hasScore__P31663(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16984,34 +17062,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___15491 = undefined;
+    s.state___44986 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 836; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 793; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___15491 = (r0);
-    r0 = s.state___15491.fields["score"];
+    s.state___44986 = (r0);
+    r0 = s.state___44986.fields["score"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 !== undefined);
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_hasScore__P2244.info = {"start":18619,"length":111,"line":616,"column":8,"endLine":619,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"hasScore","argumentNames":["this"]}
+info_PlayerInfo_hasScore__P31663.info = {"start":18619,"length":111,"line":616,"column":8,"endLine":619,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"hasScore","argumentNames":["this"]}
 
-function info_PlayerInfo_hasScore__P2244_mk(s) {
+function info_PlayerInfo_hasScore__P31663_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_hasScore__P2244, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_hasScore__P31663, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___15491: undefined,
+  state___44986: undefined,
   arg0: undefined,
 } }
 
@@ -17019,7 +17097,7 @@ function info_PlayerInfo_hasScore__P2244_mk(s) {
 
 
 
-function info_PlayerInfo_score__P2241(s) {
+function info_PlayerInfo_score__P31660(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17029,13 +17107,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___14941 = undefined;
+    s.state___44436 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
     r0 = s.arg0.fields["showScore"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === undefined);
@@ -17054,35 +17132,35 @@ switch (step) {
     r0 = (s.arg0).fields["showPlayer"] = (true);
   case 3:
   case 4:
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 830; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 787; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.state___14941 = (r0);
-    r0 = s.state___14941.fields["score"];
+    s.state___44436 = (r0);
+    r0 = s.state___44436.fields["score"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == null);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = (s.state___14941).fields["score"] = (0);
+    r0 = (s.state___44436).fields["score"] = (0);
   case 5:
   case 6:
-    r0 = s.state___14941.fields["score"];
+    r0 = s.state___44436.fields["score"];
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_score__P2241.info = {"start":17492,"length":314,"line":578,"column":8,"endLine":587,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"score","argumentNames":["this"]}
+info_PlayerInfo_score__P31660.info = {"start":17492,"length":314,"line":578,"column":8,"endLine":587,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"score","argumentNames":["this"]}
 
-function info_PlayerInfo_score__P2241_mk(s) {
+function info_PlayerInfo_score__P31660_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_score__P2241, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_score__P31660, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  state___14941: undefined,
+  state___44436: undefined,
   arg0: undefined,
 } }
 
@@ -17090,7 +17168,7 @@ function info_PlayerInfo_score__P2241_mk(s) {
 
 
 
-function info_PlayerInfo_getState__P2239(s) {
+function info_PlayerInfo_getState__P31658(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17105,13 +17183,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_init__P4282_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_init__P33775_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 829; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 786; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals.infoState___4230.fields["playerStates"];
+    r0 = globals.infoState___33723.fields["playerStates"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["_player"];
     s.tmp_2 = r0;
@@ -17121,12 +17199,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_getState__P2239.info = {"start":17088,"length":121,"line":562,"column":8,"endLine":565,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"getState","argumentNames":["this"]}
+info_PlayerInfo_getState__P31658.info = {"start":17088,"length":121,"line":562,"column":8,"endLine":565,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"getState","argumentNames":["this"]}
 
-function info_PlayerInfo_getState__P2239_mk(s) {
+function info_PlayerInfo_getState__P31658_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_getState__P2239, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_getState__P31658, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17138,7 +17216,7 @@ function info_PlayerInfo_getState__P2239_mk(s) {
 
 
 
-function info_PlayerInfo_init__P4282(s) {
+function info_PlayerInfo_init__P33775(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17153,9 +17231,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_initHUD__P4276_mk(s);
-    s.callLocIdx = 826; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_initHUD__P33769_mk(s);
+    s.callLocIdx = 783; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = s.arg0.fields["_player"];
@@ -17164,13 +17242,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = info_initMultiHUD__P4277_mk(s);
-    s.callLocIdx = 827; s.pc = 6; return s.tmp_2;
+    s.tmp_2 = info_initMultiHUD__P33770_mk(s);
+    s.callLocIdx = 784; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = globals.infoState___4230.fields["playerStates"];
+    r0 = globals.infoState___33723.fields["playerStates"];
     s.tmp_3 = r0;
     r0 = s.arg0.fields["_player"];
     s.tmp_5 = r0;
@@ -17184,10 +17262,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerState__C2197_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerState__C31616_VT);
     s.tmp_6 = r0;
     r0 = undefined;
-    r0 = globals.infoState___4230.fields["playerStates"];
+    r0 = globals.infoState___33723.fields["playerStates"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["_player"];
     s.tmp_9 = r0;
@@ -17200,12 +17278,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_init__P4282.info = {"start":16826,"length":252,"line":554,"column":8,"endLine":560,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"init","argumentNames":["this"]}
+info_PlayerInfo_init__P33775.info = {"start":16826,"length":252,"line":554,"column":8,"endLine":560,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"init","argumentNames":["this"]}
 
-function info_PlayerInfo_init__P4282_mk(s) {
+function info_PlayerInfo_init__P33775_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_init__P4282, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_init__P33775, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17224,7 +17302,7 @@ function info_PlayerInfo_init__P4282_mk(s) {
 
 
 
-function info_initMultiHUD__P4277(s) {
+function info_initMultiHUD__P33770(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17234,7 +17312,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.infoState___4230.fields["visibilityFlag"];
+    r0 = globals.infoState___33723.fields["visibilityFlag"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 16);
     s.tmp_0 = r0;
@@ -17243,13 +17321,13 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_2 = r0 = globals.infoState___4230;
+    s.tmp_2 = r0 = globals.infoState___33723;
     r0 = s.tmp_2.fields["visibilityFlag"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 | 16);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["visibilityFlag"] = (s.tmp_3);
-    r0 = globals.infoState___4230.fields["visibilityFlag"];
+    r0 = globals.infoState___33723.fields["visibilityFlag"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 32);
     s.tmp_2 = r0;
@@ -17259,17 +17337,17 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = r0 = globals.infoState___4230;
-    s.tmp_6 = info_defaultMultiplayerHeartImage__P4279_mk(s);
-    s.callLocIdx = 796; s.pc = 6; return s.tmp_6;
+    s.tmp_4 = r0 = globals.infoState___33723;
+    s.tmp_6 = info_defaultMultiplayerHeartImage__P33772_mk(s);
+    s.callLocIdx = 753; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = (s.tmp_4).fields["heartImage"] = (s.tmp_5);
   case 3:
   case 4:
-    s.tmp_0 = r0 = globals.infoState___4230;
-    r0 = pxsim.image.ofBuffer(_hex15954);
+    s.tmp_0 = r0 = globals.infoState___33723;
+    r0 = pxsim.image.ofBuffer(_hex45449);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["multiplierImage"] = (s.tmp_1);
   case 5:
@@ -17277,12 +17355,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_initMultiHUD__P4277.info = {"start":4681,"length":393,"line":149,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"initMultiHUD","argumentNames":[]}
+info_initMultiHUD__P33770.info = {"start":4681,"length":393,"line":149,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"initMultiHUD","argumentNames":[]}
 
-function info_initMultiHUD__P4277_mk(s) {
+function info_initMultiHUD__P33770_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_initMultiHUD__P4277, depth: s.depth + 1,
+        parent: s, fn: info_initMultiHUD__P33770, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17293,12 +17371,12 @@ function info_initMultiHUD__P4277_mk(s) {
   tmp_6: undefined,
 } }
 
-const _hex15954 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100001000000001010000")
+const _hex45449 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100001000000001010000")
 
 
 
 
-function info_defaultMultiplayerHeartImage__P4279(s) {
+function info_defaultMultiplayerHeartImage__P33772(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17308,14 +17386,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex15958);
+    r0 = pxsim.image.ofBuffer(_hex45453);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex15960);
+    r0 = pxsim.image.ofBuffer(_hex45455);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -17323,24 +17401,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_defaultMultiplayerHeartImage__P4279.info = {"start":5678,"length":503,"line":185,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"defaultMultiplayerHeartImage","argumentNames":[]}
+info_defaultMultiplayerHeartImage__P33772.info = {"start":5678,"length":503,"line":185,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"defaultMultiplayerHeartImage","argumentNames":[]}
 
-function info_defaultMultiplayerHeartImage__P4279_mk(s) {
+function info_defaultMultiplayerHeartImage__P33772_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_defaultMultiplayerHeartImage__P4279, depth: s.depth + 1,
+        parent: s, fn: info_defaultMultiplayerHeartImage__P33772, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex15958 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100000110000010000100011000001001000000000000")
-const _hex15960 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100002112000010240100411200001001000000000000")
+const _hex45453 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100000110000010000100011000001001000000000000")
+const _hex45455 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100002112000010240100411200001001000000000000")
 
 
 
 
-function info_PlayerState_constructor__P2201(s) {
+function info_PlayerState_constructor__P31620(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17355,17 +17433,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerState__C2197_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_PlayerState__C31616_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerState_constructor__P2201.info = {"start":608,"length":17,"line":27,"column":8,"endLine":27,"endColumn":25,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this"]}
+info_PlayerState_constructor__P31620.info = {"start":608,"length":17,"line":27,"column":8,"endLine":27,"endColumn":25,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["this"]}
 
-function info_PlayerState_constructor__P2201_mk(s) {
+function info_PlayerState_constructor__P31620_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerState_constructor__P2201, depth: s.depth + 1,
+        parent: s, fn: info_PlayerState_constructor__P31620, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -17374,7 +17452,7 @@ function info_PlayerState_constructor__P2201_mk(s) {
 
 
 
-function tiles_setTileAt__P2342(s) {
+function tiles_setTileAt__P31761(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17384,19 +17462,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___21331 = undefined;
-    s.scale___21344 = undefined;
-    s.index___21348 = undefined;
+    s.scene___50827 = undefined;
+    s.scale___50840 = undefined;
+    s.index___50844 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 977; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 934; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.scene___21331 = (r0);
+    s.scene___50827 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -17417,7 +17495,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 4; continue; }
   case 3:
-    r0 = s.scene___21331.fields["tileMap"];
+    r0 = s.scene___50827.fields["tileMap"];
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     s.tmp_4 = r0;
@@ -17431,39 +17509,39 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    r0 = s.scene___21331.fields["tileMap"];
+    r0 = s.scene___50827.fields["tileMap"];
     s.tmp_7 = r0;
     r0 = s.tmp_7.fields["_scale"];
-    s.scale___21344 = (r0);
-    s.tmp_0 = tiles_TileMap_getImageType__P2332_mk(s);
-    r0 = s.scene___21331.fields["tileMap"];
+    s.scale___50840 = (r0);
+    s.tmp_0 = tiles_TileMap_getImageType__P31751_mk(s);
+    r0 = s.scene___50827.fields["tileMap"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 979; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 936; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.index___21348 = (r0);
-    s.tmp_0 = tiles_TileMap_setTileAt__P2331_mk(s);
-    r0 = s.scene___21331.fields["tileMap"];
+    s.index___50844 = (r0);
+    s.tmp_0 = tiles_TileMap_setTileAt__P31750_mk(s);
+    r0 = s.scene___50827.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_2 = tiles_Location_x__P2293_mk(s);
+    s.tmp_2 = tiles_Location_x__P31712_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 980; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 937; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 >> s.scale___21344);
+    r0 = (s.tmp_1 >> s.scale___50840);
     s.tmp_0.arg1 = r0;
-    s.tmp_4 = tiles_Location_y__P2294_mk(s);
+    s.tmp_4 = tiles_Location_y__P31713_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 981; s.pc = 12; return s.tmp_4;
+    s.callLocIdx = 938; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> s.scale___21344);
+    r0 = (s.tmp_3 >> s.scale___50840);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.index___21348;
-    s.callLocIdx = 982; s.pc = 10; return s.tmp_0;
+    s.tmp_0.arg3 = s.index___50844;
+    s.callLocIdx = 939; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 7:
@@ -17471,12 +17549,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_setTileAt__P2342.info = {"start":15058,"length":339,"line":482,"column":4,"endLine":488,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTileAt","argumentNames":["loc","tile"]}
+tiles_setTileAt__P31761.info = {"start":15058,"length":339,"line":482,"column":4,"endLine":488,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setTileAt","argumentNames":["loc","tile"]}
 
-function tiles_setTileAt__P2342_mk(s) {
+function tiles_setTileAt__P31761_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_setTileAt__P2342, depth: s.depth + 1,
+        parent: s, fn: tiles_setTileAt__P31761, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17486,9 +17564,9 @@ function tiles_setTileAt__P2342_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  scene___21331: undefined,
-  scale___21344: undefined,
-  index___21348: undefined,
+  scene___50827: undefined,
+  scale___50840: undefined,
+  index___50844: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -17497,7 +17575,7 @@ function tiles_setTileAt__P2342_mk(s) {
 
 
 
-function tiles_TileMap_getImageType__P2332(s) {
+function tiles_TileMap_getImageType__P31751(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17507,49 +17585,49 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tileset___21057 = undefined;
-    s.i___21062 = undefined;
-    s.newIndex___21076 = undefined;
+    s.tileset___50553 = undefined;
+    s.i___50558 = undefined;
+    s.newIndex___50572 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["tileset"];
-    s.tileset___21057 = (r0);
-    s.i___21062 = (0);
+    s.tileset___50553 = (r0);
+    s.i___50558 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___21062;
-    r0 = pxsim_Array__length(s.tileset___21057);
+    s.tmp_1 = r0 = s.i___50558;
+    r0 = pxsim_Array__length(s.tileset___50553);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.tileset___21057, s.i___21062);
+    r0 = pxsim_Array__getAt(s.tileset___50553, s.i___50558);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.equals(s.tmp_4, s.arg1);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 2; continue; }
-    r0 = s.i___21062;
+    r0 = s.i___50558;
     { step = 7; continue; }
   case 2:
   case 3:
-    r0 = (s.i___21062 + 1);
-    s.i___21062 = (r0);
+    r0 = (s.i___50558 + 1);
+    s.i___50558 = (r0);
     { step = 1; continue; }
   case 4:
-    r0 = pxsim_Array__length(s.tileset___21057);
-    s.newIndex___21076 = (r0);
-    s.tmp_3 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
+    r0 = pxsim_Array__length(s.tileset___50553);
+    s.newIndex___50572 = (r0);
+    s.tmp_3 = tiles_TileMap_isInvalidIndex__P33786_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.tmp_3.arg1 = s.newIndex___21076;
-    s.callLocIdx = 914; s.pc = 8; return s.tmp_3;
+    s.tmp_3.arg1 = s.newIndex___50572;
+    s.callLocIdx = 871; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -17559,8 +17637,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array__push(s.tileset___21057, s.arg1);
-    r0 = s.newIndex___21076;
+    r0 = pxsim_Array__push(s.tileset___50553, s.arg1);
+    r0 = s.newIndex___50572;
     { step = 7; continue; }
   case 5:
   case 6:
@@ -17569,21 +17647,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getImageType__P2332.info = {"start":7714,"length":482,"line":282,"column":8,"endLine":295,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getImageType","argumentNames":["this","im"]}
+tiles_TileMap_getImageType__P31751.info = {"start":7714,"length":482,"line":282,"column":8,"endLine":295,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getImageType","argumentNames":["this","im"]}
 
-function tiles_TileMap_getImageType__P2332_mk(s) {
+function tiles_TileMap_getImageType__P31751_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getImageType__P2332, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getImageType__P31751, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  tileset___21057: undefined,
-  i___21062: undefined,
-  newIndex___21076: undefined,
+  tileset___50553: undefined,
+  i___50558: undefined,
+  newIndex___50572: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -17592,7 +17670,7 @@ function tiles_TileMap_getImageType__P2332_mk(s) {
 
 
 
-function tiles_TileMap_isInvalidIndex__P4293(s) {
+function tiles_TileMap_isInvalidIndex__P33786(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17608,7 +17686,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = (s.arg1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -17624,12 +17702,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isInvalidIndex__P4293.info = {"start":10071,"length":106,"line":343,"column":8,"endLine":345,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isInvalidIndex","argumentNames":["this","index"]}
+tiles_TileMap_isInvalidIndex__P33786.info = {"start":10071,"length":106,"line":343,"column":8,"endLine":345,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"isInvalidIndex","argumentNames":["this","index"]}
 
-function tiles_TileMap_isInvalidIndex__P4293_mk(s) {
+function tiles_TileMap_isInvalidIndex__P33786_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isInvalidIndex__P4293, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isInvalidIndex__P33786, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17641,7 +17719,7 @@ function tiles_TileMap_isInvalidIndex__P4293_mk(s) {
 
 
 
-function tiles_TileMapData_getTileset__P2312(s) {
+function tiles_TileMapData_getTileset__P31731(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17656,17 +17734,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = s.arg0.fields["tileset"];
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTileset__P2312.info = {"start":4532,"length":57,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileset","argumentNames":["this"]}
+tiles_TileMapData_getTileset__P31731.info = {"start":4532,"length":57,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTileset","argumentNames":["this"]}
 
-function tiles_TileMapData_getTileset__P2312_mk(s) {
+function tiles_TileMapData_getTileset__P31731_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTileset__P2312, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_getTileset__P31731, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -17675,7 +17753,7 @@ function tiles_TileMapData_getTileset__P2312_mk(s) {
 
 
 
-function tiles_TileMap_setTileAt__P2331(s) {
+function tiles_TileMap_setTileAt__P31750(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17693,13 +17771,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_3 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_3 = tiles_TileMapData_isOutsideMap__P31735_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.arg1;
     s.tmp_3.arg2 = s.arg2;
-    s.callLocIdx = 910; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 867; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -17712,10 +17790,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_6 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
+    s.tmp_6 = tiles_TileMap_isInvalidIndex__P33786_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.tmp_6.arg1 = s.arg3;
-    s.callLocIdx = 911; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 868; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -17727,13 +17805,13 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 3; continue; }
-    s.tmp_8 = tiles_TileMapData_setTile__P2311_mk(s);
+    s.tmp_8 = tiles_TileMapData_setTile__P31730_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_8.arg0 = r0;
     s.tmp_8.arg1 = s.arg1;
     s.tmp_8.arg2 = s.arg2;
     s.tmp_8.arg3 = s.arg3;
-    s.callLocIdx = 912; s.pc = 7; return s.tmp_8;
+    s.callLocIdx = 869; s.pc = 7; return s.tmp_8;
   case 7:
     r0 = s.retval;
   case 3:
@@ -17742,12 +17820,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_setTileAt__P2331.info = {"start":7495,"length":209,"line":277,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTileAt","argumentNames":["this","col","row","index"]}
+tiles_TileMap_setTileAt__P31750.info = {"start":7495,"length":209,"line":277,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setTileAt","argumentNames":["this","col","row","index"]}
 
-function tiles_TileMap_setTileAt__P2331_mk(s) {
+function tiles_TileMap_setTileAt__P31750_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_setTileAt__P2331, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_setTileAt__P31750, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17768,7 +17846,7 @@ function tiles_TileMap_setTileAt__P2331_mk(s) {
 
 
 
-function tiles_TileMapData_setTile__P2311(s) {
+function tiles_TileMapData_setTile__P31730(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17786,12 +17864,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P31735_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 888; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 845; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -17834,12 +17912,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_setTile__P2311.info = {"start":4207,"length":315,"line":158,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTile","argumentNames":["this","col","row","tile"]}
+tiles_TileMapData_setTile__P31730.info = {"start":4207,"length":315,"line":158,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setTile","argumentNames":["this","col","row","tile"]}
 
-function tiles_TileMapData_setTile__P2311_mk(s) {
+function tiles_TileMapData_setTile__P31730_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_setTile__P2311, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_setTile__P31730, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17858,7 +17936,7 @@ function tiles_TileMapData_setTile__P2311_mk(s) {
 
 
 
-function tiles_getTilesByType__P2350(s) {
+function tiles_getTilesByType__P31769(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17868,17 +17946,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___20980 = undefined;
-    s.index___20990 = undefined;
+    s.scene___50476 = undefined;
+    s.index___50486 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 996; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 953; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___20980 = (r0);
+    s.scene___50476 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -17888,7 +17966,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___20980.fields["tileMap"];
+    r0 = s.scene___50476.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -17902,31 +17980,31 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = tiles_TileMap_getImageType__P2332_mk(s);
-    r0 = s.scene___20980.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getImageType__P31751_mk(s);
+    r0 = s.scene___50476.fields["tileMap"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg0;
-    s.callLocIdx = 997; s.pc = 7; return s.tmp_5;
+    s.callLocIdx = 954; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
-    s.index___20990 = (r0);
-    s.tmp_0 = tiles_TileMap_getTilesByType__P2334_mk(s);
-    r0 = s.scene___20980.fields["tileMap"];
+    s.index___50486 = (r0);
+    s.tmp_0 = tiles_TileMap_getTilesByType__P31753_mk(s);
+    r0 = s.scene___50476.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___20990;
-    s.callLocIdx = 998; s.pc = 8; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___50486;
+    s.callLocIdx = 955; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getTilesByType__P2350.info = {"start":19427,"length":262,"line":597,"column":4,"endLine":602,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTilesByType","argumentNames":["tile"]}
+tiles_getTilesByType__P31769.info = {"start":19427,"length":262,"line":597,"column":4,"endLine":602,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTilesByType","argumentNames":["tile"]}
 
-function tiles_getTilesByType__P2350_mk(s) {
+function tiles_getTilesByType__P31769_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getTilesByType__P2350, depth: s.depth + 1,
+        parent: s, fn: tiles_getTilesByType__P31769, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17934,8 +18012,8 @@ function tiles_getTilesByType__P2350_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___20980: undefined,
-  index___20990: undefined,
+  scene___50476: undefined,
+  index___50486: undefined,
   arg0: undefined,
 } }
 
@@ -17943,7 +18021,7 @@ function tiles_getTilesByType__P2350_mk(s) {
 
 
 
-function tiles_TileMap_getTilesByType__P2334(s) {
+function tiles_TileMap_getTilesByType__P31753(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17953,21 +18031,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.output___21009 = undefined;
-    s.col___21011 = undefined;
-    s.row___21018 = undefined;
-    s.currTile___21025 = undefined;
+    s.output___50505 = undefined;
+    s.col___50507 = undefined;
+    s.row___50514 = undefined;
+    s.currTile___50521 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMap_isInvalidIndex__P33786_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 917; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 874; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -17999,10 +18077,10 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_Array__mk();
-    s.output___21009 = (r0);
-    s.col___21011 = (0);
+    s.output___50505 = (r0);
+    s.col___50507 = (0);
   case 5:
-    s.tmp_1 = r0 = s.col___21011;
+    s.tmp_1 = r0 = s.col___50507;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_width"];
@@ -18011,9 +18089,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.row___21018 = (0);
+    s.row___50514 = (0);
   case 6:
-    s.tmp_1 = r0 = s.row___21018;
+    s.tmp_1 = r0 = s.row___50514;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_height"];
@@ -18022,51 +18100,51 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_4 = tiles_TileMapData_getTile__P2310_mk(s);
+    s.tmp_4 = tiles_TileMapData_getTile__P31729_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.col___21011;
-    s.tmp_4.arg2 = s.row___21018;
-    s.callLocIdx = 921; s.pc = 13; return s.tmp_4;
+    s.tmp_4.arg1 = s.col___50507;
+    s.tmp_4.arg2 = s.row___50514;
+    s.callLocIdx = 878; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
-    s.currTile___21025 = (r0);
-    r0 = (s.currTile___21025 === s.arg1);
+    s.currTile___50521 = (r0);
+    r0 = (s.currTile___50521 === s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C31708_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = tiles_Location_constructor__P2292_mk(s);
+    s.tmp_2 = tiles_Location_constructor__P31711_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = s.col___21011;
-    s.tmp_2.arg2 = s.row___21018;
+    s.tmp_2.arg1 = s.col___50507;
+    s.tmp_2.arg2 = s.row___50514;
     s.tmp_2.arg3 = s.arg0;
-    s.callLocIdx = 922; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 879; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.output___21009, s.tmp_1);
+    r0 = pxsim_Array__push(s.output___50505, s.tmp_1);
   case 7:
   case 8:
-    r0 = (s.row___21018 + 1);
-    s.row___21018 = (r0);
+    r0 = (s.row___50514 + 1);
+    s.row___50514 = (r0);
     { step = 6; continue; }
   case 9:
-    r0 = (s.col___21011 + 1);
-    s.col___21011 = (r0);
+    r0 = (s.col___50507 + 1);
+    s.col___50507 = (r0);
     { step = 5; continue; }
   case 10:
-    r0 = s.output___21009;
+    r0 = s.output___50505;
   case 11:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTilesByType__P2334.info = {"start":8389,"length":561,"line":302,"column":8,"endLine":315,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTilesByType","argumentNames":["this","index"]}
+tiles_TileMap_getTilesByType__P31753.info = {"start":8389,"length":561,"line":302,"column":8,"endLine":315,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTilesByType","argumentNames":["this","index"]}
 
-function tiles_TileMap_getTilesByType__P2334_mk(s) {
+function tiles_TileMap_getTilesByType__P31753_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTilesByType__P2334, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTilesByType__P31753, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18077,10 +18155,10 @@ function tiles_TileMap_getTilesByType__P2334_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  output___21009: undefined,
-  col___21011: undefined,
-  row___21018: undefined,
-  currTile___21025: undefined,
+  output___50505: undefined,
+  col___50507: undefined,
+  row___50514: undefined,
+  currTile___50521: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -18089,7 +18167,7 @@ function tiles_TileMap_getTilesByType__P2334_mk(s) {
 
 
 
-function tiles_Location_constructor__P2292(s) {
+function tiles_Location_constructor__P31711(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18107,7 +18185,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C31708_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_col"] = (s.arg1);
     r0 = (s.arg0).fields["_row"] = (s.arg2);
     r0 = (s.arg0).fields["tileMap"] = (s.arg3);
@@ -18115,12 +18193,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_constructor__P2292.info = {"start":528,"length":153,"line":27,"column":8,"endLine":31,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","col","row","map"]}
+tiles_Location_constructor__P31711.info = {"start":528,"length":153,"line":27,"column":8,"endLine":31,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"inline","argumentNames":["this","col","row","map"]}
 
-function tiles_Location_constructor__P2292_mk(s) {
+function tiles_Location_constructor__P31711_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_constructor__P2292, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_constructor__P31711, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -18132,7 +18210,7 @@ function tiles_Location_constructor__P2292_mk(s) {
 
 
 
-function controller_moveSprite__P1952(s) {
+function controller_moveSprite__P31371(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18148,28 +18226,28 @@ switch (step) {
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller_moveSprite__P1939_mk(s);
-    s.tmp_1 = controller__player1__P1917_mk(s);
-    s.callLocIdx = 244; s.pc = 2; return s.tmp_1;
+    s.tmp_0 = controller_Controller_moveSprite__P31358_mk(s);
+    s.tmp_1 = controller__player1__P31336_mk(s);
+    s.callLocIdx = 201; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg2;
-    s.callLocIdx = 245; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 202; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_moveSprite__P1952.info = {"start":18919,"length":133,"line":574,"column":4,"endLine":576,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"moveSprite","argumentNames":["sprite","vx","vy"]}
+controller_moveSprite__P31371.info = {"start":18919,"length":133,"line":574,"column":4,"endLine":576,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"moveSprite","argumentNames":["sprite","vx","vy"]}
 
-function controller_moveSprite__P1952_mk(s) {
+function controller_moveSprite__P31371_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_moveSprite__P1952, depth: s.depth + 1,
+        parent: s, fn: controller_moveSprite__P31371, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18182,7 +18260,7 @@ function controller_moveSprite__P1952_mk(s) {
 
 
 
-function controller_Controller_moveSprite__P1939(s) {
+function controller_Controller_moveSprite__P31358(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18192,7 +18270,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cp___15987 = undefined;
+    s.cp___45482 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -18201,7 +18279,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -18211,9 +18289,9 @@ switch (step) {
     { step = 15; continue; }
   case 1:
   case 2:
-    s.tmp_5 = controller_Controller__controlledSprites__P1928_mk(s);
+    s.tmp_5 = controller_Controller__controlledSprites__P31347_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 205; s.pc = 16; return s.tmp_5;
+    s.callLocIdx = 162; s.pc = 16; return s.tmp_5;
   case 16:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -18223,57 +18301,57 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    s.tmp_6 = controller_Controller__controlledSprites__P1929_mk(s);
+    s.tmp_6 = controller_Controller__controlledSprites__P31348_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_6.arg1 = r0;
-    s.callLocIdx = 206; s.pc = 17; return s.tmp_6;
+    s.callLocIdx = 163; s.pc = 17; return s.tmp_6;
   case 17:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P15990);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P45485);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayFind__P109_mk(s);
-    s.tmp_2 = controller_Controller__controlledSprites__P1928_mk(s);
+    s.tmp_1 = helpers_arrayFind__P29644_mk(s);
+    s.tmp_2 = controller_Controller__controlledSprites__P31347_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 207; s.pc = 19; return s.tmp_2;
+    s.callLocIdx = 164; s.pc = 19; return s.tmp_2;
   case 19:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 208; s.pc = 18; return s.tmp_1;
+    s.callLocIdx = 165; s.pc = 18; return s.tmp_1;
   case 18:
     r0 = s.retval;
-    s.cp___15987 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.cp___15987);
+    s.cp___45482 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.cp___45482);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(controller_ControlledSprite__C1919_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_ControlledSprite__C31338_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = controller_ControlledSprite_constructor__P1921_mk(s);
+    s.tmp_3 = controller_ControlledSprite_constructor__P31340_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
     s.tmp_3.arg1 = s.arg1;
     s.tmp_3.arg2 = s.arg2;
     s.tmp_3.arg3 = s.arg3;
-    s.callLocIdx = 209; s.pc = 20; return s.tmp_3;
+    s.callLocIdx = 166; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
-    s.cp___15987 = (s.tmp_2);
-    s.tmp_1 = controller_Controller__controlledSprites__P1928_mk(s);
+    s.cp___45482 = (s.tmp_2);
+    s.tmp_1 = controller_Controller__controlledSprites__P31347_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 210; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 167; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.cp___15987);
+    r0 = pxsim_Array__push(s.tmp_0, s.cp___45482);
   case 5:
   case 6:
-    r0 = s.cp___15987.fields["vx"];
+    r0 = s.cp___45482.fields["vx"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 7; continue; }
@@ -18286,16 +18364,16 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 9; continue; }
-    s.tmp_2 = Sprite_vx__P2030_mk(s);
-    r0 = s.cp___15987.fields["s"];
+    s.tmp_2 = Sprite_vx__P31449_mk(s);
+    r0 = s.cp___45482.fields["s"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 211; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 168; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
   case 9:
   case 10:
-    r0 = s.cp___15987.fields["vy"];
+    r0 = s.cp___45482.fields["vy"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 11; continue; }
@@ -18308,28 +18386,28 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 13; continue; }
-    s.tmp_2 = Sprite_vy__P2032_mk(s);
-    r0 = s.cp___15987.fields["s"];
+    s.tmp_2 = Sprite_vy__P31451_mk(s);
+    r0 = s.cp___45482.fields["s"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 212; s.pc = 23; return s.tmp_2;
+    s.callLocIdx = 169; s.pc = 23; return s.tmp_2;
   case 23:
     r0 = s.retval;
   case 13:
   case 14:
-    r0 = (s.cp___15987).fields["vx"] = (s.arg2);
-    r0 = (s.cp___15987).fields["vy"] = (s.arg3);
+    r0 = (s.cp___45482).fields["vx"] = (s.arg2);
+    r0 = (s.cp___45482).fields["vy"] = (s.arg3);
   case 15:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_moveSprite__P1939.info = {"start":10866,"length":608,"line":355,"column":8,"endLine":371,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"moveSprite","argumentNames":["this","sprite","vx","vy"]}
+controller_Controller_moveSprite__P31358.info = {"start":10866,"length":608,"line":355,"column":8,"endLine":371,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"moveSprite","argumentNames":["this","sprite","vx","vy"]}
 
-function controller_Controller_moveSprite__P1939_mk(s) {
+function controller_Controller_moveSprite__P31358_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_moveSprite__P1939, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_moveSprite__P31358, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18338,7 +18416,7 @@ function controller_Controller_moveSprite__P1939_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  cp___15987: undefined,
+  cp___45482: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -18349,7 +18427,7 @@ function controller_Controller_moveSprite__P1939_mk(s) {
 
 
 
-function inline__P15990(s) {
+function inline__P45485(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18372,12 +18450,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P15990.info = {"start":11086,"length":26,"line":358,"column":50,"endLine":358,"endColumn":76,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["cp"]}
+inline__P45485.info = {"start":11086,"length":26,"line":358,"column":50,"endLine":358,"endColumn":76,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["cp"]}
 
-function inline__P15990_mk(s) {
+function inline__P45485_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P15990, depth: s.depth + 1,
+        parent: s, fn: inline__P45485, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18388,7 +18466,7 @@ function inline__P15990_mk(s) {
 
 
 
-function controller_Controller__controlledSprites__P1929(s) {
+function controller_Controller__controlledSprites__P31348(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18404,9 +18482,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 200; s.pc = 1; return s.tmp_1;
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 157; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["controlledSprites"];
@@ -18418,12 +18496,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller__controlledSprites__P1929.info = {"start":8697,"length":134,"line":272,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"_controlledSprites","argumentNames":["this","cps"]}
+controller_Controller__controlledSprites__P31348.info = {"start":8697,"length":134,"line":272,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_controlledSprites","argumentNames":["this","cps"]}
 
-function controller_Controller__controlledSprites__P1929_mk(s) {
+function controller_Controller__controlledSprites__P31348_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller__controlledSprites__P1929, depth: s.depth + 1,
+        parent: s, fn: controller_Controller__controlledSprites__P31348, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18436,7 +18514,7 @@ function controller_Controller__controlledSprites__P1929_mk(s) {
 
 
 
-function controller_Controller__controlledSprites__P1928(s) {
+function controller_Controller__controlledSprites__P31347(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18451,9 +18529,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 199; s.pc = 1; return s.tmp_1;
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 156; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["controlledSprites"];
@@ -18464,13 +18542,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller__controlledSprites__P1928.info = {"start":8555,"length":132,"line":268,"column":8,"endLine":270,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"_controlledSprites","argumentNames":["this"]}
-controller_Controller__controlledSprites__P1928.isGetter = true;
+controller_Controller__controlledSprites__P31347.info = {"start":8555,"length":132,"line":268,"column":8,"endLine":270,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_controlledSprites","argumentNames":["this"]}
+controller_Controller__controlledSprites__P31347.isGetter = true;
 
-function controller_Controller__controlledSprites__P1928_mk(s) {
+function controller_Controller__controlledSprites__P31347_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller__controlledSprites__P1928, depth: s.depth + 1,
+        parent: s, fn: controller_Controller__controlledSprites__P31347, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18482,7 +18560,7 @@ function controller_Controller__controlledSprites__P1928_mk(s) {
 
 
 
-function controller_ControlledSprite_constructor__P1921(s) {
+function controller_ControlledSprite_constructor__P31340(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18500,7 +18578,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_ControlledSprite__C1919_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_ControlledSprite__C31338_VT)) failedCast(r0);
     r0 = (s.arg0).fields["s"] = (s.arg1);
     r0 = (s.arg0).fields["vx"] = (s.arg2);
     r0 = (s.arg0).fields["vy"] = (s.arg3);
@@ -18508,12 +18586,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_ControlledSprite_constructor__P1921.info = {"start":7271,"length":117,"line":227,"column":8,"endLine":231,"endColumn":13,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","s","vx","vy"]}
+controller_ControlledSprite_constructor__P31340.info = {"start":7271,"length":117,"line":227,"column":8,"endLine":231,"endColumn":13,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["this","s","vx","vy"]}
 
-function controller_ControlledSprite_constructor__P1921_mk(s) {
+function controller_ControlledSprite_constructor__P31340_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_ControlledSprite_constructor__P1921, depth: s.depth + 1,
+        parent: s, fn: controller_ControlledSprite_constructor__P31340, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -18525,7 +18603,7 @@ function controller_ControlledSprite_constructor__P1921_mk(s) {
 
 
 
-function controller__player1__P1917(s) {
+function controller__player1__P31336(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18535,7 +18613,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals._players___4190);
+    r0 = pxsim_numops_toBoolDecr(globals._players___33683);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -18544,7 +18622,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__getAt(globals._players___4190, 0);
+    r0 = pxsim_Array__getAt(globals._players___33683, 0);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -18554,36 +18632,36 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Controller__C1923_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Controller__C31342_VT);
     s.tmp_5 = r0;
     r0 = pxsim_Array__mk();
     s.tmp_6 = r0;
-    r0 = pxsim_Array__push(s.tmp_6, globals.left___1879);
-    r0 = pxsim_Array__push(s.tmp_6, globals.up___1880);
-    r0 = pxsim_Array__push(s.tmp_6, globals.right___1881);
-    r0 = pxsim_Array__push(s.tmp_6, globals.down___1882);
-    r0 = pxsim_Array__push(s.tmp_6, globals.A___1877);
-    r0 = pxsim_Array__push(s.tmp_6, globals.B___1878);
-    r0 = pxsim_Array__push(s.tmp_6, globals.menu___1883);
-    s.tmp_7 = controller_Controller_constructor__P1927_mk(s);
+    r0 = pxsim_Array__push(s.tmp_6, globals.left___31298);
+    r0 = pxsim_Array__push(s.tmp_6, globals.up___31299);
+    r0 = pxsim_Array__push(s.tmp_6, globals.right___31300);
+    r0 = pxsim_Array__push(s.tmp_6, globals.down___31301);
+    r0 = pxsim_Array__push(s.tmp_6, globals.A___31296);
+    r0 = pxsim_Array__push(s.tmp_6, globals.B___31297);
+    r0 = pxsim_Array__push(s.tmp_6, globals.menu___31302);
+    s.tmp_7 = controller_Controller_constructor__P31346_mk(s);
     s.tmp_7.arg0 = s.tmp_5;
     s.tmp_7.arg1 = 1;
     s.tmp_7.arg2 = s.tmp_6;
-    s.callLocIdx = 191; s.pc = 5; return s.tmp_7;
+    s.callLocIdx = 148; s.pc = 5; return s.tmp_7;
   case 5:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_Array__getAt(globals._players___4190, 0);
+    r0 = pxsim_Array__getAt(globals._players___33683, 0);
     return leave(s, r0)
   default: oops()
 } } }
-controller__player1__P1917.info = {"start":6776,"length":258,"line":214,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_player1","argumentNames":[]}
+controller__player1__P31336.info = {"start":6776,"length":258,"line":214,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_player1","argumentNames":[]}
 
-function controller__player1__P1917_mk(s) {
+function controller__player1__P31336_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__player1__P1917, depth: s.depth + 1,
+        parent: s, fn: controller__player1__P31336, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18599,7 +18677,7 @@ function controller__player1__P1917_mk(s) {
 
 
 
-function controller_Controller_constructor__P1927(s) {
+function controller_Controller_constructor__P31346(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18609,9 +18687,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.leftId___11298 = undefined;
-    s.i___11306 = undefined;
-    s.i___11324 = undefined;
+    s.leftId___40835 = undefined;
+    s.i___40843 = undefined;
+    s.i___40861 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -18619,7 +18697,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim.control.allocateNotifyEvent();
     s.tmp_1 = r0;
@@ -18643,34 +18721,34 @@ switch (step) {
     r0 = (s.tmp_1 * 7);
     s.tmp_0 = r0;
     r0 = (1 + s.tmp_0);
-    s.leftId___11298 = (r0);
-    s.i___11306 = (0);
+    s.leftId___40835 = (r0);
+    s.i___40843 = (0);
   case 2:
-    r0 = (s.i___11306 < 7);
+    r0 = (s.i___40843 < 7);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C31322_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = controller_Button_constructor__P1909_mk(s);
+    s.tmp_2 = controller_Button_constructor__P31328_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    r0 = (s.leftId___11298 + s.i___11306);
+    r0 = (s.leftId___40835 + s.i___40843);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = -1;
-    s.callLocIdx = 197; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 154; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["buttons"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_1);
-    r0 = (s.i___11306 + 1);
-    s.i___11306 = (r0);
+    r0 = (s.i___40843 + 1);
+    s.i___40843 = (r0);
     { step = 2; continue; }
   case 3:
   case 4:
-    s.i___11324 = (0);
+    s.i___40861 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___11324;
+    s.tmp_1 = r0 = s.i___40861;
     r0 = s.arg0.fields["buttons"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -18681,28 +18759,28 @@ switch (step) {
     if (!r0) { step = 6; continue; }
     r0 = s.arg0.fields["buttons"];
     s.tmp_5 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_5, s.i___11324);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___40861);
     s.tmp_4 = r0;
     r0 = (s.tmp_4).fields["_owner"] = (s.arg0);
-    r0 = (s.i___11324 + 1);
-    s.i___11324 = (r0);
+    r0 = (s.i___40861 + 1);
+    s.i___40861 = (r0);
     { step = 5; continue; }
   case 6:
-    s.tmp_0 = controller_addController__P4191_mk(s);
+    s.tmp_0 = controller_addController__P33684_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 198; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 155; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_constructor__P1927.info = {"start":7849,"length":696,"line":249,"column":8,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","playerIndex","buttons"]}
+controller_Controller_constructor__P31346.info = {"start":7849,"length":696,"line":249,"column":8,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["this","playerIndex","buttons"]}
 
-function controller_Controller_constructor__P1927_mk(s) {
+function controller_Controller_constructor__P31346_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_constructor__P1927, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_constructor__P31346, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18710,9 +18788,9 @@ function controller_Controller_constructor__P1927_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  leftId___11298: undefined,
-  i___11306: undefined,
-  i___11324: undefined,
+  leftId___40835: undefined,
+  i___40843: undefined,
+  i___40861: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -18722,7 +18800,7 @@ function controller_Controller_constructor__P1927_mk(s) {
 
 
 
-function controller_addController__P4191(s) {
+function controller_addController__P33684(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18736,17 +18814,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._players___4190);
+    r0 = pxsim_numops_toBoolDecr(globals._players___33683);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals._players___4190 = (r0);
+    globals._players___33683 = (r0);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals._players___4190;
+    s.tmp_0 = r0 = globals._players___33683;
     r0 = s.arg0.fields["playerIndex"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
@@ -18756,12 +18834,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_addController__P4191.info = {"start":6613,"length":157,"line":207,"column":4,"endLine":212,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"addController","argumentNames":["ctrl"]}
+controller_addController__P33684.info = {"start":6613,"length":157,"line":207,"column":4,"endLine":212,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"addController","argumentNames":["ctrl"]}
 
-function controller_addController__P4191_mk(s) {
+function controller_addController__P33684_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_addController__P4191, depth: s.depth + 1,
+        parent: s, fn: controller_addController__P33684, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18773,7 +18851,7 @@ function controller_addController__P4191_mk(s) {
 
 
 
-function summon_fish__P45918(s) {
+function summon_fish__P97775(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18790,7 +18868,7 @@ switch (step) {
     }
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46773);
+    r0 = pxsim.image.ofBuffer(_hex97783);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
     r0 = pxsim_Array__mk();
@@ -18798,26 +18876,26 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_0);
     r0 = pxsim_Array__mk();
     s.tmp_3 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46776);
+    r0 = pxsim.image.ofBuffer(_hex97786);
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_4);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_3);
     r0 = pxsim_Array__mk();
     s.tmp_5 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46779);
+    r0 = pxsim.image.ofBuffer(_hex97789);
     s.tmp_6 = r0;
     r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_5);
     r0 = pxsim_Array__mk();
     s.tmp_7 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46782);
+    r0 = pxsim.image.ofBuffer(_hex97792);
     s.tmp_8 = r0;
     r0 = pxsim_Array__push(s.tmp_7, s.tmp_8);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_7);
-    globals.left_fish_animations___46155 = (s.tmp_2);
+    globals.left_fish_animations___97779 = (s.tmp_2);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46787);
+    r0 = pxsim.image.ofBuffer(_hex97798);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
     r0 = pxsim_Array__mk();
@@ -18825,62 +18903,62 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_0);
     r0 = pxsim_Array__mk();
     s.tmp_3 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46790);
+    r0 = pxsim.image.ofBuffer(_hex97801);
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_4);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_3);
     r0 = pxsim_Array__mk();
     s.tmp_5 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46793);
+    r0 = pxsim.image.ofBuffer(_hex97804);
     s.tmp_6 = r0;
     r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_5);
     r0 = pxsim_Array__mk();
     s.tmp_7 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46796);
+    r0 = pxsim.image.ofBuffer(_hex97807);
     s.tmp_8 = r0;
     r0 = pxsim_Array__push(s.tmp_7, s.tmp_8);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_7);
-    globals.right_fish_animations___46154 = (s.tmp_2);
-    r0 = pxsim_Array__length(globals.left_fish_animations___46155);
+    globals.right_fish_animations___97794 = (s.tmp_2);
+    r0 = pxsim_Array__length(globals.left_fish_animations___97779);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.randomRange(0, s.tmp_0);
-    globals.local_choice___46153 = (r0);
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    r0 = pxsim_Array__getAt(globals.right_fish_animations___46154, globals.local_choice___46153);
+    globals.local_choice___97809 = (r0);
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    r0 = pxsim_Array__getAt(globals.right_fish_animations___97794, globals.local_choice___97809);
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, 0);
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.NPC___45888;
+    s.tmp_0.arg1 = globals.NPC___97745;
     s.callLocIdx = 86; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.sprite_fish___46151 = (r0);
-    s.tmp_0 = tiles_placeOnRandomTile__P2349_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
-    s.tmp_0.arg1 = globals.tile13___3947;
+    globals.sprite_fish___97817 = (r0);
+    s.tmp_0 = tiles_placeOnRandomTile__P31768_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
+    s.tmp_0.arg1 = globals.tile13___33482;
     s.callLocIdx = 87; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = tiles_setTileAt__P2342_mk(s);
-    s.tmp_1 = tiles_locationOfSprite__P3775_mk(s);
-    s.tmp_1.arg0 = globals.sprite_fish___46151;
+    s.tmp_0 = tiles_setTileAt__P31761_mk(s);
+    s.tmp_1 = tiles_locationOfSprite__P33309_mk(s);
+    s.tmp_1.arg0 = globals.sprite_fish___97817;
     s.callLocIdx = 88; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.tile15___3948;
+    s.tmp_0.arg1 = globals.tile15___33483;
     s.callLocIdx = 89; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = character_loopFrames__P3739_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
-    r0 = pxsim_Array__getAt(globals.left_fish_animations___46155, globals.local_choice___46153);
+    s.tmp_0 = character_loopFrames__P33273_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
+    r0 = pxsim_Array__getAt(globals.left_fish_animations___97779, globals.local_choice___97809);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 100;
-    s.tmp_1 = character_rule__P3745_mk(s);
+    s.tmp_1 = character_rule__P33279_mk(s);
     s.tmp_1.arg0 = 512;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
@@ -18893,12 +18971,12 @@ switch (step) {
     s.callLocIdx = 91; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = character_loopFrames__P3739_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
-    r0 = pxsim_Array__getAt(globals.right_fish_animations___46154, globals.local_choice___46153);
+    s.tmp_0 = character_loopFrames__P33273_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
+    r0 = pxsim_Array__getAt(globals.right_fish_animations___97794, globals.local_choice___97809);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 100;
-    s.tmp_1 = character_rule__P3745_mk(s);
+    s.tmp_1 = character_rule__P33279_mk(s);
     s.tmp_1.arg0 = 128;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
@@ -18913,9 +18991,9 @@ switch (step) {
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = character_setCharacterState__P3743_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
-    s.tmp_1 = character_rule__P3745_mk(s);
+    s.tmp_0 = character_setCharacterState__P33277_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
+    s.tmp_1 = character_rule__P33279_mk(s);
     s.tmp_1.arg0 = 128;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
@@ -18930,24 +19008,24 @@ switch (step) {
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P46846);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P97861);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = timer_background__P3595_mk(s);
+    s.tmp_1 = timer_background__P33129_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 107; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    r0 = globals.sprite_fish___46151;
+    r0 = globals.sprite_fish___97817;
     return leave(s, r0)
   default: oops()
 } } }
-summon_fish__P45918.info = {"start":412,"length":6902,"line":12,"column":0,"endLine":182,"endColumn":1,"fileName":"main.ts","functionName":"summon_fish","argumentNames":["ai","force_animate"]}
+summon_fish__P97775.info = {"start":412,"length":6902,"line":12,"column":0,"endLine":182,"endColumn":1,"fileName":"main.ts","functionName":"summon_fish","argumentNames":["ai","force_animate"]}
 
-function summon_fish__P45918_mk(s) {
+function summon_fish__P97775_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: summon_fish__P45918, depth: s.depth + 1,
+        parent: s, fn: summon_fish__P97775, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18962,19 +19040,19 @@ function summon_fish__P45918_mk(s) {
   arg1: undefined,
 } }
 
-const _hex46773 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000f00f000000000000dc0f0000000000c0dc0f00000000ccccddf1000000cc11dd1df10000c01b111111110f005c1b11c111110f005cbb1b1111110fc055bbbbbb11b1f5c0551b1111b1bbf5c055bb11b1bbbbf5c055b51111115bf5c055c5cc5bfb5ff5005cc5005b0bf0ff00c00cc055c50000000000c0cccc0000")
-const _hex46776 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000ff0f0000000000c044f400000000004c44440f000000c04444440f0000004c44f444f40000c0dc444444fd0000cc44111111440f00cc4444c4c4440fc0cd4444c4444f0fc0cd444444ff4f0fc0cd4d444444c4cdc0dd1c4d44d4dccd00cccc1111fdbfcd000000ccf4ffcc0c0000c04444f400000000c0ccffff0000")
-const _hex46779 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000b0bb0000000000001b110b00000000b01111c100000000b01111c1000000001b111f110c0000001b1111d10c0000b0dbdddd1dc10000b01b111b1bc10000db1b111bb1c10000db1b11b1bbc10000db1b111111cc0000dbdd1111cdcd0000b0dbddddcc0c000000b01bcbcc000000001b11110c00000000bbbbcc0c0000")
-const _hex46782 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000bb000000000000b0770b00000000007b7fc700000000007b77cd00000000b0dddd120c000000b02222120c000000bb4242120c000000bb4222140c0000b0bd2244140c0000b0bd2222120c0000b0bd2b22120c000000db2d221d0c000000b0ddddcc00000000005bcb0c00000000b055550c00000000b0bbcc0c0000")
-const _hex46787 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cccc000000c00cc055c50000005cc5005b0bf0ffc055c5cc5bfb5ff5c055b51111115bf5c055bb11b1bbbbf5c0551b1111b1bbf5c055bbbbbb11b1f5005cbb1b1111110f005c1b11c111110f00c01b111111110f0000cc11dd1df100000000ccccddf10000000000c0dc0f000000000000dc0f000000000000f00f00")
-const _hex46790 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000c0ccffff00000000c04444f40000000000ccf4ffcc0c00cccc1111fdbfcdc0dd1c4d44d4dccdc0cd4d444444c4cdc0cd444444ff4f0fc0cd4444c4444f0f00cc4444c4c4440f00cc44111111440f00c0dc444444fd0000004c44f444f4000000c04444440f000000004c44440f00000000c044f4000000000000ff0f0000")
-const _hex46793 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000bbbbcc0c000000001b11110c00000000b01bcbcc000000b0dbddddcc0c0000dbdd1111cdcd0000db1b111111cc0000db1b11b1bbc10000db1b111bb1c10000b01b111b1bc10000b0dbdddd1dc10000001b1111d10c0000001b111f110c000000b01111c100000000b01111c100000000001b110b0000000000b0bb000000")
-const _hex46796 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000b0bbcc0c00000000b055550c00000000005bcb0c00000000b0ddddcc00000000db2d221d0c0000b0bd2b22120c0000b0bd2222120c0000b0bd2244140c000000bb4222140c000000bb4242120c000000b02222120c000000b0dddd120c000000007b77cd00000000007b7fc70000000000b0770b000000000000bb000000")
+const _hex97783 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000f00f000000000000dc0f0000000000c0dc0f00000000ccccddf1000000cc11dd1df10000c01b111111110f005c1b11c111110f005cbb1b1111110fc055bbbbbb11b1f5c0551b1111b1bbf5c055bb11b1bbbbf5c055b51111115bf5c055c5cc5bfb5ff5005cc5005b0bf0ff00c00cc055c50000000000c0cccc0000")
+const _hex97786 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000ff0f0000000000c044f400000000004c44440f000000c04444440f0000004c44f444f40000c0dc444444fd0000cc44111111440f00cc4444c4c4440fc0cd4444c4444f0fc0cd444444ff4f0fc0cd4d444444c4cdc0dd1c4d44d4dccd00cccc1111fdbfcd000000ccf4ffcc0c0000c04444f400000000c0ccffff0000")
+const _hex97789 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000b0bb0000000000001b110b00000000b01111c100000000b01111c1000000001b111f110c0000001b1111d10c0000b0dbdddd1dc10000b01b111b1bc10000db1b111bb1c10000db1b11b1bbc10000db1b111111cc0000dbdd1111cdcd0000b0dbddddcc0c000000b01bcbcc000000001b11110c00000000bbbbcc0c0000")
+const _hex97792 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000bb000000000000b0770b00000000007b7fc700000000007b77cd00000000b0dddd120c000000b02222120c000000bb4242120c000000bb4222140c0000b0bd2244140c0000b0bd2222120c0000b0bd2b22120c000000db2d221d0c000000b0ddddcc00000000005bcb0c00000000b055550c00000000b0bbcc0c0000")
+const _hex97798 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cccc000000c00cc055c50000005cc5005b0bf0ffc055c5cc5bfb5ff5c055b51111115bf5c055bb11b1bbbbf5c0551b1111b1bbf5c055bbbbbb11b1f5005cbb1b1111110f005c1b11c111110f00c01b111111110f0000cc11dd1df100000000ccccddf10000000000c0dc0f000000000000dc0f000000000000f00f00")
+const _hex97801 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000c0ccffff00000000c04444f40000000000ccf4ffcc0c00cccc1111fdbfcdc0dd1c4d44d4dccdc0cd4d444444c4cdc0cd444444ff4f0fc0cd4444c4444f0f00cc4444c4c4440f00cc44111111440f00c0dc444444fd0000004c44f444f4000000c04444440f000000004c44440f00000000c044f4000000000000ff0f0000")
+const _hex97804 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000bbbbcc0c000000001b11110c00000000b01bcbcc000000b0dbddddcc0c0000dbdd1111cdcd0000db1b111111cc0000db1b11b1bbc10000db1b111bb1c10000b01b111b1bc10000b0dbdddd1dc10000001b1111d10c0000001b111f110c000000b01111c100000000b01111c100000000001b110b0000000000b0bb000000")
+const _hex97807 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000b0bbcc0c00000000b055550c00000000005bcb0c00000000b0ddddcc00000000db2d221d0c0000b0bd2b22120c0000b0bd2222120c0000b0bd2244140c000000bb4222140c000000bb4242120c000000b02222120c000000b0dddd120c000000007b77cd00000000007b7fc70000000000b0770b000000000000bb000000")
 
 
 
 
-function inline__P46846(s) {
+function inline__P97861(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18986,14 +19064,14 @@ switch (step) {
 
     r0 = pxsim_numops_toBoolDecr(s.caps[0]);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = tiles_getTilesByType__P2350_mk(s);
-    s.tmp_1.arg0 = globals.tile16___3949;
+    s.tmp_1 = tiles_getTilesByType__P31769_mk(s);
+    s.tmp_1.arg0 = globals.tile16___33484;
     s.callLocIdx = 96; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_6 = tiles_getTilesByType__P2350_mk(s);
-    s.tmp_6.arg0 = globals.tile16___3949;
+    s.tmp_6 = tiles_getTilesByType__P31769_mk(s);
+    s.tmp_6.arg0 = globals.tile16___33484;
     s.callLocIdx = 97; s.pc = 4; return s.tmp_6;
   case 4:
     r0 = s.retval;
@@ -19005,43 +19083,43 @@ switch (step) {
     r0 = pxsim.Math_.randomRange(0, s.tmp_3);
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_2);
-    globals.location___46149 = (r0);
-    s.tmp_0 = tiles_setTileAt__P2342_mk(s);
-    s.tmp_0.arg0 = globals.location___46149;
-    s.tmp_0.arg1 = globals.tile12___3945;
+    globals.location___97864 = (r0);
+    s.tmp_0 = tiles_setTileAt__P31761_mk(s);
+    s.tmp_0.arg0 = globals.location___97864;
+    s.tmp_0.arg1 = globals.tile12___33480;
     s.callLocIdx = 98; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.paths___46005;
-    s.tmp_2 = scene_aStar__P3655_mk(s);
-    s.tmp_3 = tiles_locationOfSprite__P3775_mk(s);
-    s.tmp_3.arg0 = globals.sprite_fish___46151;
+    s.tmp_0 = r0 = globals.paths___97881;
+    s.tmp_2 = scene_aStar__P33189_mk(s);
+    s.tmp_3 = tiles_locationOfSprite__P33309_mk(s);
+    s.tmp_3.arg0 = globals.sprite_fish___97817;
     s.callLocIdx = 99; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = globals.location___46149;
+    s.tmp_2.arg1 = globals.location___97864;
     s.tmp_2.arg2 = null;
     s.callLocIdx = 100; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
+    s.tmp_0 = sprites_setDataNumber__P33153_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
     s.tmp_0.arg1 = "path_index";
-    r0 = pxsim_Array__length(globals.paths___46005);
+    r0 = pxsim_Array__length(globals.paths___97881);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
     s.callLocIdx = 101; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
+    s.tmp_0 = sprites_setDataNumber__P33153_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
     s.tmp_0.arg1 = "target_row";
-    s.tmp_1 = tiles_locationXY__P3791_mk(s);
-    s.tmp_1.arg0 = globals.location___46149;
+    s.tmp_1 = tiles_locationXY__P33325_mk(s);
+    s.tmp_1.arg0 = globals.location___97864;
     s.tmp_1.arg1 = 1;
     s.callLocIdx = 102; s.pc = 10; return s.tmp_1;
   case 10:
@@ -19050,11 +19128,11 @@ switch (step) {
     s.callLocIdx = 103; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
+    s.tmp_0 = sprites_setDataNumber__P33153_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
     s.tmp_0.arg1 = "target_col";
-    s.tmp_1 = tiles_locationXY__P3791_mk(s);
-    s.tmp_1.arg0 = globals.location___46149;
+    s.tmp_1 = tiles_locationXY__P33325_mk(s);
+    s.tmp_1.arg0 = globals.location___97864;
     s.tmp_1.arg1 = 0;
     s.callLocIdx = 104; s.pc = 12; return s.tmp_1;
   case 12:
@@ -19063,8 +19141,8 @@ switch (step) {
     s.callLocIdx = 105; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataBoolean__P3624_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___46151;
+    s.tmp_0 = sprites_setDataBoolean__P33158_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___97817;
     s.tmp_0.arg1 = "running_away";
     s.tmp_0.arg2 = false;
     s.callLocIdx = 106; s.pc = 13; return s.tmp_0;
@@ -19076,12 +19154,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P46846.info = {"start":6624,"length":664,"line":170,"column":21,"endLine":180,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P97861.info = {"start":6624,"length":664,"line":170,"column":21,"endLine":180,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P46846_mk(s) {
+function inline__P97861_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P46846, depth: s.depth + 1,
+        parent: s, fn: inline__P97861, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19096,7 +19174,7 @@ function inline__P46846_mk(s) {
 
 
 
-function tiles_locationXY__P3791(s) {
+function tiles_locationXY__P33325(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19115,14 +19193,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = tiles_screenCoordinateToTile__P3797_mk(s);
-    s.tmp_2 = tiles_Location_y__P2294_mk(s);
+    s.tmp_1 = tiles_screenCoordinateToTile__P33331_mk(s);
+    s.tmp_2 = tiles_Location_y__P31713_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 2102; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 2107; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 2103; s.pc = 13; return s.tmp_1;
+    s.callLocIdx = 2108; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
     { step = 12; continue; }
@@ -19132,14 +19210,14 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 2; continue; }
-    s.tmp_4 = tiles_screenCoordinateToTile__P3797_mk(s);
-    s.tmp_5 = tiles_Location_x__P2293_mk(s);
+    s.tmp_4 = tiles_screenCoordinateToTile__P33331_mk(s);
+    s.tmp_5 = tiles_Location_x__P31712_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 2104; s.pc = 16; return s.tmp_5;
+    s.callLocIdx = 2109; s.pc = 16; return s.tmp_5;
   case 16:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 2105; s.pc = 15; return s.tmp_4;
+    s.callLocIdx = 2110; s.pc = 15; return s.tmp_4;
   case 15:
     r0 = s.retval;
     { step = 12; continue; }
@@ -19162,28 +19240,28 @@ switch (step) {
     r0 = s.tmp_6;
     { step = 11; continue; }
   case 5:
-    s.tmp_7 = tiles_Location_x__P2293_mk(s);
+    s.tmp_7 = tiles_Location_x__P31712_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 2106; s.pc = 17; return s.tmp_7;
+    s.callLocIdx = 2111; s.pc = 17; return s.tmp_7;
   case 17:
     r0 = s.retval;
     { step = 12; continue; }
   case 6:
-    s.tmp_8 = tiles_Location_y__P2294_mk(s);
+    s.tmp_8 = tiles_Location_y__P31713_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 2107; s.pc = 18; return s.tmp_8;
+    s.callLocIdx = 2112; s.pc = 18; return s.tmp_8;
   case 18:
     r0 = s.retval;
     { step = 12; continue; }
   case 7:
-    s.tmp_10 = tiles_Location_x__P2293_mk(s);
+    s.tmp_10 = tiles_Location_x__P31712_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 2108; s.pc = 19; return s.tmp_10;
+    s.callLocIdx = 2113; s.pc = 19; return s.tmp_10;
   case 19:
     r0 = s.retval;
     s.tmp_9 = r0;
-    s.tmp_13 = tiles_tileWidth__P3794_mk(s);
-    s.callLocIdx = 2109; s.pc = 20; return s.tmp_13;
+    s.tmp_13 = tiles_tileWidth__P33328_mk(s);
+    s.callLocIdx = 2114; s.pc = 20; return s.tmp_13;
   case 20:
     r0 = s.retval;
     s.tmp_12 = r0;
@@ -19192,14 +19270,14 @@ switch (step) {
     r0 = (s.tmp_9 - s.tmp_11);
     { step = 12; continue; }
   case 8:
-    s.tmp_15 = tiles_Location_x__P2293_mk(s);
+    s.tmp_15 = tiles_Location_x__P31712_mk(s);
     s.tmp_15.arg0 = s.arg0;
-    s.callLocIdx = 2110; s.pc = 21; return s.tmp_15;
+    s.callLocIdx = 2115; s.pc = 21; return s.tmp_15;
   case 21:
     r0 = s.retval;
     s.tmp_14 = r0;
-    s.tmp_18 = tiles_tileWidth__P3794_mk(s);
-    s.callLocIdx = 2111; s.pc = 22; return s.tmp_18;
+    s.tmp_18 = tiles_tileWidth__P33328_mk(s);
+    s.callLocIdx = 2116; s.pc = 22; return s.tmp_18;
   case 22:
     r0 = s.retval;
     s.tmp_17 = r0;
@@ -19208,14 +19286,14 @@ switch (step) {
     r0 = (s.tmp_14 + s.tmp_16);
     { step = 12; continue; }
   case 9:
-    s.tmp_20 = tiles_Location_y__P2294_mk(s);
+    s.tmp_20 = tiles_Location_y__P31713_mk(s);
     s.tmp_20.arg0 = s.arg0;
-    s.callLocIdx = 2112; s.pc = 23; return s.tmp_20;
+    s.callLocIdx = 2117; s.pc = 23; return s.tmp_20;
   case 23:
     r0 = s.retval;
     s.tmp_19 = r0;
-    s.tmp_23 = tiles_tileWidth__P3794_mk(s);
-    s.callLocIdx = 2113; s.pc = 24; return s.tmp_23;
+    s.tmp_23 = tiles_tileWidth__P33328_mk(s);
+    s.callLocIdx = 2118; s.pc = 24; return s.tmp_23;
   case 24:
     r0 = s.retval;
     s.tmp_22 = r0;
@@ -19224,14 +19302,14 @@ switch (step) {
     r0 = (s.tmp_19 - s.tmp_21);
     { step = 12; continue; }
   case 10:
-    s.tmp_25 = tiles_Location_y__P2294_mk(s);
+    s.tmp_25 = tiles_Location_y__P31713_mk(s);
     s.tmp_25.arg0 = s.arg0;
-    s.callLocIdx = 2114; s.pc = 25; return s.tmp_25;
+    s.callLocIdx = 2119; s.pc = 25; return s.tmp_25;
   case 25:
     r0 = s.retval;
     s.tmp_24 = r0;
-    s.tmp_28 = tiles_tileWidth__P3794_mk(s);
-    s.callLocIdx = 2115; s.pc = 26; return s.tmp_28;
+    s.tmp_28 = tiles_tileWidth__P33328_mk(s);
+    s.callLocIdx = 2120; s.pc = 26; return s.tmp_28;
   case 26:
     r0 = s.retval;
     s.tmp_27 = r0;
@@ -19245,12 +19323,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_locationXY__P3791.info = {"start":11480,"length":745,"line":324,"column":4,"endLine":345,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationXY","argumentNames":["location","xy"]}
+tiles_locationXY__P33325.info = {"start":11480,"length":745,"line":324,"column":4,"endLine":345,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationXY","argumentNames":["location","xy"]}
 
-function tiles_locationXY__P3791_mk(s) {
+function tiles_locationXY__P33325_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_locationXY__P3791, depth: s.depth + 1,
+        parent: s, fn: tiles_locationXY__P33325, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19289,7 +19367,7 @@ function tiles_locationXY__P3791_mk(s) {
 
 
 
-function tiles_tileWidth__P3794(s) {
+function tiles_tileWidth__P33328(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19299,14 +19377,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___20876 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 2116; s.pc = 4; return s.tmp_0;
+    s.tm___50372 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 2121; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___20876 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___20876);
+    s.tm___50372 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___50372);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -19316,31 +19394,31 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    r0 = s.tm___20876.fields["_scale"];
+    r0 = s.tm___50372.fields["_scale"];
     s.tmp_2 = r0;
     r0 = (1 << s.tmp_2);
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_tileWidth__P3794.info = {"start":13283,"length":154,"line":376,"column":4,"endLine":381,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"tileWidth","argumentNames":[]}
+tiles_tileWidth__P33328.info = {"start":13283,"length":154,"line":376,"column":4,"endLine":381,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"tileWidth","argumentNames":[]}
 
-function tiles_tileWidth__P3794_mk(s) {
+function tiles_tileWidth__P33328_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_tileWidth__P3794, depth: s.depth + 1,
+        parent: s, fn: tiles_tileWidth__P33328, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tm___20876: undefined,
+  tm___50372: undefined,
 } }
 
 
 
 
 
-function sprites_setDataNumber__P3619(s) {
+function sprites_setDataNumber__P33153(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19350,7 +19428,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___20907 = undefined;
+    s.d___50403 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -19377,31 +19455,31 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P2041_mk(s);
+    s.tmp_4 = Sprite_data__P31460_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1772; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1777; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    s.d___20907 = (r0);
-    r0 = pxsim_pxtrt.mapSetGeneric(s.d___20907, s.arg1, s.arg2);
+    s.d___50403 = (r0);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.d___50403, s.arg1, s.arg2);
   case 5:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_setDataNumber__P3619.info = {"start":241,"length":176,"line":8,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataNumber","argumentNames":["sprite","name","value"]}
+sprites_setDataNumber__P33153.info = {"start":241,"length":176,"line":8,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataNumber","argumentNames":["sprite","name","value"]}
 
-function sprites_setDataNumber__P3619_mk(s) {
+function sprites_setDataNumber__P33153_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_setDataNumber__P3619, depth: s.depth + 1,
+        parent: s, fn: sprites_setDataNumber__P33153, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___20907: undefined,
+  d___50403: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -19411,78 +19489,7 @@ function sprites_setDataNumber__P3619_mk(s) {
 
 
 
-function timer_background__P3595(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = control_runInBackground__P279_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1748; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-timer_background__P3595.info = {"start":665,"length":90,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"background","argumentNames":["then"]}
-
-function timer_background__P3595_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: timer_background__P3595, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function control_runInBackground__P279(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim.control.runInParallel(s.arg0);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-control_runInBackground__P279.info = {"start":384,"length":88,"line":10,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"runInBackground","argumentNames":["a"]}
-
-function control_runInBackground__P279_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: control_runInBackground__P279, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function character_setCharacterState__P3743(s) {
+function character_setCharacterState__P33277(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19492,38 +19499,38 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___21102 = undefined;
+    s.state___50598 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_getStateForSprite__P6155_mk(s);
+    s.tmp_0 = character_getStateForSprite__P35677_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 2091; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2096; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___21102 = (r0);
-    s.tmp_0 = character_CharacterState_setManualFlags__P6148_mk(s);
-    s.tmp_0.arg0 = s.state___21102;
+    s.state___50598 = (r0);
+    s.tmp_0 = character_CharacterState_setManualFlags__P35670_mk(s);
+    s.tmp_0.arg0 = s.state___50598;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 2092; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 2097; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_setCharacterState__P3743.info = {"start":18284,"length":160,"line":529,"column":4,"endLine":532,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterState","argumentNames":["sprite","rule"]}
+character_setCharacterState__P33277.info = {"start":18284,"length":160,"line":529,"column":4,"endLine":532,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterState","argumentNames":["sprite","rule"]}
 
-function character_setCharacterState__P3743_mk(s) {
+function character_setCharacterState__P33277_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_setCharacterState__P3743, depth: s.depth + 1,
+        parent: s, fn: character_setCharacterState__P33277, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___21102: undefined,
+  state___50598: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -19532,7 +19539,7 @@ function character_setCharacterState__P3743_mk(s) {
 
 
 
-function character_getStateForSprite__P6155(s) {
+function character_getStateForSprite__P35677(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19542,18 +19549,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sceneState___16583 = undefined;
-    s.state___16590 = undefined;
-    s.unnamed138___U2 = undefined;
-    s.unnamed139___U3 = undefined;
-    s.newState___16601 = undefined;
+    s.sceneState___46078 = undefined;
+    s.state___46085 = undefined;
+    s.unnamed978___U2 = undefined;
+    s.unnamed979___U3 = undefined;
+    s.newState___46096 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_init__P6152_mk(s);
-    s.callLocIdx = 2083; s.pc = 10; return s.tmp_0;
+    s.tmp_0 = character_init__P35674_mk(s);
+    s.callLocIdx = 2088; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -19566,55 +19573,55 @@ switch (step) {
     { step = 9; continue; }
   case 1:
   case 2:
-    s.tmp_2 = r0 = globals.sceneStack___6135;
-    r0 = pxsim_Array__length(globals.sceneStack___6135);
+    s.tmp_2 = r0 = globals.sceneStack___35657;
+    r0 = pxsim_Array__length(globals.sceneStack___35657);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 - 1);
     s.tmp_3 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.tmp_3);
-    s.sceneState___16583 = (r0);
-    s.state___16590 = (undefined);
-    r0 = s.sceneState___16583.fields["characters"];
-    s.unnamed138___U2 = (r0);
-    s.unnamed139___U3 = (0);
+    s.sceneState___46078 = (r0);
+    s.state___46085 = (undefined);
+    r0 = s.sceneState___46078.fields["characters"];
+    s.unnamed978___U2 = (r0);
+    s.unnamed979___U3 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed139___U3;
-    r0 = pxsim_Array__length(s.unnamed138___U2);
+    s.tmp_0 = r0 = s.unnamed979___U3;
+    r0 = pxsim_Array__length(s.unnamed978___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed138___U2, s.unnamed139___U3);
-    s.state___16590 = (r0);
-    r0 = s.state___16590.fields["sprite"];
+    r0 = pxsim_Array__getAt(s.unnamed978___U2, s.unnamed979___U3);
+    s.state___46085 = (r0);
+    r0 = s.state___46085.fields["sprite"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 === s.arg0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    r0 = s.state___16590;
+    r0 = s.state___46085;
     { step = 9; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed139___U3 + 1);
-    s.unnamed139___U3 = (r0);
+    r0 = (s.unnamed979___U3 + 1);
+    s.unnamed979___U3 = (r0);
     { step = 3; continue; }
   case 6:
-    s.unnamed138___U2 = (undefined);
+    s.unnamed978___U2 = (undefined);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterState__C6141_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterState__C35663_VT);
     s.tmp_4 = r0;
-    s.tmp_5 = character_CharacterState_constructor__P6151_mk(s);
+    s.tmp_5 = character_CharacterState_constructor__P35673_mk(s);
     s.tmp_5.arg0 = s.tmp_4;
     s.tmp_5.arg1 = s.arg0;
-    s.callLocIdx = 2084; s.pc = 11; return s.tmp_5;
+    s.callLocIdx = 2089; s.pc = 11; return s.tmp_5;
   case 11:
     r0 = s.retval;
-    s.newState___16601 = (s.tmp_4);
-    r0 = s.sceneState___16583.fields["characters"];
+    s.newState___46096 = (s.tmp_4);
+    r0 = s.sceneState___46078.fields["characters"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.newState___16601);
-    r0 = s.newState___16601;
+    r0 = pxsim_Array__push(s.tmp_0, s.newState___46096);
+    r0 = s.newState___46096;
     { step = 9; continue; }
   case 7:
   case 8:
@@ -19623,12 +19630,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_getStateForSprite__P6155.info = {"start":11331,"length":551,"line":352,"column":4,"endLine":370,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"getStateForSprite","argumentNames":["sprite","createIfNotFound"]}
+character_getStateForSprite__P35677.info = {"start":11331,"length":551,"line":352,"column":4,"endLine":370,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"getStateForSprite","argumentNames":["sprite","createIfNotFound"]}
 
-function character_getStateForSprite__P6155_mk(s) {
+function character_getStateForSprite__P35677_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_getStateForSprite__P6155, depth: s.depth + 1,
+        parent: s, fn: character_getStateForSprite__P35677, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19636,11 +19643,11 @@ function character_getStateForSprite__P6155_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  sceneState___16583: undefined,
-  state___16590: undefined,
-  unnamed138___U2: undefined,
-  unnamed139___U3: undefined,
-  newState___16601: undefined,
+  sceneState___46078: undefined,
+  state___46085: undefined,
+  unnamed978___U2: undefined,
+  unnamed979___U3: undefined,
+  newState___46096: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -19649,7 +19656,7 @@ function character_getStateForSprite__P6155_mk(s) {
 
 
 
-function character_init__P6152(s) {
+function character_init__P35674(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19659,9 +19666,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___6135);
+    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___35657);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_Array__length(globals.sceneStack___6135);
+    r0 = pxsim_Array__length(globals.sceneStack___35657);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -19669,8 +19676,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = character_initScene__P6153_mk(s);
-    s.callLocIdx = 2076; s.pc = 6; return s.tmp_3;
+    s.tmp_3 = character_initScene__P35675_mk(s);
+    s.callLocIdx = 2081; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
   case 1:
@@ -19679,19 +19686,19 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_Array__mk();
-    globals.sceneStack___6135 = (r0);
-    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
-    s.tmp_0.arg0 = character_initScene__P6153;
-    s.callLocIdx = 2077; s.pc = 7; return s.tmp_0;
+    globals.sceneStack___35657 = (r0);
+    s.tmp_0 = game_addScenePushHandler__P31968_mk(s);
+    s.tmp_0.arg0 = character_initScene__P35675;
+    s.callLocIdx = 2082; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
-    s.tmp_0.arg0 = inline__P16655;
-    s.callLocIdx = 2078; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = game_addScenePopHandler__P31970_mk(s);
+    s.tmp_0.arg0 = inline__P46150;
+    s.callLocIdx = 2083; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = character_initScene__P6153_mk(s);
-    s.callLocIdx = 2079; s.pc = 9; return s.tmp_0;
+    s.tmp_0 = character_initScene__P35675_mk(s);
+    s.callLocIdx = 2084; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
   case 5:
@@ -19699,12 +19706,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_init__P6152.info = {"start":10391,"length":376,"line":310,"column":5,"endLine":326,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"init","argumentNames":[]}
+character_init__P35674.info = {"start":10391,"length":376,"line":310,"column":5,"endLine":326,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"init","argumentNames":[]}
 
-function character_init__P6152_mk(s) {
+function character_init__P35674_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_init__P6152, depth: s.depth + 1,
+        parent: s, fn: character_init__P35674, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19716,7 +19723,7 @@ function character_init__P6152_mk(s) {
 
 
 
-function inline__P16655(s) {
+function inline__P46150(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19730,17 +19737,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array_.pop(globals.sceneStack___6135);
+    r0 = pxsim_Array_.pop(globals.sceneStack___35657);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P16655.info = {"start":10659,"length":76,"line":321,"column":33,"endLine":323,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P46150.info = {"start":10659,"length":76,"line":321,"column":33,"endLine":323,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P16655_mk(s) {
+function inline__P46150_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P16655, depth: s.depth + 1,
+        parent: s, fn: inline__P46150, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -19749,7 +19756,7 @@ function inline__P16655_mk(s) {
 
 
 
-function character_initScene__P6153(s) {
+function character_initScene__P35675(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19759,52 +19766,52 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sceneState___16666 = undefined;
-    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimationSceneState__C6136_VT);
+    s.sceneState___46161 = undefined;
+    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimationSceneState__C35658_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = character_CharacterAnimationSceneState_constructor__P6138_mk(s);
+    s.tmp_1 = character_CharacterAnimationSceneState_constructor__P35660_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2080; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 2085; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_Array__push(globals.sceneStack___6135, s.tmp_0);
-    s.tmp_0 = r0 = globals.sceneStack___6135;
-    r0 = pxsim_Array__length(globals.sceneStack___6135);
+    r0 = pxsim_Array__push(globals.sceneStack___35657, s.tmp_0);
+    s.tmp_0 = r0 = globals.sceneStack___35657;
+    r0 = pxsim_Array__length(globals.sceneStack___35657);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    s.sceneState___16666 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P16673);
+    s.sceneState___46161 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P46168);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sceneState___16666);
-    s.tmp_1 = game_onUpdate__P2543_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sceneState___46161);
+    s.tmp_1 = game_onUpdate__P31962_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2082; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 2087; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_initScene__P6153.info = {"start":10774,"length":287,"line":328,"column":5,"endLine":336,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"initScene","argumentNames":[]}
+character_initScene__P35675.info = {"start":10774,"length":287,"line":328,"column":5,"endLine":336,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"initScene","argumentNames":[]}
 
-function character_initScene__P6153_mk(s) {
+function character_initScene__P35675_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_initScene__P6153, depth: s.depth + 1,
+        parent: s, fn: character_initScene__P35675, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  sceneState___16666: undefined,
+  sceneState___46161: undefined,
 } }
 
 
 
 
 
-function inline__P16673(s) {
+function inline__P46168(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19816,9 +19823,9 @@ switch (step) {
 
     r0 = pxsim_numops_toBoolDecr(s.caps[0]);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = character_CharacterAnimationSceneState_update__P6137_mk(s);
+    s.tmp_0 = character_CharacterAnimationSceneState_update__P35659_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 2081; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 2086; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
@@ -19827,12 +19834,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P16673.info = {"start":10945,"length":108,"line":331,"column":23,"endLine":335,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":[]}
+inline__P46168.info = {"start":10945,"length":108,"line":331,"column":23,"endLine":335,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P16673_mk(s) {
+function inline__P46168_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P16673, depth: s.depth + 1,
+        parent: s, fn: inline__P46168, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -19841,7 +19848,7 @@ function inline__P16673_mk(s) {
 
 
 
-function character_CharacterAnimationSceneState_constructor__P6138(s) {
+function character_CharacterAnimationSceneState_constructor__P35660(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19856,7 +19863,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C6136_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C35658_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -19865,12 +19872,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterAnimationSceneState_constructor__P6138.info = {"start":1525,"length":59,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this"]}
+character_CharacterAnimationSceneState_constructor__P35660.info = {"start":1525,"length":59,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this"]}
 
-function character_CharacterAnimationSceneState_constructor__P6138_mk(s) {
+function character_CharacterAnimationSceneState_constructor__P35660_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterAnimationSceneState_constructor__P6138, depth: s.depth + 1,
+        parent: s, fn: character_CharacterAnimationSceneState_constructor__P35660, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19881,7 +19888,7 @@ function character_CharacterAnimationSceneState_constructor__P6138_mk(s) {
 
 
 
-function character_CharacterAnimationSceneState_update__P6137(s) {
+function character_CharacterAnimationSceneState_update__P35659(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19891,66 +19898,66 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dt___16678 = undefined;
-    s.cleanup___16683 = undefined;
-    s.character___16685 = undefined;
-    s.unnamed132___U3 = undefined;
-    s.unnamed133___U4 = undefined;
+    s.dt___46173 = undefined;
+    s.cleanup___46178 = undefined;
+    s.character___46180 = undefined;
+    s.unnamed972___U3 = undefined;
+    s.unnamed973___U4 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C6136_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 2042; s.pc = 7; return s.tmp_0;
+    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C35658_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 2047; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = r0.fields["eventContext"];
     r0 = r0.fields["deltaTimeMillis"];
-    s.dt___16678 = (r0);
-    s.cleanup___16683 = (false);
-    s.character___16685 = (undefined);
+    s.dt___46173 = (r0);
+    s.cleanup___46178 = (false);
+    s.character___46180 = (undefined);
     r0 = s.arg0.fields["characters"];
-    s.unnamed132___U3 = (r0);
-    s.unnamed133___U4 = (0);
+    s.unnamed972___U3 = (r0);
+    s.unnamed973___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed133___U4;
-    r0 = pxsim_Array__length(s.unnamed132___U3);
+    s.tmp_0 = r0 = s.unnamed973___U4;
+    r0 = pxsim_Array__length(s.unnamed972___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed132___U3, s.unnamed133___U4);
-    s.character___16685 = (r0);
-    r0 = s.character___16685.fields["sprite"];
+    r0 = pxsim_Array__getAt(s.unnamed972___U3, s.unnamed973___U4);
+    s.character___46180 = (r0);
+    r0 = s.character___46180.fields["sprite"];
     r0 = r0.fields["flags"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 2);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 2; continue; }
-    s.cleanup___16683 = (true);
+    s.cleanup___46178 = (true);
   case 2:
   case 3:
-    s.tmp_0 = character_CharacterState_update__P6145_mk(s);
-    s.tmp_0.arg0 = s.character___16685;
-    s.tmp_0.arg1 = s.dt___16678;
-    s.callLocIdx = 2043; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = character_CharacterState_update__P35667_mk(s);
+    s.tmp_0.arg0 = s.character___46180;
+    s.tmp_0.arg1 = s.dt___46173;
+    s.callLocIdx = 2048; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = (s.unnamed133___U4 + 1);
-    s.unnamed133___U4 = (r0);
+    r0 = (s.unnamed973___U4 + 1);
+    s.unnamed973___U4 = (r0);
     { step = 1; continue; }
   case 4:
-    s.unnamed132___U3 = (undefined);
-    r0 = pxsim_numops_toBoolDecr(s.cleanup___16683);
+    s.unnamed972___U3 = (undefined);
+    r0 = pxsim_numops_toBoolDecr(s.cleanup___46178);
     if (!r0) { step = 5; continue; }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P29643_mk(s);
     r0 = s.arg0.fields["characters"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P16703;
-    s.callLocIdx = 2044; s.pc = 9; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P46198;
+    s.callLocIdx = 2049; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -19961,22 +19968,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterAnimationSceneState_update__P6137.info = {"start":1594,"length":483,"line":56,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this"]}
+character_CharacterAnimationSceneState_update__P35659.info = {"start":1594,"length":483,"line":56,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this"]}
 
-function character_CharacterAnimationSceneState_update__P6137_mk(s) {
+function character_CharacterAnimationSceneState_update__P35659_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterAnimationSceneState_update__P6137, depth: s.depth + 1,
+        parent: s, fn: character_CharacterAnimationSceneState_update__P35659, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  dt___16678: undefined,
-  cleanup___16683: undefined,
-  character___16685: undefined,
-  unnamed132___U3: undefined,
-  unnamed133___U4: undefined,
+  dt___46173: undefined,
+  cleanup___46178: undefined,
+  character___46180: undefined,
+  unnamed972___U3: undefined,
+  unnamed973___U4: undefined,
   arg0: undefined,
 } }
 
@@ -19984,7 +19991,7 @@ function character_CharacterAnimationSceneState_update__P6137_mk(s) {
 
 
 
-function inline__P16703(s) {
+function inline__P46198(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20009,12 +20016,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P16703.info = {"start":1989,"length":63,"line":66,"column":57,"endLine":66,"endColumn":120,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["character"]}
+inline__P46198.info = {"start":1989,"length":63,"line":66,"column":57,"endLine":66,"endColumn":120,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["character"]}
 
-function inline__P16703_mk(s) {
+function inline__P46198_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P16703, depth: s.depth + 1,
+        parent: s, fn: inline__P46198, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20026,7 +20033,7 @@ function inline__P16703_mk(s) {
 
 
 
-function character_CharacterState_update__P6145(s) {
+function character_CharacterState_update__P35667(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20036,27 +20043,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___16714 = undefined;
-    s.newAnimation___16940 = undefined;
+    s.state___46209 = undefined;
+    s.newAnimation___46435 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
-    s.state___16714 = (0);
-    s.tmp_2 = Sprite_vx__P2029_mk(s);
+    if (!checkSubtype(r0, character_CharacterState__C35663_VT)) failedCast(r0);
+    s.state___46209 = (0);
+    s.tmp_2 = Sprite_vx__P31448_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2049; s.pc = 66; return s.tmp_2;
+    s.callLocIdx = 2054; s.pc = 66; return s.tmp_2;
   case 66:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Sprite_vy__P2031_mk(s);
+    s.tmp_4 = Sprite_vy__P31450_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 2050; s.pc = 67; return s.tmp_4;
+    s.callLocIdx = 2055; s.pc = 67; return s.tmp_4;
   case 67:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -20064,12 +20071,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = (s.state___16714 | 2);
-    s.state___16714 = (r0);
-    s.tmp_2 = Sprite_vx__P2029_mk(s);
+    r0 = (s.state___46209 | 2);
+    s.state___46209 = (r0);
+    s.tmp_2 = Sprite_vx__P31448_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2051; s.pc = 68; return s.tmp_2;
+    s.callLocIdx = 2056; s.pc = 68; return s.tmp_2;
   case 68:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20077,7 +20084,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = r0 = s.state___16714;
+    s.tmp_3 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (8 & s.tmp_6);
@@ -20085,13 +20092,13 @@ switch (step) {
     r0 = (s.tmp_5 | 128);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
     { step = 4; continue; }
   case 1:
-    s.tmp_2 = Sprite_vx__P2029_mk(s);
+    s.tmp_2 = Sprite_vx__P31448_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2052; s.pc = 69; return s.tmp_2;
+    s.callLocIdx = 2057; s.pc = 69; return s.tmp_2;
   case 69:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20099,7 +20106,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_3 = r0 = s.state___16714;
+    s.tmp_3 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (32 & s.tmp_6);
@@ -20107,14 +20114,14 @@ switch (step) {
     r0 = (s.tmp_5 | 512);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
   case 2:
   case 3:
   case 4:
-    s.tmp_2 = Sprite_vy__P2031_mk(s);
+    s.tmp_2 = Sprite_vy__P31450_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2053; s.pc = 70; return s.tmp_2;
+    s.callLocIdx = 2058; s.pc = 70; return s.tmp_2;
   case 70:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20122,7 +20129,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_3 = r0 = s.state___16714;
+    s.tmp_3 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (16 & s.tmp_6);
@@ -20130,13 +20137,13 @@ switch (step) {
     r0 = (s.tmp_5 | 256);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
     { step = 8; continue; }
   case 5:
-    s.tmp_2 = Sprite_vy__P2031_mk(s);
+    s.tmp_2 = Sprite_vy__P31450_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2054; s.pc = 71; return s.tmp_2;
+    s.callLocIdx = 2059; s.pc = 71; return s.tmp_2;
   case 71:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20144,7 +20151,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_3 = r0 = s.state___16714;
+    s.tmp_3 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (4 & s.tmp_6);
@@ -20152,11 +20159,11 @@ switch (step) {
     r0 = (s.tmp_5 | 64);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
   case 6:
   case 7:
   case 8:
-    r0 = (s.state___16714 & 60);
+    r0 = (s.state___46209 & 60);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -20164,21 +20171,21 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_3 = r0 = s.state___16714;
+    s.tmp_3 = r0 = s.state___46209;
     r0 = s.arg0.fields["lastState"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 & 60);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
   case 9:
   case 10:
     { step = 26; continue; }
   case 11:
-    s.tmp_2 = Sprite_x__P2025_mk(s);
+    s.tmp_2 = Sprite_x__P31444_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2055; s.pc = 72; return s.tmp_2;
+    s.callLocIdx = 2060; s.pc = 72; return s.tmp_2;
   case 72:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20191,10 +20198,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 13; continue; }
   case 12:
-    s.tmp_5 = Sprite_y__P2027_mk(s);
+    s.tmp_5 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_5.arg0 = r0;
-    s.callLocIdx = 2056; s.pc = 73; return s.tmp_5;
+    s.callLocIdx = 2061; s.pc = 73; return s.tmp_5;
   case 73:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -20206,12 +20213,12 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 24; continue; }
-    r0 = (s.state___16714 | 2);
-    s.state___16714 = (r0);
-    s.tmp_2 = Sprite_x__P2025_mk(s);
+    r0 = (s.state___46209 | 2);
+    s.state___46209 = (r0);
+    s.tmp_2 = Sprite_x__P31444_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2057; s.pc = 74; return s.tmp_2;
+    s.callLocIdx = 2062; s.pc = 74; return s.tmp_2;
   case 74:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20221,7 +20228,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_4 = r0 = s.state___16714;
+    s.tmp_4 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (8 & s.tmp_7);
@@ -20229,13 +20236,13 @@ switch (step) {
     r0 = (s.tmp_6 | 128);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
     { step = 17; continue; }
   case 14:
-    s.tmp_2 = Sprite_x__P2025_mk(s);
+    s.tmp_2 = Sprite_x__P31444_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2058; s.pc = 75; return s.tmp_2;
+    s.callLocIdx = 2063; s.pc = 75; return s.tmp_2;
   case 75:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20245,7 +20252,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_4 = r0 = s.state___16714;
+    s.tmp_4 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (32 & s.tmp_7);
@@ -20253,14 +20260,14 @@ switch (step) {
     r0 = (s.tmp_6 | 512);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
   case 15:
   case 16:
   case 17:
-    s.tmp_2 = Sprite_y__P2027_mk(s);
+    s.tmp_2 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2059; s.pc = 76; return s.tmp_2;
+    s.callLocIdx = 2064; s.pc = 76; return s.tmp_2;
   case 76:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20270,7 +20277,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.tmp_4 = r0 = s.state___16714;
+    s.tmp_4 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (16 & s.tmp_7);
@@ -20278,13 +20285,13 @@ switch (step) {
     r0 = (s.tmp_6 | 256);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
     { step = 21; continue; }
   case 18:
-    s.tmp_2 = Sprite_y__P2027_mk(s);
+    s.tmp_2 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2060; s.pc = 77; return s.tmp_2;
+    s.callLocIdx = 2065; s.pc = 77; return s.tmp_2;
   case 77:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20294,7 +20301,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    s.tmp_4 = r0 = s.state___16714;
+    s.tmp_4 = r0 = s.state___46209;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (4 & s.tmp_7);
@@ -20302,11 +20309,11 @@ switch (step) {
     r0 = (s.tmp_6 | 64);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
   case 19:
   case 20:
   case 21:
-    r0 = (s.state___16714 & 60);
+    r0 = (s.state___46209 & 60);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -20314,98 +20321,98 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    s.tmp_3 = r0 = s.state___16714;
+    s.tmp_3 = r0 = s.state___46209;
     r0 = s.arg0.fields["lastState"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 & 60);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
   case 22:
   case 23:
     { step = 25; continue; }
   case 24:
-    r0 = (s.state___16714 | 1);
-    s.state___16714 = (r0);
-    s.tmp_0 = r0 = s.state___16714;
+    r0 = (s.state___46209 | 1);
+    s.state___46209 = (r0);
+    s.tmp_0 = r0 = s.state___46209;
     r0 = s.arg0.fields["lastState"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 60);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 | s.tmp_1);
-    s.state___16714 = (r0);
+    s.state___46209 = (r0);
   case 25:
   case 26:
-    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P31500_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 3;
-    s.callLocIdx = 2061; s.pc = 78; return s.tmp_1;
+    s.callLocIdx = 2066; s.pc = 78; return s.tmp_1;
   case 78:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 27; continue; }
-    r0 = (s.state___16714 | 4096);
-    s.state___16714 = (r0);
+    r0 = (s.state___46209 | 4096);
+    s.state___46209 = (r0);
   case 27:
   case 28:
-    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P31500_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 1;
-    s.callLocIdx = 2062; s.pc = 79; return s.tmp_1;
+    s.callLocIdx = 2067; s.pc = 79; return s.tmp_1;
   case 79:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 29; continue; }
-    r0 = (s.state___16714 | 1024);
-    s.state___16714 = (r0);
+    r0 = (s.state___46209 | 1024);
+    s.state___46209 = (r0);
   case 29:
   case 30:
-    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P31500_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 2;
-    s.callLocIdx = 2063; s.pc = 80; return s.tmp_1;
+    s.callLocIdx = 2068; s.pc = 80; return s.tmp_1;
   case 80:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 31; continue; }
-    r0 = (s.state___16714 | 2048);
-    s.state___16714 = (r0);
+    r0 = (s.state___46209 | 2048);
+    s.state___46209 = (r0);
   case 31:
   case 32:
-    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P31500_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 2064; s.pc = 81; return s.tmp_1;
+    s.callLocIdx = 2069; s.pc = 81; return s.tmp_1;
   case 81:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 33; continue; }
-    r0 = (s.state___16714 | 8192);
-    s.state___16714 = (r0);
+    r0 = (s.state___46209 | 8192);
+    s.state___46209 = (r0);
   case 33:
   case 34:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_x__P2025_mk(s);
+    s.tmp_2 = Sprite_x__P31444_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2065; s.pc = 82; return s.tmp_2;
+    s.callLocIdx = 2070; s.pc = 82; return s.tmp_2;
   case 82:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["lastX"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_y__P2027_mk(s);
+    s.tmp_2 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2066; s.pc = 83; return s.tmp_2;
+    s.callLocIdx = 2071; s.pc = 83; return s.tmp_2;
   case 83:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20417,32 +20424,32 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 36; continue; }
   case 35:
-    r0 = s.state___16714;
+    r0 = s.state___46209;
   case 36:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = character_CharacterState_pickRule__P6150_mk(s);
+    s.tmp_2 = character_CharacterState_pickRule__P35672_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 2067; s.pc = 84; return s.tmp_2;
+    s.callLocIdx = 2072; s.pc = 84; return s.tmp_2;
   case 84:
     r0 = s.retval;
-    s.newAnimation___16940 = (r0);
+    s.newAnimation___46435 = (r0);
     r0 = s.arg0.fields["current"];
     s.tmp_1 = r0;
-    r0 = (s.newAnimation___16940 !== s.tmp_1);
+    r0 = (s.newAnimation___46435 !== s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 45; continue; }
     r0 = (s.arg0).fields["frame"] = (0);
     r0 = (s.arg0).fields["timer"] = (0);
-    s.tmp_0 = r0 = s.newAnimation___16940;
+    s.tmp_0 = r0 = s.newAnimation___46435;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 37; continue; }
     r0 = s.tmp_0;
     { step = 38; continue; }
   case 37:
-    r0 = s.newAnimation___16940.fields["startFrames"];
+    r0 = s.newAnimation___46435.fields["startFrames"];
   case 38:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -20456,7 +20463,7 @@ switch (step) {
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["runningStartFrames"] = (s.tmp_3);
-    r0 = (s.arg0).fields["current"] = (s.newAnimation___16940);
+    r0 = (s.arg0).fields["current"] = (s.newAnimation___46435);
     r0 = s.arg0.fields["current"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -20474,7 +20481,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 41; continue; }
-    s.tmp_3 = Sprite_setImage__P2056_mk(s);
+    s.tmp_3 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_3.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20482,12 +20489,12 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_Array__getAt(s.tmp_4, 0);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 2068; s.pc = 85; return s.tmp_3;
+    s.callLocIdx = 2073; s.pc = 85; return s.tmp_3;
   case 85:
     r0 = s.retval;
     { step = 42; continue; }
   case 41:
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20495,7 +20502,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, 0);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2069; s.pc = 86; return s.tmp_0;
+    s.callLocIdx = 2074; s.pc = 86; return s.tmp_0;
   case 86:
     r0 = s.retval;
   case 42:
@@ -20588,7 +20595,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 54; continue; }
-    s.tmp_1 = Sprite_setImage__P2056_mk(s);
+    s.tmp_1 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20596,7 +20603,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, 0);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 2070; s.pc = 87; return s.tmp_1;
+    s.callLocIdx = 2075; s.pc = 87; return s.tmp_1;
   case 87:
     r0 = s.retval;
     r0 = (s.arg0).fields["timer"] = (0);
@@ -20605,7 +20612,7 @@ switch (step) {
   case 55:
     { step = 57; continue; }
   case 56:
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20615,7 +20622,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2071; s.pc = 88; return s.tmp_0;
+    s.callLocIdx = 2076; s.pc = 88; return s.tmp_0;
   case 88:
     r0 = s.retval;
   case 57:
@@ -20660,7 +20667,7 @@ switch (step) {
     r0 = (s.tmp_2 % s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["frame"] = (s.tmp_1);
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20670,7 +20677,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2072; s.pc = 89; return s.tmp_0;
+    s.callLocIdx = 2077; s.pc = 89; return s.tmp_0;
   case 89:
     r0 = s.retval;
     { step = 60; continue; }
@@ -20683,12 +20690,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_update__P6145.info = {"start":4439,"length":4624,"line":148,"column":8,"endLine":263,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this","dt"]}
+character_CharacterState_update__P35667.info = {"start":4439,"length":4624,"line":148,"column":8,"endLine":263,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function character_CharacterState_update__P6145_mk(s) {
+function character_CharacterState_update__P35667_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_update__P6145, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_update__P35667, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20699,8 +20706,8 @@ function character_CharacterState_update__P6145_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  state___16714: undefined,
-  newAnimation___16940: undefined,
+  state___46209: undefined,
+  newAnimation___46435: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -20709,7 +20716,7 @@ function character_CharacterState_update__P6145_mk(s) {
 
 
 
-function character_CharacterState_pickRule__P6150(s) {
+function character_CharacterState_pickRule__P35672(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20719,22 +20726,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.best___17098 = undefined;
-    s.bestScore___17101 = undefined;
-    s.currentScore___17110 = undefined;
-    s.animation___17112 = undefined;
-    s.unnamed136___U4 = undefined;
-    s.unnamed137___U5 = undefined;
+    s.best___46593 = undefined;
+    s.bestScore___46596 = undefined;
+    s.currentScore___46605 = undefined;
+    s.animation___46607 = undefined;
+    s.unnamed976___U4 = undefined;
+    s.unnamed977___U5 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C35663_VT)) failedCast(r0);
     r0 = (s.arg0).fields["lastState"] = (s.arg1);
     r0 = s.arg0.fields["current"];
-    s.best___17098 = (r0);
+    s.best___46593 = (r0);
     r0 = s.arg0.fields["current"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -20742,58 +20749,58 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_1 = character_score__P6154_mk(s);
+    s.tmp_1 = character_score__P35676_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    r0 = s.best___17098.fields["rule"];
+    r0 = s.best___46593.fields["rule"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 2074; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 2079; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.bestScore___17101 = (s.tmp_2);
-    s.animation___17112 = (undefined);
+    s.bestScore___46596 = (s.tmp_2);
+    s.animation___46607 = (undefined);
     r0 = s.arg0.fields["animations"];
-    s.unnamed136___U4 = (r0);
-    s.unnamed137___U5 = (0);
+    s.unnamed976___U4 = (r0);
+    s.unnamed977___U5 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed137___U5;
-    r0 = pxsim_Array__length(s.unnamed136___U4);
+    s.tmp_0 = r0 = s.unnamed977___U5;
+    r0 = pxsim_Array__length(s.unnamed976___U4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed136___U4, s.unnamed137___U5);
-    s.animation___17112 = (r0);
-    s.tmp_2 = character_score__P6154_mk(s);
+    r0 = pxsim_Array__getAt(s.unnamed976___U4, s.unnamed977___U5);
+    s.animation___46607 = (r0);
+    s.tmp_2 = character_score__P35676_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    r0 = s.animation___17112.fields["rule"];
+    r0 = s.animation___46607.fields["rule"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 2075; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 2080; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
-    s.currentScore___17110 = (r0);
-    r0 = (s.currentScore___17110 > s.bestScore___17101);
+    s.currentScore___46605 = (r0);
+    r0 = (s.currentScore___46605 > s.bestScore___46596);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.bestScore___17101 = (s.currentScore___17110);
-    s.best___17098 = (s.animation___17112);
+    s.bestScore___46596 = (s.currentScore___46605);
+    s.best___46593 = (s.animation___46607);
   case 4:
   case 5:
-    r0 = (s.unnamed137___U5 + 1);
-    s.unnamed137___U5 = (r0);
+    r0 = (s.unnamed977___U5 + 1);
+    s.unnamed977___U5 = (r0);
     { step = 3; continue; }
   case 6:
-    s.unnamed136___U4 = (undefined);
-    r0 = (s.bestScore___17101 === 0);
+    s.unnamed976___U4 = (undefined);
+    r0 = (s.bestScore___46596 === 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 7; continue; }
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    r0 = (s.bestScore___17101 == undefined);
+    r0 = (s.bestScore___46596 == undefined);
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -20803,27 +20810,27 @@ switch (step) {
     { step = 11; continue; }
   case 9:
   case 10:
-    r0 = s.best___17098;
+    r0 = s.best___46593;
   case 11:
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_pickRule__P6150.info = {"start":9567,"length":811,"line":286,"column":8,"endLine":307,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"pickRule","argumentNames":["this","state"]}
+character_CharacterState_pickRule__P35672.info = {"start":9567,"length":811,"line":286,"column":8,"endLine":307,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"pickRule","argumentNames":["this","state"]}
 
-function character_CharacterState_pickRule__P6150_mk(s) {
+function character_CharacterState_pickRule__P35672_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_pickRule__P6150, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_pickRule__P35672, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  best___17098: undefined,
-  bestScore___17101: undefined,
-  currentScore___17110: undefined,
-  animation___17112: undefined,
-  unnamed136___U4: undefined,
-  unnamed137___U5: undefined,
+  best___46593: undefined,
+  bestScore___46596: undefined,
+  currentScore___46605: undefined,
+  animation___46607: undefined,
+  unnamed976___U4: undefined,
+  unnamed977___U5: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -20832,7 +20839,7 @@ function character_CharacterState_pickRule__P6150_mk(s) {
 
 
 
-function character_score__P6154(s) {
+function character_score__P35676(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20842,15 +20849,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___17137 = undefined;
-    s.check___17138 = undefined;
+    s.res___46632 = undefined;
+    s.check___46633 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.res___17137 = (0);
-    s.check___17138 = (s.arg0);
+    s.res___46632 = (0);
+    s.check___46633 = (s.arg0);
     r0 = (s.arg0 & s.arg1);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 ^ s.arg1);
@@ -20862,37 +20869,37 @@ switch (step) {
   case 1:
   case 2:
   case 3:
-    r0 = pxsim_numops_toBoolDecr(s.check___17138);
+    r0 = pxsim_numops_toBoolDecr(s.check___46633);
     if (!r0) { step = 6; continue; }
-    r0 = (s.check___17138 & 1);
+    r0 = (s.check___46633 & 1);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    r0 = (s.res___17137 + 1);
-    s.res___17137 = (r0);
+    r0 = (s.res___46632 + 1);
+    s.res___46632 = (r0);
   case 4:
   case 5:
-    r0 = (s.check___17138 >> 1);
-    s.check___17138 = (r0);
+    r0 = (s.check___46633 >> 1);
+    s.check___46633 = (r0);
     { step = 3; continue; }
   case 6:
-    r0 = s.res___17137;
+    r0 = s.res___46632;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-character_score__P6154.info = {"start":11067,"length":258,"line":338,"column":4,"endLine":350,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"score","argumentNames":["state","rule"]}
+character_score__P35676.info = {"start":11067,"length":258,"line":338,"column":4,"endLine":350,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"score","argumentNames":["state","rule"]}
 
-function character_score__P6154_mk(s) {
+function character_score__P35676_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_score__P6154, depth: s.depth + 1,
+        parent: s, fn: character_score__P35676, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  res___17137: undefined,
-  check___17138: undefined,
+  res___46632: undefined,
+  check___46633: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -20901,7 +20908,7 @@ function character_score__P6154_mk(s) {
 
 
 
-function Sprite_isHittingTile__P2081(s) {
+function Sprite_isHittingTile__P31500(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20917,7 +20924,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_obstacles"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -20943,12 +20950,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_isHittingTile__P2081.info = {"start":25208,"length":125,"line":765,"column":4,"endLine":767,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isHittingTile","argumentNames":["this","direction"]}
+Sprite_isHittingTile__P31500.info = {"start":25208,"length":125,"line":765,"column":4,"endLine":767,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"isHittingTile","argumentNames":["this","direction"]}
 
-function Sprite_isHittingTile__P2081_mk(s) {
+function Sprite_isHittingTile__P31500_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isHittingTile__P2081, depth: s.depth + 1,
+        parent: s, fn: Sprite_isHittingTile__P31500, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20965,7 +20972,7 @@ function Sprite_isHittingTile__P2081_mk(s) {
 
 
 
-function game_onUpdate__P2543(s) {
+function game_onUpdate__P31962(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20979,9 +20986,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P4356_mk(s);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1208; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1165; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -20993,15 +21000,15 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = control_EventContext_registerFrameHandler__P392_mk(s);
-    s.tmp_3 = game_eventContext__P2535_mk(s);
-    s.callLocIdx = 1209; s.pc = 6; return s.tmp_3;
+    s.tmp_2 = control_EventContext_registerFrameHandler__P29927_mk(s);
+    s.tmp_3 = game_eventContext__P31954_mk(s);
+    s.callLocIdx = 1166; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 20;
     s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1210; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1167; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -21009,12 +21016,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onUpdate__P2543.info = {"start":7427,"length":169,"line":242,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onUpdate","argumentNames":["a"]}
+game_onUpdate__P31962.info = {"start":7427,"length":169,"line":242,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"onUpdate","argumentNames":["a"]}
 
-function game_onUpdate__P2543_mk(s) {
+function game_onUpdate__P31962_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onUpdate__P2543, depth: s.depth + 1,
+        parent: s, fn: game_onUpdate__P31962, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21027,7 +21034,7 @@ function game_onUpdate__P2543_mk(s) {
 
 
 
-function game_init__P4356(s) {
+function game_init__P33849(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21041,7 +21048,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scene___4348);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___33841);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -21056,73 +21063,73 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(scene_Scene__C2419_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Scene__C31838_VT);
     s.tmp_3 = r0;
-    s.tmp_4 = scene_Scene_constructor__P2440_mk(s);
+    s.tmp_4 = scene_Scene_constructor__P31859_mk(s);
     s.tmp_4.arg0 = s.tmp_3;
-    s.tmp_5 = control_pushEventContext__P398_mk(s);
-    s.callLocIdx = 1154; s.pc = 14; return s.tmp_5;
+    s.tmp_5 = control_pushEventContext__P29933_mk(s);
+    s.callLocIdx = 1111; s.pc = 14; return s.tmp_5;
   case 14:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
-    s.tmp_4.arg2 = globals._scene___4348;
-    s.callLocIdx = 1155; s.pc = 13; return s.tmp_4;
+    s.tmp_4.arg2 = globals._scene___33841;
+    s.callLocIdx = 1112; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
-    globals._scene___4348 = (s.tmp_3);
+    globals._scene___33841 = (s.tmp_3);
   case 3:
   case 4:
-    s.tmp_0 = scene_Scene_init__P2441_mk(s);
-    s.tmp_0.arg0 = globals._scene___4348;
-    s.callLocIdx = 1156; s.pc = 15; return s.tmp_0;
+    s.tmp_0 = scene_Scene_init__P31860_mk(s);
+    s.tmp_0.arg0 = globals._scene___33841;
+    s.callLocIdx = 1113; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.winEffect___2530);
+    r0 = pxsim_numops_toBoolDecr(globals.winEffect___31949);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    globals.winEffect___2530 = (globals.confetti___2801);
+    globals.winEffect___31949 = (globals.confetti___32220);
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(globals.loseEffect___2531);
+    r0 = pxsim_numops_toBoolDecr(globals.loseEffect___31950);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    globals.loseEffect___2531 = (globals.melt___2822);
+    globals.loseEffect___31950 = (globals.melt___32241);
   case 7:
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals.winSound___4347);
+    r0 = pxsim_numops_toBoolDecr(globals.winSound___33840);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    globals.winSound___4347 = (globals.powerUp___1618);
+    globals.winSound___33840 = (globals.powerUp___32298);
   case 9:
   case 10:
-    r0 = pxsim_numops_toBoolDecr(globals.loseSound___4345);
+    r0 = pxsim_numops_toBoolDecr(globals.loseSound___33838);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    globals.loseSound___4345 = (globals.wawawawaa___1615);
+    globals.loseSound___33838 = (globals.wawawawaa___32295);
   case 11:
   case 12:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_init__P4356.info = {"start":1202,"length":452,"line":45,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"init","argumentNames":["forceNewScene"]}
+game_init__P33849.info = {"start":1202,"length":452,"line":45,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"init","argumentNames":["forceNewScene"]}
 
-function game_init__P4356_mk(s) {
+function game_init__P33849_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_init__P4356, depth: s.depth + 1,
+        parent: s, fn: game_init__P33849, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21137,7 +21144,7 @@ function game_init__P4356_mk(s) {
 
 
 
-function inline__P9231(s) {
+function music_Melody_constructor__P32281(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21147,87 +21154,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rounds___9234 = undefined;
-    s.j___9242 = undefined;
-    s.x___9247 = undefined;
-    s.y___9253 = undefined;
-    s.c___9259 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.width(s.arg0);
-    s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.height(s.arg0);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 * s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 >> 5);
-    s.rounds___9234 = (r0);
-    s.j___9242 = (0);
-  case 1:
-    r0 = (s.j___9242 < s.rounds___9234);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_FastRandom_randomRange__P2590_mk(s);
-    s.tmp_1.arg0 = s.arg1;
-    s.tmp_1.arg1 = 0;
-    r0 = pxsim_ImageMethods.width(s.arg0);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 - 1);
-    s.tmp_1.arg2 = r0;
-    s.callLocIdx = 53; s.pc = 3; return s.tmp_1;
-  case 3:
-    r0 = s.retval;
-    s.x___9247 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = 0;
-    r0 = pxsim_ImageMethods.height(s.arg0);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 - 3);
-    s.tmp_0.arg2 = r0;
-    s.callLocIdx = 54; s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-    s.y___9253 = (r0);
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___9247, s.y___9253);
-    s.c___9259 = (r0);
-    s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.x___9247;
-    r0 = (s.y___9253 + 1);
-    s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___9259);
-    s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.x___9247;
-    r0 = (s.y___9253 + 2);
-    s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___9259);
-    r0 = (s.j___9242 + 1);
-    s.j___9242 = (r0);
-    { step = 1; continue; }
-  case 2:
+    r0 = s.arg0;
+    if (!checkSubtype(r0, music_Melody__C32278_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["_text"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P9231.info = {"start":2652,"length":386,"line":72,"column":45,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["input","r"]}
+music_Melody_constructor__P32281.info = {"start":6328,"length":67,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"inline","argumentNames":["this","text"]}
 
-function inline__P9231_mk(s) {
+function music_Melody_constructor__P32281_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P9231, depth: s.depth + 1,
+        parent: s, fn: music_Melody_constructor__P32281, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  rounds___9234: undefined,
-  j___9242: undefined,
-  x___9247: undefined,
-  y___9253: undefined,
-  c___9259: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -21236,7 +21181,7 @@ function inline__P9231_mk(s) {
 
 
 
-function Math_FastRandom_randomRange__P2590(s) {
+function inline__P38768(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21246,264 +21191,87 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.rounds___38771 = undefined;
+    s.j___38779 = undefined;
+    s.x___38784 = undefined;
+    s.y___38790 = undefined;
+    s.c___38796 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
-    r0 = (s.arg2 > s.arg1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    s.tmp_2 = Math_FastRandom_next__P2589_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1344; s.pc = 3; return s.tmp_2;
-  case 3:
-    r0 = s.retval;
+    r0 = pxsim_ImageMethods.width(s.arg0);
     s.tmp_1 = r0;
-    r0 = (s.arg2 - s.arg1);
-    s.tmp_4 = r0;
-    r0 = (s.tmp_4 + 1);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_1 % s.tmp_3);
-    { step = 2; continue; }
-  case 1:
-    r0 = 0;
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_5 = r0;
-    r0 = (s.arg1 + s.tmp_5);
-    return leave(s, r0)
-  default: oops()
-} } }
-Math_FastRandom_randomRange__P2590.info = {"start":2079,"length":131,"line":62,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"randomRange","argumentNames":["this","min","max"]}
-
-function Math_FastRandom_randomRange__P2590_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: Math_FastRandom_randomRange__P2590, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-} }
-
-
-
-
-
-function Math_FastRandom_next__P2589(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = s.arg0.fields["lfsr"];
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> 1);
+    r0 = pxsim_ImageMethods.height(s.arg0);
     s.tmp_2 = r0;
-    r0 = s.arg0.fields["lfsr"];
-    s.tmp_7 = r0;
-    r0 = (s.tmp_7 & 1);
-    s.tmp_6 = r0;
-    r0 = (0 - s.tmp_6);
-    s.tmp_5 = r0;
-    r0 = (s.tmp_5 & 46080);
-    s.tmp_4 = r0;
-    r0 = (s.tmp_2 ^ s.tmp_4);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["lfsr"] = (s.tmp_1);
-    r0 = s.tmp_1;
-    return leave(s, r0)
-  default: oops()
-} } }
-Math_FastRandom_next__P2589.info = {"start":1713,"length":107,"line":53,"column":8,"endLine":55,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"next","argumentNames":["this"]}
-
-function Math_FastRandom_next__P2589_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: Math_FastRandom_next__P2589, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function effects_ImageEffect_constructor__P2817(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["effect"] = (s.arg2);
-    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C2586_VT);
+    r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P2588_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1650; s.pc = 1; return s.tmp_1;
+    r0 = (s.tmp_0 >> 5);
+    s.rounds___38771 = (r0);
+    s.j___38779 = (0);
   case 1:
-    r0 = s.retval;
-    r0 = (s.arg0).fields["fastRandom"] = (s.tmp_0);
-    r0 = (s.arg0).fields["preferredDelay"] = (s.arg1);
-    r0 = (s.arg0).fields["times"] = (undefined);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-effects_ImageEffect_constructor__P2817.info = {"start":410,"length":290,"line":10,"column":8,"endLine":15,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["this","defaultRate","effectFactory"]}
-
-function effects_ImageEffect_constructor__P2817_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: effects_ImageEffect_constructor__P2817, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-} }
-
-
-
-
-
-function inline__P9339(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.factory___9342 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ConfettiFactory__C2745_VT);
+    r0 = (s.j___38779 < s.rounds___38771);
     s.tmp_0 = r0;
-    s.tmp_2 = if_width_1_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    if (!s.tmp_2.arg0.vtable.iface) {
-      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "width");
-    } else {
-      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["width"];
-      if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["width"]; }
-      else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 41; s.pc = 3; return s.tmp_2; }
-    }
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    s.tmp_1 = Math_FastRandom_randomRange__P32009_mk(s);
+    s.tmp_1.arg0 = s.arg1;
+    s.tmp_1.arg1 = 0;
+    r0 = pxsim_ImageMethods.width(s.arg0);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 - 1);
+    s.tmp_1.arg2 = r0;
+    s.callLocIdx = 51; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
+    s.x___38784 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P32009_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.tmp_0.arg1 = 0;
+    r0 = pxsim_ImageMethods.height(s.arg0);
     s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    if (!r0) { step = 1; continue; }
-    s.tmp_3 = if_width_1_mk(s);
-    s.tmp_3.arg0 = s.arg0;
-    if (!s.tmp_3.arg0.vtable.iface) {
-      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "width");
-    } else {
-      s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["width"];
-      if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["width"]; }
-      else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 42; s.pc = 4; return s.tmp_3; }
-    }
+    r0 = (s.tmp_1 - 3);
+    s.tmp_0.arg2 = r0;
+    s.callLocIdx = 52; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    { step = 2; continue; }
-  case 1:
-    r0 = 16;
+    s.y___38790 = (r0);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___38784, s.y___38790);
+    s.c___38796 = (r0);
+    s.tmp_0 = r0 = s.arg0;
+    s.tmp_1 = r0 = s.x___38784;
+    r0 = (s.y___38790 + 1);
+    s.tmp_2 = r0;
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___38796);
+    s.tmp_0 = r0 = s.arg0;
+    s.tmp_1 = r0 = s.x___38784;
+    r0 = (s.y___38790 + 2);
+    s.tmp_2 = r0;
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___38796);
+    r0 = (s.j___38779 + 1);
+    s.j___38779 = (r0);
+    { step = 1; continue; }
   case 2:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    s.tmp_5 = particles_ConfettiFactory_constructor__P2746_mk(s);
-    s.tmp_5.arg0 = s.tmp_0;
-    s.tmp_5.arg1 = s.tmp_4;
-    s.tmp_5.arg2 = 16;
-    s.callLocIdx = 43; s.pc = 5; return s.tmp_5;
-  case 5:
-    r0 = s.retval;
-    s.factory___9342 = (s.tmp_0);
-    s.tmp_0 = particles_SprayFactory_setSpeed__P2722_mk(s);
-    s.tmp_0.arg0 = s.factory___9342;
-    s.tmp_0.arg1 = 30;
-    s.callLocIdx = 44; s.pc = 6; return s.tmp_0;
-  case 6:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C2678_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = particles_ParticleSource_constructor__P2683_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.arg0;
-    s.tmp_1.arg2 = s.arg1;
-    s.tmp_1.arg3 = s.factory___9342;
-    s.callLocIdx = 45; s.pc = 7; return s.tmp_1;
-  case 7:
-    r0 = s.retval;
-    r0 = s.tmp_0;
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P9339.info = {"start":7534,"length":284,"line":191,"column":59,"endLine":195,"endColumn":5,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["anchor","particlesPerSecond"]}
+inline__P38768.info = {"start":2652,"length":386,"line":72,"column":45,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game---hw/effects.ts","functionName":"inline","argumentNames":["input","r"]}
 
-function inline__P9339_mk(s) {
+function inline__P38768_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P9339, depth: s.depth + 1,
+        parent: s, fn: inline__P38768, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  factory___9342: undefined,
+  rounds___38771: undefined,
+  j___38779: undefined,
+  x___38784: undefined,
+  y___38790: undefined,
+  c___38796: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -21512,7 +21280,7 @@ function inline__P9339_mk(s) {
 
 
 
-function particles_ParticleSource_constructor__P2683(s) {
+function Math_FastRandom_randomRange__P32009(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21522,8 +21290,284 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___9363 = undefined;
-    s.removedSource___9372 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Math_FastRandom__C32005_VT)) failedCast(r0);
+    r0 = (s.arg2 > s.arg1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_2 = Math_FastRandom_next__P32008_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    s.callLocIdx = 1301; s.pc = 3; return s.tmp_2;
+  case 3:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.arg2 - s.arg1);
+    s.tmp_4 = r0;
+    r0 = (s.tmp_4 + 1);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_1 % s.tmp_3);
+    { step = 2; continue; }
+  case 1:
+    r0 = 0;
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_5 = r0;
+    r0 = (s.arg1 + s.tmp_5);
+    return leave(s, r0)
+  default: oops()
+} } }
+Math_FastRandom_randomRange__P32009.info = {"start":2079,"length":131,"line":62,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game---hw/mathUtil.ts","functionName":"randomRange","argumentNames":["this","min","max"]}
+
+function Math_FastRandom_randomRange__P32009_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: Math_FastRandom_randomRange__P32009, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+} }
+
+
+
+
+
+function Math_FastRandom_next__P32008(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Math_FastRandom__C32005_VT)) failedCast(r0);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = s.arg0.fields["lfsr"];
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 >> 1);
+    s.tmp_2 = r0;
+    r0 = s.arg0.fields["lfsr"];
+    s.tmp_7 = r0;
+    r0 = (s.tmp_7 & 1);
+    s.tmp_6 = r0;
+    r0 = (0 - s.tmp_6);
+    s.tmp_5 = r0;
+    r0 = (s.tmp_5 & 46080);
+    s.tmp_4 = r0;
+    r0 = (s.tmp_2 ^ s.tmp_4);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["lfsr"] = (s.tmp_1);
+    r0 = s.tmp_1;
+    return leave(s, r0)
+  default: oops()
+} } }
+Math_FastRandom_next__P32008.info = {"start":1713,"length":107,"line":53,"column":8,"endLine":55,"endColumn":9,"fileName":"pxt_modules/game---hw/mathUtil.ts","functionName":"next","argumentNames":["this"]}
+
+function Math_FastRandom_next__P32008_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: Math_FastRandom_next__P32008, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function effects_ImageEffect_constructor__P32236(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, effects_ImageEffect__C32235_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["effect"] = (s.arg2);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C32005_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = Math_FastRandom_constructor__P32007_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.tmp_1.arg1 = undefined;
+    s.callLocIdx = 1607; s.pc = 1; return s.tmp_1;
+  case 1:
+    r0 = s.retval;
+    r0 = (s.arg0).fields["fastRandom"] = (s.tmp_0);
+    r0 = (s.arg0).fields["preferredDelay"] = (s.arg1);
+    r0 = (s.arg0).fields["times"] = (undefined);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+effects_ImageEffect_constructor__P32236.info = {"start":410,"length":290,"line":10,"column":8,"endLine":15,"endColumn":9,"fileName":"pxt_modules/game---hw/effects.ts","functionName":"inline","argumentNames":["this","defaultRate","effectFactory"]}
+
+function effects_ImageEffect_constructor__P32236_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: effects_ImageEffect_constructor__P32236, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+} }
+
+
+
+
+
+function inline__P38876(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.factory___38879 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ConfettiFactory__C32164_VT);
+    s.tmp_0 = r0;
+    s.tmp_2 = if_width_1_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    if (!s.tmp_2.arg0.vtable.iface) {
+      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "width");
+    } else {
+      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["width"];
+      if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["width"]; }
+      else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
+     else { s.callLocIdx = 39; s.pc = 3; return s.tmp_2; }
+    }
+  case 3:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    if (!r0) { step = 1; continue; }
+    s.tmp_3 = if_width_1_mk(s);
+    s.tmp_3.arg0 = s.arg0;
+    if (!s.tmp_3.arg0.vtable.iface) {
+      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "width");
+    } else {
+      s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["width"];
+      if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["width"]; }
+      else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
+     else { s.callLocIdx = 40; s.pc = 4; return s.tmp_3; }
+    }
+  case 4:
+    r0 = s.retval;
+    { step = 2; continue; }
+  case 1:
+    r0 = 16;
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    s.tmp_5 = particles_ConfettiFactory_constructor__P32165_mk(s);
+    s.tmp_5.arg0 = s.tmp_0;
+    s.tmp_5.arg1 = s.tmp_4;
+    s.tmp_5.arg2 = 16;
+    s.callLocIdx = 41; s.pc = 5; return s.tmp_5;
+  case 5:
+    r0 = s.retval;
+    s.factory___38879 = (s.tmp_0);
+    s.tmp_0 = particles_SprayFactory_setSpeed__P32141_mk(s);
+    s.tmp_0.arg0 = s.factory___38879;
+    s.tmp_0.arg1 = 30;
+    s.callLocIdx = 42; s.pc = 6; return s.tmp_0;
+  case 6:
+    r0 = s.retval;
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C32097_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = particles_ParticleSource_constructor__P32102_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.tmp_1.arg1 = s.arg0;
+    s.tmp_1.arg2 = s.arg1;
+    s.tmp_1.arg3 = s.factory___38879;
+    s.callLocIdx = 43; s.pc = 7; return s.tmp_1;
+  case 7:
+    r0 = s.retval;
+    r0 = s.tmp_0;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P38876.info = {"start":7534,"length":284,"line":191,"column":59,"endLine":195,"endColumn":5,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"inline","argumentNames":["anchor","particlesPerSecond"]}
+
+function inline__P38876_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P38876, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  factory___38879: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function particles_ParticleSource_constructor__P32102(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.sources___38900 = undefined;
+    s.removedSource___38909 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -21532,65 +21576,65 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P31279_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1513; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1470; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = particles_init__P4706_mk(s);
-    s.callLocIdx = 1514; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = particles_init__P34199_mk(s);
+    s.callLocIdx = 1471; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = particles_particleSources__P4712_mk(s);
-    s.callLocIdx = 1515; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = particles_particleSources__P34205_mk(s);
+    s.callLocIdx = 1472; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.sources___9363 = (r0);
-    r0 = pxsim_Array__length(s.sources___9363);
+    s.sources___38900 = (r0);
+    r0 = pxsim_Array__length(s.sources___38900);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 >= globals.MAX_SOURCES___4683);
+    r0 = (s.tmp_1 >= globals.MAX_SOURCES___34176);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = particles_sortSources__P4709_mk(s);
-    s.tmp_2.arg0 = s.sources___9363;
-    s.callLocIdx = 1516; s.pc = 8; return s.tmp_2;
+    s.tmp_2 = particles_sortSources__P34202_mk(s);
+    s.tmp_2.arg0 = s.sources___38900;
+    s.callLocIdx = 1473; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeAt(s.sources___9363, 0);
-    s.removedSource___9372 = (r0);
-    s.tmp_0 = particles_ParticleSource_clear__P2693_mk(s);
-    s.tmp_0.arg0 = s.removedSource___9372;
-    s.callLocIdx = 1518; s.pc = 9; return s.tmp_0;
+    r0 = pxsim_Array_.removeAt(s.sources___38900, 0);
+    s.removedSource___38909 = (r0);
+    s.tmp_0 = particles_ParticleSource_clear__P32112_mk(s);
+    s.tmp_0.arg0 = s.removedSource___38909;
+    s.callLocIdx = 1475; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_destroy__P2692_mk(s);
-    s.tmp_0.arg0 = s.removedSource___9372;
-    s.callLocIdx = 1519; s.pc = 10; return s.tmp_0;
+    s.tmp_0 = particles_ParticleSource_destroy__P32111_mk(s);
+    s.tmp_0.arg0 = s.removedSource___38909;
+    s.callLocIdx = 1476; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 1:
   case 2:
     r0 = (s.arg0).fields["pFlags"] = (0);
-    s.tmp_0 = particles_ParticleSource_setRate__P2695_mk(s);
+    s.tmp_0 = particles_ParticleSource_setRate__P32114_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1520; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1477; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_setAcceleration__P2687_mk(s);
+    s.tmp_0 = particles_ParticleSource_setAcceleration__P32106_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    s.callLocIdx = 1521; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1478; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_setAnchor__P2694_mk(s);
+    s.tmp_0 = particles_ParticleSource_setAnchor__P32113_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1522; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1479; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = (s.arg0).fields["lifespan"] = (undefined);
@@ -21602,39 +21646,39 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = globals.defaultFactory___2698;
+    r0 = globals.defaultFactory___32117;
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = particles_ParticleSource_setFactory__P2697_mk(s);
+    s.tmp_2 = particles_ParticleSource_setFactory__P32116_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 1523; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 1480; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.sources___9363, s.arg0);
-    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
+    r0 = pxsim_Array__push(s.sources___38900, s.arg0);
+    s.tmp_0 = particles_ParticleSource_enabled__P32110_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1524; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1481; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_constructor__P2683.info = {"start":2290,"length":899,"line":86,"column":8,"endLine":109,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["this","anchor","particlesPerSecond","factory"]}
+particles_ParticleSource_constructor__P32102.info = {"start":2290,"length":899,"line":86,"column":8,"endLine":109,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["this","anchor","particlesPerSecond","factory"]}
 
-function particles_ParticleSource_constructor__P2683_mk(s) {
+function particles_ParticleSource_constructor__P32102_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_constructor__P2683, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_constructor__P32102, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  sources___9363: undefined,
-  removedSource___9372: undefined,
+  sources___38900: undefined,
+  removedSource___38909: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -21645,7 +21689,7 @@ function particles_ParticleSource_constructor__P2683_mk(s) {
 
 
 
-function particles_particleSources__P4712(s) {
+function particles_particleSources__P34205(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21655,33 +21699,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___8667 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1575; s.pc = 1; return s.tmp_0;
+    s.sources___38204 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1532; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["particleSources"];
-    s.sources___8667 = (r0);
-    r0 = s.sources___8667;
+    s.sources___38204 = (r0);
+    r0 = s.sources___38204;
     return leave(s, r0)
   default: oops()
 } } }
-particles_particleSources__P4712.info = {"start":12831,"length":119,"line":420,"column":4,"endLine":423,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"particleSources","argumentNames":[]}
+particles_particleSources__P34205.info = {"start":12831,"length":119,"line":420,"column":4,"endLine":423,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"particleSources","argumentNames":[]}
 
-function particles_particleSources__P4712_mk(s) {
+function particles_particleSources__P34205_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_particleSources__P4712, depth: s.depth + 1,
+        parent: s, fn: particles_particleSources__P34205, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___8667: undefined,
+  sources___38204: undefined,
 } }
 
 
 
 
 
-function particles_sortSources__P4709(s) {
+function particles_sortSources__P34202(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21695,22 +21739,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_arraySort__P103_mk(s);
+    s.tmp_0 = helpers_arraySort__P29638_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = inline__P9574;
-    s.callLocIdx = 1562; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P39111;
+    s.callLocIdx = 1519; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_sortSources__P4709.info = {"start":10009,"length":129,"line":331,"column":4,"endLine":333,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"sortSources","argumentNames":["sources"]}
+particles_sortSources__P34202.info = {"start":10009,"length":129,"line":331,"column":4,"endLine":333,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"sortSources","argumentNames":["sources"]}
 
-function particles_sortSources__P4709_mk(s) {
+function particles_sortSources__P34202_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_sortSources__P4709, depth: s.depth + 1,
+        parent: s, fn: particles_sortSources__P34202, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -21720,7 +21764,7 @@ function particles_sortSources__P4709_mk(s) {
 
 
 
-function inline__P9574(s) {
+function inline__P39111(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21758,12 +21802,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P9574.info = {"start":10080,"length":50,"line":332,"column":21,"endLine":332,"endColumn":71,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P39111.info = {"start":10080,"length":50,"line":332,"column":21,"endLine":332,"endColumn":71,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P9574_mk(s) {
+function inline__P39111_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P9574, depth: s.depth + 1,
+        parent: s, fn: inline__P39111, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21779,7 +21823,7 @@ function inline__P9574_mk(s) {
 
 
 
-function helpers_arraySort__P103(s) {
+function helpers_arraySort__P29638(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21811,10 +21855,10 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.arg1 = (inline__P9597);
+    s.arg1 = (inline__P39134);
   case 3:
   case 4:
-    s.tmp_0 = helpers_sortHelper__P3958_mk(s);
+    s.tmp_0 = helpers_sortHelper__P33493_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 3; s.pc = 5; return s.tmp_0;
@@ -21823,12 +21867,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySort__P103.info = {"start":5663,"length":859,"line":207,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySort","argumentNames":["arr","callbackfn"]}
+helpers_arraySort__P29638.info = {"start":5663,"length":859,"line":207,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySort","argumentNames":["arr","callbackfn"]}
 
-function helpers_arraySort__P103_mk(s) {
+function helpers_arraySort__P29638_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySort__P103, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySort__P29638, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21842,7 +21886,7 @@ function helpers_arraySort__P103_mk(s) {
 
 
 
-function inline__P9597(s) {
+function inline__P39134(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21852,26 +21896,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.aIsUndef___9600 = undefined;
-    s.bIsUndef___9604 = undefined;
-    s.aIsNull___9615 = undefined;
-    s.bIsNull___9619 = undefined;
+    s.aIsUndef___39137 = undefined;
+    s.bIsUndef___39141 = undefined;
+    s.aIsNull___39152 = undefined;
+    s.bIsNull___39156 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = (s.arg0 === undefined);
-    s.aIsUndef___9600 = (r0);
+    s.aIsUndef___39137 = (r0);
     r0 = (s.arg1 === undefined);
-    s.bIsUndef___9604 = (r0);
-    s.tmp_0 = r0 = s.aIsUndef___9600;
+    s.bIsUndef___39141 = (r0);
+    s.tmp_0 = r0 = s.aIsUndef___39137;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.bIsUndef___9604;
+    r0 = s.bIsUndef___39141;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -21881,13 +21925,13 @@ switch (step) {
     { step = 17; continue; }
     { step = 8; continue; }
   case 3:
-    r0 = pxsim_numops_toBoolDecr(s.aIsUndef___9600);
+    r0 = pxsim_numops_toBoolDecr(s.aIsUndef___39137);
     if (!r0) { step = 4; continue; }
     r0 = 1;
     { step = 17; continue; }
     { step = 7; continue; }
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.bIsUndef___9604);
+    r0 = pxsim_numops_toBoolDecr(s.bIsUndef___39141);
     if (!r0) { step = 5; continue; }
     r0 = -1;
     { step = 17; continue; }
@@ -21896,16 +21940,16 @@ switch (step) {
   case 7:
   case 8:
     r0 = (s.arg0 === null);
-    s.aIsNull___9615 = (r0);
+    s.aIsNull___39152 = (r0);
     r0 = (s.arg1 === null);
-    s.bIsNull___9619 = (r0);
-    s.tmp_0 = r0 = s.aIsNull___9615;
+    s.bIsNull___39156 = (r0);
+    s.tmp_0 = r0 = s.aIsNull___39152;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 9; continue; }
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 9:
-    r0 = s.bIsNull___9619;
+    r0 = s.bIsNull___39156;
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -21915,13 +21959,13 @@ switch (step) {
     { step = 17; continue; }
     { step = 16; continue; }
   case 11:
-    r0 = pxsim_numops_toBoolDecr(s.aIsNull___9615);
+    r0 = pxsim_numops_toBoolDecr(s.aIsNull___39152);
     if (!r0) { step = 12; continue; }
     r0 = 1;
     { step = 17; continue; }
     { step = 15; continue; }
   case 12:
-    r0 = pxsim_numops_toBoolDecr(s.bIsNull___9619);
+    r0 = pxsim_numops_toBoolDecr(s.bIsNull___39156);
     if (!r0) { step = 13; continue; }
     r0 = -1;
     { step = 17; continue; }
@@ -21960,12 +22004,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P9597.info = {"start":5826,"length":636,"line":209,"column":25,"endLine":224,"endColumn":13,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P39134.info = {"start":5826,"length":636,"line":209,"column":25,"endLine":224,"endColumn":13,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P9597_mk(s) {
+function inline__P39134_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P9597, depth: s.depth + 1,
+        parent: s, fn: inline__P39134, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21975,10 +22019,10 @@ function inline__P9597_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  aIsUndef___9600: undefined,
-  bIsUndef___9604: undefined,
-  aIsNull___9615: undefined,
-  bIsNull___9619: undefined,
+  aIsUndef___39137: undefined,
+  bIsUndef___39141: undefined,
+  aIsNull___39152: undefined,
+  bIsNull___39156: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -21987,7 +22031,7 @@ function inline__P9597_mk(s) {
 
 
 
-function helpers_sortHelper__P3958(s) {
+function helpers_sortHelper__P33493(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21997,9 +22041,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___9654 = undefined;
-    s.i___9657 = undefined;
-    s.j___9663 = undefined;
+    s.len___39191 = undefined;
+    s.i___39194 = undefined;
+    s.j___39200 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22027,28 +22071,28 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_Array__length(s.arg0);
-    s.len___9654 = (r0);
-    s.i___9657 = (0);
+    s.len___39191 = (r0);
+    s.i___39194 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___9657;
-    r0 = (s.len___9654 - 1);
+    s.tmp_1 = r0 = s.i___39194;
+    r0 = (s.len___39191 - 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    r0 = (s.i___9657 + 1);
-    s.j___9663 = (r0);
+    r0 = (s.i___39194 + 1);
+    s.j___39200 = (r0);
   case 6:
-    r0 = (s.j___9663 < s.len___9654);
+    r0 = (s.j___39200 < s.len___39191);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
     s.tmp_3 = lambda_3_mk(s);
     s.tmp_3.argL = s.arg1;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___9657);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___39194);
     s.tmp_3.arg0 = r0;
-    r0 = pxsim_Array__getAt(s.arg0, s.j___9663);
+    r0 = pxsim_Array__getAt(s.arg0, s.j___39200);
     s.tmp_3.arg1 = r0;
     setupLambda(s.tmp_3, s.tmp_3.argL);
     s.callLocIdx = 1; s.pc = 12; return s.tmp_3;
@@ -22059,21 +22103,21 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = helpers_swap__P3957_mk(s);
+    s.tmp_4 = helpers_swap__P33492_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.tmp_4.arg1 = s.i___9657;
-    s.tmp_4.arg2 = s.j___9663;
+    s.tmp_4.arg1 = s.i___39194;
+    s.tmp_4.arg2 = s.j___39200;
     s.callLocIdx = 2; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = (s.j___9663 + 1);
-    s.j___9663 = (r0);
+    r0 = (s.j___39200 + 1);
+    s.j___39200 = (r0);
     { step = 6; continue; }
   case 9:
-    r0 = (s.i___9657 + 1);
-    s.i___9657 = (r0);
+    r0 = (s.i___39194 + 1);
+    s.i___39194 = (r0);
     { step = 5; continue; }
   case 10:
     r0 = s.arg0;
@@ -22081,21 +22125,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_sortHelper__P3958.info = {"start":5176,"length":481,"line":191,"column":4,"endLine":205,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"sortHelper","argumentNames":["arr","callbackfn"]}
+helpers_sortHelper__P33493.info = {"start":5176,"length":481,"line":191,"column":4,"endLine":205,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"sortHelper","argumentNames":["arr","callbackfn"]}
 
-function helpers_sortHelper__P3958_mk(s) {
+function helpers_sortHelper__P33493_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_sortHelper__P3958, depth: s.depth + 1,
+        parent: s, fn: helpers_sortHelper__P33493, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  len___9654: undefined,
-  i___9657: undefined,
-  j___9663: undefined,
+  len___39191: undefined,
+  i___39194: undefined,
+  j___39200: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -22104,7 +22148,7 @@ function helpers_sortHelper__P3958_mk(s) {
 
 
 
-function helpers_swap__P3957(s) {
+function helpers_swap__P33492(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22114,7 +22158,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.temp___9692 = undefined;
+    s.temp___39229 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22122,28 +22166,28 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__getAt(s.arg0, s.arg1);
-    s.temp___9692 = (r0);
+    s.temp___39229 = (r0);
     s.tmp_0 = r0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = pxsim_Array__getAt(s.arg0, s.arg2);
     s.tmp_2 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_0, s.tmp_1, s.tmp_2);
-    r0 = pxsim_Array_.setAt(s.arg0, s.arg2, s.temp___9692);
+    r0 = pxsim_Array_.setAt(s.arg0, s.arg2, s.temp___39229);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_swap__P3957.info = {"start":5030,"length":140,"line":185,"column":4,"endLine":189,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"swap","argumentNames":["arr","i","j"]}
+helpers_swap__P33492.info = {"start":5030,"length":140,"line":185,"column":4,"endLine":189,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"swap","argumentNames":["arr","i","j"]}
 
-function helpers_swap__P3957_mk(s) {
+function helpers_swap__P33492_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_swap__P3957, depth: s.depth + 1,
+        parent: s, fn: helpers_swap__P33492, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  temp___9692: undefined,
+  temp___39229: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22153,7 +22197,7 @@ function helpers_swap__P3957_mk(s) {
 
 
 
-function particles_init__P4706(s) {
+function particles_init__P34199(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22163,34 +22207,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___9704 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1552; s.pc = 4; return s.tmp_0;
+    s.scene___39241 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1509; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.scene___9704 = (r0);
-    r0 = s.scene___9704.fields["particleSources"];
+    s.scene___39241 = (r0);
+    r0 = s.scene___39241.fields["particleSources"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_1 = r0 = s.scene___9704;
+    s.tmp_1 = r0 = s.scene___39241;
     r0 = pxsim_Array__mk();
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["particleSources"] = (s.tmp_2);
     r0 = pxsim.control.millis();
-    globals.lastUpdate___4701 = (r0);
-    s.tmp_0 = game_onUpdate__P2543_mk(s);
-    s.tmp_0.arg0 = particles_updateParticles__P4707;
-    s.callLocIdx = 1553; s.pc = 5; return s.tmp_0;
+    globals.lastUpdate___34194 = (r0);
+    s.tmp_0 = game_onUpdate__P31962_mk(s);
+    s.tmp_0.arg0 = particles_updateParticles__P34200;
+    s.callLocIdx = 1510; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_onUpdateInterval__P2544_mk(s);
+    s.tmp_0 = game_onUpdateInterval__P31963_mk(s);
     s.tmp_0.arg0 = 250;
-    s.tmp_0.arg1 = particles_pruneParticles__P4708;
-    s.callLocIdx = 1554; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg1 = particles_pruneParticles__P34201;
+    s.callLocIdx = 1511; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -22198,24 +22242,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_init__P4706.info = {"start":9219,"length":276,"line":303,"column":4,"endLine":310,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"init","argumentNames":[]}
+particles_init__P34199.info = {"start":9219,"length":276,"line":303,"column":4,"endLine":310,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"init","argumentNames":[]}
 
-function particles_init__P4706_mk(s) {
+function particles_init__P34199_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_init__P4706, depth: s.depth + 1,
+        parent: s, fn: particles_init__P34199, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  scene___9704: undefined,
+  scene___39241: undefined,
 } }
 
 
 
 
 
-function particles_pruneParticles__P4708(s) {
+function particles_pruneParticles__P34201(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22225,26 +22269,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___8504 = undefined;
-    s.tmp_0 = particles_particleSources__P4712_mk(s);
-    s.callLocIdx = 1558; s.pc = 3; return s.tmp_0;
+    s.sources___38041 = undefined;
+    s.tmp_0 = particles_particleSources__P34205_mk(s);
+    s.callLocIdx = 1515; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___8504 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___8504);
+    s.sources___38041 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___38041);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_1 = helpers_arraySlice__P112_mk(s);
-    s.tmp_1.arg0 = s.sources___8504;
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_1 = helpers_arraySlice__P29647_mk(s);
+    s.tmp_1.arg0 = s.sources___38041;
     s.tmp_1.arg1 = 0;
-    r0 = pxsim_Array__length(s.sources___8504);
+    r0 = pxsim_Array__length(s.sources___38041);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1559; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1516; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P8513;
-    s.callLocIdx = 1561; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P38050;
+    s.callLocIdx = 1518; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -22253,23 +22297,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_pruneParticles__P4708.info = {"start":9847,"length":156,"line":326,"column":4,"endLine":329,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"pruneParticles","argumentNames":[]}
+particles_pruneParticles__P34201.info = {"start":9847,"length":156,"line":326,"column":4,"endLine":329,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"pruneParticles","argumentNames":[]}
 
-function particles_pruneParticles__P4708_mk(s) {
+function particles_pruneParticles__P34201_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_pruneParticles__P4708, depth: s.depth + 1,
+        parent: s, fn: particles_pruneParticles__P34201, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  sources___8504: undefined,
+  sources___38041: undefined,
 } }
 
 
 
 
 
-function inline__P8513(s) {
+function inline__P38050(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22283,21 +22327,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource__prune__P2686_mk(s);
+    s.tmp_0 = particles_ParticleSource__prune__P32105_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1560; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1517; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8513.info = {"start":9980,"length":15,"line":328,"column":62,"endLine":328,"endColumn":77,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P38050.info = {"start":9980,"length":15,"line":328,"column":62,"endLine":328,"endColumn":77,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P8513_mk(s) {
+function inline__P38050_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8513, depth: s.depth + 1,
+        parent: s, fn: inline__P38050, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -22307,7 +22351,7 @@ function inline__P8513_mk(s) {
 
 
 
-function particles_ParticleSource__prune__P2686(s) {
+function particles_ParticleSource__prune__P32105(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22317,15 +22361,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___8543 = undefined;
-    s.sources___8551 = undefined;
-    s.current___8565 = undefined;
+    s.scene___38080 = undefined;
+    s.sources___38088 = undefined;
+    s.current___38102 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
   case 1:
     r0 = s.arg0.fields["head"];
     s.tmp_0 = r0;
@@ -22368,36 +22412,36 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 13; continue; }
-    s.tmp_5 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1533; s.pc = 21; return s.tmp_5;
+    s.tmp_5 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1490; s.pc = 21; return s.tmp_5;
   case 21:
     r0 = s.retval;
-    s.scene___8543 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.scene___8543);
+    s.scene___38080 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.scene___38080);
     if (!r0) { step = 7; continue; }
-    r0 = s.scene___8543.fields["allSprites"];
+    r0 = s.scene___38080.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg0);
   case 7:
   case 8:
-    s.tmp_0 = particles_particleSources__P4712_mk(s);
-    s.callLocIdx = 1534; s.pc = 22; return s.tmp_0;
+    s.tmp_0 = particles_particleSources__P34205_mk(s);
+    s.callLocIdx = 1491; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
-    s.sources___8551 = (r0);
-    s.tmp_0 = r0 = s.sources___8551;
+    s.sources___38088 = (r0);
+    s.tmp_0 = r0 = s.sources___38088;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 9; continue; }
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 9:
-    r0 = pxsim_Array__length(s.sources___8551);
+    r0 = pxsim_Array__length(s.sources___38088);
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 11; continue; }
-    r0 = pxsim_Array_.removeElement(s.sources___8551, s.arg0);
+    r0 = pxsim_Array_.removeElement(s.sources___38088, s.arg0);
   case 11:
   case 12:
     r0 = s.arg0.fields["anchor"];
@@ -22406,35 +22450,35 @@ switch (step) {
   case 13:
   case 14:
     r0 = s.arg0.fields["head"];
-    s.current___8565 = (r0);
+    s.current___38102 = (r0);
   case 15:
-    s.tmp_0 = r0 = s.current___8565;
+    s.tmp_0 = r0 = s.current___38102;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 16; continue; }
     r0 = s.tmp_0;
     { step = 17; continue; }
   case 16:
-    r0 = s.current___8565.fields["next"];
+    r0 = s.current___38102.fields["next"];
   case 17:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = s.current___8565.fields["next"];
+    r0 = s.current___38102.fields["next"];
     r0 = r0.fields["lifespan"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 <= 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 18; continue; }
-    r0 = s.current___8565.fields["next"];
+    r0 = s.current___38102.fields["next"];
     r0 = r0.fields["next"];
     s.tmp_4 = r0;
-    r0 = (s.current___8565).fields["next"] = (s.tmp_4);
+    r0 = (s.current___38102).fields["next"] = (s.tmp_4);
     { step = 19; continue; }
   case 18:
-    r0 = s.current___8565.fields["next"];
-    s.current___8565 = (r0);
+    r0 = s.current___38102.fields["next"];
+    s.current___38102 = (r0);
   case 19:
     { step = 15; continue; }
   case 20:
@@ -22442,12 +22486,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource__prune__P2686.info = {"start":5087,"length":830,"line":165,"column":8,"endLine":188,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"_prune","argumentNames":["this"]}
+particles_ParticleSource__prune__P32105.info = {"start":5087,"length":830,"line":165,"column":8,"endLine":188,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"_prune","argumentNames":["this"]}
 
-function particles_ParticleSource__prune__P2686_mk(s) {
+function particles_ParticleSource__prune__P32105_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource__prune__P2686, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource__prune__P32105, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22455,9 +22499,9 @@ function particles_ParticleSource__prune__P2686_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___8543: undefined,
-  sources___8551: undefined,
-  current___8565: undefined,
+  scene___38080: undefined,
+  sources___38088: undefined,
+  current___38102: undefined,
   arg0: undefined,
 } }
 
@@ -22465,7 +22509,7 @@ function particles_ParticleSource__prune__P2686_mk(s) {
 
 
 
-function helpers_arraySlice__P112(s) {
+function helpers_arraySlice__P29647(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22475,9 +22519,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___8588 = undefined;
-    s.len___8590 = undefined;
-    s.i___8624 = undefined;
+    s.res___38125 = undefined;
+    s.len___38127 = undefined;
+    s.i___38161 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22485,9 +22529,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___8588 = (r0);
+    s.res___38125 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___8590 = (r0);
+    s.len___38127 = (r0);
     r0 = (s.arg1 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -22499,8 +22543,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_max__P125_mk(s);
-    r0 = (s.len___8590 + s.arg1);
+    s.tmp_1 = Math_max__P29660_mk(s);
+    r0 = (s.len___38127 + s.arg1);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
     s.callLocIdx = 10; s.pc = 16; return s.tmp_1;
@@ -22510,11 +22554,11 @@ switch (step) {
   case 2:
   case 3:
   case 4:
-    r0 = (s.arg1 > s.len___8590);
+    r0 = (s.arg1 > s.len___38127);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = s.res___8588;
+    r0 = s.res___38125;
     { step = 15; continue; }
   case 5:
   case 6:
@@ -22522,57 +22566,57 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
-    s.arg2 = (s.len___8590);
+    s.arg2 = (s.len___38127);
     { step = 10; continue; }
   case 7:
     r0 = (s.arg2 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    r0 = (s.len___8590 + s.arg2);
+    r0 = (s.len___38127 + s.arg2);
     s.arg2 = (r0);
   case 8:
   case 9:
   case 10:
-    r0 = (s.arg2 > s.len___8590);
+    r0 = (s.arg2 > s.len___38127);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.arg2 = (s.len___8590);
+    s.arg2 = (s.len___38127);
   case 11:
   case 12:
-    s.i___8624 = (s.arg1);
+    s.i___38161 = (s.arg1);
   case 13:
-    r0 = (s.i___8624 < s.arg2);
+    r0 = (s.i___38161 < s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_1 = r0 = s.res___8588;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___8624);
+    s.tmp_1 = r0 = s.res___38125;
+    r0 = pxsim_Array__getAt(s.arg0, s.i___38161);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___8624 + 1);
-    s.i___8624 = (r0);
+    r0 = (s.i___38161 + 1);
+    s.i___38161 = (r0);
     { step = 13; continue; }
   case 14:
-    r0 = s.res___8588;
+    r0 = s.res___38125;
   case 15:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySlice__P112.info = {"start":8909,"length":690,"line":299,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySlice","argumentNames":["arr","start","end"]}
+helpers_arraySlice__P29647.info = {"start":8909,"length":690,"line":299,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySlice","argumentNames":["arr","start","end"]}
 
-function helpers_arraySlice__P112_mk(s) {
+function helpers_arraySlice__P29647_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySlice__P112, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySlice__P29647, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  res___8588: undefined,
-  len___8590: undefined,
-  i___8624: undefined,
+  res___38125: undefined,
+  len___38127: undefined,
+  i___38161: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22582,7 +22626,7 @@ function helpers_arraySlice__P112_mk(s) {
 
 
 
-function particles_updateParticles__P4707(s) {
+function particles_updateParticles__P34200(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22592,16 +22636,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___9745 = undefined;
-    s.time___9752 = undefined;
-    s.dt___9755 = undefined;
-    s.i___9761 = undefined;
-    s.tmp_0 = particles_particleSources__P4712_mk(s);
-    s.callLocIdx = 1555; s.pc = 6; return s.tmp_0;
+    s.sources___39282 = undefined;
+    s.time___39289 = undefined;
+    s.dt___39292 = undefined;
+    s.i___39298 = undefined;
+    s.tmp_0 = particles_particleSources__P34205_mk(s);
+    s.callLocIdx = 1512; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.sources___9745 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___9745);
+    s.sources___39282 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___39282);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -22610,34 +22654,34 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_2 = particles_sortSources__P4709_mk(s);
-    s.tmp_2.arg0 = s.sources___9745;
-    s.callLocIdx = 1556; s.pc = 7; return s.tmp_2;
+    s.tmp_2 = particles_sortSources__P34202_mk(s);
+    s.tmp_2.arg0 = s.sources___39282;
+    s.callLocIdx = 1513; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     r0 = pxsim.control.millis();
-    s.time___9752 = (r0);
-    r0 = (s.time___9752 - globals.lastUpdate___4701);
-    s.dt___9755 = (r0);
-    globals.lastUpdate___4701 = (s.time___9752);
-    s.i___9761 = (0);
+    s.time___39289 = (r0);
+    r0 = (s.time___39289 - globals.lastUpdate___34194);
+    s.dt___39292 = (r0);
+    globals.lastUpdate___34194 = (s.time___39289);
+    s.i___39298 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___9761;
-    r0 = pxsim_Array__length(s.sources___9745);
+    s.tmp_1 = r0 = s.i___39298;
+    r0 = pxsim_Array__length(s.sources___39282);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_3 = particles_ParticleSource__update__P2685_mk(s);
-    r0 = pxsim_Array__getAt(s.sources___9745, s.i___9761);
+    s.tmp_3 = particles_ParticleSource__update__P32104_mk(s);
+    r0 = pxsim_Array__getAt(s.sources___39282, s.i___39298);
     s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = s.dt___9755;
-    s.callLocIdx = 1557; s.pc = 8; return s.tmp_3;
+    s.tmp_3.arg1 = s.dt___39292;
+    s.callLocIdx = 1514; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
-    r0 = (s.i___9761 + 1);
-    s.i___9761 = (r0);
+    r0 = (s.i___39298 + 1);
+    s.i___39298 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -22645,28 +22689,28 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_updateParticles__P4707.info = {"start":9501,"length":340,"line":312,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"updateParticles","argumentNames":[]}
+particles_updateParticles__P34200.info = {"start":9501,"length":340,"line":312,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"updateParticles","argumentNames":[]}
 
-function particles_updateParticles__P4707_mk(s) {
+function particles_updateParticles__P34200_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_updateParticles__P4707, depth: s.depth + 1,
+        parent: s, fn: particles_updateParticles__P34200, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  sources___9745: undefined,
-  time___9752: undefined,
-  dt___9755: undefined,
-  i___9761: undefined,
+  sources___39282: undefined,
+  time___39289: undefined,
+  dt___39292: undefined,
+  i___39298: undefined,
 } }
 
 
 
 
 
-function particles_ParticleSource__update__P2685(s) {
+function particles_ParticleSource__update__P32104(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22676,16 +22720,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___9824 = undefined;
-    s.current___9843 = undefined;
-    s.fixedDt___9851 = undefined;
+    s.p___39361 = undefined;
+    s.current___39380 = undefined;
+    s.fixedDt___39388 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["timer"];
     s.tmp_2 = r0;
@@ -22711,9 +22755,9 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["lifespan"] = (undefined);
-    s.tmp_0 = particles_ParticleSource_destroy__P2692_mk(s);
+    s.tmp_0 = particles_ParticleSource_destroy__P32111_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1528; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1485; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
   case 1:
@@ -22736,7 +22780,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["flags"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["flags"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1529; s.pc = 29; return s.tmp_2; }
+     else { s.callLocIdx = 1486; s.pc = 29; return s.tmp_2; }
     }
   case 29:
     r0 = s.retval;
@@ -22759,7 +22803,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["flags"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["flags"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1530; s.pc = 30; return s.tmp_5; }
+     else { s.callLocIdx = 1487; s.pc = 30; return s.tmp_5; }
     }
   case 30:
     r0 = s.retval;
@@ -22784,9 +22828,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 13; continue; }
   case 12:
-    s.tmp_2 = particles_ParticleSource_enabled__P2690_mk(s);
+    s.tmp_2 = particles_ParticleSource_enabled__P32109_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1531; s.pc = 31; return s.tmp_2;
+    s.callLocIdx = 1488; s.pc = 31; return s.tmp_2;
   case 31:
     r0 = s.retval;
   case 13:
@@ -22802,18 +22846,18 @@ switch (step) {
     r0 = (s.tmp_6 + s.tmp_7);
     s.tmp_5 = r0;
     r0 = (s.tmp_4).fields["timer"] = (s.tmp_5);
-    s.tmp_0 = particles_ParticleFactory__C2714_v0_2_mk(s);
+    s.tmp_0 = particles_ParticleFactory__C32133_v0_2_mk(s);
     r0 = s.arg0.fields["_factory"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["anchor"];
     s.tmp_0.arg1 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C2714_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C32133_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.createParticle;
     s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
-    s.p___9824 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.p___9824);
+    s.p___39361 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.p___39361);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -22824,8 +22868,8 @@ switch (step) {
   case 15:
     r0 = s.arg0.fields["head"];
     s.tmp_2 = r0;
-    r0 = (s.p___9824).fields["next"] = (s.tmp_2);
-    r0 = (s.arg0).fields["head"] = (s.p___9824);
+    r0 = (s.p___39361).fields["next"] = (s.tmp_2);
+    r0 = (s.arg0).fields["head"] = (s.p___39361);
     { step = 11; continue; }
   case 16:
     r0 = s.arg0.fields["head"];
@@ -22840,7 +22884,7 @@ switch (step) {
   case 17:
   case 18:
     r0 = s.arg0.fields["head"];
-    s.current___9843 = (r0);
+    s.current___39380 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["_dt"];
     s.tmp_2 = r0;
@@ -22852,36 +22896,36 @@ switch (step) {
     r0 = (s.tmp_0 * 256);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 | 0);
-    s.fixedDt___9851 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.fixedDt___9851);
+    s.fixedDt___39388 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.fixedDt___39388);
     if (!r0) { step = 23; continue; }
   case 19:
-    r0 = s.current___9843.fields["lifespan"];
+    r0 = s.current___39380.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    s.tmp_2 = r0 = s.current___9843;
+    s.tmp_2 = r0 = s.current___39380;
     r0 = s.tmp_2.fields["lifespan"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 - s.arg1);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["lifespan"] = (s.tmp_3);
-    s.tmp_0 = particles_ParticleSource__C2678_v4_3_mk(s);
+    s.tmp_0 = particles_ParticleSource__C32097_v4_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.current___9843;
-    s.tmp_0.arg2 = s.fixedDt___9851;
-    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleSource__C2678_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.current___39380;
+    s.tmp_0.arg2 = s.fixedDt___39388;
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleSource__C32097_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.updateParticle;
     s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
   case 20:
   case 21:
-    r0 = s.current___9843.fields["next"];
+    r0 = s.current___39380.fields["next"];
     s.tmp_0 = r0;
-    s.current___9843 = (r0);
+    s.current___39380 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
     { step = 19; continue; }
@@ -22890,15 +22934,15 @@ switch (step) {
     { step = 26; continue; }
   case 23:
   case 24:
-    s.tmp_0 = r0 = s.current___9843;
+    s.tmp_0 = r0 = s.current___39380;
     r0 = s.tmp_0.fields["lifespan"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - s.arg1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["lifespan"] = (s.tmp_1);
-    r0 = s.current___9843.fields["next"];
+    r0 = s.current___39380.fields["next"];
     s.tmp_0 = r0;
-    s.current___9843 = (r0);
+    s.current___39380 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 25; continue; }
     { step = 24; continue; }
@@ -22909,12 +22953,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource__update__P2685.info = {"start":3677,"length":1400,"line":123,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"_update","argumentNames":["this","dt"]}
+particles_ParticleSource__update__P32104.info = {"start":3677,"length":1400,"line":123,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"_update","argumentNames":["this","dt"]}
 
-function particles_ParticleSource__update__P2685_mk(s) {
+function particles_ParticleSource__update__P32104_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource__update__P2685, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource__update__P32104, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22924,9 +22968,9 @@ function particles_ParticleSource__update__P2685_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  p___9824: undefined,
-  current___9843: undefined,
-  fixedDt___9851: undefined,
+  p___39361: undefined,
+  current___39380: undefined,
+  fixedDt___39388: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -22935,7 +22979,7 @@ function particles_ParticleSource__update__P2685_mk(s) {
 
 
 
-function particles_ParticleSource_updateParticle__P4703(s) {
+function particles_ParticleSource_updateParticle__P34196(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22952,7 +22996,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     r0 = (s.arg2 >> 10);
     s.arg2 = (r0);
     s.tmp_0 = r0 = s.arg1;
@@ -23007,12 +23051,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_updateParticle__P4703.info = {"start":8231,"length":357,"line":276,"column":8,"endLine":284,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"updateParticle","argumentNames":["this","p","fixedDt"]}
+particles_ParticleSource_updateParticle__P34196.info = {"start":8231,"length":357,"line":276,"column":8,"endLine":284,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"updateParticle","argumentNames":["this","p","fixedDt"]}
 
-function particles_ParticleSource_updateParticle__P4703_mk(s) {
+function particles_ParticleSource_updateParticle__P34196_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_updateParticle__P4703, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_updateParticle__P34196, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23029,7 +23073,7 @@ function particles_ParticleSource_updateParticle__P4703_mk(s) {
 
 
 
-function Fx_rightShift__P164(s) {
+function Fx_rightShift__P29699(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23048,12 +23092,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_rightShift__P164.info = {"start":2031,"length":108,"line":65,"column":4,"endLine":67,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"rightShift","argumentNames":["a","n"]}
+Fx_rightShift__P29699.info = {"start":2031,"length":108,"line":65,"column":4,"endLine":67,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"rightShift","argumentNames":["a","n"]}
 
-function Fx_rightShift__P164_mk(s) {
+function Fx_rightShift__P29699_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_rightShift__P164, depth: s.depth + 1,
+        parent: s, fn: Fx_rightShift__P29699, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23063,7 +23107,7 @@ function Fx_rightShift__P164_mk(s) {
 
 
 
-function Fx_mul__P155(s) {
+function Fx_mul__P29690(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23084,12 +23128,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_mul__P155.info = {"start":872,"length":133,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"mul","argumentNames":["a","b"]}
+Fx_mul__P29690.info = {"start":872,"length":133,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"mul","argumentNames":["a","b"]}
 
-function Fx_mul__P155_mk(s) {
+function Fx_mul__P29690_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_mul__P155, depth: s.depth + 1,
+        parent: s, fn: Fx_mul__P29690, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -23100,7 +23144,7 @@ function Fx_mul__P155_mk(s) {
 
 
 
-function Fx_add__P152(s) {
+function Fx_add__P29687(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23119,12 +23163,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_add__P152.info = {"start":511,"length":118,"line":20,"column":4,"endLine":22,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"add","argumentNames":["a","b"]}
+Fx_add__P29687.info = {"start":511,"length":118,"line":20,"column":4,"endLine":22,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"add","argumentNames":["a","b"]}
 
-function Fx_add__P152_mk(s) {
+function Fx_add__P29687_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_add__P152, depth: s.depth + 1,
+        parent: s, fn: Fx_add__P29687, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23134,7 +23178,7 @@ function Fx_add__P152_mk(s) {
 
 
 
-function particles_ParticleFactory_createParticle__P2716(s) {
+function particles_ParticleFactory_createParticle__P32135(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23144,17 +23188,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___9948 = undefined;
+    s.p___39485 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleFactory__C2714_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(particles_Particle__C2659_VT);
-    s.p___9948 = (r0);
-    s.tmp_0 = r0 = s.p___9948;
+    if (!checkSubtype(r0, particles_ParticleFactory__C32133_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_Particle__C32078_VT);
+    s.p___39485 = (r0);
+    s.tmp_0 = r0 = s.p___39485;
     s.tmp_3 = if_x_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -23163,7 +23207,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["x"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["x"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1582; s.pc = 1; return s.tmp_3; }
+     else { s.callLocIdx = 1539; s.pc = 1; return s.tmp_3; }
     }
   case 1:
     r0 = s.retval;
@@ -23173,7 +23217,7 @@ switch (step) {
     r0 = (s.tmp_4 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_x"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.p___9948;
+    s.tmp_0 = r0 = s.p___39485;
     s.tmp_3 = if_y_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -23182,7 +23226,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["y"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["y"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1584; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 1541; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -23192,26 +23236,26 @@ switch (step) {
     r0 = (s.tmp_4 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    r0 = (s.p___9948).fields["vx"] = (0);
-    r0 = (s.p___9948).fields["vy"] = (0);
-    r0 = (s.p___9948).fields["lifespan"] = (500);
-    r0 = s.p___9948;
+    r0 = (s.p___39485).fields["vx"] = (0);
+    r0 = (s.p___39485).fields["vy"] = (0);
+    r0 = (s.p___39485).fields["lifespan"] = (500);
+    r0 = s.p___39485;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_createParticle__P2716.info = {"start":1822,"length":282,"line":67,"column":8,"endLine":77,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_ParticleFactory_createParticle__P32135.info = {"start":1822,"length":282,"line":67,"column":8,"endLine":77,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_ParticleFactory_createParticle__P2716_mk(s) {
+function particles_ParticleFactory_createParticle__P32135_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_createParticle__P2716, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_createParticle__P32135, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  p___9948: undefined,
+  p___39485: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -23220,7 +23264,7 @@ function particles_ParticleFactory_createParticle__P2716_mk(s) {
 
 
 
-function game_onUpdateInterval__P2544(s) {
+function game_onUpdateInterval__P31963(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23230,15 +23274,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.timer___9728 = undefined;
+    s.timer___39265 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P4356_mk(s);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1211; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1168; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
@@ -23260,22 +23304,22 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_pxtrt.mklocRef();
-    s.timer___9728 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.timer___9728, 0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P9732);
+    s.timer___39265 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.timer___39265, 0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P39269);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.timer___9728);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.timer___39265);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg0);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg1);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
-    s.tmp_2 = game_eventContext__P2535_mk(s);
-    s.callLocIdx = 1212; s.pc = 8; return s.tmp_2;
+    s.tmp_1 = control_EventContext_registerFrameHandler__P29927_mk(s);
+    s.tmp_2 = game_eventContext__P31954_mk(s);
+    s.callLocIdx = 1169; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 19;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1216; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1173; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
   case 5:
@@ -23283,17 +23327,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onUpdateInterval__P2544.info = {"start":7929,"length":417,"line":256,"column":4,"endLine":267,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onUpdateInterval","argumentNames":["period","a"]}
+game_onUpdateInterval__P31963.info = {"start":7929,"length":417,"line":256,"column":4,"endLine":267,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"onUpdateInterval","argumentNames":["period","a"]}
 
-function game_onUpdateInterval__P2544_mk(s) {
+function game_onUpdateInterval__P31963_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onUpdateInterval__P2544, depth: s.depth + 1,
+        parent: s, fn: game_onUpdateInterval__P31963, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  timer___9728: undefined,
+  timer___39265: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -23302,7 +23346,7 @@ function game_onUpdateInterval__P2544_mk(s) {
 
 
 
-function inline__P9732(s) {
+function inline__P39269(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23312,28 +23356,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.time___9733 = undefined;
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1213; s.pc = 3; return s.tmp_1;
+    s.time___39270 = undefined;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1170; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_millis"];
-    s.time___9733 = (r0);
+    s.time___39270 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.time___9733);
+    r0 = (s.tmp_1 <= s.time___39270);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     s.tmp_2 = r0 = s.caps[0];
-    r0 = (s.time___9733 + s.caps[1]);
+    r0 = (s.time___39270 + s.caps[1]);
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_2, s.tmp_3);
     s.tmp_0 = lambda_1_mk(s);
     s.tmp_0.argL = s.caps[2];
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1215; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1172; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -23342,25 +23386,25 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P9732.info = {"start":8159,"length":179,"line":260,"column":81,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
+inline__P39269.info = {"start":8159,"length":179,"line":260,"column":81,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P9732_mk(s) {
+function inline__P39269_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P9732, depth: s.depth + 1,
+        parent: s, fn: inline__P39269, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  time___9733: undefined,
+  time___39270: undefined,
 } }
 
 
 
 
 
-function particles_SprayFactory_constructor__P2719(s) {
+function particles_SprayFactory_constructor__P32138(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23378,35 +23422,35 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C32137_VT)) failedCast(r0);
     r0 = undefined;
-    s.tmp_0 = particles_initTrig__P4727_mk(s);
-    s.callLocIdx = 1589; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = particles_initTrig__P34220_mk(s);
+    s.callLocIdx = 1546; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = particles_SprayFactory_setSpeed__P2722_mk(s);
+    s.tmp_0 = particles_SprayFactory_setSpeed__P32141_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1590; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1547; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = particles_SprayFactory_setDirection__P2723_mk(s);
+    s.tmp_0 = particles_SprayFactory_setDirection__P32142_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
     s.tmp_0.arg2 = s.arg3;
-    s.callLocIdx = 1591; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1548; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_constructor__P2719.info = {"start":2623,"length":218,"line":98,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","speed","centerDegrees","arcDegrees"]}
+particles_SprayFactory_constructor__P32138.info = {"start":2623,"length":218,"line":98,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"inline","argumentNames":["this","speed","centerDegrees","arcDegrees"]}
 
-function particles_SprayFactory_constructor__P2719_mk(s) {
+function particles_SprayFactory_constructor__P32138_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_constructor__P2719, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_constructor__P32138, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -23419,7 +23463,7 @@ function particles_SprayFactory_constructor__P2719_mk(s) {
 
 
 
-function particles_initTrig__P4727(s) {
+function particles_initTrig__P34220(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23429,36 +23473,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.cachedSin___4713);
+    r0 = pxsim_numops_toBoolDecr(globals.cachedSin___34206);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = particles_cacheSin__P2712_mk(s);
+    s.tmp_2 = particles_cacheSin__P32131_mk(s);
     s.tmp_2.arg0 = 100;
-    s.callLocIdx = 1577; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1534; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    globals.cachedSin___4713 = (r0);
-    s.tmp_0 = particles_cacheCos__P2713_mk(s);
+    globals.cachedSin___34206 = (r0);
+    s.tmp_0 = particles_cacheCos__P32132_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 1578; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1535; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    globals.cachedCos___4714 = (r0);
+    globals.cachedCos___34207 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_initTrig__P4727.info = {"start":291,"length":155,"line":11,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"initTrig","argumentNames":[]}
+particles_initTrig__P34220.info = {"start":291,"length":155,"line":11,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"initTrig","argumentNames":[]}
 
-function particles_initTrig__P4727_mk(s) {
+function particles_initTrig__P34220_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_initTrig__P4727, depth: s.depth + 1,
+        parent: s, fn: particles_initTrig__P34220, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23469,7 +23513,7 @@ function particles_initTrig__P4727_mk(s) {
 
 
 
-function particles_cacheCos__P2713(s) {
+function particles_cacheCos__P32132(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23479,25 +23523,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cos___9466 = undefined;
-    s.anglePerSlice___9468 = undefined;
-    s.i___9474 = undefined;
+    s.cos___39003 = undefined;
+    s.anglePerSlice___39005 = undefined;
+    s.i___39011 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.cos___9466 = (r0);
+    s.cos___39003 = (r0);
     r0 = (6.283185307179586 / s.arg0);
-    s.anglePerSlice___9468 = (r0);
-    s.i___9474 = (0);
+    s.anglePerSlice___39005 = (r0);
+    s.i___39011 = (0);
   case 1:
-    r0 = (s.i___9474 < s.arg0);
+    r0 = (s.i___39011 < s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.cos___9466;
-    r0 = (s.i___9474 * s.anglePerSlice___9468);
+    s.tmp_1 = r0 = s.cos___39003;
+    r0 = (s.i___39011 * s.anglePerSlice___39005);
     s.tmp_4 = r0;
     r0 = pxsim.Math_.cos(s.tmp_4);
     s.tmp_3 = r0;
@@ -23506,20 +23550,20 @@ switch (step) {
     r0 = (s.tmp_5 | 0);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___9474 + 1);
-    s.i___9474 = (r0);
+    r0 = (s.i___39011 + 1);
+    s.i___39011 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.cos___9466;
+    r0 = s.cos___39003;
     return leave(s, r0)
   default: oops()
 } } }
-particles_cacheCos__P2713.info = {"start":1005,"length":263,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"cacheCos","argumentNames":["slices"]}
+particles_cacheCos__P32132.info = {"start":1005,"length":263,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"cacheCos","argumentNames":["slices"]}
 
-function particles_cacheCos__P2713_mk(s) {
+function particles_cacheCos__P32132_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_cacheCos__P2713, depth: s.depth + 1,
+        parent: s, fn: particles_cacheCos__P32132, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23527,9 +23571,9 @@ function particles_cacheCos__P2713_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  cos___9466: undefined,
-  anglePerSlice___9468: undefined,
-  i___9474: undefined,
+  cos___39003: undefined,
+  anglePerSlice___39005: undefined,
+  i___39011: undefined,
   arg0: undefined,
 } }
 
@@ -23537,7 +23581,7 @@ function particles_cacheCos__P2713_mk(s) {
 
 
 
-function particles_cacheSin__P2712(s) {
+function particles_cacheSin__P32131(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23547,25 +23591,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sin___9492 = undefined;
-    s.anglePerSlice___9494 = undefined;
-    s.i___9500 = undefined;
+    s.sin___39029 = undefined;
+    s.anglePerSlice___39031 = undefined;
+    s.i___39037 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.sin___9492 = (r0);
+    s.sin___39029 = (r0);
     r0 = (6.283185307179586 / s.arg0);
-    s.anglePerSlice___9494 = (r0);
-    s.i___9500 = (0);
+    s.anglePerSlice___39031 = (r0);
+    s.i___39037 = (0);
   case 1:
-    r0 = (s.i___9500 < s.arg0);
+    r0 = (s.i___39037 < s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.sin___9492;
-    r0 = (s.i___9500 * s.anglePerSlice___9494);
+    s.tmp_1 = r0 = s.sin___39029;
+    r0 = (s.i___39037 * s.anglePerSlice___39031);
     s.tmp_4 = r0;
     r0 = pxsim.Math_.sin(s.tmp_4);
     s.tmp_3 = r0;
@@ -23574,20 +23618,20 @@ switch (step) {
     r0 = (s.tmp_5 | 0);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___9500 + 1);
-    s.i___9500 = (r0);
+    r0 = (s.i___39037 + 1);
+    s.i___39037 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.sin___9492;
+    r0 = s.sin___39029;
     return leave(s, r0)
   default: oops()
 } } }
-particles_cacheSin__P2712.info = {"start":594,"length":263,"line":22,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"cacheSin","argumentNames":["slices"]}
+particles_cacheSin__P32131.info = {"start":594,"length":263,"line":22,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"cacheSin","argumentNames":["slices"]}
 
-function particles_cacheSin__P2712_mk(s) {
+function particles_cacheSin__P32131_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_cacheSin__P2712, depth: s.depth + 1,
+        parent: s, fn: particles_cacheSin__P32131, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23595,9 +23639,9 @@ function particles_cacheSin__P2712_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  sin___9492: undefined,
-  anglePerSlice___9494: undefined,
-  i___9500: undefined,
+  sin___39029: undefined,
+  anglePerSlice___39031: undefined,
+  i___39037: undefined,
   arg0: undefined,
 } }
 
@@ -23605,7 +23649,7 @@ function particles_cacheSin__P2712_mk(s) {
 
 
 
-function particles_SprayFactory_setDirection__P2723(s) {
+function particles_SprayFactory_setDirection__P32142(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23622,31 +23666,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C32137_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_4 = particles_toRadians__P4732_mk(s);
+    s.tmp_4 = particles_toRadians__P34225_mk(s);
     s.tmp_5 = r0 = s.arg1;
     r0 = (s.arg2 >> 1);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 - s.tmp_6);
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 1599; s.pc = 1; return s.tmp_4;
+    s.callLocIdx = 1556; s.pc = 1; return s.tmp_4;
   case 1:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / globals.angleSlice___4726);
+    r0 = (s.tmp_3 / globals.angleSlice___34219);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["minAngle"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_4 = particles_toRadians__P4732_mk(s);
+    s.tmp_4 = particles_toRadians__P34225_mk(s);
     s.tmp_4.arg0 = s.arg2;
-    s.callLocIdx = 1600; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 1557; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / globals.angleSlice___4726);
+    r0 = (s.tmp_3 / globals.angleSlice___34219);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_1 = r0;
@@ -23655,12 +23699,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_setDirection__P2723.info = {"start":3424,"length":228,"line":123,"column":8,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"setDirection","argumentNames":["this","centerDegrees","arcDegrees"]}
+particles_SprayFactory_setDirection__P32142.info = {"start":3424,"length":228,"line":123,"column":8,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"setDirection","argumentNames":["this","centerDegrees","arcDegrees"]}
 
-function particles_SprayFactory_setDirection__P2723_mk(s) {
+function particles_SprayFactory_setDirection__P32142_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_setDirection__P2723, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_setDirection__P32142, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23678,7 +23722,7 @@ function particles_SprayFactory_setDirection__P2723_mk(s) {
 
 
 
-function particles_toRadians__P4732(s) {
+function particles_toRadians__P34225(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23696,9 +23740,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = Math_abs__P123_mk(s);
+    s.tmp_3 = Math_abs__P29658_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1581; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1538; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -23715,12 +23759,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_toRadians__P4732.info = {"start":1307,"length":206,"line":45,"column":4,"endLine":52,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"toRadians","argumentNames":["degrees"]}
+particles_toRadians__P34225.info = {"start":1307,"length":206,"line":45,"column":4,"endLine":52,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"toRadians","argumentNames":["degrees"]}
 
-function particles_toRadians__P4732_mk(s) {
+function particles_toRadians__P34225_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_toRadians__P4732, depth: s.depth + 1,
+        parent: s, fn: particles_toRadians__P34225, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23733,7 +23777,7 @@ function particles_toRadians__P4732_mk(s) {
 
 
 
-function particles_ParticleFactory_constructor__P2715(s) {
+function particles_ParticleFactory_constructor__P32134(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23748,17 +23792,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleFactory__C2714_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleFactory__C32133_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_constructor__P2715.info = {"start":1617,"length":78,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this"]}
+particles_ParticleFactory_constructor__P32134.info = {"start":1617,"length":78,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"inline","argumentNames":["this"]}
 
-function particles_ParticleFactory_constructor__P2715_mk(s) {
+function particles_ParticleFactory_constructor__P32134_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_constructor__P2715, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_constructor__P32134, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -23767,7 +23811,7 @@ function particles_ParticleFactory_constructor__P2715_mk(s) {
 
 
 
-function particles_ParticleSource_setFactory__P2697(s) {
+function particles_ParticleSource_setFactory__P32116(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23783,7 +23827,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["_factory"] = (s.arg1);
@@ -23793,12 +23837,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setFactory__P2697.info = {"start":8107,"length":114,"line":271,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setFactory","argumentNames":["this","factory"]}
+particles_ParticleSource_setFactory__P32116.info = {"start":8107,"length":114,"line":271,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"setFactory","argumentNames":["this","factory"]}
 
-function particles_ParticleSource_setFactory__P2697_mk(s) {
+function particles_ParticleSource_setFactory__P32116_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setFactory__P2697, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setFactory__P32116, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23808,7 +23852,7 @@ function particles_ParticleSource_setFactory__P2697_mk(s) {
 
 
 
-function particles_ParticleSource_setRate__P2695(s) {
+function particles_ParticleSource_setRate__P32114(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23824,7 +23868,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (1000 / s.arg1);
     s.tmp_2 = r0;
@@ -23836,12 +23880,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setRate__P2695.info = {"start":7785,"length":139,"line":258,"column":8,"endLine":261,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRate","argumentNames":["this","particlesPerSecond"]}
+particles_ParticleSource_setRate__P32114.info = {"start":7785,"length":139,"line":258,"column":8,"endLine":261,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"setRate","argumentNames":["this","particlesPerSecond"]}
 
-function particles_ParticleSource_setRate__P2695_mk(s) {
+function particles_ParticleSource_setRate__P32114_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setRate__P2695, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setRate__P32114, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23854,7 +23898,7 @@ function particles_ParticleSource_setRate__P2695_mk(s) {
 
 
 
-function particles_ParticleSource_setAnchor__P2694(s) {
+function particles_ParticleSource_setAnchor__P32113(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23870,18 +23914,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     r0 = (s.arg0).fields["anchor"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setAnchor__P2694.info = {"start":7577,"length":79,"line":250,"column":8,"endLine":252,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setAnchor","argumentNames":["this","anchor"]}
+particles_ParticleSource_setAnchor__P32113.info = {"start":7577,"length":79,"line":250,"column":8,"endLine":252,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"setAnchor","argumentNames":["this","anchor"]}
 
-function particles_ParticleSource_setAnchor__P2694_mk(s) {
+function particles_ParticleSource_setAnchor__P32113_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setAnchor__P2694, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setAnchor__P32113, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23891,7 +23935,7 @@ function particles_ParticleSource_setAnchor__P2694_mk(s) {
 
 
 
-function particles_ParticleSource_clear__P2693(s) {
+function particles_ParticleSource_clear__P32112(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23906,18 +23950,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     r0 = (s.arg0).fields["head"] = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_clear__P2693.info = {"start":7407,"length":54,"line":242,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"clear","argumentNames":["this"]}
+particles_ParticleSource_clear__P32112.info = {"start":7407,"length":54,"line":242,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"clear","argumentNames":["this"]}
 
-function particles_ParticleSource_clear__P2693_mk(s) {
+function particles_ParticleSource_clear__P32112_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_clear__P2693, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_clear__P32112, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -23926,7 +23970,7 @@ function particles_ParticleSource_clear__P2693_mk(s) {
 
 
 
-function particles_ParticleSource_destroy__P2692(s) {
+function particles_ParticleSource_destroy__P32111(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23941,11 +23985,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleSource_enabled__P32110_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1538; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1495; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -23954,21 +23998,21 @@ switch (step) {
     r0 = (s.tmp_2 | 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["pFlags"] = (s.tmp_1);
-    s.tmp_0 = particles_ParticleSource__prune__P2686_mk(s);
+    s.tmp_0 = particles_ParticleSource__prune__P32105_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1539; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1496; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_destroy__P2692.info = {"start":7077,"length":240,"line":232,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"destroy","argumentNames":["this"]}
+particles_ParticleSource_destroy__P32111.info = {"start":7077,"length":240,"line":232,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"destroy","argumentNames":["this"]}
 
-function particles_ParticleSource_destroy__P2692_mk(s) {
+function particles_ParticleSource_destroy__P32111_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_destroy__P2692, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_destroy__P32111, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23980,7 +24024,7 @@ function particles_ParticleSource_destroy__P2692_mk(s) {
 
 
 
-function particles_ParticleSource_enabled__P2691(s) {
+function particles_ParticleSource_enabled__P32110(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23996,11 +24040,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = particles_ParticleSource_enabled__P2690_mk(s);
+    s.tmp_3 = particles_ParticleSource_enabled__P32109_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1537; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1494; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -24029,12 +24073,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_enabled__P2691.info = {"start":6799,"length":214,"line":222,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"enabled","argumentNames":["this","v"]}
+particles_ParticleSource_enabled__P32110.info = {"start":6799,"length":214,"line":222,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"enabled","argumentNames":["this","v"]}
 
-function particles_ParticleSource_enabled__P2691_mk(s) {
+function particles_ParticleSource_enabled__P32110_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_enabled__P2691, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_enabled__P32110, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24051,7 +24095,7 @@ function particles_ParticleSource_enabled__P2691_mk(s) {
 
 
 
-function particles_ParticleSource_enabled__P2690(s) {
+function particles_ParticleSource_enabled__P32109(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24066,7 +24110,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 & 1);
@@ -24081,13 +24125,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_enabled__P2690.info = {"start":6605,"length":76,"line":215,"column":8,"endLine":217,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"enabled","argumentNames":["this"]}
-particles_ParticleSource_enabled__P2690.isGetter = true;
+particles_ParticleSource_enabled__P32109.info = {"start":6605,"length":76,"line":215,"column":8,"endLine":217,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"enabled","argumentNames":["this"]}
+particles_ParticleSource_enabled__P32109.isGetter = true;
 
-function particles_ParticleSource_enabled__P2690_mk(s) {
+function particles_ParticleSource_enabled__P32109_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_enabled__P2690, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_enabled__P32109, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24101,7 +24145,7 @@ function particles_ParticleSource_enabled__P2690_mk(s) {
 
 
 
-function particles_ParticleSource_setAcceleration__P2687(s) {
+function particles_ParticleSource_setAcceleration__P32106(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24118,7 +24162,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -24135,12 +24179,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setAcceleration__P2687.info = {"start":6009,"length":113,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setAcceleration","argumentNames":["this","ax","ay"]}
+particles_ParticleSource_setAcceleration__P32106.info = {"start":6009,"length":113,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"setAcceleration","argumentNames":["this","ax","ay"]}
 
-function particles_ParticleSource_setAcceleration__P2687_mk(s) {
+function particles_ParticleSource_setAcceleration__P32106_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setAcceleration__P2687, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setAcceleration__P32106, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24154,7 +24198,7 @@ function particles_ParticleSource_setAcceleration__P2687_mk(s) {
 
 
 
-function helpers_arrayShift__P100(s) {
+function helpers_arrayShift__P29635(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24172,12 +24216,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayShift__P100.info = {"start":4045,"length":82,"line":153,"column":4,"endLine":155,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayShift","argumentNames":["arr"]}
+helpers_arrayShift__P29635.info = {"start":4045,"length":82,"line":153,"column":4,"endLine":155,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayShift","argumentNames":["arr"]}
 
-function helpers_arrayShift__P100_mk(s) {
+function helpers_arrayShift__P29635_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayShift__P100, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayShift__P29635, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -24186,7 +24230,7 @@ function helpers_arrayShift__P100_mk(s) {
 
 
 
-function particles_SprayFactory_setSpeed__P2722(s) {
+function particles_SprayFactory_setSpeed__P32141(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24202,7 +24246,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C32137_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -24213,12 +24257,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_setSpeed__P2722.info = {"start":3322,"length":92,"line":119,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"setSpeed","argumentNames":["this","pixelsPerSecond"]}
+particles_SprayFactory_setSpeed__P32141.info = {"start":3322,"length":92,"line":119,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"setSpeed","argumentNames":["this","pixelsPerSecond"]}
 
-function particles_SprayFactory_setSpeed__P2722_mk(s) {
+function particles_SprayFactory_setSpeed__P32141_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_setSpeed__P2722, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_setSpeed__P32141, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24231,7 +24275,7 @@ function particles_SprayFactory_setSpeed__P2722_mk(s) {
 
 
 
-function particles_ConfettiFactory_constructor__P2746(s) {
+function particles_ConfettiFactory_constructor__P32165(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24241,8 +24285,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.confetti___10018 = undefined;
-    s.i___10034 = undefined;
+    s.confetti___39555 = undefined;
+    s.i___39571 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -24250,52 +24294,52 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ConfettiFactory__C2745_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ConfettiFactory__C32164_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex10021);
+    r0 = pxsim.image.ofBuffer(_hex39558);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    r0 = pxsim.image.ofBuffer(_hex10023);
+    r0 = pxsim.image.ofBuffer(_hex39560);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_2);
-    r0 = pxsim.image.ofBuffer(_hex10025);
+    r0 = pxsim.image.ofBuffer(_hex39562);
     s.tmp_3 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_3);
-    r0 = pxsim.image.ofBuffer(_hex10027);
+    r0 = pxsim.image.ofBuffer(_hex39564);
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_4);
-    r0 = pxsim.image.ofBuffer(_hex10029);
+    r0 = pxsim.image.ofBuffer(_hex39566);
     s.tmp_5 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_5);
-    s.confetti___10018 = (s.tmp_0);
-    s.tmp_0 = particles_ShapeFactory_constructor__P2741_mk(s);
+    s.confetti___39555 = (s.tmp_0);
+    s.tmp_0 = particles_ShapeFactory_constructor__P32160_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
-    r0 = pxsim_Array__getAt(s.confetti___10018, 0);
+    r0 = pxsim_Array__getAt(s.confetti___39555, 0);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1623; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1580; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.i___10034 = (1);
+    s.i___39571 = (1);
   case 1:
-    s.tmp_1 = r0 = s.i___10034;
-    r0 = pxsim_Array__length(s.confetti___10018);
+    s.tmp_1 = r0 = s.i___39571;
+    r0 = pxsim_Array__length(s.confetti___39555);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_3 = particles_ShapeFactory_addShape__P2742_mk(s);
+    s.tmp_3 = particles_ShapeFactory_addShape__P32161_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.confetti___10018, s.i___10034);
+    r0 = pxsim_Array__getAt(s.confetti___39555, s.i___39571);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 1624; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1581; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
-    r0 = (s.i___10034 + 1);
-    s.i___10034 = (r0);
+    r0 = (s.i___39571 + 1);
+    s.i___39571 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = (s.arg0).fields["minLifespan"] = (1000);
@@ -24304,12 +24348,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ConfettiFactory_constructor__P2746.info = {"start":7755,"length":706,"line":247,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange"]}
+particles_ConfettiFactory_constructor__P32165.info = {"start":7755,"length":706,"line":247,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange"]}
 
-function particles_ConfettiFactory_constructor__P2746_mk(s) {
+function particles_ConfettiFactory_constructor__P32165_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ConfettiFactory_constructor__P2746, depth: s.depth + 1,
+        parent: s, fn: particles_ConfettiFactory_constructor__P32165, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24317,23 +24361,23 @@ function particles_ConfettiFactory_constructor__P2746_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  confetti___10018: undefined,
-  i___10034: undefined,
+  confetti___39555: undefined,
+  i___39571: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
 } }
 
-const _hex10021 = pxsim.BufferMethods.createBufferFromHex("87040100010000000f000000")
-const _hex10023 = pxsim.BufferMethods.createBufferFromHex("8704010002000000ff000000")
-const _hex10025 = pxsim.BufferMethods.createBufferFromHex("87040200010000000f0000000f000000")
-const _hex10027 = pxsim.BufferMethods.createBufferFromHex("8704020002000000ff0000000f000000")
-const _hex10029 = pxsim.BufferMethods.createBufferFromHex("87040200020000000f000000ff000000")
+const _hex39558 = pxsim.BufferMethods.createBufferFromHex("87040100010000000f000000")
+const _hex39560 = pxsim.BufferMethods.createBufferFromHex("8704010002000000ff000000")
+const _hex39562 = pxsim.BufferMethods.createBufferFromHex("87040200010000000f0000000f000000")
+const _hex39564 = pxsim.BufferMethods.createBufferFromHex("8704020002000000ff0000000f000000")
+const _hex39566 = pxsim.BufferMethods.createBufferFromHex("87040200020000000f000000ff000000")
 
 
 
 
-function particles_ShapeFactory_addShape__P2742(s) {
+function particles_ShapeFactory_addShape__P32161(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24349,7 +24393,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ShapeFactory__C32159_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["sources"];
@@ -24361,12 +24405,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_addShape__P2742.info = {"start":7079,"length":83,"line":225,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"addShape","argumentNames":["this","shape"]}
+particles_ShapeFactory_addShape__P32161.info = {"start":7079,"length":83,"line":225,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"addShape","argumentNames":["this","shape"]}
 
-function particles_ShapeFactory_addShape__P2742_mk(s) {
+function particles_ShapeFactory_addShape__P32161_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_addShape__P2742, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_addShape__P32161, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -24377,7 +24421,7 @@ function particles_ShapeFactory_addShape__P2742_mk(s) {
 
 
 
-function particles_ShapeFactory_constructor__P2741(s) {
+function particles_ShapeFactory_constructor__P32160(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24395,14 +24439,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
-    s.tmp_0 = particles_AreaFactory_constructor__P2729_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C32159_VT)) failedCast(r0);
+    s.tmp_0 = particles_AreaFactory_constructor__P32148_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = undefined;
     s.tmp_0.arg4 = undefined;
-    s.callLocIdx = 1613; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1570; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
@@ -24433,12 +24477,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_constructor__P2741.info = {"start":6668,"length":285,"line":212,"column":8,"endLine":219,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","source"]}
+particles_ShapeFactory_constructor__P32160.info = {"start":6668,"length":285,"line":212,"column":8,"endLine":219,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","source"]}
 
-function particles_ShapeFactory_constructor__P2741_mk(s) {
+function particles_ShapeFactory_constructor__P32160_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_constructor__P2741, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_constructor__P32160, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24455,7 +24499,7 @@ function particles_ShapeFactory_constructor__P2741_mk(s) {
 
 
 
-function particles_AreaFactory_constructor__P2729(s) {
+function particles_AreaFactory_constructor__P32148(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24474,13 +24518,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_AreaFactory__C2724_VT)) failedCast(r0);
-    s.tmp_0 = particles_SprayFactory_constructor__P2719_mk(s);
+    if (!checkSubtype(r0, particles_AreaFactory__C32143_VT)) failedCast(r0);
+    s.tmp_0 = particles_SprayFactory_constructor__P32138_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 40;
     s.tmp_0.arg2 = 0;
     s.tmp_0.arg3 = 90;
-    s.callLocIdx = 1601; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1558; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = (s.arg0).fields["xRange"] = (s.arg1);
@@ -24505,12 +24549,12 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_0 = r0;
     r0 = (s.arg0).fields["maxLifespan"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C2586_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C32005_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P2588_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P32007_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1602; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1559; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["galois"] = (s.tmp_0);
@@ -24518,12 +24562,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_constructor__P2729.info = {"start":3950,"length":374,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","minLifespan","maxLifespan"]}
+particles_AreaFactory_constructor__P32148.info = {"start":3950,"length":374,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","minLifespan","maxLifespan"]}
 
-function particles_AreaFactory_constructor__P2729_mk(s) {
+function particles_AreaFactory_constructor__P32148_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_constructor__P2729, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_constructor__P32148, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24538,7 +24582,7 @@ function particles_AreaFactory_constructor__P2729_mk(s) {
 
 
 
-function effects_ScreenEffect_constructor__P2794(s) {
+function effects_ScreenEffect_constructor__P32213(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24557,13 +24601,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ScreenEffect__C2793_VT)) failedCast(r0);
-    s.tmp_0 = effects_ParticleEffect_constructor__P2790_mk(s);
+    if (!checkSubtype(r0, effects_ScreenEffect__C32212_VT)) failedCast(r0);
+    s.tmp_0 = effects_ParticleEffect_constructor__P32209_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg3;
     s.tmp_0.arg3 = s.arg4;
-    s.callLocIdx = 1633; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1590; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["sceneDefaultRate"] = (s.arg2);
@@ -24571,12 +24615,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ScreenEffect_constructor__P2794.info = {"start":2911,"length":332,"line":81,"column":8,"endLine":85,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this","anchorDefault","sceneDefault","defaultLifespan","sourceFactory"]}
+effects_ScreenEffect_constructor__P32213.info = {"start":2911,"length":332,"line":81,"column":8,"endLine":85,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"inline","argumentNames":["this","anchorDefault","sceneDefault","defaultLifespan","sourceFactory"]}
 
-function effects_ScreenEffect_constructor__P2794_mk(s) {
+function effects_ScreenEffect_constructor__P32213_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ScreenEffect_constructor__P2794, depth: s.depth + 1,
+        parent: s, fn: effects_ScreenEffect_constructor__P32213, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -24590,7 +24634,7 @@ function effects_ScreenEffect_constructor__P2794_mk(s) {
 
 
 
-function effects_ParticleEffect_constructor__P2790(s) {
+function effects_ParticleEffect_constructor__P32209(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24608,7 +24652,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C2789_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ParticleEffect__C32208_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sourceFactory"] = (s.arg3);
     r0 = (s.arg0).fields["defaultRate"] = (s.arg1);
     r0 = (s.arg0).fields["defaultLifespan"] = (s.arg2);
@@ -24616,12 +24660,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_constructor__P2790.info = {"start":384,"length":364,"line":13,"column":8,"endLine":18,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this","defaultParticlesPerSecond","defaultLifespan","sourceFactory"]}
+effects_ParticleEffect_constructor__P32209.info = {"start":384,"length":364,"line":13,"column":8,"endLine":18,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"inline","argumentNames":["this","defaultParticlesPerSecond","defaultLifespan","sourceFactory"]}
 
-function effects_ParticleEffect_constructor__P2790_mk(s) {
+function effects_ParticleEffect_constructor__P32209_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_constructor__P2790, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_constructor__P32209, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -24633,7 +24677,7 @@ function effects_ParticleEffect_constructor__P2790_mk(s) {
 
 
 
-function scene_Scene_init__P2441(s) {
+function scene_Scene_init__P31860(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24648,7 +24692,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C31838_VT)) failedCast(r0);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -24656,8 +24700,8 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_1 = power_poke__P1705_mk(s);
-    s.callLocIdx = 1026; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = power_poke__P31123_mk(s);
+    s.callLocIdx = 983; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -24665,84 +24709,84 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["allSprites"] = (s.tmp_1);
     r0 = (s.arg0).fields["spriteNextId"] = (0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P10153);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P39690);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P29927_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 8;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1029; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 986; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameHandler__P29927_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 13;
-    s.tmp_0.arg2 = controller__moveSprites__P1922;
-    s.callLocIdx = 1030; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg2 = controller__moveSprites__P31341;
+    s.callLocIdx = 987; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P10176);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P39713);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P29927_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 15;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1032; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 989; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P10189);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P39726);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P29927_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 55;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1036; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 993; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P10210);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P39747);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P29927_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 90;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1038; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 995; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P10218);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P39755);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P29927_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 150;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1042; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 999; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameHandler__P29927_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 200;
-    s.tmp_0.arg2 = control___screen_update__P1763;
-    s.callLocIdx = 1043; s.pc = 11; return s.tmp_0;
+    s.tmp_0.arg2 = control___screen_update__P31181;
+    s.callLocIdx = 1000; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P10247);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P39784);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_1.arg0 = globals.scene_Scene_initializers___2439;
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_1.arg0 = globals.scene_Scene_initializers___31858;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1045; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 1002; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
   case 3:
@@ -24750,12 +24794,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_init__P2441.info = {"start":4168,"length":2477,"line":122,"column":8,"endLine":180,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"init","argumentNames":["this"]}
+scene_Scene_init__P31860.info = {"start":4168,"length":2477,"line":122,"column":8,"endLine":180,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"init","argumentNames":["this"]}
 
-function scene_Scene_init__P2441_mk(s) {
+function scene_Scene_init__P31860_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_init__P2441, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_init__P31860, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24766,7 +24810,7 @@ function scene_Scene_init__P2441_mk(s) {
 
 
 
-function inline__P10153(s) {
+function inline__P39690(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24785,26 +24829,26 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_millis"] = (s.tmp_1);
-    s.tmp_0 = controller___update__P1950_mk(s);
+    s.tmp_0 = controller___update__P31369_mk(s);
     r0 = s.caps[0].fields["eventContext"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["deltaTimeMillis"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 1000);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1028; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 985; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10153.info = {"start":4458,"length":217,"line":129,"column":72,"endLine":133,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P39690.info = {"start":4458,"length":217,"line":129,"column":72,"endLine":133,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P10153_mk(s) {
+function inline__P39690_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10153, depth: s.depth + 1,
+        parent: s, fn: inline__P39690, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24816,7 +24860,7 @@ function inline__P10153_mk(s) {
 
 
 
-function inline__P10176(s) {
+function inline__P39713(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24826,7 +24870,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = PhysicsEngine__C2159_v4_2_mk(s);
+    s.tmp_0 = PhysicsEngine__C31578_v4_2_mk(s);
     r0 = s.caps[0].fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
     r0 = s.caps[0].fields["eventContext"];
@@ -24835,7 +24879,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 1000);
     s.tmp_0.arg1 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C31578_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.move;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -24844,12 +24888,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10176.info = {"start":4970,"length":159,"line":138,"column":69,"endLine":141,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P39713.info = {"start":4970,"length":159,"line":138,"column":69,"endLine":141,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P10176_mk(s) {
+function inline__P39713_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10176, depth: s.depth + 1,
+        parent: s, fn: inline__P39713, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24860,7 +24904,7 @@ function inline__P10176_mk(s) {
 
 
 
-function inline__P10189(s) {
+function inline__P39726(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24870,80 +24914,80 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dt___10190 = undefined;
-    s.s___10198 = undefined;
-    s.unnamed114___U2 = undefined;
-    s.unnamed115___U3 = undefined;
+    s.dt___39727 = undefined;
+    s.s___39735 = undefined;
+    s.unnamed954___U2 = undefined;
+    s.unnamed955___U3 = undefined;
     r0 = s.caps[0].fields["eventContext"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["deltaTimeMillis"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 1000);
-    s.dt___10190 = (r0);
-    s.tmp_0 = scene_Camera_update__P2376_mk(s);
+    s.dt___39727 = (r0);
+    s.tmp_0 = scene_Camera_update__P31795_mk(s);
     r0 = s.caps[0].fields["camera"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1034; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 991; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.s___10198 = (undefined);
+    s.s___39735 = (undefined);
     r0 = s.caps[0].fields["allSprites"];
-    s.unnamed114___U2 = (r0);
-    s.unnamed115___U3 = (0);
+    s.unnamed954___U2 = (r0);
+    s.unnamed955___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed115___U3;
-    r0 = pxsim_Array__length(s.unnamed114___U2);
+    s.tmp_0 = r0 = s.unnamed955___U3;
+    r0 = pxsim_Array__length(s.unnamed954___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed114___U2, s.unnamed115___U3);
-    s.s___10198 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed954___U2, s.unnamed955___U3);
+    s.s___39735 = (r0);
     s.tmp_2 = if___update_3_mk(s);
-    s.tmp_2.arg0 = s.s___10198;
+    s.tmp_2.arg0 = s.s___39735;
     r0 = s.caps[0].fields["camera"];
     s.tmp_2.arg1 = r0;
-    s.tmp_2.arg2 = s.dt___10190;
+    s.tmp_2.arg2 = s.dt___39727;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "__update"), 3);
-      s.callLocIdx = 1035; s.pc = 4; return s.tmp_2;
+      s.callLocIdx = 992; s.pc = 4; return s.tmp_2;
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["__update"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["__update"], 3); s.callLocIdx = 1035; s.pc = 4; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1035; s.pc = 4; return s.tmp_2;; }
-     else { s.callLocIdx = 1035; s.pc = 4; return s.tmp_2; }
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["__update"], 3); s.callLocIdx = 992; s.pc = 4; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 992; s.pc = 4; return s.tmp_2;; }
+     else { s.callLocIdx = 992; s.pc = 4; return s.tmp_2; }
     }
   case 4:
     r0 = s.retval;
-    r0 = (s.unnamed115___U3 + 1);
-    s.unnamed115___U3 = (r0);
+    r0 = (s.unnamed955___U3 + 1);
+    s.unnamed955___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed114___U2 = (undefined);
+    s.unnamed954___U2 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10189.info = {"start":5318,"length":214,"line":147,"column":79,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P39726.info = {"start":5318,"length":214,"line":147,"column":79,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P10189_mk(s) {
+function inline__P39726_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10189, depth: s.depth + 1,
+        parent: s, fn: inline__P39726, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  dt___10190: undefined,
-  s___10198: undefined,
-  unnamed114___U2: undefined,
-  unnamed115___U3: undefined,
+  dt___39727: undefined,
+  s___39735: undefined,
+  unnamed954___U2: undefined,
+  unnamed955___U3: undefined,
 } }
 
 
 
 
 
-function inline__P10210(s) {
+function inline__P39747(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24953,21 +24997,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_Scene_render__P2446_mk(s);
+    s.tmp_0 = scene_Scene_render__P31865_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1037; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 994; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10210.info = {"start":5673,"length":109,"line":158,"column":76,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P39747.info = {"start":5673,"length":109,"line":158,"column":76,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P10210_mk(s) {
+function inline__P39747_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10210, depth: s.depth + 1,
+        parent: s, fn: inline__P39747, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -24976,7 +25020,7 @@ function inline__P10210_mk(s) {
 
 
 
-function inline__P10218(s) {
+function inline__P39755(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24986,26 +25030,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = r0 = globals.stats___2529;
+    s.tmp_0 = r0 = globals.stats___31948;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.control_EventContext_onStats___387;
+    r0 = globals.control_EventContext_onStats___29922;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 3; continue; }
     s.tmp_2 = lambda_2_mk(s);
-    s.tmp_2.argL = globals.control_EventContext_onStats___387;
-    if ((globals.control_EventContext_lastStats___386) && (globals.control_EventContext_lastStats___386).vtable) {
+    s.tmp_2.argL = globals.control_EventContext_onStats___29922;
+    if ((globals.control_EventContext_lastStats___29921) && (globals.control_EventContext_lastStats___29921).vtable) {
     setupResume(s, 8);
-    pxsim_String__stringConv(globals.control_EventContext_lastStats___386);
+    pxsim_String__stringConv(globals.control_EventContext_lastStats___29921);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.control_EventContext_lastStats___386) + ""; }
+    } else { s.retval = (globals.control_EventContext_lastStats___29921) + ""; }
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -25036,41 +25080,41 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_4);
     s.tmp_2.arg0 = r0;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1039; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 996; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___2528);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___31947);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = PhysicsEngine__C2159_v3_1_mk(s);
+    s.tmp_0 = PhysicsEngine__C31578_v3_1_mk(s);
     r0 = s.caps[0].fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C31578_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.draw;
     s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
   case 5:
   case 6:
-    s.tmp_0 = game_consoleOverlay_draw__P2654_mk(s);
-    s.callLocIdx = 1040; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = game_consoleOverlay_draw__P32073_mk(s);
+    s.callLocIdx = 997; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = power_checkDeepSleep__P1706_mk(s);
-    s.callLocIdx = 1041; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = power_checkDeepSleep__P31124_mk(s);
+    s.callLocIdx = 998; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10218.info = {"start":5899,"length":504,"line":163,"column":80,"endLine":175,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P39755.info = {"start":5899,"length":504,"line":163,"column":80,"endLine":175,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P10218_mk(s) {
+function inline__P39755_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10218, depth: s.depth + 1,
+        parent: s, fn: inline__P39755, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25087,7 +25131,7 @@ function inline__P10218_mk(s) {
 
 
 
-function inline__P10247(s) {
+function inline__P39784(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25105,19 +25149,19 @@ switch (step) {
     s.tmp_0.argL = s.arg0;
     s.tmp_0.arg0 = s.caps[0];
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1044; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1001; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10247.info = {"start":6621,"length":12,"line":179,"column":39,"endLine":179,"endColumn":51,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["f"]}
+inline__P39784.info = {"start":6621,"length":12,"line":179,"column":39,"endLine":179,"endColumn":51,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":["f"]}
 
-function inline__P10247_mk(s) {
+function inline__P39784_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10247, depth: s.depth + 1,
+        parent: s, fn: inline__P39784, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -25127,7 +25171,7 @@ function inline__P10247_mk(s) {
 
 
 
-function game_consoleOverlay_draw__P2654(s) {
+function game_consoleOverlay_draw__P32073(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25137,16 +25181,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.height___10296 = undefined;
-    s.top___10301 = undefined;
-    s.i___10307 = undefined;
-    s.t___10320 = undefined;
-    s.tOff___10327 = undefined;
-    s.tab___10329 = undefined;
-    s.unnamed118___U6 = undefined;
-    s.unnamed119___U7 = undefined;
-    s.padding___10331 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
+    s.height___39833 = undefined;
+    s.top___39838 = undefined;
+    s.i___39844 = undefined;
+    s.t___39857 = undefined;
+    s.tOff___39864 = undefined;
+    s.tab___39866 = undefined;
+    s.unnamed958___U6 = undefined;
+    s.unnamed959___U7 = undefined;
+    s.padding___39868 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___34139);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -25155,7 +25199,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___34093);
     s.tmp_4 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
@@ -25171,23 +25215,23 @@ switch (step) {
   case 3:
   case 4:
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = globals.consoleFont___4654;
+    s.tmp_7.arg0 = globals.consoleFont___34147;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "charHeight");
     } else {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["charHeight"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["charHeight"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 1506; s.pc = 14; return s.tmp_7; }
+     else { s.callLocIdx = 1463; s.pc = 14; return s.tmp_7; }
     }
   case 14:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = (s.tmp_6 + 2);
-    s.height___10296 = (r0);
-    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
+    s.height___39833 = (r0);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___31948);
     if (!r0) { step = 5; continue; }
-    r0 = s.height___10296;
+    r0 = s.height___39833;
     { step = 6; continue; }
   case 5:
     r0 = 0;
@@ -25195,17 +25239,17 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_0 = r0;
     r0 = (2 + s.tmp_0);
-    s.top___10301 = (r0);
-    s.i___10307 = (0);
+    s.top___39838 = (r0);
+    s.i___39844 = (0);
   case 7:
-    s.tmp_1 = r0 = s.i___10307;
-    r0 = pxsim_Array__length(globals.consoleStrings___4646);
+    s.tmp_1 = r0 = s.i___39844;
+    r0 = pxsim_Array__length(globals.consoleStrings___34139);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
-    r0 = pxsim_Array__getAt(globals.consoleStrings___4646, s.i___10307);
+    r0 = pxsim_Array__getAt(globals.consoleStrings___34139, s.i___39844);
     s.tmp_5 = r0;
     r0 = pxsim_String_.indexOf(s.tmp_5, "\t", undefined);
     s.tmp_4 = r0;
@@ -25213,50 +25257,50 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 10; continue; }
-    s.tmp_6 = helpers_stringSplit__P117_mk(s);
-    r0 = pxsim_Array__getAt(globals.consoleStrings___4646, s.i___10307);
+    s.tmp_6 = helpers_stringSplit__P29652_mk(s);
+    r0 = pxsim_Array__getAt(globals.consoleStrings___34139, s.i___39844);
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = "\t";
     s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1507; s.pc = 15; return s.tmp_6;
+    s.callLocIdx = 1464; s.pc = 15; return s.tmp_6;
   case 15:
     r0 = s.retval;
-    s.t___10320 = (r0);
-    s.tOff___10327 = (0);
-    s.tab___10329 = (undefined);
-    s.unnamed118___U6 = (s.t___10320);
-    s.unnamed119___U7 = (0);
+    s.t___39857 = (r0);
+    s.tOff___39864 = (0);
+    s.tab___39866 = (undefined);
+    s.unnamed958___U6 = (s.t___39857);
+    s.unnamed959___U7 = (0);
   case 8:
-    s.tmp_0 = r0 = s.unnamed119___U7;
-    r0 = pxsim_Array__length(s.unnamed118___U6);
+    s.tmp_0 = r0 = s.unnamed959___U7;
+    r0 = pxsim_Array__length(s.unnamed958___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed118___U6, s.unnamed119___U7);
-    s.tab___10329 = (r0);
-    s.tmp_2 = r0 = globals.tabSize___4648;
-    s.tmp_5 = r0 = s.tOff___10327;
-    r0 = pxsim_String_.length(s.tab___10329);
+    r0 = pxsim_Array__getAt(s.unnamed958___U6, s.unnamed959___U7);
+    s.tab___39866 = (r0);
+    s.tmp_2 = r0 = globals.tabSize___34141;
+    s.tmp_5 = r0 = s.tOff___39864;
+    r0 = pxsim_String_.length(s.tab___39866);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 % globals.tabSize___4648);
+    r0 = (s.tmp_4 % globals.tabSize___34141);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
-    s.padding___10331 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_0.arg1 = s.tab___10329;
-    s.tmp_2 = r0 = s.tOff___10327;
+    s.padding___39868 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_0.arg1 = s.tab___39866;
+    s.tmp_2 = r0 = s.tOff___39864;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.consoleFont___4654;
+    s.tmp_4.arg0 = globals.consoleFont___34147;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charWidth");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1508; s.pc = 17; return s.tmp_4; }
+     else { s.callLocIdx = 1465; s.pc = 17; return s.tmp_4; }
     }
   case 17:
     r0 = s.retval;
@@ -25265,50 +25309,50 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (4 + s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.tmp_5 = r0 = s.top___10301;
-    r0 = (s.i___10307 * s.height___10296);
+    s.tmp_5 = r0 = s.top___39838;
+    r0 = (s.i___39844 * s.height___39833);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = globals.consoleColor___4645;
-    s.tmp_0.arg5 = globals.consoleFont___4654;
+    s.tmp_0.arg4 = globals.consoleColor___34138;
+    s.tmp_0.arg5 = globals.consoleFont___34147;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1509; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1466; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tOff___10327;
-    r0 = pxsim_String_.length(s.tab___10329);
+    s.tmp_0 = r0 = s.tOff___39864;
+    r0 = pxsim_String_.length(s.tab___39866);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.padding___10331);
+    r0 = (s.tmp_2 + s.padding___39868);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.tOff___10327 = (r0);
-    r0 = (s.unnamed119___U7 + 1);
-    s.unnamed119___U7 = (r0);
+    s.tOff___39864 = (r0);
+    r0 = (s.unnamed959___U7 + 1);
+    s.unnamed959___U7 = (r0);
     { step = 8; continue; }
   case 9:
-    s.unnamed118___U6 = (undefined);
+    s.unnamed958___U6 = (undefined);
     { step = 11; continue; }
   case 10:
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    r0 = pxsim_Array__getAt(globals.consoleStrings___4646, s.i___10307);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    r0 = pxsim_Array__getAt(globals.consoleStrings___34139, s.i___39844);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 4;
-    s.tmp_1 = r0 = s.top___10301;
-    r0 = (s.i___10307 * s.height___10296);
+    s.tmp_1 = r0 = s.top___39838;
+    r0 = (s.i___39844 * s.height___39833);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = globals.consoleColor___4645;
-    s.tmp_0.arg5 = globals.consoleFont___4654;
+    s.tmp_0.arg4 = globals.consoleColor___34138;
+    s.tmp_0.arg5 = globals.consoleFont___34147;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1510; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1467; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
   case 11:
-    r0 = (s.i___10307 + 1);
-    s.i___10307 = (r0);
+    r0 = (s.i___39844 + 1);
+    s.i___39844 = (r0);
     { step = 7; continue; }
   case 12:
   case 13:
@@ -25316,12 +25360,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_draw__P2654.info = {"start":1364,"length":859,"line":44,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"draw","argumentNames":[]}
+game_consoleOverlay_draw__P32073.info = {"start":1364,"length":859,"line":44,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/game---hw/console.ts","functionName":"draw","argumentNames":[]}
 
-function game_consoleOverlay_draw__P2654_mk(s) {
+function game_consoleOverlay_draw__P32073_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_draw__P2654, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_draw__P32073, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25331,22 +25375,22 @@ function game_consoleOverlay_draw__P2654_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  height___10296: undefined,
-  top___10301: undefined,
-  i___10307: undefined,
-  t___10320: undefined,
-  tOff___10327: undefined,
-  tab___10329: undefined,
-  unnamed118___U6: undefined,
-  unnamed119___U7: undefined,
-  padding___10331: undefined,
+  height___39833: undefined,
+  top___39838: undefined,
+  i___39844: undefined,
+  t___39857: undefined,
+  tOff___39864: undefined,
+  tab___39866: undefined,
+  unnamed958___U6: undefined,
+  unnamed959___U7: undefined,
+  padding___39868: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_isVisible__P2635(s) {
+function scene_systemMenu_isVisible__P32054(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25356,7 +25400,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___34093);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1 = r0;
@@ -25366,12 +25410,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_isVisible__P2635.info = {"start":13170,"length":62,"line":395,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"isVisible","argumentNames":[]}
+scene_systemMenu_isVisible__P32054.info = {"start":13170,"length":62,"line":395,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"isVisible","argumentNames":[]}
 
-function scene_systemMenu_isVisible__P2635_mk(s) {
+function scene_systemMenu_isVisible__P32054_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_isVisible__P2635, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_isVisible__P32054, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25382,7 +25426,7 @@ function scene_systemMenu_isVisible__P2635_mk(s) {
 
 
 
-function helpers_stringSplit__P117(s) {
+function helpers_stringSplit__P29652(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25392,15 +25436,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.A___10385 = undefined;
-    s.lim___10387 = undefined;
-    s.s___10403 = undefined;
-    s.p___10406 = undefined;
-    s.R___10407 = undefined;
-    s.z___10421 = undefined;
-    s.T___10434 = undefined;
-    s.q___10435 = undefined;
-    s.e___10441 = undefined;
+    s.A___39922 = undefined;
+    s.lim___39924 = undefined;
+    s.s___39940 = undefined;
+    s.p___39943 = undefined;
+    s.R___39944 = undefined;
+    s.z___39958 = undefined;
+    s.T___39971 = undefined;
+    s.q___39972 = undefined;
+    s.e___39978 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -25408,36 +25452,36 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.A___10385 = (r0);
-    s.lim___10387 = (0);
+    s.A___39922 = (r0);
+    s.lim___39924 = (0);
     r0 = (s.arg2 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = (536870912 - 1);
-    s.lim___10387 = (r0);
+    s.lim___39924 = (r0);
     { step = 4; continue; }
   case 1:
     r0 = (s.arg2 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.lim___10387 = (0);
+    s.lim___39924 = (0);
     { step = 3; continue; }
   case 2:
     r0 = (s.arg2 | 0);
-    s.lim___10387 = (r0);
+    s.lim___39924 = (r0);
   case 3:
   case 4:
     r0 = pxsim_String_.length(s.arg0);
-    s.s___10403 = (r0);
-    s.p___10406 = (0);
-    s.R___10407 = (s.arg1);
-    r0 = (s.lim___10387 == 0);
+    s.s___39940 = (r0);
+    s.p___39943 = (0);
+    s.R___39944 = (s.arg1);
+    r0 = (s.lim___39924 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = s.A___10385;
+    r0 = s.A___39922;
     { step = 21; continue; }
   case 5:
   case 6:
@@ -25445,123 +25489,123 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_Array_.setAt(s.A___10385, 0, s.arg0);
-    r0 = s.A___10385;
+    r0 = pxsim_Array_.setAt(s.A___39922, 0, s.arg0);
+    r0 = s.A___39922;
     { step = 21; continue; }
   case 7:
   case 8:
-    r0 = (s.s___10403 == 0);
+    r0 = (s.s___39940 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = helpers_splitMatch__P3959_mk(s);
+    s.tmp_1 = helpers_splitMatch__P33494_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = 0;
-    s.tmp_1.arg2 = s.R___10407;
+    s.tmp_1.arg2 = s.R___39944;
     s.callLocIdx = 12; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    s.z___10421 = (r0);
-    r0 = (s.z___10421 > -1);
+    s.z___39958 = (r0);
+    r0 = (s.z___39958 > -1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = s.A___10385;
+    r0 = s.A___39922;
     { step = 21; continue; }
   case 9:
   case 10:
-    r0 = pxsim_Array_.setAt(s.A___10385, 0, s.arg0);
-    r0 = s.A___10385;
+    r0 = pxsim_Array_.setAt(s.A___39922, 0, s.arg0);
+    r0 = s.A___39922;
     { step = 21; continue; }
   case 11:
   case 12:
-    s.q___10435 = (s.p___10406);
+    s.q___39972 = (s.p___39943);
   case 13:
-    r0 = (s.q___10435 != s.s___10403);
+    r0 = (s.q___39972 != s.s___39940);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    s.tmp_1 = helpers_splitMatch__P3959_mk(s);
+    s.tmp_1 = helpers_splitMatch__P33494_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.q___10435;
-    s.tmp_1.arg2 = s.R___10407;
+    s.tmp_1.arg1 = s.q___39972;
+    s.tmp_1.arg2 = s.R___39944;
     s.callLocIdx = 13; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
-    s.e___10441 = (r0);
-    r0 = (s.e___10441 < 0);
+    s.e___39978 = (r0);
+    r0 = (s.e___39978 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.q___10435 + 1);
-    s.q___10435 = (r0);
+    r0 = (s.q___39972 + 1);
+    s.q___39972 = (r0);
     { step = 19; continue; }
   case 14:
-    r0 = (s.e___10441 == s.p___10406);
+    r0 = (s.e___39978 == s.p___39943);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = (s.q___10435 + 1);
-    s.q___10435 = (r0);
+    r0 = (s.q___39972 + 1);
+    s.q___39972 = (r0);
     { step = 18; continue; }
   case 15:
-    s.tmp_0 = helpers_stringSlice__P115_mk(s);
+    s.tmp_0 = helpers_stringSlice__P29650_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.p___10406;
-    s.tmp_0.arg2 = s.q___10435;
+    s.tmp_0.arg1 = s.p___39943;
+    s.tmp_0.arg2 = s.q___39972;
     s.callLocIdx = 14; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.T___10434 = (r0);
-    r0 = pxsim_Array__push(s.A___10385, s.T___10434);
-    r0 = pxsim_Array__length(s.A___10385);
+    s.T___39971 = (r0);
+    r0 = pxsim_Array__push(s.A___39922, s.T___39971);
+    r0 = pxsim_Array__length(s.A___39922);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.lim___10387);
+    r0 = (s.tmp_1 == s.lim___39924);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    r0 = s.A___10385;
+    r0 = s.A___39922;
     { step = 21; continue; }
   case 16:
   case 17:
-    s.p___10406 = (s.e___10441);
-    s.q___10435 = (s.p___10406);
+    s.p___39943 = (s.e___39978);
+    s.q___39972 = (s.p___39943);
   case 18:
   case 19:
     { step = 13; continue; }
   case 20:
-    s.tmp_0 = helpers_stringSlice__P115_mk(s);
+    s.tmp_0 = helpers_stringSlice__P29650_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.p___10406;
-    s.tmp_0.arg2 = s.q___10435;
+    s.tmp_0.arg1 = s.p___39943;
+    s.tmp_0.arg2 = s.q___39972;
     s.callLocIdx = 15; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.T___10434 = (r0);
-    r0 = pxsim_Array__push(s.A___10385, s.T___10434);
-    r0 = s.A___10385;
+    s.T___39971 = (r0);
+    r0 = pxsim_Array__push(s.A___39922, s.T___39971);
+    r0 = s.A___39922;
   case 21:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_stringSplit__P117.info = {"start":11930,"length":1319,"line":407,"column":4,"endLine":451,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSplit","argumentNames":["S","separator","limit"]}
+helpers_stringSplit__P29652.info = {"start":11930,"length":1319,"line":407,"column":4,"endLine":451,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSplit","argumentNames":["S","separator","limit"]}
 
-function helpers_stringSplit__P117_mk(s) {
+function helpers_stringSplit__P29652_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_stringSplit__P117, depth: s.depth + 1,
+        parent: s, fn: helpers_stringSplit__P29652, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  A___10385: undefined,
-  lim___10387: undefined,
-  s___10403: undefined,
-  p___10406: undefined,
-  R___10407: undefined,
-  z___10421: undefined,
-  T___10434: undefined,
-  q___10435: undefined,
-  e___10441: undefined,
+  A___39922: undefined,
+  lim___39924: undefined,
+  s___39940: undefined,
+  p___39943: undefined,
+  R___39944: undefined,
+  z___39958: undefined,
+  T___39971: undefined,
+  q___39972: undefined,
+  e___39978: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -25571,7 +25615,7 @@ function helpers_stringSplit__P117_mk(s) {
 
 
 
-function helpers_splitMatch__P3959(s) {
+function helpers_splitMatch__P33494(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25581,9 +25625,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___10517 = undefined;
-    s.s___10520 = undefined;
-    s.i___10530 = undefined;
+    s.r___40054 = undefined;
+    s.s___40057 = undefined;
+    s.i___40067 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -25591,12 +25635,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_String_.length(s.arg2);
-    s.r___10517 = (r0);
+    s.r___40054 = (r0);
     r0 = pxsim_String_.length(s.arg0);
-    s.s___10520 = (r0);
-    r0 = (s.arg1 + s.r___10517);
+    s.s___40057 = (r0);
+    r0 = (s.arg1 + s.r___40054);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.s___10520);
+    r0 = (s.tmp_1 > s.s___40057);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -25604,18 +25648,18 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    s.i___10530 = (0);
+    s.i___40067 = (0);
   case 3:
-    r0 = (s.i___10530 < s.r___10517);
+    r0 = (s.i___40067 < s.r___40054);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
     s.tmp_3 = r0 = s.arg0;
-    r0 = (s.arg1 + s.i___10530);
+    r0 = (s.arg1 + s.i___40067);
     s.tmp_4 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_4);
     s.tmp_2 = r0;
-    r0 = pxsim_String_.charAt(s.arg2, s.i___10530);
+    r0 = pxsim_String_.charAt(s.arg2, s.i___40067);
     s.tmp_5 = r0;
     r0 = (s.tmp_2 != s.tmp_5);
     s.tmp_1 = r0;
@@ -25625,21 +25669,21 @@ switch (step) {
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.i___10530 + 1);
-    s.i___10530 = (r0);
+    r0 = (s.i___40067 + 1);
+    s.i___40067 = (r0);
     { step = 3; continue; }
   case 6:
-    r0 = (s.arg1 + s.r___10517);
+    r0 = (s.arg1 + s.r___40054);
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_splitMatch__P3959.info = {"start":13255,"length":289,"line":453,"column":4,"endLine":462,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"splitMatch","argumentNames":["S","q","R"]}
+helpers_splitMatch__P33494.info = {"start":13255,"length":289,"line":453,"column":4,"endLine":462,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"splitMatch","argumentNames":["S","q","R"]}
 
-function helpers_splitMatch__P3959_mk(s) {
+function helpers_splitMatch__P33494_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_splitMatch__P3959, depth: s.depth + 1,
+        parent: s, fn: helpers_splitMatch__P33494, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25647,9 +25691,9 @@ function helpers_splitMatch__P3959_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  r___10517: undefined,
-  s___10520: undefined,
-  i___10530: undefined,
+  r___40054: undefined,
+  s___40057: undefined,
+  i___40067: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -25659,7 +25703,7 @@ function helpers_splitMatch__P3959_mk(s) {
 
 
 
-function helpers_stringSlice__P115(s) {
+function helpers_stringSlice__P29650(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25669,7 +25713,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___10486 = undefined;
+    s.len___40023 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -25677,13 +25721,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_String_.length(s.arg0);
-    s.len___10486 = (r0);
+    s.len___40023 = (r0);
     r0 = (s.arg1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = Math_max__P125_mk(s);
-    r0 = (s.len___10486 + s.arg1);
+    s.tmp_1 = Math_max__P29660_mk(s);
+    r0 = (s.len___40023 + s.arg1);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
     s.callLocIdx = 11; s.pc = 7; return s.tmp_1;
@@ -25696,14 +25740,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.arg2 = (s.len___10486);
+    s.arg2 = (s.len___40023);
   case 3:
   case 4:
     r0 = (s.arg2 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = (s.len___10486 + s.arg2);
+    r0 = (s.len___40023 + s.arg2);
     s.arg2 = (r0);
   case 5:
   case 6:
@@ -25715,17 +25759,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_stringSlice__P115.info = {"start":11047,"length":365,"line":373,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSlice","argumentNames":["s","start","end"]}
+helpers_stringSlice__P29650.info = {"start":11047,"length":365,"line":373,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSlice","argumentNames":["s","start","end"]}
 
-function helpers_stringSlice__P115_mk(s) {
+function helpers_stringSlice__P29650_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_stringSlice__P115, depth: s.depth + 1,
+        parent: s, fn: helpers_stringSlice__P29650, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___10486: undefined,
+  len___40023: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -25735,7 +25779,7 @@ function helpers_stringSlice__P115_mk(s) {
 
 
 
-function scene_Scene_render__P2446(s) {
+function scene_Scene_render__P31865(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25745,15 +25789,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___10614 = undefined;
-    s.unnamed116___U1 = undefined;
-    s.unnamed117___U2 = undefined;
+    s.s___40151 = undefined;
+    s.unnamed956___U1 = undefined;
+    s.unnamed957___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C31838_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -25784,18 +25828,18 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 5; continue; }
-    s.tmp_3 = scene_Scene_render__P2446_mk(s);
+    s.tmp_3 = scene_Scene_render__P31865_mk(s);
     r0 = s.arg0.fields["previousScene"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 1047; s.pc = 12; return s.tmp_3;
+    s.callLocIdx = 1004; s.pc = 12; return s.tmp_3;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = scene_Background_draw__P2274_mk(s);
+    s.tmp_0 = scene_Background_draw__P31693_mk(s);
     r0 = s.arg0.fields["background"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1048; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1005; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
   case 6:
@@ -25805,11 +25849,11 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_2 = helpers_arraySort__P103_mk(s);
+    s.tmp_2 = helpers_arraySort__P29638_mk(s);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P10591;
-    s.callLocIdx = 1053; s.pc = 14; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P40128;
+    s.callLocIdx = 1010; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -25820,38 +25864,38 @@ switch (step) {
     r0 = (s.tmp_0).fields["flags"] = (s.tmp_1);
   case 7:
   case 8:
-    s.s___10614 = (undefined);
+    s.s___40151 = (undefined);
     r0 = s.arg0.fields["allSprites"];
-    s.unnamed116___U1 = (r0);
-    s.unnamed117___U2 = (0);
+    s.unnamed956___U1 = (r0);
+    s.unnamed957___U2 = (0);
   case 9:
-    s.tmp_0 = r0 = s.unnamed117___U2;
-    r0 = pxsim_Array__length(s.unnamed116___U1);
+    s.tmp_0 = r0 = s.unnamed957___U2;
+    r0 = pxsim_Array__length(s.unnamed956___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed116___U1, s.unnamed117___U2);
-    s.s___10614 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed956___U1, s.unnamed957___U2);
+    s.s___40151 = (r0);
     s.tmp_2 = if___draw_2_mk(s);
-    s.tmp_2.arg0 = s.s___10614;
+    s.tmp_2.arg0 = s.s___40151;
     r0 = s.arg0.fields["camera"];
     s.tmp_2.arg1 = r0;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "__draw"), 2);
-      s.callLocIdx = 1054; s.pc = 15; return s.tmp_2;
+      s.callLocIdx = 1011; s.pc = 15; return s.tmp_2;
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["__draw"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["__draw"], 2); s.callLocIdx = 1054; s.pc = 15; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1054; s.pc = 15; return s.tmp_2;; }
-     else { s.callLocIdx = 1054; s.pc = 15; return s.tmp_2; }
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["__draw"], 2); s.callLocIdx = 1011; s.pc = 15; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1011; s.pc = 15; return s.tmp_2;; }
+     else { s.callLocIdx = 1011; s.pc = 15; return s.tmp_2; }
     }
   case 15:
     r0 = s.retval;
-    r0 = (s.unnamed117___U2 + 1);
-    s.unnamed117___U2 = (r0);
+    r0 = (s.unnamed957___U2 + 1);
+    s.unnamed957___U2 = (r0);
     { step = 9; continue; }
   case 10:
-    s.unnamed116___U1 = (undefined);
+    s.unnamed956___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["flags"];
     s.tmp_2 = r0;
@@ -25863,21 +25907,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_render__P2446.info = {"start":7844,"length":917,"line":221,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"render","argumentNames":["this"]}
+scene_Scene_render__P31865.info = {"start":7844,"length":917,"line":221,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"render","argumentNames":["this"]}
 
-function scene_Scene_render__P2446_mk(s) {
+function scene_Scene_render__P31865_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_render__P2446, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_render__P31865, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  s___10614: undefined,
-  unnamed116___U1: undefined,
-  unnamed117___U2: undefined,
+  s___40151: undefined,
+  unnamed956___U1: undefined,
+  unnamed957___U2: undefined,
   arg0: undefined,
 } }
 
@@ -25885,7 +25929,7 @@ function scene_Scene_render__P2446_mk(s) {
 
 
 
-function inline__P10591(s) {
+function inline__P40128(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25908,7 +25952,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["z"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["z"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1049; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1006; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
@@ -25921,7 +25965,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["z"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["z"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1050; s.pc = 4; return s.tmp_4; }
+     else { s.callLocIdx = 1007; s.pc = 4; return s.tmp_4; }
     }
   case 4:
     r0 = s.retval;
@@ -25941,7 +25985,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["id"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["id"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1051; s.pc = 5; return s.tmp_6; }
+     else { s.callLocIdx = 1008; s.pc = 5; return s.tmp_6; }
     }
   case 5:
     r0 = s.retval;
@@ -25954,7 +25998,7 @@ switch (step) {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["id"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["id"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 1052; s.pc = 6; return s.tmp_8; }
+     else { s.callLocIdx = 1009; s.pc = 6; return s.tmp_8; }
     }
   case 6:
     r0 = s.retval;
@@ -25967,12 +26011,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10591.info = {"start":8422,"length":52,"line":235,"column":37,"endLine":235,"endColumn":89,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P40128.info = {"start":8422,"length":52,"line":235,"column":37,"endLine":235,"endColumn":89,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P10591_mk(s) {
+function inline__P40128_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10591, depth: s.depth + 1,
+        parent: s, fn: inline__P40128, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25992,7 +26036,7 @@ function inline__P10591_mk(s) {
 
 
 
-function scene_Background_draw__P2274(s) {
+function scene_Background_draw__P31693(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26007,31 +26051,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C31684_VT)) failedCast(r0);
     r0 = s.arg0.fields["color"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.fill(globals.screen___1802, s.tmp_0);
+    r0 = pxsim_ImageMethods.fill(globals.screen___31220, s.tmp_0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["_image"];
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, s.tmp_1, 0, 0);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___31220, s.tmp_1, 0, 0);
   case 1:
   case 2:
     r0 = s.arg0.fields["_layers"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P10646);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P40183);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_2 = helpers_arrayForEach__P29642_mk(s);
     r0 = s.arg0.fields["_layers"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 875; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 832; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -26040,12 +26084,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_draw__P2274.info = {"start":1166,"length":545,"line":48,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"draw","argumentNames":["this"]}
+scene_Background_draw__P31693.info = {"start":1166,"length":545,"line":48,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"draw","argumentNames":["this"]}
 
-function scene_Background_draw__P2274_mk(s) {
+function scene_Background_draw__P31693_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_draw__P2274, depth: s.depth + 1,
+        parent: s, fn: scene_Background_draw__P31693, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26057,7 +26101,7 @@ function scene_Background_draw__P2274_mk(s) {
 
 
 
-function inline__P10646(s) {
+function inline__P40183(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26067,8 +26111,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___10648 = undefined;
-    s.oy___10659 = undefined;
+    s.ox___40185 = undefined;
+    s.oy___40196 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -26083,7 +26127,7 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.round(s.tmp_0);
-    s.ox___10648 = (r0);
+    s.ox___40185 = (r0);
     r0 = s.caps[0].fields["camera"];
     r0 = r0.fields["drawOffsetY"];
     s.tmp_1 = r0;
@@ -26094,31 +26138,31 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.round(s.tmp_0);
-    s.oy___10659 = (r0);
-    s.tmp_0 = scene_BackgroundLayer_draw__P2283_mk(s);
+    s.oy___40196 = (r0);
+    s.tmp_0 = scene_BackgroundLayer_draw__P31702_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.ox___10648;
-    s.tmp_0.arg2 = s.oy___10659;
-    s.callLocIdx = 874; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = s.ox___40185;
+    s.tmp_0.arg2 = s.oy___40196;
+    s.callLocIdx = 831; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P10646.info = {"start":1373,"length":312,"line":53,"column":37,"endLine":58,"endColumn":17,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["layer"]}
+inline__P40183.info = {"start":1373,"length":312,"line":53,"column":37,"endLine":58,"endColumn":17,"fileName":"pxt_modules/game---hw/background.ts","functionName":"inline","argumentNames":["layer"]}
 
-function inline__P10646_mk(s) {
+function inline__P40183_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P10646, depth: s.depth + 1,
+        parent: s, fn: inline__P40183, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  ox___10648: undefined,
-  oy___10659: undefined,
+  ox___40185: undefined,
+  oy___40196: undefined,
   arg0: undefined,
 } }
 
@@ -26126,7 +26170,7 @@ function inline__P10646_mk(s) {
 
 
 
-function scene_BackgroundLayer_draw__P2283(s) {
+function scene_BackgroundLayer_draw__P31702(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26136,19 +26180,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.w___10677 = undefined;
-    s.h___10680 = undefined;
-    s.pw___10683 = undefined;
-    s.ph___10687 = undefined;
-    s.rx___10696 = undefined;
-    s.ry___10699 = undefined;
-    s.y___10768 = undefined;
-    s.py___10769 = undefined;
-    s.dh___10778 = undefined;
-    s.x___10786 = undefined;
-    s.rxl___10787 = undefined;
-    s.px___10793 = undefined;
-    s.dw___10797 = undefined;
+    s.w___40214 = undefined;
+    s.h___40217 = undefined;
+    s.pw___40220 = undefined;
+    s.ph___40224 = undefined;
+    s.rx___40233 = undefined;
+    s.ry___40236 = undefined;
+    s.y___40305 = undefined;
+    s.py___40306 = undefined;
+    s.dh___40315 = undefined;
+    s.x___40323 = undefined;
+    s.rxl___40324 = undefined;
+    s.px___40330 = undefined;
+    s.dw___40334 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -26156,20 +26200,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_BackgroundLayer__C2275_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
-    s.w___10677 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
-    s.h___10680 = (r0);
+    if (!checkSubtype(r0, scene_BackgroundLayer__C31694_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
+    s.w___40214 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
+    s.h___40217 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_0);
-    s.pw___10683 = (r0);
+    s.pw___40220 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_0);
-    s.ph___10687 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.pw___10683);
+    s.ph___40224 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.pw___40220);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -26178,7 +26222,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(s.ph___10687);
+    r0 = pxsim_numops_toBoolDecr(s.ph___40224);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
   case 2:
@@ -26190,9 +26234,9 @@ switch (step) {
   case 3:
   case 4:
     r0 = (0 - s.arg1);
-    s.rx___10696 = (r0);
+    s.rx___40233 = (r0);
     r0 = (0 - s.arg2);
-    s.ry___10699 = (r0);
+    s.ry___40236 = (r0);
     r0 = s.arg0.fields["alignX"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(2, s.tmp_0);
@@ -26202,20 +26246,20 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 5:
-    s.tmp_1 = r0 = s.rx___10696;
-    r0 = (s.w___10677 + s.pw___10683);
+    s.tmp_1 = r0 = s.rx___40233;
+    r0 = (s.w___40214 + s.pw___40220);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
-    s.rx___10696 = (r0);
+    s.rx___40233 = (r0);
     { step = 7; continue; }
   case 6:
-    s.tmp_0 = r0 = s.rx___10696;
-    r0 = (s.w___10677 + s.pw___10683);
+    s.tmp_0 = r0 = s.rx___40233;
+    r0 = (s.w___40214 + s.pw___40220);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.rx___10696 = (r0);
+    s.rx___40233 = (r0);
   case 7:
     r0 = s.arg0.fields["alignY"];
     s.tmp_0 = r0;
@@ -26226,120 +26270,120 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 8:
-    s.tmp_1 = r0 = s.ry___10699;
-    r0 = (s.h___10680 + s.ph___10687);
+    s.tmp_1 = r0 = s.ry___40236;
+    r0 = (s.h___40217 + s.ph___40224);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
-    s.ry___10699 = (r0);
+    s.ry___40236 = (r0);
     { step = 10; continue; }
   case 9:
-    s.tmp_0 = r0 = s.ry___10699;
-    r0 = (s.h___10680 + s.ph___10687);
+    s.tmp_0 = r0 = s.ry___40236;
+    r0 = (s.h___40217 + s.ph___40224);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.ry___10699 = (r0);
+    s.ry___40236 = (r0);
   case 10:
-    r0 = (s.rx___10696 % s.w___10677);
-    s.rx___10696 = (r0);
-    r0 = (s.rx___10696 < 0);
+    r0 = (s.rx___40233 % s.w___40214);
+    s.rx___40233 = (r0);
+    r0 = (s.rx___40233 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = (s.rx___10696 + s.w___10677);
-    s.rx___10696 = (r0);
+    r0 = (s.rx___40233 + s.w___40214);
+    s.rx___40233 = (r0);
   case 11:
   case 12:
-    r0 = (s.ry___10699 % s.h___10680);
-    s.ry___10699 = (r0);
-    r0 = (s.ry___10699 < 0);
+    r0 = (s.ry___40236 % s.h___40217);
+    s.ry___40236 = (r0);
+    r0 = (s.ry___40236 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (s.ry___10699 + s.h___10680);
-    s.ry___10699 = (r0);
+    r0 = (s.ry___40236 + s.h___40217);
+    s.ry___40236 = (r0);
   case 13:
   case 14:
-    r0 = pxsim.Math_.floor(s.rx___10696);
-    s.rx___10696 = (r0);
-    r0 = pxsim.Math_.floor(s.ry___10699);
-    s.ry___10699 = (r0);
-    s.y___10768 = (0);
-    s.py___10769 = (0);
+    r0 = pxsim.Math_.floor(s.rx___40233);
+    s.rx___40233 = (r0);
+    r0 = pxsim.Math_.floor(s.ry___40236);
+    s.ry___40236 = (r0);
+    s.y___40305 = (0);
+    s.py___40306 = (0);
   case 15:
-    r0 = (s.y___10768 < s.h___10680);
+    r0 = (s.y___40305 < s.h___40217);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = (s.y___10768 % s.ph___10687);
-    s.py___10769 = (r0);
-    s.tmp_0 = Math_min__P126_mk(s);
-    r0 = (s.ph___10687 - s.py___10769);
+    r0 = (s.y___40305 % s.ph___40224);
+    s.py___40306 = (r0);
+    s.tmp_0 = Math_min__P29661_mk(s);
+    r0 = (s.ph___40224 - s.py___40306);
     s.tmp_0.arg0 = r0;
-    r0 = (s.h___10680 - s.ry___10699);
+    r0 = (s.h___40217 - s.ry___40236);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 877; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 834; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.dh___10778 = (r0);
-    s.x___10786 = (0);
-    s.rxl___10787 = (s.rx___10696);
+    s.dh___40315 = (r0);
+    s.x___40323 = (0);
+    s.rxl___40324 = (s.rx___40233);
   case 16:
-    r0 = (s.x___10786 < s.w___10677);
+    r0 = (s.x___40323 < s.w___40214);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    r0 = (s.x___10786 % s.pw___10683);
-    s.px___10793 = (r0);
-    s.tmp_0 = Math_min__P126_mk(s);
-    r0 = (s.pw___10683 - s.px___10793);
+    r0 = (s.x___40323 % s.pw___40220);
+    s.px___40330 = (r0);
+    s.tmp_0 = Math_min__P29661_mk(s);
+    r0 = (s.pw___40220 - s.px___40330);
     s.tmp_0.arg0 = r0;
-    r0 = (s.w___10677 - s.rxl___10787);
+    r0 = (s.w___40214 - s.rxl___40324);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 878; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 835; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.dw___10797 = (r0);
+    s.dw___40334 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawImage(globals.screen___1802, s.tmp_0, s.rxl___10787, s.ry___10699);
-    r0 = (s.rxl___10787 + s.dw___10797);
+    r0 = pxsim_ImageMethods.drawImage(globals.screen___31220, s.tmp_0, s.rxl___40324, s.ry___40236);
+    r0 = (s.rxl___40324 + s.dw___40334);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.w___10677);
-    s.rxl___10787 = (r0);
+    r0 = (s.tmp_0 % s.w___40214);
+    s.rxl___40324 = (r0);
     r0 = s.arg0.fields["repeatX"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
-    r0 = s.dw___10797;
+    r0 = s.dw___40334;
     { step = 18; continue; }
   case 17:
-    r0 = s.w___10677;
+    r0 = s.w___40214;
   case 18:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.x___10786 + s.tmp_1);
-    s.x___10786 = (r0);
+    r0 = (s.x___40323 + s.tmp_1);
+    s.x___40323 = (r0);
     { step = 16; continue; }
   case 19:
-    r0 = (s.ry___10699 + s.dh___10778);
+    r0 = (s.ry___40236 + s.dh___40315);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.h___10680);
-    s.ry___10699 = (r0);
+    r0 = (s.tmp_0 % s.h___40217);
+    s.ry___40236 = (r0);
     r0 = s.arg0.fields["repeatY"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = s.dh___10778;
+    r0 = s.dh___40315;
     { step = 21; continue; }
   case 20:
-    r0 = s.h___10680;
+    r0 = s.h___40217;
   case 21:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.y___10768 + s.tmp_1);
-    s.y___10768 = (r0);
+    r0 = (s.y___40305 + s.tmp_1);
+    s.y___40305 = (r0);
     { step = 15; continue; }
   case 22:
   case 23:
@@ -26347,30 +26391,30 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_BackgroundLayer_draw__P2283.info = {"start":3063,"length":1537,"line":99,"column":8,"endLine":144,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"draw","argumentNames":["this","offsetX","offsetY"]}
+scene_BackgroundLayer_draw__P31702.info = {"start":3063,"length":1537,"line":99,"column":8,"endLine":144,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"draw","argumentNames":["this","offsetX","offsetY"]}
 
-function scene_BackgroundLayer_draw__P2283_mk(s) {
+function scene_BackgroundLayer_draw__P31702_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_BackgroundLayer_draw__P2283, depth: s.depth + 1,
+        parent: s, fn: scene_BackgroundLayer_draw__P31702, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  w___10677: undefined,
-  h___10680: undefined,
-  pw___10683: undefined,
-  ph___10687: undefined,
-  rx___10696: undefined,
-  ry___10699: undefined,
-  y___10768: undefined,
-  py___10769: undefined,
-  dh___10778: undefined,
-  x___10786: undefined,
-  rxl___10787: undefined,
-  px___10793: undefined,
-  dw___10797: undefined,
+  w___40214: undefined,
+  h___40217: undefined,
+  pw___40220: undefined,
+  ph___40224: undefined,
+  rx___40233: undefined,
+  ry___40236: undefined,
+  y___40305: undefined,
+  py___40306: undefined,
+  dh___40315: undefined,
+  x___40323: undefined,
+  rxl___40324: undefined,
+  px___40330: undefined,
+  dw___40334: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -26380,7 +26424,7 @@ function scene_BackgroundLayer_draw__P2283_mk(s) {
 
 
 
-function scene_Camera_update__P2376(s) {
+function scene_Camera_update__P31795(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26390,78 +26434,78 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.elapsed___10878 = undefined;
-    s.percentComplete___10892 = undefined;
-    s.damp___10899 = undefined;
-    s.f___10908 = undefined;
-    s.x___10914 = undefined;
-    s.y___10921 = undefined;
+    s.elapsed___40415 = undefined;
+    s.percentComplete___40429 = undefined;
+    s.damp___40436 = undefined;
+    s.f___40445 = undefined;
+    s.x___40451 = undefined;
+    s.y___40458 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = s.arg0.fields["sprite"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = scene_Camera_offsetX__P2366_mk(s);
+    s.tmp_1 = scene_Camera_offsetX__P31785_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_3 = Sprite_x__P2025_mk(s);
+    s.tmp_3 = Sprite_x__P31444_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 1008; s.pc = 10; return s.tmp_3;
+    s.callLocIdx = 965; s.pc = 10; return s.tmp_3;
   case 10:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1009; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 966; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = scene_Camera_offsetY__P2368_mk(s);
+    s.tmp_0 = scene_Camera_offsetY__P31787_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_y__P2027_mk(s);
+    s.tmp_2 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1010; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 967; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_1 - s.tmp_3);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1011; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 968; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
   case 1:
   case 2:
-    s.tmp_0 = scene_Camera_offsetX__P2366_mk(s);
+    s.tmp_0 = scene_Camera_offsetX__P31785_mk(s);
     s.tmp_1 = r0 = s.arg0;
     s.tmp_0.arg0 = r0;
     r0 = s.tmp_1.fields["_offsetX"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1013; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 970; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = scene_Camera_offsetY__P2368_mk(s);
+    s.tmp_0 = scene_Camera_offsetY__P31787_mk(s);
     s.tmp_1 = r0 = s.arg0;
     s.tmp_0.arg0 = r0;
     r0 = s.tmp_1.fields["_offsetY"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1015; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 972; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -26483,10 +26527,10 @@ switch (step) {
     r0 = s.arg0.fields["shakeStartTime"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
-    s.elapsed___10878 = (r0);
+    s.elapsed___40415 = (r0);
     r0 = s.arg0.fields["shakeDuration"];
     s.tmp_1 = r0;
-    r0 = (s.elapsed___10878 >= s.tmp_1);
+    r0 = (s.elapsed___40415 >= s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -26495,49 +26539,49 @@ switch (step) {
   case 3:
     r0 = s.arg0.fields["shakeDuration"];
     s.tmp_0 = r0;
-    r0 = (s.elapsed___10878 / s.tmp_0);
-    s.percentComplete___10892 = (r0);
-    s.damp___10899 = (1);
-    r0 = (s.percentComplete___10892 >= 0.75);
+    r0 = (s.elapsed___40415 / s.tmp_0);
+    s.percentComplete___40429 = (r0);
+    s.damp___40436 = (1);
+    r0 = (s.percentComplete___40429 >= 0.75);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = Math_max__P125_mk(s);
+    s.tmp_1 = Math_max__P29660_mk(s);
     s.tmp_1.arg0 = 0;
-    r0 = (1 - s.percentComplete___10892);
+    r0 = (1 - s.percentComplete___40429);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1018; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 975; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
-    s.damp___10899 = (r0);
+    s.damp___40436 = (r0);
   case 4:
   case 5:
     r0 = s.arg0.fields["shakeAmplitude"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.damp___10899);
-    s.f___10908 = (r0);
+    r0 = (s.tmp_0 * s.damp___40436);
+    s.f___40445 = (r0);
     r0 = pxsim.Math_.random();
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.f___10908);
+    r0 = (s.tmp_1 * s.f___40445);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 0);
-    s.x___10914 = (r0);
+    s.x___40451 = (r0);
     r0 = pxsim.Math_.random();
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.f___10908);
+    r0 = (s.tmp_1 * s.f___40445);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 0);
-    s.y___10921 = (r0);
+    s.y___40458 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["drawOffsetX"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.x___10914);
+    r0 = (s.tmp_2 + s.x___40451);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["drawOffsetX"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["drawOffsetY"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.y___10921);
+    r0 = (s.tmp_2 + s.y___40458);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["drawOffsetY"] = (s.tmp_1);
   case 6:
@@ -26547,12 +26591,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_update__P2376.info = {"start":2297,"length":1397,"line":77,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"update","argumentNames":["this"]}
+scene_Camera_update__P31795.info = {"start":2297,"length":1397,"line":77,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"update","argumentNames":["this"]}
 
-function scene_Camera_update__P2376_mk(s) {
+function scene_Camera_update__P31795_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_update__P2376, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_update__P31795, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26560,12 +26604,12 @@ function scene_Camera_update__P2376_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  elapsed___10878: undefined,
-  percentComplete___10892: undefined,
-  damp___10899: undefined,
-  f___10908: undefined,
-  x___10914: undefined,
-  y___10921: undefined,
+  elapsed___40415: undefined,
+  percentComplete___40429: undefined,
+  damp___40436: undefined,
+  f___40445: undefined,
+  x___40451: undefined,
+  y___40458: undefined,
   arg0: undefined,
 } }
 
@@ -26573,7 +26617,7 @@ function scene_Camera_update__P2376_mk(s) {
 
 
 
-function scene_Camera_offsetY__P2368(s) {
+function scene_Camera_offsetY__P31787(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26583,27 +26627,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___10940 = undefined;
+    s.scene___40477 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1005; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 962; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.scene___10940 = (r0);
-    r0 = s.scene___10940.fields["tileMap"];
+    s.scene___40477 = (r0);
+    r0 = s.scene___40477.fields["tileMap"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___10940.fields["tileMap"];
+    r0 = s.scene___40477.fields["tileMap"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_map"];
     s.tmp_5 = r0;
@@ -26620,11 +26664,11 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 3; continue; }
     s.tmp_7 = r0 = s.arg0;
-    s.tmp_9 = tiles_TileMap_offsetY__P2322_mk(s);
-    r0 = s.scene___10940.fields["tileMap"];
+    s.tmp_9 = tiles_TileMap_offsetY__P31741_mk(s);
+    r0 = s.scene___40477.fields["tileMap"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = s.arg1;
-    s.callLocIdx = 1007; s.pc = 6; return s.tmp_9;
+    s.callLocIdx = 964; s.pc = 6; return s.tmp_9;
   case 6:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -26637,12 +26681,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetY__P2368.info = {"start":1034,"length":267,"line":37,"column":8,"endLine":44,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetY","argumentNames":["this","v"]}
+scene_Camera_offsetY__P31787.info = {"start":1034,"length":267,"line":37,"column":8,"endLine":44,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"offsetY","argumentNames":["this","v"]}
 
-function scene_Camera_offsetY__P2368_mk(s) {
+function scene_Camera_offsetY__P31787_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetY__P2368, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetY__P31787, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26654,7 +26698,7 @@ function scene_Camera_offsetY__P2368_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  scene___10940: undefined,
+  scene___40477: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -26663,7 +26707,7 @@ function scene_Camera_offsetY__P2368_mk(s) {
 
 
 
-function tiles_TileMap_offsetY__P2322(s) {
+function tiles_TileMap_offsetY__P31741(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26679,38 +26723,38 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P122_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P29657_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_max__P125_mk(s);
-    s.tmp_3 = tiles_TileMap_areaHeight__P2324_mk(s);
+    s.tmp_1 = Math_max__P29660_mk(s);
+    s.tmp_3 = tiles_TileMap_areaHeight__P31743_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 900; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 857; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 901; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 858; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = s.arg1;
-    s.callLocIdx = 902; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 859; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_offsetY__P2322.info = {"start":6560,"length":123,"line":239,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetY","argumentNames":["this","value"]}
+tiles_TileMap_offsetY__P31741.info = {"start":6560,"length":123,"line":239,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"offsetY","argumentNames":["this","value"]}
 
-function tiles_TileMap_offsetY__P2322_mk(s) {
+function tiles_TileMap_offsetY__P31741_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_offsetY__P2322, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_offsetY__P31741, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26725,7 +26769,7 @@ function tiles_TileMap_offsetY__P2322_mk(s) {
 
 
 
-function scene_Camera_offsetY__P2367(s) {
+function scene_Camera_offsetY__P31786(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26740,18 +26784,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = s.arg0.fields["_offsetY"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetY__P2367.info = {"start":966,"length":59,"line":34,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetY","argumentNames":["this"]}
-scene_Camera_offsetY__P2367.isGetter = true;
+scene_Camera_offsetY__P31786.info = {"start":966,"length":59,"line":34,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"offsetY","argumentNames":["this"]}
+scene_Camera_offsetY__P31786.isGetter = true;
 
-function scene_Camera_offsetY__P2367_mk(s) {
+function scene_Camera_offsetY__P31786_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetY__P2367, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetY__P31786, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26760,7 +26804,7 @@ function scene_Camera_offsetY__P2367_mk(s) {
 
 
 
-function scene_Camera_offsetX__P2366(s) {
+function scene_Camera_offsetX__P31785(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26770,27 +26814,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___10996 = undefined;
+    s.scene___40533 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1002; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 959; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.scene___10996 = (r0);
-    r0 = s.scene___10996.fields["tileMap"];
+    s.scene___40533 = (r0);
+    r0 = s.scene___40533.fields["tileMap"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___10996.fields["tileMap"];
+    r0 = s.scene___40533.fields["tileMap"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_map"];
     s.tmp_5 = r0;
@@ -26807,11 +26851,11 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 3; continue; }
     s.tmp_7 = r0 = s.arg0;
-    s.tmp_9 = tiles_TileMap_offsetX__P2321_mk(s);
-    r0 = s.scene___10996.fields["tileMap"];
+    s.tmp_9 = tiles_TileMap_offsetX__P31740_mk(s);
+    r0 = s.scene___40533.fields["tileMap"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = s.arg1;
-    s.callLocIdx = 1004; s.pc = 6; return s.tmp_9;
+    s.callLocIdx = 961; s.pc = 6; return s.tmp_9;
   case 6:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -26824,12 +26868,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetX__P2366.info = {"start":690,"length":267,"line":26,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetX","argumentNames":["this","v"]}
+scene_Camera_offsetX__P31785.info = {"start":690,"length":267,"line":26,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"offsetX","argumentNames":["this","v"]}
 
-function scene_Camera_offsetX__P2366_mk(s) {
+function scene_Camera_offsetX__P31785_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetX__P2366, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetX__P31785, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26841,7 +26885,7 @@ function scene_Camera_offsetX__P2366_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  scene___10996: undefined,
+  scene___40533: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -26850,7 +26894,7 @@ function scene_Camera_offsetX__P2366_mk(s) {
 
 
 
-function tiles_TileMap_offsetX__P2321(s) {
+function tiles_TileMap_offsetX__P31740(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26866,38 +26910,38 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P122_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P29657_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_max__P125_mk(s);
-    s.tmp_3 = tiles_TileMap_areaWidth__P2323_mk(s);
+    s.tmp_1 = Math_max__P29660_mk(s);
+    s.tmp_3 = tiles_TileMap_areaWidth__P31742_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 897; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 854; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 898; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 855; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = s.arg1;
-    s.callLocIdx = 899; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 856; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_offsetX__P2321.info = {"start":6429,"length":121,"line":235,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetX","argumentNames":["this","value"]}
+tiles_TileMap_offsetX__P31740.info = {"start":6429,"length":121,"line":235,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"offsetX","argumentNames":["this","value"]}
 
-function tiles_TileMap_offsetX__P2321_mk(s) {
+function tiles_TileMap_offsetX__P31740_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_offsetX__P2321, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_offsetX__P31740, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26912,7 +26956,7 @@ function tiles_TileMap_offsetX__P2321_mk(s) {
 
 
 
-function scene_Camera_offsetX__P2365(s) {
+function scene_Camera_offsetX__P31784(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26927,18 +26971,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = s.arg0.fields["_offsetX"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetX__P2365.info = {"start":622,"length":59,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetX","argumentNames":["this"]}
-scene_Camera_offsetX__P2365.isGetter = true;
+scene_Camera_offsetX__P31784.info = {"start":622,"length":59,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"offsetX","argumentNames":["this"]}
+scene_Camera_offsetX__P31784.isGetter = true;
 
-function scene_Camera_offsetX__P2365_mk(s) {
+function scene_Camera_offsetX__P31784_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetX__P2365, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetX__P31784, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26947,7 +26991,7 @@ function scene_Camera_offsetX__P2365_mk(s) {
 
 
 
-function PhysicsEngine_move__P2165(s) {
+function PhysicsEngine_move__P31584(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26963,17 +27007,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C31578_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_move__P2165.info = {"start":351,"length":20,"line":18,"column":4,"endLine":18,"endColumn":24,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
+PhysicsEngine_move__P31584.info = {"start":351,"length":20,"line":18,"column":4,"endLine":18,"endColumn":24,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"move","argumentNames":["this","dt"]}
 
-function PhysicsEngine_move__P2165_mk(s) {
+function PhysicsEngine_move__P31584_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_move__P2165, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_move__P31584, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -26983,7 +27027,7 @@ function PhysicsEngine_move__P2165_mk(s) {
 
 
 
-function PhysicsEngine_draw__P2164(s) {
+function PhysicsEngine_draw__P31583(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26998,17 +27042,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C31578_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_draw__P2164.info = {"start":279,"length":10,"line":15,"column":4,"endLine":15,"endColumn":14,"fileName":"pxt_modules/game/physics.ts","functionName":"draw","argumentNames":["this"]}
+PhysicsEngine_draw__P31583.info = {"start":279,"length":10,"line":15,"column":4,"endLine":15,"endColumn":14,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"draw","argumentNames":["this"]}
 
-function PhysicsEngine_draw__P2164_mk(s) {
+function PhysicsEngine_draw__P31583_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_draw__P2164, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_draw__P31583, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -27017,7 +27061,7 @@ function PhysicsEngine_draw__P2164_mk(s) {
 
 
 
-function controller___update__P1950(s) {
+function controller___update__P31369(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27027,7 +27071,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dtms___11356 = undefined;
+    s.dtms___40893 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -27035,35 +27079,35 @@ switch (step) {
     r0 = (s.arg0 * 1000);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    s.dtms___11356 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P11363);
+    s.dtms___40893 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P40900);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dtms___11356);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_2 = controller_players__P1918_mk(s);
-    s.callLocIdx = 241; s.pc = 2; return s.tmp_2;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dtms___40893);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_2 = controller_players__P31337_mk(s);
+    s.callLocIdx = 198; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 243; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 200; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller___update__P1950.info = {"start":17961,"length":137,"line":550,"column":4,"endLine":553,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["dt"]}
+controller___update__P31369.info = {"start":17961,"length":137,"line":550,"column":4,"endLine":553,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"__update","argumentNames":["dt"]}
 
-function controller___update__P1950_mk(s) {
+function controller___update__P31369_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller___update__P1950, depth: s.depth + 1,
+        parent: s, fn: controller___update__P31369, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  dtms___11356: undefined,
+  dtms___40893: undefined,
   arg0: undefined,
 } }
 
@@ -27071,7 +27115,7 @@ function controller___update__P1950_mk(s) {
 
 
 
-function inline__P11363(s) {
+function inline__P40900(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27085,22 +27129,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller___update__P1948_mk(s);
+    s.tmp_0 = controller_Controller___update__P31367_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.caps[0];
-    s.callLocIdx = 242; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 199; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P11363.info = {"start":18063,"length":27,"line":552,"column":26,"endLine":552,"endColumn":53,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P40900.info = {"start":18063,"length":27,"line":552,"column":26,"endLine":552,"endColumn":53,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
 
-function inline__P11363_mk(s) {
+function inline__P40900_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P11363, depth: s.depth + 1,
+        parent: s, fn: inline__P40900, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27110,7 +27154,7 @@ function inline__P11363_mk(s) {
 
 
 
-function controller_Controller___update__P1948(s) {
+function controller_Controller___update__P31367(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27126,7 +27170,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
@@ -27137,26 +27181,26 @@ switch (step) {
     r0 = (s.tmp_3 | 0);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_1, s.tmp_2);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P11376);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P40913);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
     r0 = s.arg0.fields["buttons"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 240; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 197; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller___update__P1948.info = {"start":17439,"length":124,"line":532,"column":8,"endLine":535,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
+controller_Controller___update__P31367.info = {"start":17439,"length":124,"line":532,"column":8,"endLine":535,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
 
-function controller_Controller___update__P1948_mk(s) {
+function controller_Controller___update__P31367_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller___update__P1948, depth: s.depth + 1,
+        parent: s, fn: controller_Controller___update__P31367, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27170,7 +27214,7 @@ function controller_Controller___update__P1948_mk(s) {
 
 
 
-function inline__P11376(s) {
+function inline__P40913(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27184,23 +27228,23 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Button___update__P1915_mk(s);
+    s.tmp_0 = controller_Button___update__P31334_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 239; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 196; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P11376.info = {"start":17526,"length":25,"line":534,"column":33,"endLine":534,"endColumn":58,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["btn"]}
+inline__P40913.info = {"start":17526,"length":25,"line":534,"column":33,"endLine":534,"endColumn":58,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["btn"]}
 
-function inline__P11376_mk(s) {
+function inline__P40913_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P11376, depth: s.depth + 1,
+        parent: s, fn: inline__P40913, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27210,7 +27254,7 @@ function inline__P11376_mk(s) {
 
 
 
-function controller_Button___update__P1915(s) {
+function controller_Button___update__P31334(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27220,16 +27264,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.delay___11392 = undefined;
-    s.interval___11401 = undefined;
-    s.count___11414 = undefined;
+    s.delay___40929 = undefined;
+    s.interval___40938 = undefined;
+    s.count___40951 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -27253,31 +27297,31 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = globals.defaultRepeatDelay___4179;
+    r0 = globals.defaultRepeatDelay___33672;
     { step = 4; continue; }
   case 3:
     r0 = s.arg0.fields["repeatDelay"];
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.delay___11392 = (s.tmp_2);
+    s.delay___40929 = (s.tmp_2);
     r0 = s.arg0.fields["repeatInterval"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = globals.defaultRepeatInterval___4181;
+    r0 = globals.defaultRepeatInterval___33674;
     { step = 6; continue; }
   case 5:
     r0 = s.arg0.fields["repeatInterval"];
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.interval___11401 = (s.tmp_2);
+    s.interval___40938 = (s.tmp_2);
     r0 = s.arg0.fields["_pressedElasped"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 < s.delay___11392);
+    r0 = (s.tmp_1 < s.delay___40929);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
@@ -27286,26 +27330,26 @@ switch (step) {
   case 8:
     r0 = s.arg0.fields["_pressedElasped"];
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.delay___11392);
+    r0 = (s.tmp_5 - s.delay___40929);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.interval___11401);
+    r0 = (s.tmp_4 - s.interval___40938);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / s.interval___11401);
+    r0 = (s.tmp_3 / s.interval___40938);
     s.tmp_2 = r0;
     r0 = pxsim.Math_.floor(s.tmp_2);
-    s.count___11414 = (r0);
+    s.count___40951 = (r0);
     r0 = s.arg0.fields["_repeatCount"];
     s.tmp_1 = r0;
-    r0 = (s.count___11414 != s.tmp_1);
+    r0 = (s.count___40951 != s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_2 = controller_Button_raiseButtonRepeat__P4186_mk(s);
+    s.tmp_2 = controller_Button_raiseButtonRepeat__P33679_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 189; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 146; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
-    r0 = (s.arg0).fields["_repeatCount"] = (s.count___11414);
+    r0 = (s.arg0).fields["_repeatCount"] = (s.count___40951);
   case 9:
   case 10:
   case 11:
@@ -27313,12 +27357,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button___update__P1915.info = {"start":5117,"length":704,"line":164,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
+controller_Button___update__P31334.info = {"start":5117,"length":704,"line":164,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
 
-function controller_Button___update__P1915_mk(s) {
+function controller_Button___update__P31334_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button___update__P1915, depth: s.depth + 1,
+        parent: s, fn: controller_Button___update__P31334, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27326,9 +27370,9 @@ function controller_Button___update__P1915_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  delay___11392: undefined,
-  interval___11401: undefined,
-  count___11414: undefined,
+  delay___40929: undefined,
+  interval___40938: undefined,
+  count___40951: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -27337,7 +27381,7 @@ function controller_Button___update__P1915_mk(s) {
 
 
 
-function controller_Button_raiseButtonRepeat__P4186(s) {
+function controller_Button_raiseButtonRepeat__P33679(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27352,8 +27396,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___4177);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___33670);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -27368,12 +27412,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonRepeat__P4186.info = {"start":2887,"length":211,"line":99,"column":8,"endLine":104,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonRepeat","argumentNames":["this"]}
+controller_Button_raiseButtonRepeat__P33679.info = {"start":2887,"length":211,"line":99,"column":8,"endLine":104,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"raiseButtonRepeat","argumentNames":["this"]}
 
-function controller_Button_raiseButtonRepeat__P4186_mk(s) {
+function controller_Button_raiseButtonRepeat__P33679_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonRepeat__P4186, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonRepeat__P33679, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27383,7 +27427,7 @@ function controller_Button_raiseButtonRepeat__P4186_mk(s) {
 
 
 
-function controller_players__P1918(s) {
+function controller_players__P31337(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27393,25 +27437,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller__player1__P1917_mk(s);
-    s.callLocIdx = 192; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = controller__player1__P31336_mk(s);
+    s.callLocIdx = 149; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_0.arg0 = globals._players___4190;
-    s.tmp_0.arg1 = inline__P11251;
-    s.callLocIdx = 193; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_0.arg0 = globals._players___33683;
+    s.tmp_0.arg1 = inline__P40788;
+    s.callLocIdx = 150; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-controller_players__P1918.info = {"start":7040,"length":144,"line":220,"column":4,"endLine":223,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"players","argumentNames":[]}
+controller_players__P31337.info = {"start":7040,"length":144,"line":220,"column":4,"endLine":223,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"players","argumentNames":[]}
 
-function controller_players__P1918_mk(s) {
+function controller_players__P31337_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_players__P1918, depth: s.depth + 1,
+        parent: s, fn: controller_players__P31337, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -27420,7 +27464,7 @@ function controller_players__P1918_mk(s) {
 
 
 
-function inline__P11251(s) {
+function inline__P40788(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27444,12 +27488,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P11251.info = {"start":7162,"length":14,"line":222,"column":31,"endLine":222,"endColumn":45,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P40788.info = {"start":7162,"length":14,"line":222,"column":31,"endLine":222,"endColumn":45,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
 
-function inline__P11251_mk(s) {
+function inline__P40788_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P11251, depth: s.depth + 1,
+        parent: s, fn: inline__P40788, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27461,7 +27505,7 @@ function inline__P11251_mk(s) {
 
 
 
-function controller__moveSprites__P1922(s) {
+function controller__moveSprites__P31341(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27471,26 +27515,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_1 = controller_players__P1918_mk(s);
-    s.callLocIdx = 194; s.pc = 2; return s.tmp_1;
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_1 = controller_players__P31337_mk(s);
+    s.callLocIdx = 151; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P11046;
-    s.callLocIdx = 196; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P40583;
+    s.callLocIdx = 153; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller__moveSprites__P1922.info = {"start":7400,"length":182,"line":234,"column":4,"endLine":238,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_moveSprites","argumentNames":[]}
+controller__moveSprites__P31341.info = {"start":7400,"length":182,"line":234,"column":4,"endLine":238,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_moveSprites","argumentNames":[]}
 
-function controller__moveSprites__P1922_mk(s) {
+function controller__moveSprites__P31341_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__moveSprites__P1922, depth: s.depth + 1,
+        parent: s, fn: controller__moveSprites__P31341, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27500,7 +27544,7 @@ function controller__moveSprites__P1922_mk(s) {
 
 
 
-function inline__P11046(s) {
+function inline__P40583(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27514,21 +27558,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller___preUpdate__P1947_mk(s);
+    s.tmp_0 = controller_Controller___preUpdate__P31366_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 195; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 152; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P11046.info = {"start":7548,"length":26,"line":237,"column":26,"endLine":237,"endColumn":52,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P40583.info = {"start":7548,"length":26,"line":237,"column":26,"endLine":237,"endColumn":52,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
 
-function inline__P11046_mk(s) {
+function inline__P40583_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P11046, depth: s.depth + 1,
+        parent: s, fn: inline__P40583, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27538,7 +27582,7 @@ function inline__P11046_mk(s) {
 
 
 
-function controller_Controller___preUpdate__P1947(s) {
+function controller_Controller___preUpdate__P31366(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27548,22 +27592,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.deadSprites___11053 = undefined;
-    s.svx___11054 = undefined;
-    s.svy___11055 = undefined;
-    s.svxInCricle___11090 = undefined;
-    s.svyInCircle___11092 = undefined;
-    s.sq___11094 = undefined;
-    s.scale___11109 = undefined;
+    s.deadSprites___40590 = undefined;
+    s.svx___40591 = undefined;
+    s.svy___40592 = undefined;
+    s.svxInCricle___40627 = undefined;
+    s.svyInCircle___40629 = undefined;
+    s.sq___40631 = undefined;
+    s.scale___40646 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
-    s.tmp_3 = controller_Controller__controlledSprites__P1928_mk(s);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
+    s.tmp_3 = controller_Controller__controlledSprites__P31347_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 214; s.pc = 18; return s.tmp_3;
+    s.callLocIdx = 171; s.pc = 18; return s.tmp_3;
   case 18:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -27577,38 +27621,38 @@ switch (step) {
   case 1:
   case 2:
     r0 = pxsim_pxtrt.mklocRef();
-    s.deadSprites___11053 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.deadSprites___11053, false);
+    s.deadSprites___40590 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.deadSprites___40590, false);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svx___11054 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.svx___11054, 0);
+    s.svx___40591 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.svx___40591, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svy___11055 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.svy___11055, 0);
+    s.svy___40592 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.svy___40592, 0);
     r0 = s.arg0.fields["analog"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = r0 = s.svx___11054;
-    s.tmp_5 = controller_Button_pressureLevel__P1913_mk(s);
-    s.tmp_6 = controller_Controller_right__P1933_mk(s);
+    s.tmp_1 = r0 = s.svx___40591;
+    s.tmp_5 = controller_Button_pressureLevel__P31332_mk(s);
+    s.tmp_6 = controller_Controller_right__P31352_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 215; s.pc = 20; return s.tmp_6;
+    s.callLocIdx = 172; s.pc = 20; return s.tmp_6;
   case 20:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    s.callLocIdx = 216; s.pc = 19; return s.tmp_5;
+    s.callLocIdx = 173; s.pc = 19; return s.tmp_5;
   case 19:
     r0 = s.retval;
     s.tmp_4 = r0;
-    s.tmp_8 = controller_Button_pressureLevel__P1913_mk(s);
-    s.tmp_9 = controller_Controller_left__P1932_mk(s);
+    s.tmp_8 = controller_Button_pressureLevel__P31332_mk(s);
+    s.tmp_9 = controller_Controller_left__P31351_mk(s);
     s.tmp_9.arg0 = s.arg0;
-    s.callLocIdx = 217; s.pc = 22; return s.tmp_9;
+    s.callLocIdx = 174; s.pc = 22; return s.tmp_9;
   case 22:
     r0 = s.retval;
     s.tmp_8.arg0 = r0;
-    s.callLocIdx = 218; s.pc = 21; return s.tmp_8;
+    s.callLocIdx = 175; s.pc = 21; return s.tmp_8;
   case 21:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -27617,26 +27661,26 @@ switch (step) {
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_1, s.tmp_2);
-    s.tmp_0 = r0 = s.svy___11055;
-    s.tmp_4 = controller_Button_pressureLevel__P1913_mk(s);
-    s.tmp_5 = controller_Controller_down__P1935_mk(s);
+    s.tmp_0 = r0 = s.svy___40592;
+    s.tmp_4 = controller_Button_pressureLevel__P31332_mk(s);
+    s.tmp_5 = controller_Controller_down__P31354_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 219; s.pc = 24; return s.tmp_5;
+    s.callLocIdx = 176; s.pc = 24; return s.tmp_5;
   case 24:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 220; s.pc = 23; return s.tmp_4;
+    s.callLocIdx = 177; s.pc = 23; return s.tmp_4;
   case 23:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_7 = controller_Button_pressureLevel__P1913_mk(s);
-    s.tmp_8 = controller_Controller_up__P1934_mk(s);
+    s.tmp_7 = controller_Button_pressureLevel__P31332_mk(s);
+    s.tmp_8 = controller_Controller_up__P31353_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 221; s.pc = 26; return s.tmp_8;
+    s.callLocIdx = 178; s.pc = 26; return s.tmp_8;
   case 26:
     r0 = s.retval;
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 222; s.pc = 25; return s.tmp_7;
+    s.callLocIdx = 179; s.pc = 25; return s.tmp_7;
   case 25:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -27647,14 +27691,14 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 12; continue; }
   case 3:
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_2 = controller_Controller_right__P1933_mk(s);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_2 = controller_Controller_right__P31352_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 223; s.pc = 28; return s.tmp_2;
+    s.callLocIdx = 180; s.pc = 28; return s.tmp_2;
   case 28:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 27; return s.tmp_1;
   case 27:
@@ -27669,14 +27713,14 @@ switch (step) {
   case 5:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_5 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_6 = controller_Controller_left__P1932_mk(s);
+    s.tmp_5 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_6 = controller_Controller_left__P31351_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 224; s.pc = 30; return s.tmp_6;
+    s.callLocIdx = 181; s.pc = 30; return s.tmp_6;
   case 30:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_5.arg0);
     s.tmp_5.fn = s.tmp_5.arg0.vtable.methods.isPressed;
     s.pc = 29; return s.tmp_5;
   case 29:
@@ -27691,18 +27735,18 @@ switch (step) {
   case 7:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.svx___11054;
+    s.tmp_8 = r0 = s.svx___40591;
     r0 = (s.tmp_3 - s.tmp_7);
     s.tmp_9 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_8, s.tmp_9);
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_2 = controller_Controller_down__P1935_mk(s);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_2 = controller_Controller_down__P31354_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 225; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 182; s.pc = 32; return s.tmp_2;
   case 32:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 31; return s.tmp_1;
   case 31:
@@ -27717,14 +27761,14 @@ switch (step) {
   case 9:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_5 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_6 = controller_Controller_up__P1934_mk(s);
+    s.tmp_5 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_6 = controller_Controller_up__P31353_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 226; s.pc = 34; return s.tmp_6;
+    s.callLocIdx = 183; s.pc = 34; return s.tmp_6;
   case 34:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_5.arg0);
     s.tmp_5.fn = s.tmp_5.arg0.vtable.methods.isPressed;
     s.pc = 33; return s.tmp_5;
   case 33:
@@ -27739,57 +27783,57 @@ switch (step) {
   case 11:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.svy___11055;
+    s.tmp_8 = r0 = s.svy___40592;
     r0 = (s.tmp_3 - s.tmp_7);
     s.tmp_9 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_8, s.tmp_9);
   case 12:
     r0 = pxsim_pxtrt.mklocRef();
-    s.svxInCricle___11090 = (r0);
-    s.tmp_0 = r0 = s.svxInCricle___11090;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___11054);
+    s.svxInCricle___40627 = (r0);
+    s.tmp_0 = r0 = s.svxInCricle___40627;
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___40591);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svyInCircle___11092 = (r0);
-    s.tmp_0 = r0 = s.svyInCircle___11092;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___11055);
+    s.svyInCircle___40629 = (r0);
+    s.tmp_0 = r0 = s.svyInCircle___40629;
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___40592);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___11054);
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___40591);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___11054);
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___40591);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___11055);
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___40592);
     s.tmp_4 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___11055);
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___40592);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 * s.tmp_5);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 + s.tmp_3);
-    s.sq___11094 = (r0);
-    r0 = (s.sq___11094 > 65536);
+    s.sq___40631 = (r0);
+    r0 = (s.sq___40631 > 65536);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (65536 / s.sq___11094);
+    r0 = (65536 / s.sq___40631);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.sqrt(s.tmp_1);
-    s.scale___11109 = (r0);
-    s.tmp_0 = r0 = s.svxInCricle___11090;
-    s.tmp_3 = r0 = s.scale___11109;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___11054);
+    s.scale___40646 = (r0);
+    s.tmp_0 = r0 = s.svxInCricle___40627;
+    s.tmp_3 = r0 = s.scale___40646;
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___40591);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 * s.tmp_4);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    s.tmp_0 = r0 = s.svyInCircle___11092;
-    s.tmp_3 = r0 = s.scale___11109;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___11055);
+    s.tmp_0 = r0 = s.svyInCircle___40629;
+    s.tmp_3 = r0 = s.scale___40646;
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___40592);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 * s.tmp_4);
     s.tmp_2 = r0;
@@ -27798,43 +27842,43 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
   case 13:
   case 14:
-    r0 = pxsim_pxtcore_mkAction(5, inline__P11127);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.deadSprites___11053);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.svx___11054);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.svy___11055);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.svxInCricle___11090);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.svyInCircle___11092);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_2 = controller_Controller__controlledSprites__P1928_mk(s);
+    r0 = pxsim_pxtcore_mkAction(5, inline__P40664);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.deadSprites___40590);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.svx___40591);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.svy___40592);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.svxInCricle___40627);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.svyInCircle___40629);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_2 = controller_Controller__controlledSprites__P31347_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 227; s.pc = 36; return s.tmp_2;
+    s.callLocIdx = 184; s.pc = 36; return s.tmp_2;
   case 36:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 235; s.pc = 35; return s.tmp_1;
+    s.callLocIdx = 192; s.pc = 35; return s.tmp_1;
   case 35:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.deadSprites___11053);
+    r0 = pxsim_pxtrt_ldlocRef(s.deadSprites___40590);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_1 = controller_Controller__controlledSprites__P1929_mk(s);
+    s.tmp_1 = controller_Controller__controlledSprites__P31348_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_3 = controller_Controller__controlledSprites__P1928_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_3 = controller_Controller__controlledSprites__P31347_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 236; s.pc = 39; return s.tmp_3;
+    s.callLocIdx = 193; s.pc = 39; return s.tmp_3;
   case 39:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P11184;
-    s.callLocIdx = 237; s.pc = 38; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P40721;
+    s.callLocIdx = 194; s.pc = 38; return s.tmp_2;
   case 38:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 238; s.pc = 37; return s.tmp_1;
+    s.callLocIdx = 195; s.pc = 37; return s.tmp_1;
   case 37:
     r0 = s.retval;
   case 15:
@@ -27844,12 +27888,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller___preUpdate__P1947.info = {"start":14894,"length":2535,"line":466,"column":8,"endLine":530,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__preUpdate","argumentNames":["this"]}
+controller_Controller___preUpdate__P31366.info = {"start":14894,"length":2535,"line":466,"column":8,"endLine":530,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"__preUpdate","argumentNames":["this"]}
 
-function controller_Controller___preUpdate__P1947_mk(s) {
+function controller_Controller___preUpdate__P31366_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller___preUpdate__P1947, depth: s.depth + 1,
+        parent: s, fn: controller_Controller___preUpdate__P31366, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27861,13 +27905,13 @@ function controller_Controller___preUpdate__P1947_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  deadSprites___11053: undefined,
-  svx___11054: undefined,
-  svy___11055: undefined,
-  svxInCricle___11090: undefined,
-  svyInCircle___11092: undefined,
-  sq___11094: undefined,
-  scale___11109: undefined,
+  deadSprites___40590: undefined,
+  svx___40591: undefined,
+  svy___40592: undefined,
+  svxInCricle___40627: undefined,
+  svyInCircle___40629: undefined,
+  sq___40631: undefined,
+  scale___40646: undefined,
   arg0: undefined,
 } }
 
@@ -27875,7 +27919,7 @@ function controller_Controller___preUpdate__P1947_mk(s) {
 
 
 
-function inline__P11127(s) {
+function inline__P40664(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27885,9 +27929,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___11130 = undefined;
-    s.vx___11131 = undefined;
-    s.vy___11132 = undefined;
+    s.s___40667 = undefined;
+    s.vx___40668 = undefined;
+    s.vy___40669 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -27901,11 +27945,11 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["s"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["s"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 228; s.pc = 22; return s.tmp_0; }
+     else { s.callLocIdx = 185; s.pc = 22; return s.tmp_0; }
     }
   case 22:
     r0 = s.retval;
-    s.s___11130 = (r0);
+    s.s___40667 = (r0);
     s.tmp_2 = if_vx_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -27914,11 +27958,11 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["vx"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["vx"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 229; s.pc = 23; return s.tmp_2; }
+     else { s.callLocIdx = 186; s.pc = 23; return s.tmp_2; }
     }
   case 23:
     r0 = s.retval;
-    s.vx___11131 = (r0);
+    s.vx___40668 = (r0);
     s.tmp_3 = if_vy_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -27927,12 +27971,12 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["vy"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["vy"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 230; s.pc = 24; return s.tmp_3; }
+     else { s.callLocIdx = 187; s.pc = 24; return s.tmp_3; }
     }
   case 24:
     r0 = s.retval;
-    s.vy___11132 = (r0);
-    r0 = s.s___11130.fields["flags"];
+    s.vy___40669 = (r0);
+    r0 = s.s___40667.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 2);
     s.tmp_0 = r0;
@@ -27946,14 +27990,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.vx___11131);
+    r0 = pxsim_numops_toBoolDecr(s.vx___40668);
     if (!r0) { step = 3; continue; }
-    r0 = (s.s___11130).fields["_vx"] = (0);
+    r0 = (s.s___40667).fields["_vx"] = (0);
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.vy___11132);
+    r0 = pxsim_numops_toBoolDecr(s.vy___40669);
     if (!r0) { step = 5; continue; }
-    r0 = (s.s___11130).fields["_vy"] = (0);
+    r0 = (s.s___40667).fields["_vy"] = (0);
   case 5:
   case 6:
   case 7:
@@ -27971,48 +28015,48 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 19; continue; }
-    s.tmp_2 = r0 = s.vx___11131;
+    s.tmp_2 = r0 = s.vx___40668;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_2;
     { step = 12; continue; }
   case 11:
-    r0 = s.vy___11132;
+    r0 = s.vy___40669;
   case 12:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 13; continue; }
-    s.tmp_4 = r0 = s.s___11130;
+    s.tmp_4 = r0 = s.s___40667;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[3]);
     s.tmp_6 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_6, s.vx___11131);
+    r0 = pxsim.Math_.imul(s.tmp_6, s.vx___40668);
     s.tmp_5 = r0;
     r0 = (s.tmp_4).fields["_vx"] = (s.tmp_5);
-    s.tmp_0 = r0 = s.s___11130;
+    s.tmp_0 = r0 = s.s___40667;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[4]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___11132);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___40669);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
     { step = 18; continue; }
   case 13:
-    r0 = pxsim_numops_toBoolDecr(s.vx___11131);
+    r0 = pxsim_numops_toBoolDecr(s.vx___40668);
     if (!r0) { step = 14; continue; }
-    s.tmp_0 = r0 = s.s___11130;
+    s.tmp_0 = r0 = s.s___40667;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vx___11131);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vx___40668);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vx"] = (s.tmp_1);
     { step = 17; continue; }
   case 14:
-    r0 = pxsim_numops_toBoolDecr(s.vy___11132);
+    r0 = pxsim_numops_toBoolDecr(s.vy___40669);
     if (!r0) { step = 15; continue; }
-    s.tmp_0 = r0 = s.s___11130;
+    s.tmp_0 = r0 = s.s___40667;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___11132);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___40669);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
   case 15:
@@ -28029,12 +28073,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P11127.info = {"start":16077,"length":1171,"line":497,"column":44,"endLine":525,"endColumn":13,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["controlledSprite"]}
+inline__P40664.info = {"start":16077,"length":1171,"line":497,"column":44,"endLine":525,"endColumn":13,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["controlledSprite"]}
 
-function inline__P11127_mk(s) {
+function inline__P40664_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P11127, depth: s.depth + 1,
+        parent: s, fn: inline__P40664, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28043,9 +28087,9 @@ function inline__P11127_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  s___11130: undefined,
-  vx___11131: undefined,
-  vy___11132: undefined,
+  s___40667: undefined,
+  vx___40668: undefined,
+  vy___40669: undefined,
   arg0: undefined,
 } }
 
@@ -28053,7 +28097,7 @@ function inline__P11127_mk(s) {
 
 
 
-function inline__P11184(s) {
+function inline__P40721(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28078,12 +28122,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P11184.info = {"start":17375,"length":42,"line":529,"column":28,"endLine":529,"endColumn":70,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["s"]}
+inline__P40721.info = {"start":17375,"length":42,"line":529,"column":28,"endLine":529,"endColumn":70,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P11184_mk(s) {
+function inline__P40721_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P11184, depth: s.depth + 1,
+        parent: s, fn: inline__P40721, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28095,7 +28139,7 @@ function inline__P11184_mk(s) {
 
 
 
-function controller_Controller_down__P1935(s) {
+function controller_Controller_down__P31354(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28110,7 +28154,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (4 - 1);
@@ -28119,13 +28163,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_down__P1935.info = {"start":9528,"length":77,"line":312,"column":8,"endLine":314,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"down","argumentNames":["this"]}
-controller_Controller_down__P1935.isGetter = true;
+controller_Controller_down__P31354.info = {"start":9528,"length":77,"line":312,"column":8,"endLine":314,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"down","argumentNames":["this"]}
+controller_Controller_down__P31354.isGetter = true;
 
-function controller_Controller_down__P1935_mk(s) {
+function controller_Controller_down__P31354_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_down__P1935, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_down__P31354, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28136,7 +28180,7 @@ function controller_Controller_down__P1935_mk(s) {
 
 
 
-function controller_Controller_button__P4192(s) {
+function controller_Controller_button__P33685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28152,7 +28196,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (s.arg1 - 1);
@@ -28161,12 +28205,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_button__P4192.info = {"start":11484,"length":105,"line":373,"column":8,"endLine":375,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"button","argumentNames":["this","button"]}
+controller_Controller_button__P33685.info = {"start":11484,"length":105,"line":373,"column":8,"endLine":375,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"button","argumentNames":["this","button"]}
 
-function controller_Controller_button__P4192_mk(s) {
+function controller_Controller_button__P33685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_button__P4192, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_button__P33685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28178,7 +28222,7 @@ function controller_Controller_button__P4192_mk(s) {
 
 
 
-function controller_Controller_up__P1934(s) {
+function controller_Controller_up__P31353(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28193,7 +28237,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (2 - 1);
@@ -28202,13 +28246,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_up__P1934.info = {"start":9376,"length":73,"line":304,"column":8,"endLine":306,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"up","argumentNames":["this"]}
-controller_Controller_up__P1934.isGetter = true;
+controller_Controller_up__P31353.info = {"start":9376,"length":73,"line":304,"column":8,"endLine":306,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"up","argumentNames":["this"]}
+controller_Controller_up__P31353.isGetter = true;
 
-function controller_Controller_up__P1934_mk(s) {
+function controller_Controller_up__P31353_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_up__P1934, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_up__P31353, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28219,7 +28263,7 @@ function controller_Controller_up__P1934_mk(s) {
 
 
 
-function controller_Controller_right__P1933(s) {
+function controller_Controller_right__P31352(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28234,7 +28278,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (3 - 1);
@@ -28243,13 +28287,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_right__P1933.info = {"start":9220,"length":79,"line":296,"column":8,"endLine":298,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"right","argumentNames":["this"]}
-controller_Controller_right__P1933.isGetter = true;
+controller_Controller_right__P31352.info = {"start":9220,"length":79,"line":296,"column":8,"endLine":298,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"right","argumentNames":["this"]}
+controller_Controller_right__P31352.isGetter = true;
 
-function controller_Controller_right__P1933_mk(s) {
+function controller_Controller_right__P31352_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_right__P1933, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_right__P31352, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28260,7 +28304,7 @@ function controller_Controller_right__P1933_mk(s) {
 
 
 
-function controller_Controller_left__P1932(s) {
+function controller_Controller_left__P31351(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28275,7 +28319,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (1 - 1);
@@ -28284,13 +28328,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_left__P1932.info = {"start":9063,"length":77,"line":288,"column":8,"endLine":290,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"left","argumentNames":["this"]}
-controller_Controller_left__P1932.isGetter = true;
+controller_Controller_left__P31351.info = {"start":9063,"length":77,"line":288,"column":8,"endLine":290,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"left","argumentNames":["this"]}
+controller_Controller_left__P31351.isGetter = true;
 
-function controller_Controller_left__P1932_mk(s) {
+function controller_Controller_left__P31351_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_left__P1932, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_left__P31351, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28301,7 +28345,7 @@ function controller_Controller_left__P1932_mk(s) {
 
 
 
-function controller_Button_pressureLevel__P1913(s) {
+function controller_Button_pressureLevel__P31332(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28316,16 +28360,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
     r0 = pxsim.control.deviceDalVersion();
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == "sim");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_3 = controller_Button__C31322_v0_1_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_3.arg0);
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_3.arg0);
     s.tmp_3.fn = s.tmp_3.arg0.vtable.methods.isPressed;
     s.pc = 6; return s.tmp_3;
   case 6:
@@ -28354,12 +28398,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_pressureLevel__P1913.info = {"start":4279,"length":311,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"pressureLevel","argumentNames":["this"]}
+controller_Button_pressureLevel__P31332.info = {"start":4279,"length":311,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"pressureLevel","argumentNames":["this"]}
 
-function controller_Button_pressureLevel__P1913_mk(s) {
+function controller_Button_pressureLevel__P31332_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_pressureLevel__P1913, depth: s.depth + 1,
+        parent: s, fn: controller_Button_pressureLevel__P31332, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28374,7 +28418,7 @@ function controller_Button_pressureLevel__P1913_mk(s) {
 
 
 
-function controller_Button_isPressed__P1912(s) {
+function controller_Button_isPressed__P31331(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28389,17 +28433,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_isPressed__P1912.info = {"start":4129,"length":57,"line":132,"column":8,"endLine":134,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"isPressed","argumentNames":["this"]}
+controller_Button_isPressed__P31331.info = {"start":4129,"length":57,"line":132,"column":8,"endLine":134,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"isPressed","argumentNames":["this"]}
 
-function controller_Button_isPressed__P1912_mk(s) {
+function controller_Button_isPressed__P31331_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_isPressed__P1912, depth: s.depth + 1,
+        parent: s, fn: controller_Button_isPressed__P31331, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -28408,7 +28452,7 @@ function controller_Button_isPressed__P1912_mk(s) {
 
 
 
-function Fx_imul__P156(s) {
+function Fx_imul__P29691(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28427,12 +28471,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_imul__P156.info = {"start":1010,"length":130,"line":32,"column":4,"endLine":34,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"imul","argumentNames":["a","b"]}
+Fx_imul__P29691.info = {"start":1010,"length":130,"line":32,"column":4,"endLine":34,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"imul","argumentNames":["a","b"]}
 
-function Fx_imul__P156_mk(s) {
+function Fx_imul__P29691_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_imul__P156, depth: s.depth + 1,
+        parent: s, fn: Fx_imul__P29691, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -28442,7 +28486,7 @@ function Fx_imul__P156_mk(s) {
 
 
 
-function power_checkDeepSleep__P1706(s) {
+function power_checkDeepSleep__P31124(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28452,13 +28496,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___10251 = undefined;
-    s.to___10254 = undefined;
-    s.tmp_0 = power_init__P4091_mk(s);
-    s.callLocIdx = 117; s.pc = 11; return s.tmp_0;
+    s.p___39788 = undefined;
+    s.to___39791 = undefined;
+    s.tmp_0 = power_init__P33595_mk(s);
+    s.callLocIdx = 69; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals._poked___4089;
+    s.tmp_0 = r0 = globals._poked___33593;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
@@ -28468,8 +28512,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.p___10251 = (s.tmp_1);
-    s.tmp_0 = r0 = globals._timeout___4090;
+    s.p___39788 = (s.tmp_1);
+    s.tmp_0 = r0 = globals._timeout___33594;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = s.tmp_0;
@@ -28479,8 +28523,8 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.to___10254 = (s.tmp_1);
-    r0 = (s.to___10254 > 0);
+    s.to___39791 = (s.tmp_1);
+    r0 = (s.to___39791 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 5; continue; }
@@ -28489,9 +28533,9 @@ switch (step) {
   case 5:
     r0 = pxsim.control.millis();
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.p___10251);
+    r0 = (s.tmp_2 - s.p___39788);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.to___10254);
+    r0 = (s.tmp_1 > s.to___39791);
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -28517,12 +28561,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-power_checkDeepSleep__P1706.info = {"start":1087,"length":298,"line":36,"column":4,"endLine":46,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"checkDeepSleep","argumentNames":[]}
+power_checkDeepSleep__P31124.info = {"start":1087,"length":298,"line":36,"column":4,"endLine":46,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"checkDeepSleep","argumentNames":[]}
 
-function power_checkDeepSleep__P1706_mk(s) {
+function power_checkDeepSleep__P31124_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_checkDeepSleep__P1706, depth: s.depth + 1,
+        parent: s, fn: power_checkDeepSleep__P31124, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28531,15 +28575,15 @@ function power_checkDeepSleep__P1706_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  p___10251: undefined,
-  to___10254: undefined,
+  p___39788: undefined,
+  to___39791: undefined,
 } }
 
 
 
 
 
-function power_init__P4091(s) {
+function power_init__P33595(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28549,7 +28593,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals._timeout___4090 !== undefined);
+    r0 = (globals._timeout___33594 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -28559,21 +28603,21 @@ switch (step) {
     r0 = pxsim_pxtcore.getConfig(212, -1);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 1000);
-    globals._timeout___4090 = (r0);
-    r0 = (globals._timeout___4090 > 0);
+    globals._timeout___33594 = (r0);
+    r0 = (globals._timeout___33594 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = (globals._timeout___4090 < 300000);
+    r0 = (globals._timeout___33594 < 300000);
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    globals._timeout___4090 = (300000);
+    globals._timeout___33594 = (300000);
   case 5:
   case 6:
   case 7:
@@ -28581,12 +28625,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-power_init__P4091.info = {"start":1610,"length":376,"line":57,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"init","argumentNames":[]}
+power_init__P33595.info = {"start":1610,"length":376,"line":57,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"init","argumentNames":[]}
 
-function power_init__P4091_mk(s) {
+function power_init__P33595_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_init__P4091, depth: s.depth + 1,
+        parent: s, fn: power_init__P33595, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28596,7 +28640,7 @@ function power_init__P4091_mk(s) {
 
 
 
-function power_poke__P1705(s) {
+function power_poke__P31123(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28606,22 +28650,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = power_init__P4091_mk(s);
-    s.callLocIdx = 116; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = power_init__P33595_mk(s);
+    s.callLocIdx = 68; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = pxsim.control.millis();
-    globals._poked___4089 = (r0);
+    globals._poked___33593 = (r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-power_poke__P1705.info = {"start":795,"length":81,"line":26,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"poke","argumentNames":[]}
+power_poke__P31123.info = {"start":795,"length":81,"line":26,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"poke","argumentNames":[]}
 
-function power_poke__P1705_mk(s) {
+function power_poke__P31123_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_poke__P1705, depth: s.depth + 1,
+        parent: s, fn: power_poke__P31123, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -28630,7 +28674,7 @@ function power_poke__P1705_mk(s) {
 
 
 
-function control_EventContext_deltaTime__P389(s) {
+function control_EventContext_deltaTime__P29924(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28645,20 +28689,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
     r0 = s.arg0.fields["deltaTimeMillis"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 1000);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-control_EventContext_deltaTime__P389.info = {"start":2097,"length":75,"line":70,"column":8,"endLine":72,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"deltaTime","argumentNames":["this"]}
-control_EventContext_deltaTime__P389.isGetter = true;
+control_EventContext_deltaTime__P29924.info = {"start":2097,"length":75,"line":70,"column":8,"endLine":72,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"deltaTime","argumentNames":["this"]}
+control_EventContext_deltaTime__P29924.isGetter = true;
 
-function control_EventContext_deltaTime__P389_mk(s) {
+function control_EventContext_deltaTime__P29924_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_deltaTime__P389, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_deltaTime__P29924, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -28668,7 +28712,7 @@ function control_EventContext_deltaTime__P389_mk(s) {
 
 
 
-function scene_Scene_constructor__P2440(s) {
+function scene_Scene_constructor__P31859(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28685,36 +28729,36 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C31838_VT)) failedCast(r0);
     r0 = (s.arg0).fields["previousScene"] = (s.arg2);
     r0 = (s.arg0).fields["eventContext"] = (s.arg1);
     r0 = (s.arg0).fields["flags"] = (0);
-    r0 = pxsim_pxtcore_mkClassInstance(ArcadePhysicsEngine__C2173_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(ArcadePhysicsEngine__C31592_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = ArcadePhysicsEngine_constructor__P2174_mk(s);
+    s.tmp_1 = ArcadePhysicsEngine_constructor__P31593_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 500;
     s.tmp_1.arg2 = 2;
     s.tmp_1.arg3 = 4;
-    s.callLocIdx = 1023; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 980; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["physicsEngine"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_Camera__C2360_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Camera__C31779_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_Camera_constructor__P2364_mk(s);
+    s.tmp_1 = scene_Camera_constructor__P31783_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1024; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 981; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["camera"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_Background__C2265_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Background__C31684_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_Background_constructor__P2269_mk(s);
+    s.tmp_1 = scene_Background_constructor__P31688_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["camera"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1025; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 982; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["background"] = (s.tmp_0);
@@ -28767,12 +28811,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_constructor__P2440.info = {"start":3365,"length":793,"line":102,"column":8,"endLine":120,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","eventContext","previousScene"]}
+scene_Scene_constructor__P31859.info = {"start":3365,"length":793,"line":102,"column":8,"endLine":120,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":["this","eventContext","previousScene"]}
 
-function scene_Scene_constructor__P2440_mk(s) {
+function scene_Scene_constructor__P31859_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_constructor__P2440, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_constructor__P31859, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28785,7 +28829,7 @@ function scene_Scene_constructor__P2440_mk(s) {
 
 
 
-function scene_Camera_constructor__P2364(s) {
+function scene_Camera_constructor__P31783(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28800,7 +28844,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_offsetX"] = (0);
     r0 = (s.arg0).fields["_offsetY"] = (0);
     r0 = (s.arg0).fields["drawOffsetX"] = (0);
@@ -28809,12 +28853,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_constructor__P2364.info = {"start":456,"length":156,"line":15,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"inline","argumentNames":["this"]}
+scene_Camera_constructor__P31783.info = {"start":456,"length":156,"line":15,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"inline","argumentNames":["this"]}
 
-function scene_Camera_constructor__P2364_mk(s) {
+function scene_Camera_constructor__P31783_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_constructor__P2364, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_constructor__P31783, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -28823,7 +28867,7 @@ function scene_Camera_constructor__P2364_mk(s) {
 
 
 
-function scene_Background_constructor__P2269(s) {
+function scene_Background_constructor__P31688(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28839,7 +28883,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C31684_VT)) failedCast(r0);
     r0 = (s.arg0).fields["color"] = (0);
     r0 = (s.arg0).fields["camera"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
@@ -28850,12 +28894,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_constructor__P2269.info = {"start":367,"length":132,"line":20,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["this","camera"]}
+scene_Background_constructor__P31688.info = {"start":367,"length":132,"line":20,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"inline","argumentNames":["this","camera"]}
 
-function scene_Background_constructor__P2269_mk(s) {
+function scene_Background_constructor__P31688_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_constructor__P2269, depth: s.depth + 1,
+        parent: s, fn: scene_Background_constructor__P31688, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28867,7 +28911,7 @@ function scene_Background_constructor__P2269_mk(s) {
 
 
 
-function ArcadePhysicsEngine_constructor__P2174(s) {
+function ArcadePhysicsEngine_constructor__P31593(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28885,48 +28929,48 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = undefined;
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["sprites"] = (s.tmp_1);
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteMap__C2094_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteMap__C31513_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = sprites_SpriteMap_constructor__P2095_mk(s);
+    s.tmp_1 = sprites_SpriteMap_constructor__P31514_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 537; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 494; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["map"] = (s.tmp_0);
-    s.tmp_0 = ArcadePhysicsEngine_maxSpeed__P2176_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_maxSpeed__P31595_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 538; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 495; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = ArcadePhysicsEngine_maxStep__P2180_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_maxStep__P31599_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg3;
-    s.callLocIdx = 539; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 496; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = ArcadePhysicsEngine_minStep__P2178_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_minStep__P31597_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 540; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 497; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_constructor__P2174.info = {"start":1330,"length":277,"line":55,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","maxVelocity","minSingleStep","maxSingleStep"]}
+ArcadePhysicsEngine_constructor__P31593.info = {"start":1330,"length":277,"line":55,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["this","maxVelocity","minSingleStep","maxSingleStep"]}
 
-function ArcadePhysicsEngine_constructor__P2174_mk(s) {
+function ArcadePhysicsEngine_constructor__P31593_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_constructor__P2174, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_constructor__P31593, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28940,7 +28984,7 @@ function ArcadePhysicsEngine_constructor__P2174_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxStep__P2180(s) {
+function ArcadePhysicsEngine_maxStep__P31599(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28956,7 +29000,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -28967,12 +29011,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxStep__P2180.info = {"start":2058,"length":67,"line":85,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this","v"]}
+ArcadePhysicsEngine_maxStep__P31599.info = {"start":2058,"length":67,"line":85,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"maxStep","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_maxStep__P2180_mk(s) {
+function ArcadePhysicsEngine_maxStep__P31599_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxStep__P2180, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxStep__P31599, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28985,7 +29029,7 @@ function ArcadePhysicsEngine_maxStep__P2180_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxStep__P2179(s) {
+function ArcadePhysicsEngine_maxStep__P31598(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29000,7 +29044,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg0.fields["maxSingleStep"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -29009,13 +29053,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxStep__P2179.info = {"start":1978,"length":74,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this"]}
-ArcadePhysicsEngine_maxStep__P2179.isGetter = true;
+ArcadePhysicsEngine_maxStep__P31598.info = {"start":1978,"length":74,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"maxStep","argumentNames":["this"]}
+ArcadePhysicsEngine_maxStep__P31598.isGetter = true;
 
-function ArcadePhysicsEngine_maxStep__P2179_mk(s) {
+function ArcadePhysicsEngine_maxStep__P31598_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxStep__P2179, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxStep__P31598, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29026,7 +29070,7 @@ function ArcadePhysicsEngine_maxStep__P2179_mk(s) {
 
 
 
-function Fx_toInt__P165(s) {
+function Fx_toInt__P29700(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29046,12 +29090,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toInt__P165.info = {"start":2144,"length":86,"line":68,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toInt","argumentNames":["v"]}
+Fx_toInt__P29700.info = {"start":2144,"length":86,"line":68,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toInt","argumentNames":["v"]}
 
-function Fx_toInt__P165_mk(s) {
+function Fx_toInt__P29700_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toInt__P165, depth: s.depth + 1,
+        parent: s, fn: Fx_toInt__P29700, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -29061,7 +29105,7 @@ function Fx_toInt__P165_mk(s) {
 
 
 
-function ArcadePhysicsEngine_minStep__P2178(s) {
+function ArcadePhysicsEngine_minStep__P31597(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29077,7 +29121,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -29088,12 +29132,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_minStep__P2178.info = {"start":1905,"length":67,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this","v"]}
+ArcadePhysicsEngine_minStep__P31597.info = {"start":1905,"length":67,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"minStep","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_minStep__P2178_mk(s) {
+function ArcadePhysicsEngine_minStep__P31597_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_minStep__P2178, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_minStep__P31597, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29106,7 +29150,7 @@ function ArcadePhysicsEngine_minStep__P2178_mk(s) {
 
 
 
-function ArcadePhysicsEngine_minStep__P2177(s) {
+function ArcadePhysicsEngine_minStep__P31596(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29121,7 +29165,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg0.fields["minSingleStep"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -29130,13 +29174,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_minStep__P2177.info = {"start":1825,"length":74,"line":73,"column":4,"endLine":75,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this"]}
-ArcadePhysicsEngine_minStep__P2177.isGetter = true;
+ArcadePhysicsEngine_minStep__P31596.info = {"start":1825,"length":74,"line":73,"column":4,"endLine":75,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"minStep","argumentNames":["this"]}
+ArcadePhysicsEngine_minStep__P31596.isGetter = true;
 
-function ArcadePhysicsEngine_minStep__P2177_mk(s) {
+function ArcadePhysicsEngine_minStep__P31596_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_minStep__P2177, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_minStep__P31596, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29147,7 +29191,7 @@ function ArcadePhysicsEngine_minStep__P2177_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxSpeed__P2176(s) {
+function ArcadePhysicsEngine_maxSpeed__P31595(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29163,7 +29207,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -29180,12 +29224,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxSpeed__P2176.info = {"start":1692,"length":127,"line":68,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this","v"]}
+ArcadePhysicsEngine_maxSpeed__P31595.info = {"start":1692,"length":127,"line":68,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"maxSpeed","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_maxSpeed__P2176_mk(s) {
+function ArcadePhysicsEngine_maxSpeed__P31595_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P2176, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P31595, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29198,7 +29242,7 @@ function ArcadePhysicsEngine_maxSpeed__P2176_mk(s) {
 
 
 
-function Fx_neg__P150(s) {
+function Fx_neg__P29685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29216,12 +29260,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_neg__P150.info = {"start":311,"length":88,"line":14,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"neg","argumentNames":["a"]}
+Fx_neg__P29685.info = {"start":311,"length":88,"line":14,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"neg","argumentNames":["a"]}
 
-function Fx_neg__P150_mk(s) {
+function Fx_neg__P29685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_neg__P150, depth: s.depth + 1,
+        parent: s, fn: Fx_neg__P29685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -29230,7 +29274,7 @@ function Fx_neg__P150_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxSpeed__P2175(s) {
+function ArcadePhysicsEngine_maxSpeed__P31594(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29245,7 +29289,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg0.fields["maxVelocity"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -29254,13 +29298,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxSpeed__P2175.info = {"start":1613,"length":73,"line":64,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this"]}
-ArcadePhysicsEngine_maxSpeed__P2175.isGetter = true;
+ArcadePhysicsEngine_maxSpeed__P31594.info = {"start":1613,"length":73,"line":64,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"maxSpeed","argumentNames":["this"]}
+ArcadePhysicsEngine_maxSpeed__P31594.isGetter = true;
 
-function ArcadePhysicsEngine_maxSpeed__P2175_mk(s) {
+function ArcadePhysicsEngine_maxSpeed__P31594_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P2175, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P31594, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29271,7 +29315,7 @@ function ArcadePhysicsEngine_maxSpeed__P2175_mk(s) {
 
 
 
-function PhysicsEngine_constructor__P2160(s) {
+function PhysicsEngine_constructor__P31579(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29286,17 +29330,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C31578_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_constructor__P2160.info = {"start":26,"length":21,"line":1,"column":4,"endLine":2,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this"]}
+PhysicsEngine_constructor__P31579.info = {"start":26,"length":21,"line":1,"column":4,"endLine":2,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["this"]}
 
-function PhysicsEngine_constructor__P2160_mk(s) {
+function PhysicsEngine_constructor__P31579_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_constructor__P2160, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_constructor__P31579, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -29305,7 +29349,7 @@ function PhysicsEngine_constructor__P2160_mk(s) {
 
 
 
-function sprites_SpriteMap_constructor__P2095(s) {
+function sprites_SpriteMap_constructor__P31514(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29320,7 +29364,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -29329,12 +29373,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_constructor__P2095.info = {"start":237,"length":56,"line":8,"column":8,"endLine":10,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["this"]}
+sprites_SpriteMap_constructor__P31514.info = {"start":237,"length":56,"line":8,"column":8,"endLine":10,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"inline","argumentNames":["this"]}
 
-function sprites_SpriteMap_constructor__P2095_mk(s) {
+function sprites_SpriteMap_constructor__P31514_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_constructor__P2095, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_constructor__P31514, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29345,44 +29389,7 @@ function sprites_SpriteMap_constructor__P2095_mk(s) {
 
 
 
-function music_Melody_constructor__P1601(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["_text"] = (s.arg1);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_constructor__P1601.info = {"start":6328,"length":67,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["this","text"]}
-
-function music_Melody_constructor__P1601_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_constructor__P1601, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function control_pushEventContext__P398(s) {
+function control_pushEventContext__P29933(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29392,63 +29399,63 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___11455 = undefined;
-    s.n___11461 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___4032);
+    s.ctx___40992 = undefined;
+    s.n___40998 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___33567);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals.eventContexts___4032 = (r0);
+    globals.eventContexts___33567 = (r0);
   case 1:
   case 2:
-    s.tmp_0 = control_eventContext__P397_mk(s);
+    s.tmp_0 = control_eventContext__P29932_mk(s);
     s.callLocIdx = 62; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.ctx___11455 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___11455);
+    s.ctx___40992 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___40992);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = control_EventContext_unregister__P391_mk(s);
-    s.tmp_0.arg0 = s.ctx___11455;
+    s.tmp_0 = control_EventContext_unregister__P29926_mk(s);
+    s.tmp_0.arg0 = s.ctx___40992;
     s.callLocIdx = 63; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(control_EventContext__C384_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_EventContext__C29919_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_EventContext_constructor__P388_mk(s);
+    s.tmp_1 = control_EventContext_constructor__P29923_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 64; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.n___11461 = (s.tmp_0);
-    r0 = pxsim_Array__push(globals.eventContexts___4032, s.n___11461);
-    r0 = s.n___11461;
+    s.n___40998 = (s.tmp_0);
+    r0 = pxsim_Array__push(globals.eventContexts___33567, s.n___40998);
+    r0 = s.n___40998;
     return leave(s, r0)
   default: oops()
 } } }
-control_pushEventContext__P398.info = {"start":7123,"length":340,"line":216,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
+control_pushEventContext__P29933.info = {"start":7123,"length":340,"line":216,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
 
-function control_pushEventContext__P398_mk(s) {
+function control_pushEventContext__P29933_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_pushEventContext__P398, depth: s.depth + 1,
+        parent: s, fn: control_pushEventContext__P29933, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  ctx___11455: undefined,
-  n___11461: undefined,
+  ctx___40992: undefined,
+  n___40998: undefined,
 } }
 
 
 
 
 
-function control_EventContext_unregister__P391(s) {
+function control_EventContext_unregister__P29926(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29458,37 +29465,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___8703 = undefined;
-    s.unnamed92___U1 = undefined;
-    s.unnamed93___U2 = undefined;
+    s.h___38240 = undefined;
+    s.unnamed932___U1 = undefined;
+    s.unnamed933___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
-    s.h___8703 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
+    s.h___38240 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed92___U1 = (r0);
-    s.unnamed93___U2 = (0);
+    s.unnamed932___U1 = (r0);
+    s.unnamed933___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed93___U2;
-    r0 = pxsim_Array__length(s.unnamed92___U1);
+    s.tmp_0 = r0 = s.unnamed933___U2;
+    r0 = pxsim_Array__length(s.unnamed932___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed92___U1, s.unnamed93___U2);
-    s.h___8703 = (r0);
-    s.tmp_2 = control_EventHandler_unregister__P4026_mk(s);
-    s.tmp_2.arg0 = s.h___8703;
+    r0 = pxsim_Array__getAt(s.unnamed932___U1, s.unnamed933___U2);
+    s.h___38240 = (r0);
+    s.tmp_2 = control_EventHandler_unregister__P33561_mk(s);
+    s.tmp_2.arg0 = s.h___38240;
     s.callLocIdx = 58; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed93___U2 + 1);
-    s.unnamed93___U2 = (r0);
+    r0 = (s.unnamed933___U2 + 1);
+    s.unnamed933___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed92___U1 = (undefined);
+    s.unnamed932___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["frameWorker"];
     s.tmp_2 = r0;
@@ -29499,19 +29506,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_unregister__P391.info = {"start":4534,"length":131,"line":137,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
+control_EventContext_unregister__P29926.info = {"start":4534,"length":131,"line":137,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
 
-function control_EventContext_unregister__P391_mk(s) {
+function control_EventContext_unregister__P29926_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_unregister__P391, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_unregister__P29926, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  h___8703: undefined,
-  unnamed92___U1: undefined,
-  unnamed93___U2: undefined,
+  h___38240: undefined,
+  unnamed932___U1: undefined,
+  unnamed933___U2: undefined,
   arg0: undefined,
 } }
 
@@ -29519,7 +29526,7 @@ function control_EventContext_unregister__P391_mk(s) {
 
 
 
-function control_EventHandler_unregister__P4026(s) {
+function control_EventHandler_unregister__P33561(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29534,24 +29541,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C4024_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventHandler__C33559_VT)) failedCast(r0);
     r0 = s.arg0.fields["src"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["value"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["flags"];
     s.tmp_2 = r0;
-    r0 = pxsim.control.internalOnEvent(s.tmp_0, s.tmp_1, control_doNothing__P4028, s.tmp_2);
+    r0 = pxsim.control.internalOnEvent(s.tmp_0, s.tmp_1, control_doNothing__P33563, s.tmp_2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_unregister__P4026.info = {"start":1136,"length":106,"line":36,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
+control_EventHandler_unregister__P33561.info = {"start":1136,"length":106,"line":36,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"unregister","argumentNames":["this"]}
 
-function control_EventHandler_unregister__P4026_mk(s) {
+function control_EventHandler_unregister__P33561_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_unregister__P4026, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_unregister__P33561, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29563,7 +29570,7 @@ function control_EventHandler_unregister__P4026_mk(s) {
 
 
 
-function control_doNothing__P4028(s) {
+function control_doNothing__P33563(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29577,12 +29584,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_doNothing__P4028.info = {"start":1254,"length":24,"line":41,"column":4,"endLine":41,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
+control_doNothing__P33563.info = {"start":1254,"length":24,"line":41,"column":4,"endLine":41,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
 
-function control_doNothing__P4028_mk(s) {
+function control_doNothing__P33563_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_doNothing__P4028, depth: s.depth + 1,
+        parent: s, fn: control_doNothing__P33563, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -29590,7 +29597,7 @@ function control_doNothing__P4028_mk(s) {
 
 
 
-function control_EventContext_constructor__P388(s) {
+function control_EventContext_constructor__P29923(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29605,7 +29612,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -29615,26 +29622,26 @@ switch (step) {
     r0 = (s.arg0).fields["deltaTimeMillis"] = (0);
     r0 = (s.arg0).fields["frameWorker"] = (0);
     r0 = (s.arg0).fields["idleCallbacks"] = (undefined);
-    r0 = pxsim_numops_toBoolDecr(globals.control_EventContext_lastStats___386);
+    r0 = pxsim_numops_toBoolDecr(globals.control_EventContext_lastStats___29921);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_String_.mkEmpty();
-    globals.control_EventContext_lastStats___386 = (r0);
+    globals.control_EventContext_lastStats___29921 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_constructor__P388.info = {"start":1740,"length":347,"line":58,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this"]}
+control_EventContext_constructor__P29923.info = {"start":1740,"length":347,"line":58,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this"]}
 
-function control_EventContext_constructor__P388_mk(s) {
+function control_EventContext_constructor__P29923_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_constructor__P388, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_constructor__P29923, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29645,7 +29652,7 @@ function control_EventContext_constructor__P388_mk(s) {
 
 
 
-function character_CharacterState_constructor__P6151(s) {
+function character_CharacterState_constructor__P35673(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29661,7 +29668,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C35663_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sprite"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
@@ -29673,17 +29680,17 @@ switch (step) {
     r0 = (s.arg0).fields["possibleFacingDirections"] = (0);
     r0 = (s.arg0).fields["enabled"] = (true);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_x__P2025_mk(s);
+    s.tmp_2 = Sprite_x__P31444_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 2045; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 2050; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["lastX"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_y__P2027_mk(s);
+    s.tmp_2 = Sprite_y__P31446_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 2046; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 2051; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -29693,12 +29700,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_constructor__P6151.info = {"start":2778,"length":372,"line":98,"column":8,"endLine":108,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","sprite"]}
+character_CharacterState_constructor__P35673.info = {"start":2778,"length":372,"line":98,"column":8,"endLine":108,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","sprite"]}
 
-function character_CharacterState_constructor__P6151_mk(s) {
+function character_CharacterState_constructor__P35673_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_constructor__P6151, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_constructor__P35673, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29711,7 +29718,7 @@ function character_CharacterState_constructor__P6151_mk(s) {
 
 
 
-function character_CharacterState_setManualFlags__P6148(s) {
+function character_CharacterState_setManualFlags__P35670(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29727,14 +29734,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
-    s.tmp_0 = character_rule__P3745_mk(s);
+    if (!checkSubtype(r0, character_CharacterState__C35663_VT)) failedCast(r0);
+    s.tmp_0 = character_rule__P33279_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
     s.tmp_0.arg3 = undefined;
     s.tmp_0.arg4 = undefined;
-    s.callLocIdx = 2073; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 2078; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     s.arg1 = (r0);
@@ -29753,12 +29760,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setManualFlags__P6148.info = {"start":9280,"length":175,"line":273,"column":8,"endLine":279,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setManualFlags","argumentNames":["this","flags"]}
+character_CharacterState_setManualFlags__P35670.info = {"start":9280,"length":175,"line":273,"column":8,"endLine":279,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setManualFlags","argumentNames":["this","flags"]}
 
-function character_CharacterState_setManualFlags__P6148_mk(s) {
+function character_CharacterState_setManualFlags__P35670_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setManualFlags__P6148, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setManualFlags__P35670, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29770,7 +29777,7 @@ function character_CharacterState_setManualFlags__P6148_mk(s) {
 
 
 
-function character_rule__P3745(s) {
+function character_rule__P33279(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29780,7 +29787,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___21128 = undefined;
+    s.rule___50624 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -29789,33 +29796,33 @@ switch (step) {
       s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
-    s.rule___21128 = (s.arg0);
+    s.rule___50624 = (s.arg0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
-    r0 = (s.rule___21128 | s.arg1);
-    s.rule___21128 = (r0);
+    r0 = (s.rule___50624 | s.arg1);
+    s.rule___50624 = (r0);
   case 1:
   case 2:
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 3; continue; }
-    r0 = (s.rule___21128 | s.arg2);
-    s.rule___21128 = (r0);
+    r0 = (s.rule___50624 | s.arg2);
+    s.rule___50624 = (r0);
   case 3:
   case 4:
     r0 = pxsim_numops_toBoolDecr(s.arg3);
     if (!r0) { step = 5; continue; }
-    r0 = (s.rule___21128 | s.arg3);
-    s.rule___21128 = (r0);
+    r0 = (s.rule___50624 | s.arg3);
+    s.rule___50624 = (r0);
   case 5:
   case 6:
-    r0 = (s.rule___21128 & 1);
+    r0 = (s.rule___50624 & 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 7; continue; }
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    r0 = (s.rule___21128 & 962);
+    r0 = (s.rule___50624 & 962);
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -29824,14 +29831,14 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 12; continue; }
   case 9:
-    r0 = (s.rule___21128 & 544);
+    r0 = (s.rule___50624 & 544);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 10; continue; }
     r0 = s.tmp_2;
     { step = 11; continue; }
   case 10:
-    r0 = (s.rule___21128 & 136);
+    r0 = (s.rule___50624 & 136);
   case 11:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -29844,14 +29851,14 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 16; continue; }
   case 13:
-    r0 = (s.rule___21128 & 68);
+    r0 = (s.rule___50624 & 68);
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBool(s.tmp_5);
     if (r0) { step = 14; continue; }
     r0 = s.tmp_5;
     { step = 15; continue; }
   case 14:
-    r0 = (s.rule___21128 & 272);
+    r0 = (s.rule___50624 & 272);
   case 15:
     // jmp value (already in r0)
     s.tmp_6 = r0;
@@ -29864,14 +29871,14 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 20; continue; }
   case 17:
-    r0 = (s.rule___21128 & 256);
+    r0 = (s.rule___50624 & 256);
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBool(s.tmp_8);
     if (r0) { step = 18; continue; }
     r0 = s.tmp_8;
     { step = 19; continue; }
   case 18:
-    r0 = (s.rule___21128 & 4096);
+    r0 = (s.rule___50624 & 4096);
   case 19:
     // jmp value (already in r0)
     s.tmp_9 = r0;
@@ -29884,14 +29891,14 @@ switch (step) {
     r0 = s.tmp_10;
     { step = 24; continue; }
   case 21:
-    r0 = (s.rule___21128 & 64);
+    r0 = (s.rule___50624 & 64);
     s.tmp_11 = r0;
     r0 = pxsim_numops_toBool(s.tmp_11);
     if (r0) { step = 22; continue; }
     r0 = s.tmp_11;
     { step = 23; continue; }
   case 22:
-    r0 = (s.rule___21128 & 1024);
+    r0 = (s.rule___50624 & 1024);
   case 23:
     // jmp value (already in r0)
     s.tmp_12 = r0;
@@ -29904,14 +29911,14 @@ switch (step) {
     r0 = s.tmp_13;
     { step = 28; continue; }
   case 25:
-    r0 = (s.rule___21128 & 128);
+    r0 = (s.rule___50624 & 128);
     s.tmp_14 = r0;
     r0 = pxsim_numops_toBool(s.tmp_14);
     if (r0) { step = 26; continue; }
     r0 = s.tmp_14;
     { step = 27; continue; }
   case 26:
-    r0 = (s.rule___21128 & 2048);
+    r0 = (s.rule___50624 & 2048);
   case 27:
     // jmp value (already in r0)
     s.tmp_15 = r0;
@@ -29924,14 +29931,14 @@ switch (step) {
     r0 = s.tmp_16;
     { step = 32; continue; }
   case 29:
-    r0 = (s.rule___21128 & 512);
+    r0 = (s.rule___50624 & 512);
     s.tmp_17 = r0;
     r0 = pxsim_numops_toBool(s.tmp_17);
     if (r0) { step = 30; continue; }
     r0 = s.tmp_17;
     { step = 31; continue; }
   case 30:
-    r0 = (s.rule___21128 & 8192);
+    r0 = (s.rule___50624 & 8192);
   case 31:
     // jmp value (already in r0)
     s.tmp_18 = r0;
@@ -29945,17 +29952,17 @@ switch (step) {
     { step = 35; continue; }
   case 33:
   case 34:
-    r0 = s.rule___21128;
+    r0 = s.rule___50624;
   case 35:
     return leave(s, r0)
   default: oops()
 } } }
-character_rule__P3745.info = {"start":19564,"length":1258,"line":565,"column":4,"endLine":593,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"rule","argumentNames":["p1","p2","p3","p4","p5"]}
+character_rule__P33279.info = {"start":19564,"length":1258,"line":565,"column":4,"endLine":593,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"rule","argumentNames":["p1","p2","p3","p4","p5"]}
 
-function character_rule__P3745_mk(s) {
+function character_rule__P33279_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_rule__P3745, depth: s.depth + 1,
+        parent: s, fn: character_rule__P33279, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29977,7 +29984,7 @@ function character_rule__P3745_mk(s) {
   tmp_17: undefined,
   tmp_18: undefined,
   tmp_19: undefined,
-  rule___21128: undefined,
+  rule___50624: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -29989,7 +29996,7 @@ function character_rule__P3745_mk(s) {
 
 
 
-function character_loopFrames__P3739(s) {
+function character_loopFrames__P33273(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29999,7 +30006,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___21240 = undefined;
+    s.state___50736 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30007,8 +30014,8 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_init__P6152_mk(s);
-    s.callLocIdx = 2085; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = character_init__P35674_mk(s);
+    s.callLocIdx = 2090; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -30055,9 +30062,9 @@ switch (step) {
     { step = 13; continue; }
   case 7:
   case 8:
-    s.tmp_10 = Number_isNaN__P93_mk(s);
+    s.tmp_10 = Number_isNaN__P29628_mk(s);
     s.tmp_10.arg0 = s.arg2;
-    s.callLocIdx = 2086; s.pc = 15; return s.tmp_10;
+    s.callLocIdx = 2091; s.pc = 15; return s.tmp_10;
   case 15:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -30075,19 +30082,19 @@ switch (step) {
     s.arg2 = (5);
   case 11:
   case 12:
-    s.tmp_0 = character_getStateForSprite__P6155_mk(s);
+    s.tmp_0 = character_getStateForSprite__P35677_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 2087; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 2092; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.state___21240 = (r0);
-    s.tmp_0 = character_CharacterState_setLoopFrames__P6143_mk(s);
-    s.tmp_0.arg0 = s.state___21240;
+    s.state___50736 = (r0);
+    s.tmp_0 = character_CharacterState_setLoopFrames__P35665_mk(s);
+    s.tmp_0.arg0 = s.state___50736;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = s.arg3;
-    s.callLocIdx = 2088; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 2093; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
   case 13:
@@ -30095,12 +30102,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_loopFrames__P3739.info = {"start":12857,"length":380,"line":394,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"loopFrames","argumentNames":["sprite","frames","frameInterval","rule"]}
+character_loopFrames__P33273.info = {"start":12857,"length":380,"line":394,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"loopFrames","argumentNames":["sprite","frames","frameInterval","rule"]}
 
-function character_loopFrames__P3739_mk(s) {
+function character_loopFrames__P33273_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_loopFrames__P3739, depth: s.depth + 1,
+        parent: s, fn: character_loopFrames__P33273, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30114,7 +30121,7 @@ function character_loopFrames__P3739_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  state___21240: undefined,
+  state___50736: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30125,7 +30132,7 @@ function character_loopFrames__P3739_mk(s) {
 
 
 
-function character_CharacterState_setLoopFrames__P6143(s) {
+function character_CharacterState_setLoopFrames__P35665(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30143,26 +30150,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
-    s.tmp_0 = character_CharacterState_setFrames__P6142_mk(s);
+    if (!checkSubtype(r0, character_CharacterState__C35663_VT)) failedCast(r0);
+    s.tmp_0 = character_CharacterState_setFrames__P35664_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg2;
     s.tmp_0.arg4 = s.arg3;
-    s.callLocIdx = 2048; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2053; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setLoopFrames__P6143.info = {"start":4157,"length":130,"line":140,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setLoopFrames","argumentNames":["this","frames","interval","rule"]}
+character_CharacterState_setLoopFrames__P35665.info = {"start":4157,"length":130,"line":140,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setLoopFrames","argumentNames":["this","frames","interval","rule"]}
 
-function character_CharacterState_setLoopFrames__P6143_mk(s) {
+function character_CharacterState_setLoopFrames__P35665_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setLoopFrames__P6143, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setLoopFrames__P35665, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -30175,7 +30182,7 @@ function character_CharacterState_setLoopFrames__P6143_mk(s) {
 
 
 
-function character_CharacterState_setFrames__P6142(s) {
+function character_CharacterState_setFrames__P35664(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30185,10 +30192,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.animation___21270 = undefined;
-    s.unnamed134___U1 = undefined;
-    s.unnamed135___U2 = undefined;
-    s.anim___21290 = undefined;
+    s.animation___50766 = undefined;
+    s.unnamed974___U1 = undefined;
+    s.unnamed975___U2 = undefined;
+    s.anim___50786 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30198,7 +30205,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C35663_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["possibleFacingDirections"];
     s.tmp_2 = r0;
@@ -30207,19 +30214,19 @@ switch (step) {
     r0 = (s.tmp_2 | s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["possibleFacingDirections"] = (s.tmp_1);
-    s.animation___21270 = (undefined);
+    s.animation___50766 = (undefined);
     r0 = s.arg0.fields["animations"];
-    s.unnamed134___U1 = (r0);
-    s.unnamed135___U2 = (0);
+    s.unnamed974___U1 = (r0);
+    s.unnamed975___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed135___U2;
-    r0 = pxsim_Array__length(s.unnamed134___U1);
+    s.tmp_0 = r0 = s.unnamed975___U2;
+    r0 = pxsim_Array__length(s.unnamed974___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed134___U1, s.unnamed135___U2);
-    s.animation___21270 = (r0);
-    r0 = s.animation___21270.fields["rule"];
+    r0 = pxsim_Array__getAt(s.unnamed974___U1, s.unnamed975___U2);
+    s.animation___50766 = (r0);
+    r0 = s.animation___50766.fields["rule"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 === s.arg4);
     s.tmp_2 = r0;
@@ -30227,62 +30234,62 @@ switch (step) {
     if (!r0) { step = 4; continue; }
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 2; continue; }
-    r0 = (s.animation___21270).fields["loopFrames"] = (s.arg2);
-    r0 = (s.animation___21270).fields["loopInterval"] = (s.arg3);
+    r0 = (s.animation___50766).fields["loopFrames"] = (s.arg2);
+    r0 = (s.animation___50766).fields["loopInterval"] = (s.arg3);
     { step = 3; continue; }
   case 2:
-    r0 = (s.animation___21270).fields["startFrames"] = (s.arg2);
-    r0 = (s.animation___21270).fields["startInterval"] = (s.arg3);
+    r0 = (s.animation___50766).fields["startFrames"] = (s.arg2);
+    r0 = (s.animation___50766).fields["startInterval"] = (s.arg3);
   case 3:
     { step = 9; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed135___U2 + 1);
-    s.unnamed135___U2 = (r0);
+    r0 = (s.unnamed975___U2 + 1);
+    s.unnamed975___U2 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed134___U1 = (undefined);
-    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimation__C6139_VT);
+    s.unnamed974___U1 = (undefined);
+    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimation__C35661_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = character_CharacterAnimation_constructor__P6140_mk(s);
+    s.tmp_1 = character_CharacterAnimation_constructor__P35662_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg4;
-    s.callLocIdx = 2047; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 2052; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.anim___21290 = (s.tmp_0);
+    s.anim___50786 = (s.tmp_0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 7; continue; }
-    r0 = (s.anim___21290).fields["loopFrames"] = (s.arg2);
-    r0 = (s.anim___21290).fields["loopInterval"] = (s.arg3);
+    r0 = (s.anim___50786).fields["loopFrames"] = (s.arg2);
+    r0 = (s.anim___50786).fields["loopInterval"] = (s.arg3);
     { step = 8; continue; }
   case 7:
-    r0 = (s.anim___21290).fields["startFrames"] = (s.arg2);
-    r0 = (s.anim___21290).fields["startInterval"] = (s.arg3);
+    r0 = (s.anim___50786).fields["startFrames"] = (s.arg2);
+    r0 = (s.anim___50786).fields["startInterval"] = (s.arg3);
   case 8:
     r0 = s.arg0.fields["animations"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.anim___21290);
+    r0 = pxsim_Array__push(s.tmp_0, s.anim___50786);
   case 9:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setFrames__P6142.info = {"start":3160,"length":987,"line":110,"column":8,"endLine":138,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setFrames","argumentNames":["this","loop","frames","interval","rule"]}
+character_CharacterState_setFrames__P35664.info = {"start":3160,"length":987,"line":110,"column":8,"endLine":138,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setFrames","argumentNames":["this","loop","frames","interval","rule"]}
 
-function character_CharacterState_setFrames__P6142_mk(s) {
+function character_CharacterState_setFrames__P35664_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setFrames__P6142, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setFrames__P35664, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  animation___21270: undefined,
-  unnamed134___U1: undefined,
-  unnamed135___U2: undefined,
-  anim___21290: undefined,
+  animation___50766: undefined,
+  unnamed974___U1: undefined,
+  unnamed975___U2: undefined,
+  anim___50786: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30294,7 +30301,7 @@ function character_CharacterState_setFrames__P6142_mk(s) {
 
 
 
-function character_CharacterAnimation_constructor__P6140(s) {
+function character_CharacterAnimation_constructor__P35662(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30310,18 +30317,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterAnimation__C6139_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterAnimation__C35661_VT)) failedCast(r0);
     r0 = (s.arg0).fields["rule"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterAnimation_constructor__P6140.info = {"start":2245,"length":42,"line":77,"column":8,"endLine":78,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","rule"]}
+character_CharacterAnimation_constructor__P35662.info = {"start":2245,"length":42,"line":77,"column":8,"endLine":78,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","rule"]}
 
-function character_CharacterAnimation_constructor__P6140_mk(s) {
+function character_CharacterAnimation_constructor__P35662_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterAnimation_constructor__P6140, depth: s.depth + 1,
+        parent: s, fn: character_CharacterAnimation_constructor__P35662, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -30331,7 +30338,7 @@ function character_CharacterAnimation_constructor__P6140_mk(s) {
 
 
 
-function Number_isNaN__P93(s) {
+function Number_isNaN__P29628(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30362,12 +30369,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Number_isNaN__P93.info = {"start":355,"length":93,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isNaN","argumentNames":["x"]}
+Number_isNaN__P29628.info = {"start":355,"length":93,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isNaN","argumentNames":["x"]}
 
-function Number_isNaN__P93_mk(s) {
+function Number_isNaN__P29628_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Number_isNaN__P93, depth: s.depth + 1,
+        parent: s, fn: Number_isNaN__P29628, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30379,7 +30386,7 @@ function Number_isNaN__P93_mk(s) {
 
 
 
-function tiles_placeOnRandomTile__P2349(s) {
+function tiles_placeOnRandomTile__P31768(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30389,7 +30396,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.loc___21432 = undefined;
+    s.loc___50928 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30404,8 +30411,8 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_4 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 993; s.pc = 8; return s.tmp_4;
+    s.tmp_4 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 950; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
@@ -30421,18 +30428,18 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_6 = tiles_getRandomTileByType__P2351_mk(s);
+    s.tmp_6 = tiles_getRandomTileByType__P31770_mk(s);
     s.tmp_6.arg0 = s.arg1;
-    s.callLocIdx = 994; s.pc = 9; return s.tmp_6;
+    s.callLocIdx = 951; s.pc = 9; return s.tmp_6;
   case 9:
     r0 = s.retval;
-    s.loc___21432 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.loc___21432);
+    s.loc___50928 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.loc___50928);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = tiles_Location_place__P2296_mk(s);
-    s.tmp_0.arg0 = s.loc___21432;
+    s.tmp_0 = tiles_Location_place__P31715_mk(s);
+    s.tmp_0.arg0 = s.loc___50928;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 995; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 952; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 5:
@@ -30442,12 +30449,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_placeOnRandomTile__P2349.info = {"start":18837,"length":232,"line":581,"column":4,"endLine":586,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"placeOnRandomTile","argumentNames":["sprite","tile"]}
+tiles_placeOnRandomTile__P31768.info = {"start":18837,"length":232,"line":581,"column":4,"endLine":586,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"placeOnRandomTile","argumentNames":["sprite","tile"]}
 
-function tiles_placeOnRandomTile__P2349_mk(s) {
+function tiles_placeOnRandomTile__P31768_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_placeOnRandomTile__P2349, depth: s.depth + 1,
+        parent: s, fn: tiles_placeOnRandomTile__P31768, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30456,7 +30463,7 @@ function tiles_placeOnRandomTile__P2349_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  loc___21432: undefined,
+  loc___50928: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -30465,7 +30472,7 @@ function tiles_placeOnRandomTile__P2349_mk(s) {
 
 
 
-function tiles_getRandomTileByType__P2351(s) {
+function tiles_getRandomTileByType__P31770(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30475,18 +30482,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___21441 = undefined;
-    s.index___21451 = undefined;
-    s.sample___21457 = undefined;
+    s.scene___50937 = undefined;
+    s.index___50947 = undefined;
+    s.sample___50953 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 999; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 956; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___21441 = (r0);
+    s.scene___50937 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -30496,7 +30503,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___21441.fields["tileMap"];
+    r0 = s.scene___50937.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -30510,34 +30517,34 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = tiles_TileMap_getImageType__P2332_mk(s);
-    r0 = s.scene___21441.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getImageType__P31751_mk(s);
+    r0 = s.scene___50937.fields["tileMap"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg0;
-    s.callLocIdx = 1000; s.pc = 7; return s.tmp_5;
+    s.callLocIdx = 957; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
-    s.index___21451 = (r0);
-    s.tmp_0 = tiles_TileMap_sampleTilesByType__P2335_mk(s);
-    r0 = s.scene___21441.fields["tileMap"];
+    s.index___50947 = (r0);
+    s.tmp_0 = tiles_TileMap_sampleTilesByType__P31754_mk(s);
+    r0 = s.scene___50937.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___21451;
+    s.tmp_0.arg1 = s.index___50947;
     s.tmp_0.arg2 = 1;
-    s.callLocIdx = 1001; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 958; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.sample___21457 = (r0);
-    r0 = pxsim_Array__getAt(s.sample___21457, 0);
+    s.sample___50953 = (r0);
+    r0 = pxsim_Array__getAt(s.sample___50953, 0);
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getRandomTileByType__P2351.info = {"start":19819,"length":324,"line":608,"column":4,"endLine":615,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getRandomTileByType","argumentNames":["tile"]}
+tiles_getRandomTileByType__P31770.info = {"start":19819,"length":324,"line":608,"column":4,"endLine":615,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getRandomTileByType","argumentNames":["tile"]}
 
-function tiles_getRandomTileByType__P2351_mk(s) {
+function tiles_getRandomTileByType__P31770_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getRandomTileByType__P2351, depth: s.depth + 1,
+        parent: s, fn: tiles_getRandomTileByType__P31770, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30545,9 +30552,9 @@ function tiles_getRandomTileByType__P2351_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___21441: undefined,
-  index___21451: undefined,
-  sample___21457: undefined,
+  scene___50937: undefined,
+  index___50947: undefined,
+  sample___50953: undefined,
   arg0: undefined,
 } }
 
@@ -30555,7 +30562,7 @@ function tiles_getRandomTileByType__P2351_mk(s) {
 
 
 
-function tiles_TileMap_sampleTilesByType__P2335(s) {
+function tiles_TileMap_sampleTilesByType__P31754(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30565,12 +30572,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.count___21477 = undefined;
-    s.reservoir___21478 = undefined;
-    s.col___21480 = undefined;
-    s.row___21487 = undefined;
-    s.currTile___21494 = undefined;
-    s.potentialIndex___21513 = undefined;
+    s.count___50973 = undefined;
+    s.reservoir___50974 = undefined;
+    s.col___50976 = undefined;
+    s.row___50983 = undefined;
+    s.currTile___50990 = undefined;
+    s.potentialIndex___51009 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30578,11 +30585,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMap_isInvalidIndex__P33786_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 923; s.pc = 18; return s.tmp_1;
+    s.callLocIdx = 880; s.pc = 18; return s.tmp_1;
   case 18:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -30622,12 +30629,12 @@ switch (step) {
     { step = 17; continue; }
   case 5:
   case 6:
-    s.count___21477 = (0);
+    s.count___50973 = (0);
     r0 = pxsim_Array__mk();
-    s.reservoir___21478 = (r0);
-    s.col___21480 = (0);
+    s.reservoir___50974 = (r0);
+    s.col___50976 = (0);
   case 7:
-    s.tmp_1 = r0 = s.col___21480;
+    s.tmp_1 = r0 = s.col___50976;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_width"];
@@ -30636,9 +30643,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.row___21487 = (0);
+    s.row___50983 = (0);
   case 8:
-    s.tmp_1 = r0 = s.row___21487;
+    s.tmp_1 = r0 = s.row___50983;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_height"];
@@ -30647,79 +30654,79 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_4 = tiles_TileMapData_getTile__P2310_mk(s);
+    s.tmp_4 = tiles_TileMapData_getTile__P31729_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.col___21480;
-    s.tmp_4.arg2 = s.row___21487;
-    s.callLocIdx = 927; s.pc = 19; return s.tmp_4;
+    s.tmp_4.arg1 = s.col___50976;
+    s.tmp_4.arg2 = s.row___50983;
+    s.callLocIdx = 884; s.pc = 19; return s.tmp_4;
   case 19:
     r0 = s.retval;
-    s.currTile___21494 = (r0);
-    r0 = (s.currTile___21494 === s.arg1);
+    s.currTile___50990 = (r0);
+    r0 = (s.currTile___50990 === s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (s.count___21477 < s.arg2);
+    r0 = (s.count___50973 < s.arg2);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C31708_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = tiles_Location_constructor__P2292_mk(s);
+    s.tmp_3 = tiles_Location_constructor__P31711_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
-    s.tmp_3.arg1 = s.col___21480;
-    s.tmp_3.arg2 = s.row___21487;
+    s.tmp_3.arg1 = s.col___50976;
+    s.tmp_3.arg2 = s.row___50983;
     s.tmp_3.arg3 = s.arg0;
-    s.callLocIdx = 928; s.pc = 20; return s.tmp_3;
+    s.callLocIdx = 885; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.reservoir___21478, s.tmp_2);
+    r0 = pxsim_Array__push(s.reservoir___50974, s.tmp_2);
     { step = 12; continue; }
   case 9:
-    r0 = pxsim.Math_.randomRange(0, s.count___21477);
-    s.potentialIndex___21513 = (r0);
-    r0 = (s.potentialIndex___21513 < s.arg2);
+    r0 = pxsim.Math_.randomRange(0, s.count___50973);
+    s.potentialIndex___51009 = (r0);
+    r0 = (s.potentialIndex___51009 < s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C31708_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = tiles_Location_constructor__P2292_mk(s);
+    s.tmp_2 = tiles_Location_constructor__P31711_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = s.col___21480;
-    s.tmp_2.arg2 = s.row___21487;
+    s.tmp_2.arg1 = s.col___50976;
+    s.tmp_2.arg2 = s.row___50983;
     s.tmp_2.arg3 = s.arg0;
-    s.callLocIdx = 929; s.pc = 21; return s.tmp_2;
+    s.callLocIdx = 886; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
-    r0 = pxsim_Array_.setAt(s.reservoir___21478, s.potentialIndex___21513, s.tmp_1);
+    r0 = pxsim_Array_.setAt(s.reservoir___50974, s.potentialIndex___51009, s.tmp_1);
   case 10:
   case 11:
   case 12:
-    r0 = (s.count___21477 + 1);
-    s.count___21477 = (r0);
+    r0 = (s.count___50973 + 1);
+    s.count___50973 = (r0);
   case 13:
   case 14:
-    r0 = (s.row___21487 + 1);
-    s.row___21487 = (r0);
+    r0 = (s.row___50983 + 1);
+    s.row___50983 = (r0);
     { step = 8; continue; }
   case 15:
-    r0 = (s.col___21480 + 1);
-    s.col___21480 = (r0);
+    r0 = (s.col___50976 + 1);
+    s.col___50976 = (r0);
     { step = 7; continue; }
   case 16:
-    r0 = s.reservoir___21478;
+    r0 = s.reservoir___50974;
   case 17:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_sampleTilesByType__P2335.info = {"start":8960,"length":1101,"line":317,"column":8,"endLine":341,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"sampleTilesByType","argumentNames":["this","index","maxCount"]}
+tiles_TileMap_sampleTilesByType__P31754.info = {"start":8960,"length":1101,"line":317,"column":8,"endLine":341,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"sampleTilesByType","argumentNames":["this","index","maxCount"]}
 
-function tiles_TileMap_sampleTilesByType__P2335_mk(s) {
+function tiles_TileMap_sampleTilesByType__P31754_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_sampleTilesByType__P2335, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_sampleTilesByType__P31754, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30731,12 +30738,12 @@ function tiles_TileMap_sampleTilesByType__P2335_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  count___21477: undefined,
-  reservoir___21478: undefined,
-  col___21480: undefined,
-  row___21487: undefined,
-  currTile___21494: undefined,
-  potentialIndex___21513: undefined,
+  count___50973: undefined,
+  reservoir___50974: undefined,
+  col___50976: undefined,
+  row___50983: undefined,
+  currTile___50990: undefined,
+  potentialIndex___51009: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30746,7 +30753,7 @@ function tiles_TileMap_sampleTilesByType__P2335_mk(s) {
 
 
 
-function tiles_Location_place__P2296(s) {
+function tiles_Location_place__P31715(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30762,7 +30769,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C31708_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -30772,21 +30779,21 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = Sprite_setPosition__P2072_mk(s);
+    s.tmp_2 = Sprite_setPosition__P31491_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.tmp_3 = tiles_Location_x__P2293_mk(s);
+    s.tmp_3 = tiles_Location_x__P31712_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 882; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 839; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2.arg1 = r0;
-    s.tmp_4 = tiles_Location_y__P2294_mk(s);
+    s.tmp_4 = tiles_Location_y__P31713_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 883; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 840; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 884; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 841; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
   case 3:
@@ -30794,12 +30801,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_place__P2296.info = {"start":1189,"length":126,"line":51,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"place","argumentNames":["this","mySprite"]}
+tiles_Location_place__P31715.info = {"start":1189,"length":126,"line":51,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"place","argumentNames":["this","mySprite"]}
 
-function tiles_Location_place__P2296_mk(s) {
+function tiles_Location_place__P31715_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_place__P2296, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_place__P31715, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30814,7 +30821,7 @@ function tiles_Location_place__P2296_mk(s) {
 
 
 
-function Sprite_setPosition__P2072(s) {
+function Sprite_setPosition__P31491(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30824,7 +30831,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___19707 = undefined;
+    s.physics___49203 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30832,20 +30839,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 341; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 298; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___19707 = (r0);
-    s.tmp_0 = PhysicsEngine__C2159_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___19707;
+    s.physics___49203 = (r0);
+    s.tmp_0 = PhysicsEngine__C31578_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___49203;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_2 = r0 = s.arg1;
-    s.tmp_4 = Sprite_x__P2025_mk(s);
+    s.tmp_4 = Sprite_x__P31444_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 342; s.pc = 3; return s.tmp_4;
+    s.callLocIdx = 299; s.pc = 3; return s.tmp_4;
   case 3:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -30856,9 +30863,9 @@ switch (step) {
     r0 = (s.tmp_5 | 0);
     s.tmp_0.arg2 = r0;
     s.tmp_7 = r0 = s.arg2;
-    s.tmp_9 = Sprite_y__P2027_mk(s);
+    s.tmp_9 = Sprite_y__P31446_mk(s);
     s.tmp_9.arg0 = s.arg0;
-    s.callLocIdx = 344; s.pc = 4; return s.tmp_9;
+    s.callLocIdx = 301; s.pc = 4; return s.tmp_9;
   case 4:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -30868,7 +30875,7 @@ switch (step) {
     s.tmp_10 = r0;
     r0 = (s.tmp_10 | 0);
     s.tmp_0.arg3 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C31578_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.moveSprite;
     s.pc = 2; return s.tmp_0;
   case 2:
@@ -30877,12 +30884,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setPosition__P2072.info = {"start":11962,"length":220,"line":430,"column":4,"endLine":437,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setPosition","argumentNames":["this","x","y"]}
+Sprite_setPosition__P31491.info = {"start":11962,"length":220,"line":430,"column":4,"endLine":437,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"setPosition","argumentNames":["this","x","y"]}
 
-function Sprite_setPosition__P2072_mk(s) {
+function Sprite_setPosition__P31491_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setPosition__P2072, depth: s.depth + 1,
+        parent: s, fn: Sprite_setPosition__P31491, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30895,7 +30902,7 @@ function Sprite_setPosition__P2072_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  physics___19707: undefined,
+  physics___49203: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30905,7 +30912,7 @@ function Sprite_setPosition__P2072_mk(s) {
 
 
 
-function summon_shark__P46081(s) {
+function summon_shark__P98137(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30915,37 +30922,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    r0 = pxsim.image.ofBuffer(_hex46892);
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    r0 = pxsim.image.ofBuffer(_hex98311);
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.Enemy___2131;
-    s.callLocIdx = 184; s.pc = 3; return s.tmp_0;
+    s.tmp_0.arg1 = globals.Enemy___31550;
+    s.callLocIdx = 189; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.sprite_shark___46143 = (r0);
-    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
-    s.tmp_0.arg0 = globals.sprite_shark___46143;
+    globals.sprite_shark___98307 = (r0);
+    s.tmp_0 = sprites_setDataNumber__P33153_mk(s);
+    s.tmp_0.arg0 = globals.sprite_shark___98307;
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = 0;
-    s.callLocIdx = 185; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 190; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = tiles_placeOnRandomTile__P2349_mk(s);
-    s.tmp_0.arg0 = globals.sprite_shark___46143;
-    s.tmp_0.arg1 = globals.tile15___3948;
-    s.callLocIdx = 186; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = tiles_placeOnRandomTile__P31768_mk(s);
+    s.tmp_0.arg0 = globals.sprite_shark___98307;
+    s.tmp_0.arg1 = globals.tile15___33483;
+    s.callLocIdx = 191; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
-    s.tmp_2 = tiles_locationXY__P3791_mk(s);
-    s.tmp_3 = tiles_locationOfSprite__P3775_mk(s);
-    s.tmp_3.arg0 = globals.sprite_shark___46143;
-    s.callLocIdx = 187; s.pc = 7; return s.tmp_3;
+    s.tmp_2 = tiles_locationXY__P33325_mk(s);
+    s.tmp_3 = tiles_locationOfSprite__P33309_mk(s);
+    s.tmp_3.arg0 = globals.sprite_shark___98307;
+    s.callLocIdx = 192; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 188; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 193; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -30953,68 +30960,68 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_4 = tiles_placeOnRandomTile__P2349_mk(s);
-    s.tmp_4.arg0 = globals.sprite_shark___46143;
-    s.tmp_4.arg1 = globals.tile15___3948;
-    s.callLocIdx = 189; s.pc = 8; return s.tmp_4;
+    s.tmp_4 = tiles_placeOnRandomTile__P31768_mk(s);
+    s.tmp_4.arg0 = globals.sprite_shark___98307;
+    s.tmp_4.arg1 = globals.tile15___33483;
+    s.callLocIdx = 194; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     { step = 1; continue; }
   case 2:
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46913);
+    r0 = pxsim.image.ofBuffer(_hex98332);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_2 = character_loopFrames__P3739_mk(s);
-    s.tmp_2.arg0 = globals.sprite_shark___46143;
+    s.tmp_2 = character_loopFrames__P33273_mk(s);
+    s.tmp_2.arg0 = globals.sprite_shark___98307;
     s.tmp_2.arg1 = s.tmp_0;
     s.tmp_2.arg2 = 250;
-    s.tmp_3 = character_rule__P3745_mk(s);
+    s.tmp_3 = character_rule__P33279_mk(s);
     s.tmp_3.arg0 = 512;
     s.tmp_3.arg1 = undefined;
     s.tmp_3.arg2 = undefined;
     s.tmp_3.arg3 = undefined;
     s.tmp_3.arg4 = undefined;
-    s.callLocIdx = 190; s.pc = 10; return s.tmp_3;
+    s.callLocIdx = 195; s.pc = 10; return s.tmp_3;
   case 10:
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
-    s.callLocIdx = 191; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 196; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex46924);
+    r0 = pxsim.image.ofBuffer(_hex98343);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_2 = character_loopFrames__P3739_mk(s);
-    s.tmp_2.arg0 = globals.sprite_shark___46143;
+    s.tmp_2 = character_loopFrames__P33273_mk(s);
+    s.tmp_2.arg0 = globals.sprite_shark___98307;
     s.tmp_2.arg1 = s.tmp_0;
     s.tmp_2.arg2 = 250;
-    s.tmp_3 = character_rule__P3745_mk(s);
+    s.tmp_3 = character_rule__P33279_mk(s);
     s.tmp_3.arg0 = 128;
     s.tmp_3.arg1 = undefined;
     s.tmp_3.arg2 = undefined;
     s.tmp_3.arg3 = undefined;
     s.tmp_3.arg4 = undefined;
-    s.callLocIdx = 192; s.pc = 12; return s.tmp_3;
+    s.callLocIdx = 197; s.pc = 12; return s.tmp_3;
   case 12:
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
-    s.callLocIdx = 193; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 198; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
-    r0 = globals.sprite_shark___46143;
+    r0 = globals.sprite_shark___98307;
     return leave(s, r0)
   default: oops()
 } } }
-summon_shark__P46081.info = {"start":19681,"length":2607,"line":386,"column":0,"endLine":457,"endColumn":1,"fileName":"main.ts","functionName":"summon_shark","argumentNames":[]}
+summon_shark__P98137.info = {"start":19919,"length":2607,"line":392,"column":0,"endLine":463,"endColumn":1,"fileName":"main.ts","functionName":"summon_shark","argumentNames":[]}
 
-function summon_shark__P46081_mk(s) {
+function summon_shark__P98137_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: summon_shark__P46081, depth: s.depth + 1,
+        parent: s, fn: summon_shark__P98137, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31023,14 +31030,14 @@ function summon_shark__P46081_mk(s) {
   tmp_4: undefined,
 } }
 
-const _hex46892 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex46913 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex46924 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000000000000000000000000000000000cc000000f00f0000bcfc00f0bf0f0000bcbbffcfbb0f0000c0bbcbbcfb000000c0ddbbbc0f00000000ccbffc0000000000f0cffc0000000000cfccbc0c00000000cfccdc0c000000f0ccccbccd000000f0cccccccd000000f0ccccccdd0cff00cfbbcbcccdfccfffbfbbbbccccfbbfcbbcbbbbcbbffbdcbbbccbbbbbbbfddcbdbcbcbbbbdbfcc0cdcccbbcbbbb0fc0ccbcbc1b11fc0c00fcbcbb1111110c0000bffb1f1c110c0000bffb1fcc110c0000bfbb1113cc000000bfbb1133c3000000bfbb1bc1c1000000f0bb1bc1fc000000f0bbbbc10f00000000bfbcfb0000000000f0bb0f0000000000f0ff000000")
+const _hex98311 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex98332 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex98343 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000000000000000000000000000000000cc000000f00f0000bcfc00f0bf0f0000bcbbffcfbb0f0000c0bbcbbcfb000000c0ddbbbc0f00000000ccbffc0000000000f0cffc0000000000cfccbc0c00000000cfccdc0c000000f0ccccbccd000000f0cccccccd000000f0ccccccdd0cff00cfbbcbcccdfccfffbfbbbbccccfbbfcbbcbbbbcbbffbdcbbbccbbbbbbbfddcbdbcbcbbbbdbfcc0cdcccbbcbbbb0fc0ccbcbc1b11fc0c00fcbcbb1111110c0000bffb1f1c110c0000bffb1fcc110c0000bfbb1113cc000000bfbb1133c3000000bfbb1bc1c1000000f0bb1bc1fc000000f0bbbbc10f00000000bfbcfb0000000000f0bb0f0000000000f0ff000000")
 
 
 
 
-function game_runtime__P2548(s) {
+function game_runtime__P31967(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31040,8 +31047,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1225; s.pc = 1; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1182; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -31049,12 +31056,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_runtime__P2548.info = {"start":10291,"length":81,"line":332,"column":4,"endLine":334,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"runtime","argumentNames":[]}
+game_runtime__P31967.info = {"start":10291,"length":81,"line":332,"column":4,"endLine":334,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"runtime","argumentNames":[]}
 
-function game_runtime__P2548_mk(s) {
+function game_runtime__P31967_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_runtime__P2548, depth: s.depth + 1,
+        parent: s, fn: game_runtime__P31967, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31064,7 +31071,7 @@ function game_runtime__P2548_mk(s) {
 
 
 
-function blockSettings_writeNumber__P3749(s) {
+function blockSettings_writeNumber__P33283(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31079,22 +31086,22 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = settings_writeNumber__P1829_mk(s);
+    s.tmp_0 = settings_writeNumber__P31248_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 2093; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2098; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockSettings_writeNumber__P3749.info = {"start":401,"length":107,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"writeNumber","argumentNames":["name","value"]}
+blockSettings_writeNumber__P33283.info = {"start":401,"length":107,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"writeNumber","argumentNames":["name","value"]}
 
-function blockSettings_writeNumber__P3749_mk(s) {
+function blockSettings_writeNumber__P33283_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockSettings_writeNumber__P3749, depth: s.depth + 1,
+        parent: s, fn: blockSettings_writeNumber__P33283, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31105,7 +31112,7 @@ function blockSettings_writeNumber__P3749_mk(s) {
 
 
 
-function settings_writeNumber__P1829(s) {
+function settings_writeNumber__P31248(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31123,27 +31130,27 @@ switch (step) {
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
-    s.tmp_1 = settings_writeBuffer__P1827_mk(s);
+    s.tmp_1 = settings_writeBuffer__P31246_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = msgpack_packNumberArray__P177_mk(s);
+    s.tmp_2 = msgpack_packNumberArray__P29712_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
-    s.callLocIdx = 164; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 121; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 165; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 122; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeNumber__P1829.info = {"start":2087,"length":122,"line":82,"column":4,"endLine":84,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeNumber","argumentNames":["key","value"]}
+settings_writeNumber__P31248.info = {"start":2087,"length":122,"line":82,"column":4,"endLine":84,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeNumber","argumentNames":["key","value"]}
 
-function settings_writeNumber__P1829_mk(s) {
+function settings_writeNumber__P31248_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeNumber__P1829, depth: s.depth + 1,
+        parent: s, fn: settings_writeNumber__P31248, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31156,7 +31163,7 @@ function settings_writeNumber__P1829_mk(s) {
 
 
 
-function settings_writeBuffer__P1827(s) {
+function settings_writeBuffer__P31246(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31183,12 +31190,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeBuffer__P1827.info = {"start":1538,"length":290,"line":63,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeBuffer","argumentNames":["key","value"]}
+settings_writeBuffer__P31246.info = {"start":1538,"length":290,"line":63,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeBuffer","argumentNames":["key","value"]}
 
-function settings_writeBuffer__P1827_mk(s) {
+function settings_writeBuffer__P31246_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeBuffer__P1827, depth: s.depth + 1,
+        parent: s, fn: settings_writeBuffer__P31246, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31199,7 +31206,7 @@ function settings_writeBuffer__P1827_mk(s) {
 
 
 
-function msgpack_packNumberArray__P177(s) {
+function msgpack_packNumberArray__P29712(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31209,100 +31216,100 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.off___8282 = undefined;
-    s.n___8284 = undefined;
-    s.unnamed84___U2 = undefined;
-    s.unnamed85___U3 = undefined;
-    s.buf___8294 = undefined;
-    s.n___8300 = undefined;
-    s.unnamed86___U6 = undefined;
-    s.unnamed87___U7 = undefined;
+    s.off___37819 = undefined;
+    s.n___37821 = undefined;
+    s.unnamed924___U2 = undefined;
+    s.unnamed925___U3 = undefined;
+    s.buf___37831 = undefined;
+    s.n___37837 = undefined;
+    s.unnamed926___U6 = undefined;
+    s.unnamed927___U7 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.off___8282 = (0);
-    s.n___8284 = (undefined);
-    s.unnamed84___U2 = (s.arg0);
-    s.unnamed85___U3 = (0);
+    s.off___37819 = (0);
+    s.n___37821 = (undefined);
+    s.unnamed924___U2 = (s.arg0);
+    s.unnamed925___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed85___U3;
-    r0 = pxsim_Array__length(s.unnamed84___U2);
+    s.tmp_0 = r0 = s.unnamed925___U3;
+    r0 = pxsim_Array__length(s.unnamed924___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed84___U2, s.unnamed85___U3);
-    s.n___8284 = (r0);
-    s.tmp_2 = r0 = s.off___8282;
-    s.tmp_4 = msgpack_packNumberCore__P3973_mk(s);
+    r0 = pxsim_Array__getAt(s.unnamed924___U2, s.unnamed925___U3);
+    s.n___37821 = (r0);
+    s.tmp_2 = r0 = s.off___37819;
+    s.tmp_4 = msgpack_packNumberCore__P33508_mk(s);
     s.tmp_4.arg0 = null;
-    s.tmp_4.arg1 = s.off___8282;
-    s.tmp_4.arg2 = s.n___8284;
+    s.tmp_4.arg1 = s.off___37819;
+    s.tmp_4.arg2 = s.n___37821;
     s.callLocIdx = 23; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
-    s.off___8282 = (r0);
-    r0 = (s.unnamed85___U3 + 1);
-    s.unnamed85___U3 = (r0);
+    s.off___37819 = (r0);
+    r0 = (s.unnamed925___U3 + 1);
+    s.unnamed925___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed84___U2 = (undefined);
-    r0 = pxsim.control.createBuffer(s.off___8282);
-    s.buf___8294 = (r0);
-    s.off___8282 = (0);
-    s.n___8300 = (undefined);
-    s.unnamed86___U6 = (s.arg0);
-    s.unnamed87___U7 = (0);
+    s.unnamed924___U2 = (undefined);
+    r0 = pxsim.control.createBuffer(s.off___37819);
+    s.buf___37831 = (r0);
+    s.off___37819 = (0);
+    s.n___37837 = (undefined);
+    s.unnamed926___U6 = (s.arg0);
+    s.unnamed927___U7 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed87___U7;
-    r0 = pxsim_Array__length(s.unnamed86___U6);
+    s.tmp_0 = r0 = s.unnamed927___U7;
+    r0 = pxsim_Array__length(s.unnamed926___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed86___U6, s.unnamed87___U7);
-    s.n___8300 = (r0);
-    s.tmp_2 = r0 = s.off___8282;
-    s.tmp_4 = msgpack_packNumberCore__P3973_mk(s);
-    s.tmp_4.arg0 = s.buf___8294;
-    s.tmp_4.arg1 = s.off___8282;
-    s.tmp_4.arg2 = s.n___8300;
+    r0 = pxsim_Array__getAt(s.unnamed926___U6, s.unnamed927___U7);
+    s.n___37837 = (r0);
+    s.tmp_2 = r0 = s.off___37819;
+    s.tmp_4 = msgpack_packNumberCore__P33508_mk(s);
+    s.tmp_4.arg0 = s.buf___37831;
+    s.tmp_4.arg1 = s.off___37819;
+    s.tmp_4.arg2 = s.n___37837;
     s.callLocIdx = 24; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
-    s.off___8282 = (r0);
-    r0 = (s.unnamed87___U7 + 1);
-    s.unnamed87___U7 = (r0);
+    s.off___37819 = (r0);
+    r0 = (s.unnamed927___U7 + 1);
+    s.unnamed927___U7 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed86___U6 = (undefined);
-    r0 = s.buf___8294;
+    s.unnamed926___U6 = (undefined);
+    r0 = s.buf___37831;
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_packNumberArray__P177.info = {"start":3427,"length":330,"line":117,"column":4,"endLine":128,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"packNumberArray","argumentNames":["nums"]}
+msgpack_packNumberArray__P29712.info = {"start":3427,"length":330,"line":117,"column":4,"endLine":128,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"packNumberArray","argumentNames":["nums"]}
 
-function msgpack_packNumberArray__P177_mk(s) {
+function msgpack_packNumberArray__P29712_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_packNumberArray__P177, depth: s.depth + 1,
+        parent: s, fn: msgpack_packNumberArray__P29712, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  off___8282: undefined,
-  n___8284: undefined,
-  unnamed84___U2: undefined,
-  unnamed85___U3: undefined,
-  buf___8294: undefined,
-  n___8300: undefined,
-  unnamed86___U6: undefined,
-  unnamed87___U7: undefined,
+  off___37819: undefined,
+  n___37821: undefined,
+  unnamed924___U2: undefined,
+  unnamed925___U3: undefined,
+  buf___37831: undefined,
+  n___37837: undefined,
+  unnamed926___U6: undefined,
+  unnamed927___U7: undefined,
   arg0: undefined,
 } }
 
@@ -31310,7 +31317,7 @@ function msgpack_packNumberArray__P177_mk(s) {
 
 
 
-function msgpack_packNumberCore__P3973(s) {
+function msgpack_packNumberCore__P33508(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31320,15 +31327,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tag___8314 = undefined;
-    s.fmt___8357 = undefined;
+    s.tag___37851 = undefined;
+    s.fmt___37894 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tag___8314 = (203);
+    s.tag___37851 = (203);
     s.tmp_1 = r0 = s.arg2;
     r0 = (s.arg2 << 0);
     s.tmp_2 = r0;
@@ -31378,17 +31385,17 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 8; continue; }
-    s.tag___8314 = (204);
+    s.tag___37851 = (204);
     { step = 11; continue; }
   case 8:
     r0 = (s.arg2 <= 65535);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tag___8314 = (205);
+    s.tag___37851 = (205);
     { step = 10; continue; }
   case 9:
-    s.tag___8314 = (206);
+    s.tag___37851 = (206);
   case 10:
   case 11:
     { step = 17; continue; }
@@ -31397,41 +31404,41 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    s.tag___8314 = (208);
+    s.tag___37851 = (208);
     { step = 16; continue; }
   case 13:
     r0 = (-32767 <= s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tag___8314 = (209);
+    s.tag___37851 = (209);
     { step = 15; continue; }
   case 14:
-    s.tag___8314 = (210);
+    s.tag___37851 = (210);
   case 15:
   case 16:
   case 17:
   case 18:
   case 19:
   case 20:
-    s.tmp_0 = msgpack_tagFormat__P3972_mk(s);
-    s.tmp_0.arg0 = s.tag___8314;
+    s.tmp_0 = msgpack_tagFormat__P33507_mk(s);
+    s.tmp_0.arg0 = s.tag___37851;
     s.callLocIdx = 19; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.fmt___8357 = (r0);
+    s.fmt___37894 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 21; continue; }
-    r0 = pxsim.BufferMethods.setByte(s.arg0, s.arg1, s.tag___8314);
+    r0 = pxsim.BufferMethods.setByte(s.arg0, s.arg1, s.tag___37851);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.fmt___8357;
+    s.tmp_1 = r0 = s.fmt___37894;
     r0 = (s.arg1 + 1);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.setNumber(s.tmp_0, s.tmp_1, s.tmp_2, s.arg2);
   case 21:
   case 22:
-    s.tmp_1 = pins_sizeOf__P168_mk(s);
-    s.tmp_1.arg0 = s.fmt___8357;
+    s.tmp_1 = pins_sizeOf__P29703_mk(s);
+    s.tmp_1.arg0 = s.fmt___37894;
     s.callLocIdx = 20; s.pc = 25; return s.tmp_1;
   case 25:
     r0 = s.retval;
@@ -31441,12 +31448,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_packNumberCore__P3973.info = {"start":1632,"length":951,"line":56,"column":4,"endLine":86,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"packNumberCore","argumentNames":["buf","offset","num"]}
+msgpack_packNumberCore__P33508.info = {"start":1632,"length":951,"line":56,"column":4,"endLine":86,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"packNumberCore","argumentNames":["buf","offset","num"]}
 
-function msgpack_packNumberCore__P3973_mk(s) {
+function msgpack_packNumberCore__P33508_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_packNumberCore__P3973, depth: s.depth + 1,
+        parent: s, fn: msgpack_packNumberCore__P33508, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31456,8 +31463,8 @@ function msgpack_packNumberCore__P3973_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  tag___8314: undefined,
-  fmt___8357: undefined,
+  tag___37851: undefined,
+  fmt___37894: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -31467,7 +31474,7 @@ function msgpack_packNumberCore__P3973_mk(s) {
 
 
 
-function msgpack_tagFormat__P3972(s) {
+function msgpack_tagFormat__P33507(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31527,12 +31534,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_tagFormat__P3972.info = {"start":1145,"length":481,"line":42,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"tagFormat","argumentNames":["tag"]}
+msgpack_tagFormat__P33507.info = {"start":1145,"length":481,"line":42,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"tagFormat","argumentNames":["tag"]}
 
-function msgpack_tagFormat__P3972_mk(s) {
+function msgpack_tagFormat__P33507_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_tagFormat__P3972, depth: s.depth + 1,
+        parent: s, fn: msgpack_tagFormat__P33507, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31542,7 +31549,7 @@ function msgpack_tagFormat__P3972_mk(s) {
 
 
 
-function pins_sizeOf__P168(s) {
+function pins_sizeOf__P29703(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31556,7 +31563,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Buffer_sizeOfNumberFormat__P204_mk(s);
+    s.tmp_0 = Buffer_sizeOfNumberFormat__P29739_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 18; s.pc = 1; return s.tmp_0;
   case 1:
@@ -31564,12 +31571,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pins_sizeOf__P168.info = {"start":42,"length":101,"line":2,"column":4,"endLine":4,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"sizeOf","argumentNames":["format"]}
+pins_sizeOf__P29703.info = {"start":42,"length":101,"line":2,"column":4,"endLine":4,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"sizeOf","argumentNames":["format"]}
 
-function pins_sizeOf__P168_mk(s) {
+function pins_sizeOf__P29703_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pins_sizeOf__P168, depth: s.depth + 1,
+        parent: s, fn: pins_sizeOf__P29703, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31579,7 +31586,7 @@ function pins_sizeOf__P168_mk(s) {
 
 
 
-function Buffer_sizeOfNumberFormat__P204(s) {
+function Buffer_sizeOfNumberFormat__P29739(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31658,12 +31665,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Buffer_sizeOfNumberFormat__P204.info = {"start":12467,"length":856,"line":427,"column":4,"endLine":451,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"sizeOfNumberFormat","argumentNames":["format"]}
+Buffer_sizeOfNumberFormat__P29739.info = {"start":12467,"length":856,"line":427,"column":4,"endLine":451,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"sizeOfNumberFormat","argumentNames":["format"]}
 
-function Buffer_sizeOfNumberFormat__P204_mk(s) {
+function Buffer_sizeOfNumberFormat__P29739_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Buffer_sizeOfNumberFormat__P204, depth: s.depth + 1,
+        parent: s, fn: Buffer_sizeOfNumberFormat__P29739, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31673,7 +31680,7 @@ function Buffer_sizeOfNumberFormat__P204_mk(s) {
 
 
 
-function fade_in__P46020(s) {
+function fade_in__P98017(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31683,14 +31690,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = color_startFade__P3570_mk(s);
-    s.tmp_0.arg0 = globals.originalPalette___3574;
-    s.tmp_0.arg1 = globals.Black___3585;
+    s.tmp_0 = color_startFade__P33104_mk(s);
+    s.tmp_0.arg0 = globals.originalPalette___33108;
+    s.tmp_0.arg1 = globals.Black___33119;
     s.tmp_0.arg2 = 2000;
     s.callLocIdx = 136; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = color_pauseUntilFadeDone__P3572_mk(s);
+    s.tmp_0 = color_pauseUntilFadeDone__P33106_mk(s);
     s.callLocIdx = 137; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
@@ -31698,12 +31705,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-fade_in__P46020.info = {"start":8857,"length":116,"line":229,"column":0,"endLine":232,"endColumn":1,"fileName":"main.ts","functionName":"fade_in","argumentNames":[]}
+fade_in__P98017.info = {"start":8857,"length":116,"line":229,"column":0,"endLine":232,"endColumn":1,"fileName":"main.ts","functionName":"fade_in","argumentNames":[]}
 
-function fade_in__P46020_mk(s) {
+function fade_in__P98017_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: fade_in__P46020, depth: s.depth + 1,
+        parent: s, fn: fade_in__P98017, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -31712,7 +31719,7 @@ function fade_in__P46020_mk(s) {
 
 
 
-function color_pauseUntilFadeDone__P3572(s) {
+function color_pauseUntilFadeDone__P33106(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31722,11 +31729,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.activeFade___5983);
+    r0 = pxsim_numops_toBoolDecr(globals.activeFade___35505);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = color_Fade_pauseUntilDone__P3565_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___5983;
-    s.callLocIdx = 1744; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = color_Fade_pauseUntilDone__P33099_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___35505;
+    s.callLocIdx = 1749; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
@@ -31735,12 +31742,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_pauseUntilFadeDone__P3572.info = {"start":7302,"length":121,"line":258,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilFadeDone","argumentNames":[]}
+color_pauseUntilFadeDone__P33106.info = {"start":7302,"length":121,"line":258,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilFadeDone","argumentNames":[]}
 
-function color_pauseUntilFadeDone__P3572_mk(s) {
+function color_pauseUntilFadeDone__P33106_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_pauseUntilFadeDone__P3572, depth: s.depth + 1,
+        parent: s, fn: color_pauseUntilFadeDone__P33106, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -31749,7 +31756,7 @@ function color_pauseUntilFadeDone__P3572_mk(s) {
 
 
 
-function color_Fade_pauseUntilDone__P3565(s) {
+function color_Fade_pauseUntilDone__P33099(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31764,26 +31771,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P19986);
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P49482);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = pauseUntil__P356_mk(s);
+    s.tmp_1 = pauseUntil__P29891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1730; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1735; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.arg0;
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_pauseUntilDone__P3565.info = {"start":2872,"length":114,"line":102,"column":8,"endLine":105,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilDone","argumentNames":["this"]}
+color_Fade_pauseUntilDone__P33099.info = {"start":2872,"length":114,"line":102,"column":8,"endLine":105,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilDone","argumentNames":["this"]}
 
-function color_Fade_pauseUntilDone__P3565_mk(s) {
+function color_Fade_pauseUntilDone__P33099_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_pauseUntilDone__P3565, depth: s.depth + 1,
+        parent: s, fn: color_Fade_pauseUntilDone__P33099, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31794,7 +31801,7 @@ function color_Fade_pauseUntilDone__P3565_mk(s) {
 
 
 
-function inline__P19986(s) {
+function inline__P49482(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31804,9 +31811,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_2 = color_Fade_isActive__P3555_mk(s);
+    s.tmp_2 = color_Fade_isActive__P33089_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 1729; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1734; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -31816,12 +31823,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P19986.info = {"start":2927,"length":22,"line":103,"column":23,"endLine":103,"endColumn":45,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P49482.info = {"start":2927,"length":22,"line":103,"column":23,"endLine":103,"endColumn":45,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P19986_mk(s) {
+function inline__P49482_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P19986, depth: s.depth + 1,
+        parent: s, fn: inline__P49482, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31832,7 +31839,7 @@ function inline__P19986_mk(s) {
 
 
 
-function color_Fade_isActive__P3555(s) {
+function color_Fade_isActive__P33089(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31847,7 +31854,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
     r0 = s.arg0.fields["startTime"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
@@ -31874,8 +31881,8 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
-    s.tmp_8 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 1711; s.pc = 5; return s.tmp_8;
+    s.tmp_8 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 1716; s.pc = 5; return s.tmp_8;
   case 5:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -31887,12 +31894,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_isActive__P3555.info = {"start":623,"length":201,"line":23,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"isActive","argumentNames":["this"]}
+color_Fade_isActive__P33089.info = {"start":623,"length":201,"line":23,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"isActive","argumentNames":["this"]}
 
-function color_Fade_isActive__P3555_mk(s) {
+function color_Fade_isActive__P33089_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_isActive__P3555, depth: s.depth + 1,
+        parent: s, fn: color_Fade_isActive__P33089, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31911,7 +31918,7 @@ function color_Fade_isActive__P3555_mk(s) {
 
 
 
-function color_bufferToPalette__P3544(s) {
+function color_bufferToPalette__P33078(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31921,40 +31928,40 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___20013 = undefined;
+    s.p___49509 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C33064_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P33027_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = pxsim.BufferMethods.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 3);
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1694; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1699; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.p___20013 = (s.tmp_0);
-    r0 = (s.p___20013).fields["buf"] = (s.arg0);
-    r0 = s.p___20013;
+    s.p___49509 = (s.tmp_0);
+    r0 = (s.p___49509).fields["buf"] = (s.arg0);
+    r0 = s.p___49509;
     return leave(s, r0)
   default: oops()
 } } }
-color_bufferToPalette__P3544.info = {"start":10280,"length":147,"line":335,"column":4,"endLine":339,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"bufferToPalette","argumentNames":["buf"]}
+color_bufferToPalette__P33078.info = {"start":10280,"length":147,"line":335,"column":4,"endLine":339,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"bufferToPalette","argumentNames":["buf"]}
 
-function color_bufferToPalette__P3544_mk(s) {
+function color_bufferToPalette__P33078_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_bufferToPalette__P3544, depth: s.depth + 1,
+        parent: s, fn: color_bufferToPalette__P33078, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  p___20013: undefined,
+  p___49509: undefined,
   arg0: undefined,
 } }
 
@@ -31962,7 +31969,7 @@ function color_bufferToPalette__P3544_mk(s) {
 
 
 
-function color_ColorBuffer_constructor__P3493(s) {
+function color_ColorBuffer_constructor__P33027(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31979,7 +31986,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C33024_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -31994,9 +32001,9 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 | 0);
     s.tmp_3 = r0;
-    s.tmp_5 = color_ColorBuffer_stride__P3495_mk(s);
+    s.tmp_5 = color_ColorBuffer_stride__P33029_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1683; s.pc = 3; return s.tmp_5;
+    s.callLocIdx = 1688; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -32009,12 +32016,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_constructor__P3493.info = {"start":338,"length":199,"line":19,"column":8,"endLine":22,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"inline","argumentNames":["this","length","layout"]}
+color_ColorBuffer_constructor__P33027.info = {"start":338,"length":199,"line":19,"column":8,"endLine":22,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"inline","argumentNames":["this","length","layout"]}
 
-function color_ColorBuffer_constructor__P3493_mk(s) {
+function color_ColorBuffer_constructor__P33027_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_constructor__P3493, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_constructor__P33027, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32031,7 +32038,7 @@ function color_ColorBuffer_constructor__P3493_mk(s) {
 
 
 
-function color_ColorBuffer_stride__P3495(s) {
+function color_ColorBuffer_stride__P33029(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32046,7 +32053,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C33024_VT)) failedCast(r0);
     r0 = s.arg0.fields["layout"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
@@ -32064,13 +32071,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_stride__P3495.info = {"start":737,"length":89,"line":30,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"stride","argumentNames":["this"]}
-color_ColorBuffer_stride__P3495.isGetter = true;
+color_ColorBuffer_stride__P33029.info = {"start":737,"length":89,"line":30,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"stride","argumentNames":["this"]}
+color_ColorBuffer_stride__P33029.isGetter = true;
 
-function color_ColorBuffer_stride__P3495_mk(s) {
+function color_ColorBuffer_stride__P33029_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_stride__P3495, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_stride__P33029, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32082,7 +32089,7 @@ function color_ColorBuffer_stride__P3495_mk(s) {
 
 
 
-function color_startFade__P3570(s) {
+function color_startFade__P33104(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32118,15 +32125,15 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 4; continue; }
   case 3:
-    s.tmp_5 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_5 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1738; s.pc = 8; return s.tmp_5;
+    s.callLocIdx = 1743; s.pc = 8; return s.tmp_5;
   case 8:
     r0 = s.retval;
     s.tmp_4 = r0;
-    s.tmp_7 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_7 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_7.arg0 = s.arg1;
-    s.callLocIdx = 1739; s.pc = 9; return s.tmp_7;
+    s.callLocIdx = 1744; s.pc = 9; return s.tmp_7;
   case 9:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -32139,26 +32146,26 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    r0 = pxsim_pxtcore_mkClassInstance(color_Fade__C3551_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Fade__C33085_VT);
     s.tmp_9 = r0;
     r0 = undefined;
-    globals.activeFade___5983 = (s.tmp_9);
-    s.tmp_0 = color_Fade_setStartPalette__P3559_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___5983;
+    globals.activeFade___35505 = (s.tmp_9);
+    s.tmp_0 = color_Fade_setStartPalette__P33093_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___35505;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1741; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1746; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = color_Fade_setEndPalette__P3561_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___5983;
+    s.tmp_0 = color_Fade_setEndPalette__P33095_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___35505;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1742; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1747; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = color_Fade_start__P3556_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___5983;
+    s.tmp_0 = color_Fade_start__P33090_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___35505;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1743; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1748; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
   case 7:
@@ -32166,12 +32173,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_startFade__P3570.info = {"start":6657,"length":310,"line":238,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startFade","argumentNames":["start","end","duration"]}
+color_startFade__P33104.info = {"start":6657,"length":310,"line":238,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startFade","argumentNames":["start","end","duration"]}
 
-function color_startFade__P3570_mk(s) {
+function color_startFade__P33104_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_startFade__P3570, depth: s.depth + 1,
+        parent: s, fn: color_startFade__P33104, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32192,7 +32199,7 @@ function color_startFade__P3570_mk(s) {
 
 
 
-function color_Fade_setEndPalette__P3561(s) {
+function color_Fade_setEndPalette__P33095(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32208,11 +32215,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = color__clone__P3549_mk(s);
+    s.tmp_2 = color__clone__P33083_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 1717; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1722; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -32221,12 +32228,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_setEndPalette__P3561.info = {"start":1647,"length":127,"line":59,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setEndPalette","argumentNames":["this","colors"]}
+color_Fade_setEndPalette__P33095.info = {"start":1647,"length":127,"line":59,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setEndPalette","argumentNames":["this","colors"]}
 
-function color_Fade_setEndPalette__P3561_mk(s) {
+function color_Fade_setEndPalette__P33095_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_setEndPalette__P3561, depth: s.depth + 1,
+        parent: s, fn: color_Fade_setEndPalette__P33095, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32239,7 +32246,7 @@ function color_Fade_setEndPalette__P3561_mk(s) {
 
 
 
-function color__clone__P3549(s) {
+function color__clone__P33083(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32249,33 +32256,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.out___20113 = undefined;
-    s.i___20119 = undefined;
+    s.out___49609 = undefined;
+    s.i___49615 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C33064_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P33027_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_2 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1705; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1710; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1706; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1711; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.out___20113 = (s.tmp_0);
-    s.i___20119 = (0);
+    s.out___49609 = (s.tmp_0);
+    s.i___49615 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___20119;
-    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_1 = r0 = s.i___49615;
+    s.tmp_3 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1707; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1712; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32283,33 +32290,33 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_4 = color_ColorBuffer_setColor__P3498_mk(s);
-    s.tmp_4.arg0 = s.out___20113;
-    s.tmp_4.arg1 = s.i___20119;
-    s.tmp_5 = color_ColorBuffer_color__P3497_mk(s);
+    s.tmp_4 = color_ColorBuffer_setColor__P33032_mk(s);
+    s.tmp_4.arg0 = s.out___49609;
+    s.tmp_4.arg1 = s.i___49615;
+    s.tmp_5 = color_ColorBuffer_color__P33031_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.tmp_5.arg1 = s.i___20119;
-    s.callLocIdx = 1708; s.pc = 7; return s.tmp_5;
+    s.tmp_5.arg1 = s.i___49615;
+    s.callLocIdx = 1713; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
     s.tmp_4.arg2 = r0;
-    s.callLocIdx = 1709; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1714; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    r0 = (s.i___20119 + 1);
-    s.i___20119 = (r0);
+    r0 = (s.i___49615 + 1);
+    s.i___49615 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.out___20113;
+    r0 = s.out___49609;
     return leave(s, r0)
   default: oops()
 } } }
-color__clone__P3549.info = {"start":12453,"length":200,"line":408,"column":4,"endLine":414,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"_clone","argumentNames":["p"]}
+color__clone__P33083.info = {"start":12453,"length":200,"line":408,"column":4,"endLine":414,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"_clone","argumentNames":["p"]}
 
-function color__clone__P3549_mk(s) {
+function color__clone__P33083_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color__clone__P3549, depth: s.depth + 1,
+        parent: s, fn: color__clone__P33083, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32317,8 +32324,8 @@ function color__clone__P3549_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  out___20113: undefined,
-  i___20119: undefined,
+  out___49609: undefined,
+  i___49615: undefined,
   arg0: undefined,
 } }
 
@@ -32326,7 +32333,7 @@ function color__clone__P3549_mk(s) {
 
 
 
-function color_ColorBuffer_setColor__P3498(s) {
+function color_ColorBuffer_setColor__P33032(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32336,9 +32343,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___20188 = undefined;
-    s.start___20190 = undefined;
-    s.i___20194 = undefined;
+    s.s___49684 = undefined;
+    s.start___49686 = undefined;
+    s.i___49690 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -32346,7 +32353,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C33024_VT)) failedCast(r0);
     r0 = (s.arg1 | 0);
     s.arg1 = (r0);
     r0 = (s.arg1 < 0);
@@ -32357,9 +32364,9 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_3 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1687; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 1692; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32372,32 +32379,32 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_5 = color_ColorBuffer_stride__P3495_mk(s);
+    s.tmp_5 = color_ColorBuffer_stride__P33029_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1688; s.pc = 9; return s.tmp_5;
+    s.callLocIdx = 1693; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
-    s.s___20188 = (r0);
-    r0 = (s.arg1 * s.s___20188);
-    s.start___20190 = (r0);
-    r0 = (s.s___20188 - 1);
-    s.i___20194 = (r0);
+    s.s___49684 = (r0);
+    r0 = (s.arg1 * s.s___49684);
+    s.start___49686 = (r0);
+    r0 = (s.s___49684 - 1);
+    s.i___49690 = (r0);
   case 5:
-    r0 = (s.i___20194 >= 0);
+    r0 = (s.i___49690 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
     r0 = s.arg0.fields["buf"];
     s.tmp_1 = r0;
-    r0 = (s.start___20190 + s.i___20194);
+    r0 = (s.start___49686 + s.i___49690);
     s.tmp_2 = r0;
     r0 = (s.arg2 & 255);
     s.tmp_3 = r0;
     r0 = pxsim.BufferMethods.setByte(s.tmp_1, s.tmp_2, s.tmp_3);
     r0 = (s.arg2 >> 8);
     s.arg2 = (r0);
-    r0 = (s.i___20194 - 1);
-    s.i___20194 = (r0);
+    r0 = (s.i___49690 - 1);
+    s.i___49690 = (r0);
     { step = 5; continue; }
   case 6:
   case 7:
@@ -32405,12 +32412,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_setColor__P3498.info = {"start":1308,"length":362,"line":51,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"setColor","argumentNames":["this","index","color"]}
+color_ColorBuffer_setColor__P33032.info = {"start":1308,"length":362,"line":51,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"setColor","argumentNames":["this","index","color"]}
 
-function color_ColorBuffer_setColor__P3498_mk(s) {
+function color_ColorBuffer_setColor__P33032_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_setColor__P3498, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_setColor__P33032, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32418,9 +32425,9 @@ function color_ColorBuffer_setColor__P3498_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  s___20188: undefined,
-  start___20190: undefined,
-  i___20194: undefined,
+  s___49684: undefined,
+  start___49686: undefined,
+  i___49690: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -32430,7 +32437,7 @@ function color_ColorBuffer_setColor__P3498_mk(s) {
 
 
 
-function color_ColorBuffer_color__P3497(s) {
+function color_ColorBuffer_color__P33031(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32440,17 +32447,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___20148 = undefined;
-    s.start___20150 = undefined;
-    s.c___20154 = undefined;
-    s.i___20155 = undefined;
+    s.s___49644 = undefined;
+    s.start___49646 = undefined;
+    s.c___49650 = undefined;
+    s.i___49651 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C33024_VT)) failedCast(r0);
     r0 = (s.arg1 | 0);
     s.arg1 = (r0);
     r0 = (s.arg1 < 0);
@@ -32461,9 +32468,9 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_3 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1685; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 1690; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32477,48 +32484,48 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_5 = color_ColorBuffer_stride__P3495_mk(s);
+    s.tmp_5 = color_ColorBuffer_stride__P33029_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1686; s.pc = 9; return s.tmp_5;
+    s.callLocIdx = 1691; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
-    s.s___20148 = (r0);
-    r0 = (s.arg1 * s.s___20148);
-    s.start___20150 = (r0);
-    s.c___20154 = (0);
-    s.i___20155 = (0);
+    s.s___49644 = (r0);
+    r0 = (s.arg1 * s.s___49644);
+    s.start___49646 = (r0);
+    s.c___49650 = (0);
+    s.i___49651 = (0);
   case 5:
-    r0 = (s.i___20155 < s.s___20148);
+    r0 = (s.i___49651 < s.s___49644);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    r0 = (s.c___20154 << 8);
+    r0 = (s.c___49650 << 8);
     s.tmp_1 = r0;
     r0 = s.arg0.fields["buf"];
     s.tmp_4 = r0;
-    r0 = (s.start___20150 + s.i___20155);
+    r0 = (s.start___49646 + s.i___49651);
     s.tmp_5 = r0;
     r0 = pxsim.BufferMethods.getByte(s.tmp_4, s.tmp_5);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 255);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 | s.tmp_2);
-    s.c___20154 = (r0);
-    r0 = (s.i___20155 + 1);
-    s.i___20155 = (r0);
+    s.c___49650 = (r0);
+    r0 = (s.i___49651 + 1);
+    s.i___49651 = (r0);
     { step = 5; continue; }
   case 6:
-    r0 = s.c___20154;
+    r0 = s.c___49650;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_color__P3497.info = {"start":930,"length":368,"line":38,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"color","argumentNames":["this","index"]}
+color_ColorBuffer_color__P33031.info = {"start":930,"length":368,"line":38,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"color","argumentNames":["this","index"]}
 
-function color_ColorBuffer_color__P3497_mk(s) {
+function color_ColorBuffer_color__P33031_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_color__P3497, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_color__P33031, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32526,10 +32533,10 @@ function color_ColorBuffer_color__P3497_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  s___20148: undefined,
-  start___20150: undefined,
-  c___20154: undefined,
-  i___20155: undefined,
+  s___49644: undefined,
+  start___49646: undefined,
+  c___49650: undefined,
+  i___49651: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -32538,7 +32545,7 @@ function color_ColorBuffer_color__P3497_mk(s) {
 
 
 
-function color_Fade_setStartPalette__P3559(s) {
+function color_Fade_setStartPalette__P33093(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32554,11 +32561,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = color__clone__P3549_mk(s);
+    s.tmp_2 = color__clone__P33083_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 1716; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1721; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -32567,12 +32574,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_setStartPalette__P3559.info = {"start":1352,"length":131,"line":49,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setStartPalette","argumentNames":["this","colors"]}
+color_Fade_setStartPalette__P33093.info = {"start":1352,"length":131,"line":49,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setStartPalette","argumentNames":["this","colors"]}
 
-function color_Fade_setStartPalette__P3559_mk(s) {
+function color_Fade_setStartPalette__P33093_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_setStartPalette__P3559, depth: s.depth + 1,
+        parent: s, fn: color_Fade_setStartPalette__P33093, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32585,7 +32592,7 @@ function color_Fade_setStartPalette__P3559_mk(s) {
 
 
 
-function color_Fade_start__P3556(s) {
+function color_Fade_start__P33090(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32601,43 +32608,43 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
-    s.tmp_0 = color_init__P6037_mk(s);
-    s.callLocIdx = 1712; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
+    s.tmp_0 = color_init__P35559_mk(s);
+    s.callLocIdx = 1717; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["duration"] = (s.arg1);
-    s.tmp_0 = color_setPalette__P3535_mk(s);
-    s.tmp_1 = color_Fade_startPalette__P3553_mk(s);
+    s.tmp_0 = color_setPalette__P33069_mk(s);
+    s.tmp_1 = color_Fade_startPalette__P33087_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1713; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1718; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
     s.tmp_0.arg3 = 0;
-    s.callLocIdx = 1714; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1719; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 1715; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 1720; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["startTime"] = (s.tmp_1);
-    globals.activeFade___5983 = (s.arg0);
+    globals.activeFade___35505 = (s.arg0);
     r0 = s.arg0;
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_start__P3556.info = {"start":834,"length":258,"line":29,"column":8,"endLine":37,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"start","argumentNames":["this","duration"]}
+color_Fade_start__P33090.info = {"start":834,"length":258,"line":29,"column":8,"endLine":37,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"start","argumentNames":["this","duration"]}
 
-function color_Fade_start__P3556_mk(s) {
+function color_Fade_start__P33090_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_start__P3556, depth: s.depth + 1,
+        parent: s, fn: color_Fade_start__P33090, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32650,7 +32657,7 @@ function color_Fade_start__P3556_mk(s) {
 
 
 
-function color_init__P6037(s) {
+function color_init__P35559(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32660,34 +32667,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.currentScene___5984);
+    r0 = pxsim_numops_toBoolDecr(globals.currentScene___35506);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = game_forever__P2545_mk(s);
-    s.tmp_2.arg0 = inline__P20277;
-    s.callLocIdx = 1736; s.pc = 3; return s.tmp_2;
+    s.tmp_2 = game_forever__P31964_mk(s);
+    s.tmp_2.arg0 = inline__P49773;
+    s.callLocIdx = 1741; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1737; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1742; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    globals.currentScene___5984 = (r0);
+    globals.currentScene___35506 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_init__P6037.info = {"start":6049,"length":374,"line":217,"column":4,"endLine":230,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"init","argumentNames":[]}
+color_init__P35559.info = {"start":6049,"length":374,"line":217,"column":4,"endLine":230,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"init","argumentNames":[]}
 
-function color_init__P6037_mk(s) {
+function color_init__P35559_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_init__P6037, depth: s.depth + 1,
+        parent: s, fn: color_init__P35559, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32698,7 +32705,7 @@ function color_init__P6037_mk(s) {
 
 
 
-function inline__P20277(s) {
+function inline__P49773(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32708,18 +32715,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.finished___20279 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.activeFade___5983);
+    s.finished___49775 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.activeFade___35505);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = color_Fade_step__P3563_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___5983;
-    s.callLocIdx = 1735; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = color_Fade_step__P33097_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___35505;
+    s.callLocIdx = 1740; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.finished___20279 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.finished___20279);
+    s.finished___49775 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.finished___49775);
     if (!r0) { step = 1; continue; }
-    globals.activeFade___5983 = (undefined);
+    globals.activeFade___35505 = (undefined);
   case 1:
   case 2:
   case 3:
@@ -32728,22 +32735,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P20277.info = {"start":6121,"length":236,"line":219,"column":25,"endLine":227,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P49773.info = {"start":6121,"length":236,"line":219,"column":25,"endLine":227,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P20277_mk(s) {
+function inline__P49773_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P20277, depth: s.depth + 1,
+        parent: s, fn: inline__P49773, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  finished___20279: undefined,
+  finished___49775: undefined,
 } }
 
 
 
 
 
-function color_Fade_step__P3563(s) {
+function color_Fade_step__P33097(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32753,16 +32760,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.time___20307 = undefined;
-    s.p___20313 = undefined;
-    s.i___20320 = undefined;
-    s.col___20326 = undefined;
+    s.time___49803 = undefined;
+    s.p___49809 = undefined;
+    s.i___49816 = undefined;
+    s.col___49822 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
     r0 = s.arg0.fields["_endPalette"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -32786,9 +32793,9 @@ switch (step) {
     { step = 9; continue; }
   case 3:
   case 4:
-    s.tmp_8 = color_Fade_isActive__P3555_mk(s);
+    s.tmp_8 = color_Fade_isActive__P33089_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1718; s.pc = 10; return s.tmp_8;
+    s.callLocIdx = 1723; s.pc = 10; return s.tmp_8;
   case 10:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -32798,13 +32805,13 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
-    s.tmp_9 = color_setPalette__P3535_mk(s);
+    s.tmp_9 = color_setPalette__P33069_mk(s);
     r0 = s.arg0.fields["_endPalette"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = 0;
     s.tmp_9.arg2 = 0;
     s.tmp_9.arg3 = 0;
-    s.callLocIdx = 1719; s.pc = 11; return s.tmp_9;
+    s.callLocIdx = 1724; s.pc = 11; return s.tmp_9;
   case 11:
     r0 = s.retval;
     r0 = (s.arg0).fields["startTime"] = (undefined);
@@ -32812,37 +32819,37 @@ switch (step) {
     { step = 9; continue; }
   case 5:
   case 6:
-    s.tmp_1 = game_runtime__P2548_mk(s);
-    s.callLocIdx = 1720; s.pc = 12; return s.tmp_1;
+    s.tmp_1 = game_runtime__P31967_mk(s);
+    s.callLocIdx = 1725; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = s.arg0.fields["startTime"];
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.time___20307 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
+    s.time___49803 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C33064_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P33027_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_2 = color_ColorBuffer_length__P33030_mk(s);
     r0 = s.arg0.fields["_startPalette"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1721; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 1726; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1722; s.pc = 13; return s.tmp_1;
+    s.callLocIdx = 1727; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    s.p___20313 = (s.tmp_0);
-    s.i___20320 = (0);
+    s.p___49809 = (s.tmp_0);
+    s.i___49816 = (0);
   case 7:
-    s.tmp_1 = r0 = s.i___20320;
-    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
-    s.tmp_3.arg0 = s.p___20313;
-    s.callLocIdx = 1723; s.pc = 15; return s.tmp_3;
+    s.tmp_1 = r0 = s.i___49816;
+    s.tmp_3 = color_ColorBuffer_length__P33030_mk(s);
+    s.tmp_3.arg0 = s.p___49809;
+    s.callLocIdx = 1728; s.pc = 15; return s.tmp_3;
   case 15:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32850,48 +32857,48 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_4 = color_partialColorTransition__P3546_mk(s);
-    s.tmp_5 = color_ColorBuffer_color__P3497_mk(s);
+    s.tmp_4 = color_partialColorTransition__P33080_mk(s);
+    s.tmp_5 = color_ColorBuffer_color__P33031_mk(s);
     r0 = s.arg0.fields["_startPalette"];
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = s.i___20320;
-    s.callLocIdx = 1724; s.pc = 17; return s.tmp_5;
+    s.tmp_5.arg1 = s.i___49816;
+    s.callLocIdx = 1729; s.pc = 17; return s.tmp_5;
   case 17:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.tmp_6 = color_ColorBuffer_color__P3497_mk(s);
+    s.tmp_6 = color_ColorBuffer_color__P33031_mk(s);
     r0 = s.arg0.fields["_endPalette"];
     s.tmp_6.arg0 = r0;
-    s.tmp_6.arg1 = s.i___20320;
-    s.callLocIdx = 1725; s.pc = 18; return s.tmp_6;
+    s.tmp_6.arg1 = s.i___49816;
+    s.callLocIdx = 1730; s.pc = 18; return s.tmp_6;
   case 18:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
     r0 = s.arg0.fields["duration"];
     s.tmp_7 = r0;
-    r0 = (s.time___20307 / s.tmp_7);
+    r0 = (s.time___49803 / s.tmp_7);
     s.tmp_4.arg2 = r0;
-    s.callLocIdx = 1726; s.pc = 16; return s.tmp_4;
+    s.callLocIdx = 1731; s.pc = 16; return s.tmp_4;
   case 16:
     r0 = s.retval;
-    s.col___20326 = (r0);
-    s.tmp_0 = color_ColorBuffer_setColor__P3498_mk(s);
-    s.tmp_0.arg0 = s.p___20313;
-    s.tmp_0.arg1 = s.i___20320;
-    s.tmp_0.arg2 = s.col___20326;
-    s.callLocIdx = 1727; s.pc = 19; return s.tmp_0;
+    s.col___49822 = (r0);
+    s.tmp_0 = color_ColorBuffer_setColor__P33032_mk(s);
+    s.tmp_0.arg0 = s.p___49809;
+    s.tmp_0.arg1 = s.i___49816;
+    s.tmp_0.arg2 = s.col___49822;
+    s.callLocIdx = 1732; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    r0 = (s.i___20320 + 1);
-    s.i___20320 = (r0);
+    r0 = (s.i___49816 + 1);
+    s.i___49816 = (r0);
     { step = 7; continue; }
   case 8:
-    s.tmp_0 = color_setPalette__P3535_mk(s);
-    s.tmp_0.arg0 = s.p___20313;
+    s.tmp_0 = color_setPalette__P33069_mk(s);
+    s.tmp_0.arg0 = s.p___49809;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
     s.tmp_0.arg3 = 0;
-    s.callLocIdx = 1728; s.pc = 20; return s.tmp_0;
+    s.callLocIdx = 1733; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     r0 = false;
@@ -32899,12 +32906,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_step__P3563.info = {"start":1934,"length":818,"line":69,"column":8,"endLine":95,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"step","argumentNames":["this"]}
+color_Fade_step__P33097.info = {"start":1934,"length":818,"line":69,"column":8,"endLine":95,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"step","argumentNames":["this"]}
 
-function color_Fade_step__P3563_mk(s) {
+function color_Fade_step__P33097_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_step__P3563, depth: s.depth + 1,
+        parent: s, fn: color_Fade_step__P33097, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32916,10 +32923,10 @@ function color_Fade_step__P3563_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  time___20307: undefined,
-  p___20313: undefined,
-  i___20320: undefined,
-  col___20326: undefined,
+  time___49803: undefined,
+  p___49809: undefined,
+  i___49816: undefined,
+  col___49822: undefined,
   arg0: undefined,
 } }
 
@@ -32927,7 +32934,7 @@ function color_Fade_step__P3563_mk(s) {
 
 
 
-function color_partialColorTransition__P3546(s) {
+function color_partialColorTransition__P33080(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32937,12 +32944,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r1___20359 = undefined;
-    s.g1___20363 = undefined;
-    s.b1___20367 = undefined;
-    s.rDiff___20371 = undefined;
-    s.gDiff___20377 = undefined;
-    s.bDiff___20383 = undefined;
+    s.r1___49855 = undefined;
+    s.g1___49859 = undefined;
+    s.b1___49863 = undefined;
+    s.rDiff___49867 = undefined;
+    s.gDiff___49873 = undefined;
+    s.bDiff___49879 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -32969,68 +32976,68 @@ switch (step) {
     r0 = (s.arg0 >> 16);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 255);
-    s.r1___20359 = (r0);
+    s.r1___49855 = (r0);
     r0 = (s.arg0 >> 8);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 & 255);
-    s.g1___20363 = (r0);
+    s.g1___49859 = (r0);
     r0 = (s.arg0 >> 0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 & 255);
-    s.b1___20367 = (r0);
+    s.b1___49863 = (r0);
     r0 = (s.arg1 >> 16);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 255);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.r1___20359);
-    s.rDiff___20371 = (r0);
+    r0 = (s.tmp_0 - s.r1___49855);
+    s.rDiff___49867 = (r0);
     r0 = (s.arg1 >> 8);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 255);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.g1___20363);
-    s.gDiff___20377 = (r0);
+    r0 = (s.tmp_0 - s.g1___49859);
+    s.gDiff___49873 = (r0);
     r0 = (s.arg1 >> 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 255);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.b1___20367);
-    s.bDiff___20383 = (r0);
-    s.tmp_0 = color_toColor__P5980_mk(s);
-    s.tmp_1 = r0 = s.r1___20359;
-    r0 = (s.rDiff___20371 * s.arg2);
+    r0 = (s.tmp_0 - s.b1___49863);
+    s.bDiff___49879 = (r0);
+    s.tmp_0 = color_toColor__P35502_mk(s);
+    s.tmp_1 = r0 = s.r1___49855;
+    r0 = (s.rDiff___49867 * s.arg2);
     s.tmp_3 = r0;
     r0 = pxsim.Math_.round(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg0 = r0;
-    s.tmp_4 = r0 = s.g1___20363;
-    r0 = (s.gDiff___20377 * s.arg2);
+    s.tmp_4 = r0 = s.g1___49859;
+    r0 = (s.gDiff___49873 * s.arg2);
     s.tmp_6 = r0;
     r0 = pxsim.Math_.round(s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_0.arg1 = r0;
-    s.tmp_7 = r0 = s.b1___20367;
-    r0 = (s.bDiff___20383 * s.arg2);
+    s.tmp_7 = r0 = s.b1___49863;
+    r0 = (s.bDiff___49879 * s.arg2);
     s.tmp_9 = r0;
     r0 = pxsim.Math_.round(s.tmp_9);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 1701; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1706; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-color_partialColorTransition__P3546.info = {"start":11146,"length":669,"line":364,"column":4,"endLine":384,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"partialColorTransition","argumentNames":["start","end","percentage"]}
+color_partialColorTransition__P33080.info = {"start":11146,"length":669,"line":364,"column":4,"endLine":384,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"partialColorTransition","argumentNames":["start","end","percentage"]}
 
-function color_partialColorTransition__P3546_mk(s) {
+function color_partialColorTransition__P33080_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_partialColorTransition__P3546, depth: s.depth + 1,
+        parent: s, fn: color_partialColorTransition__P33080, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33042,12 +33049,12 @@ function color_partialColorTransition__P3546_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  r1___20359: undefined,
-  g1___20363: undefined,
-  b1___20367: undefined,
-  rDiff___20371: undefined,
-  gDiff___20377: undefined,
-  bDiff___20383: undefined,
+  r1___49855: undefined,
+  g1___49859: undefined,
+  b1___49863: undefined,
+  rDiff___49867: undefined,
+  gDiff___49873: undefined,
+  bDiff___49879: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -33057,7 +33064,7 @@ function color_partialColorTransition__P3546_mk(s) {
 
 
 
-function color_toColor__P5980(s) {
+function color_toColor__P35502(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33089,12 +33096,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_toColor__P5980.info = {"start":12315,"length":132,"line":404,"column":4,"endLine":406,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"toColor","argumentNames":["r","g","b"]}
+color_toColor__P35502.info = {"start":12315,"length":132,"line":404,"column":4,"endLine":406,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"toColor","argumentNames":["r","g","b"]}
 
-function color_toColor__P5980_mk(s) {
+function color_toColor__P35502_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_toColor__P5980, depth: s.depth + 1,
+        parent: s, fn: color_toColor__P35502, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33111,7 +33118,7 @@ function color_toColor__P5980_mk(s) {
 
 
 
-function color_unpackB__P3484(s) {
+function color_unpackB__P33018(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33131,12 +33138,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_unpackB__P3484.info = {"start":6324,"length":86,"line":200,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackB","argumentNames":["rgb"]}
+color_unpackB__P33018.info = {"start":6324,"length":86,"line":200,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackB","argumentNames":["rgb"]}
 
-function color_unpackB__P3484_mk(s) {
+function color_unpackB__P33018_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_unpackB__P3484, depth: s.depth + 1,
+        parent: s, fn: color_unpackB__P33018, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -33146,7 +33153,7 @@ function color_unpackB__P3484_mk(s) {
 
 
 
-function color_unpackG__P3483(s) {
+function color_unpackG__P33017(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33166,12 +33173,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_unpackG__P3483.info = {"start":6233,"length":86,"line":197,"column":4,"endLine":199,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackG","argumentNames":["rgb"]}
+color_unpackG__P33017.info = {"start":6233,"length":86,"line":197,"column":4,"endLine":199,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackG","argumentNames":["rgb"]}
 
-function color_unpackG__P3483_mk(s) {
+function color_unpackG__P33017_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_unpackG__P3483, depth: s.depth + 1,
+        parent: s, fn: color_unpackG__P33017, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -33181,7 +33188,7 @@ function color_unpackG__P3483_mk(s) {
 
 
 
-function color_unpackR__P3482(s) {
+function color_unpackR__P33016(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33201,12 +33208,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_unpackR__P3482.info = {"start":6141,"length":87,"line":194,"column":4,"endLine":196,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackR","argumentNames":["rgb"]}
+color_unpackR__P33016.info = {"start":6141,"length":87,"line":194,"column":4,"endLine":196,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackR","argumentNames":["rgb"]}
 
-function color_unpackR__P3482_mk(s) {
+function color_unpackR__P33016_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_unpackR__P3482, depth: s.depth + 1,
+        parent: s, fn: color_unpackR__P33016, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -33216,7 +33223,7 @@ function color_unpackR__P3482_mk(s) {
 
 
 
-function color_Fade_startPalette__P3553(s) {
+function color_Fade_startPalette__P33087(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33231,7 +33238,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
     r0 = s.arg0.fields["_startPalette"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -33241,8 +33248,8 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_5 = color_currentPalette__P3548_mk(s);
-    s.callLocIdx = 1710; s.pc = 3; return s.tmp_5;
+    s.tmp_5 = color_currentPalette__P33082_mk(s);
+    s.callLocIdx = 1715; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -33253,12 +33260,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_startPalette__P3553.info = {"start":233,"length":189,"line":9,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startPalette","argumentNames":["this"]}
+color_Fade_startPalette__P33087.info = {"start":233,"length":189,"line":9,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startPalette","argumentNames":["this"]}
 
-function color_Fade_startPalette__P3553_mk(s) {
+function color_Fade_startPalette__P33087_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_startPalette__P3553, depth: s.depth + 1,
+        parent: s, fn: color_Fade_startPalette__P33087, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33273,7 +33280,7 @@ function color_Fade_startPalette__P3553_mk(s) {
 
 
 
-function color_currentPalette__P3548(s) {
+function color_currentPalette__P33082(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33283,34 +33290,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___20097 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.currentColors___5976);
+    s.p___49593 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.currentColors___35498);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C33064_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P33027_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = color_availableColors__P3541_mk(s);
-    s.callLocIdx = 1702; s.pc = 5; return s.tmp_2;
+    s.tmp_2 = color_availableColors__P33075_mk(s);
+    s.callLocIdx = 1707; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1703; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 1708; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    s.p___20097 = (s.tmp_0);
-    s.tmp_0 = r0 = s.p___20097;
-    r0 = pxsim.BufferMethods.slice(globals.currentColors___5976, 0, -1);
+    s.p___49593 = (s.tmp_0);
+    s.tmp_0 = r0 = s.p___49593;
+    r0 = pxsim.BufferMethods.slice(globals.currentColors___35498, 0, -1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["buf"] = (s.tmp_1);
-    r0 = s.p___20097;
+    r0 = s.p___49593;
     { step = 3; continue; }
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = color__clone__P3549_mk(s);
-    s.tmp_0.arg0 = globals.originalPalette___3574;
-    s.callLocIdx = 1704; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = color__clone__P33083_mk(s);
+    s.tmp_0.arg0 = globals.originalPalette___33108;
+    s.callLocIdx = 1709; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     { step = 3; continue; }
@@ -33320,24 +33327,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_currentPalette__P3548.info = {"start":11988,"length":258,"line":393,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"currentPalette","argumentNames":[]}
+color_currentPalette__P33082.info = {"start":11988,"length":258,"line":393,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"currentPalette","argumentNames":[]}
 
-function color_currentPalette__P3548_mk(s) {
+function color_currentPalette__P33082_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_currentPalette__P3548, depth: s.depth + 1,
+        parent: s, fn: color_currentPalette__P33082, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  p___20097: undefined,
+  p___49593: undefined,
 } }
 
 
 
 
 
-function color_availableColors__P3541(s) {
+function color_availableColors__P33075(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33347,20 +33354,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = color_ColorBuffer_length__P3496_mk(s);
-    s.tmp_0.arg0 = globals.originalPalette___3574;
-    s.callLocIdx = 1693; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = color_ColorBuffer_length__P33030_mk(s);
+    s.tmp_0.arg0 = globals.originalPalette___33108;
+    s.callLocIdx = 1698; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-color_availableColors__P3541.info = {"start":9742,"length":88,"line":317,"column":4,"endLine":319,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"availableColors","argumentNames":[]}
+color_availableColors__P33075.info = {"start":9742,"length":88,"line":317,"column":4,"endLine":319,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"availableColors","argumentNames":[]}
 
-function color_availableColors__P3541_mk(s) {
+function color_availableColors__P33075_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_availableColors__P3541, depth: s.depth + 1,
+        parent: s, fn: color_availableColors__P33075, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33369,7 +33376,7 @@ function color_availableColors__P3541_mk(s) {
 
 
 
-function color_setPalette__P3535(s) {
+function color_setPalette__P33069(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33379,11 +33386,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fromStart___20239 = undefined;
-    s.toStart___20242 = undefined;
-    s.asBuf___20245 = undefined;
-    s.copyLength___20248 = undefined;
-    s.i___20255 = undefined;
+    s.fromStart___49735 = undefined;
+    s.toStart___49738 = undefined;
+    s.asBuf___49741 = undefined;
+    s.copyLength___49744 = undefined;
+    s.i___49751 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -33401,9 +33408,9 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_2 = r0 = s.arg2;
-    s.tmp_4 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_4 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1689; s.pc = 9; return s.tmp_4;
+    s.callLocIdx = 1694; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -33413,76 +33420,76 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 3; continue; }
-    s.tmp_6 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_6 = color_ColorBuffer_length__P33030_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 1690; s.pc = 10; return s.tmp_6;
+    s.callLocIdx = 1695; s.pc = 10; return s.tmp_6;
   case 10:
     r0 = s.retval;
     s.arg2 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals.currentColors___5976);
+    r0 = pxsim_numops_toBoolDecr(globals.currentColors___35498);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = globals.originalPalette___3574.fields["buf"];
+    r0 = globals.originalPalette___33108.fields["buf"];
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.slice(s.tmp_2, 0, -1);
-    globals.currentColors___5976 = (r0);
+    globals.currentColors___35498 = (r0);
   case 5:
   case 6:
     r0 = (s.arg3 * 3);
-    s.fromStart___20239 = (r0);
+    s.fromStart___49735 = (r0);
     r0 = (s.arg1 * 3);
-    s.toStart___20242 = (r0);
+    s.toStart___49738 = (r0);
     r0 = s.arg0.fields["buf"];
-    s.asBuf___20245 = (r0);
-    s.tmp_1 = Math_clamp__P122_mk(s);
+    s.asBuf___49741 = (r0);
+    s.tmp_1 = Math_clamp__P29657_mk(s);
     s.tmp_1.arg0 = 0;
-    s.tmp_2 = color_availableColors__P3541_mk(s);
-    s.callLocIdx = 1691; s.pc = 12; return s.tmp_2;
+    s.tmp_2 = color_availableColors__P33075_mk(s);
+    s.callLocIdx = 1696; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 1692; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 1697; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (3 * s.tmp_0);
-    s.copyLength___20248 = (r0);
-    s.i___20255 = (0);
+    s.copyLength___49744 = (r0);
+    s.i___49751 = (0);
   case 7:
-    r0 = (s.i___20255 < s.copyLength___20248);
+    r0 = (s.i___49751 < s.copyLength___49744);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_1 = r0 = globals.currentColors___5976;
-    r0 = (s.toStart___20242 + s.i___20255);
+    s.tmp_1 = r0 = globals.currentColors___35498;
+    r0 = (s.toStart___49738 + s.i___49751);
     s.tmp_2 = r0;
-    s.tmp_4 = r0 = s.asBuf___20245;
-    r0 = (s.fromStart___20239 + s.i___20255);
+    s.tmp_4 = r0 = s.asBuf___49741;
+    r0 = (s.fromStart___49735 + s.i___49751);
     s.tmp_5 = r0;
     r0 = pxsim.BufferMethods.getByte(s.tmp_4, s.tmp_5);
     s.tmp_3 = r0;
     r0 = pxsim.BufferMethods.setByte(s.tmp_1, s.tmp_2, s.tmp_3);
-    r0 = (s.i___20255 + 1);
-    s.i___20255 = (r0);
+    r0 = (s.i___49751 + 1);
+    s.i___49751 = (r0);
     { step = 7; continue; }
   case 8:
-    r0 = pxsim_pxtcore.setPalette(globals.currentColors___5976);
+    r0 = pxsim_pxtcore.setPalette(globals.currentColors___35498);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_setPalette__P3535.info = {"start":6189,"length":617,"line":219,"column":4,"endLine":236,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"setPalette","argumentNames":["palette","start","length","paletteOffset"]}
+color_setPalette__P33069.info = {"start":6189,"length":617,"line":219,"column":4,"endLine":236,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"setPalette","argumentNames":["palette","start","length","paletteOffset"]}
 
-function color_setPalette__P3535_mk(s) {
+function color_setPalette__P33069_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_setPalette__P3535, depth: s.depth + 1,
+        parent: s, fn: color_setPalette__P33069, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33491,11 +33498,11 @@ function color_setPalette__P3535_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  fromStart___20239: undefined,
-  toStart___20242: undefined,
-  asBuf___20245: undefined,
-  copyLength___20248: undefined,
-  i___20255: undefined,
+  fromStart___49735: undefined,
+  toStart___49738: undefined,
+  asBuf___49741: undefined,
+  copyLength___49744: undefined,
+  i___49751: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -33506,7 +33513,7 @@ function color_setPalette__P3535_mk(s) {
 
 
 
-function color_Fade_constructor__P3552(s) {
+function color_Fade_constructor__P33086(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33521,17 +33528,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C33085_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_constructor__P3552.info = {"start":206,"length":17,"line":7,"column":8,"endLine":7,"endColumn":25,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this"]}
+color_Fade_constructor__P33086.info = {"start":206,"length":17,"line":7,"column":8,"endLine":7,"endColumn":25,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this"]}
 
-function color_Fade_constructor__P3552_mk(s) {
+function color_Fade_constructor__P33086_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_constructor__P3552, depth: s.depth + 1,
+        parent: s, fn: color_Fade_constructor__P33086, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -33540,7 +33547,7 @@ function color_Fade_constructor__P3552_mk(s) {
 
 
 
-function color_ColorBuffer_length__P3496(s) {
+function color_ColorBuffer_length__P33030(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33555,14 +33562,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C33024_VT)) failedCast(r0);
     r0 = s.arg0.fields["buf"];
     s.tmp_1 = r0;
     r0 = pxsim.BufferMethods.length(s.tmp_1);
     s.tmp_0 = r0;
-    s.tmp_3 = color_ColorBuffer_stride__P3495_mk(s);
+    s.tmp_3 = color_ColorBuffer_stride__P33029_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1684; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 1689; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -33570,13 +33577,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_length__P3496.info = {"start":836,"length":84,"line":34,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"length","argumentNames":["this"]}
-color_ColorBuffer_length__P3496.isGetter = true;
+color_ColorBuffer_length__P33030.info = {"start":836,"length":84,"line":34,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"length","argumentNames":["this"]}
+color_ColorBuffer_length__P33030.isGetter = true;
 
-function color_ColorBuffer_length__P3496_mk(s) {
+function color_ColorBuffer_length__P33030_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_length__P3496, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_length__P33030, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33589,7 +33596,7 @@ function color_ColorBuffer_length__P3496_mk(s) {
 
 
 
-function game_askForNumber__P2573(s) {
+function game_askForNumber__P31992(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33599,58 +33606,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___8427 = undefined;
-    s.result___8431 = undefined;
+    s.p___37964 = undefined;
+    s.result___37968 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0 = Math_max__P29660_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_min__P126_mk(s);
+    s.tmp_1 = Math_min__P29661_mk(s);
     s.tmp_1.arg0 = 10;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 1227; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1184; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1228; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1185; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.arg1 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(game_NumberPrompt__C2574_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(game_NumberPrompt__C31993_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_NumberPrompt_constructor__P2579_mk(s);
+    s.tmp_1 = game_NumberPrompt_constructor__P31998_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1229; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1186; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.p___8427 = (s.tmp_0);
-    s.tmp_0 = game_NumberPrompt_show__P2580_mk(s);
-    s.tmp_0.arg0 = s.p___8427;
+    s.p___37964 = (s.tmp_0);
+    s.tmp_0 = game_NumberPrompt_show__P31999_mk(s);
+    s.tmp_0.arg0 = s.p___37964;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
-    s.callLocIdx = 1230; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1187; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.result___8431 = (r0);
-    r0 = s.result___8431;
+    s.result___37968 = (r0);
+    r0 = s.result___37968;
     return leave(s, r0)
   default: oops()
 } } }
-game_askForNumber__P2573.info = {"start":531,"length":253,"line":15,"column":4,"endLine":20,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"askForNumber","argumentNames":["message","answerLength"]}
+game_askForNumber__P31992.info = {"start":531,"length":253,"line":15,"column":4,"endLine":20,"endColumn":5,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"askForNumber","argumentNames":["message","answerLength"]}
 
-function game_askForNumber__P2573_mk(s) {
+function game_askForNumber__P31992_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_askForNumber__P2573, depth: s.depth + 1,
+        parent: s, fn: game_askForNumber__P31992, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  p___8427: undefined,
-  result___8431: undefined,
+  p___37964: undefined,
+  result___37968: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -33659,7 +33666,7 @@ function game_askForNumber__P2573_mk(s) {
 
 
 
-function game_NumberPrompt_show__P2580(s) {
+function game_NumberPrompt_show__P31999(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33676,46 +33683,46 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = (s.arg0).fields["message"] = (s.arg1);
     r0 = (s.arg0).fields["answerLength"] = (s.arg2);
     r0 = (s.arg0).fields["inputIndex"] = (0);
-    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P31373_mk(s);
     s.tmp_0.arg0 = false;
-    s.callLocIdx = 1236; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1193; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = game_pushScene__P2536_mk(s);
-    s.callLocIdx = 1237; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P31955_mk(s);
+    s.callLocIdx = 1194; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_draw__P4582_mk(s);
+    s.tmp_0 = game_NumberPrompt_draw__P34075_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1238; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1195; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_registerHandlers__P4592_mk(s);
+    s.tmp_0 = game_NumberPrompt_registerHandlers__P34085_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1239; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1196; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["confirmPressed"] = (false);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8459);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P37996);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = pauseUntil__P356_mk(s);
+    s.tmp_1 = pauseUntil__P29891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1240; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1197; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P2537_mk(s);
-    s.callLocIdx = 1241; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_popScene__P31956_mk(s);
+    s.callLocIdx = 1198; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P31373_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1242; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1199; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["result"];
@@ -33724,12 +33731,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_show__P2580.info = {"start":4834,"length":545,"line":148,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"show","argumentNames":["this","message","answerLength"]}
+game_NumberPrompt_show__P31999.info = {"start":4834,"length":545,"line":148,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"show","argumentNames":["this","message","answerLength"]}
 
-function game_NumberPrompt_show__P2580_mk(s) {
+function game_NumberPrompt_show__P31999_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_show__P2580, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_show__P31999, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33742,7 +33749,7 @@ function game_NumberPrompt_show__P2580_mk(s) {
 
 
 
-function inline__P8459(s) {
+function inline__P37996(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33756,12 +33763,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8459.info = {"start":5215,"length":25,"line":160,"column":23,"endLine":160,"endColumn":48,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P37996.info = {"start":5215,"length":25,"line":160,"column":23,"endLine":160,"endColumn":48,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8459_mk(s) {
+function inline__P37996_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8459, depth: s.depth + 1,
+        parent: s, fn: inline__P37996, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -33769,7 +33776,7 @@ function inline__P8459_mk(s) {
 
 
 
-function game_NumberPrompt_registerHandlers__P4592(s) {
+function game_NumberPrompt_registerHandlers__P34085(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33784,87 +33791,87 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8725);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38262);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.up___1880;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.up___31299;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1299; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1256; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8730);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38267);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.down___1882;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.down___31301;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1301; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1258; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8735);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38272);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.right___1881;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.right___31300;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1303; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1260; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8740);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38277);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.left___1879;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.left___31298;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1305; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 1262; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8745);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38282);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.A___1877;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.A___31296;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1307; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1264; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8750);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38287);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.B___1878;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.B___31297;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1309; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1266; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["frameCount"] = (0);
     r0 = (s.arg0).fields["blink"] = (true);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8759);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38296);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = game_onUpdate__P2543_mk(s);
+    s.tmp_1 = game_onUpdate__P31962_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1311; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1268; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_registerHandlers__P4592.info = {"start":9716,"length":1066,"line":287,"column":8,"endLine":325,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"registerHandlers","argumentNames":["this"]}
+game_NumberPrompt_registerHandlers__P34085.info = {"start":9716,"length":1066,"line":287,"column":8,"endLine":325,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"registerHandlers","argumentNames":["this"]}
 
-function game_NumberPrompt_registerHandlers__P4592_mk(s) {
+function game_NumberPrompt_registerHandlers__P34085_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_registerHandlers__P4592, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_registerHandlers__P34085, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33875,7 +33882,7 @@ function game_NumberPrompt_registerHandlers__P4592_mk(s) {
 
 
 
-function inline__P8725(s) {
+function inline__P38262(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33885,22 +33892,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveVertical__P4593_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveVertical__P34086_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1298; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1255; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8725.info = {"start":9796,"length":62,"line":288,"column":51,"endLine":290,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P38262.info = {"start":9796,"length":62,"line":288,"column":51,"endLine":290,"endColumn":13,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8725_mk(s) {
+function inline__P38262_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8725, depth: s.depth + 1,
+        parent: s, fn: inline__P38262, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33909,7 +33916,7 @@ function inline__P8725_mk(s) {
 
 
 
-function inline__P8730(s) {
+function inline__P38267(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33919,22 +33926,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveVertical__P4593_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveVertical__P34086_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1300; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1257; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8730.info = {"start":9914,"length":63,"line":292,"column":53,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P38267.info = {"start":9914,"length":63,"line":292,"column":53,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8730_mk(s) {
+function inline__P38267_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8730, depth: s.depth + 1,
+        parent: s, fn: inline__P38267, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33943,7 +33950,7 @@ function inline__P8730_mk(s) {
 
 
 
-function inline__P8735(s) {
+function inline__P38272(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33953,22 +33960,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveHorizontal__P4594_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveHorizontal__P34087_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1302; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1259; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8735.info = {"start":10034,"length":64,"line":296,"column":54,"endLine":298,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P38272.info = {"start":10034,"length":64,"line":296,"column":54,"endLine":298,"endColumn":13,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8735_mk(s) {
+function inline__P38272_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8735, depth: s.depth + 1,
+        parent: s, fn: inline__P38272, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33977,7 +33984,7 @@ function inline__P8735_mk(s) {
 
 
 
-function inline__P8740(s) {
+function inline__P38277(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33987,22 +33994,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveHorizontal__P4594_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveHorizontal__P34087_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1304; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1261; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8740.info = {"start":10155,"length":65,"line":300,"column":53,"endLine":302,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P38277.info = {"start":10155,"length":65,"line":300,"column":53,"endLine":302,"endColumn":13,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8740_mk(s) {
+function inline__P38277_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8740, depth: s.depth + 1,
+        parent: s, fn: inline__P38277, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -34011,7 +34018,7 @@ function inline__P8740_mk(s) {
 
 
 
-function inline__P8745(s) {
+function inline__P38282(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34021,21 +34028,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_confirm__P4595_mk(s);
+    s.tmp_0 = game_NumberPrompt_confirm__P34088_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1306; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1263; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8745.info = {"start":10274,"length":53,"line":304,"column":50,"endLine":306,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P38282.info = {"start":10274,"length":53,"line":304,"column":50,"endLine":306,"endColumn":13,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8745_mk(s) {
+function inline__P38282_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8745, depth: s.depth + 1,
+        parent: s, fn: inline__P38282, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -34044,7 +34051,7 @@ function inline__P8745_mk(s) {
 
 
 
-function inline__P8750(s) {
+function inline__P38287(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34054,21 +34061,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_delete__P4596_mk(s);
+    s.tmp_0 = game_NumberPrompt_delete__P34089_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1308; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1265; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8750.info = {"start":10381,"length":52,"line":308,"column":50,"endLine":310,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P38287.info = {"start":10381,"length":52,"line":308,"column":50,"endLine":310,"endColumn":13,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8750_mk(s) {
+function inline__P38287_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8750, depth: s.depth + 1,
+        parent: s, fn: inline__P38287, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -34077,7 +34084,7 @@ function inline__P8750_mk(s) {
 
 
 
-function inline__P8759(s) {
+function inline__P38296(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34109,9 +34116,9 @@ switch (step) {
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["blink"] = (s.tmp_3);
-    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P4589_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P34082_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1310; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1267; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
@@ -34120,12 +34127,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8759.info = {"start":10529,"length":242,"line":316,"column":26,"endLine":324,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P38296.info = {"start":10529,"length":242,"line":316,"column":26,"endLine":324,"endColumn":13,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P8759_mk(s) {
+function inline__P38296_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8759, depth: s.depth + 1,
+        parent: s, fn: inline__P38296, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34139,7 +34146,7 @@ function inline__P8759_mk(s) {
 
 
 
-function game_NumberPrompt_delete__P4596(s) {
+function game_NumberPrompt_delete__P34089(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34154,7 +34161,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 <= 0);
@@ -34172,7 +34179,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    s.tmp_5 = game_NumberPrompt_drawInput__P4591_mk(s);
+    s.tmp_5 = game_NumberPrompt_drawInput__P34084_mk(s);
     s.tmp_5.arg0 = s.arg0;
     r0 = s.arg0.fields["inputs"];
     s.tmp_7 = r0;
@@ -34193,12 +34200,12 @@ switch (step) {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["colorInput"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["colorInput"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 1325; s.pc = 9; return s.tmp_9; }
+     else { s.callLocIdx = 1282; s.pc = 9; return s.tmp_9; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_5.arg3 = r0;
-    s.callLocIdx = 1326; s.pc = 8; return s.tmp_5;
+    s.callLocIdx = 1283; s.pc = 8; return s.tmp_5;
   case 8:
     r0 = s.retval;
   case 3:
@@ -34232,10 +34239,10 @@ switch (step) {
     r0 = pxsim_String_.substr(s.tmp_2, 0, s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["result"] = (s.tmp_1);
-    s.tmp_0 = game_NumberPrompt_changeInputIndex__P4597_mk(s);
+    s.tmp_0 = game_NumberPrompt_changeInputIndex__P34090_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1327; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1284; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 7:
@@ -34243,12 +34250,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_delete__P4596.info = {"start":12778,"length":479,"line":391,"column":8,"endLine":405,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"delete","argumentNames":["this"]}
+game_NumberPrompt_delete__P34089.info = {"start":12778,"length":479,"line":391,"column":8,"endLine":405,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"delete","argumentNames":["this"]}
 
-function game_NumberPrompt_delete__P4596_mk(s) {
+function game_NumberPrompt_delete__P34089_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_delete__P4596, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_delete__P34089, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34267,7 +34274,7 @@ function game_NumberPrompt_delete__P4596_mk(s) {
 
 
 
-function game_NumberPrompt_changeInputIndex__P4597(s) {
+function game_NumberPrompt_changeInputIndex__P34090(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34283,7 +34290,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["inputIndex"];
     s.tmp_2 = r0;
@@ -34292,21 +34299,21 @@ switch (step) {
     r0 = (s.tmp_0).fields["inputIndex"] = (s.tmp_1);
     r0 = (s.arg0).fields["frameCount"] = (0);
     r0 = (s.arg0).fields["blink"] = (false);
-    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P4589_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P34082_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1328; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1285; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_changeInputIndex__P4597.info = {"start":13267,"length":193,"line":407,"column":8,"endLine":412,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"changeInputIndex","argumentNames":["this","delta"]}
+game_NumberPrompt_changeInputIndex__P34090.info = {"start":13267,"length":193,"line":407,"column":8,"endLine":412,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"changeInputIndex","argumentNames":["this","delta"]}
 
-function game_NumberPrompt_changeInputIndex__P4597_mk(s) {
+function game_NumberPrompt_changeInputIndex__P34090_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_changeInputIndex__P4597, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_changeInputIndex__P34090, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34319,7 +34326,7 @@ function game_NumberPrompt_changeInputIndex__P4597_mk(s) {
 
 
 
-function game_NumberPrompt_drawInput__P4591(s) {
+function game_NumberPrompt_drawInput__P34084(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34337,27 +34344,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = pxsim_ImageMethods.fill(s.arg1, 0);
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
-    r0 = (globals.CELL_HEIGHT___4512 - 1);
+    r0 = (globals.CELL_HEIGHT___34005 - 1);
     s.tmp_0.arg2 = r0;
-    r0 = (globals.CELL_WIDTH___4514 - 2);
+    r0 = (globals.CELL_WIDTH___34007 - 2);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = s.arg3;
-    s.callLocIdx = 1295; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1252; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg2;
-    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___4518;
-    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___4522;
+    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___34011;
+    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___34015;
     s.tmp_1 = if_colorInputText_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -34367,14 +34374,14 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInputText"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInputText"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1296; s.pc = 5; return s.tmp_1; }
+     else { s.callLocIdx = 1253; s.pc = 5; return s.tmp_1; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = globals.font___4483;
+    s.tmp_0.arg5 = globals.font___33976;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1297; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1254; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -34383,12 +34390,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawInput__P4591.info = {"start":9373,"length":333,"line":278,"column":8,"endLine":285,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawInput","argumentNames":["this","img","char","color"]}
+game_NumberPrompt_drawInput__P34084.info = {"start":9373,"length":333,"line":278,"column":8,"endLine":285,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"drawInput","argumentNames":["this","img","char","color"]}
 
-function game_NumberPrompt_drawInput__P4591_mk(s) {
+function game_NumberPrompt_drawInput__P34084_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawInput__P4591, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawInput__P34084, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34402,7 +34409,7 @@ function game_NumberPrompt_drawInput__P4591_mk(s) {
 
 
 
-function game_NumberPrompt_confirm__P4595(s) {
+function game_NumberPrompt_confirm__P34088(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34412,15 +34419,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___11707 = undefined;
-    s.letter___11716 = undefined;
-    s.sprite___11749 = undefined;
+    s.index___41241 = undefined;
+    s.letter___41250 = undefined;
+    s.sprite___41283 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 4);
@@ -34448,14 +34455,14 @@ switch (step) {
     r0 = (s.tmp_5 * 3);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
-    s.index___11707 = (r0);
-    s.tmp_0 = game_getSymbolFromIndex__P4599_mk(s);
-    s.tmp_0.arg0 = s.index___11707;
-    s.callLocIdx = 1319; s.pc = 18; return s.tmp_0;
+    s.index___41241 = (r0);
+    s.tmp_0 = game_getSymbolFromIndex__P34092_mk(s);
+    s.tmp_0.arg0 = s.index___41241;
+    s.callLocIdx = 1276; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.letter___11716 = (r0);
-    r0 = (s.letter___11716 === ".");
+    s.letter___41250 = (r0);
+    r0 = (s.letter___41250 === ".");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
@@ -34470,7 +34477,7 @@ switch (step) {
   case 5:
   case 6:
   case 7:
-    r0 = (s.letter___11716 === "-");
+    r0 = (s.letter___41250 === "-");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 8; continue; }
@@ -34509,7 +34516,7 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 14; continue; }
-    r0 = (s.arg0).fields["result"] = (s.letter___11716);
+    r0 = (s.arg0).fields["result"] = (s.letter___41250);
     { step = 15; continue; }
   case 14:
     s.tmp_0 = r0 = s.arg0;
@@ -34524,12 +34531,12 @@ switch (step) {
   case 19:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((s.letter___11716) && (s.letter___11716).vtable) {
+    if ((s.letter___41250) && (s.letter___41250).vtable) {
     setupResume(s, 20);
-    pxsim_String__stringConv(s.letter___11716);
+    pxsim_String__stringConv(s.letter___41250);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.letter___11716) + ""; }
+    } else { s.retval = (s.letter___41250) + ""; }
   case 20:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -34542,18 +34549,18 @@ switch (step) {
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    s.sprite___11749 = (r0);
-    s.tmp_0 = game_NumberPrompt_changeInputIndex__P4597_mk(s);
+    s.sprite___41283 = (r0);
+    s.tmp_0 = game_NumberPrompt_changeInputIndex__P34090_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.callLocIdx = 1320; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 1277; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawInput__P4591_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawInput__P34084_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = s.sprite___11749.fields["_image"];
+    r0 = s.sprite___41283.fields["_image"];
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.letter___11716;
+    s.tmp_0.arg2 = s.letter___41250;
     s.tmp_1 = if_colorInput_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -34563,12 +34570,12 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInput"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInput"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1322; s.pc = 23; return s.tmp_1; }
+     else { s.callLocIdx = 1279; s.pc = 23; return s.tmp_1; }
     }
   case 23:
     r0 = s.retval;
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1323; s.pc = 22; return s.tmp_0;
+    s.callLocIdx = 1280; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
   case 16:
@@ -34577,12 +34584,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_confirm__P4595.info = {"start":11690,"length":1078,"line":357,"column":8,"endLine":389,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"confirm","argumentNames":["this"]}
+game_NumberPrompt_confirm__P34088.info = {"start":11690,"length":1078,"line":357,"column":8,"endLine":389,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"confirm","argumentNames":["this"]}
 
-function game_NumberPrompt_confirm__P4595_mk(s) {
+function game_NumberPrompt_confirm__P34088_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_confirm__P4595, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_confirm__P34088, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34593,9 +34600,9 @@ function game_NumberPrompt_confirm__P4595_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  index___11707: undefined,
-  letter___11716: undefined,
-  sprite___11749: undefined,
+  index___41241: undefined,
+  letter___41250: undefined,
+  sprite___41283: undefined,
   arg0: undefined,
 } }
 
@@ -34603,7 +34610,7 @@ function game_NumberPrompt_confirm__P4595_mk(s) {
 
 
 
-function game_getSymbolFromIndex__P4599(s) {
+function game_getSymbolFromIndex__P34092(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34685,12 +34692,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_getSymbolFromIndex__P4599.info = {"start":15334,"length":406,"line":487,"column":4,"endLine":500,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"getSymbolFromIndex","argumentNames":["index"]}
+game_getSymbolFromIndex__P34092.info = {"start":15334,"length":406,"line":487,"column":4,"endLine":500,"endColumn":5,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"getSymbolFromIndex","argumentNames":["index"]}
 
-function game_getSymbolFromIndex__P4599_mk(s) {
+function game_getSymbolFromIndex__P34092_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_getSymbolFromIndex__P4599, depth: s.depth + 1,
+        parent: s, fn: game_getSymbolFromIndex__P34092, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34712,7 +34719,7 @@ function game_getSymbolFromIndex__P4599_mk(s) {
 
 
 
-function game_NumberPrompt_moveHorizontal__P4594(s) {
+function game_NumberPrompt_moveHorizontal__P34087(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34728,7 +34735,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -34750,21 +34757,21 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorColumn"] = (s.tmp_1);
   case 2:
-    s.tmp_0 = game_NumberPrompt_updateCursor__P4588_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateCursor__P34081_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1318; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1275; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_moveHorizontal__P4594.info = {"start":11340,"length":340,"line":346,"column":8,"endLine":355,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"moveHorizontal","argumentNames":["this","right"]}
+game_NumberPrompt_moveHorizontal__P34087.info = {"start":11340,"length":340,"line":346,"column":8,"endLine":355,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"moveHorizontal","argumentNames":["this","right"]}
 
-function game_NumberPrompt_moveHorizontal__P4594_mk(s) {
+function game_NumberPrompt_moveHorizontal__P34087_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_moveHorizontal__P4594, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_moveHorizontal__P34087, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34778,7 +34785,7 @@ function game_NumberPrompt_moveHorizontal__P4594_mk(s) {
 
 
 
-function game_NumberPrompt_updateCursor__P4588(s) {
+function game_NumberPrompt_updateCursor__P34081(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34793,7 +34800,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 4);
@@ -34805,37 +34812,37 @@ switch (step) {
     r0 = s.tmp_3.fields["_image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_2, 0);
-    s.tmp_0 = game_NumberPrompt_updateButtons__P4587_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateButtons__P34080_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1283; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1240; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = Sprite_x__P2026_mk(s);
+    s.tmp_0 = Sprite_x__P31445_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = r0 = globals.ROW_LEFT___4530;
+    s.tmp_1 = r0 = globals.ROW_LEFT___34023;
     r0 = s.arg0.fields["cursorColumn"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 * globals.CELL_WIDTH___4514);
+    r0 = (s.tmp_3 * globals.CELL_WIDTH___34007);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1284; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1241; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0 = Sprite_y__P31447_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = r0 = globals.NUMPAD_TOP___4562;
+    s.tmp_1 = r0 = globals.NUMPAD_TOP___34055;
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 * globals.CELL_HEIGHT___4512);
+    r0 = (s.tmp_3 * globals.CELL_HEIGHT___34005);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1285; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1242; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 2:
@@ -34843,12 +34850,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateCursor__P4588.info = {"start":8275,"length":352,"line":246,"column":8,"endLine":255,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateCursor","argumentNames":["this"]}
+game_NumberPrompt_updateCursor__P34081.info = {"start":8275,"length":352,"line":246,"column":8,"endLine":255,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"updateCursor","argumentNames":["this"]}
 
-function game_NumberPrompt_updateCursor__P4588_mk(s) {
+function game_NumberPrompt_updateCursor__P34081_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateCursor__P4588, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateCursor__P34081, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34861,7 +34868,7 @@ function game_NumberPrompt_updateCursor__P4588_mk(s) {
 
 
 
-function game_NumberPrompt_updateButtons__P4587(s) {
+function game_NumberPrompt_updateButtons__P34080(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34876,7 +34883,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 4);
@@ -34896,7 +34903,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["colorCursor"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["colorCursor"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1277; s.pc = 3; return s.tmp_5; }
+     else { s.callLocIdx = 1234; s.pc = 3; return s.tmp_5; }
     }
   case 3:
     r0 = s.retval;
@@ -34917,37 +34924,37 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["colorBottomBackground"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["colorBottomBackground"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1279; s.pc = 4; return s.tmp_3; }
+     else { s.callLocIdx = 1236; s.pc = 4; return s.tmp_3; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, s.tmp_2);
   case 2:
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
     r0 = s.arg0.fields["confirmButton"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_image"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.confirmText___4581;
-    s.tmp_0.arg2 = globals.BOTTOM_BAR_CONFIRM_X___4554;
-    s.tmp_0.arg3 = globals.BOTTOM_BAR_TEXT_Y___4551;
+    s.tmp_0.arg1 = globals.confirmText___34074;
+    s.tmp_0.arg2 = globals.BOTTOM_BAR_CONFIRM_X___34047;
+    s.tmp_0.arg3 = globals.BOTTOM_BAR_TEXT_Y___34044;
     s.tmp_0.arg4 = undefined;
     s.tmp_0.arg5 = undefined;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1281; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1238; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateButtons__P4587.info = {"start":7892,"length":373,"line":235,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateButtons","argumentNames":["this"]}
+game_NumberPrompt_updateButtons__P34080.info = {"start":7892,"length":373,"line":235,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"updateButtons","argumentNames":["this"]}
 
-function game_NumberPrompt_updateButtons__P4587_mk(s) {
+function game_NumberPrompt_updateButtons__P34080_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateButtons__P4587, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateButtons__P34080, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34962,7 +34969,7 @@ function game_NumberPrompt_updateButtons__P4587_mk(s) {
 
 
 
-function Sprite_y__P2028(s) {
+function Sprite_y__P31447(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34978,8 +34985,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P2067_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P31486_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -34990,19 +34997,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 276; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 233; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_y__P2028.info = {"start":2022,"length":72,"line":86,"column":4,"endLine":88,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this","v"]}
+Sprite_y__P31447.info = {"start":2022,"length":72,"line":86,"column":4,"endLine":88,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"y","argumentNames":["this","v"]}
 
-function Sprite_y__P2028_mk(s) {
+function Sprite_y__P31447_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_y__P2028, depth: s.depth + 1,
+        parent: s, fn: Sprite_y__P31447, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35017,7 +35024,7 @@ function Sprite_y__P2028_mk(s) {
 
 
 
-function game_NumberPrompt_moveVertical__P4593(s) {
+function game_NumberPrompt_moveVertical__P34086(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35033,7 +35040,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 3; continue; }
     r0 = s.arg0.fields["cursorRow"];
@@ -35055,28 +35062,28 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["colorCursor"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["colorCursor"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1313; s.pc = 5; return s.tmp_5; }
+     else { s.callLocIdx = 1270; s.pc = 5; return s.tmp_5; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_2, s.tmp_4);
     r0 = (s.arg0).fields["cursorRow"] = (3);
-    s.tmp_0 = game_NumberPrompt_updateButtons__P4587_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateButtons__P34080_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1314; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1271; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
     s.tmp_2.arg0 = 0;
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1315; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1272; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -35085,33 +35092,33 @@ switch (step) {
     { step = 4; continue; }
   case 3:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_min__P126_mk(s);
+    s.tmp_2 = Math_min__P29661_mk(s);
     s.tmp_2.arg0 = 4;
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1316; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1273; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorRow"] = (s.tmp_1);
   case 4:
-    s.tmp_0 = game_NumberPrompt_updateCursor__P4588_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateCursor__P34081_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1317; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1274; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_moveVertical__P4593.info = {"start":10792,"length":538,"line":327,"column":8,"endLine":344,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"moveVertical","argumentNames":["this","up"]}
+game_NumberPrompt_moveVertical__P34086.info = {"start":10792,"length":538,"line":327,"column":8,"endLine":344,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"moveVertical","argumentNames":["this","up"]}
 
-function game_NumberPrompt_moveVertical__P4593_mk(s) {
+function game_NumberPrompt_moveVertical__P34086_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_moveVertical__P4593, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_moveVertical__P34086, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35127,7 +35134,7 @@ function game_NumberPrompt_moveVertical__P4593_mk(s) {
 
 
 
-function game_NumberPrompt_updateSelectedInput__P4589(s) {
+function game_NumberPrompt_updateSelectedInput__P34082(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35137,13 +35144,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.u___8783 = undefined;
+    s.u___38320 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["answerLength"];
@@ -35157,14 +35164,14 @@ switch (step) {
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_4 = r0;
     r0 = pxsim_Array__getAt(s.tmp_3, s.tmp_4);
-    s.u___8783 = (r0);
+    s.u___38320 = (r0);
     r0 = s.arg0.fields["blink"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = game_NumberPrompt_drawInput__P4591_mk(s);
+    s.tmp_1 = game_NumberPrompt_drawInput__P34084_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    r0 = s.u___8783.fields["_image"];
+    r0 = s.u___38320.fields["_image"];
     s.tmp_1.arg1 = r0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1.arg2 = r0;
@@ -35177,19 +35184,19 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorInput"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorInput"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1287; s.pc = 6; return s.tmp_2; }
+     else { s.callLocIdx = 1244; s.pc = 6; return s.tmp_2; }
     }
   case 6:
     r0 = s.retval;
     s.tmp_1.arg3 = r0;
-    s.callLocIdx = 1288; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1245; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = game_NumberPrompt_drawInput__P4591_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawInput__P34084_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = s.u___8783.fields["_image"];
+    r0 = s.u___38320.fields["_image"];
     s.tmp_0.arg1 = r0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_0.arg2 = r0;
@@ -35202,12 +35209,12 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInputHighlighted"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInputHighlighted"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1290; s.pc = 8; return s.tmp_1; }
+     else { s.callLocIdx = 1247; s.pc = 8; return s.tmp_1; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1291; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1248; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 2:
@@ -35217,19 +35224,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateSelectedInput__P4589.info = {"start":8637,"length":413,"line":257,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateSelectedInput","argumentNames":["this"]}
+game_NumberPrompt_updateSelectedInput__P34082.info = {"start":8637,"length":413,"line":257,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"updateSelectedInput","argumentNames":["this"]}
 
-function game_NumberPrompt_updateSelectedInput__P4589_mk(s) {
+function game_NumberPrompt_updateSelectedInput__P34082_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateSelectedInput__P4589, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateSelectedInput__P34082, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  u___8783: undefined,
+  u___38320: undefined,
   arg0: undefined,
 } }
 
@@ -35237,7 +35244,7 @@ function game_NumberPrompt_updateSelectedInput__P4589_mk(s) {
 
 
 
-function game_NumberPrompt_draw__P4582(s) {
+function game_NumberPrompt_draw__P34075(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35252,37 +35259,37 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
-    s.tmp_0 = game_NumberPrompt_drawPromptText__P4583_mk(s);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
+    s.tmp_0 = game_NumberPrompt_drawPromptText__P34076_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1243; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1200; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawNumpad__P4585_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawNumpad__P34078_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1244; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1201; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawInputarea__P4584_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawInputarea__P34077_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1245; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1202; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawBottomBar__P4586_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawBottomBar__P34079_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1246; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1203; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_draw__P4582.info = {"start":5389,"length":160,"line":168,"column":8,"endLine":173,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"draw","argumentNames":["this"]}
+game_NumberPrompt_draw__P34075.info = {"start":5389,"length":160,"line":168,"column":8,"endLine":173,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"draw","argumentNames":["this"]}
 
-function game_NumberPrompt_draw__P4582_mk(s) {
+function game_NumberPrompt_draw__P34075_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_draw__P4582, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_draw__P34075, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -35292,7 +35299,7 @@ function game_NumberPrompt_draw__P4582_mk(s) {
 
 
 
-function game_NumberPrompt_drawBottomBar__P4586(s) {
+function game_NumberPrompt_drawBottomBar__P34079(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35302,19 +35309,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bg___11999 = undefined;
-    s.bgSprite___12011 = undefined;
+    s.bg___41525 = undefined;
+    s.bgSprite___41537 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0 = r0;
-    r0 = pxsim.image.create(s.tmp_0, globals.BOTTOM_BAR_HEIGHT___4538);
-    s.bg___11999 = (r0);
-    s.tmp_0 = r0 = s.bg___11999;
+    r0 = pxsim.image.create(s.tmp_0, globals.BOTTOM_BAR_HEIGHT___34031);
+    s.bg___41525 = (r0);
+    s.tmp_0 = r0 = s.bg___41525;
     s.tmp_2 = if_colorBottomBackground_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -35324,40 +35331,40 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorBottomBackground"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorBottomBackground"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1267; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1224; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, s.tmp_1);
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    s.tmp_0.arg0 = s.bg___11999;
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    s.tmp_0.arg0 = s.bg___41525;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1268; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1225; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.bgSprite___12011 = (r0);
-    s.tmp_0 = Sprite_x__P2026_mk(s);
-    s.tmp_0.arg0 = s.bgSprite___12011;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.bgSprite___41537 = (r0);
+    s.tmp_0 = Sprite_x__P31445_mk(s);
+    s.tmp_0.arg0 = s.bgSprite___41537;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1269; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1226; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
-    s.tmp_0.arg0 = s.bgSprite___12011;
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___4541;
-    r0 = (globals.BOTTOM_BAR_HEIGHT___4538 / 2);
+    s.tmp_0 = Sprite_y__P31447_mk(s);
+    s.tmp_0.arg0 = s.bgSprite___41537;
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___34034;
+    r0 = (globals.BOTTOM_BAR_HEIGHT___34031 / 2);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1270; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1227; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     s.tmp_0 = if_z_2_mk(s);
-    s.tmp_0.arg0 = s.bgSprite___12011;
+    s.tmp_0.arg0 = s.bgSprite___41537;
     s.tmp_0.arg1 = -1;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapSetByString(s.tmp_0.arg0, "z", s.tmp_0.arg1);
@@ -35365,63 +35372,63 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 1271; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 1228; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = sprites_create__P1974_mk(s);
-    r0 = pxsim.image.create(globals.BOTTOM_BAR_BUTTON_WIDTH___4548, globals.BOTTOM_BAR_HEIGHT___4538);
+    s.tmp_2 = sprites_create__P31393_mk(s);
+    r0 = pxsim.image.create(globals.BOTTOM_BAR_BUTTON_WIDTH___34041, globals.BOTTOM_BAR_HEIGHT___34031);
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = -1;
-    s.callLocIdx = 1272; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 1229; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["confirmButton"] = (s.tmp_1);
-    s.tmp_0 = Sprite_right__P2065_mk(s);
+    s.tmp_0 = Sprite_right__P31484_mk(s);
     r0 = s.arg0.fields["confirmButton"];
     s.tmp_0.arg0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1273; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1230; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0 = Sprite_y__P31447_mk(s);
     r0 = s.arg0.fields["confirmButton"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___4541;
-    r0 = (globals.BOTTOM_BAR_HEIGHT___4538 / 2);
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___34034;
+    r0 = (globals.BOTTOM_BAR_HEIGHT___34031 / 2);
     s.tmp_3 = r0;
     r0 = pxsim.Math_.ceil(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1274; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1231; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_updateButtons__P4587_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateButtons__P34080_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1275; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1232; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawBottomBar__P4586.info = {"start":7245,"length":637,"line":219,"column":8,"endLine":233,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawBottomBar","argumentNames":["this"]}
+game_NumberPrompt_drawBottomBar__P34079.info = {"start":7245,"length":637,"line":219,"column":8,"endLine":233,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"drawBottomBar","argumentNames":["this"]}
 
-function game_NumberPrompt_drawBottomBar__P4586_mk(s) {
+function game_NumberPrompt_drawBottomBar__P34079_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawBottomBar__P4586, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawBottomBar__P34079, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  bg___11999: undefined,
-  bgSprite___12011: undefined,
+  bg___41525: undefined,
+  bgSprite___41537: undefined,
   arg0: undefined,
 } }
 
@@ -35429,7 +35436,7 @@ function game_NumberPrompt_drawBottomBar__P4586_mk(s) {
 
 
 
-function Sprite_right__P2065(s) {
+function Sprite_right__P31484(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35445,8 +35452,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P2063_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P31482_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -35455,19 +35462,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 327; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 284; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_right__P2065.info = {"start":9428,"length":71,"line":344,"column":4,"endLine":346,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this","value"]}
+Sprite_right__P31484.info = {"start":9428,"length":71,"line":344,"column":4,"endLine":346,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"right","argumentNames":["this","value"]}
 
-function Sprite_right__P2065_mk(s) {
+function Sprite_right__P31484_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_right__P2065, depth: s.depth + 1,
+        parent: s, fn: Sprite_right__P31484, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35481,7 +35488,7 @@ function Sprite_right__P2065_mk(s) {
 
 
 
-function Sprite_right__P2064(s) {
+function Sprite_right__P31483(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35496,10 +35503,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_left__P2062_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_left__P31481_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 324; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 281; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -35511,13 +35518,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_right__P2064.info = {"start":9279,"length":57,"line":339,"column":4,"endLine":341,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this"]}
-Sprite_right__P2064.isGetter = true;
+Sprite_right__P31483.info = {"start":9279,"length":57,"line":339,"column":4,"endLine":341,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"right","argumentNames":["this"]}
+Sprite_right__P31483.isGetter = true;
 
-function Sprite_right__P2064_mk(s) {
+function Sprite_right__P31483_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_right__P2064, depth: s.depth + 1,
+        parent: s, fn: Sprite_right__P31483, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35530,7 +35537,7 @@ function Sprite_right__P2064_mk(s) {
 
 
 
-function game_NumberPrompt_drawNumpad__P4585(s) {
+function game_NumberPrompt_drawNumpad__P34078(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35540,21 +35547,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cursorImage___12146 = undefined;
-    s.j___12173 = undefined;
-    s.letter___12178 = undefined;
-    s.col2___12183 = undefined;
-    s.row2___12187 = undefined;
-    s.t___12193 = undefined;
+    s.cursorImage___41672 = undefined;
+    s.j___41699 = undefined;
+    s.letter___41704 = undefined;
+    s.col2___41709 = undefined;
+    s.row2___41713 = undefined;
+    s.t___41719 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
-    r0 = pxsim.image.create(globals.CELL_WIDTH___4514, globals.CELL_HEIGHT___4512);
-    s.cursorImage___12146 = (r0);
-    s.tmp_0 = r0 = s.cursorImage___12146;
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
+    r0 = pxsim.image.create(globals.CELL_WIDTH___34007, globals.CELL_HEIGHT___34005);
+    s.cursorImage___41672 = (r0);
+    s.tmp_0 = r0 = s.cursorImage___41672;
     s.tmp_2 = if_colorCursor_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -35564,17 +35571,17 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorCursor"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorCursor"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1259; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1216; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = sprites_create__P1974_mk(s);
-    s.tmp_2.arg0 = s.cursorImage___12146;
+    s.tmp_2 = sprites_create__P31393_mk(s);
+    s.tmp_2.arg0 = s.cursorImage___41672;
     s.tmp_2.arg1 = -1;
-    s.callLocIdx = 1260; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1217; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -35589,92 +35596,92 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 1261; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 1218; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_updateCursor__P4588_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateCursor__P34081_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1262; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1219; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["numbers"] = (s.tmp_1);
-    s.j___12173 = (0);
+    s.j___41699 = (0);
   case 1:
-    r0 = (s.j___12173 < 12);
+    r0 = (s.j___41699 < 12);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim.image.create(globals.CELL_WIDTH___4514, globals.CELL_HEIGHT___4512);
-    s.letter___12178 = (r0);
-    r0 = (s.j___12173 % 3);
-    s.col2___12183 = (r0);
-    r0 = (s.j___12173 / 3);
+    r0 = pxsim.image.create(globals.CELL_WIDTH___34007, globals.CELL_HEIGHT___34005);
+    s.letter___41704 = (r0);
+    r0 = (s.j___41699 % 3);
+    s.col2___41709 = (r0);
+    r0 = (s.j___41699 / 3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.row2___12187 = (r0);
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    s.tmp_0.arg0 = s.letter___12178;
+    s.row2___41713 = (r0);
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    s.tmp_0.arg0 = s.letter___41704;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1263; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1220; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.t___12193 = (r0);
-    s.tmp_0 = Sprite_x__P2026_mk(s);
-    s.tmp_0.arg0 = s.t___12193;
-    s.tmp_1 = r0 = globals.ROW_LEFT___4530;
-    r0 = (s.col2___12183 * globals.CELL_WIDTH___4514);
+    s.t___41719 = (r0);
+    s.tmp_0 = Sprite_x__P31445_mk(s);
+    s.tmp_0.arg0 = s.t___41719;
+    s.tmp_1 = r0 = globals.ROW_LEFT___34023;
+    r0 = (s.col2___41709 * globals.CELL_WIDTH___34007);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1264; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1221; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
-    s.tmp_0.arg0 = s.t___12193;
-    s.tmp_1 = r0 = globals.NUMPAD_TOP___4562;
-    r0 = (s.row2___12187 * globals.CELL_HEIGHT___4512);
+    s.tmp_0 = Sprite_y__P31447_mk(s);
+    s.tmp_0.arg0 = s.t___41719;
+    s.tmp_1 = r0 = globals.NUMPAD_TOP___34055;
+    r0 = (s.row2___41713 * globals.CELL_HEIGHT___34005);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1265; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1222; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = s.arg0.fields["numbers"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.t___12193);
-    r0 = (s.j___12173 + 1);
-    s.j___12173 = (r0);
+    r0 = pxsim_Array__push(s.tmp_0, s.t___41719);
+    r0 = (s.j___41699 + 1);
+    s.j___41699 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_0 = game_NumberPrompt_updateKeyboard__P4590_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateKeyboard__P34083_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1266; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1223; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawNumpad__P4585.info = {"start":6433,"length":802,"line":196,"column":8,"endLine":217,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawNumpad","argumentNames":["this"]}
+game_NumberPrompt_drawNumpad__P34078.info = {"start":6433,"length":802,"line":196,"column":8,"endLine":217,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"drawNumpad","argumentNames":["this"]}
 
-function game_NumberPrompt_drawNumpad__P4585_mk(s) {
+function game_NumberPrompt_drawNumpad__P34078_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawNumpad__P4585, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawNumpad__P34078, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  cursorImage___12146: undefined,
-  j___12173: undefined,
-  letter___12178: undefined,
-  col2___12183: undefined,
-  row2___12187: undefined,
-  t___12193: undefined,
+  cursorImage___41672: undefined,
+  j___41699: undefined,
+  letter___41704: undefined,
+  col2___41709: undefined,
+  row2___41713: undefined,
+  t___41719: undefined,
   arg0: undefined,
 } }
 
@@ -35682,7 +35689,7 @@ function game_NumberPrompt_drawNumpad__P4585_mk(s) {
 
 
 
-function game_NumberPrompt_updateKeyboard__P4590(s) {
+function game_NumberPrompt_updateKeyboard__P34083(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35692,69 +35699,69 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___12222 = undefined;
-    s.k___12226 = undefined;
-    s.img___12231 = undefined;
+    s.len___41748 = undefined;
+    s.k___41752 = undefined;
+    s.img___41757 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = s.arg0.fields["numbers"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__length(s.tmp_0);
-    s.len___12222 = (r0);
-    s.k___12226 = (0);
+    s.len___41748 = (r0);
+    s.k___41752 = (0);
   case 1:
-    r0 = (s.k___12226 < s.len___12222);
+    r0 = (s.k___41752 < s.len___41748);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
     r0 = s.arg0.fields["numbers"];
     s.tmp_2 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_2, s.k___12226);
+    r0 = pxsim_Array__getAt(s.tmp_2, s.k___41752);
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_image"];
-    s.img___12231 = (r0);
-    r0 = pxsim_ImageMethods.fill(s.img___12231, 0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = s.img___12231;
-    s.tmp_1 = game_getSymbolFromIndex__P4599_mk(s);
-    s.tmp_1.arg0 = s.k___12226;
-    s.callLocIdx = 1293; s.pc = 4; return s.tmp_1;
+    s.img___41757 = (r0);
+    r0 = pxsim_ImageMethods.fill(s.img___41757, 0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = s.img___41757;
+    s.tmp_1 = game_getSymbolFromIndex__P34092_mk(s);
+    s.tmp_1.arg0 = s.k___41752;
+    s.callLocIdx = 1250; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___4518;
-    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___4522;
+    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___34011;
+    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___34015;
     s.tmp_0.arg4 = undefined;
     s.tmp_0.arg5 = undefined;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1294; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1251; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = (s.k___12226 + 1);
-    s.k___12226 = (r0);
+    r0 = (s.k___41752 + 1);
+    s.k___41752 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateKeyboard__P4590.info = {"start":9060,"length":303,"line":269,"column":8,"endLine":276,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateKeyboard","argumentNames":["this"]}
+game_NumberPrompt_updateKeyboard__P34083.info = {"start":9060,"length":303,"line":269,"column":8,"endLine":276,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"updateKeyboard","argumentNames":["this"]}
 
-function game_NumberPrompt_updateKeyboard__P4590_mk(s) {
+function game_NumberPrompt_updateKeyboard__P34083_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateKeyboard__P4590, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateKeyboard__P34083, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___12222: undefined,
-  k___12226: undefined,
-  img___12231: undefined,
+  len___41748: undefined,
+  k___41752: undefined,
+  img___41757: undefined,
   arg0: undefined,
 } }
 
@@ -35762,7 +35769,7 @@ function game_NumberPrompt_updateKeyboard__P4590_mk(s) {
 
 
 
-function game_NumberPrompt_drawInputarea__P4584(s) {
+function game_NumberPrompt_drawInputarea__P34077(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35772,43 +35779,43 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.answerLeft___12091 = undefined;
-    s.i___12104 = undefined;
-    s.blank___12110 = undefined;
-    s.s___12120 = undefined;
+    s.answerLeft___41617 = undefined;
+    s.i___41630 = undefined;
+    s.blank___41636 = undefined;
+    s.s___41646 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = s.arg0.fields["answerLength"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 * globals.CELL_WIDTH___4514);
+    r0 = (s.tmp_3 * globals.CELL_WIDTH___34007);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    s.answerLeft___12091 = (r0);
+    s.answerLeft___41617 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["inputs"] = (s.tmp_1);
-    s.i___12104 = (0);
+    s.i___41630 = (0);
   case 1:
     r0 = s.arg0.fields["answerLength"];
     s.tmp_1 = r0;
-    r0 = (s.i___12104 < s.tmp_1);
+    r0 = (s.i___41630 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim.image.create(globals.CELL_WIDTH___4514, globals.CELL_HEIGHT___4512);
-    s.blank___12110 = (r0);
-    s.tmp_0 = game_NumberPrompt_drawInput__P4591_mk(s);
+    r0 = pxsim.image.create(globals.CELL_WIDTH___34007, globals.CELL_HEIGHT___34005);
+    s.blank___41636 = (r0);
+    s.tmp_0 = game_NumberPrompt_drawInput__P34084_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.blank___12110;
+    s.tmp_0.arg1 = s.blank___41636;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_0.arg2 = r0;
     s.tmp_1 = if_colorInput_1_mk(s);
@@ -35820,63 +35827,63 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInput"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInput"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1254; s.pc = 4; return s.tmp_1; }
+     else { s.callLocIdx = 1211; s.pc = 4; return s.tmp_1; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1255; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1212; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    s.tmp_0.arg0 = s.blank___12110;
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    s.tmp_0.arg0 = s.blank___41636;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1256; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1213; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.s___12120 = (r0);
-    s.tmp_0 = Sprite_left__P2063_mk(s);
-    s.tmp_0.arg0 = s.s___12120;
-    s.tmp_1 = r0 = s.answerLeft___12091;
-    r0 = (s.i___12104 * globals.CELL_WIDTH___4514);
+    s.s___41646 = (r0);
+    s.tmp_0 = Sprite_left__P31482_mk(s);
+    s.tmp_0.arg0 = s.s___41646;
+    s.tmp_1 = r0 = s.answerLeft___41617;
+    r0 = (s.i___41630 * globals.CELL_WIDTH___34007);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1257; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1214; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
-    s.tmp_0.arg0 = s.s___12120;
-    s.tmp_0.arg1 = globals.INPUT_TOP___4572;
-    s.callLocIdx = 1258; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = Sprite_y__P31447_mk(s);
+    s.tmp_0.arg0 = s.s___41646;
+    s.tmp_0.arg1 = globals.INPUT_TOP___34065;
+    s.callLocIdx = 1215; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["inputs"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.s___12120);
-    r0 = (s.i___12104 + 1);
-    s.i___12104 = (r0);
+    r0 = pxsim_Array__push(s.tmp_0, s.s___41646);
+    r0 = (s.i___41630 + 1);
+    s.i___41630 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawInputarea__P4584.info = {"start":5889,"length":534,"line":181,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawInputarea","argumentNames":["this"]}
+game_NumberPrompt_drawInputarea__P34077.info = {"start":5889,"length":534,"line":181,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"drawInputarea","argumentNames":["this"]}
 
-function game_NumberPrompt_drawInputarea__P4584_mk(s) {
+function game_NumberPrompt_drawInputarea__P34077_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawInputarea__P4584, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawInputarea__P34077, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  answerLeft___12091: undefined,
-  i___12104: undefined,
-  blank___12110: undefined,
-  s___12120: undefined,
+  answerLeft___41617: undefined,
+  i___41630: undefined,
+  blank___41636: undefined,
+  s___41646: undefined,
   arg0: undefined,
 } }
 
@@ -35884,7 +35891,7 @@ function game_NumberPrompt_drawInputarea__P4584_mk(s) {
 
 
 
-function game_NumberPrompt_drawPromptText__P4583(s) {
+function game_NumberPrompt_drawPromptText__P34076(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35894,19 +35901,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.prompt___12251 = undefined;
+    s.prompt___41777 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    s.tmp_1 = game_layoutText__P4598_mk(s);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    s.tmp_1 = game_layoutText__P34091_mk(s);
     r0 = s.arg0.fields["message"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = globals.PROMPT_WIDTH___4580;
-    s.tmp_1.arg2 = globals.PROMPT_HEIGHT___4577;
+    s.tmp_1.arg1 = globals.PROMPT_WIDTH___34073;
+    s.tmp_1.arg2 = globals.PROMPT_HEIGHT___34070;
     s.tmp_2 = if_colorPrompt_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -35916,33 +35923,33 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorPrompt"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorPrompt"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1247; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1204; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_1.arg3 = r0;
-    s.callLocIdx = 1248; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1205; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1249; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1206; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.prompt___12251 = (r0);
-    s.tmp_0 = Sprite_x__P2026_mk(s);
-    s.tmp_0.arg0 = s.prompt___12251;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.prompt___41777 = (r0);
+    s.tmp_0 = Sprite_x__P31445_mk(s);
+    s.tmp_0.arg0 = s.prompt___41777;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1250; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1207; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
-    s.tmp_0.arg0 = s.prompt___12251;
-    s.tmp_5 = r0 = globals.PROMPT_HEIGHT___4577;
-    r0 = s.prompt___12251.fields["_image"];
+    s.tmp_0 = Sprite_y__P31447_mk(s);
+    s.tmp_0.arg0 = s.prompt___41777;
+    s.tmp_5 = r0 = globals.PROMPT_HEIGHT___34070;
+    r0 = s.prompt___41777.fields["_image"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_7);
     s.tmp_6 = r0;
@@ -35954,7 +35961,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (4 + s.tmp_2);
     s.tmp_1 = r0;
-    r0 = s.prompt___12251.fields["_image"];
+    r0 = s.prompt___41777.fields["_image"];
     s.tmp_11 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_11);
     s.tmp_10 = r0;
@@ -35964,19 +35971,19 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_1 + s.tmp_8);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1253; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1210; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawPromptText__P4583.info = {"start":5559,"length":320,"line":175,"column":8,"endLine":179,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawPromptText","argumentNames":["this"]}
+game_NumberPrompt_drawPromptText__P34076.info = {"start":5559,"length":320,"line":175,"column":8,"endLine":179,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"drawPromptText","argumentNames":["this"]}
 
-function game_NumberPrompt_drawPromptText__P4583_mk(s) {
+function game_NumberPrompt_drawPromptText__P34076_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawPromptText__P4583, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawPromptText__P34076, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35990,7 +35997,7 @@ function game_NumberPrompt_drawPromptText__P4583_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  prompt___12251: undefined,
+  prompt___41777: undefined,
   arg0: undefined,
 } }
 
@@ -35998,7 +36005,7 @@ function game_NumberPrompt_drawPromptText__P4583_mk(s) {
 
 
 
-function game_layoutText__P4598(s) {
+function game_layoutText__P34091(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36008,21 +36015,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.lineHeight___12300 = undefined;
-    s.lineLength___12305 = undefined;
-    s.numLines___12312 = undefined;
-    s.lines___12318 = undefined;
-    s.word___12320 = undefined;
-    s.line___12321 = undefined;
-    s.pushWord___12322 = undefined;
-    s.l___12354 = undefined;
-    s.char___12360 = undefined;
-    s.maxLineWidth___12389 = undefined;
-    s.m___12390 = undefined;
-    s.actualWidth___12404 = undefined;
-    s.actualHeight___12409 = undefined;
-    s.res___12414 = undefined;
-    s.n___12419 = undefined;
+    s.lineHeight___41826 = undefined;
+    s.lineLength___41831 = undefined;
+    s.numLines___41838 = undefined;
+    s.lines___41844 = undefined;
+    s.word___41846 = undefined;
+    s.line___41847 = undefined;
+    s.pushWord___41848 = undefined;
+    s.l___41880 = undefined;
+    s.char___41886 = undefined;
+    s.maxLineWidth___41915 = undefined;
+    s.m___41916 = undefined;
+    s.actualWidth___41930 = undefined;
+    s.actualHeight___41935 = undefined;
+    s.res___41940 = undefined;
+    s.n___41945 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -36031,30 +36038,30 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_charHeight_1_mk(s);
-    s.tmp_1.arg0 = globals.font___4483;
+    s.tmp_1.arg0 = globals.font___33976;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "charHeight");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["charHeight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["charHeight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1329; s.pc = 19; return s.tmp_1; }
+     else { s.callLocIdx = 1286; s.pc = 19; return s.tmp_1; }
     }
   case 19:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 2);
-    s.lineHeight___12300 = (r0);
+    s.lineHeight___41826 = (r0);
     s.tmp_1 = r0 = s.arg1;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = globals.font___4483;
+    s.tmp_3.arg0 = globals.font___33976;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1330; s.pc = 20; return s.tmp_3; }
+     else { s.callLocIdx = 1287; s.pc = 20; return s.tmp_3; }
     }
   case 20:
     r0 = s.retval;
@@ -36062,56 +36069,56 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.lineLength___12305 = (r0);
-    r0 = (s.arg2 / s.lineHeight___12300);
+    s.lineLength___41831 = (r0);
+    r0 = (s.arg2 / s.lineHeight___41826);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.numLines___12312 = (r0);
+    s.numLines___41838 = (r0);
     r0 = pxsim_Array__mk();
-    s.lines___12318 = (r0);
+    s.lines___41844 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.word___12320 = (r0);
+    s.word___41846 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.line___12321 = (r0);
-    r0 = pxsim_pxtcore_mkAction(4, inline__P12323);
+    s.line___41847 = (r0);
+    r0 = pxsim_pxtcore_mkAction(4, inline__P41849);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___12321);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.word___12320);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.lineLength___12305);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.lines___12318);
-    s.pushWord___12322 = (s.tmp_0);
-    s.l___12354 = (0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___41847);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.word___41846);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.lineLength___41831);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.lines___41844);
+    s.pushWord___41848 = (s.tmp_0);
+    s.l___41880 = (0);
   case 1:
-    s.tmp_1 = r0 = s.l___12354;
+    s.tmp_1 = r0 = s.l___41880;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    r0 = pxsim_String_.charAt(s.arg0, s.l___12354);
-    s.char___12360 = (r0);
-    r0 = (s.char___12360 === " ");
+    r0 = pxsim_String_.charAt(s.arg0, s.l___41880);
+    s.char___41886 = (r0);
+    r0 = (s.char___41886 === " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_pxtrt_ldlocRef(s.word___12320);
+    r0 = pxsim_pxtrt_ldlocRef(s.word___41846);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 2; continue; }
     s.tmp_2 = lambda_1_mk(s);
-    s.tmp_2.argL = s.pushWord___12322;
+    s.tmp_2.argL = s.pushWord___41848;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1331; s.pc = 21; return s.tmp_2;
+    s.callLocIdx = 1288; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
     { step = 3; continue; }
   case 2:
-    r0 = pxsim_pxtrt_stlocRef(s.word___12320, " ");
+    r0 = pxsim_pxtrt_stlocRef(s.word___41846, " ");
   case 3:
     { step = 7; continue; }
   case 4:
-    r0 = pxsim_pxtrt_ldlocRef(s.word___12320);
+    r0 = pxsim_pxtrt_ldlocRef(s.word___41846);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -36119,11 +36126,11 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtrt_stlocRef(s.word___12320, s.char___12360);
+    r0 = pxsim_pxtrt_stlocRef(s.word___41846, s.char___41886);
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = r0 = s.word___12320;
-    r0 = pxsim_pxtrt_ldlocRef(s.word___12320);
+    s.tmp_0 = r0 = s.word___41846;
+    r0 = pxsim_pxtrt_ldlocRef(s.word___41846);
     s.tmp_3 = r0;
     if ((s.tmp_3) && (s.tmp_3).vtable) {
     setupResume(s, 22);
@@ -36134,12 +36141,12 @@ switch (step) {
   case 22:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((s.char___12360) && (s.char___12360).vtable) {
+    if ((s.char___41886) && (s.char___41886).vtable) {
     setupResume(s, 23);
-    pxsim_String__stringConv(s.char___12360);
+    pxsim_String__stringConv(s.char___41886);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.char___12360) + ""; }
+    } else { s.retval = (s.char___41886) + ""; }
   case 23:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -36148,123 +36155,123 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
   case 6:
   case 7:
-    r0 = (s.l___12354 + 1);
-    s.l___12354 = (r0);
+    r0 = (s.l___41880 + 1);
+    s.l___41880 = (r0);
     { step = 1; continue; }
   case 8:
-    r0 = pxsim_pxtrt_ldlocRef(s.word___12320);
+    r0 = pxsim_pxtrt_ldlocRef(s.word___41846);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
     s.tmp_1 = lambda_1_mk(s);
-    s.tmp_1.argL = s.pushWord___12322;
+    s.tmp_1.argL = s.pushWord___41848;
     setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 1332; s.pc = 24; return s.tmp_1;
+    s.callLocIdx = 1289; s.pc = 24; return s.tmp_1;
   case 24:
     r0 = s.retval;
   case 9:
   case 10:
-    r0 = pxsim_pxtrt_ldlocRef(s.line___12321);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___41847);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = r0 = s.lines___12318;
-    r0 = pxsim_pxtrt_ldlocRef(s.line___12321);
+    s.tmp_1 = r0 = s.lines___41844;
+    r0 = pxsim_pxtrt_ldlocRef(s.line___41847);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
   case 11:
   case 12:
-    s.maxLineWidth___12389 = (0);
-    s.m___12390 = (0);
+    s.maxLineWidth___41915 = (0);
+    s.m___41916 = (0);
   case 13:
-    s.tmp_1 = r0 = s.m___12390;
-    r0 = pxsim_Array__length(s.lines___12318);
+    s.tmp_1 = r0 = s.m___41916;
+    r0 = pxsim_Array__length(s.lines___41844);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_3 = Math_max__P125_mk(s);
-    s.tmp_3.arg0 = s.maxLineWidth___12389;
-    r0 = pxsim_Array__getAt(s.lines___12318, s.m___12390);
+    s.tmp_3 = Math_max__P29660_mk(s);
+    s.tmp_3.arg0 = s.maxLineWidth___41915;
+    r0 = pxsim_Array__getAt(s.lines___41844, s.m___41916);
     s.tmp_4 = r0;
     r0 = pxsim_String_.length(s.tmp_4);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 1333; s.pc = 25; return s.tmp_3;
+    s.callLocIdx = 1290; s.pc = 25; return s.tmp_3;
   case 25:
     r0 = s.retval;
-    s.maxLineWidth___12389 = (r0);
-    r0 = (s.m___12390 + 1);
-    s.m___12390 = (r0);
+    s.maxLineWidth___41915 = (r0);
+    r0 = (s.m___41916 + 1);
+    s.m___41916 = (r0);
     { step = 13; continue; }
   case 14:
-    s.tmp_0 = r0 = s.maxLineWidth___12389;
+    s.tmp_0 = r0 = s.maxLineWidth___41915;
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = globals.font___4483;
+    s.tmp_2.arg0 = globals.font___33976;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1334; s.pc = 26; return s.tmp_2; }
+     else { s.callLocIdx = 1291; s.pc = 26; return s.tmp_2; }
     }
   case 26:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.actualWidth___12404 = (r0);
-    r0 = pxsim_Array__length(s.lines___12318);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.lineHeight___12300);
-    s.actualHeight___12409 = (r0);
-    r0 = pxsim.image.create(s.actualWidth___12404, s.actualHeight___12409);
-    s.res___12414 = (r0);
-    s.n___12419 = (0);
+    s.actualWidth___41930 = (r0);
+    r0 = pxsim_Array__length(s.lines___41844);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 * s.lineHeight___41826);
+    s.actualHeight___41935 = (r0);
+    r0 = pxsim.image.create(s.actualWidth___41930, s.actualHeight___41935);
+    s.res___41940 = (r0);
+    s.n___41945 = (0);
   case 15:
-    s.tmp_1 = r0 = s.n___12419;
-    r0 = pxsim_Array__length(s.lines___12318);
+    s.tmp_1 = r0 = s.n___41945;
+    r0 = pxsim_Array__length(s.lines___41844);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    r0 = (s.n___12419 + 1);
+    r0 = (s.n___41945 + 1);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 > s.numLines___12312);
+    r0 = (s.tmp_4 > s.numLines___41838);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 16; continue; }
     { step = 18; continue; }
   case 16:
   case 17:
-    s.tmp_5 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_5.arg0 = s.res___12414;
-    r0 = pxsim_Array__getAt(s.lines___12318, s.n___12419);
+    s.tmp_5 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_5.arg0 = s.res___41940;
+    r0 = pxsim_Array__getAt(s.lines___41844, s.n___41945);
     s.tmp_5.arg1 = r0;
     s.tmp_5.arg2 = 0;
-    r0 = (s.n___12419 * s.lineHeight___12300);
+    r0 = (s.n___41945 * s.lineHeight___41826);
     s.tmp_5.arg3 = r0;
     s.tmp_5.arg4 = s.arg3;
-    s.tmp_5.arg5 = globals.font___4483;
+    s.tmp_5.arg5 = globals.font___33976;
     s.tmp_5.arg6 = undefined;
-    s.callLocIdx = 1335; s.pc = 27; return s.tmp_5;
+    s.callLocIdx = 1292; s.pc = 27; return s.tmp_5;
   case 27:
     r0 = s.retval;
-    r0 = (s.n___12419 + 1);
-    s.n___12419 = (r0);
+    r0 = (s.n___41945 + 1);
+    s.n___41945 = (r0);
     { step = 15; continue; }
   case 18:
-    r0 = s.res___12414;
+    r0 = s.res___41940;
     return leave(s, r0)
   default: oops()
 } } }
-game_layoutText__P4598.info = {"start":13472,"length":1856,"line":415,"column":4,"endLine":485,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"layoutText","argumentNames":["message","width","height","color"]}
+game_layoutText__P34091.info = {"start":13472,"length":1856,"line":415,"column":4,"endLine":485,"endColumn":5,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"layoutText","argumentNames":["message","width","height","color"]}
 
-function game_layoutText__P4598_mk(s) {
+function game_layoutText__P34091_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_layoutText__P4598, depth: s.depth + 1,
+        parent: s, fn: game_layoutText__P34091, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36272,21 +36279,21 @@ function game_layoutText__P4598_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  lineHeight___12300: undefined,
-  lineLength___12305: undefined,
-  numLines___12312: undefined,
-  lines___12318: undefined,
-  word___12320: undefined,
-  line___12321: undefined,
-  pushWord___12322: undefined,
-  l___12354: undefined,
-  char___12360: undefined,
-  maxLineWidth___12389: undefined,
-  m___12390: undefined,
-  actualWidth___12404: undefined,
-  actualHeight___12409: undefined,
-  res___12414: undefined,
-  n___12419: undefined,
+  lineHeight___41826: undefined,
+  lineLength___41831: undefined,
+  numLines___41838: undefined,
+  lines___41844: undefined,
+  word___41846: undefined,
+  line___41847: undefined,
+  pushWord___41848: undefined,
+  l___41880: undefined,
+  char___41886: undefined,
+  maxLineWidth___41915: undefined,
+  m___41916: undefined,
+  actualWidth___41930: undefined,
+  actualHeight___41935: undefined,
+  res___41940: undefined,
+  n___41945: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -36297,7 +36304,7 @@ function game_layoutText__P4598_mk(s) {
 
 
 
-function inline__P12323(s) {
+function inline__P41849(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36387,12 +36394,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12323.info = {"start":13856,"length":385,"line":425,"column":23,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P41849.info = {"start":13856,"length":385,"line":425,"column":23,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P12323_mk(s) {
+function inline__P41849_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12323, depth: s.depth + 1,
+        parent: s, fn: inline__P41849, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36410,7 +36417,7 @@ function inline__P12323_mk(s) {
 
 
 
-function game_popScene__P2537(s) {
+function game_popScene__P31956(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36420,59 +36427,59 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.oldScene___8468 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1163; s.pc = 11; return s.tmp_0;
+    s.oldScene___38005 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1120; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.oldScene___8468 = (r0);
-    s.tmp_0 = r0 = globals._sceneStack___4349;
+    s.oldScene___38005 = (r0);
+    s.tmp_0 = r0 = globals._sceneStack___33842;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(globals._sceneStack___4349);
+    r0 = pxsim_Array__length(globals._sceneStack___33842);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_Array_.pop(globals._sceneStack___4349);
-    globals._scene___4348 = (r0);
-    s.tmp_0 = control_popEventContext__P399_mk(s);
-    s.callLocIdx = 1164; s.pc = 12; return s.tmp_0;
+    r0 = pxsim_Array_.pop(globals._sceneStack___33842);
+    globals._scene___33841 = (r0);
+    s.tmp_0 = control_popEventContext__P29934_mk(s);
+    s.callLocIdx = 1121; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 3:
-    r0 = pxsim_numops_toBoolDecr(globals._scene___4348);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___33841);
     if (!r0) { step = 4; continue; }
-    s.tmp_0 = control_popEventContext__P399_mk(s);
-    s.callLocIdx = 1165; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = control_popEventContext__P29934_mk(s);
+    s.callLocIdx = 1122; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    globals._scene___4348 = (undefined);
+    globals._scene___33841 = (undefined);
   case 4:
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(globals._scene___4348);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___33841);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = particles_enableAll__P2710_mk(s);
-    s.callLocIdx = 1166; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = particles_enableAll__P32129_mk(s);
+    s.callLocIdx = 1123; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___4351);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___33844);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P8489);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P38026);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___8468);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_1.arg0 = globals._scenePopHandlers___4351;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___38005);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_1.arg0 = globals._scenePopHandlers___33844;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1168; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 1125; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
   case 9:
@@ -36481,23 +36488,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_popScene__P2537.info = {"start":2033,"length":548,"line":75,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"popScene","argumentNames":[]}
+game_popScene__P31956.info = {"start":2033,"length":548,"line":75,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"popScene","argumentNames":[]}
 
-function game_popScene__P2537_mk(s) {
+function game_popScene__P31956_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_popScene__P2537, depth: s.depth + 1,
+        parent: s, fn: game_popScene__P31956, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  oldScene___8468: undefined,
+  oldScene___38005: undefined,
 } }
 
 
 
 
 
-function inline__P8489(s) {
+function inline__P38026(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36515,19 +36522,19 @@ switch (step) {
     s.tmp_0.argL = s.arg0;
     s.tmp_0.arg0 = s.caps[0];
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1167; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1124; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8489.info = {"start":2545,"length":18,"line":91,"column":38,"endLine":91,"endColumn":56,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["cb"]}
+inline__P38026.info = {"start":2545,"length":18,"line":91,"column":38,"endLine":91,"endColumn":56,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":["cb"]}
 
-function inline__P8489_mk(s) {
+function inline__P38026_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8489, depth: s.depth + 1,
+        parent: s, fn: inline__P38026, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36537,7 +36544,7 @@ function inline__P8489_mk(s) {
 
 
 
-function particles_enableAll__P2710(s) {
+function particles_enableAll__P32129(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36547,22 +36554,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___8493 = undefined;
-    s.tmp_0 = particles_particleSources__P4712_mk(s);
-    s.callLocIdx = 1571; s.pc = 3; return s.tmp_0;
+    s.sources___38030 = undefined;
+    s.tmp_0 = particles_particleSources__P34205_mk(s);
+    s.callLocIdx = 1528; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___8493 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___8493);
+    s.sources___38030 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___38030);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_0.arg0 = s.sources___8493;
-    s.tmp_0.arg1 = inline__P8499;
-    s.callLocIdx = 1573; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_0.arg0 = s.sources___38030;
+    s.tmp_0.arg1 = inline__P38036;
+    s.callLocIdx = 1530; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P4708_mk(s);
-    s.callLocIdx = 1574; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P34201_mk(s);
+    s.callLocIdx = 1531; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -36571,22 +36578,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_enableAll__P2710.info = {"start":12632,"length":193,"line":412,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"enableAll","argumentNames":[]}
+particles_enableAll__P32129.info = {"start":12632,"length":193,"line":412,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"enableAll","argumentNames":[]}
 
-function particles_enableAll__P2710_mk(s) {
+function particles_enableAll__P32129_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_enableAll__P2710, depth: s.depth + 1,
+        parent: s, fn: particles_enableAll__P32129, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___8493: undefined,
+  sources___38030: undefined,
 } }
 
 
 
 
 
-function inline__P8499(s) {
+function inline__P38036(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36600,22 +36607,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
+    s.tmp_0 = particles_ParticleSource_enabled__P32110_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1572; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1529; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = true;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P8499.info = {"start":12756,"length":21,"line":415,"column":28,"endLine":415,"endColumn":49,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P38036.info = {"start":12756,"length":21,"line":415,"column":28,"endLine":415,"endColumn":49,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P8499_mk(s) {
+function inline__P38036_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P8499, depth: s.depth + 1,
+        parent: s, fn: inline__P38036, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36625,7 +36632,7 @@ function inline__P8499_mk(s) {
 
 
 
-function control_popEventContext__P399(s) {
+function control_popEventContext__P29934(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36635,9 +36642,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___8674 = undefined;
-    s.context___8682 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___4032);
+    s.ctx___38211 = undefined;
+    s.context___38219 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___33567);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -36646,9 +36653,9 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    r0 = pxsim_Array_.pop(globals.eventContexts___4032);
-    s.ctx___8674 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___8674);
+    r0 = pxsim_Array_.pop(globals.eventContexts___33567);
+    s.ctx___38211 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___38211);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -36657,53 +36664,53 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_2 = control_EventContext_unregister__P391_mk(s);
-    s.tmp_2.arg0 = s.ctx___8674;
+    s.tmp_2 = control_EventContext_unregister__P29926_mk(s);
+    s.tmp_2.arg0 = s.ctx___38211;
     s.callLocIdx = 65; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.eventContexts___4032;
-    r0 = pxsim_Array__length(globals.eventContexts___4032);
+    s.tmp_0 = r0 = globals.eventContexts___33567;
+    r0 = pxsim_Array__length(globals.eventContexts___33567);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    s.context___8682 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.context___8682);
+    s.context___38219 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.context___38219);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = control_EventContext_register__P390_mk(s);
-    s.tmp_0.arg0 = s.context___8682;
+    s.tmp_0 = control_EventContext_register__P29925_mk(s);
+    s.tmp_0.arg0 = s.context___38219;
     s.callLocIdx = 66; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    globals.eventContexts___4032 = (undefined);
+    globals.eventContexts___33567 = (undefined);
   case 6:
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_popEventContext__P399.info = {"start":7568,"length":413,"line":232,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
+control_popEventContext__P29934.info = {"start":7568,"length":413,"line":232,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
 
-function control_popEventContext__P399_mk(s) {
+function control_popEventContext__P29934_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_popEventContext__P399, depth: s.depth + 1,
+        parent: s, fn: control_popEventContext__P29934, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  ctx___8674: undefined,
-  context___8682: undefined,
+  ctx___38211: undefined,
+  context___38219: undefined,
 } }
 
 
 
 
 
-function control_EventContext_register__P390(s) {
+function control_EventContext_register__P29925(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36713,38 +36720,38 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___8695 = undefined;
-    s.unnamed90___U1 = undefined;
-    s.unnamed91___U2 = undefined;
+    s.h___38232 = undefined;
+    s.unnamed930___U1 = undefined;
+    s.unnamed931___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
-    s.h___8695 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C29919_VT)) failedCast(r0);
+    s.h___38232 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed90___U1 = (r0);
-    s.unnamed91___U2 = (0);
+    s.unnamed930___U1 = (r0);
+    s.unnamed931___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed91___U2;
-    r0 = pxsim_Array__length(s.unnamed90___U1);
+    s.tmp_0 = r0 = s.unnamed931___U2;
+    r0 = pxsim_Array__length(s.unnamed930___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed90___U1, s.unnamed91___U2);
-    s.h___8695 = (r0);
-    s.tmp_2 = control_EventHandler_register__P4025_mk(s);
-    s.tmp_2.arg0 = s.h___8695;
+    r0 = pxsim_Array__getAt(s.unnamed930___U1, s.unnamed931___U2);
+    s.h___38232 = (r0);
+    s.tmp_2 = control_EventHandler_register__P33560_mk(s);
+    s.tmp_2.arg0 = s.h___38232;
     s.callLocIdx = 56; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed91___U2 + 1);
-    s.unnamed91___U2 = (r0);
+    r0 = (s.unnamed931___U2 + 1);
+    s.unnamed931___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed90___U1 = (undefined);
-    s.tmp_0 = control_EventContext_registerFrameCallbacks__P4030_mk(s);
+    s.unnamed930___U1 = (undefined);
+    s.tmp_0 = control_EventContext_registerFrameCallbacks__P33565_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 57; s.pc = 4; return s.tmp_0;
   case 4:
@@ -36753,19 +36760,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_register__P390.info = {"start":4386,"length":138,"line":131,"column":8,"endLine":135,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
+control_EventContext_register__P29925.info = {"start":4386,"length":138,"line":131,"column":8,"endLine":135,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
 
-function control_EventContext_register__P390_mk(s) {
+function control_EventContext_register__P29925_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_register__P390, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_register__P29925, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  h___8695: undefined,
-  unnamed90___U1: undefined,
-  unnamed91___U2: undefined,
+  h___38232: undefined,
+  unnamed930___U1: undefined,
+  unnamed931___U2: undefined,
   arg0: undefined,
 } }
 
@@ -36773,7 +36780,7 @@ function control_EventContext_register__P390_mk(s) {
 
 
 
-function game_pushScene__P2536(s) {
+function game_pushScene__P31955(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36783,45 +36790,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.oldScene___12444 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1157; s.pc = 5; return s.tmp_0;
+    s.oldScene___41970 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1114; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.oldScene___12444 = (r0);
-    s.tmp_0 = particles_clearAll__P2708_mk(s);
-    s.callLocIdx = 1158; s.pc = 6; return s.tmp_0;
+    s.oldScene___41970 = (r0);
+    s.tmp_0 = particles_clearAll__P32127_mk(s);
+    s.callLocIdx = 1115; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = particles_disableAll__P2709_mk(s);
-    s.callLocIdx = 1159; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = particles_disableAll__P32128_mk(s);
+    s.callLocIdx = 1116; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals._sceneStack___4349);
+    r0 = pxsim_numops_toBoolDecr(globals._sceneStack___33842);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals._sceneStack___4349 = (r0);
+    globals._sceneStack___33842 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array__push(globals._sceneStack___4349, globals._scene___4348);
-    s.tmp_0 = game_init__P4356_mk(s);
+    r0 = pxsim_Array__push(globals._sceneStack___33842, globals._scene___33841);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1160; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1117; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___4350);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___33843);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P12461);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P41987);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___12444);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_1.arg0 = globals._scenePushHandlers___4350;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___41970);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_1.arg0 = globals._scenePushHandlers___33843;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1162; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 1119; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
   case 3:
@@ -36830,23 +36837,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_pushScene__P2536.info = {"start":1660,"length":367,"line":62,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"pushScene","argumentNames":[]}
+game_pushScene__P31955.info = {"start":1660,"length":367,"line":62,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"pushScene","argumentNames":[]}
 
-function game_pushScene__P2536_mk(s) {
+function game_pushScene__P31955_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_pushScene__P2536, depth: s.depth + 1,
+        parent: s, fn: game_pushScene__P31955, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  oldScene___12444: undefined,
+  oldScene___41970: undefined,
 } }
 
 
 
 
 
-function inline__P12461(s) {
+function inline__P41987(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36864,19 +36871,19 @@ switch (step) {
     s.tmp_0.argL = s.arg0;
     s.tmp_0.arg0 = s.caps[0];
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1161; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1118; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12461.info = {"start":1991,"length":18,"line":71,"column":39,"endLine":71,"endColumn":57,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["cb"]}
+inline__P41987.info = {"start":1991,"length":18,"line":71,"column":39,"endLine":71,"endColumn":57,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":["cb"]}
 
-function inline__P12461_mk(s) {
+function inline__P41987_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12461, depth: s.depth + 1,
+        parent: s, fn: inline__P41987, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36886,7 +36893,7 @@ function inline__P12461_mk(s) {
 
 
 
-function particles_disableAll__P2709(s) {
+function particles_disableAll__P32128(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36896,22 +36903,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___12465 = undefined;
-    s.tmp_0 = particles_particleSources__P4712_mk(s);
-    s.callLocIdx = 1567; s.pc = 3; return s.tmp_0;
+    s.sources___41991 = undefined;
+    s.tmp_0 = particles_particleSources__P34205_mk(s);
+    s.callLocIdx = 1524; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___12465 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___12465);
+    s.sources___41991 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___41991);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_0.arg0 = s.sources___12465;
-    s.tmp_0.arg1 = inline__P12471;
-    s.callLocIdx = 1569; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_0.arg0 = s.sources___41991;
+    s.tmp_0.arg1 = inline__P41997;
+    s.callLocIdx = 1526; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P4708_mk(s);
-    s.callLocIdx = 1570; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P34201_mk(s);
+    s.callLocIdx = 1527; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -36920,22 +36927,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_disableAll__P2709.info = {"start":12353,"length":195,"line":401,"column":4,"endLine":407,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"disableAll","argumentNames":[]}
+particles_disableAll__P32128.info = {"start":12353,"length":195,"line":401,"column":4,"endLine":407,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"disableAll","argumentNames":[]}
 
-function particles_disableAll__P2709_mk(s) {
+function particles_disableAll__P32128_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_disableAll__P2709, depth: s.depth + 1,
+        parent: s, fn: particles_disableAll__P32128, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___12465: undefined,
+  sources___41991: undefined,
 } }
 
 
 
 
 
-function inline__P12471(s) {
+function inline__P41997(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36949,22 +36956,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
+    s.tmp_0 = particles_ParticleSource_enabled__P32110_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1568; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1525; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = false;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12471.info = {"start":12478,"length":22,"line":404,"column":28,"endLine":404,"endColumn":50,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P41997.info = {"start":12478,"length":22,"line":404,"column":28,"endLine":404,"endColumn":50,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P12471_mk(s) {
+function inline__P41997_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12471, depth: s.depth + 1,
+        parent: s, fn: inline__P41997, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36974,7 +36981,7 @@ function inline__P12471_mk(s) {
 
 
 
-function particles_clearAll__P2708(s) {
+function particles_clearAll__P32127(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36984,22 +36991,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___12476 = undefined;
-    s.tmp_0 = particles_particleSources__P4712_mk(s);
-    s.callLocIdx = 1563; s.pc = 3; return s.tmp_0;
+    s.sources___42002 = undefined;
+    s.tmp_0 = particles_particleSources__P34205_mk(s);
+    s.callLocIdx = 1520; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___12476 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___12476);
+    s.sources___42002 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___42002);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_0.arg0 = s.sources___12476;
-    s.tmp_0.arg1 = inline__P12482;
-    s.callLocIdx = 1565; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_0.arg0 = s.sources___42002;
+    s.tmp_0.arg1 = inline__P42008;
+    s.callLocIdx = 1522; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P4708_mk(s);
-    s.callLocIdx = 1566; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P34201_mk(s);
+    s.callLocIdx = 1523; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -37008,22 +37015,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_clearAll__P2708.info = {"start":12081,"length":185,"line":390,"column":4,"endLine":396,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"clearAll","argumentNames":[]}
+particles_clearAll__P32127.info = {"start":12081,"length":185,"line":390,"column":4,"endLine":396,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"clearAll","argumentNames":[]}
 
-function particles_clearAll__P2708_mk(s) {
+function particles_clearAll__P32127_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_clearAll__P2708, depth: s.depth + 1,
+        parent: s, fn: particles_clearAll__P32127, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___12476: undefined,
+  sources___42002: undefined,
 } }
 
 
 
 
 
-function inline__P12482(s) {
+function inline__P42008(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37037,21 +37044,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_clear__P2693_mk(s);
+    s.tmp_0 = particles_ParticleSource_clear__P32112_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1564; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1521; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12482.info = {"start":12204,"length":14,"line":393,"column":28,"endLine":393,"endColumn":42,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P42008.info = {"start":12204,"length":14,"line":393,"column":28,"endLine":393,"endColumn":42,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P12482_mk(s) {
+function inline__P42008_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12482, depth: s.depth + 1,
+        parent: s, fn: inline__P42008, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -37061,7 +37068,7 @@ function inline__P12482_mk(s) {
 
 
 
-function controller__setUserEventsEnabled__P1954(s) {
+function controller__setUserEventsEnabled__P31373(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37075,17 +37082,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    globals._userEventsEnabled___4177 = (s.arg0);
+    globals._userEventsEnabled___33670 = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller__setUserEventsEnabled__P1954.info = {"start":19246,"length":101,"line":587,"column":4,"endLine":589,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_setUserEventsEnabled","argumentNames":["enabled"]}
+controller__setUserEventsEnabled__P31373.info = {"start":19246,"length":101,"line":587,"column":4,"endLine":589,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_setUserEventsEnabled","argumentNames":["enabled"]}
 
-function controller__setUserEventsEnabled__P1954_mk(s) {
+function controller__setUserEventsEnabled__P31373_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__setUserEventsEnabled__P1954, depth: s.depth + 1,
+        parent: s, fn: controller__setUserEventsEnabled__P31373, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -37094,7 +37101,7 @@ function controller__setUserEventsEnabled__P1954_mk(s) {
 
 
 
-function game_NumberPrompt_constructor__P2579(s) {
+function game_NumberPrompt_constructor__P31998(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37110,7 +37117,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C31993_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["theme"] = (s.arg1);
@@ -37137,12 +37144,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_constructor__P2579.info = {"start":4128,"length":696,"line":125,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":["this","theme"]}
+game_NumberPrompt_constructor__P31998.info = {"start":4128,"length":696,"line":125,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game---hw/numberprompt.ts","functionName":"inline","argumentNames":["this","theme"]}
 
-function game_NumberPrompt_constructor__P2579_mk(s) {
+function game_NumberPrompt_constructor__P31998_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_constructor__P2579, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_constructor__P31998, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -37153,7 +37160,7 @@ function game_NumberPrompt_constructor__P2579_mk(s) {
 
 
 
-function game_ask__P2582(s) {
+function game_ask__P32001(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37163,82 +37170,82 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.answer___12513 = undefined;
+    s.answer___42039 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_eventContext__P2535_mk(s);
-    s.callLocIdx = 1336; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_eventContext__P31954_mk(s);
+    s.callLocIdx = 1293; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = control_pushEventContext__P398_mk(s);
-    s.callLocIdx = 1337; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = control_pushEventContext__P29933_mk(s);
+    s.callLocIdx = 1294; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_showDialog__P2538_mk(s);
+    s.tmp_0 = game_showDialog__P31957_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "A = OK, B = CANCEL";
-    s.callLocIdx = 1338; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1295; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = pxsim_pxtrt.mklocRef();
-    s.answer___12513 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.answer___12513, null);
-    s.tmp_0 = pause__P402_mk(s);
+    s.answer___42039 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.answer___42039, null);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 500;
-    s.callLocIdx = 1339; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1296; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P12520);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P42045);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___12513);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.A___1877;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___42039);
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.A___31296;
     s.tmp_1.arg1 = 2049;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1340; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1297; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P12525);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P42050);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___12513);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.B___1878;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___42039);
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.B___31297;
     s.tmp_1.arg1 = 2049;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1341; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1298; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P12529);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P42054);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___12513);
-    s.tmp_1 = pauseUntil__P356_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___42039);
+    s.tmp_1 = pauseUntil__P29891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1342; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1299; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = control_popEventContext__P399_mk(s);
-    s.callLocIdx = 1343; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = control_popEventContext__P29934_mk(s);
+    s.callLocIdx = 1300; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.answer___12513);
+    r0 = pxsim_pxtrt_ldlocRef(s.answer___42039);
     return leave(s, r0)
   default: oops()
 } } }
-game_ask__P2582.info = {"start":261,"length":610,"line":10,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/game/ask.ts","functionName":"ask","argumentNames":["title","subtitle"]}
+game_ask__P32001.info = {"start":261,"length":610,"line":10,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/game---hw/ask.ts","functionName":"ask","argumentNames":["title","subtitle"]}
 
-function game_ask__P2582_mk(s) {
+function game_ask__P32001_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_ask__P2582, depth: s.depth + 1,
+        parent: s, fn: game_ask__P32001, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  answer___12513: undefined,
+  answer___42039: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -37247,7 +37254,7 @@ function game_ask__P2582_mk(s) {
 
 
 
-function inline__P12520(s) {
+function inline__P42045(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37262,12 +37269,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12520.info = {"start":660,"length":19,"line":18,"column":60,"endLine":18,"endColumn":79,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
+inline__P42045.info = {"start":660,"length":19,"line":18,"column":60,"endLine":18,"endColumn":79,"fileName":"pxt_modules/game---hw/ask.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P12520_mk(s) {
+function inline__P42045_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12520, depth: s.depth + 1,
+        parent: s, fn: inline__P42045, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -37275,7 +37282,7 @@ function inline__P12520_mk(s) {
 
 
 
-function inline__P12525(s) {
+function inline__P42050(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37290,12 +37297,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12525.info = {"start":742,"length":20,"line":19,"column":60,"endLine":19,"endColumn":80,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
+inline__P42050.info = {"start":742,"length":20,"line":19,"column":60,"endLine":19,"endColumn":80,"fileName":"pxt_modules/game---hw/ask.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P12525_mk(s) {
+function inline__P42050_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12525, depth: s.depth + 1,
+        parent: s, fn: inline__P42050, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -37303,7 +37310,7 @@ function inline__P12525_mk(s) {
 
 
 
-function inline__P12529(s) {
+function inline__P42054(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37319,12 +37326,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12529.info = {"start":784,"length":21,"line":20,"column":19,"endLine":20,"endColumn":40,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
+inline__P42054.info = {"start":784,"length":21,"line":20,"column":19,"endLine":20,"endColumn":40,"fileName":"pxt_modules/game---hw/ask.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P12529_mk(s) {
+function inline__P42054_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12529, depth: s.depth + 1,
+        parent: s, fn: inline__P42054, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -37333,7 +37340,7 @@ function inline__P12529_mk(s) {
 
 
 
-function game_showDialog__P2538(s) {
+function game_showDialog__P31957(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37343,22 +37350,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.titleFont___12540 = undefined;
-    s.subFont___12545 = undefined;
-    s.footerFont___12550 = undefined;
-    s.h___12555 = undefined;
-    s.top___12574 = undefined;
-    s.y___12578 = undefined;
-    s.footerTop___12615 = undefined;
+    s.titleFont___42065 = undefined;
+    s.subFont___42070 = undefined;
+    s.footerFont___42075 = undefined;
+    s.h___42080 = undefined;
+    s.top___42099 = undefined;
+    s.y___42103 = undefined;
+    s.footerTop___42140 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P4356_mk(s);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1172; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 1129; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -37371,12 +37378,12 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P1747_mk(s);
+    s.tmp_2 = image_getFontForText__P31165_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 1173; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 1130; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
-    s.titleFont___12540 = (r0);
+    s.titleFont___42065 = (r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -37387,12 +37394,12 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P1747_mk(s);
+    s.tmp_2 = image_getFontForText__P31165_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 1174; s.pc = 23; return s.tmp_2;
+    s.callLocIdx = 1131; s.pc = 23; return s.tmp_2;
   case 23:
     r0 = s.retval;
-    s.subFont___12545 = (r0);
+    s.subFont___42070 = (r0);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -37403,45 +37410,45 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P1747_mk(s);
+    s.tmp_2 = image_getFontForText__P31165_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 1175; s.pc = 24; return s.tmp_2;
+    s.callLocIdx = 1132; s.pc = 24; return s.tmp_2;
   case 24:
     r0 = s.retval;
-    s.footerFont___12550 = (r0);
-    s.h___12555 = (8);
+    s.footerFont___42075 = (r0);
+    s.h___42080 = (8);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = r0 = s.h___12555;
+    s.tmp_0 = r0 = s.h___42080;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.titleFont___12540;
+    s.tmp_2.arg0 = s.titleFont___42065;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charHeight");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charHeight"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charHeight"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1176; s.pc = 25; return s.tmp_2; }
+     else { s.callLocIdx = 1133; s.pc = 25; return s.tmp_2; }
     }
   case 25:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.h___12555 = (r0);
+    s.h___42080 = (r0);
   case 7:
   case 8:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 9; continue; }
-    s.tmp_0 = r0 = s.h___12555;
+    s.tmp_0 = r0 = s.h___42080;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.subFont___12545;
+    s.tmp_3.arg0 = s.subFont___42070;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1177; s.pc = 26; return s.tmp_3; }
+     else { s.callLocIdx = 1134; s.pc = 26; return s.tmp_3; }
     }
   case 26:
     r0 = s.retval;
@@ -37449,23 +37456,23 @@ switch (step) {
     r0 = (2 + s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.h___12555 = (r0);
+    s.h___42080 = (r0);
   case 9:
   case 10:
-    r0 = (s.h___12555 + 8);
-    s.h___12555 = (r0);
-    s.tmp_0 = game_showDialogBackground__P4357_mk(s);
-    s.tmp_0.arg0 = s.h___12555;
+    r0 = (s.h___42080 + 8);
+    s.h___42080 = (r0);
+    s.tmp_0 = game_showDialogBackground__P33850_mk(s);
+    s.tmp_0.arg0 = s.h___42080;
     s.tmp_0.arg1 = 9;
-    s.callLocIdx = 1178; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 1135; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.top___12574 = (r0);
-    r0 = (s.top___12574 + 8);
-    s.y___12578 = (r0);
+    s.top___42099 = (r0);
+    r0 = (s.top___42099 + 8);
+    s.y___42103 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 13; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
@@ -37476,27 +37483,27 @@ switch (step) {
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
+    s.tmp_2 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = 8;
-    s.tmp_2.arg3 = s.y___12578;
+    s.tmp_2.arg3 = s.y___42103;
     s.tmp_2.arg4 = s.tmp_1;
-    s.tmp_2.arg5 = s.titleFont___12540;
+    s.tmp_2.arg5 = s.titleFont___42065;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 1179; s.pc = 28; return s.tmp_2;
+    s.callLocIdx = 1136; s.pc = 28; return s.tmp_2;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.y___12578;
+    s.tmp_0 = r0 = s.y___42103;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.titleFont___12540;
+    s.tmp_3.arg0 = s.titleFont___42065;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1180; s.pc = 29; return s.tmp_3; }
+     else { s.callLocIdx = 1137; s.pc = 29; return s.tmp_3; }
     }
   case 29:
     r0 = s.retval;
@@ -37504,12 +37511,12 @@ switch (step) {
     r0 = (s.tmp_2 + 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y___12578 = (r0);
+    s.y___42103 = (r0);
   case 13:
   case 14:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 17; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
@@ -37520,27 +37527,27 @@ switch (step) {
   case 16:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
+    s.tmp_2 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = 8;
-    s.tmp_2.arg3 = s.y___12578;
+    s.tmp_2.arg3 = s.y___42103;
     s.tmp_2.arg4 = s.tmp_1;
-    s.tmp_2.arg5 = s.subFont___12545;
+    s.tmp_2.arg5 = s.subFont___42070;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 1181; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 1138; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.y___12578;
+    s.tmp_0 = r0 = s.y___42103;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.subFont___12545;
+    s.tmp_3.arg0 = s.subFont___42070;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1182; s.pc = 31; return s.tmp_3; }
+     else { s.callLocIdx = 1139; s.pc = 31; return s.tmp_3; }
     }
   case 31:
     r0 = s.retval;
@@ -37548,22 +37555,22 @@ switch (step) {
     r0 = (s.tmp_2 + 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y___12578 = (r0);
+    s.y___42103 = (r0);
   case 17:
   case 18:
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 19; continue; }
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.footerFont___12550;
+    s.tmp_3.arg0 = s.footerFont___42075;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1183; s.pc = 32; return s.tmp_3; }
+     else { s.callLocIdx = 1140; s.pc = 32; return s.tmp_3; }
     }
   case 32:
     r0 = s.retval;
@@ -37571,22 +37578,22 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.footerTop___12615 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.footerTop___42140 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.footerTop___12615;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0.arg2 = s.footerTop___42140;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.footerFont___12550;
+    s.tmp_2.arg0 = s.footerFont___42075;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charHeight");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charHeight"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charHeight"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1184; s.pc = 34; return s.tmp_2; }
+     else { s.callLocIdx = 1141; s.pc = 34; return s.tmp_2; }
     }
   case 34:
     r0 = s.retval;
@@ -37594,36 +37601,36 @@ switch (step) {
     r0 = (s.tmp_1 + 4);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 1185; s.pc = 33; return s.tmp_0;
+    s.callLocIdx = 1142; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imageDrawLine__P31148_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.footerTop___12615;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0.arg2 = s.footerTop___42140;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = s.footerTop___12615;
+    s.tmp_0.arg4 = s.footerTop___42140;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1186; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 1143; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = s.arg2;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = pxsim_String_.length(s.arg2);
     s.tmp_4 = r0;
     s.tmp_6 = if_charWidth_1_mk(s);
-    s.tmp_6.arg0 = s.footerFont___12550;
+    s.tmp_6.arg0 = s.footerFont___42075;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "charWidth");
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["charWidth"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["charWidth"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1187; s.pc = 37; return s.tmp_6; }
+     else { s.callLocIdx = 1144; s.pc = 37; return s.tmp_6; }
     }
   case 37:
     r0 = s.retval;
@@ -37634,17 +37641,17 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 8);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_8 = r0;
     s.tmp_10 = if_charHeight_1_mk(s);
-    s.tmp_10.arg0 = s.footerFont___12550;
+    s.tmp_10.arg0 = s.footerFont___42075;
     if (!s.tmp_10.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_10.arg0, "charHeight");
     } else {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["charHeight"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["charHeight"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 1188; s.pc = 38; return s.tmp_10; }
+     else { s.callLocIdx = 1145; s.pc = 38; return s.tmp_10; }
     }
   case 38:
     r0 = s.retval;
@@ -37654,9 +37661,9 @@ switch (step) {
     r0 = (s.tmp_7 - 2);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.footerFont___12550;
+    s.tmp_0.arg5 = s.footerFont___42075;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1189; s.pc = 36; return s.tmp_0;
+    s.callLocIdx = 1146; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
   case 19:
@@ -37665,12 +37672,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_showDialog__P2538.info = {"start":2895,"length":1313,"line":104,"column":4,"endLine":137,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"showDialog","argumentNames":["title","subtitle","footer"]}
+game_showDialog__P31957.info = {"start":2895,"length":1313,"line":104,"column":4,"endLine":137,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"showDialog","argumentNames":["title","subtitle","footer"]}
 
-function game_showDialog__P2538_mk(s) {
+function game_showDialog__P31957_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showDialog__P2538, depth: s.depth + 1,
+        parent: s, fn: game_showDialog__P31957, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37683,13 +37690,13 @@ function game_showDialog__P2538_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  titleFont___12540: undefined,
-  subFont___12545: undefined,
-  footerFont___12550: undefined,
-  h___12555: undefined,
-  top___12574: undefined,
-  y___12578: undefined,
-  footerTop___12615: undefined,
+  titleFont___42065: undefined,
+  subFont___42070: undefined,
+  footerFont___42075: undefined,
+  h___42080: undefined,
+  top___42099: undefined,
+  y___42103: undefined,
+  footerTop___42140: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -37699,7 +37706,7 @@ function game_showDialog__P2538_mk(s) {
 
 
 
-function game_showDialogBackground__P4357(s) {
+function game_showDialogBackground__P33850(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37709,72 +37716,72 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.top___12675 = undefined;
+    s.top___42200 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - s.arg0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.top___12675 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.top___42200 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.top___12675;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0.arg2 = s.top___42200;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg0;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 1169; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1126; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imageDrawLine__P31148_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.top___12675;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0.arg2 = s.top___42200;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = s.top___12675;
+    s.tmp_0.arg4 = s.top___42200;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1170; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1127; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imageDrawLine__P31148_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
-    r0 = (s.top___12675 + s.arg0);
+    r0 = (s.top___42200 + s.arg0);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
-    r0 = (s.top___12675 + s.arg0);
+    r0 = (s.top___42200 + s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1171; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1128; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = s.top___12675;
+    r0 = s.top___42200;
     return leave(s, r0)
   default: oops()
 } } }
-game_showDialogBackground__P4357.info = {"start":2587,"length":302,"line":95,"column":4,"endLine":102,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"showDialogBackground","argumentNames":["h","c"]}
+game_showDialogBackground__P33850.info = {"start":2587,"length":302,"line":95,"column":4,"endLine":102,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"showDialogBackground","argumentNames":["h","c"]}
 
-function game_showDialogBackground__P4357_mk(s) {
+function game_showDialogBackground__P33850_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showDialogBackground__P4357, depth: s.depth + 1,
+        parent: s, fn: game_showDialogBackground__P33850, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  top___12675: undefined,
+  top___42200: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -37783,7 +37790,7 @@ function game_showDialogBackground__P4357_mk(s) {
 
 
 
-function helpers_imageDrawLine__P1730(s) {
+function helpers_imageDrawLine__P31148(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37803,17 +37810,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_pack__P4100_mk(s);
+    s.tmp_2 = helpers_pack__P33604_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = s.arg2;
-    s.callLocIdx = 123; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 75; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = helpers_pack__P4100_mk(s);
+    s.tmp_4 = helpers_pack__P33604_mk(s);
     s.tmp_4.arg0 = s.arg3;
     s.tmp_4.arg1 = s.arg4;
-    s.callLocIdx = 124; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 76; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -37822,12 +37829,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawLine__P1730.info = {"start":3977,"length":159,"line":137,"column":4,"endLine":139,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawLine","argumentNames":["img","x","y","w","h","c"]}
+helpers_imageDrawLine__P31148.info = {"start":3977,"length":159,"line":137,"column":4,"endLine":139,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"imageDrawLine","argumentNames":["img","x","y","w","h","c"]}
 
-function helpers_imageDrawLine__P1730_mk(s) {
+function helpers_imageDrawLine__P31148_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawLine__P1730, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawLine__P31148, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37846,7 +37853,7 @@ function helpers_imageDrawLine__P1730_mk(s) {
 
 
 
-function game_showLongText__P2521(s) {
+function game_showLongText__P31940(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37856,31 +37863,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.width___12717 = undefined;
-    s.height___12718 = undefined;
-    s.top___12719 = undefined;
-    s.left___12720 = undefined;
-    s.dialog___12831 = undefined;
-    s.s___12839 = undefined;
-    s.pressed___12855 = undefined;
-    s.done___12856 = undefined;
-    s.upPressed___12857 = undefined;
+    s.width___42242 = undefined;
+    s.height___42243 = undefined;
+    s.top___42244 = undefined;
+    s.left___42245 = undefined;
+    s.dialog___42356 = undefined;
+    s.s___42364 = undefined;
+    s.pressed___42380 = undefined;
+    s.done___42381 = undefined;
+    s.upPressed___42382 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P31373_mk(s);
     s.tmp_0.arg0 = false;
-    s.callLocIdx = 1124; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1081; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = game_pushScene__P2536_mk(s);
-    s.callLocIdx = 1125; s.pc = 9; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P31955_mk(s);
+    s.callLocIdx = 1082; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1126; s.pc = 10; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1083; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -37905,206 +37912,206 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 1:
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 4);
-    s.width___12717 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.width___42242 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.height___12718 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.height___42243 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.height___12718);
-    s.top___12719 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = (s.tmp_0 - s.height___42243);
+    s.top___42244 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___12717);
+    r0 = (s.tmp_1 - s.width___42242);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.left___12720 = (r0);
+    s.left___42245 = (r0);
     { step = 7; continue; }
   case 2:
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.width___12717 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.width___42242 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.height___12718 = (r0);
-    s.top___12719 = (0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.height___42243 = (r0);
+    s.top___42244 = (0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___12717);
+    r0 = (s.tmp_1 - s.width___42242);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.left___12720 = (r0);
+    s.left___42245 = (r0);
     { step = 7; continue; }
   case 3:
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.width___12717 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
-    s.height___12718 = (r0);
-    s.top___12719 = (0);
-    s.left___12720 = (0);
+    s.width___42242 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
+    s.height___42243 = (r0);
+    s.top___42244 = (0);
+    s.left___42245 = (0);
     { step = 7; continue; }
   case 4:
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.width___12717 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
-    s.height___12718 = (r0);
-    s.top___12719 = (0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.width___12717);
-    s.left___12720 = (r0);
+    s.width___42242 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
+    s.height___42243 = (r0);
+    s.top___42244 = (0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 - s.width___42242);
+    s.left___42245 = (r0);
     { step = 7; continue; }
   case 5:
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 << 1);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 3);
-    s.width___12717 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.width___42242 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 << 1);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 3);
-    s.height___12718 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.height___42243 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.height___12718);
+    r0 = (s.tmp_1 - s.height___42243);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.top___12719 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.top___42244 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___12717);
+    r0 = (s.tmp_1 - s.width___42242);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.left___12720 = (r0);
+    s.left___42245 = (r0);
     { step = 7; continue; }
   case 6:
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
-    s.width___12717 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
-    s.height___12718 = (r0);
-    s.top___12719 = (0);
-    s.left___12720 = (0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
+    s.width___42242 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
+    s.height___42243 = (r0);
+    s.top___42244 = (0);
+    s.left___42245 = (0);
   case 7:
-    r0 = pxsim_pxtcore_mkClassInstance(game_Dialog__C2494_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(game_Dialog__C31913_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_Dialog_constructor__P2497_mk(s);
+    s.tmp_1 = game_Dialog_constructor__P31916_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.width___12717;
-    s.tmp_1.arg2 = s.height___12718;
+    s.tmp_1.arg1 = s.width___42242;
+    s.tmp_1.arg2 = s.height___42243;
     s.tmp_1.arg3 = undefined;
     s.tmp_1.arg4 = undefined;
     s.tmp_1.arg5 = undefined;
-    s.callLocIdx = 1127; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 1084; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
-    s.dialog___12831 = (s.tmp_0);
-    s.tmp_0 = sprites_create__P1974_mk(s);
-    r0 = s.dialog___12831.fields["image"];
+    s.dialog___42356 = (s.tmp_0);
+    s.tmp_0 = sprites_create__P31393_mk(s);
+    r0 = s.dialog___42356.fields["image"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1128; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1085; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.s___12839 = (r0);
-    s.tmp_0 = Sprite_top__P2067_mk(s);
-    s.tmp_0.arg0 = s.s___12839;
-    s.tmp_0.arg1 = s.top___12719;
-    s.callLocIdx = 1129; s.pc = 13; return s.tmp_0;
+    s.s___42364 = (r0);
+    s.tmp_0 = Sprite_top__P31486_mk(s);
+    s.tmp_0.arg0 = s.s___42364;
+    s.tmp_0.arg1 = s.top___42244;
+    s.callLocIdx = 1086; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = Sprite_left__P2063_mk(s);
-    s.tmp_0.arg0 = s.s___12839;
-    s.tmp_0.arg1 = s.left___12720;
-    s.callLocIdx = 1130; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = Sprite_left__P31482_mk(s);
+    s.tmp_0.arg0 = s.s___42364;
+    s.tmp_0.arg1 = s.left___42245;
+    s.callLocIdx = 1087; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = game_Dialog__C2494_v1_2_mk(s);
-    s.tmp_0.arg0 = s.dialog___12831;
+    s.tmp_0 = game_Dialog__C31913_v1_2_mk(s);
+    s.tmp_0.arg0 = s.dialog___42356;
     s.tmp_0.arg1 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, game_Dialog__C2494_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_Dialog__C31913_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.setText;
     s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     r0 = pxsim_pxtrt.mklocRef();
-    s.pressed___12855 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.pressed___12855, true);
+    s.pressed___42380 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.pressed___42380, true);
     r0 = pxsim_pxtrt.mklocRef();
-    s.done___12856 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.done___12856, false);
+    s.done___42381 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.done___42381, false);
     r0 = pxsim_pxtrt.mklocRef();
-    s.upPressed___12857 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.upPressed___12857, true);
-    r0 = pxsim_pxtcore_mkAction(4, inline__P12859);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dialog___12831);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pressed___12855);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.done___12856);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.upPressed___12857);
-    s.tmp_1 = game_onUpdate__P2543_mk(s);
+    s.upPressed___42382 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.upPressed___42382, true);
+    r0 = pxsim_pxtcore_mkAction(4, inline__P42384);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dialog___42356);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pressed___42380);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.done___42381);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.upPressed___42382);
+    s.tmp_1 = game_onUpdate__P31962_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1137; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 1094; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P12907);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P42432);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.done___12856);
-    s.tmp_1 = pauseUntil__P356_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.done___42381);
+    s.tmp_1 = pauseUntil__P29891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1138; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 1095; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P31373_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1139; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1096; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_showLongText__P2521.info = {"start":13263,"length":3039,"line":410,"column":4,"endLine":502,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"showLongText","argumentNames":["str","layout"]}
+game_showLongText__P31940.info = {"start":13263,"length":3039,"line":410,"column":4,"endLine":502,"endColumn":5,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"showLongText","argumentNames":["str","layout"]}
 
-function game_showLongText__P2521_mk(s) {
+function game_showLongText__P31940_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showLongText__P2521, depth: s.depth + 1,
+        parent: s, fn: game_showLongText__P31940, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  width___12717: undefined,
-  height___12718: undefined,
-  top___12719: undefined,
-  left___12720: undefined,
-  dialog___12831: undefined,
-  s___12839: undefined,
-  pressed___12855: undefined,
-  done___12856: undefined,
-  upPressed___12857: undefined,
+  width___42242: undefined,
+  height___42243: undefined,
+  top___42244: undefined,
+  left___42245: undefined,
+  dialog___42356: undefined,
+  s___42364: undefined,
+  pressed___42380: undefined,
+  done___42381: undefined,
+  upPressed___42382: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -38113,7 +38120,7 @@ function game_showLongText__P2521_mk(s) {
 
 
 
-function inline__P12859(s) {
+function inline__P42384(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38123,18 +38130,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currentState___12862 = undefined;
-    s.moveBack___12887 = undefined;
-    s.tmp_0 = game_BaseDialog__C2477_v0_1_mk(s);
+    s.currentState___42387 = undefined;
+    s.moveBack___42412 = undefined;
+    s.tmp_0 = game_BaseDialog__C31896_v0_1_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C2477_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C31896_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.update;
     s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.A___1877;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.A___31296;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 24; return s.tmp_1;
   case 24:
@@ -38145,9 +38152,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_2.arg0 = globals.down___1882;
-    if (!checkSubtype(s.tmp_2.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_2.arg0);
+    s.tmp_2 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_2.arg0 = globals.down___31301;
+    if (!checkSubtype(s.tmp_2.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_2.arg0);
     s.tmp_2.fn = s.tmp_2.arg0.vtable.methods.isPressed;
     s.pc = 25; return s.tmp_2;
   case 25:
@@ -38155,8 +38162,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.currentState___12862 = (s.tmp_3);
-    s.tmp_0 = r0 = s.currentState___12862;
+    s.currentState___42387 = (s.tmp_3);
+    s.tmp_0 = r0 = s.currentState___42387;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
@@ -38173,28 +38180,28 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], true);
-    s.tmp_1 = game_Dialog_hasNext__P2498_mk(s);
+    s.tmp_1 = game_Dialog_hasNext__P31917_mk(s);
     s.tmp_1.arg0 = s.caps[0];
-    s.callLocIdx = 1131; s.pc = 26; return s.tmp_1;
+    s.callLocIdx = 1088; s.pc = 26; return s.tmp_1;
   case 26:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = game_Dialog_nextPage__P2500_mk(s);
+    s.tmp_2 = game_Dialog_nextPage__P31919_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 1132; s.pc = 27; return s.tmp_2;
+    s.callLocIdx = 1089; s.pc = 27; return s.tmp_2;
   case 27:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
+    s.tmp_0 = scene_setBackgroundImage__P31878_mk(s);
     s.tmp_0.arg0 = null;
-    s.callLocIdx = 1133; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1090; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P2537_mk(s);
-    s.callLocIdx = 1134; s.pc = 29; return s.tmp_0;
+    s.tmp_0 = game_popScene__P31956_mk(s);
+    s.callLocIdx = 1091; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
     r0 = pxsim_pxtrt_stlocRef(s.caps[2], true);
@@ -38208,7 +38215,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 9; continue; }
   case 8:
-    r0 = pxsim_numops_toBoolDecr(s.currentState___12862);
+    r0 = pxsim_numops_toBoolDecr(s.currentState___42387);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
   case 9:
@@ -38220,15 +38227,15 @@ switch (step) {
   case 10:
   case 11:
   case 12:
-    s.tmp_0 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_0.arg0 = globals.up___1880;
-    if (!checkSubtype(s.tmp_0.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_0.arg0 = globals.up___31299;
+    if (!checkSubtype(s.tmp_0.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.isPressed;
     s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
-    s.moveBack___12887 = (r0);
-    s.tmp_0 = r0 = s.moveBack___12887;
+    s.moveBack___42412 = (r0);
+    s.tmp_0 = r0 = s.moveBack___42412;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 13; continue; }
     r0 = s.tmp_0;
@@ -38245,17 +38252,17 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 17; continue; }
     r0 = pxsim_pxtrt_stlocRef(s.caps[3], true);
-    s.tmp_1 = game_Dialog_hasPrev__P2499_mk(s);
+    s.tmp_1 = game_Dialog_hasPrev__P31918_mk(s);
     s.tmp_1.arg0 = s.caps[0];
-    s.callLocIdx = 1135; s.pc = 31; return s.tmp_1;
+    s.callLocIdx = 1092; s.pc = 31; return s.tmp_1;
   case 31:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_2 = game_Dialog_prevPage__P2501_mk(s);
+    s.tmp_2 = game_Dialog_prevPage__P31920_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 1136; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 1093; s.pc = 32; return s.tmp_2;
   case 32:
     r0 = s.retval;
   case 15:
@@ -38269,7 +38276,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    r0 = pxsim_numops_toBoolDecr(s.moveBack___12887);
+    r0 = pxsim_numops_toBoolDecr(s.moveBack___42412);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
   case 19:
@@ -38285,26 +38292,26 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12859.info = {"start":15283,"length":931,"line":470,"column":22,"endLine":498,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":[]}
+inline__P42384.info = {"start":15283,"length":931,"line":470,"column":22,"endLine":498,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P12859_mk(s) {
+function inline__P42384_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12859, depth: s.depth + 1,
+        parent: s, fn: inline__P42384, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  currentState___12862: undefined,
-  moveBack___12887: undefined,
+  currentState___42387: undefined,
+  moveBack___42412: undefined,
 } }
 
 
 
 
 
-function inline__P12907(s) {
+function inline__P42432(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38318,12 +38325,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P12907.info = {"start":16236,"length":10,"line":500,"column":19,"endLine":500,"endColumn":29,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":[]}
+inline__P42432.info = {"start":16236,"length":10,"line":500,"column":19,"endLine":500,"endColumn":29,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P12907_mk(s) {
+function inline__P42432_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P12907, depth: s.depth + 1,
+        parent: s, fn: inline__P42432, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -38331,7 +38338,7 @@ function inline__P12907_mk(s) {
 
 
 
-function game_Dialog_setText__P2503(s) {
+function game_Dialog_setText__P31922(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38347,23 +38354,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_setFont__P4329_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_setFont__P33822_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = image_getFontForText__P1747_mk(s);
+    s.tmp_1 = image_getFontForText__P31165_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 1105; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1062; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1106; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1063; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = game_Dialog_chunkText__P2502_mk(s);
+    s.tmp_2 = game_Dialog_chunkText__P31921_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 1107; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1064; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -38373,12 +38380,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_setText__P2503.info = {"start":6990,"length":183,"line":227,"column":8,"endLine":231,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
+game_Dialog_setText__P31922.info = {"start":6990,"length":183,"line":227,"column":8,"endLine":231,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
 
-function game_Dialog_setText__P2503_mk(s) {
+function game_Dialog_setText__P31922_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_setText__P2503, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_setText__P31922, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38391,7 +38398,7 @@ function game_Dialog_setText__P2503_mk(s) {
 
 
 
-function game_BaseDialog_setFont__P4329(s) {
+function game_BaseDialog_setFont__P33822(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38407,18 +38414,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = (s.arg0).fields["font"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_setFont__P4329.info = {"start":5310,"length":77,"line":176,"column":8,"endLine":178,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setFont","argumentNames":["this","font"]}
+game_BaseDialog_setFont__P33822.info = {"start":5310,"length":77,"line":176,"column":8,"endLine":178,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"setFont","argumentNames":["this","font"]}
 
-function game_BaseDialog_setFont__P4329_mk(s) {
+function game_BaseDialog_setFont__P33822_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_setFont__P4329, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_setFont__P33822, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -38428,7 +38435,7 @@ function game_BaseDialog_setFont__P4329_mk(s) {
 
 
 
-function game_Dialog_chunkText__P2502(s) {
+function game_Dialog_chunkText__P31921(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38438,23 +38445,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.charactersPerRow___13176 = undefined;
-    s.charactersPerCursorRow___13185 = undefined;
-    s.rowsOfCharacters___13197 = undefined;
-    s.rowsWithCursor___13204 = undefined;
-    s.lineLengths___13212 = undefined;
-    s.i___13214 = undefined;
-    s.i___13227 = undefined;
+    s.charactersPerRow___42701 = undefined;
+    s.charactersPerCursorRow___42710 = undefined;
+    s.rowsOfCharacters___42722 = undefined;
+    s.rowsWithCursor___42729 = undefined;
+    s.lineLengths___42737 = undefined;
+    s.i___42739 = undefined;
+    s.i___42752 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
-    s.tmp_2 = game_BaseDialog_textAreaWidth__P4327_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
+    s.tmp_2 = game_BaseDialog_textAreaWidth__P33820_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1098; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1055; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -38467,7 +38474,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1099; s.pc = 6; return s.tmp_4; }
+     else { s.callLocIdx = 1056; s.pc = 6; return s.tmp_4; }
     }
   case 6:
     r0 = s.retval;
@@ -38475,8 +38482,8 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.charactersPerRow___13176 = (r0);
-    s.tmp_1 = r0 = s.charactersPerRow___13176;
+    s.charactersPerRow___42701 = (r0);
+    s.tmp_1 = r0 = s.charactersPerRow___42701;
     r0 = s.arg0.fields["cursor"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
@@ -38490,7 +38497,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["charWidth"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["charWidth"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1100; s.pc = 7; return s.tmp_6; }
+     else { s.callLocIdx = 1057; s.pc = 7; return s.tmp_6; }
     }
   case 7:
     r0 = s.retval;
@@ -38500,79 +38507,79 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.charactersPerCursorRow___13185 = (r0);
-    s.tmp_2 = game_BaseDialog_textAreaHeight__P4328_mk(s);
+    s.charactersPerCursorRow___42710 = (r0);
+    s.tmp_2 = game_BaseDialog_textAreaHeight__P33821_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1101; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1058; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = game_BaseDialog_rowHeight__P4326_mk(s);
+    s.tmp_4 = game_BaseDialog_rowHeight__P33819_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1102; s.pc = 9; return s.tmp_4;
+    s.callLocIdx = 1059; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_1 / s.tmp_3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.rowsOfCharacters___13197 = (r0);
+    s.rowsOfCharacters___42722 = (r0);
     r0 = s.arg0.fields["cursor"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
     s.tmp_1 = r0;
-    s.tmp_4 = game_BaseDialog_rowHeight__P4326_mk(s);
+    s.tmp_4 = game_BaseDialog_rowHeight__P33819_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1103; s.pc = 10; return s.tmp_4;
+    s.callLocIdx = 1060; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_1 / s.tmp_3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.ceil(s.tmp_0);
-    s.rowsWithCursor___13204 = (r0);
+    s.rowsWithCursor___42729 = (r0);
     r0 = pxsim_Array__mk();
-    s.lineLengths___13212 = (r0);
-    s.i___13214 = (0);
+    s.lineLengths___42737 = (r0);
+    s.i___42739 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___13214;
-    r0 = (s.rowsOfCharacters___13197 - s.rowsWithCursor___13204);
+    s.tmp_1 = r0 = s.i___42739;
+    r0 = (s.rowsOfCharacters___42722 - s.rowsWithCursor___42729);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__push(s.lineLengths___13212, s.charactersPerRow___13176);
-    r0 = (s.i___13214 + 1);
-    s.i___13214 = (r0);
+    r0 = pxsim_Array__push(s.lineLengths___42737, s.charactersPerRow___42701);
+    r0 = (s.i___42739 + 1);
+    s.i___42739 = (r0);
     { step = 1; continue; }
   case 2:
-    s.i___13227 = (0);
+    s.i___42752 = (0);
   case 3:
-    r0 = (s.i___13227 < s.rowsWithCursor___13204);
+    r0 = (s.i___42752 < s.rowsWithCursor___42729);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__push(s.lineLengths___13212, s.charactersPerCursorRow___13185);
-    r0 = (s.i___13227 + 1);
-    s.i___13227 = (r0);
+    r0 = pxsim_Array__push(s.lineLengths___42737, s.charactersPerCursorRow___42710);
+    r0 = (s.i___42752 + 1);
+    s.i___42752 = (r0);
     { step = 3; continue; }
   case 4:
-    s.tmp_0 = game_breakIntoPages__P4338_mk(s);
+    s.tmp_0 = game_breakIntoPages__P33831_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.lineLengths___13212;
-    s.callLocIdx = 1104; s.pc = 11; return s.tmp_0;
+    s.tmp_0.arg1 = s.lineLengths___42737;
+    s.callLocIdx = 1061; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_chunkText__P2502.info = {"start":6245,"length":735,"line":213,"column":8,"endLine":225,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"chunkText","argumentNames":["this","str"]}
+game_Dialog_chunkText__P31921.info = {"start":6245,"length":735,"line":213,"column":8,"endLine":225,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"chunkText","argumentNames":["this","str"]}
 
-function game_Dialog_chunkText__P2502_mk(s) {
+function game_Dialog_chunkText__P31921_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_chunkText__P2502, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_chunkText__P31921, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38581,13 +38588,13 @@ function game_Dialog_chunkText__P2502_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  charactersPerRow___13176: undefined,
-  charactersPerCursorRow___13185: undefined,
-  rowsOfCharacters___13197: undefined,
-  rowsWithCursor___13204: undefined,
-  lineLengths___13212: undefined,
-  i___13214: undefined,
-  i___13227: undefined,
+  charactersPerRow___42701: undefined,
+  charactersPerCursorRow___42710: undefined,
+  rowsOfCharacters___42722: undefined,
+  rowsWithCursor___42729: undefined,
+  lineLengths___42737: undefined,
+  i___42739: undefined,
+  i___42752: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -38596,7 +38603,7 @@ function game_Dialog_chunkText__P2502_mk(s) {
 
 
 
-function game_breakIntoPages__P4338(s) {
+function game_breakIntoPages__P33831(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38606,83 +38613,83 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.result___13243 = undefined;
-    s.currentPage___13245 = undefined;
-    s.lastBreakLocation___13247 = undefined;
-    s.lastBreak___13248 = undefined;
-    s.line___13249 = undefined;
-    s.lineLength___13250 = undefined;
-    s.nextLine___13253 = undefined;
-    s.index___13259 = undefined;
+    s.result___42768 = undefined;
+    s.currentPage___42770 = undefined;
+    s.lastBreakLocation___42772 = undefined;
+    s.lastBreak___42773 = undefined;
+    s.line___42774 = undefined;
+    s.lineLength___42775 = undefined;
+    s.nextLine___42778 = undefined;
+    s.index___42784 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.result___13243 = (r0);
+    s.result___42768 = (r0);
     r0 = pxsim_Array__mk();
-    s.currentPage___13245 = (r0);
-    s.lastBreakLocation___13247 = (0);
-    s.lastBreak___13248 = (0);
+    s.currentPage___42770 = (r0);
+    s.lastBreakLocation___42772 = (0);
+    s.lastBreak___42773 = (0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.line___13249 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.line___13249, 0);
+    s.line___42774 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.line___42774, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.lineLength___13250 = (r0);
-    s.tmp_0 = r0 = s.lineLength___13250;
+    s.lineLength___42775 = (r0);
+    s.tmp_0 = r0 = s.lineLength___42775;
     s.tmp_2 = r0 = s.arg1;
-    r0 = pxsim_pxtrt_ldlocRef(s.line___13249);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___42774);
     s.tmp_3 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.tmp_3);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtcore_mkAction(3, nextLine__P13253);
+    r0 = pxsim_pxtcore_mkAction(3, nextLine__P42778);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___13249);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.lineLength___13250);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___42774);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.lineLength___42775);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg1);
-    s.nextLine___13253 = (s.tmp_0);
-    s.index___13259 = (0);
+    s.nextLine___42778 = (s.tmp_0);
+    s.index___42784 = (0);
   case 1:
-    s.tmp_1 = r0 = s.index___13259;
+    s.tmp_1 = r0 = s.index___42784;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    r0 = pxsim_String_.charAt(s.arg0, s.index___13259);
+    r0 = pxsim_String_.charAt(s.arg0, s.index___42784);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 === "\n");
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 2; continue; }
-    s.tmp_5 = r0 = s.currentPage___13245;
-    s.tmp_7 = game_formatLine__P4339_mk(s);
+    s.tmp_5 = r0 = s.currentPage___42770;
+    s.tmp_7 = game_formatLine__P33832_mk(s);
     s.tmp_8 = r0 = s.arg0;
-    s.tmp_9 = r0 = s.lastBreak___13248;
-    r0 = (s.index___13259 - s.lastBreak___13248);
+    s.tmp_9 = r0 = s.lastBreak___42773;
+    r0 = (s.index___42784 - s.lastBreak___42773);
     s.tmp_10 = r0;
     r0 = pxsim_String_.substr(s.tmp_8, s.tmp_9, s.tmp_10);
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 1140; s.pc = 23; return s.tmp_7;
+    s.callLocIdx = 1097; s.pc = 23; return s.tmp_7;
   case 23:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
-    r0 = (s.index___13259 + 1);
-    s.index___13259 = (r0);
-    s.lastBreak___13248 = (s.index___13259);
+    r0 = (s.index___42784 + 1);
+    s.index___42784 = (r0);
+    s.lastBreak___42773 = (s.index___42784);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___13253;
+    s.tmp_0.argL = s.nextLine___42778;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1141; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1098; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
     { step = 9; continue; }
   case 2:
-    r0 = pxsim_String_.charAt(s.arg0, s.index___13259);
+    r0 = pxsim_String_.charAt(s.arg0, s.index___42784);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === "\\");
     s.tmp_0 = r0;
@@ -38692,7 +38699,7 @@ switch (step) {
     { step = 4; continue; }
   case 3:
     s.tmp_3 = r0 = s.arg0;
-    r0 = (s.index___13259 + 1);
+    r0 = (s.index___42784 + 1);
     s.tmp_4 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_4);
     s.tmp_2 = r0;
@@ -38702,111 +38709,111 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
-    s.tmp_6 = r0 = s.currentPage___13245;
-    s.tmp_8 = game_formatLine__P4339_mk(s);
+    s.tmp_6 = r0 = s.currentPage___42770;
+    s.tmp_8 = game_formatLine__P33832_mk(s);
     s.tmp_9 = r0 = s.arg0;
-    s.tmp_10 = r0 = s.lastBreak___13248;
-    r0 = (s.index___13259 - s.lastBreak___13248);
+    s.tmp_10 = r0 = s.lastBreak___42773;
+    r0 = (s.index___42784 - s.lastBreak___42773);
     s.tmp_11 = r0;
     r0 = pxsim_String_.substr(s.tmp_9, s.tmp_10, s.tmp_11);
     s.tmp_8.arg0 = r0;
-    s.callLocIdx = 1142; s.pc = 25; return s.tmp_8;
+    s.callLocIdx = 1099; s.pc = 25; return s.tmp_8;
   case 25:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = pxsim_Array__push(s.tmp_6, s.tmp_7);
-    r0 = (s.index___13259 + 2);
-    s.index___13259 = (r0);
-    s.lastBreak___13248 = (s.index___13259);
+    r0 = (s.index___42784 + 2);
+    s.index___42784 = (r0);
+    s.lastBreak___42773 = (s.index___42784);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___13253;
+    s.tmp_0.argL = s.nextLine___42778;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1143; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 1100; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
     { step = 8; continue; }
   case 5:
-    s.tmp_1 = game_isBreakCharacter__P4337_mk(s);
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.index___13259);
+    s.tmp_1 = game_isBreakCharacter__P33830_mk(s);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.index___42784);
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1144; s.pc = 27; return s.tmp_1;
+    s.callLocIdx = 1101; s.pc = 27; return s.tmp_1;
   case 27:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.lastBreakLocation___13247 = (s.index___13259);
+    s.lastBreakLocation___42772 = (s.index___42784);
   case 6:
   case 7:
   case 8:
   case 9:
-    r0 = (s.index___13259 - s.lastBreak___13248);
+    r0 = (s.index___42784 - s.lastBreak___42773);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___13250);
+    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___42775);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 === s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.lastBreakLocation___13247 === s.index___13259);
+    r0 = (s.lastBreakLocation___42772 === s.index___42784);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBool(s.tmp_3);
     if (!r0) { step = 10; continue; }
     r0 = s.tmp_3;
     { step = 11; continue; }
   case 10:
-    r0 = (s.lastBreakLocation___13247 < s.lastBreak___13248);
+    r0 = (s.lastBreakLocation___42772 < s.lastBreak___42773);
   case 11:
     // jmp value (already in r0)
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 12; continue; }
-    s.tmp_5 = r0 = s.currentPage___13245;
-    s.tmp_7 = game_formatLine__P4339_mk(s);
+    s.tmp_5 = r0 = s.currentPage___42770;
+    s.tmp_7 = game_formatLine__P33832_mk(s);
     s.tmp_8 = r0 = s.arg0;
-    s.tmp_9 = r0 = s.lastBreak___13248;
-    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___13250);
+    s.tmp_9 = r0 = s.lastBreak___42773;
+    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___42775);
     s.tmp_10 = r0;
     r0 = pxsim_String_.substr(s.tmp_8, s.tmp_9, s.tmp_10);
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 1145; s.pc = 28; return s.tmp_7;
+    s.callLocIdx = 1102; s.pc = 28; return s.tmp_7;
   case 28:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
-    s.lastBreak___13248 = (s.index___13259);
+    s.lastBreak___42773 = (s.index___42784);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___13253;
+    s.tmp_0.argL = s.nextLine___42778;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1146; s.pc = 29; return s.tmp_0;
+    s.callLocIdx = 1103; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
     { step = 13; continue; }
   case 12:
-    s.tmp_0 = r0 = s.currentPage___13245;
-    s.tmp_2 = game_formatLine__P4339_mk(s);
+    s.tmp_0 = r0 = s.currentPage___42770;
+    s.tmp_2 = game_formatLine__P33832_mk(s);
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_4 = r0 = s.lastBreak___13248;
-    r0 = (s.lastBreakLocation___13247 - s.lastBreak___13248);
+    s.tmp_4 = r0 = s.lastBreak___42773;
+    r0 = (s.lastBreakLocation___42772 - s.lastBreak___42773);
     s.tmp_5 = r0;
     r0 = pxsim_String_.substr(s.tmp_3, s.tmp_4, s.tmp_5);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1147; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 1104; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.lastBreak___13248 = (s.lastBreakLocation___13247);
+    s.lastBreak___42773 = (s.lastBreakLocation___42772);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___13253;
+    s.tmp_0.argL = s.nextLine___42778;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1148; s.pc = 31; return s.tmp_0;
+    s.callLocIdx = 1105; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
   case 13:
   case 14:
   case 15:
-    r0 = pxsim_pxtrt_ldlocRef(s.line___13249);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___42774);
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.arg1);
     s.tmp_2 = r0;
@@ -38814,39 +38821,39 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    r0 = pxsim_pxtrt_stlocRef(s.line___13249, 0);
-    s.tmp_0 = r0 = s.lineLength___13250;
+    r0 = pxsim_pxtrt_stlocRef(s.line___42774, 0);
+    s.tmp_0 = r0 = s.lineLength___42775;
     s.tmp_2 = r0 = s.arg1;
-    r0 = pxsim_pxtrt_ldlocRef(s.line___13249);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___42774);
     s.tmp_3 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.tmp_3);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_Array__push(s.result___13243, s.currentPage___13245);
+    r0 = pxsim_Array__push(s.result___42768, s.currentPage___42770);
     r0 = pxsim_Array__mk();
-    s.currentPage___13245 = (r0);
+    s.currentPage___42770 = (r0);
   case 16:
   case 17:
-    r0 = (s.index___13259 + 1);
-    s.index___13259 = (r0);
+    r0 = (s.index___42784 + 1);
+    s.index___42784 = (r0);
     { step = 1; continue; }
   case 18:
-    s.tmp_0 = r0 = s.currentPage___13245;
-    s.tmp_2 = game_formatLine__P4339_mk(s);
+    s.tmp_0 = r0 = s.currentPage___42770;
+    s.tmp_2 = game_formatLine__P33832_mk(s);
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_4 = r0 = s.lastBreak___13248;
+    s.tmp_4 = r0 = s.lastBreak___42773;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_6 = r0;
-    r0 = (s.tmp_6 - s.lastBreak___13248);
+    r0 = (s.tmp_6 - s.lastBreak___42773);
     s.tmp_5 = r0;
     r0 = pxsim_String_.substr(s.tmp_3, s.tmp_4, s.tmp_5);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1149; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 1106; s.pc = 32; return s.tmp_2;
   case 32:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    r0 = pxsim_Array__length(s.currentPage___13245);
+    r0 = pxsim_Array__length(s.currentPage___42770);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 1);
     s.tmp_0 = r0;
@@ -38855,7 +38862,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 20; continue; }
   case 19:
-    r0 = pxsim_Array__getAt(s.currentPage___13245, 0);
+    r0 = pxsim_Array__getAt(s.currentPage___42770, 0);
     s.tmp_2 = r0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
@@ -38865,19 +38872,19 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 21; continue; }
-    r0 = pxsim_Array__push(s.result___13243, s.currentPage___13245);
+    r0 = pxsim_Array__push(s.result___42768, s.currentPage___42770);
   case 21:
   case 22:
-    r0 = s.result___13243;
+    r0 = s.result___42768;
     return leave(s, r0)
   default: oops()
 } } }
-game_breakIntoPages__P4338.info = {"start":20755,"length":2187,"line":661,"column":4,"endLine":722,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"breakIntoPages","argumentNames":["text","lineLengths"]}
+game_breakIntoPages__P33831.info = {"start":20755,"length":2187,"line":661,"column":4,"endLine":722,"endColumn":5,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"breakIntoPages","argumentNames":["text","lineLengths"]}
 
-function game_breakIntoPages__P4338_mk(s) {
+function game_breakIntoPages__P33831_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_breakIntoPages__P4338, depth: s.depth + 1,
+        parent: s, fn: game_breakIntoPages__P33831, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38891,14 +38898,14 @@ function game_breakIntoPages__P4338_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  result___13243: undefined,
-  currentPage___13245: undefined,
-  lastBreakLocation___13247: undefined,
-  lastBreak___13248: undefined,
-  line___13249: undefined,
-  lineLength___13250: undefined,
-  nextLine___13253: undefined,
-  index___13259: undefined,
+  result___42768: undefined,
+  currentPage___42770: undefined,
+  lastBreakLocation___42772: undefined,
+  lastBreak___42773: undefined,
+  line___42774: undefined,
+  lineLength___42775: undefined,
+  nextLine___42778: undefined,
+  index___42784: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -38907,7 +38914,7 @@ function game_breakIntoPages__P4338_mk(s) {
 
 
 
-function nextLine__P13253(s) {
+function nextLine__P42778(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38934,12 +38941,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-nextLine__P13253.info = {"start":21048,"length":95,"line":671,"column":8,"endLine":674,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"nextLine","argumentNames":[]}
+nextLine__P42778.info = {"start":21048,"length":95,"line":671,"column":8,"endLine":674,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"nextLine","argumentNames":[]}
 
-function nextLine__P13253_mk(s) {
+function nextLine__P42778_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: nextLine__P13253, depth: s.depth + 1,
+        parent: s, fn: nextLine__P42778, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38951,7 +38958,7 @@ function nextLine__P13253_mk(s) {
 
 
 
-function game_formatLine__P4339(s) {
+function game_formatLine__P33832(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38961,42 +38968,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___13424 = undefined;
+    s.i___42949 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.i___13424 = (0);
+    s.i___42949 = (0);
   case 1:
-    r0 = pxsim_String_.charAt(s.arg0, s.i___13424);
+    r0 = pxsim_String_.charAt(s.arg0, s.i___42949);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = (s.i___13424 + 1);
-    s.i___13424 = (r0);
+    r0 = (s.i___42949 + 1);
+    s.i___42949 = (r0);
     { step = 1; continue; }
   case 2:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.i___13424;
+    s.tmp_1 = r0 = s.i___42949;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = pxsim_String_.substr(s.tmp_0, s.tmp_1, s.tmp_2);
     return leave(s, r0)
   default: oops()
 } } }
-game_formatLine__P4339.info = {"start":22948,"length":148,"line":724,"column":4,"endLine":728,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"formatLine","argumentNames":["text"]}
+game_formatLine__P33832.info = {"start":22948,"length":148,"line":724,"column":4,"endLine":728,"endColumn":5,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"formatLine","argumentNames":["text"]}
 
-function game_formatLine__P4339_mk(s) {
+function game_formatLine__P33832_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_formatLine__P4339, depth: s.depth + 1,
+        parent: s, fn: game_formatLine__P33832, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  i___13424: undefined,
+  i___42949: undefined,
   arg0: undefined,
 } }
 
@@ -39004,7 +39011,7 @@ function game_formatLine__P4339_mk(s) {
 
 
 
-function game_isBreakCharacter__P4337(s) {
+function game_isBreakCharacter__P33830(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39084,12 +39091,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_isBreakCharacter__P4337.info = {"start":20515,"length":234,"line":654,"column":4,"endLine":659,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"isBreakCharacter","argumentNames":["charCode"]}
+game_isBreakCharacter__P33830.info = {"start":20515,"length":234,"line":654,"column":4,"endLine":659,"endColumn":5,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"isBreakCharacter","argumentNames":["charCode"]}
 
-function game_isBreakCharacter__P4337_mk(s) {
+function game_isBreakCharacter__P33830_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_isBreakCharacter__P4337, depth: s.depth + 1,
+        parent: s, fn: game_isBreakCharacter__P33830, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39108,7 +39115,7 @@ function game_isBreakCharacter__P4337_mk(s) {
 
 
 
-function game_BaseDialog_textAreaHeight__P4328(s) {
+function game_BaseDialog_textAreaHeight__P33821(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39123,7 +39130,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = s.arg0.fields["image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
@@ -39142,12 +39149,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_textAreaHeight__P4328.info = {"start":5183,"length":117,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"textAreaHeight","argumentNames":["this"]}
+game_BaseDialog_textAreaHeight__P33821.info = {"start":5183,"length":117,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"textAreaHeight","argumentNames":["this"]}
 
-function game_BaseDialog_textAreaHeight__P4328_mk(s) {
+function game_BaseDialog_textAreaHeight__P33821_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_textAreaHeight__P4328, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_textAreaHeight__P33821, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39163,7 +39170,7 @@ function game_BaseDialog_textAreaHeight__P4328_mk(s) {
 
 
 
-function game_BaseDialog_textAreaWidth__P4327(s) {
+function game_BaseDialog_textAreaWidth__P33820(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39178,7 +39185,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = s.arg0.fields["image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_2);
@@ -39197,12 +39204,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_textAreaWidth__P4327.info = {"start":5057,"length":116,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"textAreaWidth","argumentNames":["this"]}
+game_BaseDialog_textAreaWidth__P33820.info = {"start":5057,"length":116,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"textAreaWidth","argumentNames":["this"]}
 
-function game_BaseDialog_textAreaWidth__P4327_mk(s) {
+function game_BaseDialog_textAreaWidth__P33820_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_textAreaWidth__P4327, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_textAreaWidth__P33820, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39218,7 +39225,7 @@ function game_BaseDialog_textAreaWidth__P4327_mk(s) {
 
 
 
-function game_BaseDialog_rowHeight__P4326(s) {
+function game_BaseDialog_rowHeight__P33819(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39233,7 +39240,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     s.tmp_1 = if_charHeight_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_1.arg0 = r0;
@@ -39243,7 +39250,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["charHeight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["charHeight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1094; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 1051; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -39252,12 +39259,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_rowHeight__P4326.info = {"start":4969,"length":78,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"rowHeight","argumentNames":["this"]}
+game_BaseDialog_rowHeight__P33819.info = {"start":4969,"length":78,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"rowHeight","argumentNames":["this"]}
 
-function game_BaseDialog_rowHeight__P4326_mk(s) {
+function game_BaseDialog_rowHeight__P33819_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_rowHeight__P4326, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_rowHeight__P33819, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39268,7 +39275,7 @@ function game_BaseDialog_rowHeight__P4326_mk(s) {
 
 
 
-function game_Dialog_prevPage__P2501(s) {
+function game_Dialog_prevPage__P31920(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39283,10 +39290,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
-    s.tmp_1 = game_Dialog_hasPrev__P2499_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
+    s.tmp_1 = game_Dialog_hasPrev__P31918_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1097; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1054; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -39304,12 +39311,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_prevPage__P2501.info = {"start":6130,"length":105,"line":207,"column":8,"endLine":211,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"prevPage","argumentNames":["this"]}
+game_Dialog_prevPage__P31920.info = {"start":6130,"length":105,"line":207,"column":8,"endLine":211,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"prevPage","argumentNames":["this"]}
 
-function game_Dialog_prevPage__P2501_mk(s) {
+function game_Dialog_prevPage__P31920_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_prevPage__P2501, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_prevPage__P31920, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39323,7 +39330,7 @@ function game_Dialog_prevPage__P2501_mk(s) {
 
 
 
-function game_Dialog_nextPage__P2500(s) {
+function game_Dialog_nextPage__P31919(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39338,10 +39345,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
-    s.tmp_1 = game_Dialog_hasNext__P2498_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
+    s.tmp_1 = game_Dialog_hasNext__P31917_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1096; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1053; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -39359,12 +39366,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_nextPage__P2500.info = {"start":6015,"length":105,"line":201,"column":8,"endLine":205,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"nextPage","argumentNames":["this"]}
+game_Dialog_nextPage__P31919.info = {"start":6015,"length":105,"line":201,"column":8,"endLine":205,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"nextPage","argumentNames":["this"]}
 
-function game_Dialog_nextPage__P2500_mk(s) {
+function game_Dialog_nextPage__P31919_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_nextPage__P2500, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_nextPage__P31919, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39378,7 +39385,7 @@ function game_Dialog_nextPage__P2500_mk(s) {
 
 
 
-function game_Dialog_hasPrev__P2499(s) {
+function game_Dialog_hasPrev__P31918(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39393,7 +39400,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
     r0 = s.arg0.fields["chunks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -39426,12 +39433,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_hasPrev__P2499.info = {"start":5872,"length":133,"line":196,"column":8,"endLine":199,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"hasPrev","argumentNames":["this"]}
+game_Dialog_hasPrev__P31918.info = {"start":5872,"length":133,"line":196,"column":8,"endLine":199,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"hasPrev","argumentNames":["this"]}
 
-function game_Dialog_hasPrev__P2499_mk(s) {
+function game_Dialog_hasPrev__P31918_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_hasPrev__P2499, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_hasPrev__P31918, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39447,7 +39454,7 @@ function game_Dialog_hasPrev__P2499_mk(s) {
 
 
 
-function game_Dialog_hasNext__P2498(s) {
+function game_Dialog_hasNext__P31917(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39462,7 +39469,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
     r0 = s.arg0.fields["chunks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -39501,12 +39508,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_hasNext__P2498.info = {"start":5708,"length":154,"line":191,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"hasNext","argumentNames":["this"]}
+game_Dialog_hasNext__P31917.info = {"start":5708,"length":154,"line":191,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"hasNext","argumentNames":["this"]}
 
-function game_Dialog_hasNext__P2498_mk(s) {
+function game_Dialog_hasNext__P31917_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_hasNext__P2498, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_hasNext__P31917, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39525,7 +39532,7 @@ function game_Dialog_hasNext__P2498_mk(s) {
 
 
 
-function game_Dialog_constructor__P2497(s) {
+function game_Dialog_constructor__P31916(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39545,15 +39552,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_constructor__P2489_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_constructor__P31908_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = s.arg3;
     s.tmp_0.arg4 = s.arg4;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 1095; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1052; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["chunkIndex"] = (0);
@@ -39561,12 +39568,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_constructor__P2497.info = {"start":5505,"length":193,"line":185,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
+game_Dialog_constructor__P31916.info = {"start":5505,"length":193,"line":185,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
 
-function game_Dialog_constructor__P2497_mk(s) {
+function game_Dialog_constructor__P31916_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_constructor__P2497, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_constructor__P31916, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -39581,7 +39588,7 @@ function game_Dialog_constructor__P2497_mk(s) {
 
 
 
-function game_BaseDialog_constructor__P2489(s) {
+function game_BaseDialog_constructor__P31908(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39601,7 +39608,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim.image.create(s.arg1, s.arg2);
     s.tmp_1 = r0;
@@ -39612,7 +39619,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.dialogFrame___4318;
+    r0 = globals.dialogFrame___33811;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39621,12 +39628,12 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 4; continue; }
   case 3:
-    s.tmp_3 = game_defaultFrame__P4334_mk(s);
-    s.callLocIdx = 1066; s.pc = 13; return s.tmp_3;
+    s.tmp_3 = game_defaultFrame__P33827_mk(s);
+    s.callLocIdx = 1023; s.pc = 13; return s.tmp_3;
   case 13:
     r0 = s.retval;
     s.tmp_2 = r0;
-    globals.dialogFrame___4318 = (r0);
+    globals.dialogFrame___33811 = (r0);
     r0 = s.tmp_2;
   case 4:
     // jmp value (already in r0)
@@ -39638,7 +39645,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    r0 = globals.font8___1745;
+    r0 = globals.font8___31163;
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39649,7 +39656,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    r0 = globals.dialogCursor___4319;
+    r0 = globals.dialogCursor___33812;
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39658,26 +39665,26 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 10; continue; }
   case 9:
-    s.tmp_3 = game_defaultCursorImage__P4336_mk(s);
-    s.callLocIdx = 1067; s.pc = 14; return s.tmp_3;
+    s.tmp_3 = game_defaultCursorImage__P33829_mk(s);
+    s.callLocIdx = 1024; s.pc = 14; return s.tmp_3;
   case 14:
     r0 = s.retval;
     s.tmp_2 = r0;
-    globals.dialogCursor___4319 = (r0);
+    globals.dialogCursor___33812 = (r0);
     r0 = s.tmp_2;
   case 10:
     // jmp value (already in r0)
     s.tmp_4 = r0;
     r0 = (s.arg0).fields["cursor"] = (s.tmp_4);
-    r0 = (globals.dialogTextColor___4320 == undefined);
+    r0 = (globals.dialogTextColor___33813 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    globals.dialogTextColor___4320 = (15);
+    globals.dialogTextColor___33813 = (15);
     r0 = 15;
     { step = 12; continue; }
   case 11:
-    r0 = globals.dialogTextColor___4320;
+    r0 = globals.dialogTextColor___33813;
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39735,26 +39742,26 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["innerTop"] = (s.tmp_1);
     r0 = (s.arg0).fields["cursorCount"] = (0);
-    s.tmp_0 = game_BaseDialog_drawBorder__P4321_mk(s);
+    s.tmp_0 = game_BaseDialog_drawBorder__P33814_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1068; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1025; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_clearInterior__P4323_mk(s);
+    s.tmp_0 = game_BaseDialog_clearInterior__P33816_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1069; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1026; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_constructor__P2489.info = {"start":634,"length":895,"line":36,"column":8,"endLine":58,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
+game_BaseDialog_constructor__P31908.info = {"start":634,"length":895,"line":36,"column":8,"endLine":58,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
 
-function game_BaseDialog_constructor__P2489_mk(s) {
+function game_BaseDialog_constructor__P31908_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_constructor__P2489, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_constructor__P31908, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39775,7 +39782,7 @@ function game_BaseDialog_constructor__P2489_mk(s) {
 
 
 
-function game_defaultCursorImage__P4336(s) {
+function game_defaultCursorImage__P33829(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39785,14 +39792,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex13647);
+    r0 = pxsim.image.ofBuffer(_hex43172);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex13649);
+    r0 = pxsim.image.ofBuffer(_hex43174);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39800,24 +39807,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_defaultCursorImage__P4336.info = {"start":17096,"length":690,"line":543,"column":4,"endLine":569,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultCursorImage","argumentNames":[]}
+game_defaultCursorImage__P33829.info = {"start":17096,"length":690,"line":543,"column":4,"endLine":569,"endColumn":5,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"defaultCursorImage","argumentNames":[]}
 
-function game_defaultCursorImage__P4336_mk(s) {
+function game_defaultCursorImage__P33829_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_defaultCursorImage__P4336, depth: s.depth + 1,
+        parent: s, fn: game_defaultCursorImage__P33829, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex13647 = pxsim.BufferMethods.createBufferFromHex("87040a000800000011111101010000010111010111100001011101010100000101000001100010000001010000100000")
-const _hex13649 = pxsim.BufferMethods.createBufferFromHex("87040b000b00000000606686080000006076776686000000607777676608000076171111670800007671177766080000767117776608000076711777660800007617111167080000607777676608000060767766860000000060668608000000")
+const _hex43172 = pxsim.BufferMethods.createBufferFromHex("87040a000800000011111101010000010111010111100001011101010100000101000001100010000001010000100000")
+const _hex43174 = pxsim.BufferMethods.createBufferFromHex("87040b000b00000000606686080000006076776686000000607777676608000076171111670800007671177766080000767117776608000076711777660800007617111167080000607777676608000060767766860000000060668608000000")
 
 
 
 
-function game_defaultFrame__P4334(s) {
+function game_defaultFrame__P33827(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39827,14 +39834,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex13653);
+    r0 = pxsim.image.ofBuffer(_hex43178);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex13655);
+    r0 = pxsim.image.ofBuffer(_hex43180);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39842,24 +39849,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_defaultFrame__P4334.info = {"start":16308,"length":556,"line":504,"column":4,"endLine":526,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultFrame","argumentNames":[]}
+game_defaultFrame__P33827.info = {"start":16308,"length":556,"line":504,"column":4,"endLine":526,"endColumn":5,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"defaultFrame","argumentNames":[]}
 
-function game_defaultFrame__P4334_mk(s) {
+function game_defaultFrame__P33827_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_defaultFrame__P4334, depth: s.depth + 1,
+        parent: s, fn: game_defaultFrame__P33827, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex13653 = pxsim.BufferMethods.createBufferFromHex("8704030003000000110100000101000011010000")
-const _hex13655 = pxsim.BufferMethods.createBufferFromHex("87040c000c0000000000000000000000b0bbbbbbbb0b0000b0bbbbbbbbcb0000b0db1111bdcb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b0db1111bdcb0000b0bbbbbbbbcb0000b0bbbbbbbbcb000000cccccccccc0000")
+const _hex43178 = pxsim.BufferMethods.createBufferFromHex("8704030003000000110100000101000011010000")
+const _hex43180 = pxsim.BufferMethods.createBufferFromHex("87040c000c0000000000000000000000b0bbbbbbbb0b0000b0bbbbbbbbcb0000b0db1111bdcb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b0db1111bdcb0000b0bbbbbbbbcb0000b0bbbbbbbbcb000000cccccccccc0000")
 
 
 
 
-function game_BaseDialog_clearInterior__P4323(s) {
+function game_BaseDialog_clearInterior__P33816(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39869,21 +39876,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___13042 = undefined;
-    s.s___13049 = undefined;
+    s.d___42567 = undefined;
+    s.s___42574 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_2 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = 4;
     s.tmp_2.arg2 = 1;
@@ -39896,15 +39903,15 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 - 2);
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 1092; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1049; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     { step = 7; continue; }
   case 1:
   case 2:
-    s.d___13042 = (1);
+    s.d___42567 = (1);
   case 3:
-    s.tmp_1 = r0 = s.d___13042;
+    s.tmp_1 = r0 = s.d___42567;
     r0 = s.arg0.fields["columns"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -39913,9 +39920,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.s___13049 = (1);
+    s.s___42574 = (1);
   case 4:
-    s.tmp_1 = r0 = s.s___13049;
+    s.tmp_1 = r0 = s.s___42574;
     r0 = s.arg0.fields["rows"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -39924,20 +39931,20 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_4 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_4 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = 4;
-    s.tmp_4.arg2 = s.d___13042;
-    s.tmp_4.arg3 = s.s___13049;
-    s.callLocIdx = 1093; s.pc = 9; return s.tmp_4;
+    s.tmp_4.arg2 = s.d___42567;
+    s.tmp_4.arg3 = s.s___42574;
+    s.callLocIdx = 1050; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
-    r0 = (s.s___13049 + 1);
-    s.s___13049 = (r0);
+    r0 = (s.s___42574 + 1);
+    s.s___42574 = (r0);
     { step = 4; continue; }
   case 5:
-    r0 = (s.d___13042 + 1);
-    s.d___13042 = (r0);
+    r0 = (s.d___42567 + 1);
+    s.d___42567 = (r0);
     { step = 3; continue; }
   case 6:
   case 7:
@@ -39945,20 +39952,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_clearInterior__P4323.info = {"start":3911,"length":342,"line":132,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"clearInterior","argumentNames":["this"]}
+game_BaseDialog_clearInterior__P33816.info = {"start":3911,"length":342,"line":132,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"clearInterior","argumentNames":["this"]}
 
-function game_BaseDialog_clearInterior__P4323_mk(s) {
+function game_BaseDialog_clearInterior__P33816_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_clearInterior__P4323, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_clearInterior__P33816, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___13042: undefined,
-  s___13049: undefined,
+  d___42567: undefined,
+  s___42574: undefined,
   arg0: undefined,
 } }
 
@@ -39966,7 +39973,7 @@ function game_BaseDialog_clearInterior__P4323_mk(s) {
 
 
 
-function game_BaseDialog_drawPartial__P4324(s) {
+function game_BaseDialog_drawPartial__P33817(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39976,12 +39983,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x0___13067 = undefined;
-    s.y0___13075 = undefined;
-    s.xf___13083 = undefined;
-    s.yf___13090 = undefined;
-    s.e___13097 = undefined;
-    s.t___13103 = undefined;
+    s.x0___42592 = undefined;
+    s.y0___42600 = undefined;
+    s.xf___42608 = undefined;
+    s.yf___42615 = undefined;
+    s.e___42622 = undefined;
+    s.t___42628 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -39990,7 +39997,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = s.arg0.fields["innerLeft"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
@@ -39998,7 +40005,7 @@ switch (step) {
     r0 = (s.arg2 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.x0___13067 = (r0);
+    s.x0___42592 = (r0);
     r0 = s.arg0.fields["innerTop"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
@@ -40006,68 +40013,68 @@ switch (step) {
     r0 = (s.arg3 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y0___13075 = (r0);
+    s.y0___42600 = (r0);
     r0 = (s.arg1 % 3);
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.xf___13083 = (r0);
+    s.xf___42608 = (r0);
     r0 = pxsim.Math_.idiv(s.arg1, 3);
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.yf___13090 = (r0);
-    s.e___13097 = (0);
+    s.yf___42615 = (r0);
+    s.e___42622 = (0);
   case 1:
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
-    r0 = (s.e___13097 < s.tmp_1);
+    r0 = (s.e___42622 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.t___13103 = (0);
+    s.t___42628 = (0);
   case 2:
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
-    r0 = (s.t___13103 < s.tmp_1);
+    r0 = (s.t___42628 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = s.arg0.fields["image"];
     s.tmp_2 = r0;
-    r0 = (s.x0___13067 + s.e___13097);
+    r0 = (s.x0___42592 + s.e___42622);
     s.tmp_3 = r0;
-    r0 = (s.y0___13075 + s.t___13103);
+    r0 = (s.y0___42600 + s.t___42628);
     s.tmp_4 = r0;
     r0 = s.arg0.fields["frame"];
     s.tmp_6 = r0;
-    r0 = (s.xf___13083 + s.e___13097);
+    r0 = (s.xf___42608 + s.e___42622);
     s.tmp_7 = r0;
-    r0 = (s.yf___13090 + s.t___13103);
+    r0 = (s.yf___42615 + s.t___42628);
     s.tmp_8 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_6, s.tmp_7, s.tmp_8);
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.setPixel(s.tmp_2, s.tmp_3, s.tmp_4, s.tmp_5);
-    r0 = (s.t___13103 + 1);
-    s.t___13103 = (r0);
+    r0 = (s.t___42628 + 1);
+    s.t___42628 = (r0);
     { step = 2; continue; }
   case 3:
-    r0 = (s.e___13097 + 1);
-    s.e___13097 = (r0);
+    r0 = (s.e___42622 + 1);
+    s.e___42622 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawPartial__P4324.info = {"start":4263,"length":604,"line":143,"column":8,"endLine":158,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawPartial","argumentNames":["this","index","colTo","rowTo"]}
+game_BaseDialog_drawPartial__P33817.info = {"start":4263,"length":604,"line":143,"column":8,"endLine":158,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"drawPartial","argumentNames":["this","index","colTo","rowTo"]}
 
-function game_BaseDialog_drawPartial__P4324_mk(s) {
+function game_BaseDialog_drawPartial__P33817_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawPartial__P4324, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawPartial__P33817, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40078,12 +40085,12 @@ function game_BaseDialog_drawPartial__P4324_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  x0___13067: undefined,
-  y0___13075: undefined,
-  xf___13083: undefined,
-  yf___13090: undefined,
-  e___13097: undefined,
-  t___13103: undefined,
+  x0___42592: undefined,
+  y0___42600: undefined,
+  xf___42608: undefined,
+  yf___42615: undefined,
+  e___42622: undefined,
+  t___42628: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -40094,7 +40101,7 @@ function game_BaseDialog_drawPartial__P4324_mk(s) {
 
 
 
-function game_BaseDialog_fastFill__P4322(s) {
+function game_BaseDialog_fastFill__P33815(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40104,7 +40111,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.color___13139 = undefined;
+    s.color___42664 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -40115,7 +40122,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = s.arg0.fields["frame"];
     s.tmp_0 = r0;
     r0 = (s.arg1 % 3);
@@ -40123,8 +40130,8 @@ switch (step) {
     r0 = pxsim.Math_.idiv(s.arg1, 3);
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_0, s.tmp_1, s.tmp_2);
-    s.color___13139 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.color___42664 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["innerLeft"];
@@ -40137,25 +40144,25 @@ switch (step) {
     s.tmp_0.arg2 = r0;
     s.tmp_0.arg3 = s.arg4;
     s.tmp_0.arg4 = s.arg5;
-    s.tmp_0.arg5 = s.color___13139;
-    s.callLocIdx = 1091; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg5 = s.color___42664;
+    s.callLocIdx = 1048; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_fastFill__P4322.info = {"start":3652,"length":249,"line":127,"column":8,"endLine":130,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"fastFill","argumentNames":["this","index","x","y","w","h"]}
+game_BaseDialog_fastFill__P33815.info = {"start":3652,"length":249,"line":127,"column":8,"endLine":130,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"fastFill","argumentNames":["this","index","x","y","w","h"]}
 
-function game_BaseDialog_fastFill__P4322_mk(s) {
+function game_BaseDialog_fastFill__P33815_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_fastFill__P4322, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_fastFill__P33815, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  color___13139: undefined,
+  color___42664: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -40168,7 +40175,7 @@ function game_BaseDialog_fastFill__P4322_mk(s) {
 
 
 
-function game_BaseDialog_drawBorder__P4321(s) {
+function game_BaseDialog_drawBorder__P33814(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40178,32 +40185,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.y___13578 = undefined;
-    s.c___13594 = undefined;
-    s.r___13628 = undefined;
+    s.y___43103 = undefined;
+    s.c___43119 = undefined;
+    s.r___43153 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_2 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = 0;
     s.tmp_2.arg3 = 0;
     s.tmp_2.arg4 = 1;
     s.tmp_2.arg5 = 1;
-    s.callLocIdx = 1075; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 1032; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 1;
@@ -40213,10 +40220,10 @@ switch (step) {
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1076; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1033; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 2;
     r0 = s.arg0.fields["columns"];
@@ -40226,10 +40233,10 @@ switch (step) {
     s.tmp_0.arg3 = 0;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1077; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1034; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 3;
     s.tmp_0.arg2 = 0;
@@ -40239,10 +40246,10 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 1078; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1035; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 5;
     r0 = s.arg0.fields["columns"];
@@ -40255,73 +40262,73 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 2);
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 1079; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1036; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
     r0 = s.arg0.fields["rows"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.y___13578 = (r0);
-    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.y___43103 = (r0);
+    s.tmp_0 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 6;
     s.tmp_0.arg2 = 0;
-    s.tmp_0.arg3 = s.y___13578;
+    s.tmp_0.arg3 = s.y___43103;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1080; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 1037; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 7;
     s.tmp_0.arg2 = 1;
-    s.tmp_0.arg3 = s.y___13578;
+    s.tmp_0.arg3 = s.y___43103;
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1081; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1038; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P33815_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 8;
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.y___13578;
+    s.tmp_0.arg3 = s.y___43103;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1082; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 1039; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
     { step = 11; continue; }
   case 1:
   case 2:
-    s.c___13594 = (0);
+    s.c___43119 = (0);
   case 3:
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
-    r0 = (s.c___13594 < s.tmp_1);
+    r0 = (s.c___43119 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    r0 = (s.c___13594 == 0);
+    r0 = (s.c___43119 == 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    s.tmp_3 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_3 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.tmp_3.arg1 = 0;
     s.tmp_3.arg2 = 0;
     s.tmp_3.arg3 = 0;
-    s.callLocIdx = 1083; s.pc = 20; return s.tmp_3;
+    s.callLocIdx = 1040; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 6;
     s.tmp_0.arg2 = 0;
@@ -40329,12 +40336,12 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1084; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 1041; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     { step = 7; continue; }
   case 4:
-    s.tmp_1 = r0 = s.c___13594;
+    s.tmp_1 = r0 = s.c___43119;
     r0 = s.arg0.fields["columns"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -40343,55 +40350,55 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_4 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_4 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = 2;
-    s.tmp_4.arg2 = s.c___13594;
+    s.tmp_4.arg2 = s.c___43119;
     s.tmp_4.arg3 = 0;
-    s.callLocIdx = 1085; s.pc = 22; return s.tmp_4;
+    s.callLocIdx = 1042; s.pc = 22; return s.tmp_4;
   case 22:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 8;
-    s.tmp_0.arg2 = s.c___13594;
+    s.tmp_0.arg2 = s.c___43119;
     r0 = s.arg0.fields["rows"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1086; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 1043; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.tmp_0.arg2 = s.c___13594;
+    s.tmp_0.arg2 = s.c___43119;
     s.tmp_0.arg3 = 0;
-    s.callLocIdx = 1087; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1044; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 7;
-    s.tmp_0.arg2 = s.c___13594;
+    s.tmp_0.arg2 = s.c___43119;
     r0 = s.arg0.fields["rows"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1088; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 1045; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
   case 6:
   case 7:
-    r0 = (s.c___13594 + 1);
-    s.c___13594 = (r0);
+    r0 = (s.c___43119 + 1);
+    s.c___43119 = (r0);
     { step = 3; continue; }
   case 8:
-    s.r___13628 = (1);
+    s.r___43153 = (1);
   case 9:
-    s.tmp_1 = r0 = s.r___13628;
+    s.tmp_1 = r0 = s.r___43153;
     r0 = s.arg0.fields["rows"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -40400,27 +40407,27 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.tmp_4 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_4 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = 3;
     s.tmp_4.arg2 = 0;
-    s.tmp_4.arg3 = s.r___13628;
-    s.callLocIdx = 1089; s.pc = 26; return s.tmp_4;
+    s.tmp_4.arg3 = s.r___43153;
+    s.callLocIdx = 1046; s.pc = 26; return s.tmp_4;
   case 26:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P33817_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 5;
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.r___13628;
-    s.callLocIdx = 1090; s.pc = 27; return s.tmp_0;
+    s.tmp_0.arg3 = s.r___43153;
+    s.callLocIdx = 1047; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    r0 = (s.r___13628 + 1);
-    s.r___13628 = (r0);
+    r0 = (s.r___43153 + 1);
+    s.r___43153 = (r0);
     { step = 9; continue; }
   case 10:
   case 11:
@@ -40428,21 +40435,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawBorder__P4321.info = {"start":2321,"length":1321,"line":89,"column":8,"endLine":125,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawBorder","argumentNames":["this"]}
+game_BaseDialog_drawBorder__P33814.info = {"start":2321,"length":1321,"line":89,"column":8,"endLine":125,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"drawBorder","argumentNames":["this"]}
 
-function game_BaseDialog_drawBorder__P4321_mk(s) {
+function game_BaseDialog_drawBorder__P33814_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawBorder__P4321, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawBorder__P33814, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  y___13578: undefined,
-  c___13594: undefined,
-  r___13628: undefined,
+  y___43103: undefined,
+  c___43119: undefined,
+  r___43153: undefined,
   arg0: undefined,
 } }
 
@@ -40450,7 +40457,7 @@ function game_BaseDialog_drawBorder__P4321_mk(s) {
 
 
 
-function game_BaseDialog_update__P2490(s) {
+function game_BaseDialog_update__P31909(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40465,34 +40472,34 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_clearInterior__P4323_mk(s);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_clearInterior__P33816_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1070; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1027; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog__C2477_v2_1_mk(s);
+    s.tmp_0 = game_BaseDialog__C31896_v2_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C2477_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C31896_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.drawTextCore;
     s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawCursorRow__P2493_mk(s);
+    s.tmp_0 = game_BaseDialog_drawCursorRow__P31912_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1071; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1028; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_update__P2490.info = {"start":1539,"length":121,"line":60,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"update","argumentNames":["this"]}
+game_BaseDialog_update__P31909.info = {"start":1539,"length":121,"line":60,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"update","argumentNames":["this"]}
 
-function game_BaseDialog_update__P2490_mk(s) {
+function game_BaseDialog_update__P31909_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_update__P2490, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_update__P31909, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -40502,7 +40509,7 @@ function game_BaseDialog_update__P2490_mk(s) {
 
 
 
-function game_BaseDialog_drawCursorRow__P2493(s) {
+function game_BaseDialog_drawCursorRow__P31912(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40512,21 +40519,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.offset___12953 = undefined;
+    s.offset___42478 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
-    s.offset___12953 = (0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
+    s.offset___42478 = (0);
     r0 = s.arg0.fields["cursorCount"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 20);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.offset___12953 = (1);
+    s.offset___42478 = (1);
   case 1:
   case 2:
     s.tmp_0 = r0 = s.arg0;
@@ -40543,9 +40550,9 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = s.arg0.fields["innerLeft"];
     s.tmp_6 = r0;
-    s.tmp_8 = game_BaseDialog_textAreaWidth__P4327_mk(s);
+    s.tmp_8 = game_BaseDialog_textAreaWidth__P33820_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1072; s.pc = 3; return s.tmp_8;
+    s.callLocIdx = 1029; s.pc = 3; return s.tmp_8;
   case 3:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -40555,7 +40562,7 @@ switch (step) {
     s.tmp_9 = r0;
     r0 = (s.tmp_5 + s.tmp_9);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.offset___12953);
+    r0 = (s.tmp_4 + s.offset___42478);
     s.tmp_3 = r0;
     r0 = s.arg0.fields["cursor"];
     s.tmp_11 = r0;
@@ -40569,9 +40576,9 @@ switch (step) {
     s.tmp_17 = r0;
     r0 = (s.tmp_16 + s.tmp_17);
     s.tmp_15 = r0;
-    s.tmp_19 = game_BaseDialog_textAreaHeight__P4328_mk(s);
+    s.tmp_19 = game_BaseDialog_textAreaHeight__P33821_mk(s);
     s.tmp_19.arg0 = s.arg0;
-    s.callLocIdx = 1073; s.pc = 4; return s.tmp_19;
+    s.callLocIdx = 1030; s.pc = 4; return s.tmp_19;
   case 4:
     r0 = s.retval;
     s.tmp_18 = r0;
@@ -40592,12 +40599,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawCursorRow__P2493.info = {"start":1832,"length":479,"line":74,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawCursorRow","argumentNames":["this"]}
+game_BaseDialog_drawCursorRow__P31912.info = {"start":1832,"length":479,"line":74,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"drawCursorRow","argumentNames":["this"]}
 
-function game_BaseDialog_drawCursorRow__P2493_mk(s) {
+function game_BaseDialog_drawCursorRow__P31912_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawCursorRow__P2493, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawCursorRow__P31912, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40622,7 +40629,7 @@ function game_BaseDialog_drawCursorRow__P2493_mk(s) {
   tmp_20: undefined,
   tmp_21: undefined,
   tmp_22: undefined,
-  offset___12953: undefined,
+  offset___42478: undefined,
   arg0: undefined,
 } }
 
@@ -40630,7 +40637,7 @@ function game_BaseDialog_drawCursorRow__P2493_mk(s) {
 
 
 
-function game_BaseDialog_cursorRowHeight__P4325(s) {
+function game_BaseDialog_cursorRowHeight__P33818(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40645,7 +40652,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursor"];
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_1);
@@ -40654,12 +40661,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_cursorRowHeight__P4325.info = {"start":4877,"length":82,"line":160,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"cursorRowHeight","argumentNames":["this"]}
+game_BaseDialog_cursorRowHeight__P33818.info = {"start":4877,"length":82,"line":160,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"cursorRowHeight","argumentNames":["this"]}
 
-function game_BaseDialog_cursorRowHeight__P4325_mk(s) {
+function game_BaseDialog_cursorRowHeight__P33818_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_cursorRowHeight__P4325, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_cursorRowHeight__P33818, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40670,7 +40677,7 @@ function game_BaseDialog_cursorRowHeight__P4325_mk(s) {
 
 
 
-function game_BaseDialog_drawTextCore__P2492(s) {
+function game_BaseDialog_drawTextCore__P31911(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40685,17 +40692,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawTextCore__P2492.info = {"start":1757,"length":65,"line":70,"column":8,"endLine":72,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
+game_BaseDialog_drawTextCore__P31911.info = {"start":1757,"length":65,"line":70,"column":8,"endLine":72,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
 
-function game_BaseDialog_drawTextCore__P2492_mk(s) {
+function game_BaseDialog_drawTextCore__P31911_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawTextCore__P2492, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawTextCore__P31911, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -40704,7 +40711,7 @@ function game_BaseDialog_drawTextCore__P2492_mk(s) {
 
 
 
-function blockMenu_selectedMenuIndex__P3685(s) {
+function blockMenu_selectedMenuIndex__P33219(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40714,34 +40721,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___13656 = undefined;
-    s.tmp_0 = blockMenu__getState__P3722_mk(s);
-    s.callLocIdx = 1944; s.pc = 1; return s.tmp_0;
+    s.state___43181 = undefined;
+    s.tmp_0 = blockMenu__getState__P33256_mk(s);
+    s.callLocIdx = 1949; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___13656 = (r0);
-    r0 = s.state___13656.fields["menu"];
+    s.state___43181 = (r0);
+    r0 = s.state___43181.fields["menu"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["selectedIndex"];
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_selectedMenuIndex__P3685.info = {"start":1948,"length":133,"line":71,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"selectedMenuIndex","argumentNames":[]}
+blockMenu_selectedMenuIndex__P33219.info = {"start":1948,"length":133,"line":71,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"selectedMenuIndex","argumentNames":[]}
 
-function blockMenu_selectedMenuIndex__P3685_mk(s) {
+function blockMenu_selectedMenuIndex__P33219_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_selectedMenuIndex__P3685, depth: s.depth + 1,
+        parent: s, fn: blockMenu_selectedMenuIndex__P33219, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___13656: undefined,
+  state___43181: undefined,
 } }
 
 
 
 
 
-function blockMenu__getState__P3722(s) {
+function blockMenu__getState__P33256(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40751,20 +40758,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = blockMenu__init__P3721_mk(s);
-    s.callLocIdx = 2041; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = blockMenu__init__P33255_mk(s);
+    s.callLocIdx = 2046; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals.state___6115;
+    r0 = globals.state___35637;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__getState__P3722.info = {"start":3289,"length":74,"line":110,"column":4,"endLine":113,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_getState","argumentNames":[]}
+blockMenu__getState__P33256.info = {"start":3289,"length":74,"line":110,"column":4,"endLine":113,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_getState","argumentNames":[]}
 
-function blockMenu__getState__P3722_mk(s) {
+function blockMenu__getState__P33256_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__getState__P3722, depth: s.depth + 1,
+        parent: s, fn: blockMenu__getState__P33256, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -40773,7 +40780,7 @@ function blockMenu__getState__P3722_mk(s) {
 
 
 
-function blockMenu__init__P3721(s) {
+function blockMenu__init__P33255(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40783,37 +40790,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.debounce___13674 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___6116);
+    s.debounce___43199 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___35638);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
     r0 = pxsim_Array__mk();
-    globals.sceneStack___6116 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C3713_VT);
+    globals.sceneStack___35638 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C33247_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu__BlockMenuState_constructor__P3717_mk(s);
+    s.tmp_1 = blockMenu__BlockMenuState_constructor__P33251_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2022; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 2027; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    globals.state___6115 = (s.tmp_0);
+    globals.state___35637 = (s.tmp_0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.debounce___13674 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.debounce___13674, 100);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P13677);
+    s.debounce___43199 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.debounce___43199, 100);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P43202);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.debounce___13674);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.debounce___43199);
     r0 = pxsim.control.runInParallel(s.tmp_0);
-    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
-    s.tmp_0.arg0 = inline__P13734;
-    s.callLocIdx = 2037; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = game_addScenePushHandler__P31968_mk(s);
+    s.tmp_0.arg0 = inline__P43259;
+    s.callLocIdx = 2042; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
-    s.tmp_0.arg0 = inline__P13744;
-    s.callLocIdx = 2040; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_addScenePopHandler__P31970_mk(s);
+    s.tmp_0.arg0 = inline__P43269;
+    s.callLocIdx = 2045; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -40821,23 +40828,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__init__P3721.info = {"start":1098,"length":2185,"line":45,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_init","argumentNames":[]}
+blockMenu__init__P33255.info = {"start":1098,"length":2185,"line":45,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_init","argumentNames":[]}
 
-function blockMenu__init__P3721_mk(s) {
+function blockMenu__init__P33255_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__init__P3721, depth: s.depth + 1,
+        parent: s, fn: blockMenu__init__P33255, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  debounce___13674: undefined,
+  debounce___43199: undefined,
 } }
 
 
 
 
 
-function inline__P13677(s) {
+function inline__P43202(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40847,17 +40854,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.handler___13693 = undefined;
-    s.unnamed130___U1 = undefined;
-    s.unnamed131___U2 = undefined;
+    s.handler___43218 = undefined;
+    s.unnamed970___U1 = undefined;
+    s.unnamed971___U2 = undefined;
   case 1:
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 18; continue; }
-    s.tmp_0 = controller_pauseUntilAnyButtonIsPressed__P1953_mk(s);
-    s.callLocIdx = 2023; s.pc = 19; return s.tmp_0;
+    s.tmp_0 = controller_pauseUntilAnyButtonIsPressed__P31372_mk(s);
+    s.callLocIdx = 2028; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    r0 = globals.state___6115.fields["controlsEnabled"];
+    r0 = globals.state___35637.fields["controlsEnabled"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -40868,7 +40875,7 @@ switch (step) {
     { step = 1; continue; }
   case 2:
   case 3:
-    r0 = globals.state___6115.fields["menu"];
+    r0 = globals.state___35637.fields["menu"];
     r0 = r0.fields["style"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 === 0);
@@ -40880,9 +40887,9 @@ switch (step) {
   case 4:
     r0 = pxsim_pxtrt_stlocRef(s.caps[0], 100);
   case 5:
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.A___1877;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.A___31296;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 20; return s.tmp_1;
   case 20:
@@ -40890,51 +40897,51 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.handler___13693 = (undefined);
-    r0 = globals.state___6115.fields["handlers"];
-    s.unnamed130___U1 = (r0);
-    s.unnamed131___U2 = (0);
+    s.handler___43218 = (undefined);
+    r0 = globals.state___35637.fields["handlers"];
+    s.unnamed970___U1 = (r0);
+    s.unnamed971___U2 = (0);
   case 6:
-    s.tmp_0 = r0 = s.unnamed131___U2;
-    r0 = pxsim_Array__length(s.unnamed130___U1);
+    s.tmp_0 = r0 = s.unnamed971___U2;
+    r0 = pxsim_Array__length(s.unnamed970___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed130___U1, s.unnamed131___U2);
-    s.handler___13693 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed970___U1, s.unnamed971___U2);
+    s.handler___43218 = (r0);
     s.tmp_2 = lambda_3_mk(s);
-    s.tmp_2.argL = s.handler___13693;
-    s.tmp_3 = blockMenu_MenuSprite_selectedMenuOption__P3699_mk(s);
-    r0 = globals.state___6115.fields["menu"];
+    s.tmp_2.argL = s.handler___43218;
+    s.tmp_3 = blockMenu_MenuSprite_selectedMenuOption__P33233_mk(s);
+    r0 = globals.state___35637.fields["menu"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 2024; s.pc = 22; return s.tmp_3;
+    s.callLocIdx = 2029; s.pc = 22; return s.tmp_3;
   case 22:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    r0 = globals.state___6115.fields["menu"];
+    r0 = globals.state___35637.fields["menu"];
     s.tmp_4 = r0;
     r0 = s.tmp_4.fields["selectedIndex"];
     s.tmp_2.arg1 = r0;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 2026; s.pc = 21; return s.tmp_2;
+    s.callLocIdx = 2031; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
-    r0 = (s.unnamed131___U2 + 1);
-    s.unnamed131___U2 = (r0);
+    r0 = (s.unnamed971___U2 + 1);
+    s.unnamed971___U2 = (r0);
     { step = 6; continue; }
   case 7:
-    s.unnamed130___U1 = (undefined);
-    s.tmp_0 = pause__P402_mk(s);
+    s.unnamed970___U1 = (undefined);
+    s.tmp_0 = pause__P29937_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2027; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 2032; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
   case 8:
   case 9:
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.up___1880;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.up___31299;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 24; return s.tmp_1;
   case 24:
@@ -40942,24 +40949,24 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P3702_mk(s);
-    r0 = globals.state___6115.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P33236_mk(s);
+    r0 = globals.state___35637.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = true;
-    s.callLocIdx = 2028; s.pc = 25; return s.tmp_2;
+    s.callLocIdx = 2033; s.pc = 25; return s.tmp_2;
   case 25:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2029; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 2034; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
   case 10:
   case 11:
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.down___1882;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.down___31301;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 27; return s.tmp_1;
   case 27:
@@ -40967,24 +40974,24 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P3702_mk(s);
-    r0 = globals.state___6115.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P33236_mk(s);
+    r0 = globals.state___35637.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 2030; s.pc = 28; return s.tmp_2;
+    s.callLocIdx = 2035; s.pc = 28; return s.tmp_2;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2031; s.pc = 29; return s.tmp_0;
+    s.callLocIdx = 2036; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
   case 12:
   case 13:
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.left___1879;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.left___31298;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 30; return s.tmp_1;
   case 30:
@@ -40992,24 +40999,24 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P3703_mk(s);
-    r0 = globals.state___6115.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P33237_mk(s);
+    r0 = globals.state___35637.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = true;
-    s.callLocIdx = 2032; s.pc = 31; return s.tmp_2;
+    s.callLocIdx = 2037; s.pc = 31; return s.tmp_2;
   case 31:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2033; s.pc = 32; return s.tmp_0;
+    s.callLocIdx = 2038; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
   case 14:
   case 15:
-    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.right___1881;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.right___31300;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 33; return s.tmp_1;
   case 33:
@@ -41017,17 +41024,17 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P3703_mk(s);
-    r0 = globals.state___6115.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P33237_mk(s);
+    r0 = globals.state___35637.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 2034; s.pc = 34; return s.tmp_2;
+    s.callLocIdx = 2039; s.pc = 34; return s.tmp_2;
   case 34:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2035; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 2040; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
   case 16:
@@ -41038,28 +41045,28 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P13677.info = {"start":1459,"length":1320,"line":54,"column":30,"endLine":90,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":[]}
+inline__P43202.info = {"start":1459,"length":1320,"line":54,"column":30,"endLine":90,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P13677_mk(s) {
+function inline__P43202_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P13677, depth: s.depth + 1,
+        parent: s, fn: inline__P43202, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  handler___13693: undefined,
-  unnamed130___U1: undefined,
-  unnamed131___U2: undefined,
+  handler___43218: undefined,
+  unnamed970___U1: undefined,
+  unnamed971___U2: undefined,
 } }
 
 
 
 
 
-function inline__P13734(s) {
+function inline__P43259(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41073,25 +41080,25 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array__push(globals.sceneStack___6116, globals.state___6115);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C3713_VT);
+    r0 = pxsim_Array__push(globals.sceneStack___35638, globals.state___35637);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C33247_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu__BlockMenuState_constructor__P3717_mk(s);
+    s.tmp_1 = blockMenu__BlockMenuState_constructor__P33251_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2036; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 2041; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    globals.state___6115 = (s.tmp_0);
+    globals.state___35637 = (s.tmp_0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P13734.info = {"start":2815,"length":123,"line":92,"column":33,"endLine":95,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P43259.info = {"start":2815,"length":123,"line":92,"column":33,"endLine":95,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P13734_mk(s) {
+function inline__P43259_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P13734, depth: s.depth + 1,
+        parent: s, fn: inline__P43259, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41102,7 +41109,7 @@ function inline__P13734_mk(s) {
 
 
 
-function inline__P13744(s) {
+function inline__P43269(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41116,42 +41123,42 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array__length(globals.sceneStack___6116);
+    r0 = pxsim_Array__length(globals.sceneStack___35638);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_Array_.pop(globals.sceneStack___6116);
-    globals.state___6115 = (r0);
+    r0 = pxsim_Array_.pop(globals.sceneStack___35638);
+    globals.state___35637 = (r0);
     { step = 4; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(globals.state___6115);
+    r0 = pxsim_numops_toBoolDecr(globals.state___35637);
     if (!r0) { step = 2; continue; }
-    s.tmp_0 = blockMenu__BlockMenuState_destroy__P3720_mk(s);
-    s.tmp_0.arg0 = globals.state___6115;
-    s.callLocIdx = 2038; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = blockMenu__BlockMenuState_destroy__P33254_mk(s);
+    s.tmp_0.arg0 = globals.state___35637;
+    s.callLocIdx = 2043; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 2:
   case 3:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C3713_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C33247_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu__BlockMenuState_constructor__P3717_mk(s);
+    s.tmp_1 = blockMenu__BlockMenuState_constructor__P33251_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2039; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 2044; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    globals.state___6115 = (s.tmp_0);
+    globals.state___35637 = (s.tmp_0);
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P13744.info = {"start":2974,"length":301,"line":97,"column":32,"endLine":107,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P43269.info = {"start":2974,"length":301,"line":97,"column":32,"endLine":107,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P13744_mk(s) {
+function inline__P43269_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P13744, depth: s.depth + 1,
+        parent: s, fn: inline__P43269, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41162,7 +41169,7 @@ function inline__P13744_mk(s) {
 
 
 
-function blockMenu__BlockMenuState_destroy__P3720(s) {
+function blockMenu__BlockMenuState_destroy__P33254(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41177,23 +41184,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu__BlockMenuState__C3713_VT)) failedCast(r0);
-    s.tmp_0 = blockMenu_MenuSprite_destroy__P3709_mk(s);
+    if (!checkSubtype(r0, blockMenu__BlockMenuState__C33247_VT)) failedCast(r0);
+    s.tmp_0 = blockMenu_MenuSprite_destroy__P33243_mk(s);
     r0 = s.arg0.fields["menu"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2021; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2026; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__BlockMenuState_destroy__P3720.info = {"start":893,"length":54,"line":31,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"destroy","argumentNames":["this"]}
+blockMenu__BlockMenuState_destroy__P33254.info = {"start":893,"length":54,"line":31,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"destroy","argumentNames":["this"]}
 
-function blockMenu__BlockMenuState_destroy__P3720_mk(s) {
+function blockMenu__BlockMenuState_destroy__P33254_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__BlockMenuState_destroy__P3720, depth: s.depth + 1,
+        parent: s, fn: blockMenu__BlockMenuState_destroy__P33254, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41203,7 +41210,7 @@ function blockMenu__BlockMenuState_destroy__P3720_mk(s) {
 
 
 
-function blockMenu_MenuSprite_destroy__P3709(s) {
+function blockMenu_MenuSprite_destroy__P33243(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41218,9 +41225,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1977; s.pc = 1; return s.tmp_1;
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1982; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["allSprites"];
@@ -41230,12 +41237,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_destroy__P3709.info = {"start":5247,"length":85,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"destroy","argumentNames":["this"]}
+blockMenu_MenuSprite_destroy__P33243.info = {"start":5247,"length":85,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"destroy","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_destroy__P3709_mk(s) {
+function blockMenu_MenuSprite_destroy__P33243_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_destroy__P3709, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_destroy__P33243, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41246,7 +41253,7 @@ function blockMenu_MenuSprite_destroy__P3709_mk(s) {
 
 
 
-function blockMenu__BlockMenuState_constructor__P3717(s) {
+function blockMenu__BlockMenuState_constructor__P33251(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41261,12 +41268,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu__BlockMenuState__C3713_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_MenuSprite__C3692_VT);
+    if (!checkSubtype(r0, blockMenu__BlockMenuState__C33247_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_MenuSprite__C33226_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu_MenuSprite_constructor__P3694_mk(s);
+    s.tmp_1 = blockMenu_MenuSprite_constructor__P33228_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2020; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 2025; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["menu"] = (s.tmp_0);
@@ -41279,12 +41286,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__BlockMenuState_constructor__P3717.info = {"start":261,"length":140,"line":9,"column":8,"endLine":13,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["this"]}
+blockMenu__BlockMenuState_constructor__P33251.info = {"start":261,"length":140,"line":9,"column":8,"endLine":13,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["this"]}
 
-function blockMenu__BlockMenuState_constructor__P3717_mk(s) {
+function blockMenu__BlockMenuState_constructor__P33251_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__BlockMenuState_constructor__P3717, depth: s.depth + 1,
+        parent: s, fn: blockMenu__BlockMenuState_constructor__P33251, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41295,7 +41302,7 @@ function blockMenu__BlockMenuState_constructor__P3717_mk(s) {
 
 
 
-function blockMenu_MenuSprite_constructor__P3694(s) {
+function blockMenu_MenuSprite_constructor__P33228(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41310,29 +41317,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P31279_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 100;
-    s.callLocIdx = 1948; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1953; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["selectedIndex"] = (0);
     r0 = (s.arg0).fields["style"] = (1);
-    s.tmp_0 = blockMenu_MenuSprite_setLocation__P3698_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setLocation__P33232_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.callLocIdx = 1949; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1954; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["open"] = (false);
-    s.tmp_0 = blockMenu_MenuSprite_setColors__P3696_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setColors__P33230_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 15;
     s.tmp_0.arg2 = 1;
     s.tmp_0.arg3 = 1;
     s.tmp_0.arg4 = 3;
-    s.callLocIdx = 1950; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1955; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["padding"] = (2);
@@ -41340,12 +41347,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_constructor__P3694.info = {"start":859,"length":279,"line":31,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this"]}
+blockMenu_MenuSprite_constructor__P33228.info = {"start":859,"length":279,"line":31,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_constructor__P3694_mk(s) {
+function blockMenu_MenuSprite_constructor__P33228_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_constructor__P3694, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_constructor__P33228, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41355,7 +41362,7 @@ function blockMenu_MenuSprite_constructor__P3694_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setLocation__P3698(s) {
+function blockMenu_MenuSprite_setLocation__P33232(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41371,31 +41378,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = (s.arg0).fields["location"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = blockMenu_getLayoutMetrics__P6114_mk(s);
+    s.tmp_2 = blockMenu_getLayoutMetrics__P35636_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 1961; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1966; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["metrics"] = (s.tmp_1);
-    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P6107_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P35629_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1962; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1967; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setLocation__P3698.info = {"start":1841,"length":175,"line":58,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setLocation","argumentNames":["this","location"]}
+blockMenu_MenuSprite_setLocation__P33232.info = {"start":1841,"length":175,"line":58,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setLocation","argumentNames":["this","location"]}
 
-function blockMenu_MenuSprite_setLocation__P3698_mk(s) {
+function blockMenu_MenuSprite_setLocation__P33232_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setLocation__P3698, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setLocation__P33232, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41408,7 +41415,7 @@ function blockMenu_MenuSprite_setLocation__P3698_mk(s) {
 
 
 
-function blockMenu_getLayoutMetrics__P6114(s) {
+function blockMenu_getLayoutMetrics__P35636(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41418,20 +41425,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.maxWidth___14135 = undefined;
-    s.maxHeight___14142 = undefined;
+    s.maxWidth___43660 = undefined;
+    s.maxHeight___43667 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.maxWidth___14135 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.maxWidth___43660 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.maxHeight___14142 = (r0);
+    s.maxHeight___43667 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_pxtcore.switch_eq(0, s.tmp_0);
     if (r0) { step = 1; continue; }
@@ -41456,171 +41463,171 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 1:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_2 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     s.tmp_2.arg1 = 2;
     s.tmp_2.arg2 = 2;
-    s.tmp_2.arg3 = s.maxWidth___14135;
-    s.tmp_2.arg4 = s.maxHeight___14142;
-    s.callLocIdx = 2010; s.pc = 13; return s.tmp_2;
+    s.tmp_2.arg3 = s.maxWidth___43660;
+    s.tmp_2.arg4 = s.maxHeight___43667;
+    s.callLocIdx = 2015; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
     r0 = s.tmp_1;
     { step = 12; continue; }
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_3 = r0;
-    s.tmp_4 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_4 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_4.arg0 = s.tmp_3;
     s.tmp_4.arg1 = 0;
     s.tmp_4.arg2 = 0;
     s.tmp_4.arg3 = 0;
     s.tmp_4.arg4 = 0;
-    s.callLocIdx = 2011; s.pc = 14; return s.tmp_4;
+    s.callLocIdx = 2016; s.pc = 14; return s.tmp_4;
   case 14:
     r0 = s.retval;
     r0 = s.tmp_3;
     { step = 12; continue; }
   case 3:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_5 = r0;
-    s.tmp_6 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_6 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_6.arg0 = s.tmp_5;
     s.tmp_6.arg1 = 2;
     s.tmp_6.arg2 = 2;
-    s.tmp_6.arg3 = s.maxWidth___14135;
-    r0 = (s.maxHeight___14142 >> 1);
+    s.tmp_6.arg3 = s.maxWidth___43660;
+    r0 = (s.maxHeight___43667 >> 1);
     s.tmp_6.arg4 = r0;
-    s.callLocIdx = 2012; s.pc = 15; return s.tmp_6;
+    s.callLocIdx = 2017; s.pc = 15; return s.tmp_6;
   case 15:
     r0 = s.retval;
     r0 = s.tmp_5;
     { step = 12; continue; }
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_7 = r0;
-    s.tmp_8 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_8 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_8.arg0 = s.tmp_7;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_9 = r0;
     r0 = (s.tmp_9 >> 1);
     s.tmp_8.arg1 = r0;
     s.tmp_8.arg2 = 2;
-    r0 = (s.maxWidth___14135 >> 1);
+    r0 = (s.maxWidth___43660 >> 1);
     s.tmp_8.arg3 = r0;
-    s.tmp_8.arg4 = s.maxHeight___14142;
-    s.callLocIdx = 2013; s.pc = 16; return s.tmp_8;
+    s.tmp_8.arg4 = s.maxHeight___43667;
+    s.callLocIdx = 2018; s.pc = 16; return s.tmp_8;
   case 16:
     r0 = s.retval;
     r0 = s.tmp_7;
     { step = 12; continue; }
   case 5:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_10 = r0;
-    s.tmp_11 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_11 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_11.arg0 = s.tmp_10;
     s.tmp_11.arg1 = 2;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_12 = r0;
     r0 = (s.tmp_12 >> 1);
     s.tmp_11.arg2 = r0;
-    s.tmp_11.arg3 = s.maxWidth___14135;
-    r0 = (s.maxHeight___14142 >> 1);
+    s.tmp_11.arg3 = s.maxWidth___43660;
+    r0 = (s.maxHeight___43667 >> 1);
     s.tmp_11.arg4 = r0;
-    s.callLocIdx = 2014; s.pc = 17; return s.tmp_11;
+    s.callLocIdx = 2019; s.pc = 17; return s.tmp_11;
   case 17:
     r0 = s.retval;
     r0 = s.tmp_10;
     { step = 12; continue; }
   case 6:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_13 = r0;
-    s.tmp_14 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_14 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_14.arg0 = s.tmp_13;
     s.tmp_14.arg1 = 2;
     s.tmp_14.arg2 = 2;
-    r0 = (s.maxWidth___14135 >> 1);
+    r0 = (s.maxWidth___43660 >> 1);
     s.tmp_14.arg3 = r0;
-    s.tmp_14.arg4 = s.maxHeight___14142;
-    s.callLocIdx = 2015; s.pc = 18; return s.tmp_14;
+    s.tmp_14.arg4 = s.maxHeight___43667;
+    s.callLocIdx = 2020; s.pc = 18; return s.tmp_14;
   case 18:
     r0 = s.retval;
     r0 = s.tmp_13;
     { step = 12; continue; }
   case 7:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_15 = r0;
-    s.tmp_16 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_16 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_16.arg0 = s.tmp_15;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_17 = r0;
     r0 = (s.tmp_17 >> 1);
     s.tmp_16.arg1 = r0;
     s.tmp_16.arg2 = 2;
-    r0 = (s.maxWidth___14135 >> 1);
+    r0 = (s.maxWidth___43660 >> 1);
     s.tmp_16.arg3 = r0;
-    r0 = (s.maxHeight___14142 >> 1);
+    r0 = (s.maxHeight___43667 >> 1);
     s.tmp_16.arg4 = r0;
-    s.callLocIdx = 2016; s.pc = 19; return s.tmp_16;
+    s.callLocIdx = 2021; s.pc = 19; return s.tmp_16;
   case 19:
     r0 = s.retval;
     r0 = s.tmp_15;
     { step = 12; continue; }
   case 8:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_18 = r0;
-    s.tmp_19 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_19 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_19.arg0 = s.tmp_18;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_20 = r0;
     r0 = (s.tmp_20 >> 1);
     s.tmp_19.arg1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_21 = r0;
     r0 = (s.tmp_21 >> 1);
     s.tmp_19.arg2 = r0;
-    r0 = (s.maxWidth___14135 >> 1);
+    r0 = (s.maxWidth___43660 >> 1);
     s.tmp_19.arg3 = r0;
-    r0 = (s.maxHeight___14142 >> 1);
+    r0 = (s.maxHeight___43667 >> 1);
     s.tmp_19.arg4 = r0;
-    s.callLocIdx = 2017; s.pc = 20; return s.tmp_19;
+    s.callLocIdx = 2022; s.pc = 20; return s.tmp_19;
   case 20:
     r0 = s.retval;
     r0 = s.tmp_18;
     { step = 12; continue; }
   case 9:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_22 = r0;
-    s.tmp_23 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_23 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_23.arg0 = s.tmp_22;
     s.tmp_23.arg1 = 2;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_24 = r0;
     r0 = (s.tmp_24 >> 1);
     s.tmp_23.arg2 = r0;
-    r0 = (s.maxWidth___14135 >> 1);
+    r0 = (s.maxWidth___43660 >> 1);
     s.tmp_23.arg3 = r0;
-    r0 = (s.maxHeight___14142 >> 1);
+    r0 = (s.maxHeight___43667 >> 1);
     s.tmp_23.arg4 = r0;
-    s.callLocIdx = 2018; s.pc = 21; return s.tmp_23;
+    s.callLocIdx = 2023; s.pc = 21; return s.tmp_23;
   case 21:
     r0 = s.retval;
     r0 = s.tmp_22;
     { step = 12; continue; }
   case 10:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C35623_VT);
     s.tmp_25 = r0;
-    s.tmp_26 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
+    s.tmp_26 = blockMenu_LayoutMetrics_constructor__P35626_mk(s);
     s.tmp_26.arg0 = s.tmp_25;
     s.tmp_26.arg1 = 2;
     s.tmp_26.arg2 = 2;
-    r0 = (s.maxWidth___14135 >> 1);
+    r0 = (s.maxWidth___43660 >> 1);
     s.tmp_26.arg3 = r0;
-    r0 = (s.maxHeight___14142 >> 1);
+    r0 = (s.maxHeight___43667 >> 1);
     s.tmp_26.arg4 = r0;
-    s.callLocIdx = 2019; s.pc = 22; return s.tmp_26;
+    s.callLocIdx = 2024; s.pc = 22; return s.tmp_26;
   case 22:
     r0 = s.retval;
     r0 = s.tmp_25;
@@ -41631,12 +41638,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_getLayoutMetrics__P6114.info = {"start":11286,"length":1546,"line":352,"column":4,"endLine":380,"endColumn":5,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getLayoutMetrics","argumentNames":["layout"]}
+blockMenu_getLayoutMetrics__P35636.info = {"start":11286,"length":1546,"line":352,"column":4,"endLine":380,"endColumn":5,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getLayoutMetrics","argumentNames":["layout"]}
 
-function blockMenu_getLayoutMetrics__P6114_mk(s) {
+function blockMenu_getLayoutMetrics__P35636_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_getLayoutMetrics__P6114, depth: s.depth + 1,
+        parent: s, fn: blockMenu_getLayoutMetrics__P35636, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41665,8 +41672,8 @@ function blockMenu_getLayoutMetrics__P6114_mk(s) {
   tmp_24: undefined,
   tmp_25: undefined,
   tmp_26: undefined,
-  maxWidth___14135: undefined,
-  maxHeight___14142: undefined,
+  maxWidth___43660: undefined,
+  maxHeight___43667: undefined,
   arg0: undefined,
 } }
 
@@ -41674,7 +41681,7 @@ function blockMenu_getLayoutMetrics__P6114_mk(s) {
 
 
 
-function blockMenu_LayoutMetrics_constructor__P6104(s) {
+function blockMenu_LayoutMetrics_constructor__P35626(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41693,7 +41700,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_LayoutMetrics__C6101_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_LayoutMetrics__C35623_VT)) failedCast(r0);
     r0 = (s.arg0).fields["left"] = (s.arg1);
     r0 = (s.arg0).fields["top"] = (s.arg2);
     r0 = (s.arg0).fields["width"] = (s.arg3);
@@ -41702,12 +41709,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_LayoutMetrics_constructor__P6104.info = {"start":56,"length":109,"line":2,"column":8,"endLine":3,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","left","top","width","height"]}
+blockMenu_LayoutMetrics_constructor__P35626.info = {"start":56,"length":109,"line":2,"column":8,"endLine":3,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","left","top","width","height"]}
 
-function blockMenu_LayoutMetrics_constructor__P6104_mk(s) {
+function blockMenu_LayoutMetrics_constructor__P35626_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_LayoutMetrics_constructor__P6104, depth: s.depth + 1,
+        parent: s, fn: blockMenu_LayoutMetrics_constructor__P35626, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -41720,7 +41727,7 @@ function blockMenu_LayoutMetrics_constructor__P6104_mk(s) {
 
 
 
-function blockMenu_MenuSprite_recreateLabels__P6107(s) {
+function blockMenu_MenuSprite_recreateLabels__P35629(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41730,16 +41737,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.labelWidth___14027 = undefined;
-    s.option___14031 = undefined;
-    s.unnamed128___U2 = undefined;
-    s.unnamed129___U3 = undefined;
+    s.labelWidth___43552 = undefined;
+    s.option___43556 = undefined;
+    s.unnamed968___U2 = undefined;
+    s.unnamed969___U3 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -41755,46 +41762,46 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_3 = blockMenu_MenuSprite_getMaxLabelWidth__P6106_mk(s);
+    s.tmp_3 = blockMenu_MenuSprite_getMaxLabelWidth__P35628_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1981; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1986; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
-    s.labelWidth___14027 = (r0);
-    s.option___14031 = (undefined);
+    s.labelWidth___43552 = (r0);
+    s.option___43556 = (undefined);
     r0 = s.arg0.fields["options"];
-    s.unnamed128___U2 = (r0);
-    s.unnamed129___U3 = (0);
+    s.unnamed968___U2 = (r0);
+    s.unnamed969___U3 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed129___U3;
-    r0 = pxsim_Array__length(s.unnamed128___U2);
+    s.tmp_0 = r0 = s.unnamed969___U3;
+    r0 = pxsim_Array__length(s.unnamed968___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed128___U2, s.unnamed129___U3);
-    s.option___14031 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_ScrollingLabel__C6110_VT);
+    r0 = pxsim_Array__getAt(s.unnamed968___U2, s.unnamed969___U3);
+    s.option___43556 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_ScrollingLabel__C35632_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = blockMenu_ScrollingLabel_constructor__P6113_mk(s);
+    s.tmp_3 = blockMenu_ScrollingLabel_constructor__P35635_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
-    s.tmp_3.arg1 = s.option___14031;
-    s.tmp_3.arg2 = s.labelWidth___14027;
-    s.callLocIdx = 1982; s.pc = 7; return s.tmp_3;
+    s.tmp_3.arg1 = s.option___43556;
+    s.tmp_3.arg2 = s.labelWidth___43552;
+    s.callLocIdx = 1987; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["labels"];
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_4, s.tmp_2);
-    r0 = (s.unnamed129___U3 + 1);
-    s.unnamed129___U3 = (r0);
+    r0 = (s.unnamed969___U3 + 1);
+    s.unnamed969___U3 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed128___U2 = (undefined);
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.unnamed968___U2 = (undefined);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1984; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1989; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 5:
@@ -41802,22 +41809,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_recreateLabels__P6107.info = {"start":6179,"length":363,"line":202,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"recreateLabels","argumentNames":["this"]}
+blockMenu_MenuSprite_recreateLabels__P35629.info = {"start":6179,"length":363,"line":202,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"recreateLabels","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_recreateLabels__P6107_mk(s) {
+function blockMenu_MenuSprite_recreateLabels__P35629_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_recreateLabels__P6107, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_recreateLabels__P35629, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  labelWidth___14027: undefined,
-  option___14031: undefined,
-  unnamed128___U2: undefined,
-  unnamed129___U3: undefined,
+  labelWidth___43552: undefined,
+  option___43556: undefined,
+  unnamed968___U2: undefined,
+  unnamed969___U3: undefined,
   arg0: undefined,
 } }
 
@@ -41825,7 +41832,7 @@ function blockMenu_MenuSprite_recreateLabels__P6107_mk(s) {
 
 
 
-function blockMenu_ScrollingLabel_constructor__P6113(s) {
+function blockMenu_ScrollingLabel_constructor__P35635(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41835,7 +41842,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fullLength___14071 = undefined;
+    s.fullLength___43596 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -41843,7 +41850,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C6110_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C35632_VT)) failedCast(r0);
     r0 = (s.arg0).fields["text"] = (s.arg1);
     r0 = (s.arg0).fields["scrolling"] = (false);
     r0 = (s.arg0).fields["pauseTime"] = (1000);
@@ -41854,10 +41861,10 @@ switch (step) {
     r0 = (s.arg0).fields["offset"] = (0);
     r0 = (s.arg0).fields["width"] = (s.arg2);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = image_getFontForText__P1747_mk(s);
+    s.tmp_2 = image_getFontForText__P31165_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1995; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 2000; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -41875,13 +41882,13 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1996; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 2001; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 * s.tmp_2);
-    s.fullLength___14071 = (r0);
+    s.fullLength___43596 = (r0);
     s.tmp_0 = r0 = s.arg0;
     s.tmp_2 = r0 = s.arg2;
     s.tmp_4 = if_charWidth_1_mk(s);
@@ -41893,7 +41900,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1997; s.pc = 3; return s.tmp_4; }
+     else { s.callLocIdx = 2002; s.pc = 3; return s.tmp_4; }
     }
   case 3:
     r0 = s.retval;
@@ -41902,7 +41909,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["maxCharacters"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = r0 = s.fullLength___14071;
+    s.tmp_2 = r0 = s.fullLength___43596;
     r0 = s.arg0.fields["maxCharacters"];
     s.tmp_4 = r0;
     s.tmp_6 = if_charWidth_1_mk(s);
@@ -41914,7 +41921,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["charWidth"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["charWidth"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1998; s.pc = 4; return s.tmp_6; }
+     else { s.callLocIdx = 2003; s.pc = 4; return s.tmp_6; }
     }
   case 4:
     r0 = s.retval;
@@ -41934,7 +41941,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1999; s.pc = 5; return s.tmp_3; }
+     else { s.callLocIdx = 2004; s.pc = 5; return s.tmp_3; }
     }
   case 5:
     r0 = s.retval;
@@ -41948,7 +41955,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 2000; s.pc = 6; return s.tmp_5; }
+     else { s.callLocIdx = 2005; s.pc = 6; return s.tmp_5; }
     }
   case 6:
     r0 = s.retval;
@@ -41960,12 +41967,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_ScrollingLabel_constructor__P6113.info = {"start":8624,"length":646,"line":276,"column":8,"endLine":291,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","text","maxWidth"]}
+blockMenu_ScrollingLabel_constructor__P35635.info = {"start":8624,"length":646,"line":276,"column":8,"endLine":291,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","text","maxWidth"]}
 
-function blockMenu_ScrollingLabel_constructor__P6113_mk(s) {
+function blockMenu_ScrollingLabel_constructor__P35635_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_ScrollingLabel_constructor__P6113, depth: s.depth + 1,
+        parent: s, fn: blockMenu_ScrollingLabel_constructor__P35635, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41974,7 +41981,7 @@ function blockMenu_ScrollingLabel_constructor__P6113_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  fullLength___14071: undefined,
+  fullLength___43596: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -41984,7 +41991,7 @@ function blockMenu_ScrollingLabel_constructor__P6113_mk(s) {
 
 
 
-function blockMenu_MenuSprite_getMaxLabelWidth__P6106(s) {
+function blockMenu_MenuSprite_getMaxLabelWidth__P35628(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41999,7 +42006,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["style"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 0);
@@ -42031,12 +42038,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_getMaxLabelWidth__P6106.info = {"start":5934,"length":235,"line":195,"column":8,"endLine":200,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getMaxLabelWidth","argumentNames":["this"]}
+blockMenu_MenuSprite_getMaxLabelWidth__P35628.info = {"start":5934,"length":235,"line":195,"column":8,"endLine":200,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getMaxLabelWidth","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_getMaxLabelWidth__P6106_mk(s) {
+function blockMenu_MenuSprite_getMaxLabelWidth__P35628_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_getMaxLabelWidth__P6106, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_getMaxLabelWidth__P35628, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42054,7 +42061,7 @@ function blockMenu_MenuSprite_getMaxLabelWidth__P6106_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setSelectedIndex__P3701(s) {
+function blockMenu_MenuSprite_setSelectedIndex__P33235(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42064,14 +42071,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.numOptions___13789 = undefined;
+    s.numOptions___43314 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -42085,8 +42092,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.numOptions___13789 = (s.tmp_2);
-    r0 = pxsim_numops_toBoolDecr(s.numOptions___13789);
+    s.numOptions___43314 = (s.tmp_2);
+    r0 = pxsim_numops_toBoolDecr(s.numOptions___43314);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -42111,7 +42118,7 @@ switch (step) {
     s.arg1 = (r0);
     { step = 5; continue; }
   case 6:
-    r0 = (s.arg1 % s.numOptions___13789);
+    r0 = (s.arg1 % s.numOptions___43314);
     s.arg1 = (r0);
     r0 = s.arg0.fields["labels"];
     s.tmp_0 = r0;
@@ -42130,7 +42137,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 9; continue; }
-    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P6111_mk(s);
+    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P35633_mk(s);
     r0 = s.arg0.fields["labels"];
     s.tmp_5 = r0;
     r0 = s.arg0.fields["selectedIndex"];
@@ -42138,7 +42145,7 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_5, s.tmp_6);
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = false;
-    s.callLocIdx = 1963; s.pc = 16; return s.tmp_4;
+    s.callLocIdx = 1968; s.pc = 16; return s.tmp_4;
   case 16:
     r0 = s.retval;
   case 9:
@@ -42161,7 +42168,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 13; continue; }
-    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P6111_mk(s);
+    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P35633_mk(s);
     r0 = s.arg0.fields["labels"];
     s.tmp_5 = r0;
     r0 = s.arg0.fields["selectedIndex"];
@@ -42169,7 +42176,7 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_5, s.tmp_6);
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = true;
-    s.callLocIdx = 1964; s.pc = 17; return s.tmp_4;
+    s.callLocIdx = 1969; s.pc = 17; return s.tmp_4;
   case 17:
     r0 = s.retval;
   case 13:
@@ -42179,12 +42186,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setSelectedIndex__P3701.info = {"start":2329,"length":617,"line":76,"column":8,"endLine":94,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setSelectedIndex","argumentNames":["this","index"]}
+blockMenu_MenuSprite_setSelectedIndex__P33235.info = {"start":2329,"length":617,"line":76,"column":8,"endLine":94,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setSelectedIndex","argumentNames":["this","index"]}
 
-function blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s) {
+function blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setSelectedIndex__P3701, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setSelectedIndex__P33235, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42193,7 +42200,7 @@ function blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  numOptions___13789: undefined,
+  numOptions___43314: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -42202,7 +42209,7 @@ function blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s) {
 
 
 
-function blockMenu_ScrollingLabel_setScrolling__P6111(s) {
+function blockMenu_ScrollingLabel_setScrolling__P35633(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42218,7 +42225,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C6110_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C35632_VT)) failedCast(r0);
     r0 = s.arg0.fields["scrolling"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== s.arg1);
@@ -42234,12 +42241,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_ScrollingLabel_setScrolling__P6111.info = {"start":9280,"length":215,"line":293,"column":8,"endLine":299,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setScrolling","argumentNames":["this","scrolling"]}
+blockMenu_ScrollingLabel_setScrolling__P35633.info = {"start":9280,"length":215,"line":293,"column":8,"endLine":299,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setScrolling","argumentNames":["this","scrolling"]}
 
-function blockMenu_ScrollingLabel_setScrolling__P6111_mk(s) {
+function blockMenu_ScrollingLabel_setScrolling__P35633_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_ScrollingLabel_setScrolling__P6111, depth: s.depth + 1,
+        parent: s, fn: blockMenu_ScrollingLabel_setScrolling__P35633, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42251,7 +42258,7 @@ function blockMenu_ScrollingLabel_setScrolling__P6111_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setColors__P3696(s) {
+function blockMenu_MenuSprite_setColors__P33230(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42270,67 +42277,67 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P125_mk(s);
-    s.tmp_3 = Math_min__P126_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
+    s.tmp_3 = Math_min__P29661_mk(s);
     r0 = (s.arg1 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1953; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 1958; s.pc = 2; return s.tmp_3;
   case 2:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1954; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1959; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["foreground"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P125_mk(s);
-    s.tmp_3 = Math_min__P126_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
+    s.tmp_3 = Math_min__P29661_mk(s);
     r0 = (s.arg2 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1955; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1960; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1956; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1961; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["background"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P125_mk(s);
-    s.tmp_3 = Math_min__P126_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
+    s.tmp_3 = Math_min__P29661_mk(s);
     r0 = (s.arg3 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1957; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1962; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1958; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1963; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorForeground"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P125_mk(s);
-    s.tmp_3 = Math_min__P126_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
+    s.tmp_3 = Math_min__P29661_mk(s);
     r0 = (s.arg4 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1959; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 1964; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1960; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1965; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -42339,12 +42346,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setColors__P3696.info = {"start":1314,"length":429,"line":47,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setColors","argumentNames":["this","foreground","background","cursorForeground","cursorBackground"]}
+blockMenu_MenuSprite_setColors__P33230.info = {"start":1314,"length":429,"line":47,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setColors","argumentNames":["this","foreground","background","cursorForeground","cursorBackground"]}
 
-function blockMenu_MenuSprite_setColors__P3696_mk(s) {
+function blockMenu_MenuSprite_setColors__P33230_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setColors__P3696, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setColors__P33230, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42361,7 +42368,7 @@ function blockMenu_MenuSprite_setColors__P3696_mk(s) {
 
 
 
-function blockMenu_MenuSprite_moveSelectionHorizontal__P3703(s) {
+function blockMenu_MenuSprite_moveSelectionHorizontal__P33237(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42377,7 +42384,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["style"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 0);
@@ -42392,24 +42399,24 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 1; continue; }
-    s.tmp_5 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_5 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_5.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 + 1);
     s.tmp_5.arg1 = r0;
-    s.callLocIdx = 1973; s.pc = 5; return s.tmp_5;
+    s.callLocIdx = 1978; s.pc = 5; return s.tmp_5;
   case 5:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1974; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1979; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 2:
@@ -42419,12 +42426,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_moveSelectionHorizontal__P3703.info = {"start":4330,"length":358,"line":133,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionHorizontal","argumentNames":["this","left"]}
+blockMenu_MenuSprite_moveSelectionHorizontal__P33237.info = {"start":4330,"length":358,"line":133,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionHorizontal","argumentNames":["this","left"]}
 
-function blockMenu_MenuSprite_moveSelectionHorizontal__P3703_mk(s) {
+function blockMenu_MenuSprite_moveSelectionHorizontal__P33237_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_moveSelectionHorizontal__P3703, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_moveSelectionHorizontal__P33237, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42441,7 +42448,7 @@ function blockMenu_MenuSprite_moveSelectionHorizontal__P3703_mk(s) {
 
 
 
-function blockMenu_MenuSprite_moveSelectionVertical__P3702(s) {
+function blockMenu_MenuSprite_moveSelectionVertical__P33236(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42457,7 +42464,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["style"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 0);
@@ -42489,13 +42496,13 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 3; continue; }
-    s.tmp_8 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_8 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_8.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_9 = r0;
     r0 = (s.tmp_9 - 1);
     s.tmp_8.arg1 = r0;
-    s.callLocIdx = 1965; s.pc = 21; return s.tmp_8;
+    s.callLocIdx = 1970; s.pc = 21; return s.tmp_8;
   case 21:
     r0 = s.retval;
     { step = 6; continue; }
@@ -42506,37 +42513,37 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_2 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 3);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1966; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 1971; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1967; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 1972; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
   case 5:
   case 6:
     { step = 8; continue; }
   case 7:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1968; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1973; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
   case 8:
@@ -42576,24 +42583,24 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 14; continue; }
-    s.tmp_9 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_9 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_9.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_10 = r0;
     r0 = (s.tmp_10 + 1);
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 1969; s.pc = 25; return s.tmp_9;
+    s.callLocIdx = 1974; s.pc = 25; return s.tmp_9;
   case 25:
     r0 = s.retval;
     { step = 15; continue; }
   case 14:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1970; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 1975; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
   case 15:
@@ -42602,16 +42609,16 @@ switch (step) {
   case 17:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 18; continue; }
-    s.tmp_0 = blockMenu_MenuSprite_previous__P3705_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_previous__P33239_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1971; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 1976; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
     { step = 19; continue; }
   case 18:
-    s.tmp_0 = blockMenu_MenuSprite_next__P3704_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_next__P33238_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1972; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1977; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
   case 19:
@@ -42620,12 +42627,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_moveSelectionVertical__P3702.info = {"start":2956,"length":1364,"line":96,"column":8,"endLine":131,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionVertical","argumentNames":["this","up"]}
+blockMenu_MenuSprite_moveSelectionVertical__P33236.info = {"start":2956,"length":1364,"line":96,"column":8,"endLine":131,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionVertical","argumentNames":["this","up"]}
 
-function blockMenu_MenuSprite_moveSelectionVertical__P3702_mk(s) {
+function blockMenu_MenuSprite_moveSelectionVertical__P33236_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_moveSelectionVertical__P3702, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_moveSelectionVertical__P33236, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42646,7 +42653,7 @@ function blockMenu_MenuSprite_moveSelectionVertical__P3702_mk(s) {
 
 
 
-function blockMenu_MenuSprite_previous__P3705(s) {
+function blockMenu_MenuSprite_previous__P33239(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42661,26 +42668,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1976; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1981; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_previous__P3705.info = {"start":4785,"length":81,"line":148,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"previous","argumentNames":["this"]}
+blockMenu_MenuSprite_previous__P33239.info = {"start":4785,"length":81,"line":148,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"previous","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_previous__P3705_mk(s) {
+function blockMenu_MenuSprite_previous__P33239_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_previous__P3705, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_previous__P33239, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42691,7 +42698,7 @@ function blockMenu_MenuSprite_previous__P3705_mk(s) {
 
 
 
-function blockMenu_MenuSprite_next__P3704(s) {
+function blockMenu_MenuSprite_next__P33238(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42706,26 +42713,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P33235_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1975; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1980; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_next__P3704.info = {"start":4698,"length":77,"line":144,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"next","argumentNames":["this"]}
+blockMenu_MenuSprite_next__P33238.info = {"start":4698,"length":77,"line":144,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"next","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_next__P3704_mk(s) {
+function blockMenu_MenuSprite_next__P33238_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_next__P3704, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_next__P33238, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42736,7 +42743,7 @@ function blockMenu_MenuSprite_next__P3704_mk(s) {
 
 
 
-function blockMenu_MenuSprite_selectedMenuOption__P3699(s) {
+function blockMenu_MenuSprite_selectedMenuOption__P33233(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42751,7 +42758,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -42790,12 +42797,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_selectedMenuOption__P3699.info = {"start":2026,"length":205,"line":64,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuOption","argumentNames":["this"]}
+blockMenu_MenuSprite_selectedMenuOption__P33233.info = {"start":2026,"length":205,"line":64,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuOption","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_selectedMenuOption__P3699_mk(s) {
+function blockMenu_MenuSprite_selectedMenuOption__P33233_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_selectedMenuOption__P3699, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_selectedMenuOption__P33233, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42814,7 +42821,7 @@ function blockMenu_MenuSprite_selectedMenuOption__P3699_mk(s) {
 
 
 
-function blockMenu_MenuSprite_selectedMenuIndex__P3700(s) {
+function blockMenu_MenuSprite_selectedMenuIndex__P33234(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42829,17 +42836,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["selectedIndex"];
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_selectedMenuIndex__P3700.info = {"start":2241,"length":78,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuIndex","argumentNames":["this"]}
+blockMenu_MenuSprite_selectedMenuIndex__P33234.info = {"start":2241,"length":78,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuIndex","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_selectedMenuIndex__P3700_mk(s) {
+function blockMenu_MenuSprite_selectedMenuIndex__P33234_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_selectedMenuIndex__P3700, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_selectedMenuIndex__P33234, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -42848,7 +42855,7 @@ function blockMenu_MenuSprite_selectedMenuIndex__P3700_mk(s) {
 
 
 
-function wait_for_select_and_close__P45979(s) {
+function wait_for_select_and_close__P97968(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42858,22 +42865,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals.selected_option___46088 = (false);
+    globals.selected_option___97970 = (false);
   case 1:
-    r0 = pxsim_numops_toBoolDecr(globals.selected_option___46088);
+    r0 = pxsim_numops_toBoolDecr(globals.selected_option___97970);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = pause__P402_mk(s);
+    s.tmp_2 = pause__P29937_mk(s);
     s.tmp_2.arg0 = 100;
     s.callLocIdx = 125; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     { step = 1; continue; }
   case 2:
-    s.tmp_0 = blockMenu_closeMenu__P3682_mk(s);
+    s.tmp_0 = blockMenu_closeMenu__P33216_mk(s);
     s.callLocIdx = 126; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
@@ -42881,12 +42888,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-wait_for_select_and_close__P45979.info = {"start":8144,"length":153,"line":205,"column":0,"endLine":211,"endColumn":1,"fileName":"main.ts","functionName":"wait_for_select_and_close","argumentNames":[]}
+wait_for_select_and_close__P97968.info = {"start":8144,"length":153,"line":205,"column":0,"endLine":211,"endColumn":1,"fileName":"main.ts","functionName":"wait_for_select_and_close","argumentNames":[]}
 
-function wait_for_select_and_close__P45979_mk(s) {
+function wait_for_select_and_close__P97968_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: wait_for_select_and_close__P45979, depth: s.depth + 1,
+        parent: s, fn: wait_for_select_and_close__P97968, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42897,7 +42904,7 @@ function wait_for_select_and_close__P45979_mk(s) {
 
 
 
-function blockMenu_closeMenu__P3682(s) {
+function blockMenu_closeMenu__P33216(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42907,39 +42914,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___19974 = undefined;
-    s.tmp_0 = blockMenu__getState__P3722_mk(s);
-    s.callLocIdx = 1940; s.pc = 1; return s.tmp_0;
+    s.state___49470 = undefined;
+    s.tmp_0 = blockMenu__getState__P33256_mk(s);
+    s.callLocIdx = 1945; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___19974 = (r0);
-    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P3708_mk(s);
-    r0 = s.state___19974.fields["menu"];
+    s.state___49470 = (r0);
+    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P33242_mk(s);
+    r0 = s.state___49470.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1941; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1946; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_closeMenu__P3682.info = {"start":1078,"length":109,"line":46,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"closeMenu","argumentNames":[]}
+blockMenu_closeMenu__P33216.info = {"start":1078,"length":109,"line":46,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"closeMenu","argumentNames":[]}
 
-function blockMenu_closeMenu__P3682_mk(s) {
+function blockMenu_closeMenu__P33216_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_closeMenu__P3682, depth: s.depth + 1,
+        parent: s, fn: blockMenu_closeMenu__P33216, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___19974: undefined,
+  state___49470: undefined,
 } }
 
 
 
 
 
-function blockMenu_MenuSprite_setMenuOpen__P3708(s) {
+function blockMenu_MenuSprite_setMenuOpen__P33242(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42955,18 +42962,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = (s.arg0).fields["open"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setMenuOpen__P3708.info = {"start":5169,"length":68,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setMenuOpen","argumentNames":["this","open"]}
+blockMenu_MenuSprite_setMenuOpen__P33242.info = {"start":5169,"length":68,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setMenuOpen","argumentNames":["this","open"]}
 
-function blockMenu_MenuSprite_setMenuOpen__P3708_mk(s) {
+function blockMenu_MenuSprite_setMenuOpen__P33242_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setMenuOpen__P3708, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setMenuOpen__P33242, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -42976,7 +42983,7 @@ function blockMenu_MenuSprite_setMenuOpen__P3708_mk(s) {
 
 
 
-function blockMenu_showMenu__P3681(s) {
+function blockMenu_showMenu__P33215(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42986,59 +42993,59 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___14248 = undefined;
+    s.state___43773 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = blockMenu__getState__P3722_mk(s);
-    s.callLocIdx = 1935; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = blockMenu__getState__P33256_mk(s);
+    s.callLocIdx = 1940; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___14248 = (r0);
-    s.tmp_0 = blockMenu_MenuSprite_setOptions__P3695_mk(s);
-    r0 = s.state___14248.fields["menu"];
+    s.state___43773 = (r0);
+    s.tmp_0 = blockMenu_MenuSprite_setOptions__P33229_mk(s);
+    r0 = s.state___43773.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1936; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1941; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_MenuSprite_setStyle__P3697_mk(s);
-    r0 = s.state___14248.fields["menu"];
+    s.tmp_0 = blockMenu_MenuSprite_setStyle__P33231_mk(s);
+    r0 = s.state___43773.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1937; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1942; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_MenuSprite_setLocation__P3698_mk(s);
-    r0 = s.state___14248.fields["menu"];
+    s.tmp_0 = blockMenu_MenuSprite_setLocation__P33232_mk(s);
+    r0 = s.state___43773.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1938; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1943; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P3708_mk(s);
-    r0 = s.state___14248.fields["menu"];
+    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P33242_mk(s);
+    r0 = s.state___43773.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1939; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1944; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_showMenu__P3681.info = {"start":720,"length":285,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"showMenu","argumentNames":["options","style","location"]}
+blockMenu_showMenu__P33215.info = {"start":720,"length":285,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"showMenu","argumentNames":["options","style","location"]}
 
-function blockMenu_showMenu__P3681_mk(s) {
+function blockMenu_showMenu__P33215_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_showMenu__P3681, depth: s.depth + 1,
+        parent: s, fn: blockMenu_showMenu__P33215, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___14248: undefined,
+  state___43773: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -43048,7 +43055,7 @@ function blockMenu_showMenu__P3681_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setStyle__P3697(s) {
+function blockMenu_MenuSprite_setStyle__P33231(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43064,18 +43071,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = (s.arg0).fields["style"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setStyle__P3697.info = {"start":1761,"length":70,"line":54,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setStyle","argumentNames":["this","style"]}
+blockMenu_MenuSprite_setStyle__P33231.info = {"start":1761,"length":70,"line":54,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setStyle","argumentNames":["this","style"]}
 
-function blockMenu_MenuSprite_setStyle__P3697_mk(s) {
+function blockMenu_MenuSprite_setStyle__P33231_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setStyle__P3697, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setStyle__P33231, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -43085,7 +43092,7 @@ function blockMenu_MenuSprite_setStyle__P3697_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setOptions__P3695(s) {
+function blockMenu_MenuSprite_setOptions__P33229(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43101,33 +43108,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_arraySlice__P112_mk(s);
+    s.tmp_2 = helpers_arraySlice__P29647_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 1951; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1956; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["options"] = (s.tmp_1);
     r0 = (s.arg0).fields["selectedIndex"] = (0);
-    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P6107_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P35629_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1952; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1957; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setOptions__P3695.info = {"start":1148,"length":156,"line":41,"column":8,"endLine":45,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setOptions","argumentNames":["this","options"]}
+blockMenu_MenuSprite_setOptions__P33229.info = {"start":1148,"length":156,"line":41,"column":8,"endLine":45,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setOptions","argumentNames":["this","options"]}
 
-function blockMenu_MenuSprite_setOptions__P3695_mk(s) {
+function blockMenu_MenuSprite_setOptions__P33229_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setOptions__P3695, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setOptions__P33229, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43140,7 +43147,7 @@ function blockMenu_MenuSprite_setOptions__P3695_mk(s) {
 
 
 
-function blockMenu_setColors__P3683(s) {
+function blockMenu_setColors__P33217(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43150,40 +43157,40 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___14289 = undefined;
+    s.state___43814 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = blockMenu__getState__P3722_mk(s);
-    s.callLocIdx = 1942; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = blockMenu__getState__P33256_mk(s);
+    s.callLocIdx = 1947; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___14289 = (r0);
-    s.tmp_0 = blockMenu_MenuSprite_setColors__P3696_mk(s);
-    r0 = s.state___14289.fields["menu"];
+    s.state___43814 = (r0);
+    s.tmp_0 = blockMenu_MenuSprite_setColors__P33230_mk(s);
+    r0 = s.state___43814.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg1;
     s.tmp_0.arg4 = s.arg0;
-    s.callLocIdx = 1943; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1948; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_setColors__P3683.info = {"start":1443,"length":186,"line":57,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"setColors","argumentNames":["foreground","background"]}
+blockMenu_setColors__P33217.info = {"start":1443,"length":186,"line":57,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"setColors","argumentNames":["foreground","background"]}
 
-function blockMenu_setColors__P3683_mk(s) {
+function blockMenu_setColors__P33217_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_setColors__P3683, depth: s.depth + 1,
+        parent: s, fn: blockMenu_setColors__P33217, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___14289: undefined,
+  state___43814: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -43192,7 +43199,7 @@ function blockMenu_setColors__P3683_mk(s) {
 
 
 
-function fade_out__P45978(s) {
+function fade_out__P97963(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43202,14 +43209,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = color_startFade__P3570_mk(s);
-    s.tmp_0.arg0 = globals.Black___3585;
-    s.tmp_0.arg1 = globals.originalPalette___3574;
+    s.tmp_0 = color_startFade__P33104_mk(s);
+    s.tmp_0.arg0 = globals.Black___33119;
+    s.tmp_0.arg1 = globals.originalPalette___33108;
     s.tmp_0.arg2 = 2000;
     s.callLocIdx = 123; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = color_pauseUntilFadeDone__P3572_mk(s);
+    s.tmp_0 = color_pauseUntilFadeDone__P33106_mk(s);
     s.callLocIdx = 124; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
@@ -43217,12 +43224,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-fade_out__P45978.info = {"start":8026,"length":117,"line":201,"column":0,"endLine":204,"endColumn":1,"fileName":"main.ts","functionName":"fade_out","argumentNames":[]}
+fade_out__P97963.info = {"start":8026,"length":117,"line":201,"column":0,"endLine":204,"endColumn":1,"fileName":"main.ts","functionName":"fade_out","argumentNames":[]}
 
-function fade_out__P45978_mk(s) {
+function fade_out__P97963_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: fade_out__P45978, depth: s.depth + 1,
+        parent: s, fn: fade_out__P97963, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -43231,7 +43238,7 @@ function fade_out__P45978_mk(s) {
 
 
 
-function tiles_createTilemap__P2340(s) {
+function tiles_createTilemap__P31759(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43248,27 +43255,27 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMapData__C2304_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMapData__C31723_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = tiles_TileMapData_constructor__P2305_mk(s);
+    s.tmp_1 = tiles_TileMapData_constructor__P31724_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
     s.tmp_1.arg3 = s.arg2;
     s.tmp_1.arg4 = s.arg3;
-    s.callLocIdx = 975; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 932; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_createTilemap__P2340.info = {"start":14038,"length":170,"line":456,"column":4,"endLine":458,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"createTilemap","argumentNames":["data","layer","tiles","scale"]}
+tiles_createTilemap__P31759.info = {"start":14038,"length":170,"line":456,"column":4,"endLine":458,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"createTilemap","argumentNames":["data","layer","tiles","scale"]}
 
-function tiles_createTilemap__P2340_mk(s) {
+function tiles_createTilemap__P31759_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_createTilemap__P2340, depth: s.depth + 1,
+        parent: s, fn: tiles_createTilemap__P31759, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43282,7 +43289,7 @@ function tiles_createTilemap__P2340_mk(s) {
 
 
 
-function tiles_TileMapData_constructor__P2305(s) {
+function tiles_TileMapData_constructor__P31724(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43301,14 +43308,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = (s.arg0).fields["data"] = (s.arg1);
     r0 = (s.arg0).fields["layers"] = (s.arg2);
     r0 = (s.arg0).fields["tileset"] = (s.arg3);
-    s.tmp_0 = tiles_TileMapData_scale__P2309_mk(s);
+    s.tmp_0 = tiles_TileMapData_scale__P31728_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg4;
-    s.callLocIdx = 885; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 842; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -43323,12 +43330,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_constructor__P2305.info = {"start":3293,"length":358,"line":125,"column":8,"endLine":133,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","data","layers","tileset","scale"]}
+tiles_TileMapData_constructor__P31724.info = {"start":3293,"length":358,"line":125,"column":8,"endLine":133,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"inline","argumentNames":["this","data","layers","tileset","scale"]}
 
-function tiles_TileMapData_constructor__P2305_mk(s) {
+function tiles_TileMapData_constructor__P31724_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_constructor__P2305, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_constructor__P31724, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43343,7 +43350,7 @@ function tiles_TileMapData_constructor__P2305_mk(s) {
 
 
 
-function tiles_TileMapData_scale__P2309(s) {
+function tiles_TileMapData_scale__P31728(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43359,7 +43366,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_scale"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
@@ -43369,12 +43376,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_scale__P2309.info = {"start":3885,"length":102,"line":147,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
+tiles_TileMapData_scale__P31728.info = {"start":3885,"length":102,"line":147,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
 
-function tiles_TileMapData_scale__P2309_mk(s) {
+function tiles_TileMapData_scale__P31728_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_scale__P2309, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_scale__P31728, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43386,7 +43393,7 @@ function tiles_TileMapData_scale__P2309_mk(s) {
 
 
 
-function tiles_setTilemap__P2341(s) {
+function tiles_setTilemap__P31760(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43400,21 +43407,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_setTileMapLevel__P2462_mk(s);
+    s.tmp_0 = scene_setTileMapLevel__P31881_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 976; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 933; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_setTilemap__P2341.info = {"start":14603,"length":96,"line":468,"column":4,"endLine":470,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTilemap","argumentNames":["tilemap"]}
+tiles_setTilemap__P31760.info = {"start":14603,"length":96,"line":468,"column":4,"endLine":470,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setTilemap","argumentNames":["tilemap"]}
 
-function tiles_setTilemap__P2341_mk(s) {
+function tiles_setTilemap__P31760_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_setTilemap__P2341, depth: s.depth + 1,
+        parent: s, fn: tiles_setTilemap__P31760, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43424,7 +43431,7 @@ function tiles_setTilemap__P2341_mk(s) {
 
 
 
-function scene_setTileMapLevel__P2462(s) {
+function scene_setTileMapLevel__P31881(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43434,17 +43441,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___16100 = undefined;
+    s.scene___45595 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1060; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1017; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.scene___16100 = (r0);
-    r0 = s.scene___16100.fields["tileMap"];
+    s.scene___45595 = (r0);
+    r0 = s.scene___45595.fields["tileMap"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -43452,49 +43459,49 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMap__C2317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMap__C31736_VT);
     s.tmp_3 = r0;
-    s.tmp_4 = tiles_TileMap_constructor__P2318_mk(s);
+    s.tmp_4 = tiles_TileMap_constructor__P31737_mk(s);
     s.tmp_4.arg0 = s.tmp_3;
     s.tmp_4.arg1 = 4;
-    s.callLocIdx = 1061; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 1018; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
-    r0 = (s.scene___16100).fields["tileMap"] = (s.tmp_3);
+    r0 = (s.scene___45595).fields["tileMap"] = (s.tmp_3);
   case 1:
   case 2:
-    s.tmp_0 = tiles_TileMap_setData__P2328_mk(s);
-    r0 = s.scene___16100.fields["tileMap"];
+    s.tmp_0 = tiles_TileMap_setData__P31747_mk(s);
+    r0 = s.scene___45595.fields["tileMap"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1062; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1019; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = tiles_TileMap_scale__P2320_mk(s);
-    r0 = s.scene___16100.fields["tileMap"];
+    s.tmp_0 = tiles_TileMap_scale__P31739_mk(s);
+    r0 = s.scene___45595.fields["tileMap"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["_scale"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1064; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1021; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setTileMapLevel__P2462.info = {"start":2994,"length":260,"line":113,"column":4,"endLine":119,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setTileMapLevel","argumentNames":["map"]}
+scene_setTileMapLevel__P31881.info = {"start":2994,"length":260,"line":113,"column":4,"endLine":119,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"setTileMapLevel","argumentNames":["map"]}
 
-function scene_setTileMapLevel__P2462_mk(s) {
+function scene_setTileMapLevel__P31881_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setTileMapLevel__P2462, depth: s.depth + 1,
+        parent: s, fn: scene_setTileMapLevel__P31881, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  scene___16100: undefined,
+  scene___45595: undefined,
   arg0: undefined,
 } }
 
@@ -43502,7 +43509,7 @@ function scene_setTileMapLevel__P2462_mk(s) {
 
 
 
-function tiles_TileMap_setData__P2328(s) {
+function tiles_TileMap_setData__P31747(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43518,18 +43525,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_map"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_setData__P2328.info = {"start":7183,"length":66,"line":265,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setData","argumentNames":["this","map"]}
+tiles_TileMap_setData__P31747.info = {"start":7183,"length":66,"line":265,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setData","argumentNames":["this","map"]}
 
-function tiles_TileMap_setData__P2328_mk(s) {
+function tiles_TileMap_setData__P31747_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_setData__P2328, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_setData__P31747, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -43539,7 +43546,7 @@ function tiles_TileMap_setData__P2328_mk(s) {
 
 
 
-function tiles_TileMap_scale__P2320(s) {
+function tiles_TileMap_scale__P31739(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43555,17 +43562,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_scale"] = (s.arg1);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = tiles_TileMapData_scale__P2309_mk(s);
+    s.tmp_1 = tiles_TileMapData_scale__P31728_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 896; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 853; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
   case 1:
@@ -43574,12 +43581,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_scale__P2320.info = {"start":6190,"length":144,"line":224,"column":8,"endLine":229,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
+tiles_TileMap_scale__P31739.info = {"start":6190,"length":144,"line":224,"column":8,"endLine":229,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
 
-function tiles_TileMap_scale__P2320_mk(s) {
+function tiles_TileMap_scale__P31739_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_scale__P2320, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_scale__P31739, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43591,7 +43598,7 @@ function tiles_TileMap_scale__P2320_mk(s) {
 
 
 
-function tiles_TileMap_constructor__P2318(s) {
+function tiles_TileMap_constructor__P31737(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43607,34 +43614,34 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_layer"] = (1);
-    s.tmp_0 = tiles_TileMap_scale__P2320_mk(s);
+    s.tmp_0 = tiles_TileMap_scale__P31739_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 893; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 850; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P16146);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P45641);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = scene_createRenderable__P2383_mk(s);
+    s.tmp_1 = scene_createRenderable__P31802_mk(s);
     s.tmp_1.arg0 = -1;
     s.tmp_1.arg1 = s.tmp_0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 895; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 852; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_constructor__P2318.info = {"start":5865,"length":250,"line":210,"column":8,"endLine":218,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","scale"]}
+tiles_TileMap_constructor__P31737.info = {"start":5865,"length":250,"line":210,"column":8,"endLine":218,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"inline","argumentNames":["this","scale"]}
 
-function tiles_TileMap_constructor__P2318_mk(s) {
+function tiles_TileMap_constructor__P31737_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_constructor__P2318, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_constructor__P31737, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43646,7 +43653,7 @@ function tiles_TileMap_constructor__P2318_mk(s) {
 
 
 
-function inline__P16146(s) {
+function inline__P45641(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43661,23 +43668,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = tiles_TileMap_draw__P4294_mk(s);
+    s.tmp_0 = tiles_TileMap_draw__P33787_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
-    s.callLocIdx = 894; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 851; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P16146.info = {"start":6065,"length":25,"line":216,"column":16,"endLine":216,"endColumn":41,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["t","c"]}
+inline__P45641.info = {"start":6065,"length":25,"line":216,"column":16,"endLine":216,"endColumn":41,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"inline","argumentNames":["t","c"]}
 
-function inline__P16146_mk(s) {
+function inline__P45641_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P16146, depth: s.depth + 1,
+        parent: s, fn: inline__P45641, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43688,7 +43695,7 @@ function inline__P16146_mk(s) {
 
 
 
-function tiles_TileMap_draw__P4294(s) {
+function tiles_TileMap_draw__P33787(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43698,21 +43705,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bitmask___16157 = undefined;
-    s.offsetX___16163 = undefined;
-    s.offsetY___16168 = undefined;
-    s.x0___16173 = undefined;
-    s.xn___16180 = undefined;
-    s.y0___16197 = undefined;
-    s.yn___16204 = undefined;
-    s.x___16221 = undefined;
-    s.y___16227 = undefined;
-    s.index___16233 = undefined;
-    s.tile___16240 = undefined;
-    s.x___16276 = undefined;
-    s.xLine___16282 = undefined;
-    s.y___16308 = undefined;
-    s.yLine___16314 = undefined;
+    s.bitmask___45652 = undefined;
+    s.offsetX___45658 = undefined;
+    s.offsetY___45663 = undefined;
+    s.x0___45668 = undefined;
+    s.xn___45675 = undefined;
+    s.y0___45692 = undefined;
+    s.yn___45699 = undefined;
+    s.x___45716 = undefined;
+    s.y___45722 = undefined;
+    s.index___45728 = undefined;
+    s.tile___45735 = undefined;
+    s.x___45771 = undefined;
+    s.xLine___45777 = undefined;
+    s.y___45803 = undefined;
+    s.yLine___45809 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -43720,7 +43727,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
@@ -43745,16 +43752,16 @@ switch (step) {
     r0 = (1 << s.tmp_8);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 - 1);
-    s.bitmask___16157 = (r0);
+    s.bitmask___45652 = (r0);
     r0 = s.arg2.fields["drawOffsetX"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 & s.bitmask___16157);
-    s.offsetX___16163 = (r0);
+    r0 = (s.tmp_0 & s.bitmask___45652);
+    s.offsetX___45658 = (r0);
     r0 = s.arg2.fields["drawOffsetY"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 & s.bitmask___16157);
-    s.offsetY___16168 = (r0);
-    s.tmp_0 = Math_max__P125_mk(s);
+    r0 = (s.tmp_0 & s.bitmask___45652);
+    s.offsetY___45663 = (r0);
+    s.tmp_0 = Math_max__P29660_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg2.fields["drawOffsetX"];
     s.tmp_1 = r0;
@@ -43762,11 +43769,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 >> s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 933; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 890; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.x0___16173 = (r0);
-    s.tmp_0 = Math_min__P126_mk(s);
+    s.x0___45668 = (r0);
+    s.tmp_0 = Math_min__P29661_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_width"];
@@ -43783,11 +43790,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 936; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 893; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.xn___16180 = (r0);
-    s.tmp_0 = Math_max__P125_mk(s);
+    s.xn___45675 = (r0);
+    s.tmp_0 = Math_max__P29660_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg2.fields["drawOffsetY"];
     s.tmp_1 = r0;
@@ -43795,11 +43802,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 >> s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 938; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 895; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
-    s.y0___16197 = (r0);
-    s.tmp_0 = Math_min__P126_mk(s);
+    s.y0___45692 = (r0);
+    s.tmp_0 = Math_min__P29661_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_height"];
@@ -43816,95 +43823,95 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 941; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 898; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.yn___16204 = (r0);
-    s.x___16221 = (s.x0___16173);
+    s.yn___45699 = (r0);
+    s.x___45716 = (s.x0___45668);
   case 3:
-    r0 = (s.x___16221 <= s.xn___16180);
+    r0 = (s.x___45716 <= s.xn___45675);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.y___16227 = (s.y0___16197);
+    s.y___45722 = (s.y0___45692);
   case 4:
-    r0 = (s.y___16227 <= s.yn___16204);
+    r0 = (s.y___45722 <= s.yn___45699);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = tiles_TileMapData_getTile__P2310_mk(s);
+    s.tmp_1 = tiles_TileMapData_getTile__P31729_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.x___16221;
-    s.tmp_1.arg2 = s.y___16227;
-    s.callLocIdx = 942; s.pc = 28; return s.tmp_1;
+    s.tmp_1.arg1 = s.x___45716;
+    s.tmp_1.arg2 = s.y___45722;
+    s.callLocIdx = 899; s.pc = 28; return s.tmp_1;
   case 28:
     r0 = s.retval;
-    s.index___16233 = (r0);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P2313_mk(s);
+    s.index___45728 = (r0);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P31732_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___16233;
-    s.callLocIdx = 943; s.pc = 29; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___45728;
+    s.callLocIdx = 900; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
-    s.tile___16240 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tile___16240);
+    s.tile___45735 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tile___45735);
     if (!r0) { step = 5; continue; }
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_1 = r0 = s.tile___16240;
-    r0 = (s.x___16221 - s.x0___16173);
+    s.tmp_1 = r0 = s.tile___45735;
+    r0 = (s.x___45716 - s.x0___45668);
     s.tmp_4 = r0;
     r0 = s.arg0.fields["_scale"];
     s.tmp_5 = r0;
     r0 = (s.tmp_4 << s.tmp_5);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 - s.offsetX___16163);
+    r0 = (s.tmp_3 - s.offsetX___45658);
     s.tmp_2 = r0;
-    r0 = (s.y___16227 - s.y0___16197);
+    r0 = (s.y___45722 - s.y0___45692);
     s.tmp_8 = r0;
     r0 = s.arg0.fields["_scale"];
     s.tmp_9 = r0;
     r0 = (s.tmp_8 << s.tmp_9);
     s.tmp_7 = r0;
-    r0 = (s.tmp_7 - s.offsetY___16168);
+    r0 = (s.tmp_7 - s.offsetY___45663);
     s.tmp_6 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_0, s.tmp_1, s.tmp_2, s.tmp_6);
   case 5:
   case 6:
-    r0 = (s.y___16227 + 1);
-    s.y___16227 = (r0);
+    r0 = (s.y___45722 + 1);
+    s.y___45722 = (r0);
     { step = 4; continue; }
   case 7:
-    r0 = (s.x___16221 + 1);
-    s.x___16221 = (r0);
+    r0 = (s.x___45716 + 1);
+    s.x___45716 = (r0);
     { step = 3; continue; }
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___2528);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___31947);
     if (!r0) { step = 21; continue; }
-    s.x___16276 = (s.x0___16173);
+    s.x___45771 = (s.x0___45668);
   case 9:
-    r0 = (s.x___16276 <= s.xn___16180);
+    r0 = (s.x___45771 <= s.xn___45675);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.x___16276 - s.x0___16173);
+    r0 = (s.x___45771 - s.x0___45668);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["_scale"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 << s.tmp_3);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.offsetX___16163);
-    s.xLine___16282 = (r0);
-    r0 = (s.xLine___16282 >= 0);
+    r0 = (s.tmp_1 - s.offsetX___45658);
+    s.xLine___45777 = (r0);
+    r0 = (s.xLine___45777 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 10; continue; }
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 10:
-    s.tmp_1 = r0 = s.xLine___16282;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_1 = r0 = s.xLine___45777;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
   case 11:
@@ -43912,46 +43919,46 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 12; continue; }
-    s.tmp_4 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_4 = helpers_imageDrawLine__P31148_mk(s);
     s.tmp_4.arg0 = s.arg1;
-    s.tmp_4.arg1 = s.xLine___16282;
+    s.tmp_4.arg1 = s.xLine___45777;
     s.tmp_4.arg2 = 0;
-    s.tmp_4.arg3 = s.xLine___16282;
+    s.tmp_4.arg3 = s.xLine___45777;
     r0 = pxsim_ImageMethods.height(s.arg1);
     s.tmp_4.arg4 = r0;
     s.tmp_4.arg5 = 1;
-    s.callLocIdx = 947; s.pc = 30; return s.tmp_4;
+    s.callLocIdx = 904; s.pc = 30; return s.tmp_4;
   case 30:
     r0 = s.retval;
   case 12:
   case 13:
-    r0 = (s.x___16276 + 1);
-    s.x___16276 = (r0);
+    r0 = (s.x___45771 + 1);
+    s.x___45771 = (r0);
     { step = 9; continue; }
   case 14:
-    s.y___16308 = (s.y0___16197);
+    s.y___45803 = (s.y0___45692);
   case 15:
-    r0 = (s.y___16308 <= s.yn___16204);
+    r0 = (s.y___45803 <= s.yn___45699);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = (s.y___16308 - s.y0___16197);
+    r0 = (s.y___45803 - s.y0___45692);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["_scale"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 << s.tmp_3);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.offsetY___16168);
-    s.yLine___16314 = (r0);
-    r0 = (s.yLine___16314 >= 0);
+    r0 = (s.tmp_1 - s.offsetY___45663);
+    s.yLine___45809 = (r0);
+    r0 = (s.yLine___45809 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 16; continue; }
     r0 = s.tmp_0;
     { step = 17; continue; }
   case 16:
-    s.tmp_1 = r0 = s.yLine___16314;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.tmp_1 = r0 = s.yLine___45809;
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
   case 17:
@@ -43959,21 +43966,21 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 18; continue; }
-    s.tmp_4 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_4 = helpers_imageDrawLine__P31148_mk(s);
     s.tmp_4.arg0 = s.arg1;
     s.tmp_4.arg1 = 0;
-    s.tmp_4.arg2 = s.yLine___16314;
+    s.tmp_4.arg2 = s.yLine___45809;
     r0 = pxsim_ImageMethods.width(s.arg1);
     s.tmp_4.arg3 = r0;
-    s.tmp_4.arg4 = s.yLine___16314;
+    s.tmp_4.arg4 = s.yLine___45809;
     s.tmp_4.arg5 = 1;
-    s.callLocIdx = 949; s.pc = 31; return s.tmp_4;
+    s.callLocIdx = 906; s.pc = 31; return s.tmp_4;
   case 31:
     r0 = s.retval;
   case 18:
   case 19:
-    r0 = (s.y___16308 + 1);
-    s.y___16308 = (r0);
+    r0 = (s.y___45803 + 1);
+    s.y___45803 = (r0);
     { step = 15; continue; }
   case 20:
   case 21:
@@ -43983,12 +43990,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_draw__P4294.info = {"start":10187,"length":2224,"line":347,"column":8,"endLine":402,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"draw","argumentNames":["this","target","camera"]}
+tiles_TileMap_draw__P33787.info = {"start":10187,"length":2224,"line":347,"column":8,"endLine":402,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"draw","argumentNames":["this","target","camera"]}
 
-function tiles_TileMap_draw__P4294_mk(s) {
+function tiles_TileMap_draw__P33787_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_draw__P4294, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_draw__P33787, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44000,21 +44007,21 @@ function tiles_TileMap_draw__P4294_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  bitmask___16157: undefined,
-  offsetX___16163: undefined,
-  offsetY___16168: undefined,
-  x0___16173: undefined,
-  xn___16180: undefined,
-  y0___16197: undefined,
-  yn___16204: undefined,
-  x___16221: undefined,
-  y___16227: undefined,
-  index___16233: undefined,
-  tile___16240: undefined,
-  x___16276: undefined,
-  xLine___16282: undefined,
-  y___16308: undefined,
-  yLine___16314: undefined,
+  bitmask___45652: undefined,
+  offsetX___45658: undefined,
+  offsetY___45663: undefined,
+  x0___45668: undefined,
+  xn___45675: undefined,
+  y0___45692: undefined,
+  yn___45699: undefined,
+  x___45716: undefined,
+  y___45722: undefined,
+  index___45728: undefined,
+  tile___45735: undefined,
+  x___45771: undefined,
+  xLine___45777: undefined,
+  y___45803: undefined,
+  yLine___45809: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -44024,7 +44031,7 @@ function tiles_TileMap_draw__P4294_mk(s) {
 
 
 
-function scene_setBackgroundImage__P2459(s) {
+function scene_setBackgroundImage__P31878(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44034,36 +44041,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___14300 = undefined;
+    s.scene___43825 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1056; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1013; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___14300 = (r0);
-    s.tmp_0 = scene_Background_image__P2272_mk(s);
-    r0 = s.scene___14300.fields["background"];
+    s.scene___43825 = (r0);
+    s.tmp_0 = scene_Background_image__P31691_mk(s);
+    r0 = s.scene___43825.fields["background"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1057; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1014; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setBackgroundImage__P2459.info = {"start":1938,"length":135,"line":78,"column":4,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setBackgroundImage","argumentNames":["img"]}
+scene_setBackgroundImage__P31878.info = {"start":1938,"length":135,"line":78,"column":4,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"setBackgroundImage","argumentNames":["img"]}
 
-function scene_setBackgroundImage__P2459_mk(s) {
+function scene_setBackgroundImage__P31878_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setBackgroundImage__P2459, depth: s.depth + 1,
+        parent: s, fn: scene_setBackgroundImage__P31878, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___14300: undefined,
+  scene___43825: undefined,
   arg0: undefined,
 } }
 
@@ -44071,7 +44078,7 @@ function scene_setBackgroundImage__P2459_mk(s) {
 
 
 
-function scene_Background_image__P2272(s) {
+function scene_Background_image__P31691(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44087,18 +44094,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C31684_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_image"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_image__P2272.info = {"start":1003,"length":68,"line":40,"column":8,"endLine":42,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"image","argumentNames":["this","image"]}
+scene_Background_image__P31691.info = {"start":1003,"length":68,"line":40,"column":8,"endLine":42,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"image","argumentNames":["this","image"]}
 
-function scene_Background_image__P2272_mk(s) {
+function scene_Background_image__P31691_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_image__P2272, depth: s.depth + 1,
+        parent: s, fn: scene_Background_image__P31691, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -44108,7 +44115,7 @@ function scene_Background_image__P2272_mk(s) {
 
 
 
-function scene_Background_image__P2271(s) {
+function scene_Background_image__P31690(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44123,7 +44130,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C31684_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -44133,9 +44140,9 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     s.tmp_3 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_5 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_6 = r0;
     r0 = pxsim.image.create(s.tmp_5, s.tmp_6);
     s.tmp_4 = r0;
@@ -44146,13 +44153,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Background_image__P2271.info = {"start":811,"length":174,"line":33,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"image","argumentNames":["this"]}
-scene_Background_image__P2271.isGetter = true;
+scene_Background_image__P31690.info = {"start":811,"length":174,"line":33,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"image","argumentNames":["this"]}
+scene_Background_image__P31690.isGetter = true;
 
-function scene_Background_image__P2271_mk(s) {
+function scene_Background_image__P31690_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_image__P2271, depth: s.depth + 1,
+        parent: s, fn: scene_Background_image__P31690, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44168,7 +44175,7 @@ function scene_Background_image__P2271_mk(s) {
 
 
 
-function scene_setBackgroundColor__P2457(s) {
+function scene_setBackgroundColor__P31876(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44178,32 +44185,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___16341 = undefined;
+    s.scene___45836 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1055; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1012; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___16341 = (r0);
-    r0 = s.scene___16341.fields["background"];
+    s.scene___45836 = (r0);
+    r0 = s.scene___45836.fields["background"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["color"] = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setBackgroundColor__P2457.info = {"start":1207,"length":140,"line":53,"column":4,"endLine":56,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setBackgroundColor","argumentNames":["color"]}
+scene_setBackgroundColor__P31876.info = {"start":1207,"length":140,"line":53,"column":4,"endLine":56,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"setBackgroundColor","argumentNames":["color"]}
 
-function scene_setBackgroundColor__P2457_mk(s) {
+function scene_setBackgroundColor__P31876_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setBackgroundColor__P2457, depth: s.depth + 1,
+        parent: s, fn: scene_setBackgroundColor__P31876, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___16341: undefined,
+  scene___45836: undefined,
   arg0: undefined,
 } }
 
@@ -44211,7 +44218,7 @@ function scene_setBackgroundColor__P2457_mk(s) {
 
 
 
-function blockSettings_readNumber__P3750(s) {
+function blockSettings_readNumber__P33284(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44225,20 +44232,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = settings_readNumber__P1833_mk(s);
+    s.tmp_0 = settings_readNumber__P31252_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 2094; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2099; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-blockSettings_readNumber__P3750.info = {"start":752,"length":90,"line":23,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"readNumber","argumentNames":["name"]}
+blockSettings_readNumber__P33284.info = {"start":752,"length":90,"line":23,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"readNumber","argumentNames":["name"]}
 
-function blockSettings_readNumber__P3750_mk(s) {
+function blockSettings_readNumber__P33284_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockSettings_readNumber__P3750, depth: s.depth + 1,
+        parent: s, fn: blockSettings_readNumber__P33284, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -44248,7 +44255,7 @@ function blockSettings_readNumber__P3750_mk(s) {
 
 
 
-function settings_readNumber__P1833(s) {
+function settings_readNumber__P31252(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44258,15 +44265,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___14330 = undefined;
-    s.nums___14337 = undefined;
+    s.buf___43855 = undefined;
+    s.nums___43862 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim.settings._get(s.arg0);
-    s.buf___14330 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.buf___14330);
+    s.buf___43855 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.buf___43855);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -44276,20 +44283,20 @@ switch (step) {
     { step = 7; continue; }
     { step = 6; continue; }
   case 1:
-    s.tmp_2 = msgpack_unpackNumberArray__P176_mk(s);
-    s.tmp_2.arg0 = s.buf___14330;
+    s.tmp_2 = msgpack_unpackNumberArray__P29711_mk(s);
+    s.tmp_2.arg0 = s.buf___43855;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 168; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 125; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    s.nums___14337 = (r0);
-    s.tmp_0 = r0 = s.nums___14337;
+    s.nums___43862 = (r0);
+    s.tmp_0 = r0 = s.nums___43862;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 2; continue; }
     r0 = s.tmp_0;
     { step = 3; continue; }
   case 2:
-    r0 = pxsim_Array__length(s.nums___14337);
+    r0 = pxsim_Array__length(s.nums___43862);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >= 1);
   case 3:
@@ -44297,7 +44304,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.nums___14337, 0);
+    r0 = pxsim_Array__getAt(s.nums___43862, 0);
     { step = 7; continue; }
   case 4:
   case 5:
@@ -44309,18 +44316,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readNumber__P1833.info = {"start":2887,"length":313,"line":114,"column":4,"endLine":124,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"readNumber","argumentNames":["key"]}
+settings_readNumber__P31252.info = {"start":2887,"length":313,"line":114,"column":4,"endLine":124,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"readNumber","argumentNames":["key"]}
 
-function settings_readNumber__P1833_mk(s) {
+function settings_readNumber__P31252_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readNumber__P1833, depth: s.depth + 1,
+        parent: s, fn: settings_readNumber__P31252, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  buf___14330: undefined,
-  nums___14337: undefined,
+  buf___43855: undefined,
+  nums___43862: undefined,
   arg0: undefined,
 } }
 
@@ -44328,7 +44335,7 @@ function settings_readNumber__P1833_mk(s) {
 
 
 
-function settings_readBuffer__P1831(s) {
+function settings_readBuffer__P31250(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44346,12 +44353,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readBuffer__P1831.info = {"start":2516,"length":72,"line":96,"column":4,"endLine":98,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"readBuffer","argumentNames":["key"]}
+settings_readBuffer__P31250.info = {"start":2516,"length":72,"line":96,"column":4,"endLine":98,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"readBuffer","argumentNames":["key"]}
 
-function settings_readBuffer__P1831_mk(s) {
+function settings_readBuffer__P31250_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readBuffer__P1831, depth: s.depth + 1,
+        parent: s, fn: settings_readBuffer__P31250, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -44360,7 +44367,7 @@ function settings_readBuffer__P1831_mk(s) {
 
 
 
-function msgpack_unpackNumberArray__P176(s) {
+function msgpack_unpackNumberArray__P29711(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44370,16 +44377,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___14350 = undefined;
-    s.fmt___14357 = undefined;
-    s.v___14366 = undefined;
+    s.res___43875 = undefined;
+    s.fmt___43882 = undefined;
+    s.v___43891 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___14350 = (r0);
+    s.res___43875 = (r0);
   case 1:
     s.tmp_1 = r0 = s.arg1;
     r0 = pxsim.BufferMethods.length(s.arg0);
@@ -44391,14 +44398,14 @@ switch (step) {
     s.tmp_3 = r0 = s.arg1;
     r0 = (s.tmp_3 + 1);
     s.arg1 = (r0);
-    s.tmp_4 = msgpack_tagFormat__P3972_mk(s);
+    s.tmp_4 = msgpack_tagFormat__P33507_mk(s);
     r0 = pxsim.BufferMethods.getByte(s.arg0, s.tmp_3);
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 21; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
-    s.fmt___14357 = (r0);
-    r0 = (s.fmt___14357 === null);
+    s.fmt___43882 = (r0);
+    r0 = (s.fmt___43882 === null);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
@@ -44406,21 +44413,21 @@ switch (step) {
     r0 = (s.arg1 - 1);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_1, 6, s.tmp_2);
-    s.v___14366 = (r0);
-    r0 = (-31 <= s.v___14366);
+    s.v___43891 = (r0);
+    r0 = (-31 <= s.v___43891);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 2; continue; }
     r0 = s.tmp_0;
     { step = 3; continue; }
   case 2:
-    r0 = (s.v___14366 <= 127);
+    r0 = (s.v___43891 <= 127);
   case 3:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__push(s.res___14350, s.v___14366);
+    r0 = pxsim_Array__push(s.res___43875, s.v___43891);
     { step = 5; continue; }
   case 4:
     r0 = null;
@@ -44428,13 +44435,13 @@ switch (step) {
   case 5:
     { step = 7; continue; }
   case 6:
-    s.tmp_0 = r0 = s.res___14350;
-    r0 = pxsim.BufferMethods.getNumber(s.arg0, s.fmt___14357, s.arg1);
+    s.tmp_0 = r0 = s.res___43875;
+    r0 = pxsim.BufferMethods.getNumber(s.arg0, s.fmt___43882, s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_2 = pins_sizeOf__P168_mk(s);
-    s.tmp_2.arg0 = s.fmt___14357;
+    s.tmp_2 = pins_sizeOf__P29703_mk(s);
+    s.tmp_2.arg0 = s.fmt___43882;
     s.callLocIdx = 22; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
@@ -44455,26 +44462,26 @@ switch (step) {
   case 9:
     { step = 1; continue; }
   case 10:
-    r0 = s.res___14350;
+    r0 = s.res___43875;
   case 11:
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_unpackNumberArray__P176.info = {"start":2650,"length":669,"line":91,"column":4,"endLine":111,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"unpackNumberArray","argumentNames":["buf","offset"]}
+msgpack_unpackNumberArray__P29711.info = {"start":2650,"length":669,"line":91,"column":4,"endLine":111,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"unpackNumberArray","argumentNames":["buf","offset"]}
 
-function msgpack_unpackNumberArray__P176_mk(s) {
+function msgpack_unpackNumberArray__P29711_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_unpackNumberArray__P176, depth: s.depth + 1,
+        parent: s, fn: msgpack_unpackNumberArray__P29711, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  res___14350: undefined,
-  fmt___14357: undefined,
-  v___14366: undefined,
+  res___43875: undefined,
+  fmt___43882: undefined,
+  v___43891: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -44483,7 +44490,7 @@ function msgpack_unpackNumberArray__P176_mk(s) {
 
 
 
-function blockSettings_exists__P3756(s) {
+function blockSettings_exists__P33290(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44501,12 +44508,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockSettings_exists__P3756.info = {"start":2896,"length":82,"line":95,"column":4,"endLine":97,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"exists","argumentNames":["name"]}
+blockSettings_exists__P33290.info = {"start":2896,"length":82,"line":95,"column":4,"endLine":97,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"exists","argumentNames":["name"]}
 
-function blockSettings_exists__P3756_mk(s) {
+function blockSettings_exists__P33290_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockSettings_exists__P3756, depth: s.depth + 1,
+        parent: s, fn: blockSettings_exists__P33290, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -44515,7 +44522,7 @@ function blockSettings_exists__P3756_mk(s) {
 
 
 
-function settings_exists__P1837(s) {
+function settings_exists__P31256(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44533,12 +44540,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_exists__P1837.info = {"start":3828,"length":71,"line":155,"column":4,"endLine":157,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"exists","argumentNames":["key"]}
+settings_exists__P31256.info = {"start":3828,"length":71,"line":155,"column":4,"endLine":157,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"exists","argumentNames":["key"]}
 
-function settings_exists__P1837_mk(s) {
+function settings_exists__P31256_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_exists__P1837, depth: s.depth + 1,
+        parent: s, fn: settings_exists__P31256, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -44547,7 +44554,7 @@ function settings_exists__P1837_mk(s) {
 
 
 
-function scene_cameraFollowSprite__P2464(s) {
+function scene_cameraFollowSprite__P31883(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44557,32 +44564,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___15962 = undefined;
+    s.scene___45457 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1065; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1022; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___15962 = (r0);
-    r0 = s.scene___15962.fields["camera"];
+    s.scene___45457 = (r0);
+    r0 = s.scene___45457.fields["camera"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["sprite"] = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_cameraFollowSprite__P2464.info = {"start":3990,"length":139,"line":142,"column":4,"endLine":145,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"cameraFollowSprite","argumentNames":["sprite"]}
+scene_cameraFollowSprite__P31883.info = {"start":3990,"length":139,"line":142,"column":4,"endLine":145,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"cameraFollowSprite","argumentNames":["sprite"]}
 
-function scene_cameraFollowSprite__P2464_mk(s) {
+function scene_cameraFollowSprite__P31883_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_cameraFollowSprite__P2464, depth: s.depth + 1,
+        parent: s, fn: scene_cameraFollowSprite__P31883, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___15962: undefined,
+  scene___45457: undefined,
   arg0: undefined,
 } }
 
@@ -44590,7 +44597,7 @@ function scene_cameraFollowSprite__P2464_mk(s) {
 
 
 
-function blockMenu_onMenuOptionSelected__P3687(s) {
+function music_beat__P32379(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44600,35 +44607,76 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___14419 = undefined;
+    s.beat___71046 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = blockMenu__getState__P3722_mk(s);
-    s.callLocIdx = 1946; s.pc = 1; return s.tmp_0;
-  case 1:
+    s.tmp_0 = music_init__P34353_mk(s);
+    s.callLocIdx = 67; s.pc = 10; return s.tmp_0;
+  case 10:
     r0 = s.retval;
-    s.state___14419 = (r0);
-    s.tmp_0 = blockMenu__BlockMenuState_addHandler__P3718_mk(s);
-    s.tmp_0.arg0 = s.state___14419;
-    s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1947; s.pc = 2; return s.tmp_0;
+    r0 = (s.arg0 == null);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.arg0 = (1);
+  case 1:
   case 2:
-    r0 = s.retval;
-    r0 = undefined;
+    r0 = (60000 / globals.beatsPerMinute___34352);
+    s.beat___71046 = (r0);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = pxsim_pxtcore.switch_eq(2, s.tmp_0);
+    if (r0) { step = 3; continue; }
+    r0 = pxsim_pxtcore.switch_eq(4, s.tmp_0);
+    if (r0) { step = 4; continue; }
+    r0 = pxsim_pxtcore.switch_eq(8, s.tmp_0);
+    if (r0) { step = 5; continue; }
+    r0 = pxsim_pxtcore.switch_eq(16, s.tmp_0);
+    if (r0) { step = 6; continue; }
+    r0 = pxsim_pxtcore.switch_eq(32, s.tmp_0);
+    if (r0) { step = 7; continue; }
+    r0 = pxsim_pxtcore.switch_eq(64, s.tmp_0);
+    if (r0) { step = 8; continue; }
+    r0 = s.tmp_0;
+    { step = 9; continue; }
+  case 3:
+    r0 = (s.beat___71046 / 2);
+    s.beat___71046 = (r0);
+    { step = 9; continue; }
+  case 4:
+    r0 = (s.beat___71046 / 4);
+    s.beat___71046 = (r0);
+    { step = 9; continue; }
+  case 5:
+    r0 = (s.beat___71046 / 8);
+    s.beat___71046 = (r0);
+    { step = 9; continue; }
+  case 6:
+    r0 = (s.beat___71046 / 16);
+    s.beat___71046 = (r0);
+    { step = 9; continue; }
+  case 7:
+    r0 = (s.beat___71046 * 2);
+    s.beat___71046 = (r0);
+    { step = 9; continue; }
+  case 8:
+    r0 = (s.beat___71046 * 4);
+    s.beat___71046 = (r0);
+  case 9:
+    r0 = (s.beat___71046 >> 0);
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_onMenuOptionSelected__P3687.info = {"start":2427,"length":164,"line":86,"column":4,"endLine":89,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"onMenuOptionSelected","argumentNames":["handler"]}
+music_beat__P32379.info = {"start":5118,"length":583,"line":172,"column":4,"endLine":185,"endColumn":5,"fileName":"pxt_modules/mixer---samd/music.ts","functionName":"beat","argumentNames":["fraction"]}
 
-function blockMenu_onMenuOptionSelected__P3687_mk(s) {
+function music_beat__P32379_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_onMenuOptionSelected__P3687, depth: s.depth + 1,
+        parent: s, fn: music_beat__P32379, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___14419: undefined,
+  beat___71046: undefined,
   arg0: undefined,
 } }
 
@@ -44636,7 +44684,7 @@ function blockMenu_onMenuOptionSelected__P3687_mk(s) {
 
 
 
-function blockMenu__BlockMenuState_addHandler__P3718(s) {
+function music_init__P34353(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44646,41 +44694,35 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu__BlockMenuState__C3713_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    if (!r0) { step = 1; continue; }
-    r0 = s.arg0.fields["handlers"];
+    r0 = pxsim_numops_toBoolDecr(globals.beatsPerMinute___34352);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.arg1);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    globals.beatsPerMinute___34352 = (120);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__BlockMenuState_addHandler__P3718.info = {"start":411,"length":160,"line":15,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"addHandler","argumentNames":["this","handler"]}
+music_init__P34353.info = {"start":4738,"length":74,"line":160,"column":4,"endLine":162,"endColumn":5,"fileName":"pxt_modules/mixer---samd/music.ts","functionName":"init","argumentNames":[]}
 
-function blockMenu__BlockMenuState_addHandler__P3718_mk(s) {
+function music_init__P34353_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__BlockMenuState_addHandler__P3718, depth: s.depth + 1,
+        parent: s, fn: music_init__P34353, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  arg0: undefined,
-  arg1: undefined,
+  tmp_1: undefined,
 } }
 
 
 
 
 
-function Sprite_setImage__P2056(s) {
+function music_playTone__P32274(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44690,42 +44732,73 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.id___52393 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
+    s.arg1 = (s.tmp_0);
+    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 == 0);
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 1; continue; }
-    { step = 3; continue; }
+    r0 = pxsim_pxtrt_stlocRef(s.arg1, 86400000);
   case 1:
   case 2:
-    r0 = (s.arg0).fields["_image"] = (s.arg1);
-    s.tmp_0 = Sprite_setHitbox__P2057_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 302; s.pc = 4; return s.tmp_0;
-  case 4:
+    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 <= 2000);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 3; continue; }
+    s.tmp_2 = music_playNoteCore__P34333_mk(s);
+    s.tmp_2.arg0 = 0;
+    s.tmp_2.arg1 = s.arg0;
+    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
+    s.tmp_2.arg2 = r0;
+    s.callLocIdx = 1644; s.pc = 5; return s.tmp_2;
+  case 5:
+    r0 = s.retval;
+    s.tmp_0 = pause__P29937_mk(s);
+    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
+    s.tmp_0.arg0 = r0;
+    s.callLocIdx = 1645; s.pc = 6; return s.tmp_0;
+  case 6:
     r0 = s.retval;
+    { step = 4; continue; }
   case 3:
+    r0 = (globals.playToneID___34335 + 1);
+    s.tmp_0 = r0;
+    globals.playToneID___34335 = (r0);
+    s.id___52393 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P52399);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.id___52393);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg1);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg0);
+    r0 = pxsim.control.runInParallel(s.tmp_0);
+  case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setImage__P2056.info = {"start":6825,"length":133,"line":252,"column":4,"endLine":256,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setImage","argumentNames":["this","img"]}
+music_playTone__P32274.info = {"start":2591,"length":831,"line":83,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"playTone","argumentNames":["frequency","ms"]}
 
-function Sprite_setImage__P2056_mk(s) {
+function music_playTone__P32274_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setImage__P2056, depth: s.depth + 1,
+        parent: s, fn: music_playTone__P32274, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
+  tmp_2: undefined,
+  id___52393: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -44734,7 +44807,7 @@ function Sprite_setImage__P2056_mk(s) {
 
 
 
-function Sprite_setHitbox__P2057(s) {
+function inline__P52399(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44744,165 +44817,106 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.newHitBox___16357 = undefined;
-    s.oMinX___16365 = undefined;
-    s.oMinY___16369 = undefined;
-    s.oMaxX___16373 = undefined;
-    s.oMaxY___16380 = undefined;
-    s.nMinX___16387 = undefined;
-    s.nMinY___16390 = undefined;
-    s.nMaxX___16393 = undefined;
-    s.nMaxY___16399 = undefined;
-    s.xDiff___16405 = undefined;
-    s.yDiff___16416 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_0 = game_calculateHitBox__P1970_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 303; s.pc = 8; return s.tmp_0;
-  case 8:
-    r0 = s.retval;
-    s.newHitBox___16357 = (r0);
-    r0 = s.arg0.fields["_hitbox"];
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___16357);
-    { step = 7; continue; }
+    s.pos___52400 = undefined;
+    s.now___52410 = undefined;
+    s.d___52413 = undefined;
+    s.t___52417 = undefined;
+    r0 = pxsim.control.millis();
+    s.pos___52400 = (r0);
   case 1:
-  case 2:
-    r0 = s.arg0.fields["_hitbox"];
-    r0 = r0.fields["ox"];
-    s.oMinX___16365 = (r0);
-    r0 = s.arg0.fields["_hitbox"];
-    r0 = r0.fields["oy"];
-    s.oMinY___16369 = (r0);
-    r0 = s.arg0.fields["_hitbox"];
-    r0 = r0.fields["width"];
-    s.tmp_0 = r0;
-    r0 = (s.oMinX___16365 + s.tmp_0);
-    s.oMaxX___16373 = (r0);
-    r0 = s.arg0.fields["_hitbox"];
-    r0 = r0.fields["height"];
+    r0 = (s.caps[0] == globals.playToneID___34335);
     s.tmp_0 = r0;
-    r0 = (s.oMinY___16369 + s.tmp_0);
-    s.oMaxY___16380 = (r0);
-    r0 = s.newHitBox___16357.fields["ox"];
-    s.nMinX___16387 = (r0);
-    r0 = s.newHitBox___16357.fields["oy"];
-    s.nMinY___16390 = (r0);
-    r0 = s.newHitBox___16357.fields["width"];
-    s.tmp_0 = r0;
-    r0 = (s.nMinX___16387 + s.tmp_0);
-    s.nMaxX___16393 = (r0);
-    r0 = s.newHitBox___16357.fields["height"];
-    s.tmp_0 = r0;
-    r0 = (s.nMinY___16390 + s.tmp_0);
-    s.nMaxY___16399 = (r0);
-    s.tmp_1 = Fx_abs__P160_mk(s);
-    r0 = (s.oMinX___16365 - s.nMinX___16387);
-    s.tmp_1.arg0 = r0;
-    s.callLocIdx = 309; s.pc = 9; return s.tmp_1;
-  case 9:
-    r0 = s.retval;
-    s.tmp_0 = r0;
-    s.tmp_3 = Fx_abs__P160_mk(s);
-    r0 = (s.oMaxX___16373 - s.nMaxX___16393);
-    s.tmp_3.arg0 = r0;
-    s.callLocIdx = 311; s.pc = 10; return s.tmp_3;
-  case 10:
-    r0 = s.retval;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 2; continue; }
+    r0 = s.tmp_0;
+    { step = 3; continue; }
+  case 2:
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 > 0);
+  case 3:
+    // jmp value (already in r0)
     s.tmp_2 = r0;
-    r0 = (s.tmp_0 + s.tmp_2);
-    s.xDiff___16405 = (r0);
-    s.tmp_1 = Fx_abs__P160_mk(s);
-    r0 = (s.oMinY___16369 - s.nMinY___16390);
-    s.tmp_1.arg0 = r0;
-    s.callLocIdx = 314; s.pc = 11; return s.tmp_1;
-  case 11:
-    r0 = s.retval;
-    s.tmp_0 = r0;
-    s.tmp_3 = Fx_abs__P160_mk(s);
-    r0 = (s.oMaxY___16380 - s.nMaxY___16399);
-    s.tmp_3.arg0 = r0;
-    s.callLocIdx = 316; s.pc = 12; return s.tmp_3;
-  case 12:
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 6; continue; }
+    r0 = pxsim.control.millis();
+    s.now___52410 = (r0);
+    r0 = (s.pos___52400 - s.now___52410);
+    s.d___52413 = (r0);
+    s.tmp_0 = Math_min__P29661_mk(s);
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
+    s.tmp_0.arg0 = r0;
+    s.tmp_0.arg1 = 500;
+    s.callLocIdx = 1646; s.pc = 7; return s.tmp_0;
+  case 7:
     r0 = s.retval;
+    s.t___52417 = (r0);
+    s.tmp_0 = r0 = s.caps[1];
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_2 = r0;
-    r0 = (s.tmp_0 + s.tmp_2);
-    s.yDiff___16416 = (r0);
-    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___16357);
-    r0 = (s.xDiff___16405 <= 512);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 3; continue; }
-    r0 = s.arg0.fields["_hitbox"];
+    r0 = (s.tmp_2 - s.t___52417);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1).fields["ox"] = (s.oMinX___16365);
-    r0 = s.arg0.fields["_hitbox"];
-    s.tmp_0 = r0;
-    r0 = (s.oMaxX___16373 - s.oMinX___16365);
+    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
+    r0 = (s.pos___52400 + s.t___52417);
+    s.pos___52400 = (r0);
+    s.tmp_0 = music_playNoteCore__P34333_mk(s);
+    r0 = (s.d___52413 - 1);
+    s.tmp_0.arg0 = r0;
+    s.tmp_0.arg1 = s.caps[2];
+    s.tmp_0.arg2 = s.t___52417;
+    s.callLocIdx = 1647; s.pc = 8; return s.tmp_0;
+  case 8:
+    r0 = s.retval;
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["width"] = (s.tmp_1);
-  case 3:
-  case 4:
-    r0 = (s.yDiff___16416 <= 512);
+    r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    r0 = s.arg0.fields["_hitbox"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1).fields["oy"] = (s.oMinY___16369);
-    r0 = s.arg0.fields["_hitbox"];
-    s.tmp_0 = r0;
-    r0 = (s.oMaxY___16380 - s.oMinY___16369);
+    if (!r0) { step = 4; continue; }
+    s.tmp_2 = pause__P29937_mk(s);
+    r0 = (s.d___52413 + s.t___52417);
+    s.tmp_2.arg0 = r0;
+    s.callLocIdx = 1648; s.pc = 9; return s.tmp_2;
+  case 9:
+    r0 = s.retval;
+    { step = 5; continue; }
+  case 4:
+    s.tmp_0 = pause__P29937_mk(s);
+    r0 = (s.d___52413 + s.t___52417);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["height"] = (s.tmp_1);
+    r0 = (s.tmp_1 - 100);
+    s.tmp_0.arg0 = r0;
+    s.callLocIdx = 1649; s.pc = 10; return s.tmp_0;
+  case 10:
+    r0 = s.retval;
   case 5:
+    { step = 1; continue; }
   case 6:
-  case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setHitbox__P2057.info = {"start":6964,"length":1296,"line":258,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setHitbox","argumentNames":["this"]}
+inline__P52399.info = {"start":2890,"length":515,"line":92,"column":34,"endLine":106,"endColumn":13,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"inline","argumentNames":[]}
 
-function Sprite_setHitbox__P2057_mk(s) {
+function inline__P52399_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setHitbox__P2057, depth: s.depth + 1,
+        parent: s, fn: inline__P52399, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tmp_3: undefined,
-  newHitBox___16357: undefined,
-  oMinX___16365: undefined,
-  oMinY___16369: undefined,
-  oMaxX___16373: undefined,
-  oMaxY___16380: undefined,
-  nMinX___16387: undefined,
-  nMinY___16390: undefined,
-  nMaxX___16393: undefined,
-  nMaxY___16399: undefined,
-  xDiff___16405: undefined,
-  yDiff___16416: undefined,
-  arg0: undefined,
+  pos___52400: undefined,
+  now___52410: undefined,
+  d___52413: undefined,
+  t___52417: undefined,
 } }
 
 
 
 
 
-function game_calculateHitBox__P1970(s) {
+function music_playNoteCore__P34333(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44912,140 +44926,57 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___16465 = undefined;
-    s.minX___16468 = undefined;
-    s.minY___16471 = undefined;
-    s.maxX___16474 = undefined;
-    s.maxY___16475 = undefined;
-    s.c___16476 = undefined;
-    s.r___16482 = undefined;
-    s.width___16513 = undefined;
-    s.height___16519 = undefined;
+    s.buf___52447 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0.fields["_image"];
-    s.i___16465 = (r0);
-    r0 = pxsim_ImageMethods.width(s.i___16465);
-    s.minX___16468 = (r0);
-    r0 = pxsim_ImageMethods.height(s.i___16465);
-    s.minY___16471 = (r0);
-    s.maxX___16474 = (0);
-    s.maxY___16475 = (0);
-    s.c___16476 = (0);
-  case 1:
-    s.tmp_1 = r0 = s.c___16476;
-    r0 = pxsim_ImageMethods.width(s.i___16465);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 < s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 6; continue; }
-    s.r___16482 = (0);
+    r0 = pxsim.control.createBuffer(12);
+    s.buf___52447 = (r0);
+    s.tmp_0 = music_addNote__P34340_mk(s);
+    s.tmp_0.arg0 = s.buf___52447;
+    s.tmp_0.arg1 = 0;
+    s.tmp_0.arg2 = s.arg2;
+    s.tmp_0.arg3 = 255;
+    s.tmp_0.arg4 = 255;
+    s.tmp_0.arg5 = 3;
+    s.tmp_0.arg6 = s.arg1;
+    s.tmp_1 = music_volume__P32273_mk(s);
+    s.callLocIdx = 1642; s.pc = 2; return s.tmp_1;
   case 2:
-    s.tmp_1 = r0 = s.r___16482;
-    r0 = pxsim_ImageMethods.height(s.i___16465);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 < s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    r0 = pxsim_ImageMethods.getPixel(s.i___16465, s.c___16476, s.r___16482);
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    s.tmp_4 = Math_min__P126_mk(s);
-    s.tmp_4.arg0 = s.minX___16468;
-    s.tmp_4.arg1 = s.c___16476;
-    s.callLocIdx = 260; s.pc = 7; return s.tmp_4;
-  case 7:
-    r0 = s.retval;
-    s.minX___16468 = (r0);
-    s.tmp_0 = Math_min__P126_mk(s);
-    s.tmp_0.arg0 = s.minY___16471;
-    s.tmp_0.arg1 = s.r___16482;
-    s.callLocIdx = 261; s.pc = 8; return s.tmp_0;
-  case 8:
     r0 = s.retval;
-    s.minY___16471 = (r0);
-    s.tmp_0 = Math_max__P125_mk(s);
-    s.tmp_0.arg0 = s.maxX___16474;
-    s.tmp_0.arg1 = s.c___16476;
-    s.callLocIdx = 262; s.pc = 9; return s.tmp_0;
-  case 9:
-    r0 = s.retval;
-    s.maxX___16474 = (r0);
-    s.tmp_0 = Math_max__P125_mk(s);
-    s.tmp_0.arg0 = s.maxY___16475;
-    s.tmp_0.arg1 = s.r___16482;
-    s.callLocIdx = 263; s.pc = 10; return s.tmp_0;
-  case 10:
-    r0 = s.retval;
-    s.maxY___16475 = (r0);
-  case 3:
-  case 4:
-    r0 = (s.r___16482 + 1);
-    s.r___16482 = (r0);
-    { step = 2; continue; }
-  case 5:
-    r0 = (s.c___16476 + 1);
-    s.c___16476 = (r0);
-    { step = 1; continue; }
-  case 6:
-    r0 = (s.maxX___16474 - s.minX___16468);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 + 1);
-    s.width___16513 = (r0);
-    r0 = (s.maxY___16475 - s.minY___16471);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 + 1);
-    s.height___16519 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(game_Hitbox__C1959_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = game_Hitbox_constructor__P1965_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.arg0;
-    s.tmp_1.arg2 = s.width___16513;
-    s.tmp_1.arg3 = s.height___16519;
-    s.tmp_1.arg4 = s.minX___16468;
-    s.tmp_1.arg5 = s.minY___16471;
-    s.callLocIdx = 264; s.pc = 11; return s.tmp_1;
-  case 11:
+    s.tmp_0.arg7 = r0;
+    s.tmp_0.arg8 = s.arg1;
+    s.callLocIdx = 1643; s.pc = 1; return s.tmp_0;
+  case 1:
     r0 = s.retval;
-    r0 = s.tmp_0;
+    r0 = pxsim.music.queuePlayInstructions(s.arg0, s.buf___52447);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_calculateHitBox__P1970.info = {"start":894,"length":684,"line":40,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game/hitbox.ts","functionName":"calculateHitBox","argumentNames":["s"]}
+music_playNoteCore__P34333.info = {"start":1877,"length":240,"line":66,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"playNoteCore","argumentNames":["when","frequency","ms"]}
 
-function game_calculateHitBox__P1970_mk(s) {
+function music_playNoteCore__P34333_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_calculateHitBox__P1970, depth: s.depth + 1,
+        parent: s, fn: music_playNoteCore__P34333, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  i___16465: undefined,
-  minX___16468: undefined,
-  minY___16471: undefined,
-  maxX___16474: undefined,
-  maxY___16475: undefined,
-  c___16476: undefined,
-  r___16482: undefined,
-  width___16513: undefined,
-  height___16519: undefined,
+  buf___52447: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function game_Hitbox_constructor__P1965(s) {
+function music_addNote__P34340(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45062,62 +44993,157 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.arg4 = (s.lambdaArgs[4]);
       s.arg5 = (s.lambdaArgs[5]);
+      s.arg6 = (s.lambdaArgs[6]);
+      s.arg7 = (s.lambdaArgs[7]);
+      s.arg8 = (s.lambdaArgs[8]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["parent"] = (s.arg1);
+    r0 = (s.arg2 > 0);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = pxsim.BufferMethods.setNumber(s.arg0, 2, s.arg1, s.arg5);
     s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg2 * 256);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 | 0);
+    r0 = (s.arg1 + 1);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["width"] = (s.tmp_1);
+    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 2, s.tmp_1, 0);
     s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg3 * 256);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 | 0);
+    r0 = (s.arg1 + 2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["height"] = (s.tmp_1);
+    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.arg6);
     s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg4 * 256);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 | 0);
+    r0 = (s.arg1 + 4);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["ox"] = (s.tmp_1);
+    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.arg2);
     s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg5 * 256);
+    r0 = (s.arg1 + 6);
+    s.tmp_1 = r0;
+    r0 = (s.arg3 * s.arg7);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 >> 6);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 | 0);
+    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.tmp_2);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg1 + 8);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["oy"] = (s.tmp_1);
-    r0 = undefined;
+    r0 = (s.arg4 * s.arg7);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 >> 6);
+    s.tmp_2 = r0;
+    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.tmp_2);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg1 + 10);
+    s.tmp_1 = r0;
+    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.arg8);
+    r0 = (s.arg1 + 12);
+    s.arg1 = (r0);
+  case 1:
+  case 2:
+    r0 = pxsim.BufferMethods.setNumber(s.arg0, 2, s.arg1, 0);
+    r0 = s.arg1;
     return leave(s, r0)
   default: oops()
 } } }
-game_Hitbox_constructor__P1965.info = {"start":151,"length":266,"line":8,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"inline","argumentNames":["this","parent","width","height","ox","oy"]}
+music_addNote__P34340.info = {"start":9705,"length":904,"line":308,"column":4,"endLine":321,"endColumn":5,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"addNote","argumentNames":["sndInstr","sndInstrPtr","ms","beg","end","soundWave","hz","volume","endHz"]}
 
-function game_Hitbox_constructor__P1965_mk(s) {
+function music_addNote__P34340_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_constructor__P1965, depth: s.depth + 1,
+        parent: s, fn: music_addNote__P34340, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
+  tmp_3: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
   arg3: undefined,
   arg4: undefined,
   arg5: undefined,
+  arg6: undefined,
+  arg7: undefined,
+  arg8: undefined,
+} }
+
+
+
+
+
+function music_volume__P32273(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.tmp_0 = music_initVolume__P34332_mk(s);
+    s.callLocIdx = 1641; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    r0 = globals.globalVolume___34328;
+    return leave(s, r0)
+  default: oops()
+} } }
+music_volume__P32273.info = {"start":1781,"length":90,"line":61,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"volume","argumentNames":[]}
+
+function music_volume__P32273_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_volume__P32273, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function music_initVolume__P34332(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    r0 = (globals.globalVolume___34328 === null);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    globals.globalVolume___34328 = (0);
+    s.tmp_0 = music_setVolume__P32272_mk(s);
+    r0 = pxsim_pxtcore.getConfig(59, 128);
+    s.tmp_0.arg0 = r0;
+    s.callLocIdx = 1638; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+  case 1:
+  case 2:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+music_initVolume__P34332.info = {"start":1014,"length":180,"line":33,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"initVolume","argumentNames":[]}
+
+function music_initVolume__P34332_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_initVolume__P34332, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
 } }
 
 
 
 
 
-function Fx_abs__P160(s) {
+function music_setVolume__P32272(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45131,30 +45157,40 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg0 < 0);
+    s.tmp_0 = Math_clamp__P29657_mk(s);
+    s.tmp_0.arg0 = 0;
+    s.tmp_0.arg1 = 255;
+    r0 = (s.arg0 | 0);
+    s.tmp_0.arg2 = r0;
+    s.callLocIdx = 1639; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+    globals.globalVolume___34328 = (r0);
+    r0 = (globals.globalVolume___34328 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = (0 - s.arg0);
-    { step = 3; continue; }
+    r0 = 1;
     { step = 2; continue; }
   case 1:
-    r0 = s.arg0;
-    { step = 3; continue; }
+    r0 = 0;
   case 2:
+    // jmp value (already in r0)
+    s.tmp_1 = r0;
+    r0 = undefined;
     r0 = undefined;
-  case 3:
     return leave(s, r0)
   default: oops()
 } } }
-Fx_abs__P160.info = {"start":1506,"length":164,"line":44,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"abs","argumentNames":["a"]}
+music_setVolume__P32272.info = {"start":1533,"length":153,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"setVolume","argumentNames":["volume"]}
 
-function Fx_abs__P160_mk(s) {
+function music_setVolume__P32272_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_abs__P160, depth: s.depth + 1,
+        parent: s, fn: music_setVolume__P32272, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
   arg0: undefined,
 } }
 
@@ -45162,7 +45198,7 @@ function Fx_abs__P160_mk(s) {
 
 
 
-function Sprite_image__P2055(s) {
+function music_enableAmp__P34331(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45176,19 +45212,16 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_image"];
-    return leaveAccessor(s, r0)
+    r0 = undefined;
+    return leave(s, r0)
   default: oops()
 } } }
-Sprite_image__P2055.info = {"start":6549,"length":54,"line":242,"column":4,"endLine":244,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"image","argumentNames":["this"]}
-Sprite_image__P2055.isGetter = true;
+music_enableAmp__P34331.info = {"start":944,"length":64,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"enableAmp","argumentNames":["en"]}
 
-function Sprite_image__P2055_mk(s) {
+function music_enableAmp__P34331_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_image__P2055, depth: s.depth + 1,
+        parent: s, fn: music_enableAmp__P34331, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -45197,7 +45230,7 @@ function Sprite_image__P2055_mk(s) {
 
 
 
-function character_setCharacterAnimationsEnabled__P3742(s) {
+function blockMenu_onMenuOptionSelected__P33221(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45207,20 +45240,627 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___16562 = undefined;
+    s.state___43944 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_0 = blockMenu__getState__P33256_mk(s);
+    s.callLocIdx = 1951; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    s.state___43944 = (r0);
+    s.tmp_0 = blockMenu__BlockMenuState_addHandler__P33252_mk(s);
+    s.tmp_0.arg0 = s.state___43944;
+    s.tmp_0.arg1 = s.arg0;
+    s.callLocIdx = 1952; s.pc = 2; return s.tmp_0;
+  case 2:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+blockMenu_onMenuOptionSelected__P33221.info = {"start":2427,"length":164,"line":86,"column":4,"endLine":89,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"onMenuOptionSelected","argumentNames":["handler"]}
+
+function blockMenu_onMenuOptionSelected__P33221_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: blockMenu_onMenuOptionSelected__P33221, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  state___43944: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function blockMenu__BlockMenuState_addHandler__P33252(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, blockMenu__BlockMenuState__C33247_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    if (!r0) { step = 1; continue; }
+    r0 = s.arg0.fields["handlers"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array__push(s.tmp_0, s.arg1);
+  case 1:
+  case 2:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+blockMenu__BlockMenuState_addHandler__P33252.info = {"start":411,"length":160,"line":15,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"addHandler","argumentNames":["this","handler"]}
+
+function blockMenu__BlockMenuState_addHandler__P33252_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: blockMenu__BlockMenuState_addHandler__P33252, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function Sprite_setImage__P31475(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    { step = 3; continue; }
+  case 1:
+  case 2:
+    r0 = (s.arg0).fields["_image"] = (s.arg1);
+    s.tmp_0 = Sprite_setHitbox__P31476_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 259; s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+  case 3:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+Sprite_setImage__P31475.info = {"start":6825,"length":133,"line":252,"column":4,"endLine":256,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"setImage","argumentNames":["this","img"]}
+
+function Sprite_setImage__P31475_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: Sprite_setImage__P31475, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function Sprite_setHitbox__P31476(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.newHitBox___45852 = undefined;
+    s.oMinX___45860 = undefined;
+    s.oMinY___45864 = undefined;
+    s.oMaxX___45868 = undefined;
+    s.oMaxY___45875 = undefined;
+    s.nMinX___45882 = undefined;
+    s.nMinY___45885 = undefined;
+    s.nMaxX___45888 = undefined;
+    s.nMaxY___45894 = undefined;
+    s.xDiff___45900 = undefined;
+    s.yDiff___45911 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_0 = game_calculateHitBox__P31389_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 260; s.pc = 8; return s.tmp_0;
+  case 8:
+    r0 = s.retval;
+    s.newHitBox___45852 = (r0);
+    r0 = s.arg0.fields["_hitbox"];
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___45852);
+    { step = 7; continue; }
+  case 1:
+  case 2:
+    r0 = s.arg0.fields["_hitbox"];
+    r0 = r0.fields["ox"];
+    s.oMinX___45860 = (r0);
+    r0 = s.arg0.fields["_hitbox"];
+    r0 = r0.fields["oy"];
+    s.oMinY___45864 = (r0);
+    r0 = s.arg0.fields["_hitbox"];
+    r0 = r0.fields["width"];
+    s.tmp_0 = r0;
+    r0 = (s.oMinX___45860 + s.tmp_0);
+    s.oMaxX___45868 = (r0);
+    r0 = s.arg0.fields["_hitbox"];
+    r0 = r0.fields["height"];
+    s.tmp_0 = r0;
+    r0 = (s.oMinY___45864 + s.tmp_0);
+    s.oMaxY___45875 = (r0);
+    r0 = s.newHitBox___45852.fields["ox"];
+    s.nMinX___45882 = (r0);
+    r0 = s.newHitBox___45852.fields["oy"];
+    s.nMinY___45885 = (r0);
+    r0 = s.newHitBox___45852.fields["width"];
+    s.tmp_0 = r0;
+    r0 = (s.nMinX___45882 + s.tmp_0);
+    s.nMaxX___45888 = (r0);
+    r0 = s.newHitBox___45852.fields["height"];
+    s.tmp_0 = r0;
+    r0 = (s.nMinY___45885 + s.tmp_0);
+    s.nMaxY___45894 = (r0);
+    s.tmp_1 = Fx_abs__P29695_mk(s);
+    r0 = (s.oMinX___45860 - s.nMinX___45882);
+    s.tmp_1.arg0 = r0;
+    s.callLocIdx = 266; s.pc = 9; return s.tmp_1;
+  case 9:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    s.tmp_3 = Fx_abs__P29695_mk(s);
+    r0 = (s.oMaxX___45868 - s.nMaxX___45888);
+    s.tmp_3.arg0 = r0;
+    s.callLocIdx = 268; s.pc = 10; return s.tmp_3;
+  case 10:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 + s.tmp_2);
+    s.xDiff___45900 = (r0);
+    s.tmp_1 = Fx_abs__P29695_mk(s);
+    r0 = (s.oMinY___45864 - s.nMinY___45885);
+    s.tmp_1.arg0 = r0;
+    s.callLocIdx = 271; s.pc = 11; return s.tmp_1;
+  case 11:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    s.tmp_3 = Fx_abs__P29695_mk(s);
+    r0 = (s.oMaxY___45875 - s.nMaxY___45894);
+    s.tmp_3.arg0 = r0;
+    s.callLocIdx = 273; s.pc = 12; return s.tmp_3;
+  case 12:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 + s.tmp_2);
+    s.yDiff___45911 = (r0);
+    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___45852);
+    r0 = (s.xDiff___45900 <= 512);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 3; continue; }
+    r0 = s.arg0.fields["_hitbox"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1).fields["ox"] = (s.oMinX___45860);
+    r0 = s.arg0.fields["_hitbox"];
+    s.tmp_0 = r0;
+    r0 = (s.oMaxX___45868 - s.oMinX___45860);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["width"] = (s.tmp_1);
+  case 3:
+  case 4:
+    r0 = (s.yDiff___45911 <= 512);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 5; continue; }
+    r0 = s.arg0.fields["_hitbox"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1).fields["oy"] = (s.oMinY___45864);
+    r0 = s.arg0.fields["_hitbox"];
+    s.tmp_0 = r0;
+    r0 = (s.oMaxY___45875 - s.oMinY___45864);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["height"] = (s.tmp_1);
+  case 5:
+  case 6:
+  case 7:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+Sprite_setHitbox__P31476.info = {"start":6964,"length":1296,"line":258,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"setHitbox","argumentNames":["this"]}
+
+function Sprite_setHitbox__P31476_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: Sprite_setHitbox__P31476, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  newHitBox___45852: undefined,
+  oMinX___45860: undefined,
+  oMinY___45864: undefined,
+  oMaxX___45868: undefined,
+  oMaxY___45875: undefined,
+  nMinX___45882: undefined,
+  nMinY___45885: undefined,
+  nMaxX___45888: undefined,
+  nMaxY___45894: undefined,
+  xDiff___45900: undefined,
+  yDiff___45911: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function game_calculateHitBox__P31389(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.i___45960 = undefined;
+    s.minX___45963 = undefined;
+    s.minY___45966 = undefined;
+    s.maxX___45969 = undefined;
+    s.maxY___45970 = undefined;
+    s.c___45971 = undefined;
+    s.r___45977 = undefined;
+    s.width___46008 = undefined;
+    s.height___46014 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0.fields["_image"];
+    s.i___45960 = (r0);
+    r0 = pxsim_ImageMethods.width(s.i___45960);
+    s.minX___45963 = (r0);
+    r0 = pxsim_ImageMethods.height(s.i___45960);
+    s.minY___45966 = (r0);
+    s.maxX___45969 = (0);
+    s.maxY___45970 = (0);
+    s.c___45971 = (0);
+  case 1:
+    s.tmp_1 = r0 = s.c___45971;
+    r0 = pxsim_ImageMethods.width(s.i___45960);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_1 < s.tmp_2);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 6; continue; }
+    s.r___45977 = (0);
+  case 2:
+    s.tmp_1 = r0 = s.r___45977;
+    r0 = pxsim_ImageMethods.height(s.i___45960);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_1 < s.tmp_2);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 5; continue; }
+    r0 = pxsim_ImageMethods.getPixel(s.i___45960, s.c___45971, s.r___45977);
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    s.tmp_4 = Math_min__P29661_mk(s);
+    s.tmp_4.arg0 = s.minX___45963;
+    s.tmp_4.arg1 = s.c___45971;
+    s.callLocIdx = 217; s.pc = 7; return s.tmp_4;
+  case 7:
+    r0 = s.retval;
+    s.minX___45963 = (r0);
+    s.tmp_0 = Math_min__P29661_mk(s);
+    s.tmp_0.arg0 = s.minY___45966;
+    s.tmp_0.arg1 = s.r___45977;
+    s.callLocIdx = 218; s.pc = 8; return s.tmp_0;
+  case 8:
+    r0 = s.retval;
+    s.minY___45966 = (r0);
+    s.tmp_0 = Math_max__P29660_mk(s);
+    s.tmp_0.arg0 = s.maxX___45969;
+    s.tmp_0.arg1 = s.c___45971;
+    s.callLocIdx = 219; s.pc = 9; return s.tmp_0;
+  case 9:
+    r0 = s.retval;
+    s.maxX___45969 = (r0);
+    s.tmp_0 = Math_max__P29660_mk(s);
+    s.tmp_0.arg0 = s.maxY___45970;
+    s.tmp_0.arg1 = s.r___45977;
+    s.callLocIdx = 220; s.pc = 10; return s.tmp_0;
+  case 10:
+    r0 = s.retval;
+    s.maxY___45970 = (r0);
+  case 3:
+  case 4:
+    r0 = (s.r___45977 + 1);
+    s.r___45977 = (r0);
+    { step = 2; continue; }
+  case 5:
+    r0 = (s.c___45971 + 1);
+    s.c___45971 = (r0);
+    { step = 1; continue; }
+  case 6:
+    r0 = (s.maxX___45969 - s.minX___45963);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + 1);
+    s.width___46008 = (r0);
+    r0 = (s.maxY___45970 - s.minY___45966);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + 1);
+    s.height___46014 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(game_Hitbox__C31378_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = game_Hitbox_constructor__P31384_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.tmp_1.arg1 = s.arg0;
+    s.tmp_1.arg2 = s.width___46008;
+    s.tmp_1.arg3 = s.height___46014;
+    s.tmp_1.arg4 = s.minX___45963;
+    s.tmp_1.arg5 = s.minY___45966;
+    s.callLocIdx = 221; s.pc = 11; return s.tmp_1;
+  case 11:
+    r0 = s.retval;
+    r0 = s.tmp_0;
+    return leave(s, r0)
+  default: oops()
+} } }
+game_calculateHitBox__P31389.info = {"start":894,"length":684,"line":40,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game---hw/hitbox.ts","functionName":"calculateHitBox","argumentNames":["s"]}
+
+function game_calculateHitBox__P31389_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: game_calculateHitBox__P31389, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  i___45960: undefined,
+  minX___45963: undefined,
+  minY___45966: undefined,
+  maxX___45969: undefined,
+  maxY___45970: undefined,
+  c___45971: undefined,
+  r___45977: undefined,
+  width___46008: undefined,
+  height___46014: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function game_Hitbox_constructor__P31384(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
+      s.arg4 = (s.lambdaArgs[4]);
+      s.arg5 = (s.lambdaArgs[5]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, game_Hitbox__C31378_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["parent"] = (s.arg1);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg2 * 256);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 | 0);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["width"] = (s.tmp_1);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg3 * 256);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 | 0);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["height"] = (s.tmp_1);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg4 * 256);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 | 0);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["ox"] = (s.tmp_1);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg5 * 256);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 | 0);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["oy"] = (s.tmp_1);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+game_Hitbox_constructor__P31384.info = {"start":151,"length":266,"line":8,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/game---hw/hitbox.ts","functionName":"inline","argumentNames":["this","parent","width","height","ox","oy"]}
+
+function game_Hitbox_constructor__P31384_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: game_Hitbox_constructor__P31384, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
+  arg4: undefined,
+  arg5: undefined,
+} }
+
+
+
+
+
+function Fx_abs__P29695(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = (s.arg0 < 0);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = (0 - s.arg0);
+    { step = 3; continue; }
+    { step = 2; continue; }
+  case 1:
+    r0 = s.arg0;
+    { step = 3; continue; }
+  case 2:
+    r0 = undefined;
+  case 3:
+    return leave(s, r0)
+  default: oops()
+} } }
+Fx_abs__P29695.info = {"start":1506,"length":164,"line":44,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"abs","argumentNames":["a"]}
+
+function Fx_abs__P29695_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: Fx_abs__P29695, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function Sprite_image__P31474(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_image"];
+    return leaveAccessor(s, r0)
+  default: oops()
+} } }
+Sprite_image__P31474.info = {"start":6549,"length":54,"line":242,"column":4,"endLine":244,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"image","argumentNames":["this"]}
+Sprite_image__P31474.isGetter = true;
+
+function Sprite_image__P31474_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: Sprite_image__P31474, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function character_setCharacterAnimationsEnabled__P33276(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.state___46057 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_getStateForSprite__P6155_mk(s);
+    s.tmp_0 = character_getStateForSprite__P35677_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 2089; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 2094; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.state___16562 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.state___16562);
+    s.state___46057 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.state___46057);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -45229,10 +45869,10 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = character_CharacterState_setEnabled__P6147_mk(s);
-    s.tmp_2.arg0 = s.state___16562;
+    s.tmp_2 = character_CharacterState_setEnabled__P35669_mk(s);
+    s.tmp_2.arg0 = s.state___46057;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 2090; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 2095; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -45240,17 +45880,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_setCharacterAnimationsEnabled__P3742.info = {"start":17492,"length":207,"line":507,"column":4,"endLine":512,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterAnimationsEnabled","argumentNames":["sprite","enabled"]}
+character_setCharacterAnimationsEnabled__P33276.info = {"start":17492,"length":207,"line":507,"column":4,"endLine":512,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterAnimationsEnabled","argumentNames":["sprite","enabled"]}
 
-function character_setCharacterAnimationsEnabled__P3742_mk(s) {
+function character_setCharacterAnimationsEnabled__P33276_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_setCharacterAnimationsEnabled__P3742, depth: s.depth + 1,
+        parent: s, fn: character_setCharacterAnimationsEnabled__P33276, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  state___16562: undefined,
+  state___46057: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -45259,7 +45899,7 @@ function character_setCharacterAnimationsEnabled__P3742_mk(s) {
 
 
 
-function character_CharacterState_setEnabled__P6147(s) {
+function character_CharacterState_setEnabled__P35669(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45275,18 +45915,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C35663_VT)) failedCast(r0);
     r0 = (s.arg0).fields["enabled"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setEnabled__P6147.info = {"start":9194,"length":76,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setEnabled","argumentNames":["this","enabled"]}
+character_CharacterState_setEnabled__P35669.info = {"start":9194,"length":76,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setEnabled","argumentNames":["this","enabled"]}
 
-function character_CharacterState_setEnabled__P6147_mk(s) {
+function character_CharacterState_setEnabled__P35669_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setEnabled__P6147, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setEnabled__P35669, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -45296,7 +45936,7 @@ function character_CharacterState_setEnabled__P6147_mk(s) {
 
 
 
-function sprites_changeDataNumberBy__P3620(s) {
+function sprites_changeDataNumberBy__P33154(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45306,7 +45946,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___17181 = undefined;
+    s.d___46676 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -45333,13 +45973,13 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P2041_mk(s);
+    s.tmp_4 = Sprite_data__P31460_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1773; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 1778; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
-    s.d___17181 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.d___17181, s.arg1);
+    s.d___46676 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.d___46676, s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -45350,7 +45990,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = r0 = s.d___17181;
+    s.tmp_2 = r0 = s.d___46676;
     s.tmp_3 = r0 = s.arg1;
     r0 = (s.tmp_1 + s.arg2);
     s.tmp_4 = r0;
@@ -45360,19 +46000,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_changeDataNumberBy__P3620.info = {"start":665,"length":198,"line":21,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"changeDataNumberBy","argumentNames":["sprite","name","value"]}
+sprites_changeDataNumberBy__P33154.info = {"start":665,"length":198,"line":21,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"changeDataNumberBy","argumentNames":["sprite","name","value"]}
 
-function sprites_changeDataNumberBy__P3620_mk(s) {
+function sprites_changeDataNumberBy__P33154_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_changeDataNumberBy__P3620, depth: s.depth + 1,
+        parent: s, fn: sprites_changeDataNumberBy__P33154, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___17181: undefined,
+  d___46676: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -45382,7 +46022,7 @@ function sprites_changeDataNumberBy__P3620_mk(s) {
 
 
 
-function inline__P17195(s) {
+function inline__P46690(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45392,26 +46032,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C2718_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C32137_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_SprayFactory_constructor__P2719_mk(s);
+    s.tmp_1 = particles_SprayFactory_constructor__P32138_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 100;
     s.tmp_1.arg2 = 0;
     s.tmp_1.arg3 = 120;
-    s.callLocIdx = 39; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 37; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17195.info = {"start":5988,"length":62,"line":154,"column":48,"endLine":154,"endColumn":110,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":[]}
+inline__P46690.info = {"start":5988,"length":62,"line":154,"column":48,"endLine":154,"endColumn":110,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P17195_mk(s) {
+function inline__P46690_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17195, depth: s.depth + 1,
+        parent: s, fn: inline__P46690, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45421,7 +46061,7 @@ function inline__P17195_mk(s) {
 
 
 
-function effects_createEffect__P4753(s) {
+function effects_createEffect__P34246(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45437,29 +46077,29 @@ switch (step) {
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ParticleEffect__C2789_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ParticleEffect__C32208_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P17205);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P46700);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg2);
-    s.tmp_2 = effects_ParticleEffect_constructor__P2790_mk(s);
+    s.tmp_2 = effects_ParticleEffect_constructor__P32209_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = s.arg1;
     s.tmp_2.arg3 = s.tmp_1;
-    s.callLocIdx = 1641; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1598; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-effects_createEffect__P4753.info = {"start":5459,"length":434,"line":146,"column":4,"endLine":151,"endColumn":5,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"createEffect","argumentNames":["defaultParticlesPerSecond","defaultLifespan","factoryFactory"]}
+effects_createEffect__P34246.info = {"start":5459,"length":434,"line":146,"column":4,"endLine":151,"endColumn":5,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"createEffect","argumentNames":["defaultParticlesPerSecond","defaultLifespan","factoryFactory"]}
 
-function effects_createEffect__P4753_mk(s) {
+function effects_createEffect__P34246_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_createEffect__P4753, depth: s.depth + 1,
+        parent: s, fn: effects_createEffect__P34246, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45473,7 +46113,7 @@ function effects_createEffect__P4753_mk(s) {
 
 
 
-function inline__P17205(s) {
+function inline__P46700(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45488,9 +46128,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C2678_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C32097_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_ParticleSource_constructor__P2683_mk(s);
+    s.tmp_1 = particles_ParticleSource_constructor__P32102_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -45498,23 +46138,23 @@ switch (step) {
     s.tmp_2.argL = s.caps[0];
     s.tmp_2.arg0 = undefined;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1639; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 1596; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1.arg3 = r0;
-    s.callLocIdx = 1640; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1597; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17205.info = {"start":5751,"length":134,"line":149,"column":20,"endLine":150,"endColumn":83,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["anchor","pps"]}
+inline__P46700.info = {"start":5751,"length":134,"line":149,"column":20,"endLine":150,"endColumn":83,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"inline","argumentNames":["anchor","pps"]}
 
-function inline__P17205_mk(s) {
+function inline__P46700_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17205, depth: s.depth + 1,
+        parent: s, fn: inline__P46700, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45527,7 +46167,7 @@ function inline__P17205_mk(s) {
 
 
 
-function Sprite_destroy__P2087(s) {
+function Sprite_destroy__P31506(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45544,7 +46184,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 2);
@@ -45562,19 +46202,19 @@ switch (step) {
     r0 = (s.tmp_2).fields["flags"] = (s.tmp_3);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = effects_ParticleEffect_destroy__P2792_mk(s);
+    s.tmp_0 = effects_ParticleEffect_destroy__P32211_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = undefined;
-    s.callLocIdx = 430; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 387; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    s.tmp_0 = Sprite__destroyCore__P2088_mk(s);
+    s.tmp_0 = Sprite__destroyCore__P31507_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 431; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 388; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 4:
@@ -45583,12 +46223,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_destroy__P2087.info = {"start":28412,"length":293,"line":858,"column":4,"endLine":867,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"destroy","argumentNames":["this","effect","duration"]}
+Sprite_destroy__P31506.info = {"start":28412,"length":293,"line":858,"column":4,"endLine":867,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"destroy","argumentNames":["this","effect","duration"]}
 
-function Sprite_destroy__P2087_mk(s) {
+function Sprite_destroy__P31506_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_destroy__P2087, depth: s.depth + 1,
+        parent: s, fn: Sprite_destroy__P31506, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45604,7 +46244,7 @@ function Sprite_destroy__P2087_mk(s) {
 
 
 
-function effects_ParticleEffect_destroy__P2792(s) {
+function effects_ParticleEffect_destroy__P32211(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45622,15 +46262,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C2789_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_setFlag__P2079_mk(s);
+    if (!checkSubtype(r0, effects_ParticleEffect__C32208_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_setFlag__P31498_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 1627; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1584; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = effects_ParticleEffect_start__P2791_mk(s);
+    s.tmp_0 = effects_ParticleEffect_start__P32210_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg3;
@@ -45647,7 +46287,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1628; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1585; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -45662,22 +46302,22 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = (s.arg1).fields["lifespan"] = (s.tmp_1);
-    s.tmp_0 = effects_ImageEffect_applyTo__P2818_mk(s);
-    s.tmp_0.arg0 = globals.dissolve___2821;
+    s.tmp_0 = effects_ImageEffect_applyTo__P32237_mk(s);
+    s.tmp_0.arg0 = globals.dissolve___32240;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1629; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1586; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_destroy__P2792.info = {"start":1736,"length":368,"line":41,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"destroy","argumentNames":["this","anchor","duration","particlesPerSecond"]}
+effects_ParticleEffect_destroy__P32211.info = {"start":1736,"length":368,"line":41,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"destroy","argumentNames":["this","anchor","duration","particlesPerSecond"]}
 
-function effects_ParticleEffect_destroy__P2792_mk(s) {
+function effects_ParticleEffect_destroy__P32211_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_destroy__P2792, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_destroy__P32211, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45695,7 +46335,7 @@ function effects_ParticleEffect_destroy__P2792_mk(s) {
 
 
 
-function inline__P17335(s) {
+function inline__P46831(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45705,11 +46345,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___17338 = undefined;
-    s.x___17349 = undefined;
-    s.y___17355 = undefined;
-    s.w___17361 = undefined;
-    s.h___17365 = undefined;
+    s.i___46834 = undefined;
+    s.x___46845 = undefined;
+    s.y___46851 = undefined;
+    s.w___46857 = undefined;
+    s.h___46861 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -45722,79 +46362,79 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 5);
-    s.i___17338 = (r0);
+    s.i___46834 = (r0);
   case 1:
-    r0 = (s.i___17338 > 0);
+    r0 = (s.i___46834 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.tmp_1 = Math_FastRandom_randomRange__P32009_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.tmp_1.arg1 = 0;
     r0 = pxsim_ImageMethods.width(s.arg0);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 47; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 45; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.x___17349 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.x___46845 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P32009_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 0;
     r0 = pxsim_ImageMethods.height(s.arg0);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 48; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 46; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.y___17355 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.y___46851 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P32009_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 3;
-    s.callLocIdx = 49; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 47; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.w___17361 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.w___46857 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P32009_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 3;
-    s.callLocIdx = 50; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 48; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.h___17365 = (r0);
-    s.tmp_0 = helpers_imageDrawRect__P1731_mk(s);
+    s.h___46861 = (r0);
+    s.tmp_0 = helpers_imageDrawRect__P31149_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.x___17349;
-    s.tmp_0.arg2 = s.y___17355;
-    s.tmp_0.arg3 = s.w___17361;
-    s.tmp_0.arg4 = s.h___17365;
+    s.tmp_0.arg1 = s.x___46845;
+    s.tmp_0.arg2 = s.y___46851;
+    s.tmp_0.arg3 = s.w___46857;
+    s.tmp_0.arg4 = s.h___46861;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 51; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 49; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    r0 = (s.i___17338 - 1);
-    s.i___17338 = (r0);
+    r0 = (s.i___46834 - 1);
+    s.i___46834 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17335.info = {"start":2199,"length":360,"line":60,"column":49,"endLine":69,"endColumn":5,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["input","r"]}
+inline__P46831.info = {"start":2199,"length":360,"line":60,"column":49,"endLine":69,"endColumn":5,"fileName":"pxt_modules/game---hw/effects.ts","functionName":"inline","argumentNames":["input","r"]}
 
-function inline__P17335_mk(s) {
+function inline__P46831_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17335, depth: s.depth + 1,
+        parent: s, fn: inline__P46831, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  i___17338: undefined,
-  x___17349: undefined,
-  y___17355: undefined,
-  w___17361: undefined,
-  h___17365: undefined,
+  i___46834: undefined,
+  x___46845: undefined,
+  y___46851: undefined,
+  w___46857: undefined,
+  h___46861: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -45803,7 +46443,7 @@ function inline__P17335_mk(s) {
 
 
 
-function effects_ImageEffect_applyTo__P2818(s) {
+function effects_ImageEffect_applyTo__P32237(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45813,14 +46453,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.clonedImage___17386 = undefined;
+    s.clonedImage___46882 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C32235_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -45846,17 +46486,17 @@ switch (step) {
     r0 = s.arg1.fields["_image"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_5);
-    s.clonedImage___17386 = (r0);
-    s.tmp_0 = effects_ImageEffect_change__P2819_mk(s);
+    s.clonedImage___46882 = (r0);
+    s.tmp_0 = effects_ImageEffect_change__P32238_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.clonedImage___17386;
-    s.callLocIdx = 1653; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg1 = s.clonedImage___46882;
+    s.callLocIdx = 1610; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.clonedImage___17386;
-    s.callLocIdx = 1654; s.pc = 7; return s.tmp_0;
+    s.tmp_0.arg1 = s.clonedImage___46882;
+    s.callLocIdx = 1611; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 5:
@@ -45864,12 +46504,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_applyTo__P2818.info = {"start":823,"length":218,"line":21,"column":8,"endLine":26,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"applyTo","argumentNames":["this","sprite"]}
+effects_ImageEffect_applyTo__P32237.info = {"start":823,"length":218,"line":21,"column":8,"endLine":26,"endColumn":9,"fileName":"pxt_modules/game---hw/effects.ts","functionName":"applyTo","argumentNames":["this","sprite"]}
 
-function effects_ImageEffect_applyTo__P2818_mk(s) {
+function effects_ImageEffect_applyTo__P32237_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_applyTo__P2818, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_applyTo__P32237, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45877,7 +46517,7 @@ function effects_ImageEffect_applyTo__P2818_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  clonedImage___17386: undefined,
+  clonedImage___46882: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -45886,7 +46526,7 @@ function effects_ImageEffect_applyTo__P2818_mk(s) {
 
 
 
-function effects_ImageEffect_change__P2819(s) {
+function effects_ImageEffect_change__P32238(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45902,7 +46542,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C32235_VT)) failedCast(r0);
     s.tmp_0 = if_effect_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
@@ -45910,12 +46550,12 @@ switch (step) {
     s.tmp_0.arg2 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "effect"), 3);
-      s.callLocIdx = 1655; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 1612; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["effect"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["effect"], 3); s.callLocIdx = 1655; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1655; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1655; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["effect"], 3); s.callLocIdx = 1612; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1612; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 1612; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -45923,12 +46563,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_change__P2819.info = {"start":1151,"length":81,"line":32,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"change","argumentNames":["this","input"]}
+effects_ImageEffect_change__P32238.info = {"start":1151,"length":81,"line":32,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game---hw/effects.ts","functionName":"change","argumentNames":["this","input"]}
 
-function effects_ImageEffect_change__P2819_mk(s) {
+function effects_ImageEffect_change__P32238_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_change__P2819, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_change__P32238, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -45939,7 +46579,7 @@ function effects_ImageEffect_change__P2819_mk(s) {
 
 
 
-function effects_ParticleEffect_start__P2791(s) {
+function effects_ParticleEffect_start__P32210(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45949,7 +46589,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.src___17410 = undefined;
+    s.src___46906 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -45959,7 +46599,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C2789_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ParticleEffect__C32208_VT)) failedCast(r0);
     r0 = s.arg0.fields["sourceFactory"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -45986,18 +46626,18 @@ switch (step) {
     s.tmp_4.arg2 = s.tmp_3;
     if (!s.tmp_4.arg0.vtable.iface) {
       setupLambda(s.tmp_4, pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "sourceFactory"), 3);
-      s.callLocIdx = 1625; s.pc = 10; return s.tmp_4;
+      s.callLocIdx = 1582; s.pc = 10; return s.tmp_4;
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["sourceFactory"];
-      if (s.tmp_4.fn == null) { setupLambda(s.tmp_4, s.tmp_4.arg0.fields["sourceFactory"], 3); s.callLocIdx = 1625; s.pc = 10; return s.tmp_4; }
-      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1625; s.pc = 10; return s.tmp_4;; }
-     else { s.callLocIdx = 1625; s.pc = 10; return s.tmp_4; }
+      if (s.tmp_4.fn == null) { setupLambda(s.tmp_4, s.tmp_4.arg0.fields["sourceFactory"], 3); s.callLocIdx = 1582; s.pc = 10; return s.tmp_4; }
+      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1582; s.pc = 10; return s.tmp_4;; }
+     else { s.callLocIdx = 1582; s.pc = 10; return s.tmp_4; }
     }
   case 10:
     r0 = s.retval;
-    s.src___17410 = (r0);
-    s.tmp_0 = particles_ParticleSource_setRelativeToCamera__P2689_mk(s);
-    s.tmp_0.arg0 = s.src___17410;
+    s.src___46906 = (r0);
+    s.tmp_0 = particles_ParticleSource_setRelativeToCamera__P32108_mk(s);
+    s.tmp_0.arg0 = s.src___46906;
     r0 = pxsim_numops_toBoolDecr(s.arg4);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
@@ -46006,7 +46646,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1626; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1583; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -46022,7 +46662,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.src___17410).fields["lifespan"] = (s.tmp_1);
+    r0 = (s.src___46906).fields["lifespan"] = (s.tmp_1);
   case 7:
   case 8:
   case 9:
@@ -46030,19 +46670,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_start__P2791.info = {"start":967,"length":452,"line":26,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"start","argumentNames":["this","anchor","duration","particlesPerSecond","relativeToCamera"]}
+effects_ParticleEffect_start__P32210.info = {"start":967,"length":452,"line":26,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"start","argumentNames":["this","anchor","duration","particlesPerSecond","relativeToCamera"]}
 
-function effects_ParticleEffect_start__P2791_mk(s) {
+function effects_ParticleEffect_start__P32210_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_start__P2791, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_start__P32210, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  src___17410: undefined,
+  src___46906: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -46054,7 +46694,7 @@ function effects_ParticleEffect_start__P2791_mk(s) {
 
 
 
-function particles_ParticleSource_setRelativeToCamera__P2689(s) {
+function particles_ParticleSource_setRelativeToCamera__P32108(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46070,7 +46710,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -46096,12 +46736,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setRelativeToCamera__P2689.info = {"start":6422,"length":173,"line":210,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRelativeToCamera","argumentNames":["this","on"]}
+particles_ParticleSource_setRelativeToCamera__P32108.info = {"start":6422,"length":173,"line":210,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"setRelativeToCamera","argumentNames":["this","on"]}
 
-function particles_ParticleSource_setRelativeToCamera__P2689_mk(s) {
+function particles_ParticleSource_setRelativeToCamera__P32108_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setRelativeToCamera__P2689, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setRelativeToCamera__P32108, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46116,7 +46756,7 @@ function particles_ParticleSource_setRelativeToCamera__P2689_mk(s) {
 
 
 
-function Sprite__destroyCore__P2088(s) {
+function Sprite__destroyCore__P31507(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46126,39 +46766,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___17238 = undefined;
+    s.scene___46733 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["flags"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["flags"] = (s.tmp_1);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 432; s.pc = 9; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 389; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.scene___17238 = (r0);
+    s.scene___46733 = (r0);
     r0 = s.arg0.fields["sayBubbleSprite"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = Sprite_destroy__P2087_mk(s);
+    s.tmp_1 = Sprite_destroy__P31506_mk(s);
     r0 = s.arg0.fields["sayBubbleSprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 433; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 390; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = s.scene___17238.fields["allSprites"];
+    r0 = s.scene___46733.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg0);
     r0 = s.arg0.fields["_kind"];
@@ -46170,7 +46810,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = s.scene___17238.fields["spritesByKind"];
+    r0 = s.scene___46733.fields["spritesByKind"];
     s.tmp_2 = r0;
     r0 = s.arg0.fields["_kind"];
     s.tmp_3 = r0;
@@ -46180,24 +46820,24 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 5; continue; }
-    s.tmp_5 = sprites_SpriteSet_remove__P2118_mk(s);
-    r0 = s.scene___17238.fields["spritesByKind"];
+    s.tmp_5 = sprites_SpriteSet_remove__P31537_mk(s);
+    r0 = s.scene___46733.fields["spritesByKind"];
     s.tmp_6 = r0;
     r0 = s.arg0.fields["_kind"];
     s.tmp_7 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_6, s.tmp_7);
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg0;
-    s.callLocIdx = 437; s.pc = 11; return s.tmp_5;
+    s.callLocIdx = 394; s.pc = 11; return s.tmp_5;
   case 11:
     r0 = s.retval;
   case 5:
   case 6:
-    s.tmp_0 = PhysicsEngine__C2159_v1_2_mk(s);
-    r0 = s.scene___17238.fields["physicsEngine"];
+    s.tmp_0 = PhysicsEngine__C31578_v1_2_mk(s);
+    r0 = s.scene___46733.fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C31578_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.removeSprite;
     s.pc = 12; return s.tmp_0;
   case 12:
@@ -46210,46 +46850,46 @@ switch (step) {
     s.tmp_1.arg0 = s.arg0;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "destroyHandler"), 1);
-      s.callLocIdx = 438; s.pc = 13; return s.tmp_1;
+      s.callLocIdx = 395; s.pc = 13; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["destroyHandler"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["destroyHandler"], 1); s.callLocIdx = 438; s.pc = 13; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 438; s.pc = 13; return s.tmp_1;; }
-     else { s.callLocIdx = 438; s.pc = 13; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["destroyHandler"], 1); s.callLocIdx = 395; s.pc = 13; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 395; s.pc = 13; return s.tmp_1;; }
+     else { s.callLocIdx = 395; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P17274);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P46770);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P17281);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P46777);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
-    r0 = s.scene___17238.fields["destroyedHandlers"];
+    s.tmp_2 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P29643_mk(s);
+    r0 = s.scene___46733.fields["destroyedHandlers"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 440; s.pc = 15; return s.tmp_3;
+    s.callLocIdx = 397; s.pc = 15; return s.tmp_3;
   case 15:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 442; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 399; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite__destroyCore__P2088.info = {"start":28711,"length":693,"line":869,"column":4,"endLine":885,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"_destroyCore","argumentNames":["this"]}
+Sprite__destroyCore__P31507.info = {"start":28711,"length":693,"line":869,"column":4,"endLine":885,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"_destroyCore","argumentNames":["this"]}
 
-function Sprite__destroyCore__P2088_mk(s) {
+function Sprite__destroyCore__P31507_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite__destroyCore__P2088, depth: s.depth + 1,
+        parent: s, fn: Sprite__destroyCore__P31507, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46259,7 +46899,7 @@ function Sprite__destroyCore__P2088_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  scene___17238: undefined,
+  scene___46733: undefined,
   arg0: undefined,
 } }
 
@@ -46267,7 +46907,7 @@ function Sprite__destroyCore__P2088_mk(s) {
 
 
 
-function inline__P17274(s) {
+function inline__P46770(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46289,12 +46929,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17274.info = {"start":29327,"length":26,"line":883,"column":20,"endLine":883,"endColumn":46,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P46770.info = {"start":29327,"length":26,"line":883,"column":20,"endLine":883,"endColumn":46,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P17274_mk(s) {
+function inline__P46770_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17274, depth: s.depth + 1,
+        parent: s, fn: inline__P46770, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46305,7 +46945,7 @@ function inline__P17274_mk(s) {
 
 
 
-function inline__P17281(s) {
+function inline__P46777(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46324,12 +46964,12 @@ switch (step) {
     s.tmp_0.arg1 = s.caps[0];
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 2);
-      s.callLocIdx = 441; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 398; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 2); s.callLocIdx = 441; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 441; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 441; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 2); s.callLocIdx = 398; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 398; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 398; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -46337,12 +46977,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17281.info = {"start":29376,"length":20,"line":884,"column":21,"endLine":884,"endColumn":41,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P46777.info = {"start":29376,"length":20,"line":884,"column":21,"endLine":884,"endColumn":41,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P17281_mk(s) {
+function inline__P46777_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17281, depth: s.depth + 1,
+        parent: s, fn: inline__P46777, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46352,7 +46992,7 @@ function inline__P17281_mk(s) {
 
 
 
-function PhysicsEngine_removeSprite__P2162(s) {
+function PhysicsEngine_removeSprite__P31581(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46368,17 +47008,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C31578_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_removeSprite__P2162.info = {"start":159,"length":32,"line":10,"column":4,"endLine":10,"endColumn":36,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
+PhysicsEngine_removeSprite__P31581.info = {"start":159,"length":32,"line":10,"column":4,"endLine":10,"endColumn":36,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
 
-function PhysicsEngine_removeSprite__P2162_mk(s) {
+function PhysicsEngine_removeSprite__P31581_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_removeSprite__P2162, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_removeSprite__P31581, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -46388,7 +47028,7 @@ function PhysicsEngine_removeSprite__P2162_mk(s) {
 
 
 
-function sprites_SpriteSet_remove__P2118(s) {
+function sprites_SpriteSet_remove__P31537(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46398,28 +47038,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___17290 = undefined;
+    s.i___46786 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C31530_VT)) failedCast(r0);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_0, s.arg1, undefined);
-    s.i___17290 = (r0);
-    r0 = (s.i___17290 > -1);
+    s.i___46786 = (r0);
+    r0 = (s.i___46786 > -1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_arraySplice__P98_mk(s);
+    s.tmp_1 = helpers_arraySplice__P29633_mk(s);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.i___17290;
+    s.tmp_1.arg1 = s.i___46786;
     s.tmp_1.arg2 = 1;
-    s.callLocIdx = 527; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 484; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     r0 = true;
@@ -46431,16 +47071,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_remove__P2118.info = {"start":1816,"length":235,"line":66,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"remove","argumentNames":["this","sprite"]}
+sprites_SpriteSet_remove__P31537.info = {"start":1816,"length":235,"line":66,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"remove","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_remove__P2118_mk(s) {
+function sprites_SpriteSet_remove__P31537_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_remove__P2118, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_remove__P31537, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  i___17290: undefined,
+  i___46786: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -46449,7 +47089,7 @@ function sprites_SpriteSet_remove__P2118_mk(s) {
 
 
 
-function sprites_onOverlap__P2106(s) {
+function sprites_onOverlap__P31525(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46459,10 +47099,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sc___17462 = undefined;
-    s.overlapHandlers___17465 = undefined;
-    s.overlapMap___17468 = undefined;
-    s.associate___17471 = undefined;
+    s.sc___46958 = undefined;
+    s.overlapHandlers___46961 = undefined;
+    s.overlapMap___46964 = undefined;
+    s.associate___46967 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -46496,67 +47136,67 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    s.tmp_4 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 519; s.pc = 8; return s.tmp_4;
+    s.tmp_4 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 476; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
-    s.sc___17462 = (r0);
-    r0 = s.sc___17462.fields["overlapHandlers"];
-    s.overlapHandlers___17465 = (r0);
-    r0 = s.sc___17462.fields["overlapMap"];
-    s.overlapMap___17468 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, associate__P17471);
+    s.sc___46958 = (r0);
+    r0 = s.sc___46958.fields["overlapHandlers"];
+    s.overlapHandlers___46961 = (r0);
+    r0 = s.sc___46958.fields["overlapMap"];
+    s.overlapMap___46964 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, associate__P46967);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overlapMap___17468);
-    s.associate___17471 = (s.tmp_0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overlapMap___46964);
+    s.associate___46967 = (s.tmp_0);
     s.tmp_1 = lambda_3_mk(s);
-    s.tmp_1.argL = s.associate___17471;
+    s.tmp_1.argL = s.associate___46967;
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 520; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 477; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = lambda_3_mk(s);
-    s.tmp_0.argL = s.associate___17471;
+    s.tmp_0.argL = s.associate___46967;
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 521; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 478; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(scene_OverlapHandler__C2392_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_OverlapHandler__C31811_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_OverlapHandler_constructor__P2393_mk(s);
+    s.tmp_1 = scene_OverlapHandler_constructor__P31812_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
     s.tmp_1.arg3 = s.arg2;
-    s.callLocIdx = 522; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 479; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.overlapHandlers___17465, s.tmp_0);
+    r0 = pxsim_Array__push(s.overlapHandlers___46961, s.tmp_0);
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_onOverlap__P2106.info = {"start":1605,"length":755,"line":50,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"onOverlap","argumentNames":["kind","otherKind","handler"]}
+sprites_onOverlap__P31525.info = {"start":1605,"length":755,"line":50,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/game---hw/spriteevents.ts","functionName":"onOverlap","argumentNames":["kind","otherKind","handler"]}
 
-function sprites_onOverlap__P2106_mk(s) {
+function sprites_onOverlap__P31525_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_onOverlap__P2106, depth: s.depth + 1,
+        parent: s, fn: sprites_onOverlap__P31525, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  sc___17462: undefined,
-  overlapHandlers___17465: undefined,
-  overlapMap___17468: undefined,
-  associate___17471: undefined,
+  sc___46958: undefined,
+  overlapHandlers___46961: undefined,
+  overlapMap___46964: undefined,
+  associate___46967: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -46566,7 +47206,7 @@ function sprites_onOverlap__P2106_mk(s) {
 
 
 
-function associate__P17471(s) {
+function associate__P46967(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46603,12 +47243,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-associate__P17471.info = {"start":1942,"length":172,"line":56,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"associate","argumentNames":["a","b"]}
+associate__P46967.info = {"start":1942,"length":172,"line":56,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteevents.ts","functionName":"associate","argumentNames":["a","b"]}
 
-function associate__P17471_mk(s) {
+function associate__P46967_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: associate__P17471, depth: s.depth + 1,
+        parent: s, fn: associate__P46967, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46624,7 +47264,7 @@ function associate__P17471_mk(s) {
 
 
 
-function scene_OverlapHandler_constructor__P2393(s) {
+function scene_OverlapHandler_constructor__P31812(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46642,7 +47282,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_OverlapHandler__C2392_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_OverlapHandler__C31811_VT)) failedCast(r0);
     r0 = (s.arg0).fields["kind"] = (s.arg1);
     r0 = (s.arg0).fields["otherKind"] = (s.arg2);
     r0 = (s.arg0).fields["handler"] = (s.arg3);
@@ -46650,12 +47290,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_OverlapHandler_constructor__P2393.info = {"start":655,"length":171,"line":22,"column":8,"endLine":26,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","kind","otherKind","handler"]}
+scene_OverlapHandler_constructor__P31812.info = {"start":655,"length":171,"line":22,"column":8,"endLine":26,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":["this","kind","otherKind","handler"]}
 
-function scene_OverlapHandler_constructor__P2393_mk(s) {
+function scene_OverlapHandler_constructor__P31812_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_OverlapHandler_constructor__P2393, depth: s.depth + 1,
+        parent: s, fn: scene_OverlapHandler_constructor__P31812, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -46667,7 +47307,7 @@ function scene_OverlapHandler_constructor__P2393_mk(s) {
 
 
 
-function info_changeScoreBy__P2207(s) {
+function info_changeScoreBy__P31626(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46681,22 +47321,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_changeScoreBy__P2243_mk(s);
-    s.tmp_0.arg0 = globals.player1___2257;
+    s.tmp_0 = info_PlayerInfo_changeScoreBy__P31662_mk(s);
+    s.tmp_0.arg0 = globals.player1___31676;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 806; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 763; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_changeScoreBy__P2207.info = {"start":7694,"length":90,"line":263,"column":4,"endLine":265,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"changeScoreBy","argumentNames":["value"]}
+info_changeScoreBy__P31626.info = {"start":7694,"length":90,"line":263,"column":4,"endLine":265,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"changeScoreBy","argumentNames":["value"]}
 
-function info_changeScoreBy__P2207_mk(s) {
+function info_changeScoreBy__P31626_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_changeScoreBy__P2207, depth: s.depth + 1,
+        parent: s, fn: info_changeScoreBy__P31626, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46706,7 +47346,7 @@ function info_changeScoreBy__P2207_mk(s) {
 
 
 
-function info_PlayerInfo_changeScoreBy__P2243(s) {
+function info_PlayerInfo_changeScoreBy__P31662(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46722,30 +47362,30 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_setScore__P2242_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_setScore__P31661_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = info_PlayerInfo_score__P2241_mk(s);
+    s.tmp_2 = info_PlayerInfo_score__P31660_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 834; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 791; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + s.arg1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 835; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 792; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_changeScoreBy__P2243.info = {"start":18514,"length":95,"line":612,"column":8,"endLine":614,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"changeScoreBy","argumentNames":["this","value"]}
+info_PlayerInfo_changeScoreBy__P31662.info = {"start":18514,"length":95,"line":612,"column":8,"endLine":614,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"changeScoreBy","argumentNames":["this","value"]}
 
-function info_PlayerInfo_changeScoreBy__P2243_mk(s) {
+function info_PlayerInfo_changeScoreBy__P31662_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_changeScoreBy__P2243, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_changeScoreBy__P31662, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46758,7 +47398,7 @@ function info_PlayerInfo_changeScoreBy__P2243_mk(s) {
 
 
 
-function game_over__P2542(s) {
+function game_over__P31961(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46768,32 +47408,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scoreInfo___17531 = undefined;
-    s.highScore___17535 = undefined;
-    s.overDialog___17564 = undefined;
+    s.scoreInfo___47027 = undefined;
+    s.highScore___47031 = undefined;
+    s.overDialog___47060 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P4356_mk(s);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1190; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1147; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.__isOver___4355);
+    r0 = pxsim_numops_toBoolDecr(globals.__isOver___33848);
     if (!r0) { step = 1; continue; }
     { step = 17; continue; }
   case 1:
   case 2:
-    globals.__isOver___4355 = (true);
-    r0 = pxsim_numops_toBoolDecr(globals.__gameOverHandler___4353);
+    globals.__isOver___33848 = (true);
+    r0 = pxsim_numops_toBoolDecr(globals.__gameOverHandler___33846);
     if (!r0) { step = 3; continue; }
     s.tmp_0 = lambda_2_mk(s);
-    s.tmp_0.argL = globals.__gameOverHandler___4353;
+    s.tmp_0.argL = globals.__gameOverHandler___33846;
     s.tmp_0.arg0 = s.arg0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1191; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 1148; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
     { step = 16; continue; }
@@ -46806,87 +47446,87 @@ switch (step) {
     if (!r0) { step = 6; continue; }
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 4; continue; }
-    r0 = globals.winEffect___2530;
+    r0 = globals.winEffect___31949;
     { step = 5; continue; }
   case 4:
-    r0 = globals.loseEffect___2531;
+    r0 = globals.loseEffect___31950;
   case 5:
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.arg1 = (s.tmp_2);
   case 6:
   case 7:
-    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
-    s.tmp_0.arg0 = globals.player1___2257;
-    s.callLocIdx = 1192; s.pc = 20; return s.tmp_0;
+    s.tmp_0 = info_PlayerInfo_getState__P31658_mk(s);
+    s.tmp_0.arg0 = globals.player1___31676;
+    s.callLocIdx = 1149; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
-    s.scoreInfo___17531 = (r0);
-    s.tmp_0 = info_highScore__P2205_mk(s);
-    s.callLocIdx = 1193; s.pc = 21; return s.tmp_0;
+    s.scoreInfo___47027 = (r0);
+    s.tmp_0 = info_highScore__P31624_mk(s);
+    s.callLocIdx = 1150; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.highScore___17535 = (r0);
-    r0 = s.scoreInfo___17531.fields["score"];
+    s.highScore___47031 = (r0);
+    r0 = s.scoreInfo___47027.fields["score"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.highScore___17535);
+    r0 = (s.tmp_1 > s.highScore___47031);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_2 = info_saveHighScore__P2202_mk(s);
-    s.callLocIdx = 1194; s.pc = 22; return s.tmp_2;
+    s.tmp_2 = info_saveHighScore__P31621_mk(s);
+    s.callLocIdx = 1151; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
   case 8:
   case 9:
   case 10:
-    s.tmp_0 = r0 = globals._sceneStack___4349;
+    s.tmp_0 = r0 = globals._sceneStack___33842;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    r0 = pxsim_Array__length(globals._sceneStack___4349);
+    r0 = pxsim_Array__length(globals._sceneStack___33842);
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 13; continue; }
-    s.tmp_2 = scene_Scene_destroy__P2445_mk(s);
-    s.tmp_2.arg0 = globals._scene___4348;
-    s.callLocIdx = 1195; s.pc = 23; return s.tmp_2;
+    s.tmp_2 = scene_Scene_destroy__P31864_mk(s);
+    s.tmp_2.arg0 = globals._scene___33841;
+    s.callLocIdx = 1152; s.pc = 23; return s.tmp_2;
   case 23:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P2537_mk(s);
-    s.callLocIdx = 1196; s.pc = 24; return s.tmp_0;
+    s.tmp_0 = game_popScene__P31956_mk(s);
+    s.callLocIdx = 1153; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
     { step = 10; continue; }
   case 13:
-    s.tmp_0 = game_pushScene__P2536_mk(s);
-    s.callLocIdx = 1197; s.pc = 25; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P31955_mk(s);
+    s.callLocIdx = 1154; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
-    r0 = pxsim_ImageMethods.clone(globals.screen___1802);
+    s.tmp_0 = scene_setBackgroundImage__P31878_mk(s);
+    r0 = pxsim_ImageMethods.clone(globals.screen___31220);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1198; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 1155; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 14; continue; }
-    s.tmp_0 = music_Melody_play__P1605_mk(s);
-    s.tmp_0.arg0 = globals.winSound___4347;
+    s.tmp_0 = music_Melody_play__P32285_mk(s);
+    s.tmp_0.arg0 = globals.winSound___33840;
     s.tmp_0.arg1 = 255;
-    s.callLocIdx = 1199; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 1156; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
     { step = 15; continue; }
   case 14:
-    s.tmp_0 = music_Melody_play__P1605_mk(s);
-    s.tmp_0.arg0 = globals.loseSound___4345;
+    s.tmp_0 = music_Melody_play__P32285_mk(s);
+    s.tmp_0.arg0 = globals.loseSound___33838;
     s.tmp_0.arg1 = 255;
-    s.callLocIdx = 1200; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1157; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
   case 15:
@@ -46894,54 +47534,54 @@ switch (step) {
     s.tmp_0.arg0 = s.arg1;
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "startScreenEffect"), 1);
-      s.callLocIdx = 1201; s.pc = 29; return s.tmp_0;
+      s.callLocIdx = 1158; s.pc = 29; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["startScreenEffect"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["startScreenEffect"], 1); s.callLocIdx = 1201; s.pc = 29; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1201; s.pc = 29; return s.tmp_0;; }
-     else { s.callLocIdx = 1201; s.pc = 29; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["startScreenEffect"], 1); s.callLocIdx = 1158; s.pc = 29; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1158; s.pc = 29; return s.tmp_0;; }
+     else { s.callLocIdx = 1158; s.pc = 29; return s.tmp_0; }
     }
   case 29:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 400;
-    s.callLocIdx = 1202; s.pc = 30; return s.tmp_0;
+    s.callLocIdx = 1159; s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(game_GameOverDialog__C2516_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(game_GameOverDialog__C31935_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_GameOverDialog_constructor__P2517_mk(s);
+    s.tmp_1 = game_GameOverDialog_constructor__P31936_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    r0 = s.scoreInfo___17531.fields["score"];
+    r0 = s.scoreInfo___47027.fields["score"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.highScore___17535;
-    s.callLocIdx = 1203; s.pc = 31; return s.tmp_1;
+    s.tmp_1.arg3 = s.highScore___47031;
+    s.callLocIdx = 1160; s.pc = 31; return s.tmp_1;
   case 31:
     r0 = s.retval;
-    s.overDialog___17564 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P17574);
+    s.overDialog___47060 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P47070);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overDialog___17564);
-    s.tmp_1 = scene_createRenderable__P2383_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overDialog___47060);
+    s.tmp_1 = scene_createRenderable__P31802_mk(s);
     s.tmp_1.arg0 = 100;
     s.tmp_1.arg1 = s.tmp_0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1204; s.pc = 32; return s.tmp_1;
+    s.callLocIdx = 1161; s.pc = 32; return s.tmp_1;
   case 32:
     r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0 = pause__P29937_mk(s);
     s.tmp_0.arg0 = 500;
-    s.callLocIdx = 1205; s.pc = 33; return s.tmp_0;
+    s.callLocIdx = 1162; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    s.tmp_0 = game_GameOverDialog_displayCursor__P2518_mk(s);
-    s.tmp_0.arg0 = s.overDialog___17564;
-    s.callLocIdx = 1206; s.pc = 34; return s.tmp_0;
+    s.tmp_0 = game_GameOverDialog_displayCursor__P31937_mk(s);
+    s.tmp_0.arg0 = s.overDialog___47060;
+    s.callLocIdx = 1163; s.pc = 34; return s.tmp_0;
   case 34:
     r0 = s.retval;
-    s.tmp_0 = game_waitAnyButton__P2534_mk(s);
-    s.callLocIdx = 1207; s.pc = 35; return s.tmp_0;
+    s.tmp_0 = game_waitAnyButton__P31953_mk(s);
+    s.callLocIdx = 1164; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
     setupResume(s, 36);
@@ -46956,19 +47596,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_over__P2542.info = {"start":5382,"length":1774,"line":181,"column":4,"endLine":232,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"over","argumentNames":["win","effect"]}
+game_over__P31961.info = {"start":5382,"length":1774,"line":181,"column":4,"endLine":232,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"over","argumentNames":["win","effect"]}
 
-function game_over__P2542_mk(s) {
+function game_over__P31961_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_over__P2542, depth: s.depth + 1,
+        parent: s, fn: game_over__P31961, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  scoreInfo___17531: undefined,
-  highScore___17535: undefined,
-  overDialog___17564: undefined,
+  scoreInfo___47027: undefined,
+  highScore___47031: undefined,
+  overDialog___47060: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -46977,7 +47617,7 @@ function game_over__P2542_mk(s) {
 
 
 
-function inline__P17574(s) {
+function inline__P47070(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46991,9 +47631,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_GameOverDialog__C2516_v0_1_mk(s);
+    s.tmp_0 = game_GameOverDialog__C31935_v0_1_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C2516_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C31935_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.update;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -47001,7 +47641,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = s.caps[0].fields["image"];
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_4 = r0;
     r0 = s.caps[0].fields["image"];
     s.tmp_6 = r0;
@@ -47016,12 +47656,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17574.info = {"start":6721,"length":254,"line":218,"column":48,"endLine":225,"endColumn":13,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["target"]}
+inline__P47070.info = {"start":6721,"length":254,"line":218,"column":48,"endLine":225,"endColumn":13,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":["target"]}
 
-function inline__P17574_mk(s) {
+function inline__P47070_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17574, depth: s.depth + 1,
+        parent: s, fn: inline__P47070, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47037,51 +47677,7 @@ function inline__P17574_mk(s) {
 
 
 
-function game_waitAnyButton__P2534(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    r0 = pxsim_numops_toBoolDecr(globals.__waitAnyButton___4352);
-    if (!r0) { step = 1; continue; }
-    s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = globals.__waitAnyButton___4352;
-    setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1151; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    { step = 2; continue; }
-  case 1:
-    s.tmp_0 = pause__P402_mk(s);
-    s.tmp_0.arg0 = 3000;
-    s.callLocIdx = 1152; s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-  case 2:
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-game_waitAnyButton__P2534.info = {"start":967,"length":111,"line":35,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"waitAnyButton","argumentNames":[]}
-
-function game_waitAnyButton__P2534_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: game_waitAnyButton__P2534, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-} }
-
-
-
-
-
-function game_GameOverDialog_update__P2519(s) {
+function music_Melody_play__P32285(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47093,54 +47689,39 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_clearInterior__P4323_mk(s);
+    if (!checkSubtype(r0, music_Melody__C32278_VT)) failedCast(r0);
+    s.tmp_0 = music_Melody_playCore__P34338_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1118; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    s.tmp_0 = game_GameOverDialog__C2516_v2_1_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C2516_VT)) failedCast(s.tmp_0.arg0);
-    s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.drawTextCore;
-    s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-    r0 = s.arg0.fields["cursorOn"];
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    s.tmp_1 = game_BaseDialog_drawCursorRow__P2493_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1119; s.pc = 5; return s.tmp_1;
-  case 5:
-    r0 = s.retval;
+    s.tmp_0.arg1 = s.arg1;
+    s.tmp_0.arg2 = false;
+    s.callLocIdx = 1658; s.pc = 1; return s.tmp_0;
   case 1:
-  case 2:
+    r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_GameOverDialog_update__P2519.info = {"start":11365,"length":173,"line":349,"column":8,"endLine":356,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"update","argumentNames":["this"]}
+music_Melody_play__P32285.info = {"start":8858,"length":71,"line":278,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"play","argumentNames":["this","volume"]}
 
-function game_GameOverDialog_update__P2519_mk(s) {
+function music_Melody_play__P32285_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_GameOverDialog_update__P2519, depth: s.depth + 1,
+        parent: s, fn: music_Melody_play__P32285, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
   arg0: undefined,
+  arg1: undefined,
 } }
 
 
 
 
 
-function game_GameOverDialog_drawTextCore__P2520(s) {
+function music_Melody_playCore__P34338(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47150,151 +47731,66 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scoreColor___17632 = undefined;
+    s.p___47227 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
-    r0 = s.arg0.fields["win"];
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = "YOU WIN!";
-    { step = 2; continue; }
+    if (!checkSubtype(r0, music_Melody__C32278_VT)) failedCast(r0);
+    s.tmp_0 = music_Melody_stop__P32283_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1653; s.pc = 1; return s.tmp_0;
   case 1:
-    r0 = "GAME OVER!";
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    if (!r0) { step = 3; continue; }
-    r0 = 1;
-    { step = 4; continue; }
-  case 3:
-    r0 = 5;
-  case 4:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    s.tmp_4 = helpers_imagePrintCenter__P1759_mk(s);
-    r0 = s.arg0.fields["image"];
-    s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.tmp_1;
-    s.tmp_4.arg2 = 8;
-    s.tmp_4.arg3 = s.tmp_3;
-    s.tmp_4.arg4 = globals.font8___1745;
-    s.callLocIdx = 1120; s.pc = 11; return s.tmp_4;
-  case 11:
     r0 = s.retval;
-    r0 = s.arg0.fields["score"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 !== undefined);
+    r0 = pxsim_pxtcore_mkClassInstance(music_MelodyPlayer__C32288_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 9; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    if (!r0) { step = 5; continue; }
-    r0 = 1;
-    { step = 6; continue; }
-  case 5:
-    r0 = 2;
-  case 6:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    s.scoreColor___17632 = (s.tmp_3);
-    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
-    r0 = s.arg0.fields["image"];
-    s.tmp_0.arg0 = r0;
-    r0 = s.arg0.fields["score"];
-    s.tmp_2 = r0;
-    if ((s.tmp_2) && (s.tmp_2).vtable) {
-    setupResume(s, 13);
-    pxsim_String__stringConv(s.tmp_2);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (s.tmp_2) + ""; }
-  case 13:
+    s.tmp_1 = music_MelodyPlayer_constructor__P32291_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.tmp_1.arg1 = s.arg0;
+    s.callLocIdx = 1654; s.pc = 2; return s.tmp_1;
+  case 2:
     r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_String__concat("Score:", s.tmp_1);
-    s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = 23;
-    s.tmp_0.arg3 = s.scoreColor___17632;
-    s.tmp_0.arg4 = globals.font8___1745;
-    s.callLocIdx = 1121; s.pc = 12; return s.tmp_0;
-  case 12:
+    r0 = (s.arg0).fields["_player"] = (s.tmp_0);
+    s.p___47227 = (s.tmp_0);
+    s.tmp_0 = music_Melody_registerMelody__P34336_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1655; s.pc = 3; return s.tmp_0;
+  case 3:
     r0 = s.retval;
-    r0 = s.arg0.fields["isNewHighScore"];
+    r0 = pxsim_pxtcore_mkAction(4, inline__P47237);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 7; continue; }
-    s.tmp_1 = helpers_imagePrintCenter__P1759_mk(s);
-    r0 = s.arg0.fields["image"];
-    s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = "New High Score!";
-    s.tmp_1.arg2 = 34;
-    s.tmp_1.arg3 = s.scoreColor___17632;
-    s.tmp_1.arg4 = globals.font5___1750;
-    s.callLocIdx = 1122; s.pc = 14; return s.tmp_1;
-  case 14:
-    r0 = s.retval;
-    { step = 8; continue; }
-  case 7:
-    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
-    r0 = s.arg0.fields["image"];
-    s.tmp_0.arg0 = r0;
-    r0 = s.arg0.fields["highScore"];
-    s.tmp_2 = r0;
-    if ((s.tmp_2) && (s.tmp_2).vtable) {
-    setupResume(s, 16);
-    pxsim_String__stringConv(s.tmp_2);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (s.tmp_2) + ""; }
-  case 16:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_String__concat("HI", s.tmp_1);
-    s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = 34;
-    s.tmp_0.arg3 = s.scoreColor___17632;
-    s.tmp_0.arg4 = globals.font8___1745;
-    s.callLocIdx = 1123; s.pc = 15; return s.tmp_0;
-  case 15:
-    r0 = s.retval;
-  case 8:
-  case 9:
-  case 10:
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.p___47227);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg1);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.arg2);
+    r0 = pxsim.control.runInParallel(s.tmp_0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_GameOverDialog_drawTextCore__P2520.info = {"start":11548,"length":1200,"line":358,"column":8,"endLine":395,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
+music_Melody_playCore__P34338.info = {"start":7682,"length":434,"line":242,"column":8,"endLine":254,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"playCore","argumentNames":["this","volume","loop"]}
 
-function game_GameOverDialog_drawTextCore__P2520_mk(s) {
+function music_Melody_playCore__P34338_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_GameOverDialog_drawTextCore__P2520, depth: s.depth + 1,
+        parent: s, fn: music_Melody_playCore__P34338, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  scoreColor___17632: undefined,
+  p___47227: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function helpers_imagePrintCenter__P1759(s) {
+function inline__P47237(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47304,92 +47800,56 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.w___17680 = undefined;
-    s.x___17686 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
-      s.arg4 = (s.lambdaArgs[4]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim_numops_toBoolDecr(s.arg4);
+  case 1:
+    r0 = s.caps[0].fields["_player"];
     s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = (s.tmp_1 == s.caps[1]);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    s.tmp_2 = image_getFontForText__P1747_mk(s);
-    s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 136; s.pc = 3; return s.tmp_2;
-  case 3:
-    r0 = s.retval;
-    s.arg4 = (r0);
-  case 1:
-  case 2:
-    r0 = pxsim_String_.length(s.arg1);
-    s.tmp_0 = r0;
-    s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.arg4;
-    if (!s.tmp_2.arg0.vtable.iface) {
-      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
-    } else {
-      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
-      if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
-      else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 137; s.pc = 4; return s.tmp_2; }
-    }
-  case 4:
+    if (!r0) { step = 4; continue; }
+    s.tmp_2 = music_MelodyPlayer_play__P32293_mk(s);
+    s.tmp_2.arg0 = s.caps[1];
+    s.tmp_2.arg1 = s.caps[2];
+    s.callLocIdx = 1656; s.pc = 5; return s.tmp_2;
+  case 5:
     r0 = s.retval;
+    r0 = pxsim_numops_toBoolDecr(s.caps[3]);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0 * s.tmp_1);
-    s.w___17680 = (r0);
-    r0 = pxsim_ImageMethods.width(s.arg0);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.w___17680);
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 / 2);
-    s.x___17686 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.arg1;
-    s.tmp_0.arg2 = s.x___17686;
-    s.tmp_0.arg3 = s.arg2;
-    s.tmp_0.arg4 = s.arg3;
-    s.tmp_0.arg5 = s.arg4;
-    s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 138; s.pc = 5; return s.tmp_0;
-  case 5:
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    { step = 4; continue; }
+  case 2:
+  case 3:
+    { step = 1; continue; }
+  case 4:
+    s.tmp_2 = music_Melody_unregisterMelody__P34337_mk(s);
+    s.tmp_2.arg0 = s.caps[0];
+    s.callLocIdx = 1657; s.pc = 6; return s.tmp_2;
+  case 6:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imagePrintCenter__P1759.info = {"start":15025,"length":295,"line":206,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"imagePrintCenter","argumentNames":["img","text","y","color","font"]}
+inline__P47237.info = {"start":7885,"length":220,"line":246,"column":34,"endLine":253,"endColumn":13,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"inline","argumentNames":[]}
 
-function helpers_imagePrintCenter__P1759_mk(s) {
+function inline__P47237_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imagePrintCenter__P1759, depth: s.depth + 1,
+        parent: s, fn: inline__P47237, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  w___17680: undefined,
-  x___17686: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
-  arg4: undefined,
 } }
 
 
 
 
 
-function game_GameOverDialog_displayCursor__P2518(s) {
+function music_Melody_unregisterMelody__P34337(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47404,18 +47864,22 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["cursorOn"] = (true);
+    if (!checkSubtype(r0, music_Melody__C32278_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___34339);
+    if (!r0) { step = 1; continue; }
+    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___34339, s.arg0);
+  case 1:
+  case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_GameOverDialog_displayCursor__P2518.info = {"start":11294,"length":61,"line":345,"column":8,"endLine":347,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"displayCursor","argumentNames":["this"]}
+music_Melody_unregisterMelody__P34337.info = {"start":7471,"length":201,"line":235,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"unregisterMelody","argumentNames":["this"]}
 
-function game_GameOverDialog_displayCursor__P2518_mk(s) {
+function music_Melody_unregisterMelody__P34337_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_GameOverDialog_displayCursor__P2518, depth: s.depth + 1,
+        parent: s, fn: music_Melody_unregisterMelody__P34337, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -47424,7 +47888,7 @@ function game_GameOverDialog_displayCursor__P2518_mk(s) {
 
 
 
-function game_GameOverDialog_constructor__P2517(s) {
+function music_Melody_registerMelody__P34336(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47436,108 +47900,66 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["win"] = (s.arg1);
-    r0 = (s.arg0).fields["score"] = (s.arg2);
-    r0 = (s.arg0).fields["highScore"] = (s.arg3);
-    s.tmp_0 = game_BaseDialog_constructor__P2489_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
-    s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = 46;
-    s.tmp_1 = game_defaultSplashFrame__P4335_mk(s);
-    s.callLocIdx = 1116; s.pc = 2; return s.tmp_1;
-  case 2:
-    r0 = s.retval;
-    s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = undefined;
-    s.tmp_0.arg5 = undefined;
-    s.callLocIdx = 1117; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = (s.arg0).fields["cursorOn"] = (false);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = s.arg0.fields["score"];
-    s.tmp_2 = r0;
-    r0 = s.arg0.fields["highScore"];
-    s.tmp_3 = r0;
-    r0 = (s.tmp_2 > s.tmp_3);
+    if (!checkSubtype(r0, music_Melody__C32278_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___34339);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["isNewHighScore"] = (s.tmp_1);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-game_GameOverDialog_constructor__P2517.info = {"start":10978,"length":306,"line":335,"column":8,"endLine":343,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","win","score","highScore"]}
-
-function game_GameOverDialog_constructor__P2517_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: game_GameOverDialog_constructor__P2517, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
-} }
-
-
-
-
-
-function game_defaultSplashFrame__P4335(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex17720);
-    { step = 2; continue; }
+    r0 = pxsim_Array__mk();
+    globals.music_Melody_playingMelodies___34339 = (r0);
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex17722);
   case 2:
-    // jmp value (already in r0)
+    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___34339);
     s.tmp_1 = r0;
-    r0 = s.tmp_1;
+    r0 = (s.tmp_1 > 4);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 3; continue; }
+    s.tmp_2 = music_Melody_stop__P32283_mk(s);
+    s.tmp_3 = r0 = globals.music_Melody_playingMelodies___34339;
+    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___34339);
+    s.tmp_5 = r0;
+    r0 = (s.tmp_5 - 1);
+    s.tmp_4 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_3, s.tmp_4);
+    s.tmp_2.arg0 = r0;
+    s.callLocIdx = 1652; s.pc = 5; return s.tmp_2;
+  case 5:
+    r0 = s.retval;
+  case 3:
+  case 4:
+    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___34339, s.arg0);
+    r0 = pxsim_Array__push(globals.music_Melody_playingMelodies___34339, s.arg0);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_defaultSplashFrame__P4335.info = {"start":16870,"length":220,"line":528,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultSplashFrame","argumentNames":[]}
+music_Melody_registerMelody__P34336.info = {"start":6889,"length":573,"line":223,"column":8,"endLine":234,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"registerMelody","argumentNames":["this"]}
 
-function game_defaultSplashFrame__P4335_mk(s) {
+function music_Melody_registerMelody__P34336_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_defaultSplashFrame__P4335, depth: s.depth + 1,
+        parent: s, fn: music_Melody_registerMelody__P34336, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  arg0: undefined,
 } }
 
-const _hex17720 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100000101000001010000")
-const _hex17722 = pxsim.BufferMethods.createBufferFromHex("8704030003000000f1010000f1010000f1010000")
 
 
 
 
-function scene_Scene_destroy__P2445(s) {
+function music_MelodyPlayer_play__P32293(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47547,809 +47969,244 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.notes___47266 = undefined;
+    s.pos___47270 = undefined;
+    s.duration___47271 = undefined;
+    s.octave___47272 = undefined;
+    s.tempo___47273 = undefined;
+    s.hz___47274 = undefined;
+    s.endHz___47275 = undefined;
+    s.ms___47278 = undefined;
+    s.timePos___47279 = undefined;
+    s.startTime___47280 = undefined;
+    s.now___47283 = undefined;
+    s.envA___47284 = undefined;
+    s.envD___47285 = undefined;
+    s.envS___47286 = undefined;
+    s.envR___47287 = undefined;
+    s.soundWave___47288 = undefined;
+    s.sndInstr___47289 = undefined;
+    s.sndInstrPtr___47295 = undefined;
+    s.addForm___47296 = undefined;
+    s.scanNextWord___47356 = undefined;
+    s.token___47413 = undefined;
+    s.tokenKind___47414 = undefined;
+    s.consumeToken___47417 = undefined;
+    s.currNote___47493 = undefined;
+    s.prevNote___47495 = undefined;
+    s.timeLeft___47498 = undefined;
+    s.note___47512 = undefined;
+    s.i___47516 = undefined;
+    s.noteChar___47522 = undefined;
+    s.keyNumber___47596 = undefined;
+    s.currMs___47613 = undefined;
+    s.beat___47617 = undefined;
+    s.timeLeft___47674 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["eventContext"] = (undefined);
-    r0 = (s.arg0).fields["background"] = (undefined);
-    r0 = (s.arg0).fields["tileMap"] = (undefined);
-    r0 = (s.arg0).fields["allSprites"] = (undefined);
-    r0 = (s.arg0).fields["spriteNextId"] = (undefined);
-    r0 = (s.arg0).fields["spritesByKind"] = (undefined);
-    r0 = (s.arg0).fields["physicsEngine"] = (undefined);
-    r0 = (s.arg0).fields["camera"] = (undefined);
-    r0 = (s.arg0).fields["flags"] = (undefined);
-    r0 = (s.arg0).fields["destroyedHandlers"] = (undefined);
-    r0 = (s.arg0).fields["createdHandlers"] = (undefined);
-    r0 = (s.arg0).fields["overlapHandlers"] = (undefined);
-    r0 = (s.arg0).fields["tileOverlapHandlers"] = (undefined);
-    r0 = (s.arg0).fields["collisionHandlers"] = (undefined);
-    r0 = (s.arg0).fields["wallCollisionHandlers"] = (undefined);
-    r0 = (s.arg0).fields["gameForeverHandlers"] = (undefined);
-    r0 = (s.arg0).fields["_data"] = (undefined);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-scene_Scene_destroy__P2445.info = {"start":6997,"length":764,"line":198,"column":8,"endLine":216,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"destroy","argumentNames":["this"]}
-
-function scene_Scene_destroy__P2445_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: scene_Scene_destroy__P2445, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function info_highScore__P2205(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.tmp_1 = settings_readNumber__P1833_mk(s);
-    s.tmp_1.arg0 = "high-score";
-    s.callLocIdx = 804; s.pc = 3; return s.tmp_1;
-  case 3:
-    r0 = s.retval;
+    if (!checkSubtype(r0, music_MelodyPlayer__C32288_VT)) failedCast(r0);
+    r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
+    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
+    s.arg1 = (s.tmp_0);
+    r0 = s.arg0.fields["melody"];
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
+    { step = 59; continue; }
   case 1:
-    r0 = 0;
   case 2:
-    // jmp value (already in r0)
-    s.tmp_2 = r0;
-    r0 = s.tmp_2;
-    return leave(s, r0)
-  default: oops()
-} } }
-info_highScore__P2205.info = {"start":7086,"length":98,"line":240,"column":4,"endLine":242,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"highScore","argumentNames":[]}
-
-function info_highScore__P2205_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: info_highScore__P2205, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-} }
-
-
-
-
-
-function info_saveHighScore__P2202(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.hs___18554 = undefined;
-    s.curr___18571 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.players___4231);
-    if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtrt.mklocRef();
-    s.hs___18554 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.hs___18554, 0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P18564);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hs___18554);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_2.arg0 = globals.players___4231;
-    s.tmp_2.arg1 = inline__P18558;
-    s.callLocIdx = 798; s.pc = 8; return s.tmp_2;
-  case 8:
-    r0 = s.retval;
-    s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 801; s.pc = 7; return s.tmp_1;
-  case 7:
+    s.tmp_4 = r0 = s.arg1;
+    s.tmp_6 = Math_clamp__P29657_mk(s);
+    s.tmp_6.arg0 = 0;
+    s.tmp_6.arg1 = 255;
+    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
+    s.tmp_8 = r0;
+    s.tmp_10 = music_volume__P32273_mk(s);
+    s.callLocIdx = 1659; s.pc = 61; return s.tmp_10;
+  case 61:
     r0 = s.retval;
-    s.tmp_0 = settings_readNumber__P1833_mk(s);
-    s.tmp_0.arg0 = "high-score";
-    s.callLocIdx = 802; s.pc = 9; return s.tmp_0;
-  case 9:
+    s.tmp_9 = r0;
+    r0 = (s.tmp_8 * s.tmp_9);
+    s.tmp_7 = r0;
+    r0 = (s.tmp_7 >> 8);
+    s.tmp_6.arg2 = r0;
+    s.callLocIdx = 1660; s.pc = 60; return s.tmp_6;
+  case 60:
     r0 = s.retval;
-    s.curr___18571 = (r0);
-    r0 = (s.curr___18571 == null);
+    s.tmp_5 = r0;
+    r0 = pxsim_pxtrt_stlocRef(s.tmp_4, s.tmp_5);
+    r0 = s.arg0.fields["melody"];
+    r0 = r0.fields["_text"];
+    s.notes___47266 = (r0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.pos___47270 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.pos___47270, 0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.duration___47271 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.duration___47271, 4);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.octave___47272 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.octave___47272, 4);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.tempo___47273 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.tempo___47273, 120);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.hz___47274 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.hz___47274, 0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.endHz___47275 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.endHz___47275, -1);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.ms___47278 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.ms___47278, 0);
+    s.timePos___47279 = (0);
+    r0 = pxsim.control.millis();
+    s.startTime___47280 = (r0);
+    s.now___47283 = (0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.envA___47284 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envA___47284, 0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.envD___47285 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envD___47285, 0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.envS___47286 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envS___47286, 255);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.envR___47287 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envR___47287, 0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.soundWave___47288 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.soundWave___47288, 1);
+    r0 = pxsim.control.createBuffer(60);
+    s.sndInstr___47289 = (r0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.sndInstrPtr___47295 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___47295, 0);
+    r0 = pxsim_pxtcore_mkAction(10, inline__P47297);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hz___47274);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.endHz___47275);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.ms___47278);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___47271);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.tempo___47273);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.envR___47287);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.sndInstrPtr___47295);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.sndInstr___47289);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.soundWave___47288);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 9, s.arg1);
+    s.addForm___47296 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P47357);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
-  case 1:
-    r0 = pxsim_pxtrt_ldlocRef(s.hs___18554);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pos___47270);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.notes___47266);
+    s.scanNextWord___47356 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.token___47413 = (r0);
+    s.tmp_0 = r0 = s.token___47413;
+    r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.curr___18571);
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    if (!r0) { step = 3; continue; }
-    s.tmp_3 = settings_writeNumber__P1829_mk(s);
-    s.tmp_3.arg0 = "high-score";
-    r0 = pxsim_pxtrt_ldlocRef(s.hs___18554);
-    s.tmp_3.arg1 = r0;
-    s.callLocIdx = 803; s.pc = 10; return s.tmp_3;
-  case 10:
-    r0 = s.retval;
+    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.tokenKind___47414 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 0);
+    r0 = pxsim_pxtcore_mkAction(13, inline__P47418);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.token___47413);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tokenKind___47414);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.octave___47272);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___47271);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.ms___47278);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.tempo___47273);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.hz___47274);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.soundWave___47288);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.envA___47284);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 9, s.envD___47285);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 10, s.envS___47286);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 11, s.envR___47287);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 12, s.endHz___47275);
+    s.consumeToken___47417 = (s.tmp_0);
   case 3:
+    r0 = pxsim_numops_toBoolDecr(true);
+    if (!r0) { step = 58; continue; }
+    s.tmp_0 = lambda_1_mk(s);
+    s.tmp_0.argL = s.scanNextWord___47356;
+    setupLambda(s.tmp_0, s.tmp_0.argL);
+    s.callLocIdx = 1668; s.pc = 62; return s.tmp_0;
+  case 62:
+    r0 = s.retval;
+    s.currNote___47493 = (r0);
+    s.prevNote___47495 = (false);
+    r0 = pxsim_numops_toBoolDecr(s.currNote___47493);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 8; continue; }
+    r0 = (s.timePos___47279 - s.now___47283);
+    s.timeLeft___47498 = (r0);
+    r0 = (s.timeLeft___47498 > 0);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 4; continue; }
+    s.tmp_1 = pause__P29937_mk(s);
+    s.tmp_1.arg0 = s.timeLeft___47498;
+    s.callLocIdx = 1669; s.pc = 63; return s.tmp_1;
+  case 63:
+    r0 = s.retval;
   case 4:
   case 5:
-  case 6:
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-info_saveHighScore__P2202.info = {"start":6187,"length":383,"line":204,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"saveHighScore","argumentNames":[]}
-
-function info_saveHighScore__P2202_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: info_saveHighScore__P2202, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  hs___18554: undefined,
-  curr___18571: undefined,
-} }
-
-
-
-
-
-function inline__P18558(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
-  case 1:
-    s.tmp_1 = info_PlayerInfo_hasScore__P2244_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 797; s.pc = 3; return s.tmp_1;
-  case 3:
-    r0 = s.retval;
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_2 = r0;
-    r0 = s.tmp_2;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P18558.info = {"start":6312,"length":22,"line":208,"column":24,"endLine":208,"endColumn":46,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
-
-function inline__P18558_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P18558, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function inline__P18564(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = r0 = s.caps[0];
-    s.tmp_2 = Math_max__P125_mk(s);
-    r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
-    s.tmp_2.arg0 = r0;
-    s.tmp_3 = info_PlayerInfo_score__P2241_mk(s);
-    s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 799; s.pc = 2; return s.tmp_3;
-  case 2:
-    r0 = s.retval;
-    s.tmp_2.arg1 = r0;
-    s.callLocIdx = 800; s.pc = 1; return s.tmp_2;
-  case 1:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = s.tmp_1;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P18564.info = {"start":6361,"length":33,"line":209,"column":25,"endLine":209,"endColumn":58,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
-
-function inline__P18564_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P18564, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function music_Melody_play__P1605(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
-    s.tmp_0 = music_Melody_playCore__P4073_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.arg1;
-    s.tmp_0.arg2 = false;
-    s.callLocIdx = 88; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_play__P1605.info = {"start":8858,"length":71,"line":278,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"play","argumentNames":["this","volume"]}
-
-function music_Melody_play__P1605_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_play__P1605, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function music_Melody_playCore__P4073(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.p___17731 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
-    s.tmp_0 = music_Melody_stop__P1603_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 83; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(music_MelodyPlayer__C1608_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = music_MelodyPlayer_constructor__P1611_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 84; s.pc = 2; return s.tmp_1;
-  case 2:
-    r0 = s.retval;
-    r0 = (s.arg0).fields["_player"] = (s.tmp_0);
-    s.p___17731 = (s.tmp_0);
-    s.tmp_0 = music_Melody_registerMelody__P4071_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 85; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(4, inline__P17741);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.p___17731);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.arg2);
-    r0 = pxsim.control.runInParallel(s.tmp_0);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_playCore__P4073.info = {"start":7682,"length":434,"line":242,"column":8,"endLine":254,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playCore","argumentNames":["this","volume","loop"]}
-
-function music_Melody_playCore__P4073_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_playCore__P4073, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  p___17731: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-} }
-
-
-
-
-
-function inline__P17741(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-  case 1:
-    r0 = s.caps[0].fields["_player"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.caps[1]);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    s.tmp_2 = music_MelodyPlayer_play__P1613_mk(s);
-    s.tmp_2.arg0 = s.caps[1];
-    s.tmp_2.arg1 = s.caps[2];
-    s.callLocIdx = 86; s.pc = 5; return s.tmp_2;
-  case 5:
-    r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.caps[3]);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 2; continue; }
-    { step = 4; continue; }
-  case 2:
-  case 3:
-    { step = 1; continue; }
-  case 4:
-    s.tmp_2 = music_Melody_unregisterMelody__P4072_mk(s);
-    s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 87; s.pc = 6; return s.tmp_2;
-  case 6:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P17741.info = {"start":7885,"length":220,"line":246,"column":34,"endLine":253,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P17741_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P17741, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-} }
-
-
-
-
-
-function music_Melody_unregisterMelody__P4072(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___4074);
-    if (!r0) { step = 1; continue; }
-    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___4074, s.arg0);
-  case 1:
-  case 2:
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_unregisterMelody__P4072.info = {"start":7471,"length":201,"line":235,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"unregisterMelody","argumentNames":["this"]}
-
-function music_Melody_unregisterMelody__P4072_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_unregisterMelody__P4072, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function music_Melody_registerMelody__P4071(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___4074);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = pxsim_Array__mk();
-    globals.music_Melody_playingMelodies___4074 = (r0);
-  case 1:
-  case 2:
-    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___4074);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 > 4);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 3; continue; }
-    s.tmp_2 = music_Melody_stop__P1603_mk(s);
-    s.tmp_3 = r0 = globals.music_Melody_playingMelodies___4074;
-    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___4074);
-    s.tmp_5 = r0;
-    r0 = (s.tmp_5 - 1);
-    s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_3, s.tmp_4);
-    s.tmp_2.arg0 = r0;
-    s.callLocIdx = 82; s.pc = 5; return s.tmp_2;
-  case 5:
-    r0 = s.retval;
-  case 3:
-  case 4:
-    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___4074, s.arg0);
-    r0 = pxsim_Array__push(globals.music_Melody_playingMelodies___4074, s.arg0);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_registerMelody__P4071.info = {"start":6889,"length":573,"line":223,"column":8,"endLine":234,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"registerMelody","argumentNames":["this"]}
-
-function music_Melody_registerMelody__P4071_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_registerMelody__P4071, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function music_MelodyPlayer_play__P1613(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.notes___17770 = undefined;
-    s.pos___17774 = undefined;
-    s.duration___17775 = undefined;
-    s.octave___17776 = undefined;
-    s.tempo___17777 = undefined;
-    s.hz___17778 = undefined;
-    s.endHz___17779 = undefined;
-    s.ms___17782 = undefined;
-    s.timePos___17783 = undefined;
-    s.startTime___17784 = undefined;
-    s.now___17787 = undefined;
-    s.envA___17788 = undefined;
-    s.envD___17789 = undefined;
-    s.envS___17790 = undefined;
-    s.envR___17791 = undefined;
-    s.soundWave___17792 = undefined;
-    s.sndInstr___17793 = undefined;
-    s.sndInstrPtr___17799 = undefined;
-    s.addForm___17800 = undefined;
-    s.scanNextWord___17860 = undefined;
-    s.token___17917 = undefined;
-    s.tokenKind___17918 = undefined;
-    s.consumeToken___17921 = undefined;
-    s.currNote___17997 = undefined;
-    s.prevNote___17999 = undefined;
-    s.timeLeft___18002 = undefined;
-    s.note___18016 = undefined;
-    s.i___18020 = undefined;
-    s.noteChar___18026 = undefined;
-    s.keyNumber___18100 = undefined;
-    s.currMs___18117 = undefined;
-    s.beat___18121 = undefined;
-    s.timeLeft___18178 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
-    s.arg1 = (s.tmp_0);
-    r0 = s.arg0.fields["melody"];
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    if (!r0) { step = 1; continue; }
-    { step = 59; continue; }
-  case 1:
-  case 2:
-    s.tmp_4 = r0 = s.arg1;
-    s.tmp_6 = Math_clamp__P122_mk(s);
-    s.tmp_6.arg0 = 0;
-    s.tmp_6.arg1 = 255;
-    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
-    s.tmp_8 = r0;
-    s.tmp_10 = music_volume__P1593_mk(s);
-    s.callLocIdx = 89; s.pc = 61; return s.tmp_10;
-  case 61:
-    r0 = s.retval;
-    s.tmp_9 = r0;
-    r0 = (s.tmp_8 * s.tmp_9);
-    s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> 8);
-    s.tmp_6.arg2 = r0;
-    s.callLocIdx = 90; s.pc = 60; return s.tmp_6;
-  case 60:
-    r0 = s.retval;
-    s.tmp_5 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.tmp_4, s.tmp_5);
-    r0 = s.arg0.fields["melody"];
-    r0 = r0.fields["_text"];
-    s.notes___17770 = (r0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.pos___17774 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.pos___17774, 0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.duration___17775 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.duration___17775, 4);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.octave___17776 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.octave___17776, 4);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.tempo___17777 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.tempo___17777, 120);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.hz___17778 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.hz___17778, 0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.endHz___17779 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.endHz___17779, -1);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.ms___17782 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.ms___17782, 0);
-    s.timePos___17783 = (0);
-    r0 = pxsim.control.millis();
-    s.startTime___17784 = (r0);
-    s.now___17787 = (0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.envA___17788 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envA___17788, 0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.envD___17789 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envD___17789, 0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.envS___17790 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envS___17790, 255);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.envR___17791 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envR___17791, 0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.soundWave___17792 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.soundWave___17792, 1);
-    r0 = pxsim.control.createBuffer(60);
-    s.sndInstr___17793 = (r0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.sndInstrPtr___17799 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___17799, 0);
-    r0 = pxsim_pxtcore_mkAction(10, inline__P17801);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hz___17778);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.endHz___17779);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.ms___17782);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___17775);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.tempo___17777);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.envR___17791);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.sndInstrPtr___17799);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.sndInstr___17793);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.soundWave___17792);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 9, s.arg1);
-    s.addForm___17800 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P17861);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pos___17774);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.notes___17770);
-    s.scanNextWord___17860 = (s.tmp_0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.token___17917 = (r0);
-    s.tmp_0 = r0 = s.token___17917;
-    r0 = pxsim_String_.mkEmpty();
-    s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.tokenKind___17918 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 0);
-    r0 = pxsim_pxtcore_mkAction(13, inline__P17922);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.token___17917);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tokenKind___17918);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.octave___17776);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___17775);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.ms___17782);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.tempo___17777);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.hz___17778);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.soundWave___17792);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.envA___17788);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 9, s.envD___17789);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 10, s.envS___17790);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 11, s.envR___17791);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 12, s.endHz___17779);
-    s.consumeToken___17921 = (s.tmp_0);
-  case 3:
-    r0 = pxsim_numops_toBoolDecr(true);
-    if (!r0) { step = 58; continue; }
-    s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.scanNextWord___17860;
-    setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 98; s.pc = 62; return s.tmp_0;
-  case 62:
-    r0 = s.retval;
-    s.currNote___17997 = (r0);
-    s.prevNote___17999 = (false);
-    r0 = pxsim_numops_toBoolDecr(s.currNote___17997);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 8; continue; }
-    r0 = (s.timePos___17783 - s.now___17787);
-    s.timeLeft___18002 = (r0);
-    r0 = (s.timeLeft___18002 > 0);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    s.tmp_1 = pause__P402_mk(s);
-    s.tmp_1.arg0 = s.timeLeft___18002;
-    s.callLocIdx = 99; s.pc = 63; return s.tmp_1;
-  case 63:
-    r0 = s.retval;
-  case 4:
-  case 5:
-    r0 = s.arg0.fields["onPlayFinished"];
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 6; continue; }
-    s.tmp_1 = if_onPlayFinished_1_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    if (!s.tmp_1.arg0.vtable.iface) {
-      setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "onPlayFinished"), 1);
-      s.callLocIdx = 100; s.pc = 64; return s.tmp_1;
-    } else {
-      s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["onPlayFinished"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["onPlayFinished"], 1); s.callLocIdx = 100; s.pc = 64; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 100; s.pc = 64; return s.tmp_1;; }
-     else { s.callLocIdx = 100; s.pc = 64; return s.tmp_1; }
-    }
-  case 64:
-    r0 = s.retval;
+    r0 = s.arg0.fields["onPlayFinished"];
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 6; continue; }
+    s.tmp_1 = if_onPlayFinished_1_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    if (!s.tmp_1.arg0.vtable.iface) {
+      setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "onPlayFinished"), 1);
+      s.callLocIdx = 1670; s.pc = 64; return s.tmp_1;
+    } else {
+      s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["onPlayFinished"];
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["onPlayFinished"], 1); s.callLocIdx = 1670; s.pc = 64; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1670; s.pc = 64; return s.tmp_1;; }
+     else { s.callLocIdx = 1670; s.pc = 64; return s.tmp_1; }
+    }
+  case 64:
+    r0 = s.retval;
   case 6:
   case 7:
     { step = 59; continue; }
   case 8:
   case 9:
-    r0 = pxsim_pxtrt_stlocRef(s.hz___17778, -1);
-    s.note___18016 = (0);
-    s.tmp_0 = r0 = s.token___17917;
+    r0 = pxsim_pxtrt_stlocRef(s.hz___47274, -1);
+    s.note___47512 = (0);
+    s.tmp_0 = r0 = s.token___47413;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 0);
-    s.i___18020 = (0);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 0);
+    s.i___47516 = (0);
   case 10:
-    s.tmp_1 = r0 = s.i___18020;
-    r0 = pxsim_String_.length(s.currNote___17997);
+    s.tmp_1 = r0 = s.i___47516;
+    r0 = pxsim_String_.length(s.currNote___47493);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 41; continue; }
-    r0 = pxsim_String_.charAt(s.currNote___17997, s.i___18020);
-    s.noteChar___18026 = (r0);
-    s.tmp_0 = r0 = s.noteChar___18026;
+    r0 = pxsim_String_.charAt(s.currNote___47493, s.i___47516);
+    s.noteChar___47522 = (r0);
+    s.tmp_0 = r0 = s.noteChar___47522;
     r0 = pxsim_pxtcore.switch_eq("c", s.tmp_0);
     if (r0) { step = 11; continue; }
     r0 = pxsim_pxtcore.switch_eq("C", s.tmp_0);
@@ -48402,133 +48259,133 @@ switch (step) {
     { step = 37; continue; }
   case 11:
   case 12:
-    s.note___18016 = (1);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (1);
+    s.prevNote___47495 = (true);
     { step = 40; continue; }
   case 13:
   case 14:
-    s.note___18016 = (3);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (3);
+    s.prevNote___47495 = (true);
     { step = 40; continue; }
   case 15:
   case 16:
-    s.note___18016 = (5);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (5);
+    s.prevNote___47495 = (true);
     { step = 40; continue; }
   case 17:
   case 18:
-    s.note___18016 = (6);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (6);
+    s.prevNote___47495 = (true);
     { step = 40; continue; }
   case 19:
   case 20:
-    s.note___18016 = (8);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (8);
+    s.prevNote___47495 = (true);
     { step = 40; continue; }
   case 21:
   case 22:
-    s.note___18016 = (10);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (10);
+    s.prevNote___47495 = (true);
     { step = 40; continue; }
   case 23:
-    s.note___18016 = (12);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (12);
+    s.prevNote___47495 = (true);
     { step = 40; continue; }
   case 24:
   case 25:
-    r0 = pxsim_pxtrt_stlocRef(s.hz___17778, 0);
-    s.prevNote___17999 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.hz___47274, 0);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 26:
-    r0 = (s.note___18016 + 1);
-    s.note___18016 = (r0);
-    s.prevNote___17999 = (false);
+    r0 = (s.note___47512 + 1);
+    s.note___47512 = (r0);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 27:
-    r0 = pxsim_numops_toBoolDecr(s.prevNote___17999);
+    r0 = pxsim_numops_toBoolDecr(s.prevNote___47495);
     if (!r0) { step = 28; continue; }
-    r0 = (s.note___18016 - 1);
-    s.note___18016 = (r0);
+    r0 = (s.note___47512 - 1);
+    s.note___47512 = (r0);
     { step = 29; continue; }
   case 28:
-    s.note___18016 = (12);
-    s.prevNote___17999 = (true);
+    s.note___47512 = (12);
+    s.prevNote___47495 = (true);
   case 29:
     { step = 40; continue; }
   case 30:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___17921;
+    s.tmp_0.argL = s.consumeToken___47417;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 101; s.pc = 65; return s.tmp_0;
+    s.callLocIdx = 1671; s.pc = 65; return s.tmp_0;
   case 65:
     r0 = s.retval;
-    s.prevNote___17999 = (false);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 31:
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 4);
-    s.prevNote___17999 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 4);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 32:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___17921;
+    s.tmp_0.argL = s.consumeToken___47417;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 102; s.pc = 66; return s.tmp_0;
+    s.callLocIdx = 1672; s.pc = 66; return s.tmp_0;
   case 66:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 8);
-    s.prevNote___17999 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 8);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 33:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___17921;
+    s.tmp_0.argL = s.consumeToken___47417;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 103; s.pc = 67; return s.tmp_0;
+    s.callLocIdx = 1673; s.pc = 67; return s.tmp_0;
   case 67:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 7);
-    s.prevNote___17999 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 7);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 34:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___17921;
+    s.tmp_0.argL = s.consumeToken___47417;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 104; s.pc = 68; return s.tmp_0;
+    s.callLocIdx = 1674; s.pc = 68; return s.tmp_0;
   case 68:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 2);
-    s.prevNote___17999 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 2);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 35:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___17921;
+    s.tmp_0.argL = s.consumeToken___47417;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 105; s.pc = 69; return s.tmp_0;
+    s.callLocIdx = 1675; s.pc = 69; return s.tmp_0;
   case 69:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 3);
-    s.prevNote___17999 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 3);
+    s.prevNote___47495 = (false);
     { step = 40; continue; }
   case 36:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___17921;
+    s.tmp_0.argL = s.consumeToken___47417;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 106; s.pc = 70; return s.tmp_0;
+    s.callLocIdx = 1676; s.pc = 70; return s.tmp_0;
   case 70:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 5);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 5);
     { step = 40; continue; }
   case 37:
-    r0 = pxsim_pxtrt_ldlocRef(s.tokenKind___17918);
+    r0 = pxsim_pxtrt_ldlocRef(s.tokenKind___47414);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 38; continue; }
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17918, 1);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___47414, 1);
   case 38:
   case 39:
-    s.tmp_0 = r0 = s.token___17917;
-    r0 = pxsim_pxtrt_ldlocRef(s.token___17917);
+    s.tmp_0 = r0 = s.token___47413;
+    r0 = pxsim_pxtrt_ldlocRef(s.token___47413);
     s.tmp_3 = r0;
     if ((s.tmp_3) && (s.tmp_3).vtable) {
     setupResume(s, 71);
@@ -48539,37 +48396,37 @@ switch (step) {
   case 71:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((s.noteChar___18026) && (s.noteChar___18026).vtable) {
+    if ((s.noteChar___47522) && (s.noteChar___47522).vtable) {
     setupResume(s, 72);
-    pxsim_String__stringConv(s.noteChar___18026);
+    pxsim_String__stringConv(s.noteChar___47522);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.noteChar___18026) + ""; }
+    } else { s.retval = (s.noteChar___47522) + ""; }
   case 72:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_2, s.tmp_4);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    s.prevNote___17999 = (false);
+    s.prevNote___47495 = (false);
   case 40:
-    r0 = (s.i___18020 + 1);
-    s.i___18020 = (r0);
+    r0 = (s.i___47516 + 1);
+    s.i___47516 = (r0);
     { step = 10; continue; }
   case 41:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___17921;
+    s.tmp_0.argL = s.consumeToken___47417;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 107; s.pc = 73; return s.tmp_0;
+    s.callLocIdx = 1677; s.pc = 73; return s.tmp_0;
   case 73:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.note___18016;
+    s.tmp_0 = r0 = s.note___47512;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 42; continue; }
     r0 = s.tmp_0;
     { step = 43; continue; }
   case 42:
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___17778);
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___47274);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
   case 43:
@@ -48577,17 +48434,17 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 46; continue; }
-    s.tmp_3 = r0 = s.note___18016;
-    r0 = pxsim_pxtrt_ldlocRef(s.octave___17776);
+    s.tmp_3 = r0 = s.note___47512;
+    r0 = pxsim_pxtrt_ldlocRef(s.octave___47272);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 - 1);
     s.tmp_5 = r0;
     r0 = (12 * s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
-    s.keyNumber___18100 = (r0);
-    s.tmp_1 = r0 = globals.freqs___4059;
-    r0 = (s.keyNumber___18100 * 2);
+    s.keyNumber___47596 = (r0);
+    s.tmp_1 = r0 = globals.freqs___34324;
+    r0 = (s.keyNumber___47596 * 2);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_1, 4, s.tmp_2);
     s.tmp_0 = r0;
@@ -48600,26 +48457,26 @@ switch (step) {
   case 45:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.hz___17778, s.tmp_3);
+    r0 = pxsim_pxtrt_stlocRef(s.hz___47274, s.tmp_3);
   case 46:
   case 47:
-    r0 = pxsim_pxtrt_ldlocRef(s.ms___17782);
-    s.currMs___18117 = (r0);
-    r0 = (s.currMs___18117 <= 0);
+    r0 = pxsim_pxtrt_ldlocRef(s.ms___47278);
+    s.currMs___47613 = (r0);
+    r0 = (s.currMs___47613 <= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 48; continue; }
-    r0 = pxsim_pxtrt_ldlocRef(s.tempo___17777);
+    r0 = pxsim_pxtrt_ldlocRef(s.tempo___47273);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(15000, s.tmp_1);
-    s.beat___18121 = (r0);
-    r0 = pxsim_pxtrt_ldlocRef(s.duration___17775);
+    s.beat___47617 = (r0);
+    r0 = pxsim_pxtrt_ldlocRef(s.duration___47271);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.beat___18121);
-    s.currMs___18117 = (r0);
+    r0 = (s.tmp_0 * s.beat___47617);
+    s.currMs___47613 = (r0);
   case 48:
   case 49:
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___17778);
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___47274);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -48627,123 +48484,123 @@ switch (step) {
     if (!r0) { step = 50; continue; }
     { step = 55; continue; }
   case 50:
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___17778);
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___47274);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 == 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 51; continue; }
-    r0 = (s.timePos___17783 + s.currMs___18117);
-    s.timePos___17783 = (r0);
+    r0 = (s.timePos___47279 + s.currMs___47613);
+    s.timePos___47279 = (r0);
     { step = 54; continue; }
   case 51:
-    r0 = pxsim_pxtrt_ldlocRef(s.endHz___17779);
+    r0 = pxsim_pxtrt_ldlocRef(s.endHz___47275);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 52; continue; }
-    s.tmp_2 = r0 = s.endHz___17779;
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___17778);
+    s.tmp_2 = r0 = s.endHz___47275;
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___47274);
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_2, s.tmp_3);
   case 52:
   case 53:
-    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___17799, 0);
+    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___47295, 0);
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___17800;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___17788);
+    s.tmp_0.argL = s.addForm___47296;
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___47284);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 255;
     s.tmp_0.arg3 = 0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 108; s.pc = 74; return s.tmp_0;
+    s.callLocIdx = 1678; s.pc = 74; return s.tmp_0;
   case 74:
     r0 = s.retval;
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___17800;
-    r0 = pxsim_pxtrt_ldlocRef(s.envD___17789);
+    s.tmp_0.argL = s.addForm___47296;
+    r0 = pxsim_pxtrt_ldlocRef(s.envD___47285);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 255;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___17790);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___47286);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___17788);
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___47284);
     s.tmp_0.arg3 = r0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 109; s.pc = 75; return s.tmp_0;
+    s.callLocIdx = 1679; s.pc = 75; return s.tmp_0;
   case 75:
     r0 = s.retval;
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___17800;
-    s.tmp_1 = r0 = s.currMs___18117;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___17788);
+    s.tmp_0.argL = s.addForm___47296;
+    s.tmp_1 = r0 = s.currMs___47613;
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___47284);
     s.tmp_3 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envD___17789);
+    r0 = pxsim_pxtrt_ldlocRef(s.envD___47285);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg0 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___17790);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___47286);
     s.tmp_0.arg1 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___17790);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___47286);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envD___17789);
+    r0 = pxsim_pxtrt_ldlocRef(s.envD___47285);
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___17788);
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___47284);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_0.arg3 = r0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 110; s.pc = 76; return s.tmp_0;
+    s.callLocIdx = 1680; s.pc = 76; return s.tmp_0;
   case 76:
     r0 = s.retval;
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___17800;
-    r0 = pxsim_pxtrt_ldlocRef(s.envR___17791);
+    s.tmp_0.argL = s.addForm___47296;
+    r0 = pxsim_pxtrt_ldlocRef(s.envR___47287);
     s.tmp_0.arg0 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___17790);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___47286);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    s.tmp_0.arg3 = s.currMs___18117;
+    s.tmp_0.arg3 = s.currMs___47613;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 111; s.pc = 77; return s.tmp_0;
+    s.callLocIdx = 1681; s.pc = 77; return s.tmp_0;
   case 77:
     r0 = s.retval;
-    s.tmp_0 = music_MelodyPlayer_queuePlayInstructions__P4076_mk(s);
+    s.tmp_0 = music_MelodyPlayer_queuePlayInstructions__P34341_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = (s.timePos___17783 - s.now___17787);
+    r0 = (s.timePos___47279 - s.now___47283);
     s.tmp_0.arg1 = r0;
-    s.tmp_1 = r0 = s.sndInstr___17793;
-    r0 = pxsim_pxtrt_ldlocRef(s.sndInstrPtr___17799);
+    s.tmp_1 = r0 = s.sndInstr___47289;
+    r0 = pxsim_pxtrt_ldlocRef(s.sndInstrPtr___47295);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.slice(s.tmp_1, 0, s.tmp_2);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 112; s.pc = 78; return s.tmp_0;
+    s.callLocIdx = 1682; s.pc = 78; return s.tmp_0;
   case 78:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.endHz___17779, -1);
-    r0 = (s.timePos___17783 + s.currMs___18117);
-    s.timePos___17783 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.endHz___47275, -1);
+    r0 = (s.timePos___47279 + s.currMs___47613);
+    s.timePos___47279 = (r0);
   case 54:
   case 55:
-    r0 = (s.timePos___17783 - s.now___17787);
-    s.timeLeft___18178 = (r0);
-    r0 = (s.timeLeft___18178 > 200);
+    r0 = (s.timePos___47279 - s.now___47283);
+    s.timeLeft___47674 = (r0);
+    r0 = (s.timeLeft___47674 > 200);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 56; continue; }
-    s.tmp_1 = pause__P402_mk(s);
-    r0 = (s.timeLeft___18178 - 100);
+    s.tmp_1 = pause__P29937_mk(s);
+    r0 = (s.timeLeft___47674 - 100);
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 113; s.pc = 79; return s.tmp_1;
+    s.callLocIdx = 1683; s.pc = 79; return s.tmp_1;
   case 79:
     r0 = s.retval;
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.startTime___17784);
-    s.now___17787 = (r0);
+    r0 = (s.tmp_0 - s.startTime___47280);
+    s.now___47283 = (r0);
   case 56:
   case 57:
     { step = 3; continue; }
@@ -48753,12 +48610,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_MelodyPlayer_play__P1613.info = {"start":10980,"length":9006,"line":341,"column":8,"endLine":572,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"play","argumentNames":["this","volume"]}
+music_MelodyPlayer_play__P32293.info = {"start":10980,"length":9006,"line":341,"column":8,"endLine":572,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"play","argumentNames":["this","volume"]}
 
-function music_MelodyPlayer_play__P1613_mk(s) {
+function music_MelodyPlayer_play__P32293_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_MelodyPlayer_play__P1613, depth: s.depth + 1,
+        parent: s, fn: music_MelodyPlayer_play__P32293, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48771,39 +48628,39 @@ function music_MelodyPlayer_play__P1613_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  notes___17770: undefined,
-  pos___17774: undefined,
-  duration___17775: undefined,
-  octave___17776: undefined,
-  tempo___17777: undefined,
-  hz___17778: undefined,
-  endHz___17779: undefined,
-  ms___17782: undefined,
-  timePos___17783: undefined,
-  startTime___17784: undefined,
-  now___17787: undefined,
-  envA___17788: undefined,
-  envD___17789: undefined,
-  envS___17790: undefined,
-  envR___17791: undefined,
-  soundWave___17792: undefined,
-  sndInstr___17793: undefined,
-  sndInstrPtr___17799: undefined,
-  addForm___17800: undefined,
-  scanNextWord___17860: undefined,
-  token___17917: undefined,
-  tokenKind___17918: undefined,
-  consumeToken___17921: undefined,
-  currNote___17997: undefined,
-  prevNote___17999: undefined,
-  timeLeft___18002: undefined,
-  note___18016: undefined,
-  i___18020: undefined,
-  noteChar___18026: undefined,
-  keyNumber___18100: undefined,
-  currMs___18117: undefined,
-  beat___18121: undefined,
-  timeLeft___18178: undefined,
+  notes___47266: undefined,
+  pos___47270: undefined,
+  duration___47271: undefined,
+  octave___47272: undefined,
+  tempo___47273: undefined,
+  hz___47274: undefined,
+  endHz___47275: undefined,
+  ms___47278: undefined,
+  timePos___47279: undefined,
+  startTime___47280: undefined,
+  now___47283: undefined,
+  envA___47284: undefined,
+  envD___47285: undefined,
+  envS___47286: undefined,
+  envR___47287: undefined,
+  soundWave___47288: undefined,
+  sndInstr___47289: undefined,
+  sndInstrPtr___47295: undefined,
+  addForm___47296: undefined,
+  scanNextWord___47356: undefined,
+  token___47413: undefined,
+  tokenKind___47414: undefined,
+  consumeToken___47417: undefined,
+  currNote___47493: undefined,
+  prevNote___47495: undefined,
+  timeLeft___47498: undefined,
+  note___47512: undefined,
+  i___47516: undefined,
+  noteChar___47522: undefined,
+  keyNumber___47596: undefined,
+  currMs___47613: undefined,
+  beat___47617: undefined,
+  timeLeft___47674: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -48812,7 +48669,7 @@ function music_MelodyPlayer_play__P1613_mk(s) {
 
 
 
-function inline__P17801(s) {
+function inline__P47297(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48822,10 +48679,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.freqStart___17806 = undefined;
-    s.freqEnd___17808 = undefined;
-    s.envelopeWidth___17810 = undefined;
-    s.slope___17828 = undefined;
+    s.freqStart___47302 = undefined;
+    s.freqEnd___47304 = undefined;
+    s.envelopeWidth___47306 = undefined;
+    s.slope___47324 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -48834,9 +48691,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
-    s.freqStart___17806 = (r0);
+    s.freqStart___47302 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
-    s.freqEnd___17808 = (r0);
+    s.freqEnd___47304 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 0);
@@ -48860,7 +48717,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.envelopeWidth___17810 = (s.tmp_7);
+    s.envelopeWidth___47306 = (s.tmp_7);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
@@ -48872,35 +48729,35 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = (s.envelopeWidth___17810 != 0);
+    r0 = (s.envelopeWidth___47306 != 0);
   case 4:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 5; continue; }
-    r0 = (s.freqEnd___17808 - s.freqStart___17806);
+    r0 = (s.freqEnd___47304 - s.freqStart___47302);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 / s.envelopeWidth___17810);
-    s.slope___17828 = (r0);
+    r0 = (s.tmp_4 / s.envelopeWidth___47306);
+    s.slope___47324 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0 = r0;
-    r0 = (s.slope___17828 * s.arg3);
+    r0 = (s.slope___47324 * s.arg3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.freqStart___17806 = (r0);
+    s.freqStart___47302 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0 = r0;
-    s.tmp_2 = r0 = s.slope___17828;
+    s.tmp_2 = r0 = s.slope___47324;
     r0 = (s.arg3 + s.arg0);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 * s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.freqEnd___17808 = (r0);
+    s.freqEnd___47304 = (r0);
   case 5:
   case 6:
     s.tmp_0 = r0 = s.caps[6];
-    s.tmp_2 = music_addNote__P4075_mk(s);
+    s.tmp_2 = music_addNote__P34340_mk(s);
     s.tmp_2.arg0 = s.caps[7];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[6]);
     s.tmp_2.arg1 = r0;
@@ -48909,11 +48766,11 @@ switch (step) {
     s.tmp_2.arg4 = s.arg2;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[8]);
     s.tmp_2.arg5 = r0;
-    s.tmp_2.arg6 = s.freqStart___17806;
+    s.tmp_2.arg6 = s.freqStart___47302;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[9]);
     s.tmp_2.arg7 = r0;
-    s.tmp_2.arg8 = s.freqEnd___17808;
-    s.callLocIdx = 91; s.pc = 7; return s.tmp_2;
+    s.tmp_2.arg8 = s.freqEnd___47304;
+    s.callLocIdx = 1661; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -48922,12 +48779,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17801.info = {"start":11788,"length":643,"line":367,"column":28,"endLine":378,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["formDuration","beg","end","msOff"]}
+inline__P47297.info = {"start":11788,"length":643,"line":367,"column":28,"endLine":378,"endColumn":13,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"inline","argumentNames":["formDuration","beg","end","msOff"]}
 
-function inline__P17801_mk(s) {
+function inline__P47297_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17801, depth: s.depth + 1,
+        parent: s, fn: inline__P47297, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48937,10 +48794,10 @@ function inline__P17801_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  freqStart___17806: undefined,
-  freqEnd___17808: undefined,
-  envelopeWidth___17810: undefined,
-  slope___17828: undefined,
+  freqStart___47302: undefined,
+  freqEnd___47304: undefined,
+  envelopeWidth___47306: undefined,
+  slope___47324: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -48951,7 +48808,7 @@ function inline__P17801_mk(s) {
 
 
 
-function inline__P17861(s) {
+function inline__P47357(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48961,9 +48818,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.c___17870 = undefined;
-    s.note___17887 = undefined;
-    s.c___17893 = undefined;
+    s.c___47366 = undefined;
+    s.note___47383 = undefined;
+    s.c___47389 = undefined;
     r0 = s.caps[0].fields["melody"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -48989,15 +48846,15 @@ switch (step) {
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_7 = r0;
     r0 = pxsim_String_.charAt(s.tmp_6, s.tmp_7);
-    s.c___17870 = (r0);
-    r0 = (s.c___17870 != " ");
+    s.c___47366 = (r0);
+    r0 = (s.c___47366 != " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 4; continue; }
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 4:
-    r0 = (s.c___17870 != "\r");
+    r0 = (s.c___47366 != "\r");
   case 5:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -49006,7 +48863,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 7; continue; }
   case 6:
-    r0 = (s.c___17870 != "\n");
+    r0 = (s.c___47366 != "\n");
   case 7:
     // jmp value (already in r0)
     s.tmp_2 = r0;
@@ -49015,7 +48872,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 9; continue; }
   case 8:
-    r0 = (s.c___17870 != "\t");
+    r0 = (s.c___47366 != "\t");
   case 9:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -49033,7 +48890,7 @@ switch (step) {
     { step = 3; continue; }
   case 12:
     r0 = pxsim_String_.mkEmpty();
-    s.note___17887 = (r0);
+    s.note___47383 = (r0);
   case 13:
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_1 = r0;
@@ -49047,15 +48904,15 @@ switch (step) {
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_4 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_4);
-    s.c___17893 = (r0);
-    r0 = (s.c___17893 == " ");
+    s.c___47389 = (r0);
+    r0 = (s.c___47389 == " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 14; continue; }
     r0 = s.tmp_0;
     { step = 15; continue; }
   case 14:
-    r0 = (s.c___17893 == "\r");
+    r0 = (s.c___47389 == "\r");
   case 15:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -49064,7 +48921,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 17; continue; }
   case 16:
-    r0 = (s.c___17893 == "\n");
+    r0 = (s.c___47389 == "\n");
   case 17:
     // jmp value (already in r0)
     s.tmp_2 = r0;
@@ -49073,7 +48930,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 19; continue; }
   case 18:
-    r0 = (s.c___17893 == "\t");
+    r0 = (s.c___47389 == "\t");
   case 19:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -49082,26 +48939,26 @@ switch (step) {
     { step = 22; continue; }
   case 20:
   case 21:
-    if ((s.note___17887) && (s.note___17887).vtable) {
+    if ((s.note___47383) && (s.note___47383).vtable) {
     setupResume(s, 24);
-    pxsim_String__stringConv(s.note___17887);
+    pxsim_String__stringConv(s.note___47383);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.note___17887) + ""; }
+    } else { s.retval = (s.note___47383) + ""; }
   case 24:
     r0 = s.retval;
     s.tmp_4 = r0;
-    if ((s.c___17893) && (s.c___17893).vtable) {
+    if ((s.c___47389) && (s.c___47389).vtable) {
     setupResume(s, 25);
-    pxsim_String__stringConv(s.c___17893);
+    pxsim_String__stringConv(s.c___47389);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.c___17893) + ""; }
+    } else { s.retval = (s.c___47389) + ""; }
   case 25:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = pxsim_String__concat(s.tmp_4, s.tmp_5);
-    s.note___17887 = (r0);
+    s.note___47383 = (r0);
     s.tmp_0 = r0 = s.caps[1];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_2 = r0;
@@ -49110,17 +48967,17 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 13; continue; }
   case 22:
-    r0 = s.note___17887;
+    r0 = s.note___47383;
   case 23:
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17861.info = {"start":12466,"length":708,"line":380,"column":33,"endLine":402,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
+inline__P47357.info = {"start":12466,"length":708,"line":380,"column":33,"endLine":402,"endColumn":13,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P17861_mk(s) {
+function inline__P47357_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17861, depth: s.depth + 1,
+        parent: s, fn: inline__P47357, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49130,16 +48987,16 @@ function inline__P17861_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  c___17870: undefined,
-  note___17887: undefined,
-  c___17893: undefined,
+  c___47366: undefined,
+  note___47383: undefined,
+  c___47389: undefined,
 } }
 
 
 
 
 
-function inline__P17922(s) {
+function inline__P47418(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49149,7 +49006,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___17928 = undefined;
+    s.d___47424 = undefined;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -49165,14 +49022,14 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 15; continue; }
-    s.tmp_3 = parseInt__P95_mk(s);
+    s.tmp_3 = parseInt__P29630_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = undefined;
-    s.callLocIdx = 92; s.pc = 17; return s.tmp_3;
+    s.callLocIdx = 1662; s.pc = 17; return s.tmp_3;
   case 17:
     r0 = s.retval;
-    s.d___17928 = (r0);
+    s.d___47424 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(1, s.tmp_0);
@@ -49200,20 +49057,20 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 14; continue; }
   case 3:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[2], s.d___17928);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[2], s.d___47424);
     { step = 14; continue; }
   case 4:
     s.tmp_0 = r0 = s.caps[3];
-    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
     s.tmp_2.arg0 = 1;
-    s.tmp_3 = Math_min__P126_mk(s);
+    s.tmp_3 = Math_min__P29661_mk(s);
     s.tmp_3.arg0 = 16;
-    s.tmp_3.arg1 = s.d___17928;
-    s.callLocIdx = 93; s.pc = 19; return s.tmp_3;
+    s.tmp_3.arg1 = s.d___47424;
+    s.callLocIdx = 1663; s.pc = 19; return s.tmp_3;
   case 19:
     r0 = s.retval;
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 94; s.pc = 18; return s.tmp_2;
+    s.callLocIdx = 1664; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -49222,49 +49079,49 @@ switch (step) {
     { step = 14; continue; }
   case 5:
     s.tmp_0 = r0 = s.caps[5];
-    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
     s.tmp_2.arg0 = 1;
-    s.tmp_2.arg1 = s.d___17928;
-    s.callLocIdx = 95; s.pc = 20; return s.tmp_2;
+    s.tmp_2.arg1 = s.d___47424;
+    s.callLocIdx = 1665; s.pc = 20; return s.tmp_2;
   case 20:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 14; continue; }
   case 6:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[6], s.d___17928);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[6], s.d___47424);
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 6);
     { step = 14; continue; }
   case 7:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[4], s.d___17928);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[4], s.d___47424);
     { step = 14; continue; }
   case 8:
     s.tmp_0 = r0 = s.caps[7];
-    s.tmp_2 = Math_clamp__P122_mk(s);
+    s.tmp_2 = Math_clamp__P29657_mk(s);
     s.tmp_2.arg0 = 1;
     s.tmp_2.arg1 = 15;
-    s.tmp_2.arg2 = s.d___17928;
-    s.callLocIdx = 96; s.pc = 21; return s.tmp_2;
+    s.tmp_2.arg2 = s.d___47424;
+    s.callLocIdx = 1666; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 14; continue; }
   case 9:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[8], s.d___17928);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[8], s.d___47424);
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 9);
     { step = 14; continue; }
   case 10:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[9], s.d___17928);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[9], s.d___47424);
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 10);
     { step = 14; continue; }
   case 11:
     s.tmp_0 = r0 = s.caps[10];
-    s.tmp_2 = Math_clamp__P122_mk(s);
+    s.tmp_2 = Math_clamp__P29657_mk(s);
     s.tmp_2.arg0 = 0;
     s.tmp_2.arg1 = 255;
-    s.tmp_2.arg2 = s.d___17928;
-    s.callLocIdx = 97; s.pc = 22; return s.tmp_2;
+    s.tmp_2.arg2 = s.d___47424;
+    s.callLocIdx = 1667; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -49272,10 +49129,10 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 11);
     { step = 14; continue; }
   case 12:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[11], s.d___17928);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[11], s.d___47424);
     { step = 14; continue; }
   case 13:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[12], s.d___17928);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[12], s.d___47424);
   case 14:
     s.tmp_0 = r0 = s.caps[0];
     r0 = pxsim_String_.mkEmpty();
@@ -49287,25 +49144,25 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P17922.info = {"start":14207,"length":1189,"line":438,"column":33,"endLine":459,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
+inline__P47418.info = {"start":14207,"length":1189,"line":438,"column":33,"endLine":459,"endColumn":13,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P17922_mk(s) {
+function inline__P47418_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P17922, depth: s.depth + 1,
+        parent: s, fn: inline__P47418, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  d___17928: undefined,
+  d___47424: undefined,
 } }
 
 
 
 
 
-function music_MelodyPlayer_queuePlayInstructions__P4076(s) {
+function music_MelodyPlayer_queuePlayInstructions__P34341(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49322,18 +49179,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_MelodyPlayer__C32288_VT)) failedCast(r0);
     r0 = pxsim.music.queuePlayInstructions(s.arg1, s.arg2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_MelodyPlayer_queuePlayInstructions__P4076.info = {"start":10845,"length":125,"line":337,"column":8,"endLine":339,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"queuePlayInstructions","argumentNames":["this","timeDelta","buf"]}
+music_MelodyPlayer_queuePlayInstructions__P34341.info = {"start":10845,"length":125,"line":337,"column":8,"endLine":339,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"queuePlayInstructions","argumentNames":["this","timeDelta","buf"]}
 
-function music_MelodyPlayer_queuePlayInstructions__P4076_mk(s) {
+function music_MelodyPlayer_queuePlayInstructions__P34341_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_MelodyPlayer_queuePlayInstructions__P4076, depth: s.depth + 1,
+        parent: s, fn: music_MelodyPlayer_queuePlayInstructions__P34341, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -49344,7 +49201,7 @@ function music_MelodyPlayer_queuePlayInstructions__P4076_mk(s) {
 
 
 
-function music_addNote__P4075(s) {
+function parseInt__P29630(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49354,91 +49211,863 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.start___47711 = undefined;
+    s.sign___47741 = undefined;
+    s.output___47786 = undefined;
+    s.hasDigit___47787 = undefined;
+    s.i___47788 = undefined;
+    s.code___47795 = undefined;
+    s.val___47802 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
-      s.arg4 = (s.lambdaArgs[4]);
-      s.arg5 = (s.lambdaArgs[5]);
-      s.arg6 = (s.lambdaArgs[6]);
-      s.arg7 = (s.lambdaArgs[7]);
-      s.arg8 = (s.lambdaArgs[8]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg2 > 0);
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.BufferMethods.setNumber(s.arg0, 2, s.arg1, s.arg5);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 + 1);
-    s.tmp_1 = r0;
-    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 2, s.tmp_1, 0);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 + 2);
-    s.tmp_1 = r0;
-    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.arg6);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 + 4);
-    s.tmp_1 = r0;
-    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.arg2);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 + 6);
-    s.tmp_1 = r0;
-    r0 = (s.arg3 * s.arg7);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> 6);
+    r0 = s.tmp_0;
+    { step = 6; continue; }
+  case 1:
+    r0 = (s.arg1 != null);
     s.tmp_2 = r0;
-    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.tmp_2);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 + 8);
-    s.tmp_1 = r0;
-    r0 = (s.arg4 * s.arg7);
+    r0 = pxsim_numops_toBool(s.tmp_2);
+    if (r0) { step = 2; continue; }
+    r0 = s.tmp_2;
+    { step = 5; continue; }
+  case 2:
+    r0 = (s.arg1 < 2);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> 6);
+    r0 = pxsim_numops_toBool(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    r0 = s.tmp_3;
+    { step = 4; continue; }
+  case 3:
+    r0 = (s.arg1 > 36);
+  case 4:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    r0 = s.tmp_4;
+  case 5:
+    // jmp value (already in r0)
+    s.tmp_5 = r0;
+    r0 = s.tmp_5;
+  case 6:
+    // jmp value (already in r0)
+    s.tmp_6 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_6);
+    if (!r0) { step = 7; continue; }
+    r0 = NaN;
+    { step = 46; continue; }
+  case 7:
+  case 8:
+    s.start___47711 = (0);
+  case 9:
+    s.tmp_1 = r0 = s.start___47711;
+    r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
-    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.tmp_2);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 + 10);
+    r0 = (s.tmp_1 < s.tmp_2);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 10; continue; }
+    r0 = s.tmp_0;
+    { step = 11; continue; }
+  case 10:
+    s.tmp_3 = helpers_isWhitespace__P29654_mk(s);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.start___47711);
+    s.tmp_3.arg0 = r0;
+    s.callLocIdx = 0; s.pc = 47; return s.tmp_3;
+  case 47:
+    r0 = s.retval;
+  case 11:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
+    if (!r0) { step = 12; continue; }
+    r0 = (s.start___47711 + 1);
+    s.start___47711 = (r0);
+    { step = 9; continue; }
+  case 12:
+    s.tmp_1 = r0 = s.start___47711;
+    r0 = pxsim_String_.length(s.arg0);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_1 === s.tmp_2);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 13; continue; }
+    r0 = NaN;
+    { step = 46; continue; }
+  case 13:
+  case 14:
+    s.sign___47741 = (1);
+    r0 = pxsim_String_.charAt(s.arg0, s.start___47711);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtcore.switch_eq("-", s.tmp_0);
+    if (r0) { step = 15; continue; }
+    r0 = pxsim_pxtcore.switch_eq("+", s.tmp_0);
+    if (r0) { step = 16; continue; }
+    r0 = s.tmp_0;
+    { step = 17; continue; }
+  case 15:
+    s.sign___47741 = (-1);
+  case 16:
+    r0 = (s.start___47711 + 1);
+    s.start___47711 = (r0);
+  case 17:
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 18; continue; }
+    r0 = s.tmp_0;
+    { step = 19; continue; }
+  case 18:
+    r0 = (s.arg1 == 16);
+  case 19:
+    // jmp value (already in r0)
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_2);
+    if (r0) { step = 20; continue; }
+    r0 = s.tmp_2;
+    { step = 21; continue; }
+  case 20:
+    r0 = pxsim_String_.charAt(s.arg0, s.start___47711);
+    s.tmp_3 = r0;
+    r0 = ("0" === s.tmp_3);
+  case 21:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_4);
+    if (r0) { step = 22; continue; }
+    r0 = s.tmp_4;
+    { step = 25; continue; }
+  case 22:
+    s.tmp_7 = r0 = s.arg0;
+    r0 = (s.start___47711 + 1);
+    s.tmp_8 = r0;
+    r0 = pxsim_String_.charAt(s.tmp_7, s.tmp_8);
+    s.tmp_6 = r0;
+    r0 = ("x" === s.tmp_6);
+    s.tmp_5 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_5);
+    if (!r0) { step = 23; continue; }
+    r0 = s.tmp_5;
+    { step = 24; continue; }
+  case 23:
+    s.tmp_10 = r0 = s.arg0;
+    r0 = (s.start___47711 + 1);
+    s.tmp_11 = r0;
+    r0 = pxsim_String_.charAt(s.tmp_10, s.tmp_11);
+    s.tmp_9 = r0;
+    r0 = ("X" === s.tmp_9);
+  case 24:
+    // jmp value (already in r0)
+    s.tmp_12 = r0;
+    r0 = s.tmp_12;
+  case 25:
+    // jmp value (already in r0)
+    s.tmp_13 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_13);
+    if (!r0) { step = 26; continue; }
+    s.arg1 = (16);
+    r0 = (s.start___47711 + 2);
+    s.start___47711 = (r0);
+    { step = 29; continue; }
+  case 26:
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 27; continue; }
+    s.arg1 = (10);
+  case 27:
+  case 28:
+  case 29:
+    s.output___47786 = (0);
+    s.hasDigit___47787 = (false);
+    s.i___47788 = (s.start___47711);
+  case 30:
+    s.tmp_1 = r0 = s.i___47788;
+    r0 = pxsim_String_.length(s.arg0);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_1 < s.tmp_2);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 45; continue; }
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___47788);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 | 32);
+    s.code___47795 = (r0);
+    s.val___47802 = (undefined);
+    r0 = (s.code___47795 >= 48);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 31; continue; }
+    r0 = s.tmp_0;
+    { step = 32; continue; }
+  case 31:
+    r0 = (s.code___47795 < 58);
+  case 32:
+    // jmp value (already in r0)
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    if (!r0) { step = 33; continue; }
+    r0 = (s.code___47795 - 48);
+    s.val___47802 = (r0);
+    { step = 38; continue; }
+  case 33:
+    r0 = (s.code___47795 >= 97);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 34; continue; }
+    r0 = s.tmp_0;
+    { step = 35; continue; }
+  case 34:
+    r0 = (s.code___47795 < 123);
+  case 35:
+    // jmp value (already in r0)
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    if (!r0) { step = 36; continue; }
+    r0 = (10 + s.code___47795);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 - 97);
+    s.val___47802 = (r0);
+  case 36:
+  case 37:
+  case 38:
+    r0 = (s.val___47802 == undefined);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 39; continue; }
+    r0 = s.tmp_0;
+    { step = 40; continue; }
+  case 39:
+    r0 = (s.val___47802 >= s.arg1);
+  case 40:
+    // jmp value (already in r0)
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    if (!r0) { step = 43; continue; }
+    r0 = pxsim_numops_toBoolDecr(s.hasDigit___47787);
+    s.tmp_3 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_3);
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 41; continue; }
+    r0 = NaN;
+    { step = 46; continue; }
+  case 41:
+  case 42:
+    { step = 45; continue; }
+  case 43:
+  case 44:
+    s.hasDigit___47787 = (true);
+    r0 = (s.output___47786 * s.arg1);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + s.val___47802);
+    s.output___47786 = (r0);
+    r0 = (s.i___47788 + 1);
+    s.i___47788 = (r0);
+    { step = 30; continue; }
+  case 45:
+    r0 = (s.sign___47741 * s.output___47786);
+  case 46:
+    return leave(s, r0)
+  default: oops()
+} } }
+parseInt__P29630.info = {"start":1064,"length":1690,"line":44,"column":0,"endLine":103,"endColumn":1,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"parseInt","argumentNames":["text","radix"]}
+
+function parseInt__P29630_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: parseInt__P29630, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  tmp_8: undefined,
+  tmp_9: undefined,
+  tmp_10: undefined,
+  tmp_11: undefined,
+  tmp_12: undefined,
+  tmp_13: undefined,
+  start___47711: undefined,
+  sign___47741: undefined,
+  output___47786: undefined,
+  hasDigit___47787: undefined,
+  i___47788: undefined,
+  code___47795: undefined,
+  val___47802: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function helpers_isWhitespace__P29654(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_0 = r0 = s.arg0;
+    r0 = pxsim_pxtcore.switch_eq(9, s.tmp_0);
+    if (r0) { step = 1; continue; }
+    r0 = pxsim_pxtcore.switch_eq(11, s.tmp_0);
+    if (r0) { step = 2; continue; }
+    r0 = pxsim_pxtcore.switch_eq(12, s.tmp_0);
+    if (r0) { step = 3; continue; }
+    r0 = pxsim_pxtcore.switch_eq(32, s.tmp_0);
+    if (r0) { step = 4; continue; }
+    r0 = pxsim_pxtcore.switch_eq(160, s.tmp_0);
+    if (r0) { step = 5; continue; }
+    r0 = pxsim_pxtcore.switch_eq(65279, s.tmp_0);
+    if (r0) { step = 6; continue; }
+    r0 = pxsim_pxtcore.switch_eq(10, s.tmp_0);
+    if (r0) { step = 7; continue; }
+    r0 = pxsim_pxtcore.switch_eq(13, s.tmp_0);
+    if (r0) { step = 8; continue; }
+    r0 = pxsim_pxtcore.switch_eq(8232, s.tmp_0);
+    if (r0) { step = 9; continue; }
+    r0 = pxsim_pxtcore.switch_eq(8233, s.tmp_0);
+    if (r0) { step = 10; continue; }
+    r0 = s.tmp_0;
+    { step = 11; continue; }
+  case 1:
+  case 2:
+  case 3:
+  case 4:
+  case 5:
+  case 6:
+  case 7:
+  case 8:
+  case 9:
+  case 10:
+    r0 = true;
+    { step = 12; continue; }
+  case 11:
+    r0 = false;
+    { step = 12; continue; }
+    r0 = undefined;
+  case 12:
+    return leave(s, r0)
+  default: oops()
+} } }
+helpers_isWhitespace__P29654.info = {"start":13875,"length":674,"line":476,"column":4,"endLine":493,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isWhitespace","argumentNames":["c"]}
+
+function helpers_isWhitespace__P29654_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: helpers_isWhitespace__P29654, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function music_MelodyPlayer_constructor__P32291(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, music_MelodyPlayer__C32288_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["melody"] = (s.arg1);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+music_MelodyPlayer_constructor__P32291.info = {"start":10714,"length":62,"line":329,"column":8,"endLine":331,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"inline","argumentNames":["this","m"]}
+
+function music_MelodyPlayer_constructor__P32291_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_MelodyPlayer_constructor__P32291, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function music_Melody_stop__P32283(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, music_Melody__C32278_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_player"];
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_1 = music_MelodyPlayer_stop__P32292_mk(s);
+    r0 = s.arg0.fields["_player"];
+    s.tmp_1.arg0 = r0;
+    s.callLocIdx = 1650; s.pc = 3; return s.tmp_1;
+  case 3:
+    r0 = s.retval;
+    r0 = (s.arg0).fields["_player"] = (null);
+  case 1:
+  case 2:
+    s.tmp_0 = music_Melody_unregisterMelody__P34337_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1651; s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+music_Melody_stop__P32283.info = {"start":6706,"length":173,"line":215,"column":8,"endLine":221,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"stop","argumentNames":["this"]}
+
+function music_Melody_stop__P32283_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_Melody_stop__P32283, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function music_MelodyPlayer_stop__P32292(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, music_MelodyPlayer__C32288_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["melody"] = (null);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+music_MelodyPlayer_stop__P32292.info = {"start":10786,"length":49,"line":333,"column":8,"endLine":335,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"stop","argumentNames":["this"]}
+
+function music_MelodyPlayer_stop__P32292_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_MelodyPlayer_stop__P32292, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function game_waitAnyButton__P31953(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    r0 = pxsim_numops_toBoolDecr(globals.__waitAnyButton___33845);
+    if (!r0) { step = 1; continue; }
+    s.tmp_0 = lambda_1_mk(s);
+    s.tmp_0.argL = globals.__waitAnyButton___33845;
+    setupLambda(s.tmp_0, s.tmp_0.argL);
+    s.callLocIdx = 1108; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+    { step = 2; continue; }
+  case 1:
+    s.tmp_0 = pause__P29937_mk(s);
+    s.tmp_0.arg0 = 3000;
+    s.callLocIdx = 1109; s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+  case 2:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+game_waitAnyButton__P31953.info = {"start":967,"length":111,"line":35,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"waitAnyButton","argumentNames":[]}
+
+function game_waitAnyButton__P31953_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: game_waitAnyButton__P31953, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function game_GameOverDialog_update__P31938(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, game_GameOverDialog__C31935_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_clearInterior__P33816_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1075; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+    s.tmp_0 = game_GameOverDialog__C31935_v2_1_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C31935_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.drawTextCore;
+    s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+    r0 = s.arg0.fields["cursorOn"];
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_1 = game_BaseDialog_drawCursorRow__P31912_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.callLocIdx = 1076; s.pc = 5; return s.tmp_1;
+  case 5:
+    r0 = s.retval;
+  case 1:
+  case 2:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+game_GameOverDialog_update__P31938.info = {"start":11365,"length":173,"line":349,"column":8,"endLine":356,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"update","argumentNames":["this"]}
+
+function game_GameOverDialog_update__P31938_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: game_GameOverDialog_update__P31938, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function game_GameOverDialog_drawTextCore__P31939(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.scoreColor___47128 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, game_GameOverDialog__C31935_VT)) failedCast(r0);
+    r0 = s.arg0.fields["win"];
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = "YOU WIN!";
+    { step = 2; continue; }
+  case 1:
+    r0 = "GAME OVER!";
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_1 = r0;
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 3; continue; }
+    r0 = 1;
+    { step = 4; continue; }
+  case 3:
+    r0 = 5;
+  case 4:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    s.tmp_4 = helpers_imagePrintCenter__P31177_mk(s);
+    r0 = s.arg0.fields["image"];
+    s.tmp_4.arg0 = r0;
+    s.tmp_4.arg1 = s.tmp_1;
+    s.tmp_4.arg2 = 8;
+    s.tmp_4.arg3 = s.tmp_3;
+    s.tmp_4.arg4 = globals.font8___31163;
+    s.callLocIdx = 1077; s.pc = 11; return s.tmp_4;
+  case 11:
+    r0 = s.retval;
+    r0 = s.arg0.fields["score"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 !== undefined);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 9; continue; }
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 5; continue; }
+    r0 = 1;
+    { step = 6; continue; }
+  case 5:
+    r0 = 2;
+  case 6:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    s.scoreColor___47128 = (s.tmp_3);
+    s.tmp_0 = helpers_imagePrintCenter__P31177_mk(s);
+    r0 = s.arg0.fields["image"];
+    s.tmp_0.arg0 = r0;
+    r0 = s.arg0.fields["score"];
+    s.tmp_2 = r0;
+    if ((s.tmp_2) && (s.tmp_2).vtable) {
+    setupResume(s, 13);
+    pxsim_String__stringConv(s.tmp_2);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (s.tmp_2) + ""; }
+  case 13:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = pxsim_String__concat("Score:", s.tmp_1);
+    s.tmp_0.arg1 = r0;
+    s.tmp_0.arg2 = 23;
+    s.tmp_0.arg3 = s.scoreColor___47128;
+    s.tmp_0.arg4 = globals.font8___31163;
+    s.callLocIdx = 1078; s.pc = 12; return s.tmp_0;
+  case 12:
+    r0 = s.retval;
+    r0 = s.arg0.fields["isNewHighScore"];
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 7; continue; }
+    s.tmp_1 = helpers_imagePrintCenter__P31177_mk(s);
+    r0 = s.arg0.fields["image"];
+    s.tmp_1.arg0 = r0;
+    s.tmp_1.arg1 = "New High Score!";
+    s.tmp_1.arg2 = 34;
+    s.tmp_1.arg3 = s.scoreColor___47128;
+    s.tmp_1.arg4 = globals.font5___31168;
+    s.callLocIdx = 1079; s.pc = 14; return s.tmp_1;
+  case 14:
+    r0 = s.retval;
+    { step = 8; continue; }
+  case 7:
+    s.tmp_0 = helpers_imagePrintCenter__P31177_mk(s);
+    r0 = s.arg0.fields["image"];
+    s.tmp_0.arg0 = r0;
+    r0 = s.arg0.fields["highScore"];
+    s.tmp_2 = r0;
+    if ((s.tmp_2) && (s.tmp_2).vtable) {
+    setupResume(s, 16);
+    pxsim_String__stringConv(s.tmp_2);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (s.tmp_2) + ""; }
+  case 16:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = pxsim_String__concat("HI", s.tmp_1);
+    s.tmp_0.arg1 = r0;
+    s.tmp_0.arg2 = 34;
+    s.tmp_0.arg3 = s.scoreColor___47128;
+    s.tmp_0.arg4 = globals.font8___31163;
+    s.callLocIdx = 1080; s.pc = 15; return s.tmp_0;
+  case 15:
+    r0 = s.retval;
+  case 8:
+  case 9:
+  case 10:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+game_GameOverDialog_drawTextCore__P31939.info = {"start":11548,"length":1200,"line":358,"column":8,"endLine":395,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
+
+function game_GameOverDialog_drawTextCore__P31939_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: game_GameOverDialog_drawTextCore__P31939, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  scoreColor___47128: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function helpers_imagePrintCenter__P31177(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.w___47176 = undefined;
+    s.x___47182 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
+      s.arg4 = (s.lambdaArgs[4]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim_numops_toBoolDecr(s.arg4);
     s.tmp_1 = r0;
-    r0 = pxsim.BufferMethods.setNumber(s.tmp_0, 4, s.tmp_1, s.arg8);
-    r0 = (s.arg1 + 12);
-    s.arg1 = (r0);
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_2 = image_getFontForText__P31165_mk(s);
+    s.tmp_2.arg0 = s.arg1;
+    s.callLocIdx = 88; s.pc = 3; return s.tmp_2;
+  case 3:
+    r0 = s.retval;
+    s.arg4 = (r0);
   case 1:
   case 2:
-    r0 = pxsim.BufferMethods.setNumber(s.arg0, 2, s.arg1, 0);
-    r0 = s.arg1;
+    r0 = pxsim_String_.length(s.arg1);
+    s.tmp_0 = r0;
+    s.tmp_2 = if_charWidth_1_mk(s);
+    s.tmp_2.arg0 = s.arg4;
+    if (!s.tmp_2.arg0.vtable.iface) {
+      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
+    } else {
+      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
+      if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
+      else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
+     else { s.callLocIdx = 89; s.pc = 4; return s.tmp_2; }
+    }
+  case 4:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 * s.tmp_1);
+    s.w___47176 = (r0);
+    r0 = pxsim_ImageMethods.width(s.arg0);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 - s.w___47176);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 / 2);
+    s.x___47182 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = s.arg1;
+    s.tmp_0.arg2 = s.x___47182;
+    s.tmp_0.arg3 = s.arg2;
+    s.tmp_0.arg4 = s.arg3;
+    s.tmp_0.arg5 = s.arg4;
+    s.tmp_0.arg6 = undefined;
+    s.callLocIdx = 90; s.pc = 5; return s.tmp_0;
+  case 5:
+    r0 = s.retval;
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_addNote__P4075.info = {"start":9705,"length":904,"line":308,"column":4,"endLine":321,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"addNote","argumentNames":["sndInstr","sndInstrPtr","ms","beg","end","soundWave","hz","volume","endHz"]}
+helpers_imagePrintCenter__P31177.info = {"start":15025,"length":295,"line":206,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/screen---st7735/text.ts","functionName":"imagePrintCenter","argumentNames":["img","text","y","color","font"]}
 
-function music_addNote__P4075_mk(s) {
+function helpers_imagePrintCenter__P31177_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_addNote__P4075, depth: s.depth + 1,
+        parent: s, fn: helpers_imagePrintCenter__P31177, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tmp_3: undefined,
+  w___47176: undefined,
+  x___47182: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
   arg3: undefined,
   arg4: undefined,
-  arg5: undefined,
-  arg6: undefined,
-  arg7: undefined,
-  arg8: undefined,
 } }
 
 
 
 
 
-function music_volume__P1593(s) {
+function game_GameOverDialog_displayCursor__P31937(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49448,29 +50077,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = music_initVolume__P4067_mk(s);
-    s.callLocIdx = 71; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = globals.globalVolume___4063;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, game_GameOverDialog__C31935_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["cursorOn"] = (true);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_volume__P1593.info = {"start":1781,"length":90,"line":61,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"volume","argumentNames":[]}
+game_GameOverDialog_displayCursor__P31937.info = {"start":11294,"length":61,"line":345,"column":8,"endLine":347,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"displayCursor","argumentNames":["this"]}
 
-function music_volume__P1593_mk(s) {
+function game_GameOverDialog_displayCursor__P31937_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_volume__P1593, depth: s.depth + 1,
+        parent: s, fn: game_GameOverDialog_displayCursor__P31937, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
+  arg0: undefined,
 } }
 
 
 
 
 
-function music_initVolume__P4067(s) {
+function game_GameOverDialog_constructor__P31936(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49480,38 +50112,68 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals.globalVolume___4063 === null);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    globals.globalVolume___4063 = (0);
-    s.tmp_0 = music_setVolume__P1592_mk(s);
-    r0 = pxsim_pxtcore.getConfig(59, 128);
-    s.tmp_0.arg0 = r0;
-    s.callLocIdx = 68; s.pc = 3; return s.tmp_0;
-  case 3:
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, game_GameOverDialog__C31935_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["win"] = (s.arg1);
+    r0 = (s.arg0).fields["score"] = (s.arg2);
+    r0 = (s.arg0).fields["highScore"] = (s.arg3);
+    s.tmp_0 = game_BaseDialog_constructor__P31908_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
+    s.tmp_0.arg1 = r0;
+    s.tmp_0.arg2 = 46;
+    s.tmp_1 = game_defaultSplashFrame__P33828_mk(s);
+    s.callLocIdx = 1073; s.pc = 2; return s.tmp_1;
+  case 2:
     r0 = s.retval;
+    s.tmp_0.arg3 = r0;
+    s.tmp_0.arg4 = undefined;
+    s.tmp_0.arg5 = undefined;
+    s.callLocIdx = 1074; s.pc = 1; return s.tmp_0;
   case 1:
-  case 2:
+    r0 = s.retval;
+    r0 = (s.arg0).fields["cursorOn"] = (false);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = s.arg0.fields["score"];
+    s.tmp_2 = r0;
+    r0 = s.arg0.fields["highScore"];
+    s.tmp_3 = r0;
+    r0 = (s.tmp_2 > s.tmp_3);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["isNewHighScore"] = (s.tmp_1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_initVolume__P4067.info = {"start":1014,"length":180,"line":33,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"initVolume","argumentNames":[]}
+game_GameOverDialog_constructor__P31936.info = {"start":10978,"length":306,"line":335,"column":8,"endLine":343,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"inline","argumentNames":["this","win","score","highScore"]}
 
-function music_initVolume__P4067_mk(s) {
+function game_GameOverDialog_constructor__P31936_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_initVolume__P4067, depth: s.depth + 1,
+        parent: s, fn: game_GameOverDialog_constructor__P31936, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
 } }
 
 
 
 
 
-function music_setVolume__P1592(s) {
+function game_defaultSplashFrame__P33828(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49521,52 +50183,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = Math_clamp__P122_mk(s);
-    s.tmp_0.arg0 = 0;
-    s.tmp_0.arg1 = 255;
-    r0 = (s.arg0 | 0);
-    s.tmp_0.arg2 = r0;
-    s.callLocIdx = 69; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    globals.globalVolume___4063 = (r0);
-    r0 = (globals.globalVolume___4063 > 0);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = 1;
+    r0 = pxsim.image.ofBuffer(_hex47216);
     { step = 2; continue; }
   case 1:
-    r0 = 0;
+    r0 = pxsim.image.ofBuffer(_hex47218);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = undefined;
-    r0 = undefined;
+    r0 = s.tmp_1;
     return leave(s, r0)
   default: oops()
 } } }
-music_setVolume__P1592.info = {"start":1533,"length":153,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"setVolume","argumentNames":["volume"]}
+game_defaultSplashFrame__P33828.info = {"start":16870,"length":220,"line":528,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"defaultSplashFrame","argumentNames":[]}
 
-function music_setVolume__P1592_mk(s) {
+function game_defaultSplashFrame__P33828_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_setVolume__P1592, depth: s.depth + 1,
+        parent: s, fn: game_defaultSplashFrame__P33828, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  arg0: undefined,
 } }
 
+const _hex47216 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100000101000001010000")
+const _hex47218 = pxsim.BufferMethods.createBufferFromHex("8704030003000000f1010000f1010000f1010000")
 
 
 
 
-function music_enableAmp__P4066(s) {
+function scene_Scene_destroy__P31864(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49580,16 +50229,35 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, scene_Scene__C31838_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["eventContext"] = (undefined);
+    r0 = (s.arg0).fields["background"] = (undefined);
+    r0 = (s.arg0).fields["tileMap"] = (undefined);
+    r0 = (s.arg0).fields["allSprites"] = (undefined);
+    r0 = (s.arg0).fields["spriteNextId"] = (undefined);
+    r0 = (s.arg0).fields["spritesByKind"] = (undefined);
+    r0 = (s.arg0).fields["physicsEngine"] = (undefined);
+    r0 = (s.arg0).fields["camera"] = (undefined);
+    r0 = (s.arg0).fields["flags"] = (undefined);
+    r0 = (s.arg0).fields["destroyedHandlers"] = (undefined);
+    r0 = (s.arg0).fields["createdHandlers"] = (undefined);
+    r0 = (s.arg0).fields["overlapHandlers"] = (undefined);
+    r0 = (s.arg0).fields["tileOverlapHandlers"] = (undefined);
+    r0 = (s.arg0).fields["collisionHandlers"] = (undefined);
+    r0 = (s.arg0).fields["wallCollisionHandlers"] = (undefined);
+    r0 = (s.arg0).fields["gameForeverHandlers"] = (undefined);
+    r0 = (s.arg0).fields["_data"] = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_enableAmp__P4066.info = {"start":944,"length":64,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"enableAmp","argumentNames":["en"]}
+scene_Scene_destroy__P31864.info = {"start":6997,"length":764,"line":198,"column":8,"endLine":216,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"destroy","argumentNames":["this"]}
 
-function music_enableAmp__P4066_mk(s) {
+function scene_Scene_destroy__P31864_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_enableAmp__P4066, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_destroy__P31864, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -49598,7 +50266,7 @@ function music_enableAmp__P4066_mk(s) {
 
 
 
-function parseInt__P95(s) {
+function info_highScore__P31624(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49608,313 +50276,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.start___18215 = undefined;
-    s.sign___18245 = undefined;
-    s.output___18290 = undefined;
-    s.hasDigit___18291 = undefined;
-    s.i___18292 = undefined;
-    s.code___18299 = undefined;
-    s.val___18306 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_1 = settings_readNumber__P31252_mk(s);
+    s.tmp_1.arg0 = "high-score";
+    s.callLocIdx = 761; s.pc = 3; return s.tmp_1;
+  case 3:
+    r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
-    { step = 6; continue; }
+    { step = 2; continue; }
   case 1:
-    r0 = (s.arg1 != null);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_2);
-    if (r0) { step = 2; continue; }
-    r0 = s.tmp_2;
-    { step = 5; continue; }
+    r0 = 0;
   case 2:
-    r0 = (s.arg1 < 2);
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    r0 = s.tmp_3;
-    { step = 4; continue; }
-  case 3:
-    r0 = (s.arg1 > 36);
-  case 4:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    r0 = s.tmp_4;
-  case 5:
-    // jmp value (already in r0)
-    s.tmp_5 = r0;
-    r0 = s.tmp_5;
-  case 6:
-    // jmp value (already in r0)
-    s.tmp_6 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_6);
-    if (!r0) { step = 7; continue; }
-    r0 = NaN;
-    { step = 46; continue; }
-  case 7:
-  case 8:
-    s.start___18215 = (0);
-  case 9:
-    s.tmp_1 = r0 = s.start___18215;
-    r0 = pxsim_String_.length(s.arg0);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 < s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 10; continue; }
-    r0 = s.tmp_0;
-    { step = 11; continue; }
-  case 10:
-    s.tmp_3 = helpers_isWhitespace__P119_mk(s);
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.start___18215);
-    s.tmp_3.arg0 = r0;
-    s.callLocIdx = 0; s.pc = 47; return s.tmp_3;
-  case 47:
-    r0 = s.retval;
-  case 11:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
-    if (!r0) { step = 12; continue; }
-    r0 = (s.start___18215 + 1);
-    s.start___18215 = (r0);
-    { step = 9; continue; }
-  case 12:
-    s.tmp_1 = r0 = s.start___18215;
-    r0 = pxsim_String_.length(s.arg0);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 === s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 13; continue; }
-    r0 = NaN;
-    { step = 46; continue; }
-  case 13:
-  case 14:
-    s.sign___18245 = (1);
-    r0 = pxsim_String_.charAt(s.arg0, s.start___18215);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtcore.switch_eq("-", s.tmp_0);
-    if (r0) { step = 15; continue; }
-    r0 = pxsim_pxtcore.switch_eq("+", s.tmp_0);
-    if (r0) { step = 16; continue; }
-    r0 = s.tmp_0;
-    { step = 17; continue; }
-  case 15:
-    s.sign___18245 = (-1);
-  case 16:
-    r0 = (s.start___18215 + 1);
-    s.start___18215 = (r0);
-  case 17:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 18; continue; }
-    r0 = s.tmp_0;
-    { step = 19; continue; }
-  case 18:
-    r0 = (s.arg1 == 16);
-  case 19:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_2);
-    if (r0) { step = 20; continue; }
     r0 = s.tmp_2;
-    { step = 21; continue; }
-  case 20:
-    r0 = pxsim_String_.charAt(s.arg0, s.start___18215);
-    s.tmp_3 = r0;
-    r0 = ("0" === s.tmp_3);
-  case 21:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_4);
-    if (r0) { step = 22; continue; }
-    r0 = s.tmp_4;
-    { step = 25; continue; }
-  case 22:
-    s.tmp_7 = r0 = s.arg0;
-    r0 = (s.start___18215 + 1);
-    s.tmp_8 = r0;
-    r0 = pxsim_String_.charAt(s.tmp_7, s.tmp_8);
-    s.tmp_6 = r0;
-    r0 = ("x" === s.tmp_6);
-    s.tmp_5 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_5);
-    if (!r0) { step = 23; continue; }
-    r0 = s.tmp_5;
-    { step = 24; continue; }
-  case 23:
-    s.tmp_10 = r0 = s.arg0;
-    r0 = (s.start___18215 + 1);
-    s.tmp_11 = r0;
-    r0 = pxsim_String_.charAt(s.tmp_10, s.tmp_11);
-    s.tmp_9 = r0;
-    r0 = ("X" === s.tmp_9);
-  case 24:
-    // jmp value (already in r0)
-    s.tmp_12 = r0;
-    r0 = s.tmp_12;
-  case 25:
-    // jmp value (already in r0)
-    s.tmp_13 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_13);
-    if (!r0) { step = 26; continue; }
-    s.arg1 = (16);
-    r0 = (s.start___18215 + 2);
-    s.start___18215 = (r0);
-    { step = 29; continue; }
-  case 26:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 27; continue; }
-    s.arg1 = (10);
-  case 27:
-  case 28:
-  case 29:
-    s.output___18290 = (0);
-    s.hasDigit___18291 = (false);
-    s.i___18292 = (s.start___18215);
-  case 30:
-    s.tmp_1 = r0 = s.i___18292;
-    r0 = pxsim_String_.length(s.arg0);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 < s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 45; continue; }
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___18292);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 | 32);
-    s.code___18299 = (r0);
-    s.val___18306 = (undefined);
-    r0 = (s.code___18299 >= 48);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 31; continue; }
-    r0 = s.tmp_0;
-    { step = 32; continue; }
-  case 31:
-    r0 = (s.code___18299 < 58);
-  case 32:
-    // jmp value (already in r0)
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    if (!r0) { step = 33; continue; }
-    r0 = (s.code___18299 - 48);
-    s.val___18306 = (r0);
-    { step = 38; continue; }
-  case 33:
-    r0 = (s.code___18299 >= 97);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 34; continue; }
-    r0 = s.tmp_0;
-    { step = 35; continue; }
-  case 34:
-    r0 = (s.code___18299 < 123);
-  case 35:
-    // jmp value (already in r0)
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    if (!r0) { step = 36; continue; }
-    r0 = (10 + s.code___18299);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 - 97);
-    s.val___18306 = (r0);
-  case 36:
-  case 37:
-  case 38:
-    r0 = (s.val___18306 == undefined);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 39; continue; }
-    r0 = s.tmp_0;
-    { step = 40; continue; }
-  case 39:
-    r0 = (s.val___18306 >= s.arg1);
-  case 40:
-    // jmp value (already in r0)
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    if (!r0) { step = 43; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.hasDigit___18291);
-    s.tmp_3 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_3);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    if (!r0) { step = 41; continue; }
-    r0 = NaN;
-    { step = 46; continue; }
-  case 41:
-  case 42:
-    { step = 45; continue; }
-  case 43:
-  case 44:
-    s.hasDigit___18291 = (true);
-    r0 = (s.output___18290 * s.arg1);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.val___18306);
-    s.output___18290 = (r0);
-    r0 = (s.i___18292 + 1);
-    s.i___18292 = (r0);
-    { step = 30; continue; }
-  case 45:
-    r0 = (s.sign___18245 * s.output___18290);
-  case 46:
     return leave(s, r0)
   default: oops()
 } } }
-parseInt__P95.info = {"start":1064,"length":1690,"line":44,"column":0,"endLine":103,"endColumn":1,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"parseInt","argumentNames":["text","radix"]}
+info_highScore__P31624.info = {"start":7086,"length":98,"line":240,"column":4,"endLine":242,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"highScore","argumentNames":[]}
 
-function parseInt__P95_mk(s) {
+function info_highScore__P31624_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: parseInt__P95, depth: s.depth + 1,
+        parent: s, fn: info_highScore__P31624, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
-  tmp_8: undefined,
-  tmp_9: undefined,
-  tmp_10: undefined,
-  tmp_11: undefined,
-  tmp_12: undefined,
-  tmp_13: undefined,
-  start___18215: undefined,
-  sign___18245: undefined,
-  output___18290: undefined,
-  hasDigit___18291: undefined,
-  i___18292: undefined,
-  code___18299: undefined,
-  val___18306: undefined,
-  arg0: undefined,
-  arg1: undefined,
 } }
 
 
 
 
 
-function helpers_isWhitespace__P119(s) {
+function info_saveHighScore__P31621(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49924,106 +50321,84 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_pxtcore.switch_eq(9, s.tmp_0);
-    if (r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore.switch_eq(11, s.tmp_0);
-    if (r0) { step = 2; continue; }
-    r0 = pxsim_pxtcore.switch_eq(12, s.tmp_0);
-    if (r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore.switch_eq(32, s.tmp_0);
-    if (r0) { step = 4; continue; }
-    r0 = pxsim_pxtcore.switch_eq(160, s.tmp_0);
-    if (r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore.switch_eq(65279, s.tmp_0);
-    if (r0) { step = 6; continue; }
-    r0 = pxsim_pxtcore.switch_eq(10, s.tmp_0);
-    if (r0) { step = 7; continue; }
-    r0 = pxsim_pxtcore.switch_eq(13, s.tmp_0);
-    if (r0) { step = 8; continue; }
-    r0 = pxsim_pxtcore.switch_eq(8232, s.tmp_0);
-    if (r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore.switch_eq(8233, s.tmp_0);
-    if (r0) { step = 10; continue; }
+    s.hs___48050 = undefined;
+    s.curr___48067 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.players___33724);
+    if (!r0) { step = 5; continue; }
+    r0 = pxsim_pxtrt.mklocRef();
+    s.hs___48050 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.hs___48050, 0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P48060);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hs___48050);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_2.arg0 = globals.players___33724;
+    s.tmp_2.arg1 = inline__P48054;
+    s.callLocIdx = 755; s.pc = 8; return s.tmp_2;
+  case 8:
+    r0 = s.retval;
+    s.tmp_1.arg0 = r0;
+    s.tmp_1.arg1 = s.tmp_0;
+    s.callLocIdx = 758; s.pc = 7; return s.tmp_1;
+  case 7:
+    r0 = s.retval;
+    s.tmp_0 = settings_readNumber__P31252_mk(s);
+    s.tmp_0.arg0 = "high-score";
+    s.callLocIdx = 759; s.pc = 9; return s.tmp_0;
+  case 9:
+    r0 = s.retval;
+    s.curr___48067 = (r0);
+    r0 = (s.curr___48067 == null);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
-    { step = 11; continue; }
+    { step = 2; continue; }
   case 1:
+    r0 = pxsim_pxtrt_ldlocRef(s.hs___48050);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 > s.curr___48067);
   case 2:
+    // jmp value (already in r0)
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 3; continue; }
+    s.tmp_3 = settings_writeNumber__P31248_mk(s);
+    s.tmp_3.arg0 = "high-score";
+    r0 = pxsim_pxtrt_ldlocRef(s.hs___48050);
+    s.tmp_3.arg1 = r0;
+    s.callLocIdx = 760; s.pc = 10; return s.tmp_3;
+  case 10:
+    r0 = s.retval;
   case 3:
   case 4:
   case 5:
   case 6:
-  case 7:
-  case 8:
-  case 9:
-  case 10:
-    r0 = true;
-    { step = 12; continue; }
-  case 11:
-    r0 = false;
-    { step = 12; continue; }
     r0 = undefined;
-  case 12:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_isWhitespace__P119.info = {"start":13875,"length":674,"line":476,"column":4,"endLine":493,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isWhitespace","argumentNames":["c"]}
+info_saveHighScore__P31621.info = {"start":6187,"length":383,"line":204,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"saveHighScore","argumentNames":[]}
 
-function helpers_isWhitespace__P119_mk(s) {
+function info_saveHighScore__P31621_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_isWhitespace__P119, depth: s.depth + 1,
+        parent: s, fn: info_saveHighScore__P31621, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function music_MelodyPlayer_constructor__P1611(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["melody"] = (s.arg1);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_MelodyPlayer_constructor__P1611.info = {"start":10714,"length":62,"line":329,"column":8,"endLine":331,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["this","m"]}
-
-function music_MelodyPlayer_constructor__P1611_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_MelodyPlayer_constructor__P1611, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-  arg1: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  hs___48050: undefined,
+  curr___48067: undefined,
 } }
 
 
 
 
 
-function music_Melody_stop__P1603(s) {
+function inline__P48054(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50037,39 +50412,34 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_player"];
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    s.tmp_1 = music_MelodyPlayer_stop__P1612_mk(s);
-    r0 = s.arg0.fields["_player"];
-    s.tmp_1.arg0 = r0;
-    s.callLocIdx = 80; s.pc = 3; return s.tmp_1;
+    s.tmp_0 = r0 = s.arg0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 1; continue; }
+    r0 = s.tmp_0;
+    { step = 2; continue; }
+  case 1:
+    s.tmp_1 = info_PlayerInfo_hasScore__P31663_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.callLocIdx = 754; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    r0 = (s.arg0).fields["_player"] = (null);
-  case 1:
   case 2:
-    s.tmp_0 = music_Melody_unregisterMelody__P4072_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 81; s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-    r0 = undefined;
+    // jmp value (already in r0)
+    s.tmp_2 = r0;
+    r0 = s.tmp_2;
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_stop__P1603.info = {"start":6706,"length":173,"line":215,"column":8,"endLine":221,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"stop","argumentNames":["this"]}
+inline__P48054.info = {"start":6312,"length":22,"line":208,"column":24,"endLine":208,"endColumn":46,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function music_Melody_stop__P1603_mk(s) {
+function inline__P48054_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_stop__P1603, depth: s.depth + 1,
+        parent: s, fn: inline__P48054, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
+  tmp_2: undefined,
   arg0: undefined,
 } }
 
@@ -50077,7 +50447,7 @@ function music_Melody_stop__P1603_mk(s) {
 
 
 
-function music_MelodyPlayer_stop__P1612(s) {
+function inline__P48060(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50091,20 +50461,36 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["melody"] = (null);
-    r0 = undefined;
+    s.tmp_0 = r0 = s.caps[0];
+    s.tmp_2 = Math_max__P29660_mk(s);
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
+    s.tmp_2.arg0 = r0;
+    s.tmp_3 = info_PlayerInfo_score__P31660_mk(s);
+    s.tmp_3.arg0 = s.arg0;
+    s.callLocIdx = 756; s.pc = 2; return s.tmp_3;
+  case 2:
+    r0 = s.retval;
+    s.tmp_2.arg1 = r0;
+    s.callLocIdx = 757; s.pc = 1; return s.tmp_2;
+  case 1:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
+    r0 = s.tmp_1;
     return leave(s, r0)
   default: oops()
 } } }
-music_MelodyPlayer_stop__P1612.info = {"start":10786,"length":49,"line":333,"column":8,"endLine":335,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"stop","argumentNames":["this"]}
+inline__P48060.info = {"start":6361,"length":33,"line":209,"column":25,"endLine":209,"endColumn":58,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function music_MelodyPlayer_stop__P1612_mk(s) {
+function inline__P48060_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_MelodyPlayer_stop__P1612, depth: s.depth + 1,
+        parent: s, fn: inline__P48060, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
   arg0: undefined,
 } }
 
@@ -50112,7 +50498,7 @@ function music_MelodyPlayer_stop__P1612_mk(s) {
 
 
 
-function sprites_readDataNumber__P3621(s) {
+function sprites_readDataNumber__P33155(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50122,7 +50508,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___18595 = undefined;
+    s.d___48091 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -50149,30 +50535,30 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P2041_mk(s);
+    s.tmp_4 = Sprite_data__P31460_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1774; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1779; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    s.d___18595 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.d___18595, s.arg1);
+    s.d___48091 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.d___48091, s.arg1);
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-sprites_readDataNumber__P3621.info = {"start":1075,"length":181,"line":34,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataNumber","argumentNames":["sprite","name"]}
+sprites_readDataNumber__P33155.info = {"start":1075,"length":181,"line":34,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataNumber","argumentNames":["sprite","name"]}
 
-function sprites_readDataNumber__P3621_mk(s) {
+function sprites_readDataNumber__P33155_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_readDataNumber__P3621, depth: s.depth + 1,
+        parent: s, fn: sprites_readDataNumber__P33155, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___18595: undefined,
+  d___48091: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -50181,7 +50567,7 @@ function sprites_readDataNumber__P3621_mk(s) {
 
 
 
-function scene_followPath__P3659(s) {
+function scene_followPath__P33193(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50191,20 +50577,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pathFollowingSprites___18614 = undefined;
-    s.i___18618 = undefined;
-    s.pfs___18625 = undefined;
-    s.tm___18644 = undefined;
-    s.nearestTile___18653 = undefined;
-    s.minDistSquared___18655 = undefined;
-    s.p___18657 = undefined;
-    s.unnamed124___U7 = undefined;
-    s.unnamed125___U8 = undefined;
-    s.distSqrd___18659 = undefined;
-    s.remainingPath___18685 = undefined;
-    s.remainingPath___18695 = undefined;
-    s.currentLocation___18706 = undefined;
-    s.pathToNearest___18710 = undefined;
+    s.pathFollowingSprites___48110 = undefined;
+    s.i___48114 = undefined;
+    s.pfs___48121 = undefined;
+    s.tm___48140 = undefined;
+    s.nearestTile___48149 = undefined;
+    s.minDistSquared___48151 = undefined;
+    s.p___48153 = undefined;
+    s.unnamed964___U7 = undefined;
+    s.unnamed965___U8 = undefined;
+    s.distSqrd___48155 = undefined;
+    s.remainingPath___48181 = undefined;
+    s.remainingPath___48191 = undefined;
+    s.currentLocation___48202 = undefined;
+    s.pathToNearest___48206 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -50250,47 +50636,47 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 13; continue; }
-    s.tmp_9 = scene_getPathFollowingSprites__P6096_mk(s);
-    s.callLocIdx = 1890; s.pc = 26; return s.tmp_9;
+    s.tmp_9 = scene_getPathFollowingSprites__P35618_mk(s);
+    s.callLocIdx = 1895; s.pc = 26; return s.tmp_9;
   case 26:
     r0 = s.retval;
-    s.pathFollowingSprites___18614 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.pathFollowingSprites___18614);
+    s.pathFollowingSprites___48110 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.pathFollowingSprites___48110);
     if (!r0) { step = 11; continue; }
-    r0 = pxsim_Array__length(s.pathFollowingSprites___18614);
+    r0 = pxsim_Array__length(s.pathFollowingSprites___48110);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.i___18618 = (r0);
+    s.i___48114 = (r0);
   case 7:
-    r0 = (s.i___18618 >= 0);
+    r0 = (s.i___48114 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__getAt(s.pathFollowingSprites___18614, s.i___18618);
-    s.pfs___18625 = (r0);
-    r0 = s.pfs___18625.fields["sprite"];
+    r0 = pxsim_Array__getAt(s.pathFollowingSprites___48110, s.i___48114);
+    s.pfs___48121 = (r0);
+    r0 = s.pfs___48121.fields["sprite"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_2 = Sprite_vx__P2030_mk(s);
+    s.tmp_2 = Sprite_vx__P31449_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1891; s.pc = 27; return s.tmp_2;
+    s.callLocIdx = 1896; s.pc = 27; return s.tmp_2;
   case 27:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1892; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1897; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeAt(s.pathFollowingSprites___18614, s.i___18618);
+    r0 = pxsim_Array_.removeAt(s.pathFollowingSprites___48110, s.i___48114);
   case 8:
   case 9:
-    r0 = (s.i___18618 - 1);
-    s.i___18618 = (r0);
+    r0 = (s.i___48114 - 1);
+    s.i___48114 = (r0);
     { step = 7; continue; }
   case 10:
   case 11:
@@ -50298,13 +50684,13 @@ switch (step) {
     { step = 25; continue; }
   case 13:
   case 14:
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1893; s.pc = 29; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1898; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___18644 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___18644);
+    s.tm___48140 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___48140);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -50313,38 +50699,38 @@ switch (step) {
     { step = 25; continue; }
   case 15:
   case 16:
-    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
-    s.tmp_3.arg0 = s.tm___18644;
+    s.tmp_3 = tiles_TileMap_isOnWall__P31757_mk(s);
+    s.tmp_3.arg0 = s.tm___48140;
     s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1894; s.pc = 30; return s.tmp_3;
+    s.callLocIdx = 1899; s.pc = 30; return s.tmp_3;
   case 30:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 21; continue; }
     r0 = pxsim_Array__getAt(s.arg1, 0);
-    s.nearestTile___18653 = (r0);
-    s.minDistSquared___18655 = (999999);
-    s.p___18657 = (undefined);
-    s.unnamed124___U7 = (s.arg1);
-    s.unnamed125___U8 = (0);
+    s.nearestTile___48149 = (r0);
+    s.minDistSquared___48151 = (999999);
+    s.p___48153 = (undefined);
+    s.unnamed964___U7 = (s.arg1);
+    s.unnamed965___U8 = (0);
   case 17:
-    s.tmp_0 = r0 = s.unnamed125___U8;
-    r0 = pxsim_Array__length(s.unnamed124___U7);
+    s.tmp_0 = r0 = s.unnamed965___U8;
+    r0 = pxsim_Array__length(s.unnamed964___U7);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed124___U7, s.unnamed125___U8);
-    s.p___18657 = (r0);
-    s.tmp_5 = tiles_Location_x__P2293_mk(s);
-    s.tmp_5.arg0 = s.p___18657;
-    s.callLocIdx = 1895; s.pc = 31; return s.tmp_5;
+    r0 = pxsim_Array__getAt(s.unnamed964___U7, s.unnamed965___U8);
+    s.p___48153 = (r0);
+    s.tmp_5 = tiles_Location_x__P31712_mk(s);
+    s.tmp_5.arg0 = s.p___48153;
+    s.callLocIdx = 1900; s.pc = 31; return s.tmp_5;
   case 31:
     r0 = s.retval;
     s.tmp_4 = r0;
-    s.tmp_7 = Sprite_x__P2025_mk(s);
+    s.tmp_7 = Sprite_x__P31444_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 1896; s.pc = 32; return s.tmp_7;
+    s.callLocIdx = 1901; s.pc = 32; return s.tmp_7;
   case 32:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -50352,15 +50738,15 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim.Math_.pow(s.tmp_3, 2);
     s.tmp_2 = r0;
-    s.tmp_11 = tiles_Location_y__P2294_mk(s);
-    s.tmp_11.arg0 = s.p___18657;
-    s.callLocIdx = 1897; s.pc = 33; return s.tmp_11;
+    s.tmp_11 = tiles_Location_y__P31713_mk(s);
+    s.tmp_11.arg0 = s.p___48153;
+    s.callLocIdx = 1902; s.pc = 33; return s.tmp_11;
   case 33:
     r0 = s.retval;
     s.tmp_10 = r0;
-    s.tmp_13 = Sprite_y__P2027_mk(s);
+    s.tmp_13 = Sprite_y__P31446_mk(s);
     s.tmp_13.arg0 = s.arg0;
-    s.callLocIdx = 1898; s.pc = 34; return s.tmp_13;
+    s.callLocIdx = 1903; s.pc = 34; return s.tmp_13;
   case 34:
     r0 = s.retval;
     s.tmp_12 = r0;
@@ -50369,94 +50755,94 @@ switch (step) {
     r0 = pxsim.Math_.pow(s.tmp_9, 2);
     s.tmp_8 = r0;
     r0 = (s.tmp_2 + s.tmp_8);
-    s.distSqrd___18659 = (r0);
-    r0 = (s.distSqrd___18659 < s.minDistSquared___18655);
+    s.distSqrd___48155 = (r0);
+    r0 = (s.distSqrd___48155 < s.minDistSquared___48151);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.nearestTile___18653 = (s.p___18657);
-    s.minDistSquared___18655 = (s.distSqrd___18659);
+    s.nearestTile___48149 = (s.p___48153);
+    s.minDistSquared___48151 = (s.distSqrd___48155);
   case 18:
   case 19:
-    r0 = (s.unnamed125___U8 + 1);
-    s.unnamed125___U8 = (r0);
+    r0 = (s.unnamed965___U8 + 1);
+    s.unnamed965___U8 = (r0);
     { step = 17; continue; }
   case 20:
-    s.unnamed124___U7 = (undefined);
-    s.tmp_0 = tiles_Location_place__P2296_mk(s);
-    s.tmp_0.arg0 = s.nearestTile___18653;
+    s.unnamed964___U7 = (undefined);
+    s.tmp_0 = tiles_Location_place__P31715_mk(s);
+    s.tmp_0.arg0 = s.nearestTile___48149;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1899; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 1904; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
-    s.tmp_0 = scene_getRemainingPath__P6100_mk(s);
+    s.tmp_0 = scene_getRemainingPath__P35622_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1900; s.pc = 36; return s.tmp_0;
+    s.callLocIdx = 1905; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
-    s.remainingPath___18685 = (r0);
-    s.tmp_0 = scene__followPath__P3664_mk(s);
+    s.remainingPath___48181 = (r0);
+    s.tmp_0 = scene__followPath__P33198_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.remainingPath___18685;
+    s.tmp_0.arg1 = s.remainingPath___48181;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = undefined;
-    s.callLocIdx = 1901; s.pc = 37; return s.tmp_0;
+    s.callLocIdx = 1906; s.pc = 37; return s.tmp_0;
   case 37:
     r0 = s.retval;
     { step = 25; continue; }
   case 21:
   case 22:
-    s.tmp_0 = scene_getRemainingPath__P6100_mk(s);
+    s.tmp_0 = scene_getRemainingPath__P35622_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1902; s.pc = 38; return s.tmp_0;
+    s.callLocIdx = 1907; s.pc = 38; return s.tmp_0;
   case 38:
     r0 = s.retval;
-    s.remainingPath___18695 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.remainingPath___18695);
+    s.remainingPath___48191 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.remainingPath___48191);
     if (!r0) { step = 23; continue; }
-    s.tmp_0 = scene__followPath__P3664_mk(s);
+    s.tmp_0 = scene__followPath__P33198_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.remainingPath___18695;
+    s.tmp_0.arg1 = s.remainingPath___48191;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = undefined;
-    s.callLocIdx = 1903; s.pc = 39; return s.tmp_0;
+    s.callLocIdx = 1908; s.pc = 39; return s.tmp_0;
   case 39:
     r0 = s.retval;
     { step = 25; continue; }
   case 23:
   case 24:
-    s.tmp_0 = scene_locationOfSprite__P6099_mk(s);
+    s.tmp_0 = scene_locationOfSprite__P35621_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1904; s.pc = 40; return s.tmp_0;
+    s.callLocIdx = 1909; s.pc = 40; return s.tmp_0;
   case 40:
     r0 = s.retval;
-    s.currentLocation___18706 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P18717);
+    s.currentLocation___48202 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P48213);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = scene_generalAStar__P3657_mk(s);
-    s.tmp_1.arg0 = s.tm___18644;
-    s.tmp_1.arg1 = s.currentLocation___18706;
+    s.tmp_1 = scene_generalAStar__P33191_mk(s);
+    s.tmp_1.arg0 = s.tm___48140;
+    s.tmp_1.arg1 = s.currentLocation___48202;
     s.tmp_1.arg2 = null;
-    s.tmp_1.arg3 = inline__P18716;
+    s.tmp_1.arg3 = inline__P48212;
     s.tmp_1.arg4 = s.tmp_0;
-    s.callLocIdx = 1909; s.pc = 41; return s.tmp_1;
+    s.callLocIdx = 1914; s.pc = 41; return s.tmp_1;
   case 41:
     r0 = s.retval;
-    s.pathToNearest___18710 = (r0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P18737);
+    s.pathToNearest___48206 = (r0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P48233);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg1);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg2);
-    s.tmp_1 = scene__followPath__P3664_mk(s);
+    s.tmp_1 = scene__followPath__P33198_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.pathToNearest___18710;
+    s.tmp_1.arg1 = s.pathToNearest___48206;
     s.tmp_1.arg2 = s.arg2;
     s.tmp_1.arg3 = s.tmp_0;
-    s.callLocIdx = 1912; s.pc = 42; return s.tmp_1;
+    s.callLocIdx = 1917; s.pc = 42; return s.tmp_1;
   case 42:
     r0 = s.retval;
   case 25:
@@ -50464,12 +50850,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_followPath__P3659.info = {"start":3834,"length":2414,"line":97,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"followPath","argumentNames":["sprite","path","speed"]}
+scene_followPath__P33193.info = {"start":3834,"length":2414,"line":97,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"followPath","argumentNames":["sprite","path","speed"]}
 
-function scene_followPath__P3659_mk(s) {
+function scene_followPath__P33193_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_followPath__P3659, depth: s.depth + 1,
+        parent: s, fn: scene_followPath__P33193, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50485,20 +50871,20 @@ function scene_followPath__P3659_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  pathFollowingSprites___18614: undefined,
-  i___18618: undefined,
-  pfs___18625: undefined,
-  tm___18644: undefined,
-  nearestTile___18653: undefined,
-  minDistSquared___18655: undefined,
-  p___18657: undefined,
-  unnamed124___U7: undefined,
-  unnamed125___U8: undefined,
-  distSqrd___18659: undefined,
-  remainingPath___18685: undefined,
-  remainingPath___18695: undefined,
-  currentLocation___18706: undefined,
-  pathToNearest___18710: undefined,
+  pathFollowingSprites___48110: undefined,
+  i___48114: undefined,
+  pfs___48121: undefined,
+  tm___48140: undefined,
+  nearestTile___48149: undefined,
+  minDistSquared___48151: undefined,
+  p___48153: undefined,
+  unnamed964___U7: undefined,
+  unnamed965___U8: undefined,
+  distSqrd___48155: undefined,
+  remainingPath___48181: undefined,
+  remainingPath___48191: undefined,
+  currentLocation___48202: undefined,
+  pathToNearest___48206: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -50508,7 +50894,7 @@ function scene_followPath__P3659_mk(s) {
 
 
 
-function inline__P18716(s) {
+function inline__P48212(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50522,12 +50908,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P18716.info = {"start":5766,"length":7,"line":146,"column":70,"endLine":146,"endColumn":77,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
+inline__P48212.info = {"start":5766,"length":7,"line":146,"column":70,"endLine":146,"endColumn":77,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P18716_mk(s) {
+function inline__P48212_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P18716, depth: s.depth + 1,
+        parent: s, fn: inline__P48212, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -50535,7 +50921,7 @@ function inline__P18716_mk(s) {
 
 
 
-function inline__P18717(s) {
+function inline__P48213(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50545,33 +50931,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pathTile___18720 = undefined;
-    s.unnamed126___U1 = undefined;
-    s.unnamed127___U2 = undefined;
+    s.pathTile___48216 = undefined;
+    s.unnamed966___U1 = undefined;
+    s.unnamed967___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.pathTile___18720 = (undefined);
-    s.unnamed126___U1 = (s.caps[0]);
-    s.unnamed127___U2 = (0);
+    s.pathTile___48216 = (undefined);
+    s.unnamed966___U1 = (s.caps[0]);
+    s.unnamed967___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed127___U2;
-    r0 = pxsim_Array__length(s.unnamed126___U1);
+    s.tmp_0 = r0 = s.unnamed967___U2;
+    r0 = pxsim_Array__length(s.unnamed966___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed126___U1, s.unnamed127___U2);
-    s.pathTile___18720 = (r0);
-    s.tmp_4 = tiles_Location_x__P2293_mk(s);
+    r0 = pxsim_Array__getAt(s.unnamed966___U1, s.unnamed967___U2);
+    s.pathTile___48216 = (r0);
+    s.tmp_4 = tiles_Location_x__P31712_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1905; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 1910; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_6 = tiles_Location_x__P2293_mk(s);
-    s.tmp_6.arg0 = s.pathTile___18720;
-    s.callLocIdx = 1906; s.pc = 9; return s.tmp_6;
+    s.tmp_6 = tiles_Location_x__P31712_mk(s);
+    s.tmp_6.arg0 = s.pathTile___48216;
+    s.callLocIdx = 1911; s.pc = 9; return s.tmp_6;
   case 9:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -50582,15 +50968,15 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    s.tmp_8 = tiles_Location_y__P2294_mk(s);
+    s.tmp_8 = tiles_Location_y__P31713_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1907; s.pc = 10; return s.tmp_8;
+    s.callLocIdx = 1912; s.pc = 10; return s.tmp_8;
   case 10:
     r0 = s.retval;
     s.tmp_7 = r0;
-    s.tmp_10 = tiles_Location_y__P2294_mk(s);
-    s.tmp_10.arg0 = s.pathTile___18720;
-    s.callLocIdx = 1908; s.pc = 11; return s.tmp_10;
+    s.tmp_10 = tiles_Location_y__P31713_mk(s);
+    s.tmp_10.arg0 = s.pathTile___48216;
+    s.callLocIdx = 1913; s.pc = 11; return s.tmp_10;
   case 11:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -50604,22 +50990,22 @@ switch (step) {
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed127___U2 + 1);
-    s.unnamed127___U2 = (r0);
+    r0 = (s.unnamed967___U2 + 1);
+    s.unnamed967___U2 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed126___U1 = (undefined);
+    s.unnamed966___U1 = (undefined);
     r0 = false;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-inline__P18717.info = {"start":5775,"length":221,"line":146,"column":79,"endLine":153,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P48213.info = {"start":5775,"length":221,"line":146,"column":79,"endLine":153,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P18717_mk(s) {
+function inline__P48213_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P18717, depth: s.depth + 1,
+        parent: s, fn: inline__P48213, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50633,9 +51019,9 @@ function inline__P18717_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  pathTile___18720: undefined,
-  unnamed126___U1: undefined,
-  unnamed127___U2: undefined,
+  pathTile___48216: undefined,
+  unnamed966___U1: undefined,
+  unnamed967___U2: undefined,
   arg0: undefined,
 } }
 
@@ -50643,7 +51029,7 @@ function inline__P18717_mk(s) {
 
 
 
-function inline__P18737(s) {
+function inline__P48233(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50653,42 +51039,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.remainingPath___18738 = undefined;
-    s.tmp_0 = scene_getRemainingPath__P6100_mk(s);
+    s.remainingPath___48234 = undefined;
+    s.tmp_0 = scene_getRemainingPath__P35622_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.caps[1];
-    s.callLocIdx = 1910; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1915; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.remainingPath___18738 = (r0);
-    s.tmp_0 = scene__followPath__P3664_mk(s);
+    s.remainingPath___48234 = (r0);
+    s.tmp_0 = scene__followPath__P33198_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_0.arg1 = s.remainingPath___18738;
+    s.tmp_0.arg1 = s.remainingPath___48234;
     s.tmp_0.arg2 = s.caps[2];
     s.tmp_0.arg3 = undefined;
-    s.callLocIdx = 1911; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1916; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P18737.info = {"start":6050,"length":191,"line":155,"column":50,"endLine":159,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
+inline__P48233.info = {"start":6050,"length":191,"line":155,"column":50,"endLine":159,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P18737_mk(s) {
+function inline__P48233_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P18737, depth: s.depth + 1,
+        parent: s, fn: inline__P48233, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  remainingPath___18738: undefined,
+  remainingPath___48234: undefined,
 } }
 
 
 
 
 
-function scene_getRemainingPath__P6100(s) {
+function scene_getRemainingPath__P35622(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50698,26 +51084,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currentLocation___19654 = undefined;
-    s.i___19658 = undefined;
-    s.pathTile___19664 = undefined;
-    s.remainingPath___19679 = undefined;
+    s.currentLocation___49150 = undefined;
+    s.i___49154 = undefined;
+    s.pathTile___49160 = undefined;
+    s.remainingPath___49175 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationOfSprite__P6099_mk(s);
+    s.tmp_0 = scene_locationOfSprite__P35621_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1929; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1934; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.currentLocation___19654 = (r0);
+    s.currentLocation___49150 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.i___19658 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.i___19658, 0);
+    s.i___49154 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.i___49154, 0);
   case 1:
-    r0 = pxsim_pxtrt_ldlocRef(s.i___19658);
+    r0 = pxsim_pxtrt_ldlocRef(s.i___49154);
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.arg1);
     s.tmp_2 = r0;
@@ -50726,19 +51112,19 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
     s.tmp_3 = r0 = s.arg1;
-    r0 = pxsim_pxtrt_ldlocRef(s.i___19658);
+    r0 = pxsim_pxtrt_ldlocRef(s.i___49154);
     s.tmp_4 = r0;
     r0 = pxsim_Array__getAt(s.tmp_3, s.tmp_4);
-    s.pathTile___19664 = (r0);
-    s.tmp_2 = tiles_Location_x__P2293_mk(s);
-    s.tmp_2.arg0 = s.currentLocation___19654;
-    s.callLocIdx = 1930; s.pc = 11; return s.tmp_2;
+    s.pathTile___49160 = (r0);
+    s.tmp_2 = tiles_Location_x__P31712_mk(s);
+    s.tmp_2.arg0 = s.currentLocation___49150;
+    s.callLocIdx = 1935; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = tiles_Location_x__P2293_mk(s);
-    s.tmp_4.arg0 = s.pathTile___19664;
-    s.callLocIdx = 1931; s.pc = 12; return s.tmp_4;
+    s.tmp_4 = tiles_Location_x__P31712_mk(s);
+    s.tmp_4.arg0 = s.pathTile___49160;
+    s.callLocIdx = 1936; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -50749,15 +51135,15 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 3; continue; }
   case 2:
-    s.tmp_6 = tiles_Location_y__P2294_mk(s);
-    s.tmp_6.arg0 = s.currentLocation___19654;
-    s.callLocIdx = 1932; s.pc = 13; return s.tmp_6;
+    s.tmp_6 = tiles_Location_y__P31713_mk(s);
+    s.tmp_6.arg0 = s.currentLocation___49150;
+    s.callLocIdx = 1937; s.pc = 13; return s.tmp_6;
   case 13:
     r0 = s.retval;
     s.tmp_5 = r0;
-    s.tmp_8 = tiles_Location_y__P2294_mk(s);
-    s.tmp_8.arg0 = s.pathTile___19664;
-    s.callLocIdx = 1933; s.pc = 14; return s.tmp_8;
+    s.tmp_8 = tiles_Location_y__P31713_mk(s);
+    s.tmp_8.arg0 = s.pathTile___49160;
+    s.callLocIdx = 1938; s.pc = 14; return s.tmp_8;
   case 14:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -50767,7 +51153,7 @@ switch (step) {
     s.tmp_9 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_9);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_pxtrt_ldlocRef(s.i___19658);
+    r0 = pxsim_pxtrt_ldlocRef(s.i___49154);
     s.tmp_11 = r0;
     r0 = (s.tmp_11 === 0);
     s.tmp_10 = r0;
@@ -50776,25 +51162,25 @@ switch (step) {
     r0 = s.arg1;
     { step = 5; continue; }
   case 4:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P19686);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P49182);
     s.tmp_12 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_12, 0, s.i___19658);
-    s.tmp_13 = helpers_arrayFilter__P108_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_12, 0, s.i___49154);
+    s.tmp_13 = helpers_arrayFilter__P29643_mk(s);
     s.tmp_13.arg0 = s.arg1;
     s.tmp_13.arg1 = s.tmp_12;
-    s.callLocIdx = 1934; s.pc = 15; return s.tmp_13;
+    s.callLocIdx = 1939; s.pc = 15; return s.tmp_13;
   case 15:
     r0 = s.retval;
   case 5:
     // jmp value (already in r0)
     s.tmp_14 = r0;
-    s.remainingPath___19679 = (s.tmp_14);
-    r0 = s.remainingPath___19679;
+    s.remainingPath___49175 = (s.tmp_14);
+    r0 = s.remainingPath___49175;
     { step = 9; continue; }
   case 6:
   case 7:
-    s.tmp_0 = r0 = s.i___19658;
-    r0 = pxsim_pxtrt_ldlocRef(s.i___19658);
+    s.tmp_0 = r0 = s.i___49154;
+    r0 = pxsim_pxtrt_ldlocRef(s.i___49154);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_1 = r0;
@@ -50806,12 +51192,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_getRemainingPath__P6100.info = {"start":10579,"length":497,"line":292,"column":4,"endLine":302,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getRemainingPath","argumentNames":["sprite","path"]}
+scene_getRemainingPath__P35622.info = {"start":10579,"length":497,"line":292,"column":4,"endLine":302,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getRemainingPath","argumentNames":["sprite","path"]}
 
-function scene_getRemainingPath__P6100_mk(s) {
+function scene_getRemainingPath__P35622_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_getRemainingPath__P6100, depth: s.depth + 1,
+        parent: s, fn: scene_getRemainingPath__P35622, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50828,10 +51214,10 @@ function scene_getRemainingPath__P6100_mk(s) {
   tmp_12: undefined,
   tmp_13: undefined,
   tmp_14: undefined,
-  currentLocation___19654: undefined,
-  i___19658: undefined,
-  pathTile___19664: undefined,
-  remainingPath___19679: undefined,
+  currentLocation___49150: undefined,
+  i___49154: undefined,
+  pathTile___49160: undefined,
+  remainingPath___49175: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -50840,7 +51226,7 @@ function scene_getRemainingPath__P6100_mk(s) {
 
 
 
-function inline__P19686(s) {
+function inline__P49182(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50862,12 +51248,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P19686.info = {"start":10970,"length":16,"line":297,"column":67,"endLine":297,"endColumn":83,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["_","j"]}
+inline__P49182.info = {"start":10970,"length":16,"line":297,"column":67,"endLine":297,"endColumn":83,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["_","j"]}
 
-function inline__P19686_mk(s) {
+function inline__P49182_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P19686, depth: s.depth + 1,
+        parent: s, fn: inline__P49182, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50879,7 +51265,7 @@ function inline__P19686_mk(s) {
 
 
 
-function scene_locationOfSprite__P6099(s) {
+function scene_locationOfSprite__P35621(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50893,41 +51279,41 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
-    s.tmp_1 = scene_screenCoordinateToTile__P6098_mk(s);
-    s.tmp_2 = Sprite_x__P2025_mk(s);
+    s.tmp_0 = tiles_getTileLocation__P31763_mk(s);
+    s.tmp_1 = scene_screenCoordinateToTile__P35620_mk(s);
+    s.tmp_2 = Sprite_x__P31444_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1924; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1929; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1925; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1930; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = scene_screenCoordinateToTile__P6098_mk(s);
-    s.tmp_4 = Sprite_y__P2027_mk(s);
+    s.tmp_3 = scene_screenCoordinateToTile__P35620_mk(s);
+    s.tmp_4 = Sprite_y__P31446_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1926; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 1931; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 1927; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1932; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1928; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1933; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_locationOfSprite__P6099.info = {"start":10417,"length":156,"line":288,"column":4,"endLine":290,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"locationOfSprite","argumentNames":["s"]}
+scene_locationOfSprite__P35621.info = {"start":10417,"length":156,"line":288,"column":4,"endLine":290,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"locationOfSprite","argumentNames":["s"]}
 
-function scene_locationOfSprite__P6099_mk(s) {
+function scene_locationOfSprite__P35621_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_locationOfSprite__P6099, depth: s.depth + 1,
+        parent: s, fn: scene_locationOfSprite__P35621, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50941,7 +51327,7 @@ function scene_locationOfSprite__P6099_mk(s) {
 
 
 
-function scene_screenCoordinateToTile__P6098(s) {
+function scene_screenCoordinateToTile__P35620(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50951,18 +51337,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___19378 = undefined;
+    s.tm___48874 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1922; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1927; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___19378 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___19378);
+    s.tm___48874 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___48874);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -50973,25 +51359,25 @@ switch (step) {
   case 1:
   case 2:
     s.tmp_2 = r0 = s.arg0;
-    r0 = s.tm___19378.fields["_scale"];
+    r0 = s.tm___48874.fields["_scale"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 >> s.tmp_3);
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenCoordinateToTile__P6098.info = {"start":10239,"length":172,"line":282,"column":4,"endLine":286,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
+scene_screenCoordinateToTile__P35620.info = {"start":10239,"length":172,"line":282,"column":4,"endLine":286,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
 
-function scene_screenCoordinateToTile__P6098_mk(s) {
+function scene_screenCoordinateToTile__P35620_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenCoordinateToTile__P6098, depth: s.depth + 1,
+        parent: s, fn: scene_screenCoordinateToTile__P35620, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tm___19378: undefined,
+  tm___48874: undefined,
   arg0: undefined,
 } }
 
@@ -50999,7 +51385,7 @@ function scene_screenCoordinateToTile__P6098_mk(s) {
 
 
 
-function scene_getPathFollowingSprites__P6096(s) {
+function scene_getPathFollowingSprites__P35618(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51009,23 +51395,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_2 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1918; s.pc = 1; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1923; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_data"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_FOLLOW_KEY___6088);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_FOLLOW_KEY___35610);
     return leave(s, r0)
   default: oops()
 } } }
-scene_getPathFollowingSprites__P6096.info = {"start":9927,"length":148,"line":274,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathFollowingSprites","argumentNames":[]}
+scene_getPathFollowingSprites__P35618.info = {"start":9927,"length":148,"line":274,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathFollowingSprites","argumentNames":[]}
 
-function scene_getPathFollowingSprites__P6096_mk(s) {
+function scene_getPathFollowingSprites__P35618_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_getPathFollowingSprites__P6096, depth: s.depth + 1,
+        parent: s, fn: scene_getPathFollowingSprites__P35618, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51036,7 +51422,7 @@ function scene_getPathFollowingSprites__P6096_mk(s) {
 
 
 
-function scene_Scene_data__P2442(s) {
+function scene_Scene_data__P31861(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51051,18 +51437,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C31838_VT)) failedCast(r0);
     r0 = s.arg0.fields["_data"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Scene_data__P2442.info = {"start":6655,"length":53,"line":182,"column":8,"endLine":184,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"data","argumentNames":["this"]}
-scene_Scene_data__P2442.isGetter = true;
+scene_Scene_data__P31861.info = {"start":6655,"length":53,"line":182,"column":8,"endLine":184,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"data","argumentNames":["this"]}
+scene_Scene_data__P31861.isGetter = true;
 
-function scene_Scene_data__P2442_mk(s) {
+function scene_Scene_data__P31861_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_data__P2442, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_data__P31861, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -51071,7 +51457,7 @@ function scene_Scene_data__P2442_mk(s) {
 
 
 
-function scene__followPath__P3664(s) {
+function scene__followPath__P33198(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51081,10 +51467,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.store___19397 = undefined;
-    s.previousEl___19400 = undefined;
-    s.start___19410 = undefined;
-    s.pfs___19421 = undefined;
+    s.store___48893 = undefined;
+    s.previousEl___48896 = undefined;
+    s.start___48906 = undefined;
+    s.pfs___48917 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -51101,25 +51487,25 @@ switch (step) {
     { step = 19; continue; }
   case 1:
   case 2:
-    s.tmp_2 = scene_init__P6094_mk(s);
-    s.callLocIdx = 1913; s.pc = 20; return s.tmp_2;
+    s.tmp_2 = scene_init__P35616_mk(s);
+    s.callLocIdx = 1918; s.pc = 20; return s.tmp_2;
   case 20:
     r0 = s.retval;
-    s.tmp_0 = scene_getPathFollowingSprites__P6096_mk(s);
-    s.callLocIdx = 1914; s.pc = 21; return s.tmp_0;
+    s.tmp_0 = scene_getPathFollowingSprites__P35618_mk(s);
+    s.callLocIdx = 1919; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.store___19397 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P19402);
+    s.store___48893 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P48898);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFind__P109_mk(s);
-    s.tmp_1.arg0 = s.store___19397;
+    s.tmp_1 = helpers_arrayFind__P29644_mk(s);
+    s.tmp_1.arg0 = s.store___48893;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1915; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 1920; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    s.previousEl___19400 = (r0);
+    s.previousEl___48896 = (r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
@@ -51130,28 +51516,28 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.start___19410 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.start___19410);
+    s.start___48906 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.start___48906);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.previousEl___19400);
+    r0 = pxsim_numops_toBoolDecr(s.previousEl___48896);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array_.removeElement(s.store___19397, s.previousEl___19400);
+    r0 = pxsim_Array_.removeElement(s.store___48893, s.previousEl___48896);
   case 5:
   case 6:
     { step = 19; continue; }
   case 7:
   case 8:
-    s.tmp_0 = r0 = s.previousEl___19400;
+    s.tmp_0 = r0 = s.previousEl___48896;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 9; continue; }
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 9:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_PathFollowingSprite__C6090_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_PathFollowingSprite__C35612_VT);
     s.tmp_1 = r0;
     s.tmp_2 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_2);
@@ -51163,44 +51549,44 @@ switch (step) {
   case 11:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_4 = scene_PathFollowingSprite_constructor__P6091_mk(s);
+    s.tmp_4 = scene_PathFollowingSprite_constructor__P35613_mk(s);
     s.tmp_4.arg0 = s.tmp_1;
     s.tmp_4.arg1 = s.arg0;
     s.tmp_4.arg2 = s.arg1;
     s.tmp_4.arg3 = s.tmp_3;
-    s.callLocIdx = 1916; s.pc = 23; return s.tmp_4;
+    s.callLocIdx = 1921; s.pc = 23; return s.tmp_4;
   case 23:
     r0 = s.retval;
     r0 = s.tmp_1;
   case 12:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.pfs___19421 = (s.tmp_5);
-    r0 = pxsim_numops_toBoolDecr(s.previousEl___19400);
+    s.pfs___48917 = (s.tmp_5);
+    r0 = pxsim_numops_toBoolDecr(s.previousEl___48896);
     if (!r0) { step = 17; continue; }
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 13; continue; }
-    r0 = (s.previousEl___19400).fields["speed"] = (s.arg2);
+    r0 = (s.previousEl___48896).fields["speed"] = (s.arg2);
   case 13:
   case 14:
-    r0 = (s.previousEl___19400).fields["path"] = (s.arg1);
-    r0 = (s.previousEl___19400).fields["index"] = (0);
+    r0 = (s.previousEl___48896).fields["path"] = (s.arg1);
+    r0 = (s.previousEl___48896).fields["index"] = (0);
     r0 = pxsim_numops_toBoolDecr(s.arg3);
     if (!r0) { step = 15; continue; }
-    r0 = (s.previousEl___19400).fields["onEndHandler"] = (s.arg3);
+    r0 = (s.previousEl___48896).fields["onEndHandler"] = (s.arg3);
   case 15:
   case 16:
     { step = 18; continue; }
   case 17:
-    r0 = (s.pfs___19421).fields["onEndHandler"] = (s.arg3);
-    r0 = pxsim_Array__push(s.store___19397, s.pfs___19421);
+    r0 = (s.pfs___48917).fields["onEndHandler"] = (s.arg3);
+    r0 = pxsim_Array__push(s.store___48893, s.pfs___48917);
   case 18:
-    s.tmp_0 = scene_setVelocityTowards__P6095_mk(s);
+    s.tmp_0 = scene_setVelocityTowards__P35617_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.start___19410;
-    r0 = s.pfs___19421.fields["speed"];
+    s.tmp_0.arg1 = s.start___48906;
+    r0 = s.pfs___48917.fields["speed"];
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 1917; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1922; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
   case 19:
@@ -51208,12 +51594,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene__followPath__P3664.info = {"start":8364,"length":1001,"line":219,"column":4,"endLine":255,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"_followPath","argumentNames":["sprite","path","speed","endCb"]}
+scene__followPath__P33198.info = {"start":8364,"length":1001,"line":219,"column":4,"endLine":255,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"_followPath","argumentNames":["sprite","path","speed","endCb"]}
 
-function scene__followPath__P3664_mk(s) {
+function scene__followPath__P33198_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene__followPath__P3664, depth: s.depth + 1,
+        parent: s, fn: scene__followPath__P33198, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51221,10 +51607,10 @@ function scene__followPath__P3664_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  store___19397: undefined,
-  previousEl___19400: undefined,
-  start___19410: undefined,
-  pfs___19421: undefined,
+  store___48893: undefined,
+  previousEl___48896: undefined,
+  start___48906: undefined,
+  pfs___48917: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -51235,7 +51621,7 @@ function scene__followPath__P3664_mk(s) {
 
 
 
-function inline__P19402(s) {
+function inline__P48898(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51255,12 +51641,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P19402.info = {"start":8615,"length":26,"line":225,"column":38,"endLine":225,"endColumn":64,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["el"]}
+inline__P48898.info = {"start":8615,"length":26,"line":225,"column":38,"endLine":225,"endColumn":64,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["el"]}
 
-function inline__P19402_mk(s) {
+function inline__P48898_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P19402, depth: s.depth + 1,
+        parent: s, fn: inline__P48898, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -51270,7 +51656,7 @@ function inline__P19402_mk(s) {
 
 
 
-function scene_setVelocityTowards__P6095(s) {
+function scene_setVelocityTowards__P35617(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51280,46 +51666,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dx___19463 = undefined;
-    s.dy___19469 = undefined;
-    s.dist___19475 = undefined;
+    s.dx___48959 = undefined;
+    s.dy___48965 = undefined;
+    s.dist___48971 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = tiles_Location_x__P2293_mk(s);
+    s.tmp_1 = tiles_Location_x__P31712_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 1884; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1889; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_x__P2025_mk(s);
+    s.tmp_3 = Sprite_x__P31444_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1885; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1890; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dx___19463 = (r0);
-    s.tmp_1 = tiles_Location_y__P2294_mk(s);
+    s.dx___48959 = (r0);
+    s.tmp_1 = tiles_Location_y__P31713_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 1886; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1891; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_y__P2027_mk(s);
+    s.tmp_3 = Sprite_y__P31446_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1887; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1892; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dy___19469 = (r0);
-    r0 = (s.dx___19463 * s.dx___19463);
+    s.dy___48965 = (r0);
+    r0 = (s.dx___48959 * s.dx___48959);
     s.tmp_2 = r0;
-    r0 = (s.dy___19469 * s.dy___19469);
+    r0 = (s.dy___48965 * s.dy___48965);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
@@ -51334,44 +51720,44 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.dist___19475 = (s.tmp_4);
-    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    s.dist___48971 = (s.tmp_4);
+    s.tmp_0 = Sprite_vx__P31449_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = (s.dx___19463 / s.dist___19475);
+    r0 = (s.dx___48959 / s.dist___48971);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * s.arg2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1888; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1893; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = (s.dy___19469 / s.dist___19475);
+    r0 = (s.dy___48965 / s.dist___48971);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * s.arg2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1889; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1894; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setVelocityTowards__P6095.info = {"start":2926,"length":304,"line":74,"column":4,"endLine":80,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"setVelocityTowards","argumentNames":["sprite","target","speed"]}
+scene_setVelocityTowards__P35617.info = {"start":2926,"length":304,"line":74,"column":4,"endLine":80,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"setVelocityTowards","argumentNames":["sprite","target","speed"]}
 
-function scene_setVelocityTowards__P6095_mk(s) {
+function scene_setVelocityTowards__P35617_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setVelocityTowards__P6095, depth: s.depth + 1,
+        parent: s, fn: scene_setVelocityTowards__P35617, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  dx___19463: undefined,
-  dy___19469: undefined,
-  dist___19475: undefined,
+  dx___48959: undefined,
+  dy___48965: undefined,
+  dist___48971: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -51381,7 +51767,7 @@ function scene_setVelocityTowards__P6095_mk(s) {
 
 
 
-function scene_init__P6094(s) {
+function scene_init__P35616(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51391,14 +51777,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_5 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1855; s.pc = 3; return s.tmp_5;
+    s.tmp_5 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1860; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = s.tmp_4.fields["_data"];
     s.tmp_3 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_3, globals.PATH_FOLLOW_KEY___6088);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_3, globals.PATH_FOLLOW_KEY___35610);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -51406,31 +51792,31 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_8 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1857; s.pc = 4; return s.tmp_8;
+    s.tmp_8 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1862; s.pc = 4; return s.tmp_8;
   case 4:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = s.tmp_7.fields["_data"];
     s.tmp_6 = r0;
-    s.tmp_9 = r0 = globals.PATH_FOLLOW_KEY___6088;
+    s.tmp_9 = r0 = globals.PATH_FOLLOW_KEY___35610;
     r0 = pxsim_Array__mk();
     s.tmp_10 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_6, s.tmp_9, s.tmp_10);
-    s.tmp_2 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1859; s.pc = 5; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1864; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_data"];
     s.tmp_0 = r0;
-    s.tmp_3 = r0 = globals.PATH_COMPLETION_KEY___6089;
+    s.tmp_3 = r0 = globals.PATH_COMPLETION_KEY___35611;
     r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_3, s.tmp_4);
-    s.tmp_0 = game_onUpdate__P2543_mk(s);
-    s.tmp_0.arg0 = inline__P19523;
-    s.callLocIdx = 1883; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_onUpdate__P31962_mk(s);
+    s.tmp_0.arg0 = inline__P49019;
+    s.callLocIdx = 1888; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 1:
@@ -51439,12 +51825,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_init__P6094.info = {"start":619,"length":2301,"line":24,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"init","argumentNames":[]}
+scene_init__P35616.info = {"start":619,"length":2301,"line":24,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"init","argumentNames":[]}
 
-function scene_init__P6094_mk(s) {
+function scene_init__P35616_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_init__P6094, depth: s.depth + 1,
+        parent: s, fn: scene_init__P35616, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51463,7 +51849,7 @@ function scene_init__P6094_mk(s) {
 
 
 
-function inline__P19523(s) {
+function inline__P49019(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51473,45 +51859,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.store___19524 = undefined;
-    s.handlers___19527 = undefined;
-    s.i___19530 = undefined;
-    s.pfs___19537 = undefined;
-    s.sprite___19542 = undefined;
-    s.index___19543 = undefined;
-    s.path___19544 = undefined;
-    s.speed___19545 = undefined;
-    s.target___19546 = undefined;
-    s.x___19551 = undefined;
-    s.y___19552 = undefined;
-    s.vx___19553 = undefined;
-    s.vy___19554 = undefined;
-    s.pastTargetHorizontally___19555 = undefined;
-    s.pastTargetVertically___19574 = undefined;
-    s.newTarget___19599 = undefined;
-    s.tmp_0 = scene_getPathFollowingSprites__P6096_mk(s);
-    s.callLocIdx = 1861; s.pc = 27; return s.tmp_0;
+    s.store___49020 = undefined;
+    s.handlers___49023 = undefined;
+    s.i___49026 = undefined;
+    s.pfs___49033 = undefined;
+    s.sprite___49038 = undefined;
+    s.index___49039 = undefined;
+    s.path___49040 = undefined;
+    s.speed___49041 = undefined;
+    s.target___49042 = undefined;
+    s.x___49047 = undefined;
+    s.y___49048 = undefined;
+    s.vx___49049 = undefined;
+    s.vy___49050 = undefined;
+    s.pastTargetHorizontally___49051 = undefined;
+    s.pastTargetVertically___49070 = undefined;
+    s.newTarget___49095 = undefined;
+    s.tmp_0 = scene_getPathFollowingSprites__P35618_mk(s);
+    s.callLocIdx = 1866; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.store___19524 = (r0);
-    s.tmp_0 = scene_getPathCompletionEvents__P6097_mk(s);
-    s.callLocIdx = 1862; s.pc = 28; return s.tmp_0;
+    s.store___49020 = (r0);
+    s.tmp_0 = scene_getPathCompletionEvents__P35619_mk(s);
+    s.callLocIdx = 1867; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    s.handlers___19527 = (r0);
-    r0 = pxsim_Array__length(s.store___19524);
+    s.handlers___49023 = (r0);
+    r0 = pxsim_Array__length(s.store___49020);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.i___19530 = (r0);
+    s.i___49026 = (r0);
   case 1:
-    r0 = (s.i___19530 >= 0);
+    r0 = (s.i___49026 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    r0 = pxsim_Array__getAt(s.store___19524, s.i___19530);
-    s.pfs___19537 = (r0);
+    r0 = pxsim_Array__getAt(s.store___49020, s.i___49026);
+    s.pfs___49033 = (r0);
     s.tmp_0 = if_sprite_1_mk(s);
-    s.tmp_1 = r0 = s.pfs___19537;
+    s.tmp_1 = r0 = s.pfs___49033;
     s.tmp_0.arg0 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "sprite");
@@ -51519,11 +51905,11 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["sprite"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["sprite"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 1863; s.pc = 29; return s.tmp_0; }
+     else { s.callLocIdx = 1868; s.pc = 29; return s.tmp_0; }
     }
   case 29:
     r0 = s.retval;
-    s.sprite___19542 = (r0);
+    s.sprite___49038 = (r0);
     s.tmp_2 = if_index_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -51532,11 +51918,11 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["index"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["index"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1864; s.pc = 30; return s.tmp_2; }
+     else { s.callLocIdx = 1869; s.pc = 30; return s.tmp_2; }
     }
   case 30:
     r0 = s.retval;
-    s.index___19543 = (r0);
+    s.index___49039 = (r0);
     s.tmp_3 = if_path_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -51545,11 +51931,11 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["path"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["path"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1865; s.pc = 31; return s.tmp_3; }
+     else { s.callLocIdx = 1870; s.pc = 31; return s.tmp_3; }
     }
   case 31:
     r0 = s.retval;
-    s.path___19544 = (r0);
+    s.path___49040 = (r0);
     s.tmp_4 = if_speed_1_mk(s);
     s.tmp_4.arg0 = s.tmp_1;
     if (!s.tmp_4.arg0.vtable.iface) {
@@ -51558,15 +51944,15 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["speed"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["speed"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1866; s.pc = 32; return s.tmp_4; }
+     else { s.callLocIdx = 1871; s.pc = 32; return s.tmp_4; }
     }
   case 32:
     r0 = s.retval;
-    s.speed___19545 = (r0);
-    r0 = pxsim_Array__getAt(s.path___19544, s.index___19543);
-    s.target___19546 = (r0);
+    s.speed___49041 = (r0);
+    r0 = pxsim_Array__getAt(s.path___49040, s.index___49039);
+    s.target___49042 = (r0);
     s.tmp_0 = if_x_1_mk(s);
-    s.tmp_1 = r0 = s.sprite___19542;
+    s.tmp_1 = r0 = s.sprite___49038;
     s.tmp_0.arg0 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "x");
@@ -51574,11 +51960,11 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["x"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["x"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 1867; s.pc = 33; return s.tmp_0; }
+     else { s.callLocIdx = 1872; s.pc = 33; return s.tmp_0; }
     }
   case 33:
     r0 = s.retval;
-    s.x___19551 = (r0);
+    s.x___49047 = (r0);
     s.tmp_2 = if_y_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -51587,11 +51973,11 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["y"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["y"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1868; s.pc = 34; return s.tmp_2; }
+     else { s.callLocIdx = 1873; s.pc = 34; return s.tmp_2; }
     }
   case 34:
     r0 = s.retval;
-    s.y___19552 = (r0);
+    s.y___49048 = (r0);
     s.tmp_3 = if_vx_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -51600,11 +51986,11 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["vx"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["vx"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1869; s.pc = 35; return s.tmp_3; }
+     else { s.callLocIdx = 1874; s.pc = 35; return s.tmp_3; }
     }
   case 35:
     r0 = s.retval;
-    s.vx___19553 = (r0);
+    s.vx___49049 = (r0);
     s.tmp_4 = if_vy_1_mk(s);
     s.tmp_4.arg0 = s.tmp_1;
     if (!s.tmp_4.arg0.vtable.iface) {
@@ -51613,12 +51999,12 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["vy"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["vy"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1870; s.pc = 36; return s.tmp_4; }
+     else { s.callLocIdx = 1875; s.pc = 36; return s.tmp_4; }
     }
   case 36:
     r0 = s.retval;
-    s.vy___19554 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.vx___19553);
+    s.vy___49050 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.vx___49049);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -51627,17 +52013,17 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 2:
-    r0 = (s.vx___19553 < 0);
+    r0 = (s.vx___49049 < 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_2;
     { step = 4; continue; }
   case 3:
-    s.tmp_3 = r0 = s.x___19551;
-    s.tmp_5 = tiles_Location_x__P2293_mk(s);
-    s.tmp_5.arg0 = s.target___19546;
-    s.callLocIdx = 1871; s.pc = 37; return s.tmp_5;
+    s.tmp_3 = r0 = s.x___49047;
+    s.tmp_5 = tiles_Location_x__P31712_mk(s);
+    s.tmp_5.arg0 = s.target___49042;
+    s.callLocIdx = 1876; s.pc = 37; return s.tmp_5;
   case 37:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -51654,17 +52040,17 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 9; continue; }
   case 6:
-    r0 = (s.vx___19553 > 0);
+    r0 = (s.vx___49049 > 0);
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBool(s.tmp_8);
     if (r0) { step = 7; continue; }
     r0 = s.tmp_8;
     { step = 8; continue; }
   case 7:
-    s.tmp_9 = r0 = s.x___19551;
-    s.tmp_11 = tiles_Location_x__P2293_mk(s);
-    s.tmp_11.arg0 = s.target___19546;
-    s.callLocIdx = 1872; s.pc = 38; return s.tmp_11;
+    s.tmp_9 = r0 = s.x___49047;
+    s.tmp_11 = tiles_Location_x__P31712_mk(s);
+    s.tmp_11.arg0 = s.target___49042;
+    s.callLocIdx = 1877; s.pc = 38; return s.tmp_11;
   case 38:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -51676,8 +52062,8 @@ switch (step) {
   case 9:
     // jmp value (already in r0)
     s.tmp_13 = r0;
-    s.pastTargetHorizontally___19555 = (s.tmp_13);
-    r0 = pxsim_numops_toBoolDecr(s.vy___19554);
+    s.pastTargetHorizontally___49051 = (s.tmp_13);
+    r0 = pxsim_numops_toBoolDecr(s.vy___49050);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -51686,17 +52072,17 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 13; continue; }
   case 10:
-    r0 = (s.vy___19554 < 0);
+    r0 = (s.vy___49050 < 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_2;
     { step = 12; continue; }
   case 11:
-    s.tmp_3 = r0 = s.y___19552;
-    s.tmp_5 = tiles_Location_y__P2294_mk(s);
-    s.tmp_5.arg0 = s.target___19546;
-    s.callLocIdx = 1873; s.pc = 39; return s.tmp_5;
+    s.tmp_3 = r0 = s.y___49048;
+    s.tmp_5 = tiles_Location_y__P31713_mk(s);
+    s.tmp_5.arg0 = s.target___49042;
+    s.callLocIdx = 1878; s.pc = 39; return s.tmp_5;
   case 39:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -51713,17 +52099,17 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 17; continue; }
   case 14:
-    r0 = (s.vy___19554 > 0);
+    r0 = (s.vy___49050 > 0);
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBool(s.tmp_8);
     if (r0) { step = 15; continue; }
     r0 = s.tmp_8;
     { step = 16; continue; }
   case 15:
-    s.tmp_9 = r0 = s.y___19552;
-    s.tmp_11 = tiles_Location_y__P2294_mk(s);
-    s.tmp_11.arg0 = s.target___19546;
-    s.callLocIdx = 1874; s.pc = 40; return s.tmp_11;
+    s.tmp_9 = r0 = s.y___49048;
+    s.tmp_11 = tiles_Location_y__P31713_mk(s);
+    s.tmp_11.arg0 = s.target___49042;
+    s.callLocIdx = 1879; s.pc = 40; return s.tmp_11;
   case 40:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -51735,112 +52121,112 @@ switch (step) {
   case 17:
     // jmp value (already in r0)
     s.tmp_13 = r0;
-    s.pastTargetVertically___19574 = (s.tmp_13);
-    s.tmp_0 = r0 = s.pastTargetHorizontally___19555;
+    s.pastTargetVertically___49070 = (s.tmp_13);
+    s.tmp_0 = r0 = s.pastTargetHorizontally___49051;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 18; continue; }
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    r0 = s.pastTargetVertically___19574;
+    r0 = s.pastTargetVertically___49070;
   case 19:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 24; continue; }
-    s.tmp_2 = r0 = s.pfs___19537;
+    s.tmp_2 = r0 = s.pfs___49033;
     r0 = s.tmp_2.fields["index"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["index"] = (s.tmp_3);
-    r0 = s.pfs___19537.fields["index"];
+    r0 = s.pfs___49033.fields["index"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.path___19544, s.tmp_0);
-    s.newTarget___19599 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.newTarget___19599);
+    r0 = pxsim_Array__getAt(s.path___49040, s.tmp_0);
+    s.newTarget___49095 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.newTarget___49095);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    s.tmp_2 = Sprite_setVelocity__P2073_mk(s);
-    s.tmp_2.arg0 = s.sprite___19542;
+    s.tmp_2 = Sprite_setVelocity__P31492_mk(s);
+    s.tmp_2.arg0 = s.sprite___49038;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 1875; s.pc = 41; return s.tmp_2;
+    s.callLocIdx = 1880; s.pc = 41; return s.tmp_2;
   case 41:
     r0 = s.retval;
-    s.tmp_0 = tiles_Location_place__P2296_mk(s);
-    s.tmp_0.arg0 = s.target___19546;
-    s.tmp_0.arg1 = s.sprite___19542;
-    s.callLocIdx = 1876; s.pc = 42; return s.tmp_0;
+    s.tmp_0 = tiles_Location_place__P31715_mk(s);
+    s.tmp_0.arg0 = s.target___49042;
+    s.tmp_0.arg1 = s.sprite___49038;
+    s.callLocIdx = 1881; s.pc = 42; return s.tmp_0;
   case 42:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeAt(s.store___19524, s.i___19530);
-    r0 = s.pfs___19537.fields["onEndHandler"];
+    r0 = pxsim_Array_.removeAt(s.store___49020, s.i___49026);
+    r0 = s.pfs___49033.fields["onEndHandler"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
     s.tmp_1 = if_onEndHandler_1_mk(s);
-    s.tmp_1.arg0 = s.pfs___19537;
+    s.tmp_1.arg0 = s.pfs___49033;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "onEndHandler"), 1);
-      s.callLocIdx = 1877; s.pc = 43; return s.tmp_1;
+      s.callLocIdx = 1882; s.pc = 43; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["onEndHandler"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["onEndHandler"], 1); s.callLocIdx = 1877; s.pc = 43; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1877; s.pc = 43; return s.tmp_1;; }
-     else { s.callLocIdx = 1877; s.pc = 43; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["onEndHandler"], 1); s.callLocIdx = 1882; s.pc = 43; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1882; s.pc = 43; return s.tmp_1;; }
+     else { s.callLocIdx = 1882; s.pc = 43; return s.tmp_1; }
     }
   case 43:
     r0 = s.retval;
     { step = 21; continue; }
   case 20:
-    r0 = pxsim_pxtcore_mkAction(3, inline__P19621);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P49117);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite___19542);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.path___19544);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.pfs___19537);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_1.arg0 = s.handlers___19527;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite___49038);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.path___49040);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.pfs___49033);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_1.arg0 = s.handlers___49023;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1880; s.pc = 44; return s.tmp_1;
+    s.callLocIdx = 1885; s.pc = 44; return s.tmp_1;
   case 44:
     r0 = s.retval;
   case 21:
     { step = 23; continue; }
   case 22:
-    s.tmp_0 = tiles_Location_place__P2296_mk(s);
-    s.tmp_0.arg0 = s.target___19546;
-    s.tmp_0.arg1 = s.sprite___19542;
-    s.callLocIdx = 1881; s.pc = 45; return s.tmp_0;
+    s.tmp_0 = tiles_Location_place__P31715_mk(s);
+    s.tmp_0.arg0 = s.target___49042;
+    s.tmp_0.arg1 = s.sprite___49038;
+    s.callLocIdx = 1886; s.pc = 45; return s.tmp_0;
   case 45:
     r0 = s.retval;
-    s.tmp_0 = scene_setVelocityTowards__P6095_mk(s);
-    s.tmp_0.arg0 = s.sprite___19542;
-    s.tmp_0.arg1 = s.newTarget___19599;
-    s.tmp_0.arg2 = s.speed___19545;
-    s.callLocIdx = 1882; s.pc = 46; return s.tmp_0;
+    s.tmp_0 = scene_setVelocityTowards__P35617_mk(s);
+    s.tmp_0.arg0 = s.sprite___49038;
+    s.tmp_0.arg1 = s.newTarget___49095;
+    s.tmp_0.arg2 = s.speed___49041;
+    s.callLocIdx = 1887; s.pc = 46; return s.tmp_0;
   case 46:
     r0 = s.retval;
   case 23:
   case 24:
   case 25:
-    r0 = (s.i___19530 - 1);
-    s.i___19530 = (r0);
+    r0 = (s.i___49026 - 1);
+    s.i___49026 = (r0);
     { step = 1; continue; }
   case 26:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P19523.info = {"start":896,"length":2006,"line":29,"column":26,"endLine":70,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
+inline__P49019.info = {"start":896,"length":2006,"line":29,"column":26,"endLine":70,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P19523_mk(s) {
+function inline__P49019_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P19523, depth: s.depth + 1,
+        parent: s, fn: inline__P49019, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51856,29 +52242,29 @@ function inline__P19523_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  store___19524: undefined,
-  handlers___19527: undefined,
-  i___19530: undefined,
-  pfs___19537: undefined,
-  sprite___19542: undefined,
-  index___19543: undefined,
-  path___19544: undefined,
-  speed___19545: undefined,
-  target___19546: undefined,
-  x___19551: undefined,
-  y___19552: undefined,
-  vx___19553: undefined,
-  vy___19554: undefined,
-  pastTargetHorizontally___19555: undefined,
-  pastTargetVertically___19574: undefined,
-  newTarget___19599: undefined,
+  store___49020: undefined,
+  handlers___49023: undefined,
+  i___49026: undefined,
+  pfs___49033: undefined,
+  sprite___49038: undefined,
+  index___49039: undefined,
+  path___49040: undefined,
+  speed___49041: undefined,
+  target___49042: undefined,
+  x___49047: undefined,
+  y___49048: undefined,
+  vx___49049: undefined,
+  vy___49050: undefined,
+  pastTargetHorizontally___49051: undefined,
+  pastTargetVertically___49070: undefined,
+  newTarget___49095: undefined,
 } }
 
 
 
 
 
-function inline__P19621(s) {
+function inline__P49117(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51912,12 +52298,12 @@ switch (step) {
     s.tmp_3.arg2 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       setupLambda(s.tmp_3, pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "handler"), 3);
-      s.callLocIdx = 1879; s.pc = 3; return s.tmp_3;
+      s.callLocIdx = 1884; s.pc = 3; return s.tmp_3;
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["handler"];
-      if (s.tmp_3.fn == null) { setupLambda(s.tmp_3, s.tmp_3.arg0.fields["handler"], 3); s.callLocIdx = 1879; s.pc = 3; return s.tmp_3; }
-      else if (s.tmp_3.fn.isGetter) { s.tmp_3.stage2Call = true; s.callLocIdx = 1879; s.pc = 3; return s.tmp_3;; }
-     else { s.callLocIdx = 1879; s.pc = 3; return s.tmp_3; }
+      if (s.tmp_3.fn == null) { setupLambda(s.tmp_3, s.tmp_3.arg0.fields["handler"], 3); s.callLocIdx = 1884; s.pc = 3; return s.tmp_3; }
+      else if (s.tmp_3.fn.isGetter) { s.tmp_3.stage2Call = true; s.callLocIdx = 1884; s.pc = 3; return s.tmp_3;; }
+     else { s.callLocIdx = 1884; s.pc = 3; return s.tmp_3; }
     }
   case 3:
     r0 = s.retval;
@@ -51927,12 +52313,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P19621.info = {"start":2359,"length":274,"line":58,"column":49,"endLine":62,"endColumn":33,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["completionHandler"]}
+inline__P49117.info = {"start":2359,"length":274,"line":58,"column":49,"endLine":62,"endColumn":33,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["completionHandler"]}
 
-function inline__P19621_mk(s) {
+function inline__P49117_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P19621, depth: s.depth + 1,
+        parent: s, fn: inline__P49117, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51948,7 +52334,7 @@ function inline__P19621_mk(s) {
 
 
 
-function scene_getPathCompletionEvents__P6097(s) {
+function scene_getPathCompletionEvents__P35619(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51958,23 +52344,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_2 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1920; s.pc = 1; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1925; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_data"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_COMPLETION_KEY___6089);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_COMPLETION_KEY___35611);
     return leave(s, r0)
   default: oops()
 } } }
-scene_getPathCompletionEvents__P6097.info = {"start":10081,"length":152,"line":278,"column":4,"endLine":280,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathCompletionEvents","argumentNames":[]}
+scene_getPathCompletionEvents__P35619.info = {"start":10081,"length":152,"line":278,"column":4,"endLine":280,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathCompletionEvents","argumentNames":[]}
 
-function scene_getPathCompletionEvents__P6097_mk(s) {
+function scene_getPathCompletionEvents__P35619_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_getPathCompletionEvents__P6097, depth: s.depth + 1,
+        parent: s, fn: scene_getPathCompletionEvents__P35619, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51985,7 +52371,7 @@ function scene_getPathCompletionEvents__P6097_mk(s) {
 
 
 
-function scene_PathFollowingSprite_constructor__P6091(s) {
+function scene_PathFollowingSprite_constructor__P35613(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52003,7 +52389,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_PathFollowingSprite__C6090_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_PathFollowingSprite__C35612_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sprite"] = (s.arg1);
     r0 = (s.arg0).fields["path"] = (s.arg2);
     r0 = (s.arg0).fields["speed"] = (s.arg3);
@@ -52012,12 +52398,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_PathFollowingSprite_constructor__P6091.info = {"start":247,"length":174,"line":8,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["this","sprite","path","speed"]}
+scene_PathFollowingSprite_constructor__P35613.info = {"start":247,"length":174,"line":8,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["this","sprite","path","speed"]}
 
-function scene_PathFollowingSprite_constructor__P6091_mk(s) {
+function scene_PathFollowingSprite_constructor__P35613_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_PathFollowingSprite_constructor__P6091, depth: s.depth + 1,
+        parent: s, fn: scene_PathFollowingSprite_constructor__P35613, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -52029,7 +52415,7 @@ function scene_PathFollowingSprite_constructor__P6091_mk(s) {
 
 
 
-function tiles_TileMap_isOnWall__P2338(s) {
+function tiles_TileMap_isOnWall__P31757(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52039,25 +52425,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hbox___19758 = undefined;
-    s.left___19761 = undefined;
-    s.right___19767 = undefined;
-    s.top___19773 = undefined;
-    s.bottom___19779 = undefined;
-    s.col___19785 = undefined;
-    s.row___19791 = undefined;
+    s.hbox___49254 = undefined;
+    s.left___49257 = undefined;
+    s.right___49263 = undefined;
+    s.top___49269 = undefined;
+    s.bottom___49275 = undefined;
+    s.col___49281 = undefined;
+    s.row___49287 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg1.fields["_hitbox"];
-    s.hbox___19758 = (r0);
-    s.tmp_1 = game_Hitbox_left__P1966_mk(s);
-    s.tmp_1.arg0 = s.hbox___19758;
-    s.callLocIdx = 960; s.pc = 8; return s.tmp_1;
+    s.hbox___49254 = (r0);
+    s.tmp_1 = game_Hitbox_left__P31385_mk(s);
+    s.tmp_1.arg0 = s.hbox___49254;
+    s.callLocIdx = 917; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52066,10 +52452,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.left___19761 = (r0);
-    s.tmp_1 = game_Hitbox_right__P1968_mk(s);
-    s.tmp_1.arg0 = s.hbox___19758;
-    s.callLocIdx = 963; s.pc = 9; return s.tmp_1;
+    s.left___49257 = (r0);
+    s.tmp_1 = game_Hitbox_right__P31387_mk(s);
+    s.tmp_1.arg0 = s.hbox___49254;
+    s.callLocIdx = 920; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52078,10 +52464,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.right___19767 = (r0);
-    s.tmp_1 = game_Hitbox_top__P1967_mk(s);
-    s.tmp_1.arg0 = s.hbox___19758;
-    s.callLocIdx = 966; s.pc = 10; return s.tmp_1;
+    s.right___49263 = (r0);
+    s.tmp_1 = game_Hitbox_top__P31386_mk(s);
+    s.tmp_1.arg0 = s.hbox___49254;
+    s.callLocIdx = 923; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52090,10 +52476,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.top___19773 = (r0);
-    s.tmp_1 = game_Hitbox_bottom__P1969_mk(s);
-    s.tmp_1.arg0 = s.hbox___19758;
-    s.callLocIdx = 969; s.pc = 11; return s.tmp_1;
+    s.top___49269 = (r0);
+    s.tmp_1 = game_Hitbox_bottom__P31388_mk(s);
+    s.tmp_1.arg0 = s.hbox___49254;
+    s.callLocIdx = 926; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52102,24 +52488,24 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.bottom___19779 = (r0);
-    s.col___19785 = (s.left___19761);
+    s.bottom___49275 = (r0);
+    s.col___49281 = (s.left___49257);
   case 1:
-    r0 = (s.col___19785 <= s.right___19767);
+    r0 = (s.col___49281 <= s.right___49263);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.row___19791 = (s.top___19773);
+    s.row___49287 = (s.top___49269);
   case 2:
-    r0 = (s.row___19791 <= s.bottom___19779);
+    r0 = (s.row___49287 <= s.bottom___49275);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.tmp_2 = tiles_TileMap_isObstacle__P31755_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.col___19785;
-    s.tmp_2.arg2 = s.row___19791;
-    s.callLocIdx = 972; s.pc = 12; return s.tmp_2;
+    s.tmp_2.arg1 = s.col___49281;
+    s.tmp_2.arg2 = s.row___49287;
+    s.callLocIdx = 929; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -52129,12 +52515,12 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = (s.row___19791 + 1);
-    s.row___19791 = (r0);
+    r0 = (s.row___49287 + 1);
+    s.row___49287 = (r0);
     { step = 2; continue; }
   case 5:
-    r0 = (s.col___19785 + 1);
-    s.col___19785 = (r0);
+    r0 = (s.col___49281 + 1);
+    s.col___49281 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = false;
@@ -52142,24 +52528,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isOnWall__P2338.info = {"start":13062,"length":627,"line":423,"column":8,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isOnWall","argumentNames":["this","s"]}
+tiles_TileMap_isOnWall__P31757.info = {"start":13062,"length":627,"line":423,"column":8,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"isOnWall","argumentNames":["this","s"]}
 
-function tiles_TileMap_isOnWall__P2338_mk(s) {
+function tiles_TileMap_isOnWall__P31757_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isOnWall__P2338, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isOnWall__P31757, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  hbox___19758: undefined,
-  left___19761: undefined,
-  right___19767: undefined,
-  top___19773: undefined,
-  bottom___19779: undefined,
-  col___19785: undefined,
-  row___19791: undefined,
+  hbox___49254: undefined,
+  left___49257: undefined,
+  right___49263: undefined,
+  top___49269: undefined,
+  bottom___49275: undefined,
+  col___49281: undefined,
+  row___49287: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52168,7 +52554,7 @@ function tiles_TileMap_isOnWall__P2338_mk(s) {
 
 
 
-function game_Hitbox_bottom__P1969(s) {
+function game_Hitbox_bottom__P31388(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52183,12 +52569,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C31378_VT)) failedCast(r0);
     r0 = s.arg0.fields["height"];
     s.tmp_1 = r0;
-    s.tmp_3 = game_Hitbox_top__P1967_mk(s);
+    s.tmp_3 = game_Hitbox_top__P31386_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 256; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 213; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -52198,13 +52584,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_bottom__P1969.info = {"start":742,"length":139,"line":31,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"bottom","argumentNames":["this"]}
-game_Hitbox_bottom__P1969.isGetter = true;
+game_Hitbox_bottom__P31388.info = {"start":742,"length":139,"line":31,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game---hw/hitbox.ts","functionName":"bottom","argumentNames":["this"]}
+game_Hitbox_bottom__P31388.isGetter = true;
 
-function game_Hitbox_bottom__P1969_mk(s) {
+function game_Hitbox_bottom__P31388_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_bottom__P1969, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_bottom__P31388, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52217,7 +52603,7 @@ function game_Hitbox_bottom__P1969_mk(s) {
 
 
 
-function game_Hitbox_right__P1968(s) {
+function game_Hitbox_right__P31387(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52232,12 +52618,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C31378_VT)) failedCast(r0);
     r0 = s.arg0.fields["width"];
     s.tmp_1 = r0;
-    s.tmp_3 = game_Hitbox_left__P1966_mk(s);
+    s.tmp_3 = game_Hitbox_left__P31385_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 253; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 210; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -52247,13 +52633,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_right__P1968.info = {"start":594,"length":138,"line":24,"column":8,"endLine":29,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"right","argumentNames":["this"]}
-game_Hitbox_right__P1968.isGetter = true;
+game_Hitbox_right__P31387.info = {"start":594,"length":138,"line":24,"column":8,"endLine":29,"endColumn":9,"fileName":"pxt_modules/game---hw/hitbox.ts","functionName":"right","argumentNames":["this"]}
+game_Hitbox_right__P31387.isGetter = true;
 
-function game_Hitbox_right__P1968_mk(s) {
+function game_Hitbox_right__P31387_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_right__P1968, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_right__P31387, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52266,7 +52652,7 @@ function game_Hitbox_right__P1968_mk(s) {
 
 
 
-function game_Hitbox_top__P1967(s) {
+function game_Hitbox_top__P31386(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52281,7 +52667,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C31378_VT)) failedCast(r0);
     r0 = s.arg0.fields["oy"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["parent"];
@@ -52291,13 +52677,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_top__P1967.info = {"start":511,"length":73,"line":20,"column":8,"endLine":22,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"top","argumentNames":["this"]}
-game_Hitbox_top__P1967.isGetter = true;
+game_Hitbox_top__P31386.info = {"start":511,"length":73,"line":20,"column":8,"endLine":22,"endColumn":9,"fileName":"pxt_modules/game---hw/hitbox.ts","functionName":"top","argumentNames":["this"]}
+game_Hitbox_top__P31386.isGetter = true;
 
-function game_Hitbox_top__P1967_mk(s) {
+function game_Hitbox_top__P31386_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_top__P1967, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_top__P31386, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52308,7 +52694,7 @@ function game_Hitbox_top__P1967_mk(s) {
 
 
 
-function game_Hitbox_left__P1966(s) {
+function game_Hitbox_left__P31385(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52323,7 +52709,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C31378_VT)) failedCast(r0);
     r0 = s.arg0.fields["ox"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["parent"];
@@ -52333,13 +52719,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_left__P1966.info = {"start":427,"length":74,"line":16,"column":8,"endLine":18,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"left","argumentNames":["this"]}
-game_Hitbox_left__P1966.isGetter = true;
+game_Hitbox_left__P31385.info = {"start":427,"length":74,"line":16,"column":8,"endLine":18,"endColumn":9,"fileName":"pxt_modules/game---hw/hitbox.ts","functionName":"left","argumentNames":["this"]}
+game_Hitbox_left__P31385.isGetter = true;
 
-function game_Hitbox_left__P1966_mk(s) {
+function game_Hitbox_left__P31385_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_left__P1966, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_left__P31385, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52350,7 +52736,7 @@ function game_Hitbox_left__P1966_mk(s) {
 
 
 
-function Fx_toIntShifted__P151(s) {
+function Fx_toIntShifted__P29686(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52372,12 +52758,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toIntShifted__P151.info = {"start":404,"length":102,"line":17,"column":4,"endLine":19,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toIntShifted","argumentNames":["a","n"]}
+Fx_toIntShifted__P29686.info = {"start":404,"length":102,"line":17,"column":4,"endLine":19,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toIntShifted","argumentNames":["a","n"]}
 
-function Fx_toIntShifted__P151_mk(s) {
+function Fx_toIntShifted__P29686_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toIntShifted__P151, depth: s.depth + 1,
+        parent: s, fn: Fx_toIntShifted__P29686, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52389,7 +52775,7 @@ function Fx_toIntShifted__P151_mk(s) {
 
 
 
-function sprites_allOfKind__P1975(s) {
+function sprites_allOfKind__P31394(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52399,17 +52785,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.spritesByKind___19846 = undefined;
+    s.spritesByKind___49342 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 271; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 228; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = r0.fields["spritesByKind"];
-    s.spritesByKind___19846 = (r0);
+    s.spritesByKind___49342 = (r0);
     r0 = (s.arg0 >= 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -52421,7 +52807,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___19846, s.arg0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___49342, s.arg0);
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -52435,10 +52821,10 @@ switch (step) {
     { step = 5; continue; }
     { step = 4; continue; }
   case 3:
-    s.tmp_6 = sprites_SpriteSet_sprites__P2115_mk(s);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___19846, s.arg0);
+    s.tmp_6 = sprites_SpriteSet_sprites__P31534_mk(s);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___49342, s.arg0);
     s.tmp_6.arg0 = r0;
-    s.callLocIdx = 272; s.pc = 7; return s.tmp_6;
+    s.callLocIdx = 229; s.pc = 7; return s.tmp_6;
   case 7:
     r0 = s.retval;
     { step = 5; continue; }
@@ -52448,12 +52834,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_allOfKind__P1975.info = {"start":1561,"length":234,"line":56,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game/sprites.ts","functionName":"allOfKind","argumentNames":["kind"]}
+sprites_allOfKind__P31394.info = {"start":1561,"length":234,"line":56,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game---hw/sprites.ts","functionName":"allOfKind","argumentNames":["kind"]}
 
-function sprites_allOfKind__P1975_mk(s) {
+function sprites_allOfKind__P31394_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_allOfKind__P1975, depth: s.depth + 1,
+        parent: s, fn: sprites_allOfKind__P31394, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52462,7 +52848,7 @@ function sprites_allOfKind__P1975_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  spritesByKind___19846: undefined,
+  spritesByKind___49342: undefined,
   arg0: undefined,
 } }
 
@@ -52470,7 +52856,7 @@ function sprites_allOfKind__P1975_mk(s) {
 
 
 
-function sprites_SpriteSet_sprites__P2115(s) {
+function sprites_SpriteSet_sprites__P31534(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52485,8 +52871,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
-    s.tmp_0 = helpers_arraySlice__P112_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteSet__C31530_VT)) failedCast(r0);
+    s.tmp_0 = helpers_arraySlice__P29647_mk(s);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
@@ -52494,18 +52880,18 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 525; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 482; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_sprites__P2115.info = {"start":787,"length":86,"line":33,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"sprites","argumentNames":["this"]}
+sprites_SpriteSet_sprites__P31534.info = {"start":787,"length":86,"line":33,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"sprites","argumentNames":["this"]}
 
-function sprites_SpriteSet_sprites__P2115_mk(s) {
+function sprites_SpriteSet_sprites__P31534_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_sprites__P2115, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_sprites__P31534, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52516,7 +52902,7 @@ function sprites_SpriteSet_sprites__P2115_mk(s) {
 
 
 
-function tiles_getTileLocation__P2344(s) {
+function tiles_getTileLocation__P31763(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52526,17 +52912,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___19872 = undefined;
+    s.scene___49368 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 988; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 945; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.scene___19872 = (r0);
+    s.scene___49368 = (r0);
     r0 = (s.arg0 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -52553,7 +52939,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 4; continue; }
   case 3:
-    r0 = s.scene___19872.fields["tileMap"];
+    r0 = s.scene___49368.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -52567,24 +52953,24 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    s.tmp_5 = tiles_TileMap_getTile__P2329_mk(s);
-    r0 = s.scene___19872.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getTile__P31748_mk(s);
+    r0 = s.scene___49368.fields["tileMap"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg0;
     s.tmp_5.arg2 = s.arg1;
-    s.callLocIdx = 989; s.pc = 9; return s.tmp_5;
+    s.callLocIdx = 946; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getTileLocation__P2344.info = {"start":16285,"length":247,"line":515,"column":4,"endLine":519,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileLocation","argumentNames":["col","row"]}
+tiles_getTileLocation__P31763.info = {"start":16285,"length":247,"line":515,"column":4,"endLine":519,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTileLocation","argumentNames":["col","row"]}
 
-function tiles_getTileLocation__P2344_mk(s) {
+function tiles_getTileLocation__P31763_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getTileLocation__P2344, depth: s.depth + 1,
+        parent: s, fn: tiles_getTileLocation__P31763, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52592,7 +52978,7 @@ function tiles_getTileLocation__P2344_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___19872: undefined,
+  scene___49368: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52601,7 +52987,7 @@ function tiles_getTileLocation__P2344_mk(s) {
 
 
 
-function tiles_TileMap_getTile__P2329(s) {
+function tiles_TileMap_getTile__P31748(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52618,27 +53004,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C31708_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = tiles_Location_constructor__P2292_mk(s);
+    s.tmp_1 = tiles_Location_constructor__P31711_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
     s.tmp_1.arg3 = s.arg0;
-    s.callLocIdx = 907; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 864; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTile__P2329.info = {"start":7259,"length":111,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTile","argumentNames":["this","col","row"]}
+tiles_TileMap_getTile__P31748.info = {"start":7259,"length":111,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTile","argumentNames":["this","col","row"]}
 
-function tiles_TileMap_getTile__P2329_mk(s) {
+function tiles_TileMap_getTile__P31748_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTile__P2329, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTile__P31748, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52651,7 +53037,7 @@ function tiles_TileMap_getTile__P2329_mk(s) {
 
 
 
-function tiles_setWallAt__P2343(s) {
+function tiles_setWallAt__P31762(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52661,18 +53047,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___19914 = undefined;
-    s.scale___19924 = undefined;
+    s.scene___49410 = undefined;
+    s.scale___49420 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 983; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 940; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___19914 = (r0);
+    s.scene___49410 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -52682,7 +53068,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___19914.fields["tileMap"];
+    r0 = s.scene___49410.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -52696,31 +53082,31 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    r0 = s.scene___19914.fields["tileMap"];
+    r0 = s.scene___49410.fields["tileMap"];
     s.tmp_5 = r0;
     r0 = s.tmp_5.fields["_scale"];
-    s.scale___19924 = (r0);
-    s.tmp_0 = tiles_TileMap_setWallAt__P2333_mk(s);
-    r0 = s.scene___19914.fields["tileMap"];
+    s.scale___49420 = (r0);
+    s.tmp_0 = tiles_TileMap_setWallAt__P31752_mk(s);
+    r0 = s.scene___49410.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_2 = tiles_Location_x__P2293_mk(s);
+    s.tmp_2 = tiles_Location_x__P31712_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 985; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 942; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 >> s.scale___19924);
+    r0 = (s.tmp_1 >> s.scale___49420);
     s.tmp_0.arg1 = r0;
-    s.tmp_4 = tiles_Location_y__P2294_mk(s);
+    s.tmp_4 = tiles_Location_y__P31713_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 986; s.pc = 9; return s.tmp_4;
+    s.callLocIdx = 943; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> s.scale___19924);
+    r0 = (s.tmp_3 >> s.scale___49420);
     s.tmp_0.arg2 = r0;
     s.tmp_0.arg3 = s.arg1;
-    s.callLocIdx = 987; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 944; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 5:
@@ -52728,12 +53114,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_setWallAt__P2343.info = {"start":15717,"length":271,"line":499,"column":4,"endLine":504,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWallAt","argumentNames":["loc","on"]}
+tiles_setWallAt__P31762.info = {"start":15717,"length":271,"line":499,"column":4,"endLine":504,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setWallAt","argumentNames":["loc","on"]}
 
-function tiles_setWallAt__P2343_mk(s) {
+function tiles_setWallAt__P31762_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_setWallAt__P2343, depth: s.depth + 1,
+        parent: s, fn: tiles_setWallAt__P31762, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52741,8 +53127,8 @@ function tiles_setWallAt__P2343_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___19914: undefined,
-  scale___19924: undefined,
+  scene___49410: undefined,
+  scale___49420: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52751,7 +53137,7 @@ function tiles_setWallAt__P2343_mk(s) {
 
 
 
-function tiles_TileMap_setWallAt__P2333(s) {
+function tiles_TileMap_setWallAt__P31752(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52769,13 +53155,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_3 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_3 = tiles_TileMapData_isOutsideMap__P31735_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.arg1;
     s.tmp_3.arg2 = s.arg2;
-    s.callLocIdx = 915; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 872; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -52785,13 +53171,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_4 = tiles_TileMapData_setWall__P2314_mk(s);
+    s.tmp_4 = tiles_TileMapData_setWall__P31733_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.arg1;
     s.tmp_4.arg2 = s.arg2;
     s.tmp_4.arg3 = s.arg3;
-    s.callLocIdx = 916; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 873; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
   case 1:
@@ -52800,12 +53186,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_setWallAt__P2333.info = {"start":8206,"length":173,"line":297,"column":8,"endLine":300,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWallAt","argumentNames":["this","col","row","on"]}
+tiles_TileMap_setWallAt__P31752.info = {"start":8206,"length":173,"line":297,"column":8,"endLine":300,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setWallAt","argumentNames":["this","col","row","on"]}
 
-function tiles_TileMap_setWallAt__P2333_mk(s) {
+function tiles_TileMap_setWallAt__P31752_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_setWallAt__P2333, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_setWallAt__P31752, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52822,7 +53208,7 @@ function tiles_TileMap_setWallAt__P2333_mk(s) {
 
 
 
-function tiles_TileMapData_setWall__P2314(s) {
+function tiles_TileMapData_setWall__P31733(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52840,7 +53226,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C31723_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg3);
     if (!r0) { step = 1; continue; }
     r0 = 2;
@@ -52857,12 +53243,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_setWall__P2314.info = {"start":5326,"length":127,"line":191,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWall","argumentNames":["this","col","row","on"]}
+tiles_TileMapData_setWall__P31733.info = {"start":5326,"length":127,"line":191,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"setWall","argumentNames":["this","col","row","on"]}
 
-function tiles_TileMapData_setWall__P2314_mk(s) {
+function tiles_TileMapData_setWall__P31733_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_setWall__P2314, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_setWall__P31733, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52876,7 +53262,7 @@ function tiles_TileMapData_setWall__P2314_mk(s) {
 
 
 
-function info_onCountdownEnd__P2215(s) {
+function info_onCountdownEnd__P31634(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52890,21 +53276,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_initHUD__P4276_mk(s);
-    s.callLocIdx = 811; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = info_initHUD__P33769_mk(s);
+    s.callLocIdx = 768; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = (globals.infoState___4230).fields["countdownEndHandler"] = (s.arg0);
+    r0 = (globals.infoState___33723).fields["countdownEndHandler"] = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_onCountdownEnd__P2215.info = {"start":10271,"length":127,"line":351,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"onCountdownEnd","argumentNames":["handler"]}
+info_onCountdownEnd__P31634.info = {"start":10271,"length":127,"line":351,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"onCountdownEnd","argumentNames":["handler"]}
 
-function info_onCountdownEnd__P2215_mk(s) {
+function info_onCountdownEnd__P31634_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_onCountdownEnd__P2215, depth: s.depth + 1,
+        parent: s, fn: info_onCountdownEnd__P31634, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -52914,7 +53300,7 @@ function info_onCountdownEnd__P2215_mk(s) {
 
 
 
-function info_startCountdown__P2213(s) {
+function info_startCountdown__P31632(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52928,15 +53314,15 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_updateFlag__P4280_mk(s);
+    s.tmp_0 = info_updateFlag__P33773_mk(s);
     s.tmp_0.arg0 = 1;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 807; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 764; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.infoState___4230;
-    s.tmp_4 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 808; s.pc = 2; return s.tmp_4;
+    s.tmp_0 = r0 = globals.infoState___33723;
+    s.tmp_4 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 765; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -52947,17 +53333,17 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_5);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["gameEnd"] = (s.tmp_1);
-    r0 = (globals.infoState___4230).fields["countdownExpired"] = (false);
+    r0 = (globals.infoState___33723).fields["countdownExpired"] = (false);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_startCountdown__P2213.info = {"start":9395,"length":224,"line":326,"column":4,"endLine":330,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"startCountdown","argumentNames":["duration"]}
+info_startCountdown__P31632.info = {"start":9395,"length":224,"line":326,"column":4,"endLine":330,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"startCountdown","argumentNames":["duration"]}
 
-function info_startCountdown__P2213_mk(s) {
+function info_startCountdown__P31632_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_startCountdown__P2213, depth: s.depth + 1,
+        parent: s, fn: info_startCountdown__P31632, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52972,7 +53358,7 @@ function info_startCountdown__P2213_mk(s) {
 
 
 
-function timer_after__P3594(s) {
+function timer_after__P33128(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52987,22 +53373,22 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = setTimeout__P412_mk(s);
+    s.tmp_0 = setTimeout__P29947_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1747; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1752; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-timer_after__P3594.info = {"start":317,"length":96,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"after","argumentNames":["time","thenDo"]}
+timer_after__P33128.info = {"start":317,"length":96,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"after","argumentNames":["time","thenDo"]}
 
-function timer_after__P3594_mk(s) {
+function timer_after__P33128_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: timer_after__P3594, depth: s.depth + 1,
+        parent: s, fn: timer_after__P33128, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53013,7 +53399,7 @@ function timer_after__P3594_mk(s) {
 
 
 
-function setTimeout__P412(s) {
+function setTimeout__P29947(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53028,7 +53414,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = control_setInterval__P343_mk(s);
+    s.tmp_0 = control_setInterval__P29878_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = 1;
@@ -53038,12 +53424,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-setTimeout__P412.info = {"start":610,"length":139,"line":26,"column":0,"endLine":28,"endColumn":1,"fileName":"pxt_modules/base/scheduling.ts","functionName":"setTimeout","argumentNames":["func","delay"]}
+setTimeout__P29947.info = {"start":610,"length":139,"line":26,"column":0,"endLine":28,"endColumn":1,"fileName":"pxt_modules/base/scheduling.ts","functionName":"setTimeout","argumentNames":["func","delay"]}
 
-function setTimeout__P412_mk(s) {
+function setTimeout__P29947_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: setTimeout__P412, depth: s.depth + 1,
+        parent: s, fn: setTimeout__P29947, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53054,7 +53440,7 @@ function setTimeout__P412_mk(s) {
 
 
 
-function control_setInterval__P343(s) {
+function control_setInterval__P29878(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53064,7 +53450,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.interval___20498 = undefined;
+    s.interval___49994 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -53090,19 +53476,19 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals._intervals___3997);
+    r0 = pxsim_numops_toBoolDecr(globals._intervals___33532);
     s.tmp_4 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 5; continue; }
     r0 = pxsim_Array__mk();
-    globals._intervals___3997 = (r0);
+    globals._intervals___33532 = (r0);
   case 5:
   case 6:
-    r0 = pxsim_pxtcore_mkClassInstance(control_Interval__C3998_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_Interval__C33533_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_Interval_constructor__P4001_mk(s);
+    s.tmp_1 = control_Interval_constructor__P33536_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -53110,25 +53496,25 @@ switch (step) {
     s.callLocIdx = 31; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.interval___20498 = (s.tmp_0);
-    r0 = s.interval___20498.fields["id"];
+    s.interval___49994 = (s.tmp_0);
+    r0 = s.interval___49994.fields["id"];
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-control_setInterval__P343.info = {"start":1554,"length":266,"line":54,"column":4,"endLine":59,"endColumn":5,"fileName":"pxt_modules/base/interval.ts","functionName":"setInterval","argumentNames":["func","delay","mode"]}
+control_setInterval__P29878.info = {"start":1554,"length":266,"line":54,"column":4,"endLine":59,"endColumn":5,"fileName":"pxt_modules/base/interval.ts","functionName":"setInterval","argumentNames":["func","delay","mode"]}
 
-function control_setInterval__P343_mk(s) {
+function control_setInterval__P29878_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_setInterval__P343, depth: s.depth + 1,
+        parent: s, fn: control_setInterval__P29878, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  interval___20498: undefined,
+  interval___49994: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -53138,7 +53524,7 @@ function control_setInterval__P343_mk(s) {
 
 
 
-function control_Interval_constructor__P4001(s) {
+function control_Interval_constructor__P33536(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53156,8 +53542,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_Interval__C3998_VT)) failedCast(r0);
-    r0 = pxsim_Array__length(globals._intervals___3997);
+    if (!checkSubtype(r0, control_Interval__C33533_VT)) failedCast(r0);
+    r0 = pxsim_Array__length(globals._intervals___33532);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
@@ -53166,8 +53552,8 @@ switch (step) {
     r0 = 1;
     { step = 2; continue; }
   case 1:
-    s.tmp_3 = r0 = globals._intervals___3997;
-    r0 = pxsim_Array__length(globals._intervals___3997);
+    s.tmp_3 = r0 = globals._intervals___33532;
+    r0 = pxsim_Array__length(globals._intervals___33532);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 - 1);
     s.tmp_4 = r0;
@@ -53182,8 +53568,8 @@ switch (step) {
     r0 = (s.arg0).fields["func"] = (s.arg1);
     r0 = (s.arg0).fields["delay"] = (s.arg2);
     r0 = (s.arg0).fields["mode"] = (s.arg3);
-    r0 = pxsim_Array__push(globals._intervals___3997, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P20541);
+    r0 = pxsim_Array__push(globals._intervals___33532, s.arg0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P50037);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim.control.runInParallel(s.tmp_0);
@@ -53191,12 +53577,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_Interval_constructor__P4001.info = {"start":283,"length":367,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":["this","func","delay","mode"]}
+control_Interval_constructor__P33536.info = {"start":283,"length":367,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":["this","func","delay","mode"]}
 
-function control_Interval_constructor__P4001_mk(s) {
+function control_Interval_constructor__P33536_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_Interval_constructor__P4001, depth: s.depth + 1,
+        parent: s, fn: control_Interval_constructor__P33536, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53215,7 +53601,7 @@ function control_Interval_constructor__P4001_mk(s) {
 
 
 
-function inline__P20541(s) {
+function inline__P50037(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53225,7 +53611,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = control_Interval_work__P3999_mk(s);
+    s.tmp_0 = control_Interval_work__P33534_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 26; s.pc = 1; return s.tmp_0;
   case 1:
@@ -53234,12 +53620,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P20541.info = {"start":621,"length":17,"line":23,"column":34,"endLine":23,"endColumn":51,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":[]}
+inline__P50037.info = {"start":621,"length":17,"line":23,"column":34,"endLine":23,"endColumn":51,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P20541_mk(s) {
+function inline__P50037_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P20541, depth: s.depth + 1,
+        parent: s, fn: inline__P50037, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -53248,7 +53634,7 @@ function inline__P20541_mk(s) {
 
 
 
-function control_Interval_work__P3999(s) {
+function control_Interval_work__P33534(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53263,7 +53649,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_Interval__C3998_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_Interval__C33533_VT)) failedCast(r0);
     r0 = s.arg0.fields["mode"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(2, s.tmp_0);
@@ -53282,7 +53668,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = pause__P402_mk(s);
+    s.tmp_3 = pause__P29937_mk(s);
     r0 = s.arg0.fields["delay"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 27; s.pc = 13; return s.tmp_3;
@@ -53320,7 +53706,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_2 = pause__P402_mk(s);
+    s.tmp_2 = pause__P29937_mk(s);
     r0 = s.arg0.fields["delay"];
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 29; s.pc = 15; return s.tmp_2;
@@ -53350,17 +53736,17 @@ switch (step) {
     { step = 8; continue; }
   case 11:
   case 12:
-    r0 = pxsim_Array_.removeElement(globals._intervals___3997, s.arg0);
+    r0 = pxsim_Array_.removeElement(globals._intervals___33532, s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_Interval_work__P3999.info = {"start":660,"length":823,"line":26,"column":8,"endLine":47,"endColumn":9,"fileName":"pxt_modules/base/interval.ts","functionName":"work","argumentNames":["this"]}
+control_Interval_work__P33534.info = {"start":660,"length":823,"line":26,"column":8,"endLine":47,"endColumn":9,"fileName":"pxt_modules/base/interval.ts","functionName":"work","argumentNames":["this"]}
 
-function control_Interval_work__P3999_mk(s) {
+function control_Interval_work__P33534_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_Interval_work__P3999, depth: s.depth + 1,
+        parent: s, fn: control_Interval_work__P33534, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53373,7 +53759,7 @@ function control_Interval_work__P3999_mk(s) {
 
 
 
-function info_stopCountdown__P2214(s) {
+function info_stopCountdown__P31633(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53383,24 +53769,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_updateFlag__P4280_mk(s);
+    s.tmp_0 = info_updateFlag__P33773_mk(s);
     s.tmp_0.arg0 = 1;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 810; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 767; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = (globals.infoState___4230).fields["gameEnd"] = (undefined);
-    r0 = (globals.infoState___4230).fields["countdownExpired"] = (true);
+    r0 = (globals.infoState___33723).fields["gameEnd"] = (undefined);
+    r0 = (globals.infoState___33723).fields["countdownExpired"] = (true);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_stopCountdown__P2214.info = {"start":9829,"length":170,"line":338,"column":4,"endLine":342,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"stopCountdown","argumentNames":[]}
+info_stopCountdown__P31633.info = {"start":9829,"length":170,"line":338,"column":4,"endLine":342,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"stopCountdown","argumentNames":[]}
 
-function info_stopCountdown__P2214_mk(s) {
+function info_stopCountdown__P31633_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_stopCountdown__P2214, depth: s.depth + 1,
+        parent: s, fn: info_stopCountdown__P31633, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -53409,7 +53795,7 @@ function info_stopCountdown__P2214_mk(s) {
 
 
 
-function Sprite_setKind__P2071(s) {
+function Sprite_setKind__P31490(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53419,15 +53805,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.spritesByKind___20591 = undefined;
-    s.overlapMap___20620 = undefined;
+    s.spritesByKind___50087 = undefined;
+    s.overlapMap___50116 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = (s.arg1 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -53446,12 +53832,12 @@ switch (step) {
     { step = 15; continue; }
   case 3:
   case 4:
-    s.tmp_3 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 336; s.pc = 16; return s.tmp_3;
+    s.tmp_3 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 293; s.pc = 16; return s.tmp_3;
   case 16:
     r0 = s.retval;
     r0 = r0.fields["spritesByKind"];
-    s.spritesByKind___20591 = (r0);
+    s.spritesByKind___50087 = (r0);
     r0 = s.arg0.fields["_kind"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >= 0);
@@ -53463,19 +53849,19 @@ switch (step) {
   case 5:
     r0 = s.arg0.fields["_kind"];
     s.tmp_2 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20591, s.tmp_2);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___50087, s.tmp_2);
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = sprites_SpriteSet_remove__P2118_mk(s);
+    s.tmp_4 = sprites_SpriteSet_remove__P31537_mk(s);
     r0 = s.arg0.fields["_kind"];
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20591, s.tmp_5);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___50087, s.tmp_5);
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.arg0;
-    s.callLocIdx = 337; s.pc = 17; return s.tmp_4;
+    s.callLocIdx = 294; s.pc = 17; return s.tmp_4;
   case 17:
     r0 = s.retval;
   case 7:
@@ -53484,7 +53870,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20591, s.arg1);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___50087, s.arg1);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -53492,32 +53878,32 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteSet__C2111_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteSet__C31530_VT);
     s.tmp_4 = r0;
-    s.tmp_5 = sprites_SpriteSet_constructor__P2113_mk(s);
+    s.tmp_5 = sprites_SpriteSet_constructor__P31532_mk(s);
     s.tmp_5.arg0 = s.tmp_4;
-    s.callLocIdx = 338; s.pc = 18; return s.tmp_5;
+    s.callLocIdx = 295; s.pc = 18; return s.tmp_5;
   case 18:
     r0 = s.retval;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.spritesByKind___20591, s.arg1, s.tmp_4);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.spritesByKind___50087, s.arg1, s.tmp_4);
   case 9:
   case 10:
-    s.tmp_0 = sprites_SpriteSet_add__P2116_mk(s);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20591, s.arg1);
+    s.tmp_0 = sprites_SpriteSet_add__P31535_mk(s);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___50087, s.arg1);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 339; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 296; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
   case 11:
   case 12:
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 340; s.pc = 20; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 297; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     r0 = r0.fields["overlapMap"];
-    s.overlapMap___20620 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___20620, s.arg1);
+    s.overlapMap___50116 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___50116, s.arg1);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -53525,7 +53911,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    s.tmp_3 = r0 = s.overlapMap___20620;
+    s.tmp_3 = r0 = s.overlapMap___50116;
     s.tmp_4 = r0 = s.arg1;
     r0 = pxsim_Array__mk();
     s.tmp_5 = r0;
@@ -53533,7 +53919,7 @@ switch (step) {
   case 13:
   case 14:
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___20620, s.arg1);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___50116, s.arg1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_kindsOverlappedWith"] = (s.tmp_1);
     r0 = (s.arg0).fields["_kind"] = (s.arg1);
@@ -53542,12 +53928,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setKind__P2071.info = {"start":10872,"length":663,"line":398,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setKind","argumentNames":["this","value"]}
+Sprite_setKind__P31490.info = {"start":10872,"length":663,"line":398,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"setKind","argumentNames":["this","value"]}
 
-function Sprite_setKind__P2071_mk(s) {
+function Sprite_setKind__P31490_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setKind__P2071, depth: s.depth + 1,
+        parent: s, fn: Sprite_setKind__P31490, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53555,8 +53941,8 @@ function Sprite_setKind__P2071_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  spritesByKind___20591: undefined,
-  overlapMap___20620: undefined,
+  spritesByKind___50087: undefined,
+  overlapMap___50116: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -53565,7 +53951,7 @@ function Sprite_setKind__P2071_mk(s) {
 
 
 
-function sprites_SpriteSet_add__P2116(s) {
+function sprites_SpriteSet_add__P31535(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53581,7 +53967,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C31530_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -53612,12 +53998,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_add__P2116.info = {"start":1027,"length":263,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"add","argumentNames":["this","sprite"]}
+sprites_SpriteSet_add__P31535.info = {"start":1027,"length":263,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"add","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_add__P2116_mk(s) {
+function sprites_SpriteSet_add__P31535_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_add__P2116, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_add__P31535, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53633,7 +54019,7 @@ function sprites_SpriteSet_add__P2116_mk(s) {
 
 
 
-function sprites_SpriteSet_contains__P2119(s) {
+function sprites_SpriteSet_contains__P31538(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53649,7 +54035,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C31530_VT)) failedCast(r0);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_1 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_1, s.arg1, undefined);
@@ -53658,12 +54044,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_contains__P2119.info = {"start":2162,"length":100,"line":79,"column":8,"endLine":81,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"contains","argumentNames":["this","sprite"]}
+sprites_SpriteSet_contains__P31538.info = {"start":2162,"length":100,"line":79,"column":8,"endLine":81,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"contains","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_contains__P2119_mk(s) {
+function sprites_SpriteSet_contains__P31538_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_contains__P2119, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_contains__P31538, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53675,7 +54061,7 @@ function sprites_SpriteSet_contains__P2119_mk(s) {
 
 
 
-function sprites_SpriteSet_constructor__P2113(s) {
+function sprites_SpriteSet_constructor__P31532(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53690,7 +54076,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C31530_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -53699,12 +54085,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_constructor__P2113.info = {"start":488,"length":57,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"inline","argumentNames":["this"]}
+sprites_SpriteSet_constructor__P31532.info = {"start":488,"length":57,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"inline","argumentNames":["this"]}
 
-function sprites_SpriteSet_constructor__P2113_mk(s) {
+function sprites_SpriteSet_constructor__P31532_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_constructor__P2113, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_constructor__P31532, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53715,7 +54101,7 @@ function sprites_SpriteSet_constructor__P2113_mk(s) {
 
 
 
-function scene_onOverlapTile__P2108(s) {
+function scene_onOverlapTile__P31527(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53725,7 +54111,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tileOverlapHandlers___20677 = undefined;
+    s.tileOverlapHandlers___50173 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -53761,34 +54147,34 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    s.tmp_5 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 523; s.pc = 8; return s.tmp_5;
+    s.tmp_5 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 480; s.pc = 8; return s.tmp_5;
   case 8:
     r0 = s.retval;
     r0 = r0.fields["tileOverlapHandlers"];
-    s.tileOverlapHandlers___20677 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_TileOverlapHandler__C2396_VT);
+    s.tileOverlapHandlers___50173 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_TileOverlapHandler__C31815_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_TileOverlapHandler_constructor__P2397_mk(s);
+    s.tmp_1 = scene_TileOverlapHandler_constructor__P31816_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
     s.tmp_1.arg3 = s.arg2;
-    s.callLocIdx = 524; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 481; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.tileOverlapHandlers___20677, s.tmp_0);
+    r0 = pxsim_Array__push(s.tileOverlapHandlers___50173, s.tmp_0);
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_onOverlapTile__P2108.info = {"start":2785,"length":432,"line":89,"column":4,"endLine":100,"endColumn":5,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"onOverlapTile","argumentNames":["kind","tile","handler"]}
+scene_onOverlapTile__P31527.info = {"start":2785,"length":432,"line":89,"column":4,"endLine":100,"endColumn":5,"fileName":"pxt_modules/game---hw/spriteevents.ts","functionName":"onOverlapTile","argumentNames":["kind","tile","handler"]}
 
-function scene_onOverlapTile__P2108_mk(s) {
+function scene_onOverlapTile__P31527_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_onOverlapTile__P2108, depth: s.depth + 1,
+        parent: s, fn: scene_onOverlapTile__P31527, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53796,7 +54182,7 @@ function scene_onOverlapTile__P2108_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  tileOverlapHandlers___20677: undefined,
+  tileOverlapHandlers___50173: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -53806,7 +54192,7 @@ function scene_onOverlapTile__P2108_mk(s) {
 
 
 
-function scene_TileOverlapHandler_constructor__P2397(s) {
+function scene_TileOverlapHandler_constructor__P31816(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53824,7 +54210,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_TileOverlapHandler__C2396_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_TileOverlapHandler__C31815_VT)) failedCast(r0);
     r0 = (s.arg0).fields["spriteKind"] = (s.arg1);
     r0 = (s.arg0).fields["tileKind"] = (s.arg2);
     r0 = (s.arg0).fields["handler"] = (s.arg3);
@@ -53832,12 +54218,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_TileOverlapHandler_constructor__P2397.info = {"start":1075,"length":180,"line":37,"column":8,"endLine":41,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","spriteKind","tileKind","handler"]}
+scene_TileOverlapHandler_constructor__P31816.info = {"start":1075,"length":180,"line":37,"column":8,"endLine":41,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":["this","spriteKind","tileKind","handler"]}
 
-function scene_TileOverlapHandler_constructor__P2397_mk(s) {
+function scene_TileOverlapHandler_constructor__P31816_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_TileOverlapHandler_constructor__P2397, depth: s.depth + 1,
+        parent: s, fn: scene_TileOverlapHandler_constructor__P31816, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -53849,7 +54235,7 @@ function scene_TileOverlapHandler_constructor__P2397_mk(s) {
 
 
 
-function images_printCenter__P3645(s) {
+function images_printCenter__P33179(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53866,25 +54252,25 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
+    s.tmp_0 = helpers_imagePrintCenter__P31177_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = s.arg3;
     s.tmp_0.arg4 = undefined;
-    s.callLocIdx = 1787; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1792; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-images_printCenter__P3645.info = {"start":675,"length":123,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/arcade-text/images.ts","functionName":"printCenter","argumentNames":["i","text","y","color"]}
+images_printCenter__P33179.info = {"start":675,"length":123,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/arcade-text/images.ts","functionName":"printCenter","argumentNames":["i","text","y","color"]}
 
-function images_printCenter__P3645_mk(s) {
+function images_printCenter__P33179_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: images_printCenter__P3645, depth: s.depth + 1,
+        parent: s, fn: images_printCenter__P33179, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53897,7 +54283,7 @@ function images_printCenter__P3645_mk(s) {
 
 
 
-function Math_map__P271(s) {
+function Math_map__P29806(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53929,12 +54315,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_map__P271.info = {"start":1093,"length":202,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/base/math.ts","functionName":"map","argumentNames":["value","fromLow","fromHigh","toLow","toHigh"]}
+Math_map__P29806.info = {"start":1093,"length":202,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/base/math.ts","functionName":"map","argumentNames":["value","fromLow","fromHigh","toLow","toHigh"]}
 
-function Math_map__P271_mk(s) {
+function Math_map__P29806_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_map__P271, depth: s.depth + 1,
+        parent: s, fn: Math_map__P29806, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53952,7 +54338,7 @@ function Math_map__P271_mk(s) {
 
 
 
-function helpers_imageFillRect__P1728(s) {
+function helpers_imageFillRect__P31146(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53972,17 +54358,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_pack__P4100_mk(s);
+    s.tmp_2 = helpers_pack__P33604_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = s.arg2;
-    s.callLocIdx = 121; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 73; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = helpers_pack__P4100_mk(s);
+    s.tmp_4 = helpers_pack__P33604_mk(s);
     s.tmp_4.arg0 = s.arg3;
     s.tmp_4.arg1 = s.arg4;
-    s.callLocIdx = 122; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 74; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -53991,12 +54377,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageFillRect__P1728.info = {"start":3650,"length":159,"line":131,"column":4,"endLine":133,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageFillRect","argumentNames":["img","x","y","w","h","c"]}
+helpers_imageFillRect__P31146.info = {"start":3650,"length":159,"line":131,"column":4,"endLine":133,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"imageFillRect","argumentNames":["img","x","y","w","h","c"]}
 
-function helpers_imageFillRect__P1728_mk(s) {
+function helpers_imageFillRect__P31146_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageFillRect__P1728, depth: s.depth + 1,
+        parent: s, fn: helpers_imageFillRect__P31146, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54015,7 +54401,7 @@ function helpers_imageFillRect__P1728_mk(s) {
 
 
 
-function scene_screenHeight__P2456(s) {
+function scene_screenHeight__P31875(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54025,16 +54411,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenHeight__P2456.info = {"start":876,"length":76,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenHeight","argumentNames":[]}
+scene_screenHeight__P31875.info = {"start":876,"length":76,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"screenHeight","argumentNames":[]}
 
-function scene_screenHeight__P2456_mk(s) {
+function scene_screenHeight__P31875_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenHeight__P2456, depth: s.depth + 1,
+        parent: s, fn: scene_screenHeight__P31875, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54042,7 +54428,7 @@ function scene_screenHeight__P2456_mk(s) {
 
 
 
-function scene_screenWidth__P2455(s) {
+function scene_screenWidth__P31874(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54052,16 +54438,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenWidth__P2455.info = {"start":604,"length":74,"line":30,"column":4,"endLine":32,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenWidth","argumentNames":[]}
+scene_screenWidth__P31874.info = {"start":604,"length":74,"line":30,"column":4,"endLine":32,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"screenWidth","argumentNames":[]}
 
-function scene_screenWidth__P2455_mk(s) {
+function scene_screenWidth__P31874_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenWidth__P2455, depth: s.depth + 1,
+        parent: s, fn: scene_screenWidth__P31874, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54069,7 +54455,7 @@ function scene_screenWidth__P2455_mk(s) {
 
 
 
-function helpers_imageDrawRect__P1731(s) {
+function helpers_imageDrawRect__P31149(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54108,7 +54494,7 @@ switch (step) {
     s.arg3 = (r0);
     r0 = (s.arg4 - 1);
     s.arg4 = (r0);
-    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P31148_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -54116,10 +54502,10 @@ switch (step) {
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg2;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 125; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 77; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P31148_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -54127,10 +54513,10 @@ switch (step) {
     r0 = (s.arg2 + s.arg4);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 126; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 78; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P31148_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg1 + s.arg3);
     s.tmp_0.arg1 = r0;
@@ -54140,10 +54526,10 @@ switch (step) {
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg2;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 127; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 79; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P31148_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg1 + s.arg3);
     s.tmp_0.arg1 = r0;
@@ -54153,7 +54539,7 @@ switch (step) {
     r0 = (s.arg2 + s.arg4);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 128; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 80; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
   case 5:
@@ -54161,12 +54547,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawRect__P1731.info = {"start":4141,"length":370,"line":140,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawRect","argumentNames":["img","x","y","w","h","c"]}
+helpers_imageDrawRect__P31149.info = {"start":4141,"length":370,"line":140,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"imageDrawRect","argumentNames":["img","x","y","w","h","c"]}
 
-function helpers_imageDrawRect__P1731_mk(s) {
+function helpers_imageDrawRect__P31149_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawRect__P1731, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawRect__P31149, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54182,7 +54568,7 @@ function helpers_imageDrawRect__P1731_mk(s) {
 
 
 
-function spriteutils_createRenderable__P3638(s) {
+function spriteutils_createRenderable__P33172(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54197,23 +54583,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_createRenderable__P2383_mk(s);
+    s.tmp_0 = scene_createRenderable__P31802_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 1786; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1791; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_createRenderable__P3638.info = {"start":4522,"length":137,"line":139,"column":4,"endLine":141,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"createRenderable","argumentNames":["index","handler"]}
+spriteutils_createRenderable__P33172.info = {"start":4522,"length":137,"line":139,"column":4,"endLine":141,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"createRenderable","argumentNames":["index","handler"]}
 
-function spriteutils_createRenderable__P3638_mk(s) {
+function spriteutils_createRenderable__P33172_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_createRenderable__P3638, depth: s.depth + 1,
+        parent: s, fn: spriteutils_createRenderable__P33172, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54224,7 +54610,7 @@ function spriteutils_createRenderable__P3638_mk(s) {
 
 
 
-function Sprite_setFlag__P2079(s) {
+function Sprite_setFlag__P31498(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54241,7 +54627,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -54276,12 +54662,12 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = Sprite_setFlag__P2079_mk(s);
+    s.tmp_2 = Sprite_setFlag__P31498_mk(s);
     r0 = s.arg0.fields["sayBubbleSprite"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 512;
     s.tmp_2.arg2 = s.arg2;
-    s.callLocIdx = 408; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 365; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
   case 5:
@@ -54290,12 +54676,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setFlag__P2079.info = {"start":23896,"length":292,"line":731,"column":4,"endLine":738,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setFlag","argumentNames":["this","flag","on"]}
+Sprite_setFlag__P31498.info = {"start":23896,"length":292,"line":731,"column":4,"endLine":738,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"setFlag","argumentNames":["this","flag","on"]}
 
-function Sprite_setFlag__P2079_mk(s) {
+function Sprite_setFlag__P31498_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setFlag__P2079, depth: s.depth + 1,
+        parent: s, fn: Sprite_setFlag__P31498, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54311,7 +54697,7 @@ function Sprite_setFlag__P2079_mk(s) {
 
 
 
-function controller_Button_onEvent__P1910(s) {
+function controller_Button_onEvent__P31329(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54328,26 +54714,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
-    s.tmp_0 = control_onEvent__P380_mk(s);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
+    s.tmp_0 = control_onEvent__P29915_mk(s);
     s.tmp_0.arg0 = s.arg1;
     r0 = s.arg0.fields["id"];
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = 16;
-    s.callLocIdx = 184; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 141; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_onEvent__P1910.info = {"start":3368,"length":124,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"onEvent","argumentNames":["this","event","handler"]}
+controller_Button_onEvent__P31329.info = {"start":3368,"length":124,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"onEvent","argumentNames":["this","event","handler"]}
 
-function controller_Button_onEvent__P1910_mk(s) {
+function controller_Button_onEvent__P31329_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_onEvent__P1910, depth: s.depth + 1,
+        parent: s, fn: controller_Button_onEvent__P31329, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54359,7 +54745,7 @@ function controller_Button_onEvent__P1910_mk(s) {
 
 
 
-function ConnectionKind_create__P3802(s) {
+function ConnectionKind_create__P33336(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54369,26 +54755,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals.nextKind___6159 === undefined);
+    r0 = (globals.nextKind___35681 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.nextKind___6159 = (1);
+    globals.nextKind___35681 = (1);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals.nextKind___6159;
+    s.tmp_0 = r0 = globals.nextKind___35681;
     r0 = (s.tmp_0 + 1);
-    globals.nextKind___6159 = (r0);
+    globals.nextKind___35681 = (r0);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-ConnectionKind_create__P3802.info = {"start":412,"length":112,"line":13,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/tilemaps/overworld.ts","functionName":"create","argumentNames":[]}
+ConnectionKind_create__P33336.info = {"start":412,"length":112,"line":13,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/tilemaps/overworld.ts","functionName":"create","argumentNames":[]}
 
-function ConnectionKind_create__P3802_mk(s) {
+function ConnectionKind_create__P33336_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ConnectionKind_create__P3802, depth: s.depth + 1,
+        parent: s, fn: ConnectionKind_create__P33336, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -54397,7 +54783,7 @@ function ConnectionKind_create__P3802_mk(s) {
 
 
 
-function color_FadeState_constructor__P5982(s) {
+function color_FadeState_constructor__P35504(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54414,19 +54800,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_FadeState__C5981_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_FadeState__C35503_VT)) failedCast(r0);
     r0 = (s.arg0).fields["state"] = (s.arg1);
     r0 = (s.arg0).fields["scene"] = (s.arg2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_FadeState_constructor__P5982.info = {"start":5010,"length":96,"line":173,"column":8,"endLine":176,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this","state","scene"]}
+color_FadeState_constructor__P35504.info = {"start":5010,"length":96,"line":173,"column":8,"endLine":176,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this","state","scene"]}
 
-function color_FadeState_constructor__P5982_mk(s) {
+function color_FadeState_constructor__P35504_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_FadeState_constructor__P5982, depth: s.depth + 1,
+        parent: s, fn: color_FadeState_constructor__P35504, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -54437,7 +54823,7 @@ function color_FadeState_constructor__P5982_mk(s) {
 
 
 
-function game_eventContext__P2535(s) {
+function game_eventContext__P31954(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54447,21 +54833,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_init__P4356_mk(s);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1153; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1110; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals._scene___4348.fields["eventContext"];
+    r0 = globals._scene___33841.fields["eventContext"];
     return leave(s, r0)
   default: oops()
 } } }
-game_eventContext__P2535.info = {"start":1084,"length":112,"line":40,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"eventContext","argumentNames":[]}
+game_eventContext__P31954.info = {"start":1084,"length":112,"line":40,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"eventContext","argumentNames":[]}
 
-function game_eventContext__P2535_mk(s) {
+function game_eventContext__P31954_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_eventContext__P2535, depth: s.depth + 1,
+        parent: s, fn: game_eventContext__P31954, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -54470,7 +54856,7 @@ function game_eventContext__P2535_mk(s) {
 
 
 
-function controller_pauseUntilAnyButtonIsPressed__P1953(s) {
+function controller_pauseUntilAnyButtonIsPressed__P31372(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54490,12 +54876,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_pauseUntilAnyButtonIsPressed__P1953.info = {"start":19144,"length":96,"line":583,"column":4,"endLine":585,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"pauseUntilAnyButtonIsPressed","argumentNames":[]}
+controller_pauseUntilAnyButtonIsPressed__P31372.info = {"start":19144,"length":96,"line":583,"column":4,"endLine":585,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"pauseUntilAnyButtonIsPressed","argumentNames":[]}
 
-function controller_pauseUntilAnyButtonIsPressed__P1953_mk(s) {
+function controller_pauseUntilAnyButtonIsPressed__P31372_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_pauseUntilAnyButtonIsPressed__P1953, depth: s.depth + 1,
+        parent: s, fn: controller_pauseUntilAnyButtonIsPressed__P31372, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54503,7 +54889,7 @@ function controller_pauseUntilAnyButtonIsPressed__P1953_mk(s) {
 
 
 
-function game_setWaitAnyButton__P2533(s) {
+function game_setWaitAnyButton__P31952(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54517,17 +54903,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    globals.__waitAnyButton___4352 = (s.arg0);
+    globals.__waitAnyButton___33845 = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_setWaitAnyButton__P2533.info = {"start":878,"length":83,"line":31,"column":4,"endLine":33,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"setWaitAnyButton","argumentNames":["f"]}
+game_setWaitAnyButton__P31952.info = {"start":878,"length":83,"line":31,"column":4,"endLine":33,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"setWaitAnyButton","argumentNames":["f"]}
 
-function game_setWaitAnyButton__P2533_mk(s) {
+function game_setWaitAnyButton__P31952_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_setWaitAnyButton__P2533, depth: s.depth + 1,
+        parent: s, fn: game_setWaitAnyButton__P31952, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -54536,7 +54922,7 @@ function game_setWaitAnyButton__P2533_mk(s) {
 
 
 
-function Math_abs__P123(s) {
+function Math_abs__P29658(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54565,12 +54951,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_abs__P123.info = {"start":15106,"length":77,"line":511,"column":4,"endLine":513,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"abs","argumentNames":["x"]}
+Math_abs__P29658.info = {"start":15106,"length":77,"line":511,"column":4,"endLine":513,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"abs","argumentNames":["x"]}
 
-function Math_abs__P123_mk(s) {
+function Math_abs__P29658_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_abs__P123, depth: s.depth + 1,
+        parent: s, fn: Math_abs__P29658, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54581,7 +54967,7 @@ function Math_abs__P123_mk(s) {
 
 
 
-function Math_sign__P124(s) {
+function Math_sign__P29659(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54616,12 +55002,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_sign__P124.info = {"start":15341,"length":125,"line":519,"column":4,"endLine":523,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"sign","argumentNames":["x"]}
+Math_sign__P29659.info = {"start":15341,"length":125,"line":519,"column":4,"endLine":523,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"sign","argumentNames":["x"]}
 
-function Math_sign__P124_mk(s) {
+function Math_sign__P29659_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_sign__P124, depth: s.depth + 1,
+        parent: s, fn: Math_sign__P29659, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54632,7 +55018,7 @@ function Math_sign__P124_mk(s) {
 
 
 
-function texteffects_TextEffect_constructor__P2833(s) {
+function texteffects_TextEffect_constructor__P32252(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54648,18 +55034,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, texteffects_TextEffect__C2831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, texteffects_TextEffect__C32250_VT)) failedCast(r0);
     r0 = (s.arg0).fields["getState"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-texteffects_TextEffect_constructor__P2833.info = {"start":657,"length":133,"line":25,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["this","getState"]}
+texteffects_TextEffect_constructor__P32252.info = {"start":657,"length":133,"line":25,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/game---hw/texteffects.ts","functionName":"inline","argumentNames":["this","getState"]}
 
-function texteffects_TextEffect_constructor__P2833_mk(s) {
+function texteffects_TextEffect_constructor__P32252_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: texteffects_TextEffect_constructor__P2833, depth: s.depth + 1,
+        parent: s, fn: texteffects_TextEffect_constructor__P32252, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -54669,7 +55055,7 @@ function texteffects_TextEffect_constructor__P2833_mk(s) {
 
 
 
-function Math_FastRandom_constructor__P2588(s) {
+function Math_FastRandom_constructor__P32007(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54685,7 +55071,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C32005_VT)) failedCast(r0);
     r0 = (s.arg1 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -54700,12 +55086,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_constructor__P2588.info = {"start":1425,"length":175,"line":44,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"inline","argumentNames":["this","seed"]}
+Math_FastRandom_constructor__P32007.info = {"start":1425,"length":175,"line":44,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game---hw/mathUtil.ts","functionName":"inline","argumentNames":["this","seed"]}
 
-function Math_FastRandom_constructor__P2588_mk(s) {
+function Math_FastRandom_constructor__P32007_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_constructor__P2588, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_constructor__P32007, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54716,7 +55102,7 @@ function Math_FastRandom_constructor__P2588_mk(s) {
 
 
 
-function control_ramSize__P335(s) {
+function control_ramSize__P29870(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54741,12 +55127,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_ramSize__P335.info = {"start":5058,"length":100,"line":172,"column":4,"endLine":174,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
+control_ramSize__P29870.info = {"start":5058,"length":100,"line":172,"column":4,"endLine":174,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
 
-function control_ramSize__P335_mk(s) {
+function control_ramSize__P29870_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_ramSize__P335, depth: s.depth + 1,
+        parent: s, fn: control_ramSize__P29870, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54756,7 +55142,7 @@ function control_ramSize__P335_mk(s) {
 
 
 
-function control__ramSize__P3995(s) {
+function control__ramSize__P33530(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54770,12 +55156,388 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control__ramSize__P3995.info = {"start":4938,"length":60,"line":167,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
+control__ramSize__P33530.info = {"start":4938,"length":60,"line":167,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
+
+function control__ramSize__P33530_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: control__ramSize__P33530, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+} }
+
+
+
+
+
+function game_consoleOverlay_listener__P34174(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___34139);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = s.tmp_0;
+    { step = 2; continue; }
+  case 1:
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    { step = 7; continue; }
+  case 3:
+  case 4:
+    s.tmp_4 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_5 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_6 = helpers_stringSplit__P29652_mk(s);
+    s.tmp_6.arg0 = s.arg1;
+    s.tmp_6.arg1 = "\n";
+    s.tmp_6.arg2 = undefined;
+    s.callLocIdx = 1457; s.pc = 10; return s.tmp_6;
+  case 10:
+    r0 = s.retval;
+    s.tmp_5.arg0 = r0;
+    s.tmp_5.arg1 = inline__P51274;
+    s.callLocIdx = 1458; s.pc = 9; return s.tmp_5;
+  case 9:
+    r0 = s.retval;
+    s.tmp_4.arg0 = r0;
+    s.tmp_4.arg1 = inline__P51279;
+    s.callLocIdx = 1460; s.pc = 8; return s.tmp_4;
+  case 8:
+    r0 = s.retval;
+    r0 = pxsim_Array__length(globals.consoleStrings___34139);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 > globals.consoleLines___34152);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 5; continue; }
+    s.tmp_2 = helpers_arraySplice__P29633_mk(s);
+    s.tmp_2.arg0 = globals.consoleStrings___34139;
+    s.tmp_2.arg1 = 0;
+    r0 = pxsim_Array__length(globals.consoleStrings___34139);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 - globals.consoleLines___34152);
+    s.tmp_2.arg2 = r0;
+    s.callLocIdx = 1461; s.pc = 11; return s.tmp_2;
+  case 11:
+    r0 = s.retval;
+  case 5:
+  case 6:
+  case 7:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+game_consoleOverlay_listener__P34174.info = {"start":787,"length":571,"line":26,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game---hw/console.ts","functionName":"listener","argumentNames":["priority","text"]}
+
+function game_consoleOverlay_listener__P34174_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: game_consoleOverlay_listener__P34174, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function inline__P51274(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_0);
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P51274.info = {"start":985,"length":14,"line":32,"column":20,"endLine":32,"endColumn":34,"fileName":"pxt_modules/game---hw/console.ts","functionName":"inline","argumentNames":["line"]}
+
+function inline__P51274_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P51274, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function inline__P51279(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.j___51281 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    s.j___51281 = (0);
+  case 1:
+    s.tmp_1 = r0 = s.j___51281;
+    r0 = pxsim_String_.length(s.arg0);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_1 < s.tmp_2);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    s.tmp_3 = r0 = globals.consoleStrings___34139;
+    s.tmp_5 = helpers_stringSlice__P29650_mk(s);
+    s.tmp_5.arg0 = s.arg0;
+    s.tmp_5.arg1 = s.j___51281;
+    r0 = (s.j___51281 + globals.consoleColumns___34162);
+    s.tmp_5.arg2 = r0;
+    s.callLocIdx = 1459; s.pc = 3; return s.tmp_5;
+  case 3:
+    r0 = s.retval;
+    s.tmp_4 = r0;
+    r0 = pxsim_Array__push(s.tmp_3, s.tmp_4);
+    r0 = (s.j___51281 + globals.consoleColumns___34162);
+    s.j___51281 = (r0);
+    { step = 1; continue; }
+  case 2:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P51279.info = {"start":1022,"length":189,"line":33,"column":21,"endLine":37,"endColumn":13,"fileName":"pxt_modules/game---hw/console.ts","functionName":"inline","argumentNames":["line"]}
+
+function inline__P51279_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P51279, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  j___51281: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function console_addListener__P29907(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = s.tmp_0;
+    { step = 2; continue; }
+  case 1:
+    r0 = pxsim_Array_.indexOf(globals.listeners___33545, s.arg0, undefined);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 > -1);
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    { step = 5; continue; }
+  case 3:
+  case 4:
+    r0 = pxsim_Array__push(globals.listeners___33545, s.arg0);
+  case 5:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+console_addListener__P29907.info = {"start":3558,"length":197,"line":121,"column":4,"endLine":124,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"addListener","argumentNames":["listener"]}
+
+function console_addListener__P29907_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: console_addListener__P29907, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function inline__P33544(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim.control.__log(s.arg0, s.arg1);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P33544.info = {"start":534,"length":85,"line":25,"column":8,"endLine":25,"endColumn":93,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["priority","text"]}
+
+function inline__P33544_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P33544, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function _screen_internal_createScreen__P31224(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.img___51334 = undefined;
+    s.status___51338 = undefined;
+    r0 = pxsim.image.create(160, 120);
+    s.img___51334 = (r0);
+    r0 = undefined;
+    r0 = pxsim.image.create(160, 8);
+    s.status___51338 = (r0);
+    r0 = undefined;
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51344);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.img___51334);
+    s.tmp_1 = control___screen_setupUpdate__P31182_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.callLocIdx = 110; s.pc = 1; return s.tmp_1;
+  case 1:
+    r0 = s.retval;
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51349);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.status___51338);
+    globals.control_EventContext_onStats___29922 = (s.tmp_0);
+    r0 = s.img___51334;
+    return leave(s, r0)
+  default: oops()
+} } }
+_screen_internal_createScreen__P31224.info = {"start":948,"length":547,"line":28,"column":4,"endLine":44,"endColumn":5,"fileName":"pxt_modules/screen---st7735/targetoverrides.ts","functionName":"createScreen","argumentNames":[]}
+
+function _screen_internal_createScreen__P31224_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: _screen_internal_createScreen__P31224, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  img___51334: undefined,
+  status___51338: undefined,
+} }
+
+
+
+
+
+function inline__P51344(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    r0 = pxsim_pxtcore.updateScreen(s.caps[0]);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P51344.info = {"start":1204,"length":23,"line":35,"column":37,"endLine":35,"endColumn":60,"fileName":"pxt_modules/screen---st7735/targetoverrides.ts","functionName":"inline","argumentNames":[]}
 
-function control__ramSize__P3995_mk(s) {
+function inline__P51344_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control__ramSize__P3995, depth: s.depth + 1,
+        parent: s, fn: inline__P51344, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54783,7 +55545,7 @@ function control__ramSize__P3995_mk(s) {
 
 
 
-function game_consoleOverlay_listener__P4681(s) {
+function inline__P51349(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54795,94 +55557,42 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
+    r0 = pxsim_ImageMethods.fill(s.caps[0], 0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = s.caps[0];
+    s.tmp_0.arg1 = s.arg0;
+    s.tmp_0.arg2 = 2;
+    s.tmp_0.arg3 = 2;
+    s.tmp_0.arg4 = 1;
+    s.tmp_0.arg5 = globals.font5___31168;
+    s.tmp_0.arg6 = undefined;
+    s.callLocIdx = 111; s.pc = 1; return s.tmp_0;
   case 1:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    { step = 7; continue; }
-  case 3:
-  case 4:
-    s.tmp_4 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_5 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_6 = helpers_stringSplit__P117_mk(s);
-    s.tmp_6.arg0 = s.arg1;
-    s.tmp_6.arg1 = "\n";
-    s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1500; s.pc = 10; return s.tmp_6;
-  case 10:
-    r0 = s.retval;
-    s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = inline__P21738;
-    s.callLocIdx = 1501; s.pc = 9; return s.tmp_5;
-  case 9:
-    r0 = s.retval;
-    s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = inline__P21743;
-    s.callLocIdx = 1503; s.pc = 8; return s.tmp_4;
-  case 8:
-    r0 = s.retval;
-    r0 = pxsim_Array__length(globals.consoleStrings___4646);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 > globals.consoleLines___4659);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    s.tmp_2 = helpers_arraySplice__P98_mk(s);
-    s.tmp_2.arg0 = globals.consoleStrings___4646;
-    s.tmp_2.arg1 = 0;
-    r0 = pxsim_Array__length(globals.consoleStrings___4646);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 - globals.consoleLines___4659);
-    s.tmp_2.arg2 = r0;
-    s.callLocIdx = 1504; s.pc = 11; return s.tmp_2;
-  case 11:
     r0 = s.retval;
-  case 5:
-  case 6:
-  case 7:
+    r0 = undefined;
+    r0 = pxsim_pxtcore.updateStats(s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_listener__P4681.info = {"start":787,"length":571,"line":26,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"listener","argumentNames":["priority","text"]}
+inline__P51349.info = {"start":1268,"length":185,"line":36,"column":39,"endLine":41,"endColumn":9,"fileName":"pxt_modules/screen---st7735/targetoverrides.ts","functionName":"inline","argumentNames":["msg"]}
 
-function game_consoleOverlay_listener__P4681_mk(s) {
+function inline__P51349_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_listener__P4681, depth: s.depth + 1,
+        parent: s, fn: inline__P51349, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
   arg0: undefined,
-  arg1: undefined,
 } }
 
 
 
 
 
-function inline__P21738(s) {
+function _screen_internal_setupScreenStatusBar__P33630(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54896,26 +55606,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21738.info = {"start":985,"length":14,"line":32,"column":20,"endLine":32,"endColumn":34,"fileName":"pxt_modules/game/console.ts","functionName":"inline","argumentNames":["line"]}
+_screen_internal_setupScreenStatusBar__P33630.info = {"start":877,"length":65,"line":26,"column":4,"endLine":26,"endColumn":69,"fileName":"pxt_modules/screen---st7735/targetoverrides.ts","functionName":"setupScreenStatusBar","argumentNames":["barHeight"]}
 
-function inline__P21738_mk(s) {
+function _screen_internal_setupScreenStatusBar__P33630_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21738, depth: s.depth + 1,
+        parent: s, fn: _screen_internal_setupScreenStatusBar__P33630, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
   arg0: undefined,
 } }
 
@@ -54923,7 +55624,7 @@ function inline__P21738_mk(s) {
 
 
 
-function inline__P21743(s) {
+function _screen_internal_updateScreenStatusBar__P33629(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54933,53 +55634,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.j___21745 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.j___21745 = (0);
-  case 1:
-    s.tmp_1 = r0 = s.j___21745;
-    r0 = pxsim_String_.length(s.arg0);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 < s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 2; continue; }
-    s.tmp_3 = r0 = globals.consoleStrings___4646;
-    s.tmp_5 = helpers_stringSlice__P115_mk(s);
-    s.tmp_5.arg0 = s.arg0;
-    s.tmp_5.arg1 = s.j___21745;
-    r0 = (s.j___21745 + globals.consoleColumns___4669);
-    s.tmp_5.arg2 = r0;
-    s.callLocIdx = 1502; s.pc = 3; return s.tmp_5;
-  case 3:
-    r0 = s.retval;
-    s.tmp_4 = r0;
-    r0 = pxsim_Array__push(s.tmp_3, s.tmp_4);
-    r0 = (s.j___21745 + globals.consoleColumns___4669);
-    s.j___21745 = (r0);
-    { step = 1; continue; }
-  case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21743.info = {"start":1022,"length":189,"line":33,"column":21,"endLine":37,"endColumn":13,"fileName":"pxt_modules/game/console.ts","functionName":"inline","argumentNames":["line"]}
+_screen_internal_updateScreenStatusBar__P33629.info = {"start":774,"length":59,"line":24,"column":4,"endLine":24,"endColumn":63,"fileName":"pxt_modules/screen---st7735/targetoverrides.ts","functionName":"updateScreenStatusBar","argumentNames":["img"]}
 
-function inline__P21743_mk(s) {
+function _screen_internal_updateScreenStatusBar__P33629_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21743, depth: s.depth + 1,
+        parent: s, fn: _screen_internal_updateScreenStatusBar__P33629, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  j___21745: undefined,
   arg0: undefined,
 } }
 
@@ -54987,7 +55656,7 @@ function inline__P21743_mk(s) {
 
 
 
-function console_addListener__P372(s) {
+function control___screen_setupUpdate__P31182(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55001,86 +55670,34 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
+    globals.__updated___33611 = (true);
+    globals.__update___33609 = (s.arg0);
+    s.tmp_0 = lambda_1_mk(s);
+    s.tmp_0.argL = s.arg0;
+    setupLambda(s.tmp_0, s.tmp_0.argL);
+    s.callLocIdx = 104; s.pc = 1; return s.tmp_0;
   case 1:
-    r0 = pxsim_Array_.indexOf(globals.listeners___4010, s.arg0, undefined);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 > -1);
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    { step = 5; continue; }
-  case 3:
-  case 4:
-    r0 = pxsim_Array__push(globals.listeners___4010, s.arg0);
-  case 5:
+    r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-console_addListener__P372.info = {"start":3558,"length":197,"line":121,"column":4,"endLine":124,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"addListener","argumentNames":["listener"]}
+control___screen_setupUpdate__P31182.info = {"start":198,"length":125,"line":10,"column":4,"endLine":14,"endColumn":5,"fileName":"pxt_modules/screen---st7735/frame.ts","functionName":"setupUpdate","argumentNames":["update"]}
 
-function console_addListener__P372_mk(s) {
+function control___screen_setupUpdate__P31182_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_addListener__P372, depth: s.depth + 1,
+        parent: s, fn: control___screen_setupUpdate__P31182, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function inline__P4009(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim.control.__log(s.arg0, s.arg1);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P4009.info = {"start":534,"length":85,"line":25,"column":8,"endLine":25,"endColumn":93,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["priority","text"]}
-
-function inline__P4009_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P4009, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
-  arg1: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_register__P2633(s) {
+function scene_systemMenu_register__P32052(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55090,16 +55707,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___34093);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_0 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_0.arg0 = globals.menu___1883;
+    s.tmp_0 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_0.arg0 = globals.menu___31302;
     s.tmp_0.arg1 = 2049;
-    s.tmp_0.arg2 = scene_systemMenu_showSystemMenu__P2634;
-    s.callLocIdx = 1487; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg2 = scene_systemMenu_showSystemMenu__P32053;
+    s.callLocIdx = 1444; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 3:
@@ -55107,12 +55724,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_register__P2633.info = {"start":12793,"length":193,"line":382,"column":4,"endLine":386,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"register","argumentNames":[]}
+scene_systemMenu_register__P32052.info = {"start":12793,"length":193,"line":382,"column":4,"endLine":386,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"register","argumentNames":[]}
 
-function scene_systemMenu_register__P2633_mk(s) {
+function scene_systemMenu_register__P32052_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_register__P2633, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_register__P32052, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -55121,7 +55738,7 @@ function scene_systemMenu_register__P2633_mk(s) {
 
 
 
-function scene_systemMenu_showSystemMenu__P2634(s) {
+function scene_systemMenu_showSystemMenu__P32053(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55131,28 +55748,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___34093);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_0 = game_pushScene__P2536_mk(s);
-    s.callLocIdx = 1488; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P31955_mk(s);
+    s.callLocIdx = 1445; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_PauseMenu__C2622_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_PauseMenu__C32041_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_PauseMenu_constructor__P2623_mk(s);
+    s.tmp_1 = scene_systemMenu_PauseMenu_constructor__P32042_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = scene_systemMenu_buildOptionList__P2630;
+    s.tmp_1.arg1 = scene_systemMenu_buildOptionList__P32049;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1489; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1446; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    globals.instance___4600 = (s.tmp_0);
-    s.tmp_0 = scene_systemMenu_PauseMenu_show__P2624_mk(s);
-    s.tmp_0.arg0 = globals.instance___4600;
-    s.callLocIdx = 1490; s.pc = 6; return s.tmp_0;
+    globals.instance___34093 = (s.tmp_0);
+    s.tmp_0 = scene_systemMenu_PauseMenu_show__P32043_mk(s);
+    s.tmp_0.arg0 = globals.instance___34093;
+    s.callLocIdx = 1447; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -55160,12 +55777,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_showSystemMenu__P2634.info = {"start":12992,"length":172,"line":388,"column":4,"endLine":393,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"showSystemMenu","argumentNames":[]}
+scene_systemMenu_showSystemMenu__P32053.info = {"start":12992,"length":172,"line":388,"column":4,"endLine":393,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"showSystemMenu","argumentNames":[]}
 
-function scene_systemMenu_showSystemMenu__P2634_mk(s) {
+function scene_systemMenu_showSystemMenu__P32053_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_showSystemMenu__P2634, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_showSystemMenu__P32053, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55175,7 +55792,7 @@ function scene_systemMenu_showSystemMenu__P2634_mk(s) {
 
 
 
-function scene_systemMenu_buildOptionList__P2630(s) {
+function scene_systemMenu_buildOptionList__P32049(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55185,136 +55802,136 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.options___22403 = undefined;
+    s.options___51978 = undefined;
     r0 = pxsim_Array__mk();
-    s.options___22403 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    s.options___51978 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.VOLUME_DOWN_ICON___2644;
-    s.tmp_1.arg2 = inline__P22411;
-    s.tmp_1.arg3 = scene_systemMenu_volumeDown__P4606;
-    s.callLocIdx = 1470; s.pc = 5; return s.tmp_1;
+    s.tmp_1.arg1 = globals.VOLUME_DOWN_ICON___32063;
+    s.tmp_1.arg2 = inline__P51986;
+    s.tmp_1.arg3 = scene_systemMenu_volumeDown__P34099;
+    s.callLocIdx = 1427; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.VOLUME_UP_ICON___2641;
-    s.tmp_1.arg2 = inline__P22425;
-    s.tmp_1.arg3 = scene_systemMenu_volumeUp__P4605;
-    s.callLocIdx = 1472; s.pc = 6; return s.tmp_1;
+    s.tmp_1.arg1 = globals.VOLUME_UP_ICON___32060;
+    s.tmp_1.arg2 = inline__P52000;
+    s.tmp_1.arg3 = scene_systemMenu_volumeUp__P34098;
+    s.callLocIdx = 1429; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_0);
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_0);
     r0 = 0;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_2 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = globals.BRIGHTNESS_DOWN_ICON___2642;
-    s.tmp_2.arg2 = inline__P22440;
-    s.tmp_2.arg3 = scene_systemMenu_brightnessDown__P4608;
-    s.callLocIdx = 1475; s.pc = 7; return s.tmp_2;
+    s.tmp_2.arg1 = globals.BRIGHTNESS_DOWN_ICON___32061;
+    s.tmp_2.arg2 = inline__P52015;
+    s.tmp_2.arg3 = scene_systemMenu_brightnessDown__P34101;
+    s.callLocIdx = 1432; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_1);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_1);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.BRIGHTNESS_UP_ICON___2647;
-    s.tmp_1.arg2 = inline__P22455;
-    s.tmp_1.arg3 = scene_systemMenu_brightnessUp__P4607;
-    s.callLocIdx = 1477; s.pc = 8; return s.tmp_1;
+    s.tmp_1.arg1 = globals.BRIGHTNESS_UP_ICON___32066;
+    s.tmp_1.arg2 = inline__P52030;
+    s.tmp_1.arg3 = scene_systemMenu_brightnessUp__P34100;
+    s.callLocIdx = 1434; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_0);
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.STATS_ICON___2648;
-    s.tmp_1.arg2 = inline__P22470;
-    s.tmp_1.arg3 = scene_systemMenu_toggleStats__P4610;
-    s.callLocIdx = 1478; s.pc = 9; return s.tmp_1;
+    s.tmp_1.arg1 = globals.STATS_ICON___32067;
+    s.tmp_1.arg2 = inline__P52045;
+    s.tmp_1.arg3 = scene_systemMenu_toggleStats__P34103;
+    s.callLocIdx = 1435; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.CONSOLE_ICON___2646;
-    s.tmp_1.arg2 = inline__P22479;
-    s.tmp_1.arg3 = scene_systemMenu_toggleConsole__P4611;
-    s.callLocIdx = 1480; s.pc = 10; return s.tmp_1;
+    s.tmp_1.arg1 = globals.CONSOLE_ICON___32065;
+    s.tmp_1.arg2 = inline__P52054;
+    s.tmp_1.arg3 = scene_systemMenu_toggleConsole__P34104;
+    s.callLocIdx = 1437; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.SLEEP_ICON___2645;
-    s.tmp_1.arg2 = inline__P22488;
-    s.tmp_1.arg3 = scene_systemMenu_sleep__P4612;
-    s.callLocIdx = 1481; s.pc = 11; return s.tmp_1;
+    s.tmp_1.arg1 = globals.SLEEP_ICON___32064;
+    s.tmp_1.arg2 = inline__P52063;
+    s.tmp_1.arg3 = scene_systemMenu_sleep__P34105;
+    s.callLocIdx = 1438; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(globals.customMenuOptions___4601);
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(globals.customMenuOptions___34094);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = helpers_arrayConcat__P111_mk(s);
-    s.tmp_0.arg0 = s.options___22403;
-    s.tmp_0.arg1 = globals.customMenuOptions___4601;
-    s.callLocIdx = 1482; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = helpers_arrayConcat__P29646_mk(s);
+    s.tmp_0.arg0 = s.options___51978;
+    s.tmp_0.arg1 = globals.customMenuOptions___34094;
+    s.callLocIdx = 1439; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.options___22403 = (r0);
+    s.options___51978 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C32033_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P32034_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.CLOSE_MENU_ICON___2643;
-    s.tmp_1.arg2 = inline__P22501;
-    s.tmp_1.arg3 = scene_systemMenu_closeMenu__P2629;
-    s.callLocIdx = 1483; s.pc = 13; return s.tmp_1;
+    s.tmp_1.arg1 = globals.CLOSE_MENU_ICON___32062;
+    s.tmp_1.arg2 = inline__P52076;
+    s.tmp_1.arg3 = scene_systemMenu_closeMenu__P32048;
+    s.callLocIdx = 1440; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___22403, s.tmp_0);
-    r0 = s.options___22403;
+    r0 = pxsim_Array__push(s.options___51978, s.tmp_0);
+    r0 = s.options___51978;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_buildOptionList__P2630.info = {"start":10499,"length":1149,"line":334,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"buildOptionList","argumentNames":[]}
+scene_systemMenu_buildOptionList__P32049.info = {"start":10499,"length":1149,"line":334,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"buildOptionList","argumentNames":[]}
 
-function scene_systemMenu_buildOptionList__P2630_mk(s) {
+function scene_systemMenu_buildOptionList__P32049_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_buildOptionList__P2630, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_buildOptionList__P32049, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  options___22403: undefined,
+  options___51978: undefined,
 } }
 
 
 
 
 
-function inline__P22411(s) {
+function inline__P51986(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55324,8 +55941,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = music_volume__P1593_mk(s);
-    s.callLocIdx = 1469; s.pc = 1; return s.tmp_3;
+    s.tmp_3 = music_volume__P32273_mk(s);
+    s.callLocIdx = 1426; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -55344,12 +55961,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22411.info = {"start":10644,"length":39,"line":337,"column":54,"endLine":337,"endColumn":93,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51986.info = {"start":10644,"length":39,"line":337,"column":54,"endLine":337,"endColumn":93,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22411_mk(s) {
+function inline__P51986_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22411, depth: s.depth + 1,
+        parent: s, fn: inline__P51986, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55361,7 +55978,7 @@ function inline__P22411_mk(s) {
 
 
 
-function inline__P22425(s) {
+function inline__P52000(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55371,8 +55988,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = music_volume__P1593_mk(s);
-    s.callLocIdx = 1471; s.pc = 1; return s.tmp_3;
+    s.tmp_3 = music_volume__P32273_mk(s);
+    s.callLocIdx = 1428; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -55391,12 +56008,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22425.info = {"start":10751,"length":37,"line":338,"column":52,"endLine":338,"endColumn":89,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P52000.info = {"start":10751,"length":37,"line":338,"column":52,"endLine":338,"endColumn":89,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22425_mk(s) {
+function inline__P52000_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22425, depth: s.depth + 1,
+        parent: s, fn: inline__P52000, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55408,7 +56025,7 @@ function inline__P22425_mk(s) {
 
 
 
-function inline__P22440(s) {
+function inline__P52015(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55418,7 +56035,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.brightness___1724;
+    r0 = globals.brightness___31142;
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 1);
@@ -55435,12 +56052,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22440.info = {"start":10910,"length":48,"line":340,"column":62,"endLine":340,"endColumn":110,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P52015.info = {"start":10910,"length":48,"line":340,"column":62,"endLine":340,"endColumn":110,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22440_mk(s) {
+function inline__P52015_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22440, depth: s.depth + 1,
+        parent: s, fn: inline__P52015, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55451,7 +56068,7 @@ function inline__P22440_mk(s) {
 
 
 
-function inline__P22455(s) {
+function inline__P52030(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55461,7 +56078,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.brightness___1724;
+    r0 = globals.brightness___31142;
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 1);
@@ -55478,12 +56095,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22455.info = {"start":11038,"length":46,"line":341,"column":60,"endLine":341,"endColumn":106,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P52030.info = {"start":11038,"length":46,"line":341,"column":60,"endLine":341,"endColumn":106,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22455_mk(s) {
+function inline__P52030_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22455, depth: s.depth + 1,
+        parent: s, fn: inline__P52030, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55494,7 +56111,7 @@ function inline__P22455_mk(s) {
 
 
 
-function inline__P22470(s) {
+function inline__P52045(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55504,7 +56121,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___31948);
     if (!r0) { step = 1; continue; }
     r0 = "HIDE STATS";
     { step = 2; continue; }
@@ -55517,12 +56134,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22470.info = {"start":11160,"length":46,"line":343,"column":48,"endLine":343,"endColumn":94,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P52045.info = {"start":11160,"length":46,"line":343,"column":48,"endLine":343,"endColumn":94,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22470_mk(s) {
+function inline__P52045_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22470, depth: s.depth + 1,
+        parent: s, fn: inline__P52045, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -55531,7 +56148,7 @@ function inline__P22470_mk(s) {
 
 
 
-function inline__P22479(s) {
+function inline__P52054(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55541,7 +56158,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___34139);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
     s.tmp_2 = r0;
@@ -55562,12 +56179,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22479.info = {"start":11273,"length":71,"line":344,"column":50,"endLine":344,"endColumn":121,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P52054.info = {"start":11273,"length":71,"line":344,"column":50,"endLine":344,"endColumn":121,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22479_mk(s) {
+function inline__P52054_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22479, depth: s.depth + 1,
+        parent: s, fn: inline__P52054, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55580,7 +56197,7 @@ function inline__P22479_mk(s) {
 
 
 
-function inline__P22488(s) {
+function inline__P52063(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55594,12 +56211,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22488.info = {"start":11411,"length":13,"line":345,"column":48,"endLine":345,"endColumn":61,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P52063.info = {"start":11411,"length":13,"line":345,"column":48,"endLine":345,"endColumn":61,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22488_mk(s) {
+function inline__P52063_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22488, depth: s.depth + 1,
+        parent: s, fn: inline__P52063, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55607,7 +56224,7 @@ function inline__P22488_mk(s) {
 
 
 
-function inline__P22501(s) {
+function inline__P52076(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55621,12 +56238,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22501.info = {"start":11590,"length":13,"line":351,"column":53,"endLine":351,"endColumn":66,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P52076.info = {"start":11590,"length":13,"line":351,"column":53,"endLine":351,"endColumn":66,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P22501_mk(s) {
+function inline__P52076_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22501, depth: s.depth + 1,
+        parent: s, fn: inline__P52076, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55634,7 +56251,7 @@ function inline__P22501_mk(s) {
 
 
 
-function scene_systemMenu_setScreenBrightnessSupported__P4613(s) {
+function scene_systemMenu_setScreenBrightnessSupported__P34106(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55648,12 +56265,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setScreenBrightnessSupported__P4613.info = {"start":10398,"length":95,"line":330,"column":4,"endLine":332,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setScreenBrightnessSupported","argumentNames":[]}
+scene_systemMenu_setScreenBrightnessSupported__P34106.info = {"start":10398,"length":95,"line":330,"column":4,"endLine":332,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setScreenBrightnessSupported","argumentNames":[]}
 
-function scene_systemMenu_setScreenBrightnessSupported__P4613_mk(s) {
+function scene_systemMenu_setScreenBrightnessSupported__P34106_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setScreenBrightnessSupported__P4613, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setScreenBrightnessSupported__P34106, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55661,7 +56278,7 @@ function scene_systemMenu_setScreenBrightnessSupported__P4613_mk(s) {
 
 
 
-function scene_systemMenu_sleep__P4612(s) {
+function scene_systemMenu_sleep__P34105(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55676,12 +56293,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_sleep__P4612.info = {"start":10072,"length":51,"line":316,"column":4,"endLine":318,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"sleep","argumentNames":[]}
+scene_systemMenu_sleep__P34105.info = {"start":10072,"length":51,"line":316,"column":4,"endLine":318,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"sleep","argumentNames":[]}
 
-function scene_systemMenu_sleep__P4612_mk(s) {
+function scene_systemMenu_sleep__P34105_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_sleep__P4612, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_sleep__P34105, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55689,7 +56306,7 @@ function scene_systemMenu_sleep__P4612_mk(s) {
 
 
 
-function scene_systemMenu_toggleConsole__P4611(s) {
+function scene_systemMenu_toggleConsole__P34104(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55699,7 +56316,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___34139);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
     s.tmp_2 = r0;
@@ -55709,23 +56326,23 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_4 = game_consoleOverlay_setVisible__P2653_mk(s);
+    s.tmp_4 = game_consoleOverlay_setVisible__P32072_mk(s);
     s.tmp_4.arg0 = false;
     s.tmp_4.arg1 = undefined;
-    s.callLocIdx = 1463; s.pc = 3; return s.tmp_4;
+    s.callLocIdx = 1420; s.pc = 3; return s.tmp_4;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = game_consoleOverlay_setVisible__P2653_mk(s);
+    s.tmp_0 = game_consoleOverlay_setVisible__P32072_mk(s);
     s.tmp_0.arg0 = true;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 1464; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1421; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = console_log__P369_mk(s);
+    s.tmp_0 = console_log__P29904_mk(s);
     s.tmp_0.arg0 = "console";
-    s.callLocIdx = 1465; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1422; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 2:
@@ -55733,12 +56350,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_toggleConsole__P4611.info = {"start":9827,"length":239,"line":307,"column":4,"endLine":314,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"toggleConsole","argumentNames":[]}
+scene_systemMenu_toggleConsole__P34104.info = {"start":9827,"length":239,"line":307,"column":4,"endLine":314,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"toggleConsole","argumentNames":[]}
 
-function scene_systemMenu_toggleConsole__P4611_mk(s) {
+function scene_systemMenu_toggleConsole__P34104_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_toggleConsole__P4611, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_toggleConsole__P34104, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55751,7 +56368,7 @@ function scene_systemMenu_toggleConsole__P4611_mk(s) {
 
 
 
-function game_consoleOverlay_setVisible__P2653(s) {
+function game_consoleOverlay_setVisible__P32072(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55767,7 +56384,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = r0 = s.arg0;
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___34139);
     s.tmp_5 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_5);
     s.tmp_4 = r0;
@@ -55788,26 +56405,26 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    globals.consoleStrings___4646 = (s.tmp_6);
+    globals.consoleStrings___34139 = (s.tmp_6);
   case 3:
   case 4:
     r0 = (s.arg1 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    globals.consoleColor___4645 = (s.arg1);
+    globals.consoleColor___34138 = (s.arg1);
   case 5:
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_setVisible__P2653.info = {"start":562,"length":219,"line":19,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"setVisible","argumentNames":["value","col"]}
+game_consoleOverlay_setVisible__P32072.info = {"start":562,"length":219,"line":19,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/game---hw/console.ts","functionName":"setVisible","argumentNames":["value","col"]}
 
-function game_consoleOverlay_setVisible__P2653_mk(s) {
+function game_consoleOverlay_setVisible__P32072_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_setVisible__P2653, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_setVisible__P32072, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55824,7 +56441,7 @@ function game_consoleOverlay_setVisible__P2653_mk(s) {
 
 
 
-function console_log__P369(s) {
+function console_log__P29904(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55838,7 +56455,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = console_add__P365_mk(s);
+    s.tmp_0 = console_add__P29900_mk(s);
     s.tmp_0.arg0 = 1;
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 41; s.pc = 1; return s.tmp_0;
@@ -55848,12 +56465,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_log__P369.info = {"start":1450,"length":86,"line":58,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"log","argumentNames":["value"]}
+console_log__P29904.info = {"start":1450,"length":86,"line":58,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"log","argumentNames":["value"]}
 
-function console_log__P369_mk(s) {
+function console_log__P29904_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_log__P369, depth: s.depth + 1,
+        parent: s, fn: console_log__P29904, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -55863,7 +56480,7 @@ function console_log__P369_mk(s) {
 
 
 
-function console_add__P365(s) {
+function console_add__P29900(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55873,58 +56490,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.text___22540 = undefined;
-    s.i___22549 = undefined;
+    s.text___52115 = undefined;
+    s.i___52124 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg0 < globals.minPriority___364);
+    r0 = (s.arg0 < globals.minPriority___29899);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_1 = console_inspect__P371_mk(s);
+    s.tmp_1 = console_inspect__P29906_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.tmp_1.arg1 = 20;
     s.callLocIdx = 39; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    s.text___22540 = (r0);
-    if ((s.text___22540) && (s.text___22540).vtable) {
+    s.text___52115 = (r0);
+    if ((s.text___52115) && (s.text___52115).vtable) {
     setupResume(s, 7);
-    pxsim_String__stringConv(s.text___22540);
+    pxsim_String__stringConv(s.text___52115);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.text___22540) + ""; }
+    } else { s.retval = (s.text___52115) + ""; }
   case 7:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, "\n");
-    s.text___22540 = (r0);
-    s.i___22549 = (0);
+    s.text___52115 = (r0);
+    s.i___52124 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___22549;
-    r0 = pxsim_Array__length(globals.listeners___4010);
+    s.tmp_1 = r0 = s.i___52124;
+    r0 = pxsim_Array__length(globals.listeners___33545);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
     s.tmp_3 = lambda_3_mk(s);
-    r0 = pxsim_Array__getAt(globals.listeners___4010, s.i___22549);
+    r0 = pxsim_Array__getAt(globals.listeners___33545, s.i___52124);
     s.tmp_3.argL = r0;
     s.tmp_3.arg0 = s.arg0;
-    s.tmp_3.arg1 = s.text___22540;
+    s.tmp_3.arg1 = s.text___52115;
     setupLambda(s.tmp_3, s.tmp_3.argL);
     s.callLocIdx = 40; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
-    r0 = (s.i___22549 + 1);
-    s.i___22549 = (r0);
+    r0 = (s.i___52124 + 1);
+    s.i___52124 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -55932,19 +56549,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_add__P365.info = {"start":632,"length":317,"line":28,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"add","argumentNames":["priority","message"]}
+console_add__P29900.info = {"start":632,"length":317,"line":28,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"add","argumentNames":["priority","message"]}
 
-function console_add__P365_mk(s) {
+function console_add__P29900_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_add__P365, depth: s.depth + 1,
+        parent: s, fn: console_add__P29900, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  text___22540: undefined,
-  i___22549: undefined,
+  text___52115: undefined,
+  i___52124: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -55953,7 +56570,7 @@ function console_add__P365_mk(s) {
 
 
 
-function console_inspect__P371(s) {
+function console_inspect__P29906(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55963,10 +56580,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.asArr___22580 = undefined;
-    s.asString___22598 = undefined;
-    s.keys___22610 = undefined;
-    s.snipped___22614 = undefined;
+    s.asArr___52155 = undefined;
+    s.asString___52173 = undefined;
+    s.keys___52185 = undefined;
+    s.snipped___52189 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -56007,15 +56624,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 5; continue; }
-    s.asArr___22580 = (s.arg0);
-    r0 = pxsim_Array__length(s.asArr___22580);
+    s.asArr___52155 = (s.arg0);
+    r0 = pxsim_Array__length(s.asArr___52155);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 <= s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = helpers_arrayJoin__P101_mk(s);
-    s.tmp_2.arg0 = s.asArr___22580;
+    s.tmp_2 = helpers_arrayJoin__P29636_mk(s);
+    s.tmp_2.arg0 = s.asArr___52155;
     s.tmp_2.arg1 = ",";
     s.callLocIdx = 42; s.pc = 19; return s.tmp_2;
   case 19:
@@ -56025,9 +56642,9 @@ switch (step) {
   case 3:
     r0 = pxsim_String_.mkEmpty();
     s.tmp_4 = r0;
-    s.tmp_7 = helpers_arrayJoin__P101_mk(s);
-    s.tmp_8 = helpers_arraySlice__P112_mk(s);
-    s.tmp_8.arg0 = s.asArr___22580;
+    s.tmp_7 = helpers_arrayJoin__P29636_mk(s);
+    s.tmp_8 = helpers_arraySlice__P29647_mk(s);
+    s.tmp_8.arg0 = s.asArr___52155;
     s.tmp_8.arg1 = 0;
     s.tmp_8.arg2 = s.arg1;
     s.callLocIdx = 43; s.pc = 21; return s.tmp_8;
@@ -56067,46 +56684,46 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     s.tmp_10 = r0;
     r0 = pxsim_String__concat(s.tmp_9, s.tmp_10);
-    s.asString___22598 = (r0);
-    r0 = (s.asString___22598 != "[object Object]");
+    s.asString___52173 = (r0);
+    r0 = (s.asString___52173 != "[object Object]");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 6; continue; }
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 6:
-    r0 = (s.asString___22598 != "[Object]");
+    r0 = (s.asString___52173 != "[Object]");
   case 7:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 8; continue; }
-    r0 = s.asString___22598;
+    r0 = s.asString___52173;
     { step = 17; continue; }
   case 8:
   case 9:
     r0 = pxsim_pxtrt.keysOf(s.arg0);
-    s.keys___22610 = (r0);
-    r0 = pxsim_Array__length(s.keys___22610);
+    s.keys___52185 = (r0);
+    r0 = pxsim_Array__length(s.keys___52185);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 > s.arg1);
-    s.snipped___22614 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.snipped___22614);
+    s.snipped___52189 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.snipped___52189);
     if (!r0) { step = 10; continue; }
-    s.tmp_0 = helpers_arraySlice__P112_mk(s);
-    s.tmp_0.arg0 = s.keys___22610;
+    s.tmp_0 = helpers_arraySlice__P29647_mk(s);
+    s.tmp_0.arg0 = s.keys___52185;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = s.arg1;
     s.callLocIdx = 45; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.keys___22610 = (r0);
+    s.keys___52185 = (r0);
   case 10:
   case 11:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P22631);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P52206);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_numops_toBoolDecr(s.snipped___22614);
+    r0 = pxsim_numops_toBoolDecr(s.snipped___52189);
     if (!r0) { step = 12; continue; }
     r0 = "\n    ...";
     { step = 13; continue; }
@@ -56115,8 +56732,8 @@ switch (step) {
   case 13:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_7 = helpers_arrayReduce__P110_mk(s);
-    s.tmp_7.arg0 = s.keys___22610;
+    s.tmp_7 = helpers_arrayReduce__P29645_mk(s);
+    s.tmp_7.arg0 = s.keys___52185;
     s.tmp_7.arg1 = s.tmp_0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_7.arg2 = r0;
@@ -56165,12 +56782,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_inspect__P371.info = {"start":2271,"length":1190,"line":81,"column":4,"endLine":114,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"inspect","argumentNames":["obj","maxElements"]}
+console_inspect__P29906.info = {"start":2271,"length":1190,"line":81,"column":4,"endLine":114,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"inspect","argumentNames":["obj","maxElements"]}
 
-function console_inspect__P371_mk(s) {
+function console_inspect__P29906_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_inspect__P371, depth: s.depth + 1,
+        parent: s, fn: console_inspect__P29906, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56183,10 +56800,10 @@ function console_inspect__P371_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  asArr___22580: undefined,
-  asString___22598: undefined,
-  keys___22610: undefined,
-  snipped___22614: undefined,
+  asArr___52155: undefined,
+  asString___52173: undefined,
+  keys___52185: undefined,
+  snipped___52189: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -56195,7 +56812,7 @@ function console_inspect__P371_mk(s) {
 
 
 
-function inline__P22631(s) {
+function inline__P52206(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56258,12 +56875,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22631.info = {"start":3293,"length":61,"line":108,"column":20,"endLine":108,"endColumn":81,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["prev","currKey"]}
+inline__P52206.info = {"start":3293,"length":61,"line":108,"column":20,"endLine":108,"endColumn":81,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["prev","currKey"]}
 
-function inline__P22631_mk(s) {
+function inline__P52206_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22631, depth: s.depth + 1,
+        parent: s, fn: inline__P52206, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56281,7 +56898,7 @@ function inline__P22631_mk(s) {
 
 
 
-function helpers_arrayReduce__P110(s) {
+function helpers_arrayReduce__P29645(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56291,8 +56908,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___22658 = undefined;
-    s.i___22661 = undefined;
+    s.len___52233 = undefined;
+    s.i___52236 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -56300,43 +56917,43 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__length(s.arg0);
-    s.len___22658 = (r0);
-    s.i___22661 = (0);
+    s.len___52233 = (r0);
+    s.i___52236 = (0);
   case 1:
-    r0 = (s.i___22661 < s.len___22658);
+    r0 = (s.i___52236 < s.len___52233);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
     s.tmp_1 = lambda_4_mk(s);
     s.tmp_1.argL = s.arg1;
     s.tmp_1.arg0 = s.arg2;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___22661);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___52236);
     s.tmp_1.arg1 = r0;
-    s.tmp_1.arg2 = s.i___22661;
+    s.tmp_1.arg2 = s.i___52236;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 9; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.arg2 = (r0);
-    r0 = (s.i___22661 + 1);
-    s.i___22661 = (r0);
+    r0 = (s.i___52236 + 1);
+    s.i___52236 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = s.arg2;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayReduce__P110.info = {"start":8316,"length":317,"line":280,"column":4,"endLine":286,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayReduce","argumentNames":["arr","callbackfn","initialValue"]}
+helpers_arrayReduce__P29645.info = {"start":8316,"length":317,"line":280,"column":4,"endLine":286,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayReduce","argumentNames":["arr","callbackfn","initialValue"]}
 
-function helpers_arrayReduce__P110_mk(s) {
+function helpers_arrayReduce__P29645_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayReduce__P110, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayReduce__P29645, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___22658: undefined,
-  i___22661: undefined,
+  len___52233: undefined,
+  i___52236: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -56346,7 +56963,7 @@ function helpers_arrayReduce__P110_mk(s) {
 
 
 
-function helpers_arrayJoin__P101(s) {
+function helpers_arrayJoin__P29636(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56356,9 +56973,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___22686 = undefined;
-    s.len___22687 = undefined;
-    s.i___22690 = undefined;
+    s.r___52261 = undefined;
+    s.len___52262 = undefined;
+    s.i___52265 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -56381,16 +56998,16 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_String_.mkEmpty();
-    s.r___22686 = (r0);
+    s.r___52261 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___22687 = (r0);
-    s.i___22690 = (0);
+    s.len___52262 = (r0);
+    s.i___52265 = (0);
   case 5:
-    r0 = (s.i___22690 < s.len___22687);
+    r0 = (s.i___52265 < s.len___52262);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.i___22690 > 0);
+    r0 = (s.i___52265 > 0);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBool(s.tmp_1);
     if (r0) { step = 6; continue; }
@@ -56403,12 +57020,12 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 8; continue; }
-    if ((s.r___22686) && (s.r___22686).vtable) {
+    if ((s.r___52261) && (s.r___52261).vtable) {
     setupResume(s, 15);
-    pxsim_String__stringConv(s.r___22686);
+    pxsim_String__stringConv(s.r___52261);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___22686) + ""; }
+    } else { s.retval = (s.r___52261) + ""; }
   case 15:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -56422,10 +57039,10 @@ switch (step) {
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_4);
-    s.r___22686 = (r0);
+    s.r___52261 = (r0);
   case 8:
   case 9:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___22690);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___52265);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === undefined);
     s.tmp_0 = r0;
@@ -56434,7 +57051,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 10:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___22690);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___52265);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 === null);
   case 11:
@@ -56445,16 +57062,16 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     { step = 13; continue; }
   case 12:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___22690);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___52265);
   case 13:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    if ((s.r___22686) && (s.r___22686).vtable) {
+    if ((s.r___52261) && (s.r___52261).vtable) {
     setupResume(s, 17);
-    pxsim_String__stringConv(s.r___22686);
+    pxsim_String__stringConv(s.r___52261);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___22686) + ""; }
+    } else { s.retval = (s.r___52261) + ""; }
   case 17:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -56468,21 +57085,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_5, s.tmp_6);
-    s.r___22686 = (r0);
-    r0 = (s.i___22690 + 1);
-    s.i___22690 = (r0);
+    s.r___52261 = (r0);
+    r0 = (s.i___52265 + 1);
+    s.i___52265 = (r0);
     { step = 5; continue; }
   case 14:
-    r0 = s.r___22686;
+    r0 = s.r___52261;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayJoin__P101.info = {"start":4133,"length":432,"line":157,"column":4,"endLine":170,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayJoin","argumentNames":["arr","sep"]}
+helpers_arrayJoin__P29636.info = {"start":4133,"length":432,"line":157,"column":4,"endLine":170,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayJoin","argumentNames":["arr","sep"]}
 
-function helpers_arrayJoin__P101_mk(s) {
+function helpers_arrayJoin__P29636_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayJoin__P101, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayJoin__P29636, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56491,9 +57108,9 @@ function helpers_arrayJoin__P101_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  r___22686: undefined,
-  len___22687: undefined,
-  i___22690: undefined,
+  r___52261: undefined,
+  len___52262: undefined,
+  i___52265: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -56502,7 +57119,7 @@ function helpers_arrayJoin__P101_mk(s) {
 
 
 
-function scene_systemMenu_toggleStats__P4610(s) {
+function scene_systemMenu_toggleStats__P34103(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56512,11 +57129,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___31948);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    globals.stats___2529 = (r0);
-    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
+    globals.stats___31948 = (r0);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___31948);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -56525,18 +57142,18 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.control_EventContext_onStats___387;
+    r0 = globals.control_EventContext_onStats___29922;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
     s.tmp_3 = lambda_2_mk(s);
-    s.tmp_3.argL = globals.control_EventContext_onStats___387;
+    s.tmp_3.argL = globals.control_EventContext_onStats___29922;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3.arg0 = r0;
     setupLambda(s.tmp_3, s.tmp_3.argL);
-    s.callLocIdx = 1461; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1418; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
   case 3:
@@ -56545,12 +57162,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_toggleStats__P4610.info = {"start":9642,"length":179,"line":300,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"toggleStats","argumentNames":[]}
+scene_systemMenu_toggleStats__P34103.info = {"start":9642,"length":179,"line":300,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"toggleStats","argumentNames":[]}
 
-function scene_systemMenu_toggleStats__P4610_mk(s) {
+function scene_systemMenu_toggleStats__P34103_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_toggleStats__P4610, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_toggleStats__P34103, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56562,7 +57179,7 @@ function scene_systemMenu_toggleStats__P4610_mk(s) {
 
 
 
-function scene_systemMenu_brightnessDown__P4608(s) {
+function scene_systemMenu_brightnessDown__P34101(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56572,24 +57189,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_setScreenBrightness__P4609_mk(s);
-    r0 = globals.brightness___1724;
+    s.tmp_0 = scene_systemMenu_setScreenBrightness__P34102_mk(s);
+    r0 = globals.brightness___31142;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 5);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1457; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1414; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_brightnessDown__P4608.info = {"start":9198,"length":87,"line":289,"column":4,"endLine":291,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"brightnessDown","argumentNames":[]}
+scene_systemMenu_brightnessDown__P34101.info = {"start":9198,"length":87,"line":289,"column":4,"endLine":291,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"brightnessDown","argumentNames":[]}
 
-function scene_systemMenu_brightnessDown__P4608_mk(s) {
+function scene_systemMenu_brightnessDown__P34101_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_brightnessDown__P4608, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_brightnessDown__P34101, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56599,7 +57216,7 @@ function scene_systemMenu_brightnessDown__P4608_mk(s) {
 
 
 
-function scene_systemMenu_setScreenBrightness__P4609(s) {
+function scene_systemMenu_setScreenBrightness__P34102(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56613,219 +57230,29 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_setScreenBrightness__P1735_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_setScreenBrightness__P31153_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1458; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1415; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = settings_writeNumber__P1829_mk(s);
+    s.tmp_0 = settings_writeNumber__P31248_mk(s);
     s.tmp_0.arg0 = "#brightness";
-    r0 = globals.brightness___1724;
+    r0 = globals.brightness___31142;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1460; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1417; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setScreenBrightness__P4609.info = {"start":9291,"length":345,"line":293,"column":4,"endLine":298,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setScreenBrightness","argumentNames":["b"]}
-
-function scene_systemMenu_setScreenBrightness__P4609_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: scene_systemMenu_setScreenBrightness__P4609, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function helpers_setScreenBrightness__P1735(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = Math_clamp__P122_mk(s);
-    s.tmp_0.arg0 = 10;
-    s.tmp_0.arg1 = 100;
-    r0 = (s.arg1 | 0);
-    s.tmp_0.arg2 = r0;
-    s.callLocIdx = 129; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    s.arg1 = (r0);
-    globals.brightness___1724 = (s.arg1);
-    r0 = pxsim_pxtcore.setScreenBrightness(globals.brightness___1724);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-helpers_setScreenBrightness__P1735.info = {"start":6243,"length":210,"line":211,"column":4,"endLine":215,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"setScreenBrightness","argumentNames":["img","b"]}
-
-function helpers_setScreenBrightness__P1735_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: helpers_setScreenBrightness__P1735, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function scene_systemMenu_brightnessUp__P4607(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.tmp_0 = scene_systemMenu_setScreenBrightness__P4609_mk(s);
-    r0 = globals.brightness___1724;
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 + 5);
-    s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1455; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-scene_systemMenu_brightnessUp__P4607.info = {"start":9107,"length":85,"line":285,"column":4,"endLine":287,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"brightnessUp","argumentNames":[]}
-
-function scene_systemMenu_brightnessUp__P4607_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: scene_systemMenu_brightnessUp__P4607, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-} }
-
-
-
-
-
-function scene_systemMenu_volumeDown__P4606(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.v___22886 = undefined;
-    s.remainder___22889 = undefined;
-    s.newVolume___22892 = undefined;
-    s.tmp_0 = music_volume__P1593_mk(s);
-    s.callLocIdx = 1452; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    s.v___22886 = (r0);
-    r0 = (s.v___22886 % 32);
-    s.remainder___22889 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.remainder___22889);
-    if (!r0) { step = 1; continue; }
-    r0 = s.remainder___22889;
-    { step = 2; continue; }
-  case 1:
-    r0 = 32;
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_0 = r0;
-    r0 = (s.v___22886 - s.tmp_0);
-    s.newVolume___22892 = (r0);
-    s.tmp_0 = scene_systemMenu_setVolume__P4604_mk(s);
-    s.tmp_0.arg0 = s.newVolume___22892;
-    s.callLocIdx = 1453; s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-scene_systemMenu_volumeDown__P4606.info = {"start":8914,"length":187,"line":278,"column":4,"endLine":283,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"volumeDown","argumentNames":[]}
-
-function scene_systemMenu_volumeDown__P4606_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: scene_systemMenu_volumeDown__P4606, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  v___22886: undefined,
-  remainder___22889: undefined,
-  newVolume___22892: undefined,
-} }
-
-
-
-
-
-function scene_systemMenu_setVolume__P4604(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = music_setVolume__P1592_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1447; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    s.tmp_0 = music_playTone__P1594_mk(s);
-    s.tmp_0.arg0 = 440;
-    s.tmp_0.arg1 = 500;
-    s.callLocIdx = 1448; s.pc = 2; return s.tmp_0;
-  case 2:
-    r0 = s.retval;
-    s.tmp_0 = settings_writeNumber__P1829_mk(s);
-    s.tmp_0.arg0 = "#volume";
-    s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1449; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-scene_systemMenu_setVolume__P4604.info = {"start":8565,"length":166,"line":265,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setVolume","argumentNames":["newVolume"]}
+scene_systemMenu_setScreenBrightness__P34102.info = {"start":9291,"length":345,"line":293,"column":4,"endLine":298,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setScreenBrightness","argumentNames":["b"]}
 
-function scene_systemMenu_setVolume__P4604_mk(s) {
+function scene_systemMenu_setScreenBrightness__P34102_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setVolume__P4604, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setScreenBrightness__P34102, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -56835,7 +57262,7 @@ function scene_systemMenu_setVolume__P4604_mk(s) {
 
 
 
-function music_playTone__P1594(s) {
+function helpers_setScreenBrightness__P31153(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56845,73 +57272,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.id___22818 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtrt.mklocRef();
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
-    s.arg1 = (s.tmp_0);
-    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 == 0);
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtrt_stlocRef(s.arg1, 86400000);
+    s.tmp_0 = Math_clamp__P29657_mk(s);
+    s.tmp_0.arg0 = 10;
+    s.tmp_0.arg1 = 100;
+    r0 = (s.arg1 | 0);
+    s.tmp_0.arg2 = r0;
+    s.callLocIdx = 81; s.pc = 1; return s.tmp_0;
   case 1:
-  case 2:
-    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= 2000);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 3; continue; }
-    s.tmp_2 = music_playNoteCore__P4068_mk(s);
-    s.tmp_2.arg0 = 0;
-    s.tmp_2.arg1 = s.arg0;
-    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
-    s.tmp_2.arg2 = r0;
-    s.callLocIdx = 74; s.pc = 5; return s.tmp_2;
-  case 5:
-    r0 = s.retval;
-    s.tmp_0 = pause__P402_mk(s);
-    r0 = pxsim_pxtrt_ldlocRef(s.arg1);
-    s.tmp_0.arg0 = r0;
-    s.callLocIdx = 75; s.pc = 6; return s.tmp_0;
-  case 6:
     r0 = s.retval;
-    { step = 4; continue; }
-  case 3:
-    r0 = (globals.playToneID___4070 + 1);
-    s.tmp_0 = r0;
-    globals.playToneID___4070 = (r0);
-    s.id___22818 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P22824);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.id___22818);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg0);
-    r0 = pxsim.control.runInParallel(s.tmp_0);
-  case 4:
+    s.arg1 = (r0);
+    globals.brightness___31142 = (s.arg1);
+    r0 = pxsim_pxtcore.setScreenBrightness(globals.brightness___31142);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_playTone__P1594.info = {"start":2591,"length":831,"line":83,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playTone","argumentNames":["frequency","ms"]}
+helpers_setScreenBrightness__P31153.info = {"start":6243,"length":210,"line":211,"column":4,"endLine":215,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"setScreenBrightness","argumentNames":["img","b"]}
 
-function music_playTone__P1594_mk(s) {
+function helpers_setScreenBrightness__P31153_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_playTone__P1594, depth: s.depth + 1,
+        parent: s, fn: helpers_setScreenBrightness__P31153, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  id___22818: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -56920,7 +57308,7 @@ function music_playTone__P1594_mk(s) {
 
 
 
-function inline__P22824(s) {
+function scene_systemMenu_brightnessUp__P34100(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56930,106 +57318,91 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pos___22825 = undefined;
-    s.now___22835 = undefined;
-    s.d___22838 = undefined;
-    s.t___22842 = undefined;
-    r0 = pxsim.control.millis();
-    s.pos___22825 = (r0);
-  case 1:
-    r0 = (s.caps[0] == globals.playToneID___4070);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 2; continue; }
-    r0 = s.tmp_0;
-    { step = 3; continue; }
-  case 2:
-    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
+    s.tmp_0 = scene_systemMenu_setScreenBrightness__P34102_mk(s);
+    r0 = globals.brightness___31142;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > 0);
-  case 3:
-    // jmp value (already in r0)
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    if (!r0) { step = 6; continue; }
-    r0 = pxsim.control.millis();
-    s.now___22835 = (r0);
-    r0 = (s.pos___22825 - s.now___22835);
-    s.d___22838 = (r0);
-    s.tmp_0 = Math_min__P126_mk(s);
-    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
+    r0 = (s.tmp_1 + 5);
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = 500;
-    s.callLocIdx = 76; s.pc = 7; return s.tmp_0;
-  case 7:
+    s.callLocIdx = 1412; s.pc = 1; return s.tmp_0;
+  case 1:
     r0 = s.retval;
-    s.t___22842 = (r0);
-    s.tmp_0 = r0 = s.caps[1];
-    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.t___22842);
-    s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = (s.pos___22825 + s.t___22842);
-    s.pos___22825 = (r0);
-    s.tmp_0 = music_playNoteCore__P4068_mk(s);
-    r0 = (s.d___22838 - 1);
-    s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.caps[2];
-    s.tmp_0.arg2 = s.t___22842;
-    s.callLocIdx = 77; s.pc = 8; return s.tmp_0;
-  case 8:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+scene_systemMenu_brightnessUp__P34100.info = {"start":9107,"length":85,"line":285,"column":4,"endLine":287,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"brightnessUp","argumentNames":[]}
+
+function scene_systemMenu_brightnessUp__P34100_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: scene_systemMenu_brightnessUp__P34100, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+} }
+
+
+
+
+
+function scene_systemMenu_volumeDown__P34099(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.v___52461 = undefined;
+    s.remainder___52464 = undefined;
+    s.newVolume___52467 = undefined;
+    s.tmp_0 = music_volume__P32273_mk(s);
+    s.callLocIdx = 1409; s.pc = 3; return s.tmp_0;
+  case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 == 0);
+    s.v___52461 = (r0);
+    r0 = (s.v___52461 % 32);
+    s.remainder___52464 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.remainder___52464);
+    if (!r0) { step = 1; continue; }
+    r0 = s.remainder___52464;
+    { step = 2; continue; }
+  case 1:
+    r0 = 32;
+  case 2:
+    // jmp value (already in r0)
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    s.tmp_2 = pause__P402_mk(s);
-    r0 = (s.d___22838 + s.t___22842);
-    s.tmp_2.arg0 = r0;
-    s.callLocIdx = 78; s.pc = 9; return s.tmp_2;
-  case 9:
-    r0 = s.retval;
-    { step = 5; continue; }
+    r0 = (s.v___52461 - s.tmp_0);
+    s.newVolume___52467 = (r0);
+    s.tmp_0 = scene_systemMenu_setVolume__P34097_mk(s);
+    s.tmp_0.arg0 = s.newVolume___52467;
+    s.callLocIdx = 1410; s.pc = 4; return s.tmp_0;
   case 4:
-    s.tmp_0 = pause__P402_mk(s);
-    r0 = (s.d___22838 + s.t___22842);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 - 100);
-    s.tmp_0.arg0 = r0;
-    s.callLocIdx = 79; s.pc = 10; return s.tmp_0;
-  case 10:
     r0 = s.retval;
-  case 5:
-    { step = 1; continue; }
-  case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22824.info = {"start":2890,"length":515,"line":92,"column":34,"endLine":106,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
+scene_systemMenu_volumeDown__P34099.info = {"start":8914,"length":187,"line":278,"column":4,"endLine":283,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"volumeDown","argumentNames":[]}
 
-function inline__P22824_mk(s) {
+function scene_systemMenu_volumeDown__P34099_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22824, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_volumeDown__P34099, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  pos___22825: undefined,
-  now___22835: undefined,
-  d___22838: undefined,
-  t___22842: undefined,
+  v___52461: undefined,
+  remainder___52464: undefined,
+  newVolume___52467: undefined,
 } }
 
 
 
 
 
-function music_playNoteCore__P4068(s) {
+function scene_systemMenu_setVolume__P34097(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57039,57 +57412,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___22872 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim.control.createBuffer(12);
-    s.buf___22872 = (r0);
-    s.tmp_0 = music_addNote__P4075_mk(s);
-    s.tmp_0.arg0 = s.buf___22872;
-    s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.arg2;
-    s.tmp_0.arg3 = 255;
-    s.tmp_0.arg4 = 255;
-    s.tmp_0.arg5 = 3;
-    s.tmp_0.arg6 = s.arg1;
-    s.tmp_1 = music_volume__P1593_mk(s);
-    s.callLocIdx = 72; s.pc = 2; return s.tmp_1;
+    s.tmp_0 = music_setVolume__P32272_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1404; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    s.tmp_0 = music_playTone__P32274_mk(s);
+    s.tmp_0.arg0 = 440;
+    s.tmp_0.arg1 = 500;
+    s.callLocIdx = 1405; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0.arg7 = r0;
-    s.tmp_0.arg8 = s.arg1;
-    s.callLocIdx = 73; s.pc = 1; return s.tmp_0;
-  case 1:
+    s.tmp_0 = settings_writeNumber__P31248_mk(s);
+    s.tmp_0.arg0 = "#volume";
+    s.tmp_0.arg1 = s.arg0;
+    s.callLocIdx = 1406; s.pc = 3; return s.tmp_0;
+  case 3:
     r0 = s.retval;
-    r0 = pxsim.music.queuePlayInstructions(s.arg0, s.buf___22872);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_playNoteCore__P4068.info = {"start":1877,"length":240,"line":66,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playNoteCore","argumentNames":["when","frequency","ms"]}
+scene_systemMenu_setVolume__P34097.info = {"start":8565,"length":166,"line":265,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setVolume","argumentNames":["newVolume"]}
 
-function music_playNoteCore__P4068_mk(s) {
+function scene_systemMenu_setVolume__P34097_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_playNoteCore__P4068, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setVolume__P34097, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  buf___22872: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_volumeUp__P4605(s) {
+function scene_systemMenu_volumeUp__P34098(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57099,47 +57462,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.v___22786 = undefined;
-    s.remainder___22789 = undefined;
-    s.newVolume___22792 = undefined;
-    s.tmp_0 = music_volume__P1593_mk(s);
-    s.callLocIdx = 1450; s.pc = 1; return s.tmp_0;
+    s.v___52361 = undefined;
+    s.remainder___52364 = undefined;
+    s.newVolume___52367 = undefined;
+    s.tmp_0 = music_volume__P32273_mk(s);
+    s.callLocIdx = 1407; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.v___22786 = (r0);
-    r0 = (s.v___22786 % 32);
-    s.remainder___22789 = (r0);
-    r0 = (s.v___22786 + 32);
+    s.v___52361 = (r0);
+    r0 = (s.v___52361 % 32);
+    s.remainder___52364 = (r0);
+    r0 = (s.v___52361 + 32);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.remainder___22789);
-    s.newVolume___22792 = (r0);
-    s.tmp_0 = scene_systemMenu_setVolume__P4604_mk(s);
-    s.tmp_0.arg0 = s.newVolume___22792;
-    s.callLocIdx = 1451; s.pc = 2; return s.tmp_0;
+    r0 = (s.tmp_0 - s.remainder___52364);
+    s.newVolume___52367 = (r0);
+    s.tmp_0 = scene_systemMenu_setVolume__P34097_mk(s);
+    s.tmp_0.arg0 = s.newVolume___52367;
+    s.callLocIdx = 1408; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_volumeUp__P4605.info = {"start":8737,"length":171,"line":271,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"volumeUp","argumentNames":[]}
+scene_systemMenu_volumeUp__P34098.info = {"start":8737,"length":171,"line":271,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"volumeUp","argumentNames":[]}
 
-function scene_systemMenu_volumeUp__P4605_mk(s) {
+function scene_systemMenu_volumeUp__P34098_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_volumeUp__P4605, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_volumeUp__P34098, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  v___22786: undefined,
-  remainder___22789: undefined,
-  newVolume___22792: undefined,
+  v___52361: undefined,
+  remainder___52364: undefined,
+  newVolume___52367: undefined,
 } }
 
 
 
 
 
-function game_consoleOverlay_isVisible__P2651(s) {
+function game_consoleOverlay_isVisible__P32070(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57149,7 +57512,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___34139);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1 = r0;
@@ -57159,12 +57522,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_isVisible__P2651.info = {"start":422,"length":68,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"isVisible","argumentNames":[]}
+game_consoleOverlay_isVisible__P32070.info = {"start":422,"length":68,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/game---hw/console.ts","functionName":"isVisible","argumentNames":[]}
 
-function game_consoleOverlay_isVisible__P2651_mk(s) {
+function game_consoleOverlay_isVisible__P32070_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_isVisible__P2651, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_isVisible__P32070, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57175,7 +57538,7 @@ function game_consoleOverlay_isVisible__P2651_mk(s) {
 
 
 
-function scene_systemMenu_closeMenu__P2629(s) {
+function scene_systemMenu_closeMenu__P32048(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57185,21 +57548,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___34093);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = scene_systemMenu_PauseMenu_dispose__P2628_mk(s);
-    s.tmp_0.arg0 = globals.instance___4600;
-    s.callLocIdx = 1466; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_PauseMenu_dispose__P32047_mk(s);
+    s.tmp_0.arg0 = globals.instance___34093;
+    s.callLocIdx = 1423; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.instance___4600 = (undefined);
-    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
+    globals.instance___34093 = (undefined);
+    s.tmp_0 = controller__setUserEventsEnabled__P31373_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1467; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1424; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P2537_mk(s);
-    s.callLocIdx = 1468; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = game_popScene__P31956_mk(s);
+    s.callLocIdx = 1425; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -57208,12 +57571,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_closeMenu__P2629.info = {"start":10129,"length":216,"line":320,"column":4,"endLine":327,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"closeMenu","argumentNames":[]}
+scene_systemMenu_closeMenu__P32048.info = {"start":10129,"length":216,"line":320,"column":4,"endLine":327,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"closeMenu","argumentNames":[]}
 
-function scene_systemMenu_closeMenu__P2629_mk(s) {
+function scene_systemMenu_closeMenu__P32048_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_closeMenu__P2629, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_closeMenu__P32048, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -57222,7 +57585,7 @@ function scene_systemMenu_closeMenu__P2629_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_dispose__P2628(s) {
+function scene_systemMenu_PauseMenu_dispose__P32047(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57237,16 +57600,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C32041_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P22266;
-    s.callLocIdx = 1443; s.pc = 3; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P51841;
+    s.callLocIdx = 1400; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["options"] = (undefined);
@@ -57256,12 +57619,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_dispose__P2628.info = {"start":7732,"length":165,"line":243,"column":8,"endLine":248,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_dispose__P32047.info = {"start":7732,"length":165,"line":243,"column":8,"endLine":248,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_dispose__P2628_mk(s) {
+function scene_systemMenu_PauseMenu_dispose__P32047_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_dispose__P2628, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_dispose__P32047, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57272,7 +57635,7 @@ function scene_systemMenu_PauseMenu_dispose__P2628_mk(s) {
 
 
 
-function inline__P22266(s) {
+function inline__P51841(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57286,21 +57649,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_systemMenu_MenuOption_dispose__P2621_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_dispose__P32040_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1442; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1399; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P22266.info = {"start":7813,"length":16,"line":245,"column":37,"endLine":245,"endColumn":53,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["o"]}
+inline__P51841.info = {"start":7813,"length":16,"line":245,"column":37,"endLine":245,"endColumn":53,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P22266_mk(s) {
+function inline__P51841_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P22266, depth: s.depth + 1,
+        parent: s, fn: inline__P51841, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -57310,7 +57673,7 @@ function inline__P22266_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_dispose__P2621(s) {
+function scene_systemMenu_MenuOption_dispose__P32040(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57325,25 +57688,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
     r0 = s.arg0.fields["card"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = Sprite_destroy__P2087_mk(s);
+    s.tmp_1 = Sprite_destroy__P31506_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1362; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1319; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_destroy__P2087_mk(s);
+    s.tmp_0 = Sprite_destroy__P31506_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 1363; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1320; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["card"] = (undefined);
@@ -57354,12 +57717,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_dispose__P2621.info = {"start":1812,"length":216,"line":77,"column":8,"endLine":84,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
+scene_systemMenu_MenuOption_dispose__P32040.info = {"start":1812,"length":216,"line":77,"column":8,"endLine":84,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
 
-function scene_systemMenu_MenuOption_dispose__P2621_mk(s) {
+function scene_systemMenu_MenuOption_dispose__P32040_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_dispose__P2621, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_dispose__P32040, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57370,7 +57733,7 @@ function scene_systemMenu_MenuOption_dispose__P2621_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_constructor__P2615(s) {
+function scene_systemMenu_MenuOption_constructor__P32034(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57388,7 +57751,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
     r0 = (s.arg0).fields["iconImage"] = (s.arg1);
     r0 = (s.arg0).fields["getText"] = (s.arg2);
     r0 = (s.arg0).fields["action"] = (s.arg3);
@@ -57396,12 +57759,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_constructor__P2615.info = {"start":786,"length":108,"line":38,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["this","iconImage","getText","action"]}
+scene_systemMenu_MenuOption_constructor__P32034.info = {"start":786,"length":108,"line":38,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":["this","iconImage","getText","action"]}
 
-function scene_systemMenu_MenuOption_constructor__P2615_mk(s) {
+function scene_systemMenu_MenuOption_constructor__P32034_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_constructor__P2615, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_constructor__P32034, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -57413,7 +57776,7 @@ function scene_systemMenu_MenuOption_constructor__P2615_mk(s) {
 
 
 
-function helpers_screenBrightness__P1736(s) {
+function helpers_screenBrightness__P31154(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57427,16 +57790,16 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = globals.brightness___1724;
+    r0 = globals.brightness___31142;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_screenBrightness__P1736.info = {"start":6459,"length":98,"line":217,"column":4,"endLine":219,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"screenBrightness","argumentNames":["img"]}
+helpers_screenBrightness__P31154.info = {"start":6459,"length":98,"line":217,"column":4,"endLine":219,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"screenBrightness","argumentNames":["img"]}
 
-function helpers_screenBrightness__P1736_mk(s) {
+function helpers_screenBrightness__P31154_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_screenBrightness__P1736, depth: s.depth + 1,
+        parent: s, fn: helpers_screenBrightness__P31154, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -57445,7 +57808,7 @@ function helpers_screenBrightness__P1736_mk(s) {
 
 
 
-function helpers_arrayConcat__P111(s) {
+function helpers_arrayConcat__P29646(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57455,74 +57818,74 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.out___22506 = undefined;
-    s.value___22509 = undefined;
-    s.unnamed80___U2 = undefined;
-    s.unnamed81___U3 = undefined;
-    s.value___22516 = undefined;
-    s.unnamed82___U5 = undefined;
-    s.unnamed83___U6 = undefined;
+    s.out___52081 = undefined;
+    s.value___52084 = undefined;
+    s.unnamed920___U2 = undefined;
+    s.unnamed921___U3 = undefined;
+    s.value___52091 = undefined;
+    s.unnamed922___U5 = undefined;
+    s.unnamed923___U6 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.out___22506 = (r0);
-    s.value___22509 = (undefined);
-    s.unnamed80___U2 = (s.arg0);
-    s.unnamed81___U3 = (0);
+    s.out___52081 = (r0);
+    s.value___52084 = (undefined);
+    s.unnamed920___U2 = (s.arg0);
+    s.unnamed921___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed81___U3;
-    r0 = pxsim_Array__length(s.unnamed80___U2);
+    s.tmp_0 = r0 = s.unnamed921___U3;
+    r0 = pxsim_Array__length(s.unnamed920___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed80___U2, s.unnamed81___U3);
-    s.value___22509 = (r0);
-    r0 = pxsim_Array__push(s.out___22506, s.value___22509);
-    r0 = (s.unnamed81___U3 + 1);
-    s.unnamed81___U3 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed920___U2, s.unnamed921___U3);
+    s.value___52084 = (r0);
+    r0 = pxsim_Array__push(s.out___52081, s.value___52084);
+    r0 = (s.unnamed921___U3 + 1);
+    s.unnamed921___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed80___U2 = (undefined);
-    s.value___22516 = (undefined);
-    s.unnamed82___U5 = (s.arg1);
-    s.unnamed83___U6 = (0);
+    s.unnamed920___U2 = (undefined);
+    s.value___52091 = (undefined);
+    s.unnamed922___U5 = (s.arg1);
+    s.unnamed923___U6 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed83___U6;
-    r0 = pxsim_Array__length(s.unnamed82___U5);
+    s.tmp_0 = r0 = s.unnamed923___U6;
+    r0 = pxsim_Array__length(s.unnamed922___U5);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed82___U5, s.unnamed83___U6);
-    s.value___22516 = (r0);
-    r0 = pxsim_Array__push(s.out___22506, s.value___22516);
-    r0 = (s.unnamed83___U6 + 1);
-    s.unnamed83___U6 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed922___U5, s.unnamed923___U6);
+    s.value___52091 = (r0);
+    r0 = pxsim_Array__push(s.out___52081, s.value___52091);
+    r0 = (s.unnamed923___U6 + 1);
+    s.unnamed923___U6 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed82___U5 = (undefined);
-    r0 = s.out___22506;
+    s.unnamed922___U5 = (undefined);
+    r0 = s.out___52081;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayConcat__P111.info = {"start":8639,"length":264,"line":288,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayConcat","argumentNames":["arr","otherArr"]}
+helpers_arrayConcat__P29646.info = {"start":8639,"length":264,"line":288,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayConcat","argumentNames":["arr","otherArr"]}
 
-function helpers_arrayConcat__P111_mk(s) {
+function helpers_arrayConcat__P29646_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayConcat__P111, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayConcat__P29646, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  out___22506: undefined,
-  value___22509: undefined,
-  unnamed80___U2: undefined,
-  unnamed81___U3: undefined,
-  value___22516: undefined,
-  unnamed82___U5: undefined,
-  unnamed83___U6: undefined,
+  out___52081: undefined,
+  value___52084: undefined,
+  unnamed920___U2: undefined,
+  unnamed921___U3: undefined,
+  value___52091: undefined,
+  unnamed922___U5: undefined,
+  unnamed923___U6: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -57531,7 +57894,7 @@ function helpers_arrayConcat__P111_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_show__P2624(s) {
+function scene_systemMenu_PauseMenu_show__P32043(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57541,34 +57904,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___21822 = undefined;
-    s.i___21823 = undefined;
+    s.current___51397 = undefined;
+    s.i___51398 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C32041_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     s.tmp_2 = if_generator_1_mk(s);
     s.tmp_2.arg0 = s.arg0;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "generator"), 1);
-      s.callLocIdx = 1375; s.pc = 3; return s.tmp_2;
+      s.callLocIdx = 1332; s.pc = 3; return s.tmp_2;
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["generator"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["generator"], 1); s.callLocIdx = 1375; s.pc = 3; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1375; s.pc = 3; return s.tmp_2;; }
-     else { s.callLocIdx = 1375; s.pc = 3; return s.tmp_2; }
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["generator"], 1); s.callLocIdx = 1332; s.pc = 3; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1332; s.pc = 3; return s.tmp_2;; }
+     else { s.callLocIdx = 1332; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["options"] = (s.tmp_1);
     r0 = (s.arg0).fields["selection"] = (0);
-    s.i___21823 = (0);
+    s.i___51398 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___21823;
+    s.tmp_1 = r0 = s.i___51398;
     r0 = s.arg0.fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -57579,22 +57942,22 @@ switch (step) {
     if (!r0) { step = 2; continue; }
     r0 = s.arg0.fields["options"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_4, s.i___21823);
-    s.current___21822 = (r0);
-    s.tmp_0 = scene_systemMenu_MenuOption_show__P2616_mk(s);
-    s.tmp_0.arg0 = s.current___21822;
-    s.callLocIdx = 1376; s.pc = 4; return s.tmp_0;
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___51398);
+    s.current___51397 = (r0);
+    s.tmp_0 = scene_systemMenu_MenuOption_show__P32035_mk(s);
+    s.tmp_0.arg0 = s.current___51397;
+    s.callLocIdx = 1333; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_MenuOption_setTheme__P2619_mk(s);
-    s.tmp_0.arg0 = s.current___21822;
+    s.tmp_0 = scene_systemMenu_MenuOption_setTheme__P32038_mk(s);
+    s.tmp_0.arg0 = s.current___51397;
     r0 = s.arg0.fields["theme"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1377; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1334; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_MenuOption_position__P2617_mk(s);
-    s.tmp_0.arg0 = s.current___21822;
+    s.tmp_0 = scene_systemMenu_MenuOption_position__P32036_mk(s);
+    s.tmp_0.arg0 = s.current___51397;
     s.tmp_2 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -57604,12 +57967,12 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["padding"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["padding"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1378; s.pc = 7; return s.tmp_2; }
+     else { s.callLocIdx = 1335; s.pc = 7; return s.tmp_2; }
     }
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_5 = r0 = s.i___21823;
+    s.tmp_5 = r0 = s.i___51398;
     s.tmp_7 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_7.arg0 = r0;
@@ -57619,7 +57982,7 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["cardsPerRow"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["cardsPerRow"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 1379; s.pc = 8; return s.tmp_7; }
+     else { s.callLocIdx = 1336; s.pc = 8; return s.tmp_7; }
     }
   case 8:
     r0 = s.retval;
@@ -57635,7 +57998,7 @@ switch (step) {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["cardWidth"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["cardWidth"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 1380; s.pc = 9; return s.tmp_10; }
+     else { s.callLocIdx = 1337; s.pc = 9; return s.tmp_10; }
     }
   case 9:
     r0 = s.retval;
@@ -57649,7 +58012,7 @@ switch (step) {
       s.tmp_12.fn = s.tmp_12.arg0.vtable.iface["cardSpacing"];
       if (s.tmp_12.fn == null) { s.retval = s.tmp_12.arg0.fields["cardSpacing"]; }
       else if (!s.tmp_12.fn.isGetter) { s.retval = bind(s.tmp_12); }
-     else { s.callLocIdx = 1381; s.pc = 10; return s.tmp_12; }
+     else { s.callLocIdx = 1338; s.pc = 10; return s.tmp_12; }
     }
   case 10:
     r0 = s.retval;
@@ -57669,12 +58032,12 @@ switch (step) {
       s.tmp_14.fn = s.tmp_14.arg0.vtable.iface["cardsTop"];
       if (s.tmp_14.fn == null) { s.retval = s.tmp_14.arg0.fields["cardsTop"]; }
       else if (!s.tmp_14.fn.isGetter) { s.retval = bind(s.tmp_14); }
-     else { s.callLocIdx = 1382; s.pc = 11; return s.tmp_14; }
+     else { s.callLocIdx = 1339; s.pc = 11; return s.tmp_14; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_17 = r0 = s.i___21823;
+    s.tmp_17 = r0 = s.i___51398;
     s.tmp_19 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_19.arg0 = r0;
@@ -57684,7 +58047,7 @@ switch (step) {
       s.tmp_19.fn = s.tmp_19.arg0.vtable.iface["cardsPerRow"];
       if (s.tmp_19.fn == null) { s.retval = s.tmp_19.arg0.fields["cardsPerRow"]; }
       else if (!s.tmp_19.fn.isGetter) { s.retval = bind(s.tmp_19); }
-     else { s.callLocIdx = 1383; s.pc = 12; return s.tmp_19; }
+     else { s.callLocIdx = 1340; s.pc = 12; return s.tmp_19; }
     }
   case 12:
     r0 = s.retval;
@@ -57700,7 +58063,7 @@ switch (step) {
       s.tmp_22.fn = s.tmp_22.arg0.vtable.iface["cardWidth"];
       if (s.tmp_22.fn == null) { s.retval = s.tmp_22.arg0.fields["cardWidth"]; }
       else if (!s.tmp_22.fn.isGetter) { s.retval = bind(s.tmp_22); }
-     else { s.callLocIdx = 1384; s.pc = 13; return s.tmp_22; }
+     else { s.callLocIdx = 1341; s.pc = 13; return s.tmp_22; }
     }
   case 13:
     r0 = s.retval;
@@ -57714,7 +58077,7 @@ switch (step) {
       s.tmp_24.fn = s.tmp_24.arg0.vtable.iface["cardSpacing"];
       if (s.tmp_24.fn == null) { s.retval = s.tmp_24.arg0.fields["cardSpacing"]; }
       else if (!s.tmp_24.fn.isGetter) { s.retval = bind(s.tmp_24); }
-     else { s.callLocIdx = 1385; s.pc = 14; return s.tmp_24; }
+     else { s.callLocIdx = 1342; s.pc = 14; return s.tmp_24; }
     }
   case 14:
     r0 = s.retval;
@@ -57725,116 +58088,116 @@ switch (step) {
     s.tmp_15 = r0;
     r0 = (s.tmp_13 + s.tmp_15);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 1386; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1343; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = (s.i___21823 + 1);
-    s.i___21823 = (r0);
+    r0 = (s.i___51398 + 1);
+    s.i___51398 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P31373_mk(s);
     s.tmp_0.arg0 = false;
-    s.callLocIdx = 1387; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1344; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21886);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51461);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.A___1877;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.A___31296;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1389; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 1346; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21906);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51481);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.A___1877;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.A___31296;
     s.tmp_1.arg1 = 2052;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1391; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 1348; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_0.arg0 = globals.B___1878;
+    s.tmp_0 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_0.arg0 = globals.B___31297;
     s.tmp_0.arg1 = 2053;
-    s.tmp_0.arg2 = inline__P21935;
-    s.callLocIdx = 1393; s.pc = 18; return s.tmp_0;
+    s.tmp_0.arg2 = inline__P51510;
+    s.callLocIdx = 1350; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_0.arg0 = globals.menu___1883;
+    s.tmp_0 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_0.arg0 = globals.menu___31302;
     s.tmp_0.arg1 = 2053;
-    s.tmp_0.arg2 = inline__P21940;
-    s.callLocIdx = 1395; s.pc = 19; return s.tmp_0;
+    s.tmp_0.arg2 = inline__P51515;
+    s.callLocIdx = 1352; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21945);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51520);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.up___1880;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.up___31299;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1399; s.pc = 20; return s.tmp_1;
+    s.callLocIdx = 1356; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21957);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51532);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.left___1879;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.left___31298;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1402; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 1359; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21966);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51541);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.down___1882;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.down___31301;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1406; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 1363; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21982);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51557);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
-    s.tmp_1.arg0 = globals.right___1881;
+    s.tmp_1 = controller_Button_onEvent__P31329_mk(s);
+    s.tmp_1.arg0 = globals.right___31300;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1409; s.pc = 23; return s.tmp_1;
+    s.callLocIdx = 1366; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P21994);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P51569);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = game_onShade__P2547_mk(s);
+    s.tmp_1 = game_onShade__P31966_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1412; s.pc = 24; return s.tmp_1;
+    s.callLocIdx = 1369; s.pc = 24; return s.tmp_1;
   case 24:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P32045_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1413; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 1370; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_show__P2624.info = {"start":3296,"length":2241,"line":123,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"show","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_show__P32043.info = {"start":3296,"length":2241,"line":123,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"show","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_show__P2624_mk(s) {
+function scene_systemMenu_PauseMenu_show__P32043_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_show__P2624, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_show__P32043, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57861,8 +58224,8 @@ function scene_systemMenu_PauseMenu_show__P2624_mk(s) {
   tmp_22: undefined,
   tmp_23: undefined,
   tmp_24: undefined,
-  current___21822: undefined,
-  i___21823: undefined,
+  current___51397: undefined,
+  i___51398: undefined,
   arg0: undefined,
 } }
 
@@ -57870,7 +58233,7 @@ function scene_systemMenu_PauseMenu_show__P2624_mk(s) {
 
 
 
-function inline__P21886(s) {
+function inline__P51461(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57908,7 +58271,7 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
+    s.tmp_8 = scene_systemMenu_MenuOption_setState__P32039_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_9 = r0;
     r0 = s.caps[0].fields["selection"];
@@ -57916,7 +58279,7 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_9, s.tmp_10);
     s.tmp_8.arg0 = r0;
     s.tmp_8.arg1 = 1;
-    s.callLocIdx = 1388; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 1345; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
   case 5:
@@ -57924,12 +58287,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21886.info = {"start":4025,"length":170,"line":140,"column":50,"endLine":143,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51461.info = {"start":4025,"length":170,"line":140,"column":50,"endLine":143,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21886_mk(s) {
+function inline__P51461_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21886, depth: s.depth + 1,
+        parent: s, fn: inline__P51461, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57948,7 +58311,7 @@ function inline__P21886_mk(s) {
 
 
 
-function inline__P21906(s) {
+function inline__P51481(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57986,7 +58349,7 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
+    s.tmp_8 = scene_systemMenu_MenuOption_setState__P32039_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_9 = r0;
     r0 = s.caps[0].fields["selection"];
@@ -57994,7 +58357,7 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_9, s.tmp_10);
     s.tmp_8.arg0 = r0;
     s.tmp_8.arg1 = 0;
-    s.callLocIdx = 1390; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 1347; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     r0 = s.caps[0].fields["options"];
@@ -58010,12 +58373,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21906.info = {"start":4247,"length":247,"line":145,"column":48,"endLine":149,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51481.info = {"start":4247,"length":247,"line":145,"column":48,"endLine":149,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21906_mk(s) {
+function inline__P51481_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21906, depth: s.depth + 1,
+        parent: s, fn: inline__P51481, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58034,7 +58397,7 @@ function inline__P21906_mk(s) {
 
 
 
-function inline__P21935(s) {
+function inline__P51510(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58044,20 +58407,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_closeMenu__P2629_mk(s);
-    s.callLocIdx = 1392; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_closeMenu__P32048_mk(s);
+    s.callLocIdx = 1349; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21935.info = {"start":4548,"length":50,"line":151,"column":50,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51510.info = {"start":4548,"length":50,"line":151,"column":50,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21935_mk(s) {
+function inline__P51510_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21935, depth: s.depth + 1,
+        parent: s, fn: inline__P51510, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -58066,7 +58429,7 @@ function inline__P21935_mk(s) {
 
 
 
-function inline__P21940(s) {
+function inline__P51515(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58076,20 +58439,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_closeMenu__P2629_mk(s);
-    s.callLocIdx = 1394; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_closeMenu__P32048_mk(s);
+    s.callLocIdx = 1351; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21940.info = {"start":4655,"length":50,"line":155,"column":53,"endLine":157,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51515.info = {"start":4655,"length":50,"line":155,"column":53,"endLine":157,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21940_mk(s) {
+function inline__P51515_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21940, depth: s.depth + 1,
+        parent: s, fn: inline__P51515, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -58098,7 +58461,7 @@ function inline__P21940_mk(s) {
 
 
 
-function inline__P21945(s) {
+function inline__P51520(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58108,9 +58471,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P32045_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_max__P125_mk(s);
+    s.tmp_1 = Math_max__P29660_mk(s);
     s.tmp_1.arg0 = 0;
     r0 = s.caps[0].fields["selection"];
     s.tmp_2 = r0;
@@ -58123,30 +58486,30 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["cardsPerRow"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["cardsPerRow"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1396; s.pc = 3; return s.tmp_4; }
+     else { s.callLocIdx = 1353; s.pc = 3; return s.tmp_4; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1397; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1354; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1398; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1355; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21945.info = {"start":4760,"length":110,"line":159,"column":51,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51520.info = {"start":4760,"length":110,"line":159,"column":51,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21945_mk(s) {
+function inline__P51520_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21945, depth: s.depth + 1,
+        parent: s, fn: inline__P51520, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58159,7 +58522,7 @@ function inline__P21945_mk(s) {
 
 
 
-function inline__P21957(s) {
+function inline__P51532(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58169,31 +58532,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P32045_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_max__P125_mk(s);
+    s.tmp_1 = Math_max__P29660_mk(s);
     s.tmp_1.arg0 = 0;
     r0 = s.caps[0].fields["selection"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1400; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1357; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1401; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1358; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21957.info = {"start":4927,"length":89,"line":163,"column":53,"endLine":165,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51532.info = {"start":4927,"length":89,"line":163,"column":53,"endLine":165,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21957_mk(s) {
+function inline__P51532_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21957, depth: s.depth + 1,
+        parent: s, fn: inline__P51532, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58204,7 +58567,7 @@ function inline__P21957_mk(s) {
 
 
 
-function inline__P21966(s) {
+function inline__P51541(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58214,9 +58577,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P32045_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_min__P126_mk(s);
+    s.tmp_1 = Math_min__P29661_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -58234,30 +58597,30 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["cardsPerRow"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["cardsPerRow"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1403; s.pc = 3; return s.tmp_6; }
+     else { s.callLocIdx = 1360; s.pc = 3; return s.tmp_6; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1404; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1361; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1405; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1362; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21966.info = {"start":5073,"length":132,"line":167,"column":53,"endLine":169,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51541.info = {"start":5073,"length":132,"line":167,"column":53,"endLine":169,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21966_mk(s) {
+function inline__P51541_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21966, depth: s.depth + 1,
+        parent: s, fn: inline__P51541, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58272,7 +58635,7 @@ function inline__P21966_mk(s) {
 
 
 
-function inline__P21982(s) {
+function inline__P51557(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58282,9 +58645,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P32045_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_min__P126_mk(s);
+    s.tmp_1 = Math_min__P29661_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -58295,23 +58658,23 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 1);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1407; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1364; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1408; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1365; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21982.info = {"start":5263,"length":111,"line":171,"column":54,"endLine":173,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51557.info = {"start":5263,"length":111,"line":171,"column":54,"endLine":173,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21982_mk(s) {
+function inline__P51557_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21982, depth: s.depth + 1,
+        parent: s, fn: inline__P51557, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58324,7 +58687,7 @@ function inline__P21982_mk(s) {
 
 
 
-function inline__P21994(s) {
+function inline__P51569(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58334,26 +58697,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_onUpdate__P2625_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_onUpdate__P32044_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1410; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1367; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_PauseMenu_drawText__P2627_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_drawText__P32046_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1411; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1368; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P21994.info = {"start":5403,"length":87,"line":175,"column":25,"endLine":178,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P51569.info = {"start":5403,"length":87,"line":175,"column":25,"endLine":178,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P21994_mk(s) {
+function inline__P51569_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P21994, depth: s.depth + 1,
+        parent: s, fn: inline__P51569, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -58362,7 +58725,7 @@ function inline__P21994_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_drawText__P2627(s) {
+function scene_systemMenu_PauseMenu_drawText__P32046(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58377,7 +58740,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C32041_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -58389,11 +58752,11 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_3 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_3.arg0 = globals.screen___1802;
+    s.tmp_3 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_3.arg0 = globals.screen___31220;
     s.tmp_3.arg1 = 0;
     s.tmp_3.arg2 = 0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_3.arg3 = r0;
     s.tmp_5 = if_cardsTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58404,7 +58767,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["cardsTop"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["cardsTop"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1424; s.pc = 5; return s.tmp_5; }
+     else { s.callLocIdx = 1381; s.pc = 5; return s.tmp_5; }
     }
   case 5:
     r0 = s.retval;
@@ -58412,11 +58775,11 @@ switch (step) {
     r0 = (s.tmp_4 - 2);
     s.tmp_3.arg4 = r0;
     s.tmp_3.arg5 = 15;
-    s.callLocIdx = 1425; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1382; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imagePrintCenter__P31177_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_1 = if_headerText_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -58426,7 +58789,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["headerText"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["headerText"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1426; s.pc = 7; return s.tmp_1; }
+     else { s.callLocIdx = 1383; s.pc = 7; return s.tmp_1; }
     }
   case 7:
     r0 = s.retval;
@@ -58442,16 +58805,16 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["headerFont"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["headerFont"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1427; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 1384; s.pc = 8; return s.tmp_2; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1428; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1385; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_0.arg1 = 0;
     s.tmp_2 = if_infoTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58462,16 +58825,16 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["infoTop"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["infoTop"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1429; s.pc = 10; return s.tmp_2; }
+     else { s.callLocIdx = 1386; s.pc = 10; return s.tmp_2; }
     }
   case 10:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 3);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0.arg3 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_4 = r0;
     s.tmp_6 = if_infoTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58482,7 +58845,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["infoTop"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["infoTop"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1430; s.pc = 11; return s.tmp_6; }
+     else { s.callLocIdx = 1387; s.pc = 11; return s.tmp_6; }
     }
   case 11:
     r0 = s.retval;
@@ -58492,11 +58855,11 @@ switch (step) {
     r0 = (s.tmp_3 + 6);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 15;
-    s.callLocIdx = 1431; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1388; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_1 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -58506,7 +58869,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["padding"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["padding"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1432; s.pc = 13; return s.tmp_1; }
+     else { s.callLocIdx = 1389; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
@@ -58520,12 +58883,12 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["infoTop"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["infoTop"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1433; s.pc = 14; return s.tmp_2; }
+     else { s.callLocIdx = 1390; s.pc = 14; return s.tmp_2; }
     }
   case 14:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_3 = r0;
     s.tmp_6 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58536,7 +58899,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["padding"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["padding"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1434; s.pc = 15; return s.tmp_6; }
+     else { s.callLocIdx = 1391; s.pc = 15; return s.tmp_6; }
     }
   case 15:
     r0 = s.retval;
@@ -58555,7 +58918,7 @@ switch (step) {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["infoFont"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["infoFont"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 1435; s.pc = 17; return s.tmp_9; }
+     else { s.callLocIdx = 1392; s.pc = 17; return s.tmp_9; }
     }
   case 17:
     r0 = s.retval;
@@ -58566,7 +58929,7 @@ switch (step) {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["charHeight"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["charHeight"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 1436; s.pc = 16; return s.tmp_8; }
+     else { s.callLocIdx = 1393; s.pc = 16; return s.tmp_8; }
     }
   case 16:
     r0 = s.retval;
@@ -58574,11 +58937,11 @@ switch (step) {
     r0 = (s.tmp_7 + 1);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1437; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1394; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imagePrintCenter__P31177_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     s.tmp_1 = if_getText_1_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
@@ -58588,12 +58951,12 @@ switch (step) {
     s.tmp_1.arg0 = r0;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "getText"), 1);
-      s.callLocIdx = 1438; s.pc = 19; return s.tmp_1;
+      s.callLocIdx = 1395; s.pc = 19; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["getText"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["getText"], 1); s.callLocIdx = 1438; s.pc = 19; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1438; s.pc = 19; return s.tmp_1;; }
-     else { s.callLocIdx = 1438; s.pc = 19; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["getText"], 1); s.callLocIdx = 1395; s.pc = 19; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1395; s.pc = 19; return s.tmp_1;; }
+     else { s.callLocIdx = 1395; s.pc = 19; return s.tmp_1; }
     }
   case 19:
     r0 = s.retval;
@@ -58607,7 +58970,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["infoTop"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["infoTop"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1439; s.pc = 20; return s.tmp_5; }
+     else { s.callLocIdx = 1396; s.pc = 20; return s.tmp_5; }
     }
   case 20:
     r0 = s.retval;
@@ -58624,12 +58987,12 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["infoFont"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["infoFont"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1440; s.pc = 21; return s.tmp_6; }
+     else { s.callLocIdx = 1397; s.pc = 21; return s.tmp_6; }
     }
   case 21:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1441; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1398; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
   case 3:
@@ -58637,12 +59000,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_drawText__P2627.info = {"start":6927,"length":795,"line":224,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"drawText","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_drawText__P32046.info = {"start":6927,"length":795,"line":224,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"drawText","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_drawText__P2627_mk(s) {
+function scene_systemMenu_PauseMenu_drawText__P32046_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_drawText__P2627, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_drawText__P32046, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58661,7 +59024,7 @@ function scene_systemMenu_PauseMenu_drawText__P2627_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_setSelection__P2626(s) {
+function scene_systemMenu_PauseMenu_setSelection__P32045(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58677,7 +59040,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C32041_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -58697,7 +59060,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_6 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
+    s.tmp_6 = scene_systemMenu_MenuOption_setState__P32039_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["selection"];
@@ -58705,7 +59068,7 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_7, s.tmp_8);
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = 2;
-    s.callLocIdx = 1421; s.pc = 10; return s.tmp_6;
+    s.callLocIdx = 1378; s.pc = 10; return s.tmp_6;
   case 10:
     r0 = s.retval;
   case 3:
@@ -58719,9 +59082,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_4.arg0 = globals.A___1877;
-    if (!checkSubtype(s.tmp_4.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_4.arg0);
+    s.tmp_4 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_4.arg0 = globals.A___31296;
+    if (!checkSubtype(s.tmp_4.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_4.arg0);
     s.tmp_4.fn = s.tmp_4.arg0.vtable.methods.isPressed;
     s.pc = 11; return s.tmp_4;
   case 11:
@@ -58736,7 +59099,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.tmp_6 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
+    s.tmp_6 = scene_systemMenu_MenuOption_setState__P32039_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["selection"];
@@ -58744,14 +59107,14 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_7, s.tmp_8);
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = s.tmp_5;
-    s.callLocIdx = 1422; s.pc = 12; return s.tmp_6;
+    s.callLocIdx = 1379; s.pc = 12; return s.tmp_6;
   case 12:
     r0 = s.retval;
   case 7:
   case 8:
-    s.tmp_0 = scene_systemMenu_PauseMenu_updateScrollTarget__P4603_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_updateScrollTarget__P34096_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1423; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1380; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
   case 9:
@@ -58759,12 +59122,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_setSelection__P2626.info = {"start":6436,"length":481,"line":208,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setSelection","argumentNames":["this","selection"]}
+scene_systemMenu_PauseMenu_setSelection__P32045.info = {"start":6436,"length":481,"line":208,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setSelection","argumentNames":["this","selection"]}
 
-function scene_systemMenu_PauseMenu_setSelection__P2626_mk(s) {
+function scene_systemMenu_PauseMenu_setSelection__P32045_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_setSelection__P2626, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_setSelection__P32045, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58783,7 +59146,7 @@ function scene_systemMenu_PauseMenu_setSelection__P2626_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_updateScrollTarget__P4603(s) {
+function scene_systemMenu_PauseMenu_updateScrollTarget__P34096(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58793,13 +59156,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.row___22212 = undefined;
+    s.row___51787 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C32041_VT)) failedCast(r0);
     r0 = s.arg0.fields["selection"];
     s.tmp_0 = r0;
     s.tmp_2 = if_cardsPerRow_1_mk(s);
@@ -58811,23 +59174,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["cardsPerRow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["cardsPerRow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1444; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 1401; s.pc = 8; return s.tmp_2; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_1);
-    s.row___22212 = (r0);
+    s.row___51787 = (r0);
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_1 = r0;
-    r0 = (s.row___22212 === s.tmp_1);
+    r0 = (s.row___51787 === s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = (s.row___22212 - 1);
+    r0 = (s.row___51787 - 1);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_3 = r0;
@@ -58842,7 +59205,7 @@ switch (step) {
   case 4:
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_6 = r0;
-    r0 = (s.row___22212 > s.tmp_6);
+    r0 = (s.row___51787 > s.tmp_6);
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
@@ -58873,7 +59236,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["cardSpacing"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["cardSpacing"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1445; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 1402; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
@@ -58887,7 +59250,7 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["cardWidth"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["cardWidth"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 1446; s.pc = 10; return s.tmp_7; }
+     else { s.callLocIdx = 1403; s.pc = 10; return s.tmp_7; }
     }
   case 10:
     r0 = s.retval;
@@ -58902,12 +59265,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_updateScrollTarget__P4603.info = {"start":7907,"length":458,"line":250,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"updateScrollTarget","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_updateScrollTarget__P34096.info = {"start":7907,"length":458,"line":250,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"updateScrollTarget","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_updateScrollTarget__P4603_mk(s) {
+function scene_systemMenu_PauseMenu_updateScrollTarget__P34096_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_updateScrollTarget__P4603, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_updateScrollTarget__P34096, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58919,7 +59282,7 @@ function scene_systemMenu_PauseMenu_updateScrollTarget__P4603_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  row___22212: undefined,
+  row___51787: undefined,
   arg0: undefined,
 } }
 
@@ -58927,7 +59290,7 @@ function scene_systemMenu_PauseMenu_updateScrollTarget__P4603_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_onUpdate__P2625(s) {
+function scene_systemMenu_PauseMenu_onUpdate__P32044(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58937,22 +59300,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.t___22072 = undefined;
-    s.i___22076 = undefined;
-    s.dt___22105 = undefined;
+    s.t___51647 = undefined;
+    s.i___51651 = undefined;
+    s.dt___51680 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C32041_VT)) failedCast(r0);
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 250);
-    s.t___22072 = (r0);
-    s.i___22076 = (0);
+    s.t___51647 = (r0);
+    s.i___51651 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___22076;
+    s.tmp_1 = r0 = s.i___51651;
     r0 = s.arg0.fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -58961,13 +59324,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_4 = scene_systemMenu_MenuOption_setOffset__P2618_mk(s);
+    s.tmp_4 = scene_systemMenu_MenuOption_setOffset__P32037_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_5 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_5, s.i___22076);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___51651);
     s.tmp_4.arg0 = r0;
-    s.tmp_8 = r0 = s.t___22072;
-    s.tmp_11 = r0 = s.i___22076;
+    s.tmp_8 = r0 = s.t___51647;
+    s.tmp_11 = r0 = s.i___51651;
     s.tmp_13 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_13.arg0 = r0;
@@ -58977,7 +59340,7 @@ switch (step) {
       s.tmp_13.fn = s.tmp_13.arg0.vtable.iface["cardsPerRow"];
       if (s.tmp_13.fn == null) { s.retval = s.tmp_13.arg0.fields["cardsPerRow"]; }
       else if (!s.tmp_13.fn.isGetter) { s.retval = bind(s.tmp_13); }
-     else { s.callLocIdx = 1414; s.pc = 11; return s.tmp_13; }
+     else { s.callLocIdx = 1371; s.pc = 11; return s.tmp_13; }
     }
   case 11:
     r0 = s.retval;
@@ -58992,15 +59355,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = (2 * s.tmp_6);
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 1415; s.pc = 10; return s.tmp_4;
+    s.callLocIdx = 1372; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
-    r0 = (s.i___22076 + 1);
-    s.i___22076 = (r0);
+    r0 = (s.i___51651 + 1);
+    s.i___51651 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1416; s.pc = 12; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1373; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     r0 = r0.fields["eventContext"];
@@ -59008,7 +59371,7 @@ switch (step) {
     r0 = s.tmp_0.fields["deltaTimeMillis"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 1000);
-    s.dt___22105 = (r0);
+    s.dt___51680 = (r0);
     r0 = s.arg0.fields["scrollOffset"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["scrollTarget"];
@@ -59020,7 +59383,7 @@ switch (step) {
     s.tmp_3 = r0 = s.arg0;
     r0 = s.tmp_3.fields["scrollOffset"];
     s.tmp_5 = r0;
-    r0 = (s.dt___22105 * 100);
+    r0 = (s.dt___51680 * 100);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
@@ -59038,7 +59401,7 @@ switch (step) {
     s.tmp_3 = r0 = s.arg0;
     r0 = s.tmp_3.fields["scrollOffset"];
     s.tmp_5 = r0;
-    r0 = (s.dt___22105 * 100);
+    r0 = (s.dt___51680 * 100);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 - s.tmp_6);
     s.tmp_4 = r0;
@@ -59048,14 +59411,14 @@ switch (step) {
     { step = 9; continue; }
   case 5:
   case 6:
-    s.tmp_2 = Math_abs__P123_mk(s);
+    s.tmp_2 = Math_abs__P29658_mk(s);
     r0 = s.arg0.fields["scrollOffset"];
     s.tmp_3 = r0;
     r0 = s.arg0.fields["scrollTarget"];
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1418; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 1375; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -59068,16 +59431,16 @@ switch (step) {
     r0 = (s.arg0).fields["scrollOffset"] = (s.tmp_5);
   case 7:
   case 8:
-    s.tmp_0 = scene_Camera_offsetY__P2368_mk(s);
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1419; s.pc = 15; return s.tmp_1;
+    s.tmp_0 = scene_Camera_offsetY__P31787_mk(s);
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1376; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
     r0 = r0.fields["camera"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["scrollOffset"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1420; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1377; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 9:
@@ -59085,12 +59448,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_onUpdate__P2625.info = {"start":5547,"length":879,"line":183,"column":8,"endLine":206,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"onUpdate","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_onUpdate__P32044.info = {"start":5547,"length":879,"line":183,"column":8,"endLine":206,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"onUpdate","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_onUpdate__P2625_mk(s) {
+function scene_systemMenu_PauseMenu_onUpdate__P32044_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_onUpdate__P2625, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_onUpdate__P32044, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59106,9 +59469,9 @@ function scene_systemMenu_PauseMenu_onUpdate__P2625_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  t___22072: undefined,
-  i___22076: undefined,
-  dt___22105: undefined,
+  t___51647: undefined,
+  i___51651: undefined,
+  dt___51680: undefined,
   arg0: undefined,
 } }
 
@@ -59116,7 +59479,7 @@ function scene_systemMenu_PauseMenu_onUpdate__P2625_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setOffset__P2618(s) {
+function scene_systemMenu_MenuOption_setOffset__P32037(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59132,40 +59495,40 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P2067_mk(s);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P31486_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["top"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + s.arg1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1357; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1314; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0 = Sprite_y__P31447_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P2027_mk(s);
+    s.tmp_1 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1358; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1315; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1359; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1316; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setOffset__P2618.info = {"start":1411,"length":123,"line":61,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setOffset","argumentNames":["this","offset"]}
+scene_systemMenu_MenuOption_setOffset__P32037.info = {"start":1411,"length":123,"line":61,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setOffset","argumentNames":["this","offset"]}
 
-function scene_systemMenu_MenuOption_setOffset__P2618_mk(s) {
+function scene_systemMenu_MenuOption_setOffset__P32037_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setOffset__P2618, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setOffset__P32037, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59177,7 +59540,7 @@ function scene_systemMenu_MenuOption_setOffset__P2618_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setState__P2620(s) {
+function scene_systemMenu_MenuOption_setState__P32039(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59193,7 +59556,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === s.arg1);
@@ -59204,9 +59567,9 @@ switch (step) {
   case 1:
   case 2:
     r0 = (s.arg0).fields["state"] = (s.arg1);
-    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P4602_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P34095_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1361; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1318; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 3:
@@ -59214,12 +59577,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setState__P2620.info = {"start":1655,"length":147,"line":71,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setState","argumentNames":["this","state"]}
+scene_systemMenu_MenuOption_setState__P32039.info = {"start":1655,"length":147,"line":71,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setState","argumentNames":["this","state"]}
 
-function scene_systemMenu_MenuOption_setState__P2620_mk(s) {
+function scene_systemMenu_MenuOption_setState__P32039_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setState__P2620, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setState__P32039, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59231,7 +59594,7 @@ function scene_systemMenu_MenuOption_setState__P2620_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_updateCard__P4602(s) {
+function scene_systemMenu_MenuOption_updateCard__P34095(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59246,7 +59609,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
     r0 = s.arg0.fields["theme"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -59269,7 +59632,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 6; continue; }
   case 3:
-    s.tmp_4 = Sprite_setImage__P2056_mk(s);
+    s.tmp_4 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_4.arg0 = r0;
     s.tmp_5 = if_basicCard_1_mk(s);
@@ -59281,17 +59644,17 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["basicCard"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["basicCard"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1364; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 1321; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 1365; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 1322; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     { step = 6; continue; }
   case 4:
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_selectedCard_1_mk(s);
@@ -59303,17 +59666,17 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["selectedCard"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["selectedCard"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1366; s.pc = 11; return s.tmp_1; }
+     else { s.callLocIdx = 1323; s.pc = 11; return s.tmp_1; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1367; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1324; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0 = Sprite_setImage__P31475_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_activeCard_1_mk(s);
@@ -59325,39 +59688,39 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["activeCard"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["activeCard"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1368; s.pc = 13; return s.tmp_1; }
+     else { s.callLocIdx = 1325; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1369; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1326; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
   case 6:
-    s.tmp_0 = Sprite_x__P2026_mk(s);
+    s.tmp_0 = Sprite_x__P31445_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_x__P2025_mk(s);
+    s.tmp_1 = Sprite_x__P31444_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1370; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 1327; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1371; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1328; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0 = Sprite_y__P31447_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P2027_mk(s);
+    s.tmp_1 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1372; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 1329; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1373; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1330; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
   case 7:
@@ -59365,12 +59728,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_updateCard__P4602.info = {"start":2038,"length":497,"line":86,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"updateCard","argumentNames":["this"]}
+scene_systemMenu_MenuOption_updateCard__P34095.info = {"start":2038,"length":497,"line":86,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"updateCard","argumentNames":["this"]}
 
-function scene_systemMenu_MenuOption_updateCard__P4602_mk(s) {
+function scene_systemMenu_MenuOption_updateCard__P34095_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_updateCard__P4602, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_updateCard__P34095, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59385,7 +59748,7 @@ function scene_systemMenu_MenuOption_updateCard__P4602_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setTheme__P2619(s) {
+function scene_systemMenu_MenuOption_setTheme__P32038(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59401,23 +59764,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
     r0 = (s.arg0).fields["theme"] = (s.arg1);
-    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P4602_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P34095_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1360; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1317; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setTheme__P2619.info = {"start":1544,"length":101,"line":66,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setTheme","argumentNames":["this","theme"]}
+scene_systemMenu_MenuOption_setTheme__P32038.info = {"start":1544,"length":101,"line":66,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setTheme","argumentNames":["this","theme"]}
 
-function scene_systemMenu_MenuOption_setTheme__P2619_mk(s) {
+function scene_systemMenu_MenuOption_setTheme__P32038_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setTheme__P2619, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setTheme__P32038, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -59428,7 +59791,7 @@ function scene_systemMenu_MenuOption_setTheme__P2619_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_position__P2617(s) {
+function scene_systemMenu_MenuOption_position__P32036(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59445,58 +59808,58 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
     r0 = (s.arg0).fields["top"] = (s.arg2);
-    s.tmp_0 = Sprite_left__P2063_mk(s);
+    s.tmp_0 = Sprite_left__P31482_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1351; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1308; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_top__P2067_mk(s);
+    s.tmp_0 = Sprite_top__P31486_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1352; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1309; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = Sprite_x__P2026_mk(s);
+    s.tmp_0 = Sprite_x__P31445_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_x__P2025_mk(s);
+    s.tmp_1 = Sprite_x__P31444_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1353; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 1310; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1354; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1311; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0 = Sprite_y__P31447_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P2027_mk(s);
+    s.tmp_1 = Sprite_y__P31446_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1355; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1312; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1356; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1313; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_position__P2617.info = {"start":1178,"length":223,"line":51,"column":8,"endLine":59,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"position","argumentNames":["this","left","top"]}
+scene_systemMenu_MenuOption_position__P32036.info = {"start":1178,"length":223,"line":51,"column":8,"endLine":59,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"position","argumentNames":["this","left","top"]}
 
-function scene_systemMenu_MenuOption_position__P2617_mk(s) {
+function scene_systemMenu_MenuOption_position__P32036_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_position__P2617, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_position__P32036, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59509,7 +59872,7 @@ function scene_systemMenu_MenuOption_position__P2617_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_show__P2616(s) {
+function scene_systemMenu_MenuOption_show__P32035(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59524,7 +59887,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C32033_VT)) failedCast(r0);
     r0 = s.arg0.fields["theme"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -59538,21 +59901,21 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["basicCard"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["basicCard"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1346; s.pc = 3; return s.tmp_1; }
+     else { s.callLocIdx = 1303; s.pc = 3; return s.tmp_1; }
     }
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    r0 = globals.CARD_NORMAL___2638;
+    r0 = globals.CARD_NORMAL___32057;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_5 = sprites_create__P1974_mk(s);
+    s.tmp_5 = sprites_create__P31393_mk(s);
     s.tmp_5.arg0 = s.tmp_2;
     s.tmp_5.arg1 = undefined;
-    s.callLocIdx = 1347; s.pc = 4; return s.tmp_5;
+    s.callLocIdx = 1304; s.pc = 4; return s.tmp_5;
   case 4:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -59567,16 +59930,16 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 1348; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 1305; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = sprites_create__P1974_mk(s);
+    s.tmp_2 = sprites_create__P31393_mk(s);
     r0 = s.arg0.fields["iconImage"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = undefined;
-    s.callLocIdx = 1349; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 1306; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -59591,7 +59954,7 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 1350; s.pc = 7; return s.tmp_0; }
+     else { s.callLocIdx = 1307; s.pc = 7; return s.tmp_0; }
     }
   case 7:
     r0 = s.retval;
@@ -59600,12 +59963,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_show__P2616.info = {"start":904,"length":264,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"show","argumentNames":["this"]}
+scene_systemMenu_MenuOption_show__P32035.info = {"start":904,"length":264,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"show","argumentNames":["this"]}
 
-function scene_systemMenu_MenuOption_show__P2616_mk(s) {
+function scene_systemMenu_MenuOption_show__P32035_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_show__P2616, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_show__P32035, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59620,7 +59983,7 @@ function scene_systemMenu_MenuOption_show__P2616_mk(s) {
 
 
 
-function game_onShade__P2547(s) {
+function game_onShade__P31966(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59634,9 +59997,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P4356_mk(s);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1223; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1180; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -59648,11 +60011,11 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = scene_createRenderable__P2383_mk(s);
+    s.tmp_2 = scene_createRenderable__P31802_mk(s);
     s.tmp_2.arg0 = 80;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 1224; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1181; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -59660,12 +60023,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onShade__P2547.info = {"start":9934,"length":145,"line":320,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onShade","argumentNames":["a"]}
+game_onShade__P31966.info = {"start":9934,"length":145,"line":320,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"onShade","argumentNames":["a"]}
 
-function game_onShade__P2547_mk(s) {
+function game_onShade__P31966_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onShade__P2547, depth: s.depth + 1,
+        parent: s, fn: game_onShade__P31966, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59677,7 +60040,7 @@ function game_onShade__P2547_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_constructor__P2623(s) {
+function scene_systemMenu_PauseMenu_constructor__P32042(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59694,7 +60057,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C32041_VT)) failedCast(r0);
     r0 = (s.arg0).fields["generator"] = (s.arg1);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -59702,13 +60065,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_1 = scene_systemMenu_buildMenuTheme__P2631_mk(s);
-    r0 = pxsim_ImageMethods.width(globals.CARD_NORMAL___2638);
+    s.tmp_1 = scene_systemMenu_buildMenuTheme__P32050_mk(s);
+    r0 = pxsim_ImageMethods.width(globals.CARD_NORMAL___32057);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 3;
     s.tmp_1.arg2 = undefined;
     s.tmp_1.arg3 = undefined;
-    s.callLocIdx = 1374; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1331; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
   case 2:
@@ -59722,12 +60085,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_constructor__P2623.info = {"start":3029,"length":257,"line":116,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["this","generator","theme"]}
+scene_systemMenu_PauseMenu_constructor__P32042.info = {"start":3029,"length":257,"line":116,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":["this","generator","theme"]}
 
-function scene_systemMenu_PauseMenu_constructor__P2623_mk(s) {
+function scene_systemMenu_PauseMenu_constructor__P32042_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_constructor__P2623, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_constructor__P32042, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59741,7 +60104,7 @@ function scene_systemMenu_PauseMenu_constructor__P2623_mk(s) {
 
 
 
-function scene_systemMenu_buildMenuTheme__P2631(s) {
+function scene_systemMenu_buildMenuTheme__P32050(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59751,7 +60114,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cardsPerRow___22921 = undefined;
+    s.cardsPerRow___52496 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -59759,19 +60122,19 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_0 = r0;
     r0 = (s.arg0 + s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_1);
-    s.cardsPerRow___22921 = (r0);
+    s.cardsPerRow___52496 = (r0);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.font8___1745;
+    r0 = globals.font8___31163;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -59782,9 +60145,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    s.tmp_1 = image_doubledFont__P1748_mk(s);
+    s.tmp_1 = image_doubledFont__P31166_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.callLocIdx = 1484; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1441; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
   case 4:
@@ -59795,12 +60158,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "cardSpacing", s.arg1);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "cardWidth", s.arg0);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "cardsPerRow", s.cardsPerRow___22921);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "cardsPerRow", s.cardsPerRow___52496);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_3 = r0;
-    r0 = (s.cardsPerRow___22921 * s.arg0);
+    r0 = (s.cardsPerRow___52496 * s.arg0);
     s.tmp_5 = r0;
-    r0 = (s.cardsPerRow___22921 - 1);
+    r0 = (s.cardsPerRow___52496 - 1);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 * s.arg1);
     s.tmp_6 = r0;
@@ -59821,7 +60184,7 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["charHeight"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["charHeight"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 1485; s.pc = 6; return s.tmp_11; }
+     else { s.callLocIdx = 1442; s.pc = 6; return s.tmp_11; }
     }
   case 6:
     r0 = s.retval;
@@ -59831,7 +60194,7 @@ switch (step) {
     r0 = (s.tmp_9 + s.arg1);
     s.tmp_8 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "cardsTop", s.tmp_8);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_14 = r0;
     s.tmp_16 = if_charHeight_1_mk(s);
     s.tmp_16.arg0 = s.arg2;
@@ -59841,7 +60204,7 @@ switch (step) {
       s.tmp_16.fn = s.tmp_16.arg0.vtable.iface["charHeight"];
       if (s.tmp_16.fn == null) { s.retval = s.tmp_16.arg0.fields["charHeight"]; }
       else if (!s.tmp_16.fn.isGetter) { s.retval = bind(s.tmp_16); }
-     else { s.callLocIdx = 1486; s.pc = 7; return s.tmp_16; }
+     else { s.callLocIdx = 1443; s.pc = 7; return s.tmp_16; }
     }
   case 7:
     r0 = s.retval;
@@ -59852,19 +60215,19 @@ switch (step) {
     s.tmp_12 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "infoTop", s.tmp_12);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "headerText", "PAUSED");
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "selectedCard", globals.CARD_SELECTED___2639);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "activeCard", globals.CARD_ACTIVE___2640);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "basicCard", globals.CARD_NORMAL___2638);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "selectedCard", globals.CARD_SELECTED___32058);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "activeCard", globals.CARD_ACTIVE___32059);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "basicCard", globals.CARD_NORMAL___32057);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_buildMenuTheme__P2631.info = {"start":11654,"length":906,"line":356,"column":4,"endLine":375,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"buildMenuTheme","argumentNames":["cardWidth","cardSpacing","infoFont","headerFont"]}
+scene_systemMenu_buildMenuTheme__P32050.info = {"start":11654,"length":906,"line":356,"column":4,"endLine":375,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"buildMenuTheme","argumentNames":["cardWidth","cardSpacing","infoFont","headerFont"]}
 
-function scene_systemMenu_buildMenuTheme__P2631_mk(s) {
+function scene_systemMenu_buildMenuTheme__P32050_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_buildMenuTheme__P2631, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_buildMenuTheme__P32050, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59883,7 +60246,7 @@ function scene_systemMenu_buildMenuTheme__P2631_mk(s) {
   tmp_14: undefined,
   tmp_15: undefined,
   tmp_16: undefined,
-  cardsPerRow___22921: undefined,
+  cardsPerRow___52496: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -59894,7 +60257,7 @@ function scene_systemMenu_buildMenuTheme__P2631_mk(s) {
 
 
 
-function image_doubledFont__P1748(s) {
+function image_doubledFont__P31166(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59908,21 +60271,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = image_scaledFont__P1749_mk(s);
+    s.tmp_0 = image_scaledFont__P31167_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 2;
-    s.callLocIdx = 130; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 82; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-image_doubledFont__P1748.info = {"start":12008,"length":82,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"doubledFont","argumentNames":["f"]}
+image_doubledFont__P31166.info = {"start":12008,"length":82,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen---st7735/text.ts","functionName":"doubledFont","argumentNames":["f"]}
 
-function image_doubledFont__P1748_mk(s) {
+function image_doubledFont__P31166_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_doubledFont__P1748, depth: s.depth + 1,
+        parent: s, fn: image_doubledFont__P31166, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -59932,7 +60295,7 @@ function image_doubledFont__P1748_mk(s) {
 
 
 
-function image_scaledFont__P1749(s) {
+function image_scaledFont__P31167(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59967,7 +60330,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 131; s.pc = 6; return s.tmp_4; }
+     else { s.callLocIdx = 83; s.pc = 6; return s.tmp_4; }
     }
   case 6:
     r0 = s.retval;
@@ -59983,7 +60346,7 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["charHeight"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["charHeight"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 132; s.pc = 7; return s.tmp_7; }
+     else { s.callLocIdx = 84; s.pc = 7; return s.tmp_7; }
     }
   case 7:
     r0 = s.retval;
@@ -59999,7 +60362,7 @@ switch (step) {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["data"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["data"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 133; s.pc = 8; return s.tmp_9; }
+     else { s.callLocIdx = 85; s.pc = 8; return s.tmp_9; }
     }
   case 8:
     r0 = s.retval;
@@ -60013,7 +60376,7 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["multiplier"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["multiplier"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 134; s.pc = 9; return s.tmp_11; }
+     else { s.callLocIdx = 86; s.pc = 9; return s.tmp_11; }
     }
   case 9:
     r0 = s.retval;
@@ -60029,7 +60392,7 @@ switch (step) {
       s.tmp_14.fn = s.tmp_14.arg0.vtable.iface["multiplier"];
       if (s.tmp_14.fn == null) { s.retval = s.tmp_14.arg0.fields["multiplier"]; }
       else if (!s.tmp_14.fn.isGetter) { s.retval = bind(s.tmp_14); }
-     else { s.callLocIdx = 135; s.pc = 10; return s.tmp_14; }
+     else { s.callLocIdx = 87; s.pc = 10; return s.tmp_14; }
     }
   case 10:
     r0 = s.retval;
@@ -60047,12 +60410,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-image_scaledFont__P1749.info = {"start":12096,"length":331,"line":150,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"scaledFont","argumentNames":["f","size"]}
+image_scaledFont__P31167.info = {"start":12096,"length":331,"line":150,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/screen---st7735/text.ts","functionName":"scaledFont","argumentNames":["f","size"]}
 
-function image_scaledFont__P1749_mk(s) {
+function image_scaledFont__P31167_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_scaledFont__P1749, depth: s.depth + 1,
+        parent: s, fn: image_scaledFont__P31167, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60078,7 +60441,7 @@ function image_scaledFont__P1749_mk(s) {
 
 
 
-function scene_systemMenu_initScreen__P4615(s) {
+function scene_systemMenu_initScreen__P34108(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60088,21 +60451,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.brightness___23001 = undefined;
-    s.tmp_0 = settings_readNumber__P1833_mk(s);
+    s.brightness___52576 = undefined;
+    s.tmp_0 = settings_readNumber__P31252_mk(s);
     s.tmp_0.arg0 = "#brightness";
-    s.callLocIdx = 1493; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1450; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.brightness___23001 = (r0);
-    r0 = (s.brightness___23001 !== undefined);
+    s.brightness___52576 = (r0);
+    r0 = (s.brightness___52576 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_setScreenBrightness__P1735_mk(s);
-    s.tmp_1.arg0 = globals.screen___1802;
-    s.tmp_1.arg1 = s.brightness___23001;
-    s.callLocIdx = 1494; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = helpers_setScreenBrightness__P31153_mk(s);
+    s.tmp_1.arg0 = globals.screen___31220;
+    s.tmp_1.arg1 = s.brightness___52576;
+    s.callLocIdx = 1451; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
   case 1:
@@ -60111,23 +60474,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_initScreen__P4615.info = {"start":13388,"length":175,"line":405,"column":4,"endLine":409,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"initScreen","argumentNames":[]}
+scene_systemMenu_initScreen__P34108.info = {"start":13388,"length":175,"line":405,"column":4,"endLine":409,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"initScreen","argumentNames":[]}
 
-function scene_systemMenu_initScreen__P4615_mk(s) {
+function scene_systemMenu_initScreen__P34108_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_initScreen__P4615, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_initScreen__P34108, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  brightness___23001: undefined,
+  brightness___52576: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_initVolume__P4614(s) {
+function scene_systemMenu_initVolume__P34107(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60137,20 +60500,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.vol___23011 = undefined;
-    s.tmp_0 = settings_readNumber__P1833_mk(s);
+    s.vol___52586 = undefined;
+    s.tmp_0 = settings_readNumber__P31252_mk(s);
     s.tmp_0.arg0 = "#volume";
-    s.callLocIdx = 1491; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1448; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.vol___23011 = (r0);
-    r0 = (s.vol___23011 !== undefined);
+    s.vol___52586 = (r0);
+    r0 = (s.vol___52586 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = music_setVolume__P1592_mk(s);
-    s.tmp_1.arg0 = s.vol___23011;
-    s.callLocIdx = 1492; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = music_setVolume__P32272_mk(s);
+    s.tmp_1.arg0 = s.vol___52586;
+    s.callLocIdx = 1449; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
   case 1:
@@ -60159,23 +60522,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_initVolume__P4614.info = {"start":13238,"length":144,"line":399,"column":4,"endLine":403,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"initVolume","argumentNames":[]}
+scene_systemMenu_initVolume__P34107.info = {"start":13238,"length":144,"line":399,"column":4,"endLine":403,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"initVolume","argumentNames":[]}
 
-function scene_systemMenu_initVolume__P4614_mk(s) {
+function scene_systemMenu_initVolume__P34107_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_initVolume__P4614, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_initVolume__P34107, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  vol___23011: undefined,
+  vol___52586: undefined,
 } }
 
 
 
 
 
-function game_currentScene__P2532(s) {
+function game_currentScene__P31951(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60185,21 +60548,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_init__P4356_mk(s);
+    s.tmp_0 = game_init__P33849_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1150; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1107; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals._scene___4348;
+    r0 = globals._scene___33841;
     return leave(s, r0)
   default: oops()
 } } }
-game_currentScene__P2532.info = {"start":667,"length":90,"line":22,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"currentScene","argumentNames":[]}
+game_currentScene__P31951.info = {"start":667,"length":90,"line":22,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"currentScene","argumentNames":[]}
 
-function game_currentScene__P2532_mk(s) {
+function game_currentScene__P31951_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_currentScene__P2532, depth: s.depth + 1,
+        parent: s, fn: game_currentScene__P31951, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60208,7 +60571,7 @@ function game_currentScene__P2532_mk(s) {
 
 
 
-function game_addScenePopHandler__P2551(s) {
+function game_addScenePopHandler__P31970(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60222,35 +60585,35 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___4351);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___33844);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals._scenePopHandlers___4351 = (r0);
+    globals._scenePopHandlers___33844 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(globals._scenePopHandlers___4351, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals._scenePopHandlers___33844, s.arg0, undefined);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_Array__push(globals._scenePopHandlers___4351, s.arg0);
+    r0 = pxsim_Array__push(globals._scenePopHandlers___33844, s.arg0);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_addScenePopHandler__P2551.info = {"start":11754,"length":237,"line":368,"column":4,"endLine":372,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"addScenePopHandler","argumentNames":["handler"]}
+game_addScenePopHandler__P31970.info = {"start":11754,"length":237,"line":368,"column":4,"endLine":372,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"addScenePopHandler","argumentNames":["handler"]}
 
-function game_addScenePopHandler__P2551_mk(s) {
+function game_addScenePopHandler__P31970_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_addScenePopHandler__P2551, depth: s.depth + 1,
+        parent: s, fn: game_addScenePopHandler__P31970, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60261,7 +60624,7 @@ function game_addScenePopHandler__P2551_mk(s) {
 
 
 
-function game_addScenePushHandler__P2549(s) {
+function game_addScenePushHandler__P31968(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60275,35 +60638,35 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___4350);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___33843);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals._scenePushHandlers___4350 = (r0);
+    globals._scenePushHandlers___33843 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(globals._scenePushHandlers___4350, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals._scenePushHandlers___33843, s.arg0, undefined);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_Array__push(globals._scenePushHandlers___4350, s.arg0);
+    r0 = pxsim_Array__push(globals._scenePushHandlers___33843, s.arg0);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_addScenePushHandler__P2549.info = {"start":10753,"length":242,"line":344,"column":4,"endLine":348,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"addScenePushHandler","argumentNames":["handler"]}
+game_addScenePushHandler__P31968.info = {"start":10753,"length":242,"line":344,"column":4,"endLine":348,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"addScenePushHandler","argumentNames":["handler"]}
 
-function game_addScenePushHandler__P2549_mk(s) {
+function game_addScenePushHandler__P31968_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_addScenePushHandler__P2549, depth: s.depth + 1,
+        parent: s, fn: game_addScenePushHandler__P31968, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60314,7 +60677,7 @@ function game_addScenePushHandler__P2549_mk(s) {
 
 
 
-function Fx8__P144(s) {
+function Fx8__P29679(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60334,12 +60697,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx8__P144.info = {"start":42,"length":68,"line":4,"column":0,"endLine":6,"endColumn":1,"fileName":"pxt_modules/base/fixed.ts","functionName":"Fx8","argumentNames":["v"]}
+Fx8__P29679.info = {"start":42,"length":68,"line":4,"column":0,"endLine":6,"endColumn":1,"fileName":"pxt_modules/base/fixed.ts","functionName":"Fx8","argumentNames":["v"]}
 
-function Fx8__P144_mk(s) {
+function Fx8__P29679_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx8__P144, depth: s.depth + 1,
+        parent: s, fn: Fx8__P29679, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60349,7 +60712,7 @@ function Fx8__P144_mk(s) {
 
 
 
-function SpriteKind_create__P2127(s) {
+function SpriteKind_create__P31546(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60359,26 +60722,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals.nextKind___4201 === undefined);
+    r0 = (globals.nextKind___33694 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.nextKind___4201 = (1000);
+    globals.nextKind___33694 = (1000);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals.nextKind___4201;
+    s.tmp_0 = r0 = globals.nextKind___33694;
     r0 = (s.tmp_0 + 1);
-    globals.nextKind___4201 = (r0);
+    globals.nextKind___33694 = (r0);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-SpriteKind_create__P2127.info = {"start":750,"length":112,"line":25,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/game/spritekind.ts","functionName":"create","argumentNames":[]}
+SpriteKind_create__P31546.info = {"start":750,"length":112,"line":25,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/game---hw/spritekind.ts","functionName":"create","argumentNames":[]}
 
-function SpriteKind_create__P2127_mk(s) {
+function SpriteKind_create__P31546_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: SpriteKind_create__P2127, depth: s.depth + 1,
+        parent: s, fn: SpriteKind_create__P31546, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60387,7 +60750,7 @@ function SpriteKind_create__P2127_mk(s) {
 
 
 
-function controller_Button_constructor__P1909(s) {
+function controller_Button_constructor__P31328(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60404,7 +60767,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
     r0 = (s.arg0).fields["id"] = (s.arg1);
     r0 = (s.arg0).fields["_pressed"] = (false);
     r0 = (s.arg0).fields["repeatDelay"] = (undefined);
@@ -60414,13 +60777,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P23087);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P52662);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
     r0 = s.arg0.fields["id"];
     s.tmp_2 = r0;
     r0 = pxsim.control.internalOnEvent(2050, s.tmp_2, s.tmp_1, 16);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P23094);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P52669);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = s.arg0.fields["id"];
@@ -60439,12 +60802,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_constructor__P1909.info = {"start":1589,"length":863,"line":67,"column":8,"endLine":83,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","id","configKey"]}
+controller_Button_constructor__P31328.info = {"start":1589,"length":863,"line":67,"column":8,"endLine":83,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["this","id","configKey"]}
 
-function controller_Button_constructor__P1909_mk(s) {
+function controller_Button_constructor__P31328_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_constructor__P1909, depth: s.depth + 1,
+        parent: s, fn: controller_Button_constructor__P31328, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60458,7 +60821,7 @@ function controller_Button_constructor__P1909_mk(s) {
 
 
 
-function inline__P23087(s) {
+function inline__P52662(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60468,22 +60831,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller_Button_setPressed__P1914_mk(s);
+    s.tmp_0 = controller_Button_setPressed__P31333_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 181; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 138; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P23087.info = {"start":2211,"length":28,"line":77,"column":66,"endLine":77,"endColumn":94,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
+inline__P52662.info = {"start":2211,"length":28,"line":77,"column":66,"endLine":77,"endColumn":94,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P23087_mk(s) {
+function inline__P52662_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P23087, depth: s.depth + 1,
+        parent: s, fn: inline__P52662, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60492,7 +60855,7 @@ function inline__P23087_mk(s) {
 
 
 
-function inline__P23094(s) {
+function inline__P52669(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60502,22 +60865,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller_Button_setPressed__P1914_mk(s);
+    s.tmp_0 = controller_Button_setPressed__P31333_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 182; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 139; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P23094.info = {"start":2313,"length":27,"line":78,"column":68,"endLine":78,"endColumn":95,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
+inline__P52669.info = {"start":2313,"length":27,"line":78,"column":68,"endLine":78,"endColumn":95,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P23094_mk(s) {
+function inline__P52669_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P23094, depth: s.depth + 1,
+        parent: s, fn: inline__P52669, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60526,7 +60889,7 @@ function inline__P23094_mk(s) {
 
 
 
-function controller_setupButton__P4183(s) {
+function controller_setupButton__P33676(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60545,12 +60908,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_setupButton__P4183.info = {"start":983,"length":93,"line":47,"column":4,"endLine":49,"endColumn":6,"fileName":"pxt_modules/game/controller.ts","functionName":"setupButton","argumentNames":["buttonId","key"]}
+controller_setupButton__P33676.info = {"start":983,"length":93,"line":47,"column":4,"endLine":49,"endColumn":6,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"setupButton","argumentNames":["buttonId","key"]}
 
-function controller_setupButton__P4183_mk(s) {
+function controller_setupButton__P33676_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_setupButton__P4183, depth: s.depth + 1,
+        parent: s, fn: controller_setupButton__P33676, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -60560,7 +60923,7 @@ function controller_setupButton__P4183_mk(s) {
 
 
 
-function controller_Button_setPressed__P1914(s) {
+function controller_Button_setPressed__P31333(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60576,26 +60939,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 != s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = power_poke__P1705_mk(s);
-    s.callLocIdx = 185; s.pc = 7; return s.tmp_2;
+    s.tmp_2 = power_poke__P31123_mk(s);
+    s.callLocIdx = 142; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["_owner"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = controller_Controller_connected__P1943_mk(s);
+    s.tmp_1 = controller_Controller_connected__P31362_mk(s);
     r0 = s.arg0.fields["_owner"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = true;
-    s.callLocIdx = 186; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 143; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
   case 1:
@@ -60606,17 +60969,17 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = (s.arg0).fields["_pressedElasped"] = (0);
-    s.tmp_0 = controller_Button_raiseButtonDown__P4185_mk(s);
+    s.tmp_0 = controller_Button_raiseButtonDown__P33678_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 187; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 144; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
     r0 = (s.arg0).fields["_repeatCount"] = (0);
-    s.tmp_0 = controller_Button_raiseButtonUp__P4184_mk(s);
+    s.tmp_0 = controller_Button_raiseButtonUp__P33677_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 188; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 145; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 4:
@@ -60626,12 +60989,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_setPressed__P1914.info = {"start":4600,"length":507,"line":148,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"setPressed","argumentNames":["this","pressed"]}
+controller_Button_setPressed__P31333.info = {"start":4600,"length":507,"line":148,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"setPressed","argumentNames":["this","pressed"]}
 
-function controller_Button_setPressed__P1914_mk(s) {
+function controller_Button_setPressed__P31333_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_setPressed__P1914, depth: s.depth + 1,
+        parent: s, fn: controller_Button_setPressed__P31333, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60644,7 +61007,7 @@ function controller_Button_setPressed__P1914_mk(s) {
 
 
 
-function controller_Button_raiseButtonDown__P4185(s) {
+function controller_Button_raiseButtonDown__P33678(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60659,8 +61022,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___4177);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___33670);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -60675,12 +61038,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonDown__P4185.info = {"start":2672,"length":205,"line":92,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonDown","argumentNames":["this"]}
+controller_Button_raiseButtonDown__P33678.info = {"start":2672,"length":205,"line":92,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"raiseButtonDown","argumentNames":["this"]}
 
-function controller_Button_raiseButtonDown__P4185_mk(s) {
+function controller_Button_raiseButtonDown__P33678_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonDown__P4185, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonDown__P33678, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60690,7 +61053,7 @@ function controller_Button_raiseButtonDown__P4185_mk(s) {
 
 
 
-function controller_Button_raiseButtonUp__P4184(s) {
+function controller_Button_raiseButtonUp__P33677(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60705,8 +61068,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___4177);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___33670);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -60721,12 +61084,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonUp__P4184.info = {"start":2462,"length":200,"line":85,"column":8,"endLine":90,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonUp","argumentNames":["this"]}
+controller_Button_raiseButtonUp__P33677.info = {"start":2462,"length":200,"line":85,"column":8,"endLine":90,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"raiseButtonUp","argumentNames":["this"]}
 
-function controller_Button_raiseButtonUp__P4184_mk(s) {
+function controller_Button_raiseButtonUp__P33677_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonUp__P4184, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonUp__P33677, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60736,7 +61099,7 @@ function controller_Button_raiseButtonUp__P4184_mk(s) {
 
 
 
-function controller_Controller_connected__P1943(s) {
+function controller_Controller_connected__P31362(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60752,7 +61115,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["_connected"];
     s.tmp_1 = r0;
     r0 = (s.arg1 != s.tmp_1);
@@ -60780,12 +61143,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_connected__P1943.info = {"start":12550,"length":261,"line":405,"column":8,"endLine":410,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"connected","argumentNames":["this","value"]}
+controller_Controller_connected__P31362.info = {"start":12550,"length":261,"line":405,"column":8,"endLine":410,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"connected","argumentNames":["this","value"]}
 
-function controller_Controller_connected__P1943_mk(s) {
+function controller_Controller_connected__P31362_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_connected__P1943, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_connected__P31362, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60798,7 +61161,7 @@ function controller_Controller_connected__P1943_mk(s) {
 
 
 
-function controller_Controller_id__P1930(s) {
+function controller_Controller_id__P31349(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60813,18 +61176,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["_id"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_id__P1930.info = {"start":8841,"length":49,"line":276,"column":8,"endLine":278,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"id","argumentNames":["this"]}
-controller_Controller_id__P1930.isGetter = true;
+controller_Controller_id__P31349.info = {"start":8841,"length":49,"line":276,"column":8,"endLine":278,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"id","argumentNames":["this"]}
+controller_Controller_id__P31349.isGetter = true;
 
-function controller_Controller_id__P1930_mk(s) {
+function controller_Controller_id__P31349_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_id__P1930, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_id__P31349, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -60833,7 +61196,7 @@ function controller_Controller_id__P1930_mk(s) {
 
 
 
-function controller_Controller_connected__P1942(s) {
+function controller_Controller_connected__P31361(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60848,18 +61211,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C31342_VT)) failedCast(r0);
     r0 = s.arg0.fields["_connected"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_connected__P1942.info = {"start":12477,"length":63,"line":401,"column":8,"endLine":403,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"connected","argumentNames":["this"]}
-controller_Controller_connected__P1942.isGetter = true;
+controller_Controller_connected__P31361.info = {"start":12477,"length":63,"line":401,"column":8,"endLine":403,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"connected","argumentNames":["this"]}
+controller_Controller_connected__P31361.isGetter = true;
 
-function controller_Controller_connected__P1942_mk(s) {
+function controller_Controller_connected__P31361_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_connected__P1942, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_connected__P31361, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -60868,7 +61231,7 @@ function controller_Controller_connected__P1942_mk(s) {
 
 
 
-function settings_initScopes__P4150(s) {
+function settings_initScopes__P33643(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60878,18 +61241,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rn___23172 = undefined;
-    s.tmp_1 = settings_runNumber__P1825_mk(s);
-    s.callLocIdx = 159; s.pc = 1; return s.tmp_1;
+    s.rn___52747 = undefined;
+    s.tmp_1 = settings_runNumber__P31244_mk(s);
+    s.callLocIdx = 116; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.rn___23172 = (r0);
-    s.tmp_0 = settings_writeNumber__P1829_mk(s);
-    s.tmp_0.arg0 = globals.RUN_KEY___4138;
-    s.tmp_0.arg1 = s.rn___23172;
-    s.callLocIdx = 160; s.pc = 2; return s.tmp_0;
+    s.rn___52747 = (r0);
+    s.tmp_0 = settings_writeNumber__P31248_mk(s);
+    s.tmp_0.arg0 = globals.RUN_KEY___33631;
+    s.tmp_0.arg1 = s.rn___52747;
+    s.callLocIdx = 117; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = pxsim.control.deviceSerialNumber();
@@ -60897,34 +61260,34 @@ switch (step) {
     r0 = (s.tmp_1 & 2147483647);
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.seedAddRandom(s.tmp_0);
-    r0 = pxsim_pxtcore.seedAddRandom(s.rn___23172);
-    s.tmp_0 = settings_setScope__P4149_mk(s);
+    r0 = pxsim_pxtcore.seedAddRandom(s.rn___52747);
+    s.tmp_0 = settings_setScope__P33642_mk(s);
     r0 = pxsim_pxtcore.programName();
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 161; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 118; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-settings_initScopes__P4150.info = {"start":1104,"length":230,"line":41,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"initScopes","argumentNames":[]}
+settings_initScopes__P33643.info = {"start":1104,"length":230,"line":41,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"initScopes","argumentNames":[]}
 
-function settings_initScopes__P4150_mk(s) {
+function settings_initScopes__P33643_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_initScopes__P4150, depth: s.depth + 1,
+        parent: s, fn: settings_initScopes__P33643, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  rn___23172: undefined,
+  rn___52747: undefined,
 } }
 
 
 
 
 
-function settings_setScope__P4149(s) {
+function settings_setScope__P33642(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60934,7 +61297,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currScope___23201 = undefined;
+    s.currScope___52776 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -60959,21 +61322,21 @@ switch (step) {
     r0 = pxsim_pxtrt.panic(922);
   case 3:
   case 4:
-    s.tmp_0 = settings_readString__P1832_mk(s);
-    s.tmp_0.arg0 = globals.SCOPE_KEY___4139;
-    s.callLocIdx = 157; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = settings_readString__P31251_mk(s);
+    s.tmp_0.arg0 = globals.SCOPE_KEY___33632;
+    s.callLocIdx = 114; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.currScope___23201 = (r0);
-    r0 = (s.currScope___23201 != s.arg0);
+    s.currScope___52776 = (r0);
+    r0 = (s.currScope___52776 != s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
     r0 = pxsim.settings._userClean();
-    s.tmp_0 = settings_writeString__P1828_mk(s);
-    s.tmp_0.arg0 = globals.SCOPE_KEY___4139;
+    s.tmp_0 = settings_writeString__P31247_mk(s);
+    s.tmp_0.arg0 = globals.SCOPE_KEY___33632;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 158; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 115; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 5:
@@ -60982,18 +61345,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_setScope__P4149.info = {"start":826,"length":272,"line":31,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"setScope","argumentNames":["scope"]}
+settings_setScope__P33642.info = {"start":826,"length":272,"line":31,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"setScope","argumentNames":["scope"]}
 
-function settings_setScope__P4149_mk(s) {
+function settings_setScope__P33642_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_setScope__P4149, depth: s.depth + 1,
+        parent: s, fn: settings_setScope__P33642, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  currScope___23201: undefined,
+  currScope___52776: undefined,
   arg0: undefined,
 } }
 
@@ -61001,7 +61364,7 @@ function settings_setScope__P4149_mk(s) {
 
 
 
-function settings_readString__P1832(s) {
+function settings_readString__P31251(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61011,14 +61374,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___23222 = undefined;
+    s.buf___52797 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim.settings._get(s.arg0);
-    s.buf___23222 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.buf___23222);
+    s.buf___52797 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.buf___52797);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -61028,7 +61391,7 @@ switch (step) {
     { step = 3; continue; }
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.BufferMethods.toString(s.buf___23222);
+    r0 = pxsim.BufferMethods.toString(s.buf___52797);
     { step = 3; continue; }
   case 2:
     r0 = undefined;
@@ -61036,16 +61399,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readString__P1832.info = {"start":2649,"length":177,"line":103,"column":4,"endLine":109,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"readString","argumentNames":["key"]}
+settings_readString__P31251.info = {"start":2649,"length":177,"line":103,"column":4,"endLine":109,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"readString","argumentNames":["key"]}
 
-function settings_readString__P1832_mk(s) {
+function settings_readString__P31251_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readString__P1832, depth: s.depth + 1,
+        parent: s, fn: settings_readString__P31251, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  buf___23222: undefined,
+  buf___52797: undefined,
   arg0: undefined,
 } }
 
@@ -61053,7 +61416,7 @@ function settings_readString__P1832_mk(s) {
 
 
 
-function settings_writeString__P1828(s) {
+function settings_writeString__P31247(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61068,23 +61431,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = settings_writeBuffer__P1827_mk(s);
+    s.tmp_0 = settings_writeBuffer__P31246_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim.control.createBufferFromUTF8(s.arg1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 163; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 120; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeString__P1828.info = {"start":1895,"length":125,"line":75,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeString","argumentNames":["key","value"]}
+settings_writeString__P31247.info = {"start":1895,"length":125,"line":75,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeString","argumentNames":["key","value"]}
 
-function settings_writeString__P1828_mk(s) {
+function settings_writeString__P31247_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeString__P1828, depth: s.depth + 1,
+        parent: s, fn: settings_writeString__P31247, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61095,7 +61458,7 @@ function settings_writeString__P1828_mk(s) {
 
 
 
-function settings_runNumber__P1825(s) {
+function settings_runNumber__P31244(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61105,9 +61468,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_1 = settings_readNumber__P1833_mk(s);
-    s.tmp_1.arg0 = globals.RUN_KEY___4138;
-    s.callLocIdx = 156; s.pc = 3; return s.tmp_1;
+    s.tmp_1 = settings_readNumber__P31252_mk(s);
+    s.tmp_1.arg0 = globals.RUN_KEY___33631;
+    s.callLocIdx = 113; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -61124,12 +61487,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_runNumber__P1825.info = {"start":745,"length":75,"line":27,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"runNumber","argumentNames":[]}
+settings_runNumber__P31244.info = {"start":745,"length":75,"line":27,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"runNumber","argumentNames":[]}
 
-function settings_runNumber__P1825_mk(s) {
+function settings_runNumber__P31244_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_runNumber__P1825, depth: s.depth + 1,
+        parent: s, fn: settings_runNumber__P31244, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61140,7 +61503,7 @@ function settings_runNumber__P1825_mk(s) {
 
 
 
-function control___screen_setupUpdate__P1764(s) {
+function control___screen_update__P31181(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61150,68 +61513,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    globals.__updated___4107 = (true);
-    globals.__update___4105 = (s.arg0);
-    s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.arg0;
-    setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 152; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-control___screen_setupUpdate__P1764.info = {"start":198,"length":125,"line":10,"column":4,"endLine":14,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"setupUpdate","argumentNames":["update"]}
-
-function control___screen_setupUpdate__P1764_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: control___screen_setupUpdate__P1764, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function control___screen_update__P1763(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    r0 = pxsim_numops_toBoolDecr(globals.__update___4105);
+    r0 = pxsim_numops_toBoolDecr(globals.__update___33609);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = globals.__update___4105;
+    s.tmp_0.argL = globals.__update___33609;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 151; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 103; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
   case 2:
-    globals.__updated___4107 = (true);
+    globals.__updated___33611 = (true);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control___screen_update__P1763.info = {"start":90,"length":102,"line":4,"column":4,"endLine":8,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"update","argumentNames":[]}
+control___screen_update__P31181.info = {"start":90,"length":102,"line":4,"column":4,"endLine":8,"endColumn":5,"fileName":"pxt_modules/screen---st7735/frame.ts","functionName":"update","argumentNames":[]}
 
-function control___screen_update__P1763_mk(s) {
+function control___screen_update__P31181_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control___screen_update__P1763, depth: s.depth + 1,
+        parent: s, fn: control___screen_update__P31181, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -61220,7 +61542,7 @@ function control___screen_update__P1763_mk(s) {
 
 
 
-function pause__P402(s) {
+function pause__P29937(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61244,12 +61566,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pause__P402.info = {"start":246,"length":57,"line":7,"column":0,"endLine":9,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
+pause__P29937.info = {"start":246,"length":57,"line":7,"column":0,"endLine":9,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
 
-function pause__P402_mk(s) {
+function pause__P29937_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pause__P402, depth: s.depth + 1,
+        parent: s, fn: pause__P29937, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -61258,7 +61580,7 @@ function pause__P402_mk(s) {
 
 
 
-function sprites_SpriteSet_toString__P2122(s) {
+function sprites_SpriteSet_toString__P31541(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61273,7 +61595,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C31530_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = s.arg0.fields["_sprites"];
@@ -61295,12 +61617,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_toString__P2122.info = {"start":2577,"length":66,"line":97,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"toString","argumentNames":["this"]}
+sprites_SpriteSet_toString__P31541.info = {"start":2577,"length":66,"line":97,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"toString","argumentNames":["this"]}
 
-function sprites_SpriteSet_toString__P2122_mk(s) {
+function sprites_SpriteSet_toString__P31541_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_toString__P2122, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_toString__P31541, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61314,7 +61636,7 @@ function sprites_SpriteSet_toString__P2122_mk(s) {
 
 
 
-function sprites_SpriteSet_length__P2114(s) {
+function sprites_SpriteSet_length__P31533(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61329,20 +61651,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C31530_VT)) failedCast(r0);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__length(s.tmp_0);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_length__P2114.info = {"start":628,"length":65,"line":26,"column":8,"endLine":28,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"length","argumentNames":["this"]}
-sprites_SpriteSet_length__P2114.isGetter = true;
+sprites_SpriteSet_length__P31533.info = {"start":628,"length":65,"line":26,"column":8,"endLine":28,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"length","argumentNames":["this"]}
+sprites_SpriteSet_length__P31533.isGetter = true;
 
-function sprites_SpriteSet_length__P2114_mk(s) {
+function sprites_SpriteSet_length__P31533_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_length__P2114, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_length__P31533, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61352,7 +61674,7 @@ function sprites_SpriteSet_length__P2114_mk(s) {
 
 
 
-function game_Dialog_drawTextCore__P2504(s) {
+function game_Dialog_drawTextCore__P31923(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61362,20 +61684,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.lines___23271 = undefined;
-    s.availableWidth___23277 = undefined;
-    s.availableHeight___23280 = undefined;
-    s.charactersPerRow___23283 = undefined;
-    s.rowsOfCharacters___23291 = undefined;
-    s.textLeft___23297 = undefined;
-    s.textTop___23316 = undefined;
-    s.row___23333 = undefined;
+    s.lines___52841 = undefined;
+    s.availableWidth___52847 = undefined;
+    s.availableHeight___52850 = undefined;
+    s.charactersPerRow___52853 = undefined;
+    s.rowsOfCharacters___52861 = undefined;
+    s.textLeft___52867 = undefined;
+    s.textTop___52886 = undefined;
+    s.row___52903 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Dialog__C31913_VT)) failedCast(r0);
     r0 = s.arg0.fields["chunks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -61405,20 +61727,20 @@ switch (step) {
     r0 = s.arg0.fields["chunkIndex"];
     s.tmp_7 = r0;
     r0 = pxsim_Array__getAt(s.tmp_6, s.tmp_7);
-    s.lines___23271 = (r0);
-    s.tmp_0 = game_BaseDialog_textAreaWidth__P4327_mk(s);
+    s.lines___52841 = (r0);
+    s.tmp_0 = game_BaseDialog_textAreaWidth__P33820_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1108; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1065; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.availableWidth___23277 = (r0);
-    s.tmp_0 = game_BaseDialog_textAreaHeight__P4328_mk(s);
+    s.availableWidth___52847 = (r0);
+    s.tmp_0 = game_BaseDialog_textAreaHeight__P33821_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1109; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1066; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.availableHeight___23280 = (r0);
-    s.tmp_1 = r0 = s.availableWidth___23277;
+    s.availableHeight___52850 = (r0);
+    s.tmp_1 = r0 = s.availableWidth___52847;
     s.tmp_3 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_3.arg0 = r0;
@@ -61428,7 +61750,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1110; s.pc = 10; return s.tmp_3; }
+     else { s.callLocIdx = 1067; s.pc = 10; return s.tmp_3; }
     }
   case 10:
     r0 = s.retval;
@@ -61436,18 +61758,18 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.charactersPerRow___23283 = (r0);
-    s.tmp_1 = r0 = s.availableHeight___23280;
-    s.tmp_3 = game_BaseDialog_rowHeight__P4326_mk(s);
+    s.charactersPerRow___52853 = (r0);
+    s.tmp_1 = r0 = s.availableHeight___52850;
+    s.tmp_3 = game_BaseDialog_rowHeight__P33819_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1111; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 1068; s.pc = 11; return s.tmp_3;
   case 11:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.rowsOfCharacters___23291 = (r0);
+    s.rowsOfCharacters___52861 = (r0);
     r0 = s.arg0.fields["innerLeft"];
     s.tmp_2 = r0;
     r0 = (1 + s.tmp_2);
@@ -61456,8 +61778,8 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_1 + s.tmp_3);
     s.tmp_0 = r0;
-    s.tmp_6 = r0 = s.availableWidth___23277;
-    s.tmp_8 = r0 = s.charactersPerRow___23283;
+    s.tmp_6 = r0 = s.availableWidth___52847;
+    s.tmp_8 = r0 = s.charactersPerRow___52853;
     s.tmp_10 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_10.arg0 = r0;
@@ -61467,7 +61789,7 @@ switch (step) {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["charWidth"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["charWidth"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 1112; s.pc = 12; return s.tmp_10; }
+     else { s.callLocIdx = 1069; s.pc = 12; return s.tmp_10; }
     }
   case 12:
     r0 = s.retval;
@@ -61479,7 +61801,7 @@ switch (step) {
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
     r0 = (s.tmp_0 + s.tmp_4);
-    s.textLeft___23297 = (r0);
+    s.textLeft___52867 = (r0);
     r0 = s.arg0.fields["innerTop"];
     s.tmp_2 = r0;
     r0 = (1 + s.tmp_2);
@@ -61488,11 +61810,11 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_1 + s.tmp_3);
     s.tmp_0 = r0;
-    s.tmp_6 = r0 = s.availableHeight___23280;
-    s.tmp_8 = r0 = s.rowsOfCharacters___23291;
-    s.tmp_10 = game_BaseDialog_rowHeight__P4326_mk(s);
+    s.tmp_6 = r0 = s.availableHeight___52850;
+    s.tmp_8 = r0 = s.rowsOfCharacters___52861;
+    s.tmp_10 = game_BaseDialog_rowHeight__P33819_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 1113; s.pc = 13; return s.tmp_10;
+    s.callLocIdx = 1070; s.pc = 13; return s.tmp_10;
   case 13:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -61503,27 +61825,27 @@ switch (step) {
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
     r0 = (s.tmp_0 + s.tmp_4);
-    s.textTop___23316 = (r0);
-    s.row___23333 = (0);
+    s.textTop___52886 = (r0);
+    s.row___52903 = (0);
   case 5:
-    s.tmp_1 = r0 = s.row___23333;
-    r0 = pxsim_Array__length(s.lines___23271);
+    s.tmp_1 = r0 = s.row___52903;
+    r0 = pxsim_Array__length(s.lines___52841);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_3 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_3 = helpers_imagePrint__P31178_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_3.arg0 = r0;
-    r0 = pxsim_Array__getAt(s.lines___23271, s.row___23333);
+    r0 = pxsim_Array__getAt(s.lines___52841, s.row___52903);
     s.tmp_3.arg1 = r0;
-    s.tmp_3.arg2 = s.textLeft___23297;
-    s.tmp_4 = r0 = s.textTop___23316;
-    s.tmp_6 = r0 = s.row___23333;
-    s.tmp_8 = game_BaseDialog_rowHeight__P4326_mk(s);
+    s.tmp_3.arg2 = s.textLeft___52867;
+    s.tmp_4 = r0 = s.textTop___52886;
+    s.tmp_6 = r0 = s.row___52903;
+    s.tmp_8 = game_BaseDialog_rowHeight__P33819_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1114; s.pc = 15; return s.tmp_8;
+    s.callLocIdx = 1071; s.pc = 15; return s.tmp_8;
   case 15:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -61536,11 +61858,11 @@ switch (step) {
     r0 = s.arg0.fields["font"];
     s.tmp_3.arg5 = r0;
     s.tmp_3.arg6 = undefined;
-    s.callLocIdx = 1115; s.pc = 14; return s.tmp_3;
+    s.callLocIdx = 1072; s.pc = 14; return s.tmp_3;
   case 14:
     r0 = s.retval;
-    r0 = (s.row___23333 + 1);
-    s.row___23333 = (r0);
+    r0 = (s.row___52903 + 1);
+    s.row___52903 = (r0);
     { step = 5; continue; }
   case 6:
   case 7:
@@ -61548,12 +61870,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_drawTextCore__P2504.info = {"start":7183,"length":978,"line":233,"column":8,"endLine":253,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
+game_Dialog_drawTextCore__P31923.info = {"start":7183,"length":978,"line":233,"column":8,"endLine":253,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
 
-function game_Dialog_drawTextCore__P2504_mk(s) {
+function game_Dialog_drawTextCore__P31923_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_drawTextCore__P2504, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_drawTextCore__P31923, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61566,14 +61888,14 @@ function game_Dialog_drawTextCore__P2504_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  lines___23271: undefined,
-  availableWidth___23277: undefined,
-  availableHeight___23280: undefined,
-  charactersPerRow___23283: undefined,
-  rowsOfCharacters___23291: undefined,
-  textLeft___23297: undefined,
-  textTop___23316: undefined,
-  row___23333: undefined,
+  lines___52841: undefined,
+  availableWidth___52847: undefined,
+  availableHeight___52850: undefined,
+  charactersPerRow___52853: undefined,
+  rowsOfCharacters___52861: undefined,
+  textLeft___52867: undefined,
+  textTop___52886: undefined,
+  row___52903: undefined,
   arg0: undefined,
 } }
 
@@ -61581,7 +61903,7 @@ function game_Dialog_drawTextCore__P2504_mk(s) {
 
 
 
-function game_BaseDialog_setText__P2491(s) {
+function game_BaseDialog_setText__P31910(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61597,17 +61919,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C31896_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_setText__P2491.info = {"start":1670,"length":77,"line":66,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
+game_BaseDialog_setText__P31910.info = {"start":1670,"length":77,"line":66,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/game---hw/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
 
-function game_BaseDialog_setText__P2491_mk(s) {
+function game_BaseDialog_setText__P31910_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_setText__P2491, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_setText__P31910, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -61617,7 +61939,7 @@ function game_BaseDialog_setText__P2491_mk(s) {
 
 
 
-function music_Melody_toString__P1607(s) {
+function sprites_SpriteMap_toString__P31521(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61632,41 +61954,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_text"];
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_toString__P1607.info = {"start":9640,"length":53,"line":303,"column":8,"endLine":305,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"toString","argumentNames":["this"]}
-
-function music_Melody_toString__P1607_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_toString__P1607, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function sprites_SpriteMap_toString__P2102(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
     r0 = s.arg0.fields["buckets"];
@@ -61686,11 +61974,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, " buckets, ");
     s.tmp_1 = r0;
-    s.tmp_10 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_10 = helpers_arrayFilter__P29643_mk(s);
     r0 = s.arg0.fields["buckets"];
     s.tmp_10.arg0 = r0;
-    s.tmp_10.arg1 = inline__P23373;
-    s.callLocIdx = 518; s.pc = 2; return s.tmp_10;
+    s.tmp_10.arg1 = inline__P52943;
+    s.callLocIdx = 475; s.pc = 2; return s.tmp_10;
   case 2:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -61711,12 +61999,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_toString__P2102.info = {"start":4109,"length":123,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"toString","argumentNames":["this"]}
+sprites_SpriteMap_toString__P31521.info = {"start":4109,"length":123,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"toString","argumentNames":["this"]}
 
-function sprites_SpriteMap_toString__P2102_mk(s) {
+function sprites_SpriteMap_toString__P31521_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_toString__P2102, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_toString__P31521, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61736,7 +62024,7 @@ function sprites_SpriteMap_toString__P2102_mk(s) {
 
 
 
-function inline__P23373(s) {
+function inline__P52943(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61760,12 +62048,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P23373.info = {"start":4196,"length":8,"line":113,"column":74,"endLine":113,"endColumn":82,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["b"]}
+inline__P52943.info = {"start":4196,"length":8,"line":113,"column":74,"endLine":113,"endColumn":82,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"inline","argumentNames":["b"]}
 
-function inline__P23373_mk(s) {
+function inline__P52943_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P23373, depth: s.depth + 1,
+        parent: s, fn: inline__P52943, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61777,7 +62065,7 @@ function inline__P23373_mk(s) {
 
 
 
-function ArcadePhysicsEngine_moveSprite__P2187(s) {
+function ArcadePhysicsEngine_moveSprite__P31606(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61787,9 +62075,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___23411 = undefined;
-    s.maxDist___23421 = undefined;
-    s.ms___23441 = undefined;
+    s.tm___52981 = undefined;
+    s.maxDist___52991 = undefined;
+    s.ms___53011 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -61798,7 +62086,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg1.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.arg1).fields["_lastX"] = (s.tmp_0);
@@ -61827,19 +62115,19 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    s.tmp_4 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 736; s.pc = 16; return s.tmp_4;
+    s.tmp_4 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 693; s.pc = 16; return s.tmp_4;
   case 16:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___23411 = (r0);
-    s.tmp_0 = r0 = s.tm___23411;
+    s.tm___52981 = (r0);
+    s.tmp_0 = r0 = s.tm___52981;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.tm___23411.fields["_map"];
+    r0 = s.tm___52981.fields["_map"];
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -61865,41 +62153,41 @@ switch (step) {
     r0 = (s.tmp_8 + 128);
     s.tmp_9 = r0;
     r0 = (s.tmp_9 >> 8);
-    s.maxDist___23421 = (r0);
-    s.tmp_2 = Math_abs__P123_mk(s);
+    s.maxDist___52991 = (r0);
+    s.tmp_2 = Math_abs__P29658_mk(s);
     r0 = (s.arg2 + 128);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 8);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 740; s.pc = 17; return s.tmp_2;
+    s.callLocIdx = 697; s.pc = 17; return s.tmp_2;
   case 17:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.maxDist___23421);
+    r0 = (s.tmp_1 <= s.maxDist___52991);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 5; continue; }
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_5 = Math_abs__P123_mk(s);
+    s.tmp_5 = Math_abs__P29658_mk(s);
     r0 = (s.arg3 + 128);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 >> 8);
     s.tmp_5.arg0 = r0;
-    s.callLocIdx = 742; s.pc = 18; return s.tmp_5;
+    s.callLocIdx = 699; s.pc = 18; return s.tmp_5;
   case 18:
     r0 = s.retval;
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 <= s.maxDist___23421);
+    r0 = (s.tmp_4 <= s.maxDist___52991);
   case 6:
     // jmp value (already in r0)
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C2171_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C31590_VT);
     s.tmp_8 = r0;
-    s.tmp_9 = MovingSprite_constructor__P2172_mk(s);
+    s.tmp_9 = MovingSprite_constructor__P31591_mk(s);
     s.tmp_9.arg0 = s.tmp_8;
     s.tmp_9.arg1 = s.arg1;
     r0 = s.arg1.fields["_vx"];
@@ -61910,23 +62198,23 @@ switch (step) {
     s.tmp_9.arg5 = s.arg3;
     s.tmp_9.arg6 = s.arg2;
     s.tmp_9.arg7 = s.arg3;
-    s.callLocIdx = 743; s.pc = 19; return s.tmp_9;
+    s.callLocIdx = 700; s.pc = 19; return s.tmp_9;
   case 19:
     r0 = s.retval;
-    s.ms___23441 = (s.tmp_8);
-    s.tmp_0 = ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s);
+    s.ms___53011 = (s.tmp_8);
+    s.tmp_0 = ArcadePhysicsEngine_tilemapCollisions__P33716_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.ms___23441;
-    s.tmp_0.arg2 = s.tm___23411;
-    s.callLocIdx = 744; s.pc = 20; return s.tmp_0;
+    s.tmp_0.arg1 = s.ms___53011;
+    s.tmp_0.arg2 = s.tm___52981;
+    s.callLocIdx = 701; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     { step = 12; continue; }
   case 7:
-    s.tmp_1 = tiles_TileMap_isOnWall__P2338_mk(s);
-    s.tmp_1.arg0 = s.tm___23411;
+    s.tmp_1 = tiles_TileMap_isOnWall__P31757_mk(s);
+    s.tmp_1.arg0 = s.tm___52981;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 745; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 702; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -61935,11 +62223,11 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 9; continue; }
   case 8:
-    s.tmp_4 = ArcadePhysicsEngine_canResolveClipping__P4225_mk(s);
+    s.tmp_4 = ArcadePhysicsEngine_canResolveClipping__P33718_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = s.arg1;
-    s.tmp_4.arg2 = s.tm___23411;
-    s.callLocIdx = 746; s.pc = 22; return s.tmp_4;
+    s.tmp_4.arg2 = s.tm___52981;
+    s.callLocIdx = 703; s.pc = 22; return s.tmp_4;
   case 22:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -61974,12 +62262,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_moveSprite__P2187.info = {"start":21785,"length":1276,"line":642,"column":4,"endLine":675,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
+ArcadePhysicsEngine_moveSprite__P31606.info = {"start":21785,"length":1276,"line":642,"column":4,"endLine":675,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
 
-function ArcadePhysicsEngine_moveSprite__P2187_mk(s) {
+function ArcadePhysicsEngine_moveSprite__P31606_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_moveSprite__P2187, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_moveSprite__P31606, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61991,9 +62279,9 @@ function ArcadePhysicsEngine_moveSprite__P2187_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  tm___23411: undefined,
-  maxDist___23421: undefined,
-  ms___23441: undefined,
+  tm___52981: undefined,
+  maxDist___52991: undefined,
+  ms___53011: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -62004,7 +62292,7 @@ function ArcadePhysicsEngine_moveSprite__P2187_mk(s) {
 
 
 
-function ArcadePhysicsEngine_canResolveClipping__P4225(s) {
+function ArcadePhysicsEngine_canResolveClipping__P33718(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62014,19 +62302,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hbox___23486 = undefined;
-    s.sz___23489 = undefined;
-    s.maxMove___23494 = undefined;
-    s.origY___23496 = undefined;
-    s.origX___23499 = undefined;
-    s.l___23502 = undefined;
-    s.r___23507 = undefined;
-    s.t___23512 = undefined;
-    s.b___23517 = undefined;
-    s.offset___23522 = undefined;
-    s.offset___23547 = undefined;
-    s.offset___23578 = undefined;
-    s.offset___23603 = undefined;
+    s.hbox___53056 = undefined;
+    s.sz___53059 = undefined;
+    s.maxMove___53064 = undefined;
+    s.origY___53066 = undefined;
+    s.origX___53069 = undefined;
+    s.l___53072 = undefined;
+    s.r___53077 = undefined;
+    s.t___53082 = undefined;
+    s.b___53087 = undefined;
+    s.offset___53092 = undefined;
+    s.offset___53117 = undefined;
+    s.offset___53148 = undefined;
+    s.offset___53173 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -62034,7 +62322,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.isStatic(s.tmp_3);
@@ -62045,91 +62333,91 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_4 = Sprite_setHitbox__P2057_mk(s);
+    s.tmp_4 = Sprite_setHitbox__P31476_mk(s);
     s.tmp_4.arg0 = s.arg1;
-    s.callLocIdx = 748; s.pc = 20; return s.tmp_4;
+    s.callLocIdx = 705; s.pc = 20; return s.tmp_4;
   case 20:
     r0 = s.retval;
   case 1:
   case 2:
     r0 = s.arg1.fields["_hitbox"];
-    s.hbox___23486 = (r0);
+    s.hbox___53056 = (r0);
     r0 = s.arg2.fields["_scale"];
     s.tmp_0 = r0;
     r0 = (1 << s.tmp_0);
-    s.sz___23489 = (r0);
-    s.tmp_0 = ArcadePhysicsEngine_maxStep__P2179_mk(s);
+    s.sz___53059 = (r0);
+    s.tmp_0 = ArcadePhysicsEngine_maxStep__P31598_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 750; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 707; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.maxMove___23494 = (r0);
+    s.maxMove___53064 = (r0);
     r0 = s.arg1.fields["_y"];
-    s.origY___23496 = (r0);
+    s.origY___53066 = (r0);
     r0 = s.arg1.fields["_x"];
-    s.origX___23499 = (r0);
-    s.tmp_1 = game_Hitbox_left__P1966_mk(s);
-    s.tmp_1.arg0 = s.hbox___23486;
-    s.callLocIdx = 751; s.pc = 22; return s.tmp_1;
+    s.origX___53069 = (r0);
+    s.tmp_1 = game_Hitbox_left__P31385_mk(s);
+    s.tmp_1.arg0 = s.hbox___53056;
+    s.callLocIdx = 708; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.l___23502 = (r0);
-    s.tmp_1 = game_Hitbox_right__P1968_mk(s);
-    s.tmp_1.arg0 = s.hbox___23486;
-    s.callLocIdx = 753; s.pc = 23; return s.tmp_1;
+    s.l___53072 = (r0);
+    s.tmp_1 = game_Hitbox_right__P31387_mk(s);
+    s.tmp_1.arg0 = s.hbox___53056;
+    s.callLocIdx = 710; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.r___23507 = (r0);
-    s.tmp_1 = game_Hitbox_top__P1967_mk(s);
-    s.tmp_1.arg0 = s.hbox___23486;
-    s.callLocIdx = 755; s.pc = 24; return s.tmp_1;
+    s.r___53077 = (r0);
+    s.tmp_1 = game_Hitbox_top__P31386_mk(s);
+    s.tmp_1.arg0 = s.hbox___53056;
+    s.callLocIdx = 712; s.pc = 24; return s.tmp_1;
   case 24:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.t___23512 = (r0);
-    s.tmp_1 = game_Hitbox_bottom__P1969_mk(s);
-    s.tmp_1.arg0 = s.hbox___23486;
-    s.callLocIdx = 757; s.pc = 25; return s.tmp_1;
+    s.t___53082 = (r0);
+    s.tmp_1 = game_Hitbox_bottom__P31388_mk(s);
+    s.tmp_1.arg0 = s.hbox___53056;
+    s.callLocIdx = 714; s.pc = 25; return s.tmp_1;
   case 25:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.b___23517 = (r0);
-    r0 = (s.b___23517 + 1);
+    s.b___53087 = (r0);
+    r0 = (s.b___53087 + 1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.sz___23489);
-    s.offset___23522 = (r0);
-    r0 = (s.offset___23522 <= s.maxMove___23494);
+    r0 = (s.tmp_0 % s.sz___53059);
+    s.offset___53092 = (r0);
+    r0 = (s.offset___53092 <= s.maxMove___53064);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg1.fields["_y"];
     s.tmp_3 = r0;
-    r0 = (s.offset___23522 * 256);
+    r0 = (s.offset___53092 * 256);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 | 0);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["_y"] = (s.tmp_2);
-    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P31757_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 761; s.pc = 26; return s.tmp_3;
+    s.callLocIdx = 718; s.pc = 26; return s.tmp_3;
   case 26:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -62143,38 +62431,38 @@ switch (step) {
     { step = 19; continue; }
     { step = 4; continue; }
   case 3:
-    r0 = (s.arg1).fields["_y"] = (s.origY___23496);
+    r0 = (s.arg1).fields["_y"] = (s.origY___53066);
   case 4:
   case 5:
   case 6:
-    r0 = (s.t___23512 / s.sz___23489);
+    r0 = (s.t___53082 / s.sz___53059);
     s.tmp_3 = r0;
     r0 = pxsim.Math_.floor(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.sz___23489);
+    r0 = (s.tmp_1 * s.sz___53059);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.t___23512);
-    s.offset___23547 = (r0);
-    r0 = (s.offset___23547 <= s.maxMove___23494);
+    r0 = (s.tmp_0 - s.t___53082);
+    s.offset___53117 = (r0);
+    r0 = (s.offset___53117 <= s.maxMove___53064);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg1.fields["_y"];
     s.tmp_3 = r0;
-    r0 = (s.offset___23547 * 256);
+    r0 = (s.offset___53117 * 256);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 | 0);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["_y"] = (s.tmp_2);
-    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P31757_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 764; s.pc = 27; return s.tmp_3;
+    s.callLocIdx = 721; s.pc = 27; return s.tmp_3;
   case 27:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -62188,32 +62476,32 @@ switch (step) {
     { step = 19; continue; }
     { step = 8; continue; }
   case 7:
-    r0 = (s.arg1).fields["_y"] = (s.origY___23496);
+    r0 = (s.arg1).fields["_y"] = (s.origY___53066);
   case 8:
   case 9:
   case 10:
-    r0 = (s.r___23507 + 1);
+    r0 = (s.r___53077 + 1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.sz___23489);
-    s.offset___23578 = (r0);
-    r0 = (s.offset___23578 <= s.maxMove___23494);
+    r0 = (s.tmp_0 % s.sz___53059);
+    s.offset___53148 = (r0);
+    r0 = (s.offset___53148 <= s.maxMove___53064);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg1.fields["_x"];
     s.tmp_3 = r0;
-    r0 = (s.offset___23578 * 256);
+    r0 = (s.offset___53148 * 256);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 | 0);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["_x"] = (s.tmp_2);
-    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P31757_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 767; s.pc = 28; return s.tmp_3;
+    s.callLocIdx = 724; s.pc = 28; return s.tmp_3;
   case 28:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -62227,38 +62515,38 @@ switch (step) {
     { step = 19; continue; }
     { step = 12; continue; }
   case 11:
-    r0 = (s.arg1).fields["_x"] = (s.origX___23499);
+    r0 = (s.arg1).fields["_x"] = (s.origX___53069);
   case 12:
   case 13:
   case 14:
-    r0 = (s.l___23502 / s.sz___23489);
+    r0 = (s.l___53072 / s.sz___53059);
     s.tmp_3 = r0;
     r0 = pxsim.Math_.floor(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.sz___23489);
+    r0 = (s.tmp_1 * s.sz___53059);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.l___23502);
-    s.offset___23603 = (r0);
-    r0 = (s.offset___23603 <= s.maxMove___23494);
+    r0 = (s.tmp_0 - s.l___53072);
+    s.offset___53173 = (r0);
+    r0 = (s.offset___53173 <= s.maxMove___53064);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg1.fields["_x"];
     s.tmp_3 = r0;
-    r0 = (s.offset___23603 * 256);
+    r0 = (s.offset___53173 * 256);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 | 0);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["_x"] = (s.tmp_2);
-    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P31757_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 770; s.pc = 29; return s.tmp_3;
+    s.callLocIdx = 727; s.pc = 29; return s.tmp_3;
   case 29:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -62272,7 +62560,7 @@ switch (step) {
     { step = 19; continue; }
     { step = 16; continue; }
   case 15:
-    r0 = (s.arg1).fields["_x"] = (s.origX___23499);
+    r0 = (s.arg1).fields["_x"] = (s.origX___53069);
   case 16:
   case 17:
   case 18:
@@ -62281,12 +62569,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_canResolveClipping__P4225.info = {"start":23157,"length":2135,"line":678,"column":4,"endLine":749,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"canResolveClipping","argumentNames":["this","s","tm"]}
+ArcadePhysicsEngine_canResolveClipping__P33718.info = {"start":23157,"length":2135,"line":678,"column":4,"endLine":749,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"canResolveClipping","argumentNames":["this","s","tm"]}
 
-function ArcadePhysicsEngine_canResolveClipping__P4225_mk(s) {
+function ArcadePhysicsEngine_canResolveClipping__P33718_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_canResolveClipping__P4225, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_canResolveClipping__P33718, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62294,19 +62582,19 @@ function ArcadePhysicsEngine_canResolveClipping__P4225_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  hbox___23486: undefined,
-  sz___23489: undefined,
-  maxMove___23494: undefined,
-  origY___23496: undefined,
-  origX___23499: undefined,
-  l___23502: undefined,
-  r___23507: undefined,
-  t___23512: undefined,
-  b___23517: undefined,
-  offset___23522: undefined,
-  offset___23547: undefined,
-  offset___23578: undefined,
-  offset___23603: undefined,
+  hbox___53056: undefined,
+  sz___53059: undefined,
+  maxMove___53064: undefined,
+  origY___53066: undefined,
+  origX___53069: undefined,
+  l___53072: undefined,
+  r___53077: undefined,
+  t___53082: undefined,
+  b___53087: undefined,
+  offset___53092: undefined,
+  offset___53117: undefined,
+  offset___53148: undefined,
+  offset___53173: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -62316,7 +62604,7 @@ function ArcadePhysicsEngine_canResolveClipping__P4225_mk(s) {
 
 
 
-function Sprite_isStatic__P2058(s) {
+function Sprite_isStatic__P31477(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62331,19 +62619,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.isStatic(s.tmp_0);
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_isStatic__P2058.info = {"start":8266,"length":57,"line":299,"column":4,"endLine":301,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isStatic","argumentNames":["this"]}
+Sprite_isStatic__P31477.info = {"start":8266,"length":57,"line":299,"column":4,"endLine":301,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"isStatic","argumentNames":["this"]}
 
-function Sprite_isStatic__P2058_mk(s) {
+function Sprite_isStatic__P31477_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isStatic__P2058, depth: s.depth + 1,
+        parent: s, fn: Sprite_isStatic__P31477, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -62353,7 +62641,7 @@ function Sprite_isStatic__P2058_mk(s) {
 
 
 
-function ArcadePhysicsEngine_tilemapCollisions__P4223(s) {
+function ArcadePhysicsEngine_tilemapCollisions__P33716(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62363,38 +62651,38 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___23642 = undefined;
-    s.hbox___23665 = undefined;
-    s.tileScale___23668 = undefined;
-    s.tileSize___23671 = undefined;
-    s.xDiff___23675 = undefined;
-    s.yDiff___23682 = undefined;
-    s.overlappedTiles___23689 = undefined;
-    s.right___23694 = undefined;
-    s.x0___23698 = undefined;
-    s.collidedTiles___23713 = undefined;
-    s.y___23715 = undefined;
-    s.y0___23729 = undefined;
-    s.obstacle___23745 = undefined;
-    s.collisionDirection___23779 = undefined;
-    s.tile___23805 = undefined;
-    s.unnamed108___U15 = undefined;
-    s.unnamed109___U16 = undefined;
-    s.down___23883 = undefined;
-    s.y0___23887 = undefined;
-    s.collidedTiles___23902 = undefined;
-    s.overlappedTiles___23904 = undefined;
-    s.x___23906 = undefined;
-    s.x0___23916 = undefined;
-    s.obstacle___23930 = undefined;
-    s.collisionDirection___23964 = undefined;
-    s.tile___23990 = undefined;
-    s.unnamed110___U26 = undefined;
-    s.unnamed111___U27 = undefined;
-    s.x___24065 = undefined;
-    s.x0___24075 = undefined;
-    s.y___24085 = undefined;
-    s.y0___24095 = undefined;
+    s.s___53212 = undefined;
+    s.hbox___53235 = undefined;
+    s.tileScale___53238 = undefined;
+    s.tileSize___53241 = undefined;
+    s.xDiff___53245 = undefined;
+    s.yDiff___53252 = undefined;
+    s.overlappedTiles___53259 = undefined;
+    s.right___53264 = undefined;
+    s.x0___53268 = undefined;
+    s.collidedTiles___53283 = undefined;
+    s.y___53285 = undefined;
+    s.y0___53299 = undefined;
+    s.obstacle___53315 = undefined;
+    s.collisionDirection___53349 = undefined;
+    s.tile___53375 = undefined;
+    s.unnamed948___U15 = undefined;
+    s.unnamed949___U16 = undefined;
+    s.down___53453 = undefined;
+    s.y0___53457 = undefined;
+    s.collidedTiles___53472 = undefined;
+    s.overlappedTiles___53474 = undefined;
+    s.x___53476 = undefined;
+    s.x0___53486 = undefined;
+    s.obstacle___53500 = undefined;
+    s.collisionDirection___53534 = undefined;
+    s.tile___53560 = undefined;
+    s.unnamed950___U26 = undefined;
+    s.unnamed951___U27 = undefined;
+    s.x___53635 = undefined;
+    s.x0___53645 = undefined;
+    s.y___53655 = undefined;
+    s.y0___53665 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -62402,19 +62690,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg1.fields["sprite"];
-    s.s___23642 = (r0);
-    r0 = s.s___23642.fields["flags"];
+    s.s___53212 = (r0);
+    r0 = s.s___53212.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 256);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P31757_mk(s);
     s.tmp_3.arg0 = s.arg2;
-    s.tmp_3.arg1 = s.s___23642;
-    s.callLocIdx = 629; s.pc = 84; return s.tmp_3;
+    s.tmp_3.arg1 = s.s___53212;
+    s.callLocIdx = 586; s.pc = 84; return s.tmp_3;
   case 84:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -62423,7 +62711,7 @@ switch (step) {
     { step = 83; continue; }
     { step = 2; continue; }
   case 1:
-    s.tmp_4 = r0 = s.s___23642;
+    s.tmp_4 = r0 = s.s___53212;
     r0 = s.tmp_4.fields["flags"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 & -257);
@@ -62432,7 +62720,7 @@ switch (step) {
   case 2:
   case 3:
   case 4:
-    r0 = s.s___23642.fields["_image"];
+    r0 = s.s___53212.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.isStatic(s.tmp_3);
     s.tmp_2 = r0;
@@ -62442,53 +62730,53 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_4 = Sprite_setHitbox__P2057_mk(s);
-    s.tmp_4.arg0 = s.s___23642;
-    s.callLocIdx = 631; s.pc = 85; return s.tmp_4;
+    s.tmp_4 = Sprite_setHitbox__P31476_mk(s);
+    s.tmp_4.arg0 = s.s___53212;
+    s.callLocIdx = 588; s.pc = 85; return s.tmp_4;
   case 85:
     r0 = s.retval;
   case 5:
   case 6:
-    r0 = s.s___23642.fields["_hitbox"];
-    s.hbox___23665 = (r0);
+    r0 = s.s___53212.fields["_hitbox"];
+    s.hbox___53235 = (r0);
     r0 = s.arg2.fields["_scale"];
-    s.tileScale___23668 = (r0);
-    r0 = (1 << s.tileScale___23668);
-    s.tileSize___23671 = (r0);
-    r0 = s.s___23642.fields["_x"];
+    s.tileScale___53238 = (r0);
+    r0 = (1 << s.tileScale___53238);
+    s.tileSize___53241 = (r0);
+    r0 = s.s___53212.fields["_x"];
     s.tmp_0 = r0;
-    r0 = s.s___23642.fields["_lastX"];
+    r0 = s.s___53212.fields["_lastX"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.xDiff___23675 = (r0);
-    r0 = s.s___23642.fields["_y"];
+    s.xDiff___53245 = (r0);
+    r0 = s.s___53212.fields["_y"];
     s.tmp_0 = r0;
-    r0 = s.s___23642.fields["_lastY"];
+    r0 = s.s___53212.fields["_lastY"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.yDiff___23682 = (r0);
+    s.yDiff___53252 = (r0);
     r0 = pxsim_Array__mk();
-    s.overlappedTiles___23689 = (r0);
-    r0 = (s.xDiff___23675 !== 0);
+    s.overlappedTiles___53259 = (r0);
+    r0 = (s.xDiff___53245 !== 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 39; continue; }
-    r0 = (s.xDiff___23675 > 0);
-    s.right___23694 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.right___23694);
+    r0 = (s.xDiff___53245 > 0);
+    s.right___53264 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.right___53264);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = game_Hitbox_right__P1968_mk(s);
-    s.tmp_1.arg0 = s.hbox___23665;
-    s.callLocIdx = 635; s.pc = 86; return s.tmp_1;
+    s.tmp_1 = game_Hitbox_right__P31387_mk(s);
+    s.tmp_1.arg0 = s.hbox___53235;
+    s.callLocIdx = 592; s.pc = 86; return s.tmp_1;
   case 86:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 256);
     { step = 8; continue; }
   case 7:
-    s.tmp_3 = game_Hitbox_left__P1966_mk(s);
-    s.tmp_3.arg0 = s.hbox___23665;
-    s.callLocIdx = 637; s.pc = 87; return s.tmp_3;
+    s.tmp_3 = game_Hitbox_left__P31385_mk(s);
+    s.tmp_3.arg0 = s.hbox___53235;
+    s.callLocIdx = 594; s.pc = 87; return s.tmp_3;
   case 87:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -62498,30 +62786,30 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 128);
     s.tmp_5 = r0;
-    r0 = (s.tileScale___23668 + 8);
+    r0 = (s.tileScale___53238 + 8);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 >> s.tmp_6);
-    s.x0___23698 = (r0);
+    s.x0___53268 = (r0);
     r0 = pxsim_Array__mk();
-    s.collidedTiles___23713 = (r0);
-    s.tmp_1 = game_Hitbox_top__P1967_mk(s);
-    s.tmp_1.arg0 = s.hbox___23665;
-    s.callLocIdx = 641; s.pc = 88; return s.tmp_1;
+    s.collidedTiles___53283 = (r0);
+    s.tmp_1 = game_Hitbox_top__P31386_mk(s);
+    s.tmp_1.arg0 = s.hbox___53235;
+    s.callLocIdx = 598; s.pc = 88; return s.tmp_1;
   case 88:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.yDiff___23682);
-    s.y___23715 = (r0);
+    r0 = (s.tmp_0 - s.yDiff___53252);
+    s.y___53285 = (r0);
   case 9:
-    s.tmp_1 = r0 = s.y___23715;
-    s.tmp_3 = r0 = s.tileSize___23671;
-    s.tmp_6 = game_Hitbox_bottom__P1969_mk(s);
-    s.tmp_6.arg0 = s.hbox___23665;
-    s.callLocIdx = 643; s.pc = 89; return s.tmp_6;
+    s.tmp_1 = r0 = s.y___53285;
+    s.tmp_3 = r0 = s.tileSize___53241;
+    s.tmp_6 = game_Hitbox_bottom__P31388_mk(s);
+    s.tmp_6.arg0 = s.hbox___53235;
+    s.callLocIdx = 600; s.pc = 89; return s.tmp_6;
   case 89:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.yDiff___23682);
+    r0 = (s.tmp_5 - s.yDiff___53252);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 << 8);
     s.tmp_7 = r0;
@@ -62531,51 +62819,51 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_10 = Fx_min__P161_mk(s);
-    s.tmp_10.arg0 = s.y___23715;
-    s.tmp_12 = game_Hitbox_bottom__P1969_mk(s);
-    s.tmp_12.arg0 = s.hbox___23665;
-    s.callLocIdx = 646; s.pc = 91; return s.tmp_12;
+    s.tmp_10 = Fx_min__P29696_mk(s);
+    s.tmp_10.arg0 = s.y___53285;
+    s.tmp_12 = game_Hitbox_bottom__P31388_mk(s);
+    s.tmp_12.arg0 = s.hbox___53235;
+    s.callLocIdx = 603; s.pc = 91; return s.tmp_12;
   case 91:
     r0 = s.retval;
     s.tmp_11 = r0;
-    r0 = (s.tmp_11 - s.yDiff___23682);
+    r0 = (s.tmp_11 - s.yDiff___53252);
     s.tmp_10.arg1 = r0;
-    s.callLocIdx = 648; s.pc = 90; return s.tmp_10;
+    s.callLocIdx = 605; s.pc = 90; return s.tmp_10;
   case 90:
     r0 = s.retval;
     s.tmp_9 = r0;
     r0 = (s.tmp_9 + 128);
     s.tmp_8 = r0;
-    r0 = (s.tileScale___23668 + 8);
+    r0 = (s.tileScale___53238 + 8);
     s.tmp_13 = r0;
     r0 = (s.tmp_8 >> s.tmp_13);
-    s.y0___23729 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.y0___53299 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P31755_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.tmp_1.arg1 = s.x0___23698;
-    s.tmp_1.arg2 = s.y0___23729;
-    s.callLocIdx = 651; s.pc = 92; return s.tmp_1;
+    s.tmp_1.arg1 = s.x0___53268;
+    s.tmp_1.arg2 = s.y0___53299;
+    s.callLocIdx = 608; s.pc = 92; return s.tmp_1;
   case 92:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
-    s.tmp_2 = tiles_TileMap_getObstacle__P2337_mk(s);
+    s.tmp_2 = tiles_TileMap_getObstacle__P31756_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___23698;
-    s.tmp_2.arg2 = s.y0___23729;
-    s.callLocIdx = 652; s.pc = 93; return s.tmp_2;
+    s.tmp_2.arg1 = s.x0___53268;
+    s.tmp_2.arg2 = s.y0___53299;
+    s.callLocIdx = 609; s.pc = 93; return s.tmp_2;
   case 93:
     r0 = s.retval;
-    s.obstacle___23745 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P23753);
+    s.obstacle___53315 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P53323);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___23745);
-    s.tmp_4 = helpers_arraySome__P105_mk(s);
-    s.tmp_4.arg0 = s.collidedTiles___23713;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___53315);
+    s.tmp_4 = helpers_arraySome__P29640_mk(s);
+    s.tmp_4.arg0 = s.collidedTiles___53283;
     s.tmp_4.arg1 = s.tmp_0;
-    s.callLocIdx = 653; s.pc = 94; return s.tmp_4;
+    s.callLocIdx = 610; s.pc = 94; return s.tmp_4;
   case 94:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -62585,33 +62873,33 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__push(s.collidedTiles___23713, s.obstacle___23745);
+    r0 = pxsim_Array__push(s.collidedTiles___53283, s.obstacle___53315);
   case 10:
   case 11:
     { step = 13; continue; }
   case 12:
-    s.tmp_0 = r0 = s.overlappedTiles___23689;
-    s.tmp_2 = tiles_TileMap_getTile__P2329_mk(s);
+    s.tmp_0 = r0 = s.overlappedTiles___53259;
+    s.tmp_2 = tiles_TileMap_getTile__P31748_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___23698;
-    s.tmp_2.arg2 = s.y0___23729;
-    s.callLocIdx = 654; s.pc = 95; return s.tmp_2;
+    s.tmp_2.arg1 = s.x0___53268;
+    s.tmp_2.arg2 = s.y0___53299;
+    s.callLocIdx = 611; s.pc = 95; return s.tmp_2;
   case 95:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
   case 13:
-    r0 = (s.tileSize___23671 << 8);
+    r0 = (s.tileSize___53241 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.y___23715);
-    s.y___23715 = (r0);
+    r0 = (s.tmp_0 + s.y___53285);
+    s.y___53285 = (r0);
     { step = 9; continue; }
   case 14:
-    r0 = pxsim_Array__length(s.collidedTiles___23713);
+    r0 = pxsim_Array__length(s.collidedTiles___53283);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 37; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.right___23694);
+    r0 = pxsim_numops_toBoolDecr(s.right___53264);
     if (!r0) { step = 15; continue; }
     r0 = 2;
     { step = 16; continue; }
@@ -62620,23 +62908,23 @@ switch (step) {
   case 16:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.collisionDirection___23779 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.right___23694);
+    s.collisionDirection___53349 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.right___53264);
     if (!r0) { step = 17; continue; }
-    r0 = (s.x0___23698 << s.tileScale___23668);
+    r0 = (s.x0___53268 << s.tileScale___53238);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 256);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_0 = r0;
-    r0 = s.hbox___23665.fields["width"];
+    r0 = s.hbox___53235.fields["width"];
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
     { step = 18; continue; }
   case 17:
-    r0 = (s.x0___23698 + 1);
+    r0 = (s.x0___53268 + 1);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 << s.tileScale___23668);
+    r0 = (s.tmp_5 << s.tileScale___53238);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 * 256);
     s.tmp_6 = r0;
@@ -62644,52 +62932,52 @@ switch (step) {
   case 18:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.s___23642;
-    r0 = s.hbox___23665.fields["ox"];
+    s.tmp_8 = r0 = s.s___53212;
+    r0 = s.hbox___53235.fields["ox"];
     s.tmp_10 = r0;
     r0 = (s.tmp_7 - s.tmp_10);
     s.tmp_9 = r0;
     r0 = (s.tmp_8).fields["_x"] = (s.tmp_9);
-    s.tile___23805 = (undefined);
-    s.unnamed108___U15 = (s.collidedTiles___23713);
-    s.unnamed109___U16 = (0);
+    s.tile___53375 = (undefined);
+    s.unnamed948___U15 = (s.collidedTiles___53283);
+    s.unnamed949___U16 = (0);
   case 19:
-    s.tmp_0 = r0 = s.unnamed109___U16;
-    r0 = pxsim_Array__length(s.unnamed108___U15);
+    s.tmp_0 = r0 = s.unnamed949___U16;
+    r0 = pxsim_Array__length(s.unnamed948___U15);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed108___U15, s.unnamed109___U16);
-    s.tile___23805 = (r0);
-    s.tmp_2 = Sprite_registerObstacle__P2085_mk(s);
-    s.tmp_2.arg0 = s.s___23642;
-    s.tmp_2.arg1 = s.collisionDirection___23779;
-    s.tmp_2.arg2 = s.tile___23805;
+    r0 = pxsim_Array__getAt(s.unnamed948___U15, s.unnamed949___U16);
+    s.tile___53375 = (r0);
+    s.tmp_2 = Sprite_registerObstacle__P31504_mk(s);
+    s.tmp_2.arg0 = s.s___53212;
+    s.tmp_2.arg1 = s.collisionDirection___53349;
+    s.tmp_2.arg2 = s.tile___53375;
     s.tmp_2.arg3 = s.arg2;
-    s.callLocIdx = 660; s.pc = 96; return s.tmp_2;
+    s.callLocIdx = 617; s.pc = 96; return s.tmp_2;
   case 96:
     r0 = s.retval;
-    r0 = (s.unnamed109___U16 + 1);
-    s.unnamed109___U16 = (r0);
+    r0 = (s.unnamed949___U16 + 1);
+    s.unnamed949___U16 = (r0);
     { step = 19; continue; }
   case 20:
-    s.unnamed108___U15 = (undefined);
-    r0 = s.s___23642.fields["flags"];
+    s.unnamed948___U15 = (undefined);
+    r0 = s.s___53212.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 16);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 21; continue; }
-    s.tmp_2 = Sprite_destroy__P2087_mk(s);
-    s.tmp_2.arg0 = s.s___23642;
+    s.tmp_2 = Sprite_destroy__P31506_mk(s);
+    s.tmp_2.arg0 = s.s___53212;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 661; s.pc = 97; return s.tmp_2;
+    s.callLocIdx = 618; s.pc = 97; return s.tmp_2;
   case 97:
     r0 = s.retval;
     { step = 36; continue; }
   case 21:
-    r0 = s.s___23642.fields["_vx"];
+    r0 = s.s___53212.fields["_vx"];
     s.tmp_1 = r0;
     r0 = s.arg1.fields["cachedVx"];
     s.tmp_2 = r0;
@@ -62697,13 +62985,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
-    r0 = s.s___23642.fields["flags"];
+    r0 = s.s___53212.fields["flags"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 & 32);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 30; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.right___23694);
+    r0 = pxsim_numops_toBoolDecr(s.right___53264);
     s.tmp_6 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_6);
     s.tmp_5 = r0;
@@ -62712,9 +63000,9 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 23; continue; }
   case 22:
-    s.tmp_8 = Sprite_vx__P2029_mk(s);
-    s.tmp_8.arg0 = s.s___23642;
-    s.callLocIdx = 662; s.pc = 98; return s.tmp_8;
+    s.tmp_8 = Sprite_vx__P31448_mk(s);
+    s.tmp_8.arg0 = s.s___53212;
+    s.callLocIdx = 619; s.pc = 98; return s.tmp_8;
   case 98:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -62727,15 +63015,15 @@ switch (step) {
     r0 = s.tmp_9;
     { step = 27; continue; }
   case 24:
-    s.tmp_10 = r0 = s.right___23694;
+    s.tmp_10 = r0 = s.right___53264;
     r0 = pxsim_numops_toBool(s.tmp_10);
     if (r0) { step = 25; continue; }
     r0 = s.tmp_10;
     { step = 26; continue; }
   case 25:
-    s.tmp_12 = Sprite_vx__P2029_mk(s);
-    s.tmp_12.arg0 = s.s___23642;
-    s.callLocIdx = 663; s.pc = 99; return s.tmp_12;
+    s.tmp_12 = Sprite_vx__P31448_mk(s);
+    s.tmp_12.arg0 = s.s___53212;
+    s.callLocIdx = 620; s.pc = 99; return s.tmp_12;
   case 99:
     r0 = s.retval;
     s.tmp_11 = r0;
@@ -62749,8 +63037,8 @@ switch (step) {
     s.tmp_14 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_14);
     if (!r0) { step = 28; continue; }
-    s.tmp_15 = r0 = s.s___23642;
-    r0 = s.s___23642.fields["_vx"];
+    s.tmp_15 = r0 = s.s___53212;
+    r0 = s.s___53212.fields["_vx"];
     s.tmp_17 = r0;
     r0 = (0 - s.tmp_17);
     s.tmp_16 = r0;
@@ -62772,29 +63060,29 @@ switch (step) {
     { step = 31; continue; }
   case 30:
     r0 = (s.arg1).fields["dx"] = (0);
-    r0 = (s.s___23642).fields["_vx"] = (0);
+    r0 = (s.s___53212).fields["_vx"] = (0);
   case 31:
     { step = 35; continue; }
   case 32:
-    s.tmp_2 = Math_sign__P124_mk(s);
-    r0 = s.s___23642.fields["_vx"];
+    s.tmp_2 = Math_sign__P29659_mk(s);
+    r0 = s.s___53212.fields["_vx"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 128);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 8);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 668; s.pc = 100; return s.tmp_2;
+    s.callLocIdx = 625; s.pc = 100; return s.tmp_2;
   case 100:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_6 = Math_sign__P124_mk(s);
+    s.tmp_6 = Math_sign__P29659_mk(s);
     r0 = s.arg1.fields["cachedVx"];
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 128);
     s.tmp_8 = r0;
     r0 = (s.tmp_8 >> 8);
     s.tmp_6.arg0 = r0;
-    s.callLocIdx = 670; s.pc = 101; return s.tmp_6;
+    s.callLocIdx = 627; s.pc = 101; return s.tmp_6;
   case 101:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -62811,26 +63099,26 @@ switch (step) {
   case 38:
   case 39:
   case 40:
-    r0 = (s.yDiff___23682 !== 0);
+    r0 = (s.yDiff___53252 !== 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 73; continue; }
-    r0 = (s.yDiff___23682 > 0);
-    s.down___23883 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.down___23883);
+    r0 = (s.yDiff___53252 > 0);
+    s.down___53453 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.down___53453);
     if (!r0) { step = 41; continue; }
-    s.tmp_1 = game_Hitbox_bottom__P1969_mk(s);
-    s.tmp_1.arg0 = s.hbox___23665;
-    s.callLocIdx = 671; s.pc = 102; return s.tmp_1;
+    s.tmp_1 = game_Hitbox_bottom__P31388_mk(s);
+    s.tmp_1.arg0 = s.hbox___53235;
+    s.callLocIdx = 628; s.pc = 102; return s.tmp_1;
   case 102:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 256);
     { step = 42; continue; }
   case 41:
-    s.tmp_3 = game_Hitbox_top__P1967_mk(s);
-    s.tmp_3.arg0 = s.hbox___23665;
-    s.callLocIdx = 673; s.pc = 103; return s.tmp_3;
+    s.tmp_3 = game_Hitbox_top__P31386_mk(s);
+    s.tmp_3.arg0 = s.hbox___53235;
+    s.callLocIdx = 630; s.pc = 103; return s.tmp_3;
   case 103:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -62840,26 +63128,26 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 128);
     s.tmp_5 = r0;
-    r0 = (s.tileScale___23668 + 8);
+    r0 = (s.tileScale___53238 + 8);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 >> s.tmp_6);
-    s.y0___23887 = (r0);
+    s.y0___53457 = (r0);
     r0 = pxsim_Array__mk();
-    s.collidedTiles___23902 = (r0);
+    s.collidedTiles___53472 = (r0);
     r0 = pxsim_Array__mk();
-    s.overlappedTiles___23904 = (r0);
-    s.tmp_0 = game_Hitbox_left__P1966_mk(s);
-    s.tmp_0.arg0 = s.hbox___23665;
-    s.callLocIdx = 677; s.pc = 104; return s.tmp_0;
+    s.overlappedTiles___53474 = (r0);
+    s.tmp_0 = game_Hitbox_left__P31385_mk(s);
+    s.tmp_0.arg0 = s.hbox___53235;
+    s.callLocIdx = 634; s.pc = 104; return s.tmp_0;
   case 104:
     r0 = s.retval;
-    s.x___23906 = (r0);
+    s.x___53476 = (r0);
   case 43:
-    s.tmp_1 = r0 = s.x___23906;
-    s.tmp_3 = r0 = s.tileSize___23671;
-    s.tmp_5 = game_Hitbox_right__P1968_mk(s);
-    s.tmp_5.arg0 = s.hbox___23665;
-    s.callLocIdx = 678; s.pc = 105; return s.tmp_5;
+    s.tmp_1 = r0 = s.x___53476;
+    s.tmp_3 = r0 = s.tileSize___53241;
+    s.tmp_5 = game_Hitbox_right__P31387_mk(s);
+    s.tmp_5.arg0 = s.hbox___53235;
+    s.callLocIdx = 635; s.pc = 105; return s.tmp_5;
   case 105:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -62871,49 +63159,49 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 48; continue; }
-    s.tmp_9 = Fx_min__P161_mk(s);
-    s.tmp_9.arg0 = s.x___23906;
-    s.tmp_10 = game_Hitbox_right__P1968_mk(s);
-    s.tmp_10.arg0 = s.hbox___23665;
-    s.callLocIdx = 680; s.pc = 107; return s.tmp_10;
+    s.tmp_9 = Fx_min__P29696_mk(s);
+    s.tmp_9.arg0 = s.x___53476;
+    s.tmp_10 = game_Hitbox_right__P31387_mk(s);
+    s.tmp_10.arg0 = s.hbox___53235;
+    s.callLocIdx = 637; s.pc = 107; return s.tmp_10;
   case 107:
     r0 = s.retval;
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 681; s.pc = 106; return s.tmp_9;
+    s.callLocIdx = 638; s.pc = 106; return s.tmp_9;
   case 106:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___23668 + 8);
+    r0 = (s.tileScale___53238 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.x0___23916 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.x0___53486 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P31755_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.tmp_1.arg1 = s.x0___23916;
-    s.tmp_1.arg2 = s.y0___23887;
-    s.callLocIdx = 684; s.pc = 108; return s.tmp_1;
+    s.tmp_1.arg1 = s.x0___53486;
+    s.tmp_1.arg2 = s.y0___53457;
+    s.callLocIdx = 641; s.pc = 108; return s.tmp_1;
   case 108:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 46; continue; }
-    s.tmp_2 = tiles_TileMap_getObstacle__P2337_mk(s);
+    s.tmp_2 = tiles_TileMap_getObstacle__P31756_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___23916;
-    s.tmp_2.arg2 = s.y0___23887;
-    s.callLocIdx = 685; s.pc = 109; return s.tmp_2;
+    s.tmp_2.arg1 = s.x0___53486;
+    s.tmp_2.arg2 = s.y0___53457;
+    s.callLocIdx = 642; s.pc = 109; return s.tmp_2;
   case 109:
     r0 = s.retval;
-    s.obstacle___23930 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P23938);
+    s.obstacle___53500 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P53508);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___23930);
-    s.tmp_4 = helpers_arraySome__P105_mk(s);
-    s.tmp_4.arg0 = s.collidedTiles___23902;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___53500);
+    s.tmp_4 = helpers_arraySome__P29640_mk(s);
+    s.tmp_4.arg0 = s.collidedTiles___53472;
     s.tmp_4.arg1 = s.tmp_0;
-    s.callLocIdx = 686; s.pc = 110; return s.tmp_4;
+    s.callLocIdx = 643; s.pc = 110; return s.tmp_4;
   case 110:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -62923,33 +63211,33 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 44; continue; }
-    r0 = pxsim_Array__push(s.collidedTiles___23902, s.obstacle___23930);
+    r0 = pxsim_Array__push(s.collidedTiles___53472, s.obstacle___53500);
   case 44:
   case 45:
     { step = 47; continue; }
   case 46:
-    s.tmp_0 = r0 = s.overlappedTiles___23904;
-    s.tmp_2 = tiles_TileMap_getTile__P2329_mk(s);
+    s.tmp_0 = r0 = s.overlappedTiles___53474;
+    s.tmp_2 = tiles_TileMap_getTile__P31748_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___23916;
-    s.tmp_2.arg2 = s.y0___23887;
-    s.callLocIdx = 687; s.pc = 111; return s.tmp_2;
+    s.tmp_2.arg1 = s.x0___53486;
+    s.tmp_2.arg2 = s.y0___53457;
+    s.callLocIdx = 644; s.pc = 111; return s.tmp_2;
   case 111:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
   case 47:
-    r0 = (s.tileSize___23671 << 8);
+    r0 = (s.tileSize___53241 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.x___23906);
-    s.x___23906 = (r0);
+    r0 = (s.tmp_0 + s.x___53476);
+    s.x___53476 = (r0);
     { step = 43; continue; }
   case 48:
-    r0 = pxsim_Array__length(s.collidedTiles___23902);
+    r0 = pxsim_Array__length(s.collidedTiles___53472);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 71; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.down___23883);
+    r0 = pxsim_numops_toBoolDecr(s.down___53453);
     if (!r0) { step = 49; continue; }
     r0 = 3;
     { step = 50; continue; }
@@ -62958,23 +63246,23 @@ switch (step) {
   case 50:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.collisionDirection___23964 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.down___23883);
+    s.collisionDirection___53534 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.down___53453);
     if (!r0) { step = 51; continue; }
-    r0 = (s.y0___23887 << s.tileScale___23668);
+    r0 = (s.y0___53457 << s.tileScale___53238);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 256);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_0 = r0;
-    r0 = s.hbox___23665.fields["height"];
+    r0 = s.hbox___53235.fields["height"];
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
     { step = 52; continue; }
   case 51:
-    r0 = (s.y0___23887 + 1);
+    r0 = (s.y0___53457 + 1);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 << s.tileScale___23668);
+    r0 = (s.tmp_5 << s.tileScale___53238);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 * 256);
     s.tmp_6 = r0;
@@ -62982,52 +63270,52 @@ switch (step) {
   case 52:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.s___23642;
-    r0 = s.hbox___23665.fields["oy"];
+    s.tmp_8 = r0 = s.s___53212;
+    r0 = s.hbox___53235.fields["oy"];
     s.tmp_10 = r0;
     r0 = (s.tmp_7 - s.tmp_10);
     s.tmp_9 = r0;
     r0 = (s.tmp_8).fields["_y"] = (s.tmp_9);
-    s.tile___23990 = (undefined);
-    s.unnamed110___U26 = (s.collidedTiles___23902);
-    s.unnamed111___U27 = (0);
+    s.tile___53560 = (undefined);
+    s.unnamed950___U26 = (s.collidedTiles___53472);
+    s.unnamed951___U27 = (0);
   case 53:
-    s.tmp_0 = r0 = s.unnamed111___U27;
-    r0 = pxsim_Array__length(s.unnamed110___U26);
+    s.tmp_0 = r0 = s.unnamed951___U27;
+    r0 = pxsim_Array__length(s.unnamed950___U26);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 54; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed110___U26, s.unnamed111___U27);
-    s.tile___23990 = (r0);
-    s.tmp_2 = Sprite_registerObstacle__P2085_mk(s);
-    s.tmp_2.arg0 = s.s___23642;
-    s.tmp_2.arg1 = s.collisionDirection___23964;
-    s.tmp_2.arg2 = s.tile___23990;
+    r0 = pxsim_Array__getAt(s.unnamed950___U26, s.unnamed951___U27);
+    s.tile___53560 = (r0);
+    s.tmp_2 = Sprite_registerObstacle__P31504_mk(s);
+    s.tmp_2.arg0 = s.s___53212;
+    s.tmp_2.arg1 = s.collisionDirection___53534;
+    s.tmp_2.arg2 = s.tile___53560;
     s.tmp_2.arg3 = s.arg2;
-    s.callLocIdx = 693; s.pc = 112; return s.tmp_2;
+    s.callLocIdx = 650; s.pc = 112; return s.tmp_2;
   case 112:
     r0 = s.retval;
-    r0 = (s.unnamed111___U27 + 1);
-    s.unnamed111___U27 = (r0);
+    r0 = (s.unnamed951___U27 + 1);
+    s.unnamed951___U27 = (r0);
     { step = 53; continue; }
   case 54:
-    s.unnamed110___U26 = (undefined);
-    r0 = s.s___23642.fields["flags"];
+    s.unnamed950___U26 = (undefined);
+    r0 = s.s___53212.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 16);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 55; continue; }
-    s.tmp_2 = Sprite_destroy__P2087_mk(s);
-    s.tmp_2.arg0 = s.s___23642;
+    s.tmp_2 = Sprite_destroy__P31506_mk(s);
+    s.tmp_2.arg0 = s.s___53212;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 694; s.pc = 113; return s.tmp_2;
+    s.callLocIdx = 651; s.pc = 113; return s.tmp_2;
   case 113:
     r0 = s.retval;
     { step = 70; continue; }
   case 55:
-    r0 = s.s___23642.fields["_vy"];
+    r0 = s.s___53212.fields["_vy"];
     s.tmp_1 = r0;
     r0 = s.arg1.fields["cachedVy"];
     s.tmp_2 = r0;
@@ -63035,13 +63323,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 66; continue; }
-    r0 = s.s___23642.fields["flags"];
+    r0 = s.s___53212.fields["flags"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 & 32);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 64; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.down___23883);
+    r0 = pxsim_numops_toBoolDecr(s.down___53453);
     s.tmp_6 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_6);
     s.tmp_5 = r0;
@@ -63050,9 +63338,9 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 57; continue; }
   case 56:
-    s.tmp_8 = Sprite_vy__P2031_mk(s);
-    s.tmp_8.arg0 = s.s___23642;
-    s.callLocIdx = 695; s.pc = 114; return s.tmp_8;
+    s.tmp_8 = Sprite_vy__P31450_mk(s);
+    s.tmp_8.arg0 = s.s___53212;
+    s.callLocIdx = 652; s.pc = 114; return s.tmp_8;
   case 114:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -63065,15 +63353,15 @@ switch (step) {
     r0 = s.tmp_9;
     { step = 61; continue; }
   case 58:
-    s.tmp_10 = r0 = s.down___23883;
+    s.tmp_10 = r0 = s.down___53453;
     r0 = pxsim_numops_toBool(s.tmp_10);
     if (r0) { step = 59; continue; }
     r0 = s.tmp_10;
     { step = 60; continue; }
   case 59:
-    s.tmp_12 = Sprite_vy__P2031_mk(s);
-    s.tmp_12.arg0 = s.s___23642;
-    s.callLocIdx = 696; s.pc = 115; return s.tmp_12;
+    s.tmp_12 = Sprite_vy__P31450_mk(s);
+    s.tmp_12.arg0 = s.s___53212;
+    s.callLocIdx = 653; s.pc = 115; return s.tmp_12;
   case 115:
     r0 = s.retval;
     s.tmp_11 = r0;
@@ -63087,8 +63375,8 @@ switch (step) {
     s.tmp_14 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_14);
     if (!r0) { step = 62; continue; }
-    s.tmp_15 = r0 = s.s___23642;
-    r0 = s.s___23642.fields["_vy"];
+    s.tmp_15 = r0 = s.s___53212;
+    r0 = s.s___53212.fields["_vy"];
     s.tmp_17 = r0;
     r0 = (0 - s.tmp_17);
     s.tmp_16 = r0;
@@ -63110,29 +63398,29 @@ switch (step) {
     { step = 65; continue; }
   case 64:
     r0 = (s.arg1).fields["dy"] = (0);
-    r0 = (s.s___23642).fields["_vy"] = (0);
+    r0 = (s.s___53212).fields["_vy"] = (0);
   case 65:
     { step = 69; continue; }
   case 66:
-    s.tmp_2 = Math_sign__P124_mk(s);
-    r0 = s.s___23642.fields["_vy"];
+    s.tmp_2 = Math_sign__P29659_mk(s);
+    r0 = s.s___53212.fields["_vy"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 128);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 8);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 701; s.pc = 116; return s.tmp_2;
+    s.callLocIdx = 658; s.pc = 116; return s.tmp_2;
   case 116:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_6 = Math_sign__P124_mk(s);
+    s.tmp_6 = Math_sign__P29659_mk(s);
     r0 = s.arg1.fields["cachedVy"];
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 128);
     s.tmp_8 = r0;
     r0 = (s.tmp_8 >> 8);
     s.tmp_6.arg0 = r0;
-    s.callLocIdx = 703; s.pc = 117; return s.tmp_6;
+    s.callLocIdx = 660; s.pc = 117; return s.tmp_6;
   case 117:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -63149,18 +63437,18 @@ switch (step) {
   case 72:
   case 73:
   case 74:
-    s.tmp_0 = game_Hitbox_left__P1966_mk(s);
-    s.tmp_0.arg0 = s.hbox___23665;
-    s.callLocIdx = 704; s.pc = 118; return s.tmp_0;
+    s.tmp_0 = game_Hitbox_left__P31385_mk(s);
+    s.tmp_0.arg0 = s.hbox___53235;
+    s.callLocIdx = 661; s.pc = 118; return s.tmp_0;
   case 118:
     r0 = s.retval;
-    s.x___24065 = (r0);
+    s.x___53635 = (r0);
   case 75:
-    s.tmp_1 = r0 = s.x___24065;
-    s.tmp_3 = r0 = s.tileSize___23671;
-    s.tmp_5 = game_Hitbox_right__P1968_mk(s);
-    s.tmp_5.arg0 = s.hbox___23665;
-    s.callLocIdx = 705; s.pc = 119; return s.tmp_5;
+    s.tmp_1 = r0 = s.x___53635;
+    s.tmp_3 = r0 = s.tileSize___53241;
+    s.tmp_5 = game_Hitbox_right__P31387_mk(s);
+    s.tmp_5.arg0 = s.hbox___53235;
+    s.callLocIdx = 662; s.pc = 119; return s.tmp_5;
   case 119:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -63172,36 +63460,36 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 80; continue; }
-    s.tmp_9 = Fx_min__P161_mk(s);
-    s.tmp_9.arg0 = s.x___24065;
-    s.tmp_10 = game_Hitbox_right__P1968_mk(s);
-    s.tmp_10.arg0 = s.hbox___23665;
-    s.callLocIdx = 707; s.pc = 121; return s.tmp_10;
+    s.tmp_9 = Fx_min__P29696_mk(s);
+    s.tmp_9.arg0 = s.x___53635;
+    s.tmp_10 = game_Hitbox_right__P31387_mk(s);
+    s.tmp_10.arg0 = s.hbox___53235;
+    s.callLocIdx = 664; s.pc = 121; return s.tmp_10;
   case 121:
     r0 = s.retval;
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 708; s.pc = 120; return s.tmp_9;
+    s.callLocIdx = 665; s.pc = 120; return s.tmp_9;
   case 120:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___23668 + 8);
+    r0 = (s.tileScale___53238 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.x0___24075 = (r0);
-    s.tmp_0 = game_Hitbox_top__P1967_mk(s);
-    s.tmp_0.arg0 = s.hbox___23665;
-    s.callLocIdx = 711; s.pc = 122; return s.tmp_0;
+    s.x0___53645 = (r0);
+    s.tmp_0 = game_Hitbox_top__P31386_mk(s);
+    s.tmp_0.arg0 = s.hbox___53235;
+    s.callLocIdx = 668; s.pc = 122; return s.tmp_0;
   case 122:
     r0 = s.retval;
-    s.y___24085 = (r0);
+    s.y___53655 = (r0);
   case 76:
-    s.tmp_1 = r0 = s.y___24085;
-    s.tmp_3 = r0 = s.tileSize___23671;
-    s.tmp_5 = game_Hitbox_bottom__P1969_mk(s);
-    s.tmp_5.arg0 = s.hbox___23665;
-    s.callLocIdx = 712; s.pc = 123; return s.tmp_5;
+    s.tmp_1 = r0 = s.y___53655;
+    s.tmp_3 = r0 = s.tileSize___53241;
+    s.tmp_5 = game_Hitbox_bottom__P31388_mk(s);
+    s.tmp_5.arg0 = s.hbox___53235;
+    s.callLocIdx = 669; s.pc = 123; return s.tmp_5;
   case 123:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -63213,29 +63501,29 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 79; continue; }
-    s.tmp_9 = Fx_min__P161_mk(s);
-    s.tmp_9.arg0 = s.y___24085;
-    s.tmp_10 = game_Hitbox_bottom__P1969_mk(s);
-    s.tmp_10.arg0 = s.hbox___23665;
-    s.callLocIdx = 714; s.pc = 125; return s.tmp_10;
+    s.tmp_9 = Fx_min__P29696_mk(s);
+    s.tmp_9.arg0 = s.y___53655;
+    s.tmp_10 = game_Hitbox_bottom__P31388_mk(s);
+    s.tmp_10.arg0 = s.hbox___53235;
+    s.callLocIdx = 671; s.pc = 125; return s.tmp_10;
   case 125:
     r0 = s.retval;
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 715; s.pc = 124; return s.tmp_9;
+    s.callLocIdx = 672; s.pc = 124; return s.tmp_9;
   case 124:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___23668 + 8);
+    r0 = (s.tileScale___53238 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.y0___24095 = (r0);
-    s.tmp_3 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.y0___53665 = (r0);
+    s.tmp_3 = tiles_TileMap_isObstacle__P31755_mk(s);
     s.tmp_3.arg0 = s.arg2;
-    s.tmp_3.arg1 = s.x0___24075;
-    s.tmp_3.arg2 = s.y0___24095;
-    s.callLocIdx = 718; s.pc = 126; return s.tmp_3;
+    s.tmp_3.arg1 = s.x0___53645;
+    s.tmp_3.arg2 = s.y0___53665;
+    s.callLocIdx = 675; s.pc = 126; return s.tmp_3;
   case 126:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -63245,39 +63533,39 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 77; continue; }
-    s.tmp_4 = r0 = s.overlappedTiles___23689;
-    s.tmp_6 = tiles_TileMap_getTile__P2329_mk(s);
+    s.tmp_4 = r0 = s.overlappedTiles___53259;
+    s.tmp_6 = tiles_TileMap_getTile__P31748_mk(s);
     s.tmp_6.arg0 = s.arg2;
-    s.tmp_6.arg1 = s.x0___24075;
-    s.tmp_6.arg2 = s.y0___24095;
-    s.callLocIdx = 719; s.pc = 127; return s.tmp_6;
+    s.tmp_6.arg1 = s.x0___53645;
+    s.tmp_6.arg2 = s.y0___53665;
+    s.callLocIdx = 676; s.pc = 127; return s.tmp_6;
   case 127:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = pxsim_Array__push(s.tmp_4, s.tmp_5);
   case 77:
   case 78:
-    r0 = (s.tileSize___23671 << 8);
+    r0 = (s.tileSize___53241 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.y___24085);
-    s.y___24085 = (r0);
+    r0 = (s.tmp_0 + s.y___53655);
+    s.y___53655 = (r0);
     { step = 76; continue; }
   case 79:
-    r0 = (s.tileSize___23671 << 8);
+    r0 = (s.tileSize___53241 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.x___24065);
-    s.x___24065 = (r0);
+    r0 = (s.tmp_0 + s.x___53635);
+    s.x___53635 = (r0);
     { step = 75; continue; }
   case 80:
-    r0 = pxsim_Array__length(s.overlappedTiles___23689);
+    r0 = pxsim_Array__length(s.overlappedTiles___53259);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 81; continue; }
-    s.tmp_1 = ArcadePhysicsEngine_tilemapOverlaps__P4224_mk(s);
+    s.tmp_1 = ArcadePhysicsEngine_tilemapOverlaps__P33717_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.s___23642;
-    s.tmp_1.arg2 = s.overlappedTiles___23689;
-    s.callLocIdx = 722; s.pc = 128; return s.tmp_1;
+    s.tmp_1.arg1 = s.s___53212;
+    s.tmp_1.arg2 = s.overlappedTiles___53259;
+    s.callLocIdx = 679; s.pc = 128; return s.tmp_1;
   case 128:
     r0 = s.retval;
   case 81:
@@ -63287,12 +63575,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_tilemapCollisions__P4223.info = {"start":11859,"length":8619,"line":370,"column":4,"endLine":606,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapCollisions","argumentNames":["this","movingSprite","tm"]}
+ArcadePhysicsEngine_tilemapCollisions__P33716.info = {"start":11859,"length":8619,"line":370,"column":4,"endLine":606,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"tilemapCollisions","argumentNames":["this","movingSprite","tm"]}
 
-function ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s) {
+function ArcadePhysicsEngine_tilemapCollisions__P33716_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_tilemapCollisions__P4223, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_tilemapCollisions__P33716, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63312,38 +63600,38 @@ function ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s) {
   tmp_15: undefined,
   tmp_16: undefined,
   tmp_17: undefined,
-  s___23642: undefined,
-  hbox___23665: undefined,
-  tileScale___23668: undefined,
-  tileSize___23671: undefined,
-  xDiff___23675: undefined,
-  yDiff___23682: undefined,
-  overlappedTiles___23689: undefined,
-  right___23694: undefined,
-  x0___23698: undefined,
-  collidedTiles___23713: undefined,
-  y___23715: undefined,
-  y0___23729: undefined,
-  obstacle___23745: undefined,
-  collisionDirection___23779: undefined,
-  tile___23805: undefined,
-  unnamed108___U15: undefined,
-  unnamed109___U16: undefined,
-  down___23883: undefined,
-  y0___23887: undefined,
-  collidedTiles___23902: undefined,
-  overlappedTiles___23904: undefined,
-  x___23906: undefined,
-  x0___23916: undefined,
-  obstacle___23930: undefined,
-  collisionDirection___23964: undefined,
-  tile___23990: undefined,
-  unnamed110___U26: undefined,
-  unnamed111___U27: undefined,
-  x___24065: undefined,
-  x0___24075: undefined,
-  y___24085: undefined,
-  y0___24095: undefined,
+  s___53212: undefined,
+  hbox___53235: undefined,
+  tileScale___53238: undefined,
+  tileSize___53241: undefined,
+  xDiff___53245: undefined,
+  yDiff___53252: undefined,
+  overlappedTiles___53259: undefined,
+  right___53264: undefined,
+  x0___53268: undefined,
+  collidedTiles___53283: undefined,
+  y___53285: undefined,
+  y0___53299: undefined,
+  obstacle___53315: undefined,
+  collisionDirection___53349: undefined,
+  tile___53375: undefined,
+  unnamed948___U15: undefined,
+  unnamed949___U16: undefined,
+  down___53453: undefined,
+  y0___53457: undefined,
+  collidedTiles___53472: undefined,
+  overlappedTiles___53474: undefined,
+  x___53476: undefined,
+  x0___53486: undefined,
+  obstacle___53500: undefined,
+  collisionDirection___53534: undefined,
+  tile___53560: undefined,
+  unnamed950___U26: undefined,
+  unnamed951___U27: undefined,
+  x___53635: undefined,
+  x0___53645: undefined,
+  y___53655: undefined,
+  y0___53665: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -63353,7 +63641,7 @@ function ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s) {
 
 
 
-function inline__P23753(s) {
+function inline__P53323(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63375,12 +63663,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P23753.info = {"start":13980,"length":39,"line":434,"column":44,"endLine":434,"endColumn":83,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
+inline__P53323.info = {"start":13980,"length":39,"line":434,"column":44,"endLine":434,"endColumn":83,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P23753_mk(s) {
+function inline__P53323_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P23753, depth: s.depth + 1,
+        parent: s, fn: inline__P53323, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63391,7 +63679,7 @@ function inline__P23753_mk(s) {
 
 
 
-function inline__P23938(s) {
+function inline__P53508(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63413,12 +63701,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P23938.info = {"start":17215,"length":39,"line":516,"column":44,"endLine":516,"endColumn":83,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
+inline__P53508.info = {"start":17215,"length":39,"line":516,"column":44,"endLine":516,"endColumn":83,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P23938_mk(s) {
+function inline__P53508_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P23938, depth: s.depth + 1,
+        parent: s, fn: inline__P53508, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63429,7 +63717,7 @@ function inline__P23938_mk(s) {
 
 
 
-function ArcadePhysicsEngine_tilemapOverlaps__P4224(s) {
+function ArcadePhysicsEngine_tilemapOverlaps__P33717(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63439,11 +63727,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.alreadyHandled___24134 = undefined;
-    s.tile___24137 = undefined;
-    s.unnamed112___U2 = undefined;
-    s.unnamed113___U3 = undefined;
-    s.tileOverlapHandlers___24158 = undefined;
+    s.alreadyHandled___53704 = undefined;
+    s.tile___53707 = undefined;
+    s.unnamed952___U2 = undefined;
+    s.unnamed953___U3 = undefined;
+    s.tileOverlapHandlers___53728 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -63451,27 +63739,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
-    s.alreadyHandled___24134 = (r0);
-    s.tile___24137 = (undefined);
-    s.unnamed112___U2 = (s.arg2);
-    s.unnamed113___U3 = (0);
+    s.alreadyHandled___53704 = (r0);
+    s.tile___53707 = (undefined);
+    s.unnamed952___U2 = (s.arg2);
+    s.unnamed953___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed113___U3;
-    r0 = pxsim_Array__length(s.unnamed112___U2);
+    s.tmp_0 = r0 = s.unnamed953___U3;
+    r0 = pxsim_Array__length(s.unnamed952___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed112___U2, s.unnamed113___U3);
-    s.tile___24137 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P24141);
+    r0 = pxsim_Array__getAt(s.unnamed952___U2, s.unnamed953___U3);
+    s.tile___53707 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P53711);
     s.tmp_2 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.tile___24137);
-    s.tmp_4 = helpers_arraySome__P105_mk(s);
-    s.tmp_4.arg0 = s.alreadyHandled___24134;
+    r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.tile___53707);
+    s.tmp_4 = helpers_arraySome__P29640_mk(s);
+    s.tmp_4.arg0 = s.alreadyHandled___53704;
     s.tmp_4.arg1 = s.tmp_2;
-    s.callLocIdx = 727; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 684; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -63480,64 +63768,64 @@ switch (step) {
     { step = 6; continue; }
   case 2:
   case 3:
-    r0 = pxsim_Array__push(s.alreadyHandled___24134, s.tile___24137);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 728; s.pc = 9; return s.tmp_0;
+    r0 = pxsim_Array__push(s.alreadyHandled___53704, s.tile___53707);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 685; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = r0.fields["tileOverlapHandlers"];
-    s.tileOverlapHandlers___24158 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tileOverlapHandlers___24158);
+    s.tileOverlapHandlers___53728 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tileOverlapHandlers___53728);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_pxtcore_mkAction(2, inline__P24166);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P53736);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tile___24137);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P24180);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tile___53707);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P53750);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_1, 1, s.tile___24137);
-    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_3.arg0 = s.tileOverlapHandlers___24158;
+    r0 = pxsim_pxtrt_stclo(s.tmp_1, 1, s.tile___53707);
+    s.tmp_2 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_3.arg0 = s.tileOverlapHandlers___53728;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 731; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 688; s.pc = 11; return s.tmp_3;
   case 11:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 733; s.pc = 10; return s.tmp_2;
+    s.callLocIdx = 690; s.pc = 10; return s.tmp_2;
   case 10:
     r0 = s.retval;
   case 4:
   case 5:
   case 6:
-    r0 = (s.unnamed113___U3 + 1);
-    s.unnamed113___U3 = (r0);
+    r0 = (s.unnamed953___U3 + 1);
+    s.unnamed953___U3 = (r0);
     { step = 1; continue; }
   case 7:
-    s.unnamed112___U2 = (undefined);
+    s.unnamed952___U2 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_tilemapOverlaps__P4224.info = {"start":20755,"length":699,"line":614,"column":4,"endLine":630,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapOverlaps","argumentNames":["this","sprite","overlappedTiles"]}
+ArcadePhysicsEngine_tilemapOverlaps__P33717.info = {"start":20755,"length":699,"line":614,"column":4,"endLine":630,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"tilemapOverlaps","argumentNames":["this","sprite","overlappedTiles"]}
 
-function ArcadePhysicsEngine_tilemapOverlaps__P4224_mk(s) {
+function ArcadePhysicsEngine_tilemapOverlaps__P33717_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_tilemapOverlaps__P4224, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_tilemapOverlaps__P33717, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  alreadyHandled___24134: undefined,
-  tile___24137: undefined,
-  unnamed112___U2: undefined,
-  unnamed113___U3: undefined,
-  tileOverlapHandlers___24158: undefined,
+  alreadyHandled___53704: undefined,
+  tile___53707: undefined,
+  unnamed952___U2: undefined,
+  unnamed953___U3: undefined,
+  tileOverlapHandlers___53728: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -63547,7 +63835,7 @@ function ArcadePhysicsEngine_tilemapOverlaps__P4224_mk(s) {
 
 
 
-function inline__P24141(s) {
+function inline__P53711(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63584,12 +63872,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24141.info = {"start":20968,"length":45,"line":618,"column":36,"endLine":618,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["l"]}
+inline__P53711.info = {"start":20968,"length":45,"line":618,"column":36,"endLine":618,"endColumn":81,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["l"]}
 
-function inline__P24141_mk(s) {
+function inline__P53711_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24141, depth: s.depth + 1,
+        parent: s, fn: inline__P53711, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63604,7 +63892,7 @@ function inline__P24141_mk(s) {
 
 
 
-function inline__P24166(s) {
+function inline__P53736(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63631,9 +63919,9 @@ switch (step) {
   case 1:
     r0 = s.arg0.fields["tileKind"];
     s.tmp_3 = r0;
-    s.tmp_5 = tiles_getTileImage__P2345_mk(s);
+    s.tmp_5 = tiles_getTileImage__P31764_mk(s);
     s.tmp_5.arg0 = s.caps[1];
-    s.callLocIdx = 730; s.pc = 3; return s.tmp_5;
+    s.callLocIdx = 687; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -63645,12 +63933,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24166.info = {"start":21282,"length":81,"line":626,"column":28,"endLine":626,"endColumn":109,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P53736.info = {"start":21282,"length":81,"line":626,"column":28,"endLine":626,"endColumn":109,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24166_mk(s) {
+function inline__P53736_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24166, depth: s.depth + 1,
+        parent: s, fn: inline__P53736, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63666,7 +63954,7 @@ function inline__P24166_mk(s) {
 
 
 
-function inline__P24180(s) {
+function inline__P53750(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63686,12 +63974,12 @@ switch (step) {
     s.tmp_0.arg2 = s.caps[1];
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 3);
-      s.callLocIdx = 732; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 689; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 3); s.callLocIdx = 732; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 732; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 732; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 3); s.callLocIdx = 689; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 689; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 689; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -63699,12 +63987,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24180.info = {"start":21394,"length":28,"line":627,"column":29,"endLine":627,"endColumn":57,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P53750.info = {"start":21394,"length":28,"line":627,"column":29,"endLine":627,"endColumn":57,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24180_mk(s) {
+function inline__P53750_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24180, depth: s.depth + 1,
+        parent: s, fn: inline__P53750, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -63714,7 +64002,7 @@ function inline__P24180_mk(s) {
 
 
 
-function tiles_getTileImage__P2345(s) {
+function tiles_getTileImage__P31764(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63724,16 +64012,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___24187 = undefined;
+    s.scene___53757 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 990; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 947; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___24187 = (r0);
+    s.scene___53757 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -63743,7 +64031,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___24187.fields["tileMap"];
+    r0 = s.scene___53757.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -63753,32 +64041,32 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim.image.ofBuffer(_hex24197);
+    r0 = pxsim.image.ofBuffer(_hex53767);
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = tiles_TileMap_getTileImage__P2339_mk(s);
-    r0 = s.scene___24187.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getTileImage__P31758_mk(s);
+    r0 = s.scene___53757.fields["tileMap"];
     s.tmp_5.arg0 = r0;
-    s.tmp_6 = tiles_Location_tileSet__P2295_mk(s);
+    s.tmp_6 = tiles_Location_tileSet__P31714_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 991; s.pc = 8; return s.tmp_6;
+    s.callLocIdx = 948; s.pc = 8; return s.tmp_6;
   case 8:
     r0 = s.retval;
     s.tmp_5.arg1 = r0;
-    s.callLocIdx = 992; s.pc = 7; return s.tmp_5;
+    s.callLocIdx = 949; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getTileImage__P2345.info = {"start":16636,"length":207,"line":525,"column":4,"endLine":529,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["loc"]}
+tiles_getTileImage__P31764.info = {"start":16636,"length":207,"line":525,"column":4,"endLine":529,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTileImage","argumentNames":["loc"]}
 
-function tiles_getTileImage__P2345_mk(s) {
+function tiles_getTileImage__P31764_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getTileImage__P2345, depth: s.depth + 1,
+        parent: s, fn: tiles_getTileImage__P31764, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63787,16 +64075,16 @@ function tiles_getTileImage__P2345_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  scene___24187: undefined,
+  scene___53757: undefined,
   arg0: undefined,
 } }
 
-const _hex24197 = pxsim.BufferMethods.createBufferFromHex("8704000000000000")
+const _hex53767 = pxsim.BufferMethods.createBufferFromHex("8704000000000000")
 
 
 
 
-function tiles_Location_tileSet__P2295(s) {
+function tiles_Location_tileSet__P31714(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63811,27 +64099,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMap_getTileIndex__P2330_mk(s);
+    if (!checkSubtype(r0, tiles_Location__C31708_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMap_getTileIndex__P31749_mk(s);
     r0 = s.arg0.fields["tileMap"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["_col"];
     s.tmp_0.arg1 = r0;
     r0 = s.arg0.fields["_row"];
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 881; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 838; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_tileSet__P2295.info = {"start":981,"length":101,"line":43,"column":8,"endLine":45,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"tileSet","argumentNames":["this"]}
-tiles_Location_tileSet__P2295.isGetter = true;
+tiles_Location_tileSet__P31714.info = {"start":981,"length":101,"line":43,"column":8,"endLine":45,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"tileSet","argumentNames":["this"]}
+tiles_Location_tileSet__P31714.isGetter = true;
 
-function tiles_Location_tileSet__P2295_mk(s) {
+function tiles_Location_tileSet__P31714_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_tileSet__P2295, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_tileSet__P31714, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -63841,7 +64129,7 @@ function tiles_Location_tileSet__P2295_mk(s) {
 
 
 
-function tiles_TileMap_getObstacle__P2337(s) {
+function tiles_TileMap_getObstacle__P31756(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63851,8 +64139,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___24307 = undefined;
-    s.tile___24319 = undefined;
+    s.index___53877 = undefined;
+    s.tile___53889 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -63860,13 +64148,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P31735_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 953; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 910; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -63875,31 +64163,31 @@ switch (step) {
     r0 = 0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = tiles_TileMapData_getTile__P2310_mk(s);
+    s.tmp_2 = tiles_TileMapData_getTile__P31729_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = s.arg2;
-    s.callLocIdx = 954; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 911; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
   case 2:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.index___24307 = (s.tmp_3);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P2313_mk(s);
+    s.index___53877 = (s.tmp_3);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P31732_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___24307;
-    s.callLocIdx = 955; s.pc = 5; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___53877;
+    s.callLocIdx = 912; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tile___24319 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_StaticObstacle__C2146_VT);
+    s.tile___53889 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_StaticObstacle__C31565_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = sprites_StaticObstacle_constructor__P2152_mk(s);
+    s.tmp_1 = sprites_StaticObstacle_constructor__P31571_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.tile___24319;
+    s.tmp_1.arg1 = s.tile___53889;
     s.tmp_2 = r0 = s.arg2;
     r0 = s.arg0.fields["_scale"];
     s.tmp_3 = r0;
@@ -63912,20 +64200,20 @@ switch (step) {
     s.tmp_1.arg3 = r0;
     r0 = s.arg0.fields["_layer"];
     s.tmp_1.arg4 = r0;
-    s.tmp_1.arg5 = s.index___24307;
-    s.callLocIdx = 959; s.pc = 6; return s.tmp_1;
+    s.tmp_1.arg5 = s.index___53877;
+    s.callLocIdx = 916; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getObstacle__P2337.info = {"start":12642,"length":410,"line":411,"column":8,"endLine":421,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getObstacle","argumentNames":["this","col","row"]}
+tiles_TileMap_getObstacle__P31756.info = {"start":12642,"length":410,"line":411,"column":8,"endLine":421,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getObstacle","argumentNames":["this","col","row"]}
 
-function tiles_TileMap_getObstacle__P2337_mk(s) {
+function tiles_TileMap_getObstacle__P31756_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getObstacle__P2337, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getObstacle__P31756, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63933,8 +64221,8 @@ function tiles_TileMap_getObstacle__P2337_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  index___24307: undefined,
-  tile___24319: undefined,
+  index___53877: undefined,
+  tile___53889: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -63944,7 +64232,7 @@ function tiles_TileMap_getObstacle__P2337_mk(s) {
 
 
 
-function tiles_TileMap_layer__P2325(s) {
+function tiles_TileMap_layer__P31744(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63959,18 +64247,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C31736_VT)) failedCast(r0);
     r0 = s.arg0.fields["_layer"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_layer__P2325.info = {"start":6897,"length":63,"line":251,"column":8,"endLine":253,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"layer","argumentNames":["this"]}
-tiles_TileMap_layer__P2325.isGetter = true;
+tiles_TileMap_layer__P31744.info = {"start":6897,"length":63,"line":251,"column":8,"endLine":253,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"layer","argumentNames":["this"]}
+tiles_TileMap_layer__P31744.isGetter = true;
 
-function tiles_TileMap_layer__P2325_mk(s) {
+function tiles_TileMap_layer__P31744_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_layer__P2325, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_layer__P31744, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -63979,7 +64267,7 @@ function tiles_TileMap_layer__P2325_mk(s) {
 
 
 
-function sprites_StaticObstacle_constructor__P2152(s) {
+function sprites_StaticObstacle_constructor__P31571(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63999,7 +64287,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C31565_VT)) failedCast(r0);
     r0 = (s.arg0).fields["image"] = (s.arg1);
     r0 = (s.arg0).fields["layer"] = (s.arg4);
     r0 = (s.arg0).fields["top"] = (s.arg2);
@@ -64009,12 +64297,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_constructor__P2152.info = {"start":563,"length":261,"line":28,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"inline","argumentNames":["this","image","top","left","layer","tileIndex"]}
+sprites_StaticObstacle_constructor__P31571.info = {"start":563,"length":261,"line":28,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game---hw/obstacle.ts","functionName":"inline","argumentNames":["this","image","top","left","layer","tileIndex"]}
 
-function sprites_StaticObstacle_constructor__P2152_mk(s) {
+function sprites_StaticObstacle_constructor__P31571_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_constructor__P2152, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_constructor__P31571, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -64028,7 +64316,7 @@ function sprites_StaticObstacle_constructor__P2152_mk(s) {
 
 
 
-function Sprite_registerObstacle__P2085(s) {
+function Sprite_registerObstacle__P31504(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64038,10 +64326,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.collisionHandlers___24220 = undefined;
-    s.wallCollisionHandlers___24227 = undefined;
-    s.wallHandlersToRun___24252 = undefined;
-    s.asTileLocation___24265 = undefined;
+    s.collisionHandlers___53790 = undefined;
+    s.wallCollisionHandlers___53797 = undefined;
+    s.wallHandlersToRun___53822 = undefined;
+    s.asTileLocation___53835 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -64050,12 +64338,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["_obstacles"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_0, s.arg1, s.arg2);
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 413; s.pc = 9; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 370; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     r0 = r0.fields["collisionHandlers"];
@@ -64068,42 +64356,42 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["tileIndex"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["tileIndex"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 414; s.pc = 10; return s.tmp_3; }
+     else { s.callLocIdx = 371; s.pc = 10; return s.tmp_3; }
     }
   case 10:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_2);
-    s.collisionHandlers___24220 = (r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 415; s.pc = 11; return s.tmp_0;
+    s.collisionHandlers___53790 = (r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 372; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = r0.fields["wallCollisionHandlers"];
-    s.wallCollisionHandlers___24227 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.collisionHandlers___24220);
+    s.wallCollisionHandlers___53797 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.collisionHandlers___53790);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P24235);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P53805);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P24241);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P53811);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_3.arg0 = s.collisionHandlers___24220;
+    s.tmp_2 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_3.arg0 = s.collisionHandlers___53790;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 417; s.pc = 13; return s.tmp_3;
+    s.callLocIdx = 374; s.pc = 13; return s.tmp_3;
   case 13:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 419; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 376; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_numops_toBoolDecr(s.wallCollisionHandlers___24227);
+    r0 = pxsim_numops_toBoolDecr(s.wallCollisionHandlers___53797);
     if (!r0) { step = 7; continue; }
     s.tmp_0 = r0 = s.arg3;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -64111,8 +64399,8 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    s.tmp_1 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 420; s.pc = 14; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 377; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
@@ -64120,21 +64408,21 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.arg3 = (s.tmp_2);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P24254);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P53824);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_1.arg0 = s.wallCollisionHandlers___24227;
+    s.tmp_1 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_1.arg0 = s.wallCollisionHandlers___53797;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 422; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 379; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
-    s.wallHandlersToRun___24252 = (r0);
-    r0 = pxsim_Array__length(s.wallHandlersToRun___24252);
+    s.wallHandlersToRun___53822 = (r0);
+    r0 = pxsim_Array__length(s.wallHandlersToRun___53822);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = tiles_TileMap_getTile__P2329_mk(s);
+    s.tmp_1 = tiles_TileMap_getTile__P31748_mk(s);
     s.tmp_1.arg0 = s.arg3;
     s.tmp_3 = if_left_1_mk(s);
     s.tmp_3.arg0 = s.arg2;
@@ -64144,7 +64432,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["left"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["left"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 423; s.pc = 17; return s.tmp_3; }
+     else { s.callLocIdx = 380; s.pc = 17; return s.tmp_3; }
     }
   case 17:
     r0 = s.retval;
@@ -64161,7 +64449,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["top"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["top"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 425; s.pc = 18; return s.tmp_6; }
+     else { s.callLocIdx = 382; s.pc = 18; return s.tmp_6; }
     }
   case 18:
     r0 = s.retval;
@@ -64170,18 +64458,18 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = (s.tmp_5 >> s.tmp_7);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 427; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 384; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    s.asTileLocation___24265 = (r0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P24281);
+    s.asTileLocation___53835 = (r0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P53851);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.asTileLocation___24265);
-    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_1.arg0 = s.wallHandlersToRun___24252;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.asTileLocation___53835);
+    s.tmp_1 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_1.arg0 = s.wallHandlersToRun___53822;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 429; s.pc = 19; return s.tmp_1;
+    s.callLocIdx = 386; s.pc = 19; return s.tmp_1;
   case 19:
     r0 = s.retval;
   case 5:
@@ -64192,12 +64480,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_registerObstacle__P2085.info = {"start":26932,"length":965,"line":817,"column":4,"endLine":837,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"registerObstacle","argumentNames":["this","direction","other","tm"]}
+Sprite_registerObstacle__P31504.info = {"start":26932,"length":965,"line":817,"column":4,"endLine":837,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"registerObstacle","argumentNames":["this","direction","other","tm"]}
 
-function Sprite_registerObstacle__P2085_mk(s) {
+function Sprite_registerObstacle__P31504_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_registerObstacle__P2085, depth: s.depth + 1,
+        parent: s, fn: Sprite_registerObstacle__P31504, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64207,10 +64495,10 @@ function Sprite_registerObstacle__P2085_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  collisionHandlers___24220: undefined,
-  wallCollisionHandlers___24227: undefined,
-  wallHandlersToRun___24252: undefined,
-  asTileLocation___24265: undefined,
+  collisionHandlers___53790: undefined,
+  wallCollisionHandlers___53797: undefined,
+  wallHandlersToRun___53822: undefined,
+  asTileLocation___53835: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -64221,7 +64509,7 @@ function Sprite_registerObstacle__P2085_mk(s) {
 
 
 
-function inline__P24235(s) {
+function inline__P53805(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64243,12 +64531,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24235.info = {"start":27330,"length":26,"line":824,"column":24,"endLine":824,"endColumn":50,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P53805.info = {"start":27330,"length":26,"line":824,"column":24,"endLine":824,"endColumn":50,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24235_mk(s) {
+function inline__P53805_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24235, depth: s.depth + 1,
+        parent: s, fn: inline__P53805, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64259,7 +64547,7 @@ function inline__P24235_mk(s) {
 
 
 
-function inline__P24241(s) {
+function inline__P53811(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64278,12 +64566,12 @@ switch (step) {
     s.tmp_0.arg1 = s.caps[0];
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 2);
-      s.callLocIdx = 418; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 375; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 2); s.callLocIdx = 418; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 418; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 418; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 2); s.callLocIdx = 375; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 375; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 375; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -64291,12 +64579,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24241.info = {"start":27383,"length":20,"line":825,"column":25,"endLine":825,"endColumn":45,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P53811.info = {"start":27383,"length":20,"line":825,"column":25,"endLine":825,"endColumn":45,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24241_mk(s) {
+function inline__P53811_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24241, depth: s.depth + 1,
+        parent: s, fn: inline__P53811, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64306,7 +64594,7 @@ function inline__P24241_mk(s) {
 
 
 
-function inline__P24254(s) {
+function inline__P53824(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64328,12 +64616,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24254.info = {"start":27589,"length":32,"line":830,"column":24,"endLine":830,"endColumn":56,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P53824.info = {"start":27589,"length":32,"line":830,"column":24,"endLine":830,"endColumn":56,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24254_mk(s) {
+function inline__P53824_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24254, depth: s.depth + 1,
+        parent: s, fn: inline__P53824, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64344,7 +64632,7 @@ function inline__P24254_mk(s) {
 
 
 
-function inline__P24281(s) {
+function inline__P53851(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64364,12 +64652,12 @@ switch (step) {
     s.tmp_0.arg2 = s.caps[1];
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 3);
-      s.callLocIdx = 428; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 385; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 3); s.callLocIdx = 428; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 428; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 428; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 3); s.callLocIdx = 385; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 385; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 385; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -64377,12 +64665,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24281.info = {"start":27829,"length":36,"line":834,"column":29,"endLine":834,"endColumn":65,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P53851.info = {"start":27829,"length":36,"line":834,"column":29,"endLine":834,"endColumn":65,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24281_mk(s) {
+function inline__P53851_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24281, depth: s.depth + 1,
+        parent: s, fn: inline__P53851, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64392,7 +64680,7 @@ function inline__P24281_mk(s) {
 
 
 
-function Fx_min__P161(s) {
+function Fx_min__P29696(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64423,12 +64711,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_min__P161.info = {"start":1675,"length":117,"line":50,"column":4,"endLine":55,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"min","argumentNames":["a","b"]}
+Fx_min__P29696.info = {"start":1675,"length":117,"line":50,"column":4,"endLine":55,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"min","argumentNames":["a","b"]}
 
-function Fx_min__P161_mk(s) {
+function Fx_min__P29696_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_min__P161, depth: s.depth + 1,
+        parent: s, fn: Fx_min__P29696, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64439,7 +64727,7 @@ function Fx_min__P161_mk(s) {
 
 
 
-function Fx_iadd__P153(s) {
+function Fx_iadd__P29688(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64460,12 +64748,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_iadd__P153.info = {"start":634,"length":110,"line":23,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"iadd","argumentNames":["a","b"]}
+Fx_iadd__P29688.info = {"start":634,"length":110,"line":23,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"iadd","argumentNames":["a","b"]}
 
-function Fx_iadd__P153_mk(s) {
+function Fx_iadd__P29688_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_iadd__P153, depth: s.depth + 1,
+        parent: s, fn: Fx_iadd__P29688, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64476,7 +64764,7 @@ function Fx_iadd__P153_mk(s) {
 
 
 
-function helpers_arraySome__P105(s) {
+function helpers_arraySome__P29640(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64486,26 +64774,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___24289 = undefined;
-    s.i___24292 = undefined;
+    s.len___53859 = undefined;
+    s.i___53862 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__length(s.arg0);
-    s.len___24289 = (r0);
-    s.i___24292 = (0);
+    s.len___53859 = (r0);
+    s.i___53862 = (0);
   case 1:
-    r0 = (s.i___24292 < s.len___24289);
+    r0 = (s.i___53862 < s.len___53859);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
     s.tmp_2 = lambda_3_mk(s);
     s.tmp_2.argL = s.arg1;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___24292);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___53862);
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = s.i___24292;
+    s.tmp_2.arg1 = s.i___53862;
     setupLambda(s.tmp_2, s.tmp_2.argL);
     s.callLocIdx = 5; s.pc = 6; return s.tmp_2;
   case 6:
@@ -64517,8 +64805,8 @@ switch (step) {
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___24292 + 1);
-    s.i___24292 = (r0);
+    r0 = (s.i___53862 + 1);
+    s.i___53862 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = false;
@@ -64526,18 +64814,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySome__P105.info = {"start":6833,"length":296,"line":238,"column":4,"endLine":244,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySome","argumentNames":["arr","callbackfn"]}
+helpers_arraySome__P29640.info = {"start":6833,"length":296,"line":238,"column":4,"endLine":244,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySome","argumentNames":["arr","callbackfn"]}
 
-function helpers_arraySome__P105_mk(s) {
+function helpers_arraySome__P29640_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySome__P105, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySome__P29640, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___24289: undefined,
-  i___24292: undefined,
+  len___53859: undefined,
+  i___53862: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -64546,7 +64834,7 @@ function helpers_arraySome__P105_mk(s) {
 
 
 
-function MovingSprite_constructor__P2172(s) {
+function MovingSprite_constructor__P31591(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64568,7 +64856,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, MovingSprite__C2171_VT)) failedCast(r0);
+    if (!checkSubtype(r0, MovingSprite__C31590_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sprite"] = (s.arg1);
     r0 = (s.arg0).fields["cachedVx"] = (s.arg2);
     r0 = (s.arg0).fields["cachedVy"] = (s.arg3);
@@ -64580,12 +64868,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-MovingSprite_constructor__P2172.info = {"start":678,"length":313,"line":30,"column":4,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","sprite","cachedVx","cachedVy","dx","dy","xStep","yStep"]}
+MovingSprite_constructor__P31591.info = {"start":678,"length":313,"line":30,"column":4,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["this","sprite","cachedVx","cachedVy","dx","dy","xStep","yStep"]}
 
-function MovingSprite_constructor__P2172_mk(s) {
+function MovingSprite_constructor__P31591_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: MovingSprite_constructor__P2172, depth: s.depth + 1,
+        parent: s, fn: MovingSprite_constructor__P31591, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -64601,7 +64889,7 @@ function MovingSprite_constructor__P2172_mk(s) {
 
 
 
-function ArcadePhysicsEngine_move__P2185(s) {
+function ArcadePhysicsEngine_move__P31604(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64611,84 +64899,84 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dtf___24378 = undefined;
-    s.dt2___24385 = undefined;
-    s.scene___24389 = undefined;
-    s.tileMap___24392 = undefined;
-    s.movingSprites___24395 = undefined;
-    s.MAX_STEP_COUNT___24426 = undefined;
-    s.overlapHandlers___24438 = undefined;
-    s.selected___24445 = undefined;
-    s.buffers___24446 = undefined;
-    s.count___24450 = undefined;
-    s.currMovers___24460 = undefined;
-    s.remainingMovers___24467 = undefined;
-    s.ms___24472 = undefined;
-    s.unnamed102___U13 = undefined;
-    s.unnamed103___U14 = undefined;
-    s.s___24474 = undefined;
-    s.stepX___24567 = undefined;
-    s.stepY___24581 = undefined;
+    s.dtf___53948 = undefined;
+    s.dt2___53955 = undefined;
+    s.scene___53959 = undefined;
+    s.tileMap___53962 = undefined;
+    s.movingSprites___53965 = undefined;
+    s.MAX_STEP_COUNT___53996 = undefined;
+    s.overlapHandlers___54008 = undefined;
+    s.selected___54015 = undefined;
+    s.buffers___54016 = undefined;
+    s.count___54020 = undefined;
+    s.currMovers___54030 = undefined;
+    s.remainingMovers___54037 = undefined;
+    s.ms___54042 = undefined;
+    s.unnamed942___U13 = undefined;
+    s.unnamed943___U14 = undefined;
+    s.s___54044 = undefined;
+    s.stepX___54137 = undefined;
+    s.stepY___54151 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
-    s.tmp_0 = Fx_min__P161_mk(s);
-    s.tmp_0.arg0 = globals.MAX_TIME_STEP___2168;
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
+    s.tmp_0 = Fx_min__P29696_mk(s);
+    s.tmp_0.arg0 = globals.MAX_TIME_STEP___31587;
     r0 = (s.arg1 * 1000);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 256);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 552; s.pc = 47; return s.tmp_0;
+    s.callLocIdx = 509; s.pc = 47; return s.tmp_0;
   case 47:
     r0 = s.retval;
-    s.dtf___24378 = (r0);
-    r0 = pxsim.Math_.idiv(s.dtf___24378, 2);
-    s.dt2___24385 = (r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 554; s.pc = 48; return s.tmp_0;
+    s.dtf___53948 = (r0);
+    r0 = pxsim.Math_.idiv(s.dtf___53948, 2);
+    s.dt2___53955 = (r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 511; s.pc = 48; return s.tmp_0;
   case 48:
     r0 = s.retval;
-    s.scene___24389 = (r0);
-    r0 = s.scene___24389.fields["tileMap"];
-    s.tileMap___24392 = (r0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P24397);
+    s.scene___53959 = (r0);
+    r0 = s.scene___53959.fields["tileMap"];
+    s.tileMap___53962 = (r0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P53967);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.dtf___24378);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.dt2___24385);
-    s.tmp_1 = helpers_arrayMap__P104_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.dtf___53948);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.dt2___53955);
+    s.tmp_1 = helpers_arrayMap__P29639_mk(s);
     r0 = s.arg0.fields["sprites"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 556; s.pc = 49; return s.tmp_1;
+    s.callLocIdx = 513; s.pc = 49; return s.tmp_1;
   case 49:
     r0 = s.retval;
-    s.movingSprites___24395 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.movingSprites___53965 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P29642_mk(s);
     r0 = s.arg0.fields["sprites"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P24409;
-    s.callLocIdx = 560; s.pc = 50; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P53979;
+    s.callLocIdx = 517; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_clear__P2100_mk(s);
+    s.tmp_0 = sprites_SpriteMap_clear__P31519_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 561; s.pc = 51; return s.tmp_0;
+    s.callLocIdx = 518; s.pc = 51; return s.tmp_0;
   case 51:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_resizeBuckets__P2099_mk(s);
+    s.tmp_0 = sprites_SpriteMap_resizeBuckets__P31518_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["sprites"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 562; s.pc = 52; return s.tmp_0;
+    s.callLocIdx = 519; s.pc = 52; return s.tmp_0;
   case 52:
     r0 = s.retval;
     r0 = s.arg0.fields["maxVelocity"];
@@ -64699,7 +64987,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_5, s.tmp_4);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.dtf___24378);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.dtf___53948);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 >> 8);
     s.tmp_1 = r0;
@@ -64708,34 +64996,34 @@ switch (step) {
     r0 = (s.tmp_0 + 128);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 >> 8);
-    s.MAX_STEP_COUNT___24426 = (r0);
-    s.tmp_0 = helpers_arraySlice__P112_mk(s);
-    r0 = s.scene___24389.fields["overlapHandlers"];
+    s.MAX_STEP_COUNT___53996 = (r0);
+    s.tmp_0 = helpers_arraySlice__P29647_mk(s);
+    r0 = s.scene___53959.fields["overlapHandlers"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 567; s.pc = 53; return s.tmp_0;
+    s.callLocIdx = 524; s.pc = 53; return s.tmp_0;
   case 53:
     r0 = s.retval;
-    s.overlapHandlers___24438 = (r0);
-    s.selected___24445 = (0);
+    s.overlapHandlers___54008 = (r0);
+    s.selected___54015 = (0);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.movingSprites___24395);
+    r0 = pxsim_Array__push(s.tmp_0, s.movingSprites___53965);
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.buffers___24446 = (s.tmp_0);
-    s.count___24450 = (0);
+    s.buffers___54016 = (s.tmp_0);
+    s.count___54020 = (0);
   case 1:
-    r0 = (s.count___24450 < s.MAX_STEP_COUNT___24426);
+    r0 = (s.count___54020 < s.MAX_STEP_COUNT___53996);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 2; continue; }
     r0 = s.tmp_0;
     { step = 3; continue; }
   case 2:
-    r0 = pxsim_Array__getAt(s.buffers___24446, s.selected___24445);
+    r0 = pxsim_Array__getAt(s.buffers___54016, s.selected___54015);
     s.tmp_2 = r0;
     r0 = pxsim_Array__length(s.tmp_2);
     s.tmp_1 = r0;
@@ -64745,43 +65033,43 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 46; continue; }
-    r0 = pxsim_Array__getAt(s.buffers___24446, s.selected___24445);
-    s.currMovers___24460 = (r0);
-    r0 = (s.selected___24445 ^ 1);
-    s.selected___24445 = (r0);
-    r0 = pxsim_Array__getAt(s.buffers___24446, s.selected___24445);
-    s.remainingMovers___24467 = (r0);
-    s.ms___24472 = (undefined);
-    s.unnamed102___U13 = (s.currMovers___24460);
-    s.unnamed103___U14 = (0);
+    r0 = pxsim_Array__getAt(s.buffers___54016, s.selected___54015);
+    s.currMovers___54030 = (r0);
+    r0 = (s.selected___54015 ^ 1);
+    s.selected___54015 = (r0);
+    r0 = pxsim_Array__getAt(s.buffers___54016, s.selected___54015);
+    s.remainingMovers___54037 = (r0);
+    s.ms___54042 = (undefined);
+    s.unnamed942___U13 = (s.currMovers___54030);
+    s.unnamed943___U14 = (0);
   case 4:
-    s.tmp_0 = r0 = s.unnamed103___U14;
-    r0 = pxsim_Array__length(s.unnamed102___U13);
+    s.tmp_0 = r0 = s.unnamed943___U14;
+    r0 = pxsim_Array__length(s.unnamed942___U13);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 43; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed102___U13, s.unnamed103___U14);
-    s.ms___24472 = (r0);
-    r0 = s.ms___24472.fields["sprite"];
-    s.s___24474 = (r0);
-    r0 = s.ms___24472.fields["cachedVx"];
+    r0 = pxsim_Array__getAt(s.unnamed942___U13, s.unnamed943___U14);
+    s.ms___54042 = (r0);
+    r0 = s.ms___54042.fields["sprite"];
+    s.s___54044 = (r0);
+    r0 = s.ms___54042.fields["cachedVx"];
     s.tmp_1 = r0;
-    r0 = s.s___24474.fields["_vx"];
+    r0 = s.s___54044.fields["_vx"];
     s.tmp_2 = r0;
     r0 = (s.tmp_1 !== s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = s.s___24474.fields["_vx"];
+    r0 = s.s___54044.fields["_vx"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 == 0);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 5; continue; }
-    r0 = (s.ms___24472).fields["dx"] = (0);
+    r0 = (s.ms___54042).fields["dx"] = (0);
     { step = 14; continue; }
   case 5:
-    r0 = s.s___24474.fields["_vx"];
+    r0 = s.s___54044.fields["_vx"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -64790,7 +65078,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 6:
-    r0 = s.ms___24472.fields["cachedVx"];
+    r0 = s.ms___54042.fields["cachedVx"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
   case 7:
@@ -64801,7 +65089,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 11; continue; }
   case 8:
-    r0 = s.s___24474.fields["_vx"];
+    r0 = s.s___54044.fields["_vx"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > 0);
     s.tmp_4 = r0;
@@ -64810,7 +65098,7 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 10; continue; }
   case 9:
-    r0 = s.ms___24472.fields["cachedVx"];
+    r0 = s.ms___54042.fields["cachedVx"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 < 0);
   case 10:
@@ -64822,14 +65110,14 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 12; continue; }
-    s.tmp_9 = r0 = s.ms___24472;
-    r0 = s.ms___24472.fields["dx"];
+    s.tmp_9 = r0 = s.ms___54042;
+    r0 = s.ms___54042.fields["dx"];
     s.tmp_11 = r0;
     r0 = (0 - s.tmp_11);
     s.tmp_10 = r0;
     r0 = (s.tmp_9).fields["dx"] = (s.tmp_10);
-    s.tmp_0 = r0 = s.ms___24472;
-    r0 = s.ms___24472.fields["xStep"];
+    s.tmp_0 = r0 = s.ms___54042;
+    r0 = s.ms___54042.fields["xStep"];
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
@@ -64837,29 +65125,29 @@ switch (step) {
   case 12:
   case 13:
   case 14:
-    r0 = s.s___24474.fields["_vx"];
+    r0 = s.s___54044.fields["_vx"];
     s.tmp_0 = r0;
-    r0 = (s.ms___24472).fields["cachedVx"] = (s.tmp_0);
+    r0 = (s.ms___54042).fields["cachedVx"] = (s.tmp_0);
   case 15:
   case 16:
-    r0 = s.ms___24472.fields["cachedVy"];
+    r0 = s.ms___54042.fields["cachedVy"];
     s.tmp_1 = r0;
-    r0 = s.s___24474.fields["_vy"];
+    r0 = s.s___54044.fields["_vy"];
     s.tmp_2 = r0;
     r0 = (s.tmp_1 !== s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 27; continue; }
-    r0 = s.s___24474.fields["_vy"];
+    r0 = s.s___54044.fields["_vy"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 == 0);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 17; continue; }
-    r0 = (s.ms___24472).fields["dy"] = (0);
+    r0 = (s.ms___54042).fields["dy"] = (0);
     { step = 26; continue; }
   case 17:
-    r0 = s.s___24474.fields["_vy"];
+    r0 = s.s___54044.fields["_vy"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -64868,7 +65156,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    r0 = s.ms___24472.fields["cachedVy"];
+    r0 = s.ms___54042.fields["cachedVy"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
   case 19:
@@ -64879,7 +65167,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 23; continue; }
   case 20:
-    r0 = s.s___24474.fields["_vy"];
+    r0 = s.s___54044.fields["_vy"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > 0);
     s.tmp_4 = r0;
@@ -64888,7 +65176,7 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 22; continue; }
   case 21:
-    r0 = s.ms___24472.fields["cachedVy"];
+    r0 = s.ms___54042.fields["cachedVy"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 < 0);
   case 22:
@@ -64900,14 +65188,14 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 24; continue; }
-    s.tmp_9 = r0 = s.ms___24472;
-    r0 = s.ms___24472.fields["dy"];
+    s.tmp_9 = r0 = s.ms___54042;
+    r0 = s.ms___54042.fields["dy"];
     s.tmp_11 = r0;
     r0 = (0 - s.tmp_11);
     s.tmp_10 = r0;
     r0 = (s.tmp_9).fields["dy"] = (s.tmp_10);
-    s.tmp_0 = r0 = s.ms___24472;
-    r0 = s.ms___24472.fields["yStep"];
+    s.tmp_0 = r0 = s.ms___54042;
+    r0 = s.ms___54042.fields["yStep"];
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
@@ -64915,22 +65203,22 @@ switch (step) {
   case 24:
   case 25:
   case 26:
-    r0 = s.s___24474.fields["_vy"];
+    r0 = s.s___54044.fields["_vy"];
     s.tmp_0 = r0;
-    r0 = (s.ms___24472).fields["cachedVy"] = (s.tmp_0);
+    r0 = (s.ms___54042).fields["cachedVy"] = (s.tmp_0);
   case 27:
   case 28:
-    s.tmp_2 = Fx_abs__P160_mk(s);
-    r0 = s.ms___24472.fields["xStep"];
+    s.tmp_2 = Fx_abs__P29695_mk(s);
+    r0 = s.ms___54042.fields["xStep"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 572; s.pc = 54; return s.tmp_2;
+    s.callLocIdx = 529; s.pc = 54; return s.tmp_2;
   case 54:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Fx_abs__P160_mk(s);
-    r0 = s.ms___24472.fields["dx"];
+    s.tmp_4 = Fx_abs__P29695_mk(s);
+    r0 = s.ms___54042.fields["dx"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 573; s.pc = 55; return s.tmp_4;
+    s.callLocIdx = 530; s.pc = 55; return s.tmp_4;
   case 55:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -64938,25 +65226,25 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 29; continue; }
-    r0 = s.ms___24472.fields["dx"];
+    r0 = s.ms___54042.fields["dx"];
     { step = 30; continue; }
   case 29:
-    r0 = s.ms___24472.fields["xStep"];
+    r0 = s.ms___54042.fields["xStep"];
   case 30:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.stepX___24567 = (s.tmp_5);
-    s.tmp_2 = Fx_abs__P160_mk(s);
-    r0 = s.ms___24472.fields["yStep"];
+    s.stepX___54137 = (s.tmp_5);
+    s.tmp_2 = Fx_abs__P29695_mk(s);
+    r0 = s.ms___54042.fields["yStep"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 574; s.pc = 56; return s.tmp_2;
+    s.callLocIdx = 531; s.pc = 56; return s.tmp_2;
   case 56:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Fx_abs__P160_mk(s);
-    r0 = s.ms___24472.fields["dy"];
+    s.tmp_4 = Fx_abs__P29695_mk(s);
+    r0 = s.ms___54042.fields["dy"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 575; s.pc = 57; return s.tmp_4;
+    s.callLocIdx = 532; s.pc = 57; return s.tmp_4;
   case 57:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -64964,45 +65252,45 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 31; continue; }
-    r0 = s.ms___24472.fields["dy"];
+    r0 = s.ms___54042.fields["dy"];
     { step = 32; continue; }
   case 31:
-    r0 = s.ms___24472.fields["yStep"];
+    r0 = s.ms___54042.fields["yStep"];
   case 32:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.stepY___24581 = (s.tmp_5);
-    s.tmp_0 = r0 = s.ms___24472;
-    r0 = s.ms___24472.fields["dx"];
+    s.stepY___54151 = (s.tmp_5);
+    s.tmp_0 = r0 = s.ms___54042;
+    r0 = s.ms___54042.fields["dx"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.stepX___24567);
+    r0 = (s.tmp_2 - s.stepX___54137);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["dx"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.ms___24472;
-    r0 = s.ms___24472.fields["dy"];
+    s.tmp_0 = r0 = s.ms___54042;
+    r0 = s.ms___54042.fields["dy"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.stepY___24581);
+    r0 = (s.tmp_2 - s.stepY___54151);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["dy"] = (s.tmp_1);
-    r0 = s.s___24474.fields["_x"];
+    r0 = s.s___54044.fields["_x"];
     s.tmp_0 = r0;
-    r0 = (s.s___24474).fields["_lastX"] = (s.tmp_0);
-    r0 = s.s___24474.fields["_y"];
+    r0 = (s.s___54044).fields["_lastX"] = (s.tmp_0);
+    r0 = s.s___54044.fields["_y"];
     s.tmp_0 = r0;
-    r0 = (s.s___24474).fields["_lastY"] = (s.tmp_0);
-    s.tmp_0 = r0 = s.s___24474;
-    r0 = s.s___24474.fields["_x"];
+    r0 = (s.s___54044).fields["_lastY"] = (s.tmp_0);
+    s.tmp_0 = r0 = s.s___54044;
+    r0 = s.s___54044.fields["_x"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.stepX___24567);
+    r0 = (s.tmp_2 + s.stepX___54137);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_x"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.s___24474;
-    r0 = s.s___24474.fields["_y"];
+    s.tmp_0 = r0 = s.s___54044;
+    r0 = s.s___54044.fields["_y"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.stepY___24581);
+    r0 = (s.tmp_2 + s.stepY___54151);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    r0 = s.s___24474.fields["flags"];
+    r0 = s.s___54044.fields["flags"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 515);
     s.tmp_2 = r0;
@@ -65012,20 +65300,20 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 37; continue; }
-    s.tmp_4 = sprites_SpriteMap_insertAABB__P2101_mk(s);
+    s.tmp_4 = sprites_SpriteMap_insertAABB__P31520_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.s___24474;
-    s.callLocIdx = 580; s.pc = 58; return s.tmp_4;
+    s.tmp_4.arg1 = s.s___54044;
+    s.callLocIdx = 537; s.pc = 58; return s.tmp_4;
   case 58:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tileMap___24392;
+    s.tmp_0 = r0 = s.tileMap___53962;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 33; continue; }
     r0 = s.tmp_0;
     { step = 34; continue; }
   case 33:
-    r0 = s.tileMap___24392.fields["_map"];
+    r0 = s.tileMap___53962.fields["_map"];
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -65039,81 +65327,81 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 35; continue; }
-    s.tmp_6 = ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s);
+    s.tmp_6 = ArcadePhysicsEngine_tilemapCollisions__P33716_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.tmp_6.arg1 = s.ms___24472;
-    s.tmp_6.arg2 = s.tileMap___24392;
-    s.callLocIdx = 582; s.pc = 59; return s.tmp_6;
+    s.tmp_6.arg1 = s.ms___54042;
+    s.tmp_6.arg2 = s.tileMap___53962;
+    s.callLocIdx = 539; s.pc = 59; return s.tmp_6;
   case 59:
     r0 = s.retval;
   case 35:
   case 36:
   case 37:
   case 38:
-    s.tmp_2 = Fx_abs__P160_mk(s);
-    r0 = s.ms___24472.fields["dx"];
+    s.tmp_2 = Fx_abs__P29695_mk(s);
+    r0 = s.ms___54042.fields["dx"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 583; s.pc = 60; return s.tmp_2;
+    s.callLocIdx = 540; s.pc = 60; return s.tmp_2;
   case 60:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > globals.MIN_MOVE_GAP___2170);
+    r0 = (s.tmp_1 > globals.MIN_MOVE_GAP___31589);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 39; continue; }
     r0 = s.tmp_0;
     { step = 40; continue; }
   case 39:
-    s.tmp_4 = Fx_abs__P160_mk(s);
-    r0 = s.ms___24472.fields["dy"];
+    s.tmp_4 = Fx_abs__P29695_mk(s);
+    r0 = s.ms___54042.fields["dy"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 584; s.pc = 61; return s.tmp_4;
+    s.callLocIdx = 541; s.pc = 61; return s.tmp_4;
   case 61:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 > globals.MIN_MOVE_GAP___2170);
+    r0 = (s.tmp_3 > globals.MIN_MOVE_GAP___31589);
   case 40:
     // jmp value (already in r0)
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 41; continue; }
-    r0 = pxsim_Array__push(s.remainingMovers___24467, s.ms___24472);
+    r0 = pxsim_Array__push(s.remainingMovers___54037, s.ms___54042);
   case 41:
   case 42:
-    r0 = (s.unnamed103___U14 + 1);
-    s.unnamed103___U14 = (r0);
+    r0 = (s.unnamed943___U14 + 1);
+    s.unnamed943___U14 = (r0);
     { step = 4; continue; }
   case 43:
-    s.unnamed102___U13 = (undefined);
-    s.tmp_0 = ArcadePhysicsEngine_spriteCollisions__P4222_mk(s);
+    s.unnamed942___U13 = (undefined);
+    s.tmp_0 = ArcadePhysicsEngine_spriteCollisions__P33715_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.currMovers___24460;
-    s.tmp_0.arg2 = s.overlapHandlers___24438;
-    s.callLocIdx = 585; s.pc = 62; return s.tmp_0;
+    s.tmp_0.arg1 = s.currMovers___54030;
+    s.tmp_0.arg2 = s.overlapHandlers___54008;
+    s.callLocIdx = 542; s.pc = 62; return s.tmp_0;
   case 62:
     r0 = s.retval;
   case 44:
-    r0 = pxsim_Array__length(s.currMovers___24460);
+    r0 = pxsim_Array__length(s.currMovers___54030);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 45; continue; }
-    r0 = pxsim_Array_.pop(s.currMovers___24460);
+    r0 = pxsim_Array_.pop(s.currMovers___54030);
     { step = 44; continue; }
   case 45:
-    r0 = (s.count___24450 + 1);
-    s.count___24450 = (r0);
+    r0 = (s.count___54020 + 1);
+    s.count___54020 = (r0);
     { step = 1; continue; }
   case 46:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_move__P2185.info = {"start":2551,"length":3971,"line":109,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
+ArcadePhysicsEngine_move__P31604.info = {"start":2551,"length":3971,"line":109,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"move","argumentNames":["this","dt"]}
 
-function ArcadePhysicsEngine_move__P2185_mk(s) {
+function ArcadePhysicsEngine_move__P31604_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_move__P2185, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_move__P31604, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65127,24 +65415,24 @@ function ArcadePhysicsEngine_move__P2185_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  dtf___24378: undefined,
-  dt2___24385: undefined,
-  scene___24389: undefined,
-  tileMap___24392: undefined,
-  movingSprites___24395: undefined,
-  MAX_STEP_COUNT___24426: undefined,
-  overlapHandlers___24438: undefined,
-  selected___24445: undefined,
-  buffers___24446: undefined,
-  count___24450: undefined,
-  currMovers___24460: undefined,
-  remainingMovers___24467: undefined,
-  ms___24472: undefined,
-  unnamed102___U13: undefined,
-  unnamed103___U14: undefined,
-  s___24474: undefined,
-  stepX___24567: undefined,
-  stepY___24581: undefined,
+  dtf___53948: undefined,
+  dt2___53955: undefined,
+  scene___53959: undefined,
+  tileMap___53962: undefined,
+  movingSprites___53965: undefined,
+  MAX_STEP_COUNT___53996: undefined,
+  overlapHandlers___54008: undefined,
+  selected___54015: undefined,
+  buffers___54016: undefined,
+  count___54020: undefined,
+  currMovers___54030: undefined,
+  remainingMovers___54037: undefined,
+  ms___54042: undefined,
+  unnamed942___U13: undefined,
+  unnamed943___U14: undefined,
+  s___54044: undefined,
+  stepX___54137: undefined,
+  stepY___54151: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -65153,7 +65441,7 @@ function ArcadePhysicsEngine_move__P2185_mk(s) {
 
 
 
-function inline__P24397(s) {
+function inline__P53967(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65167,23 +65455,23 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = ArcadePhysicsEngine_createMovingSprite__P4221_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_createMovingSprite__P33714_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.caps[1];
     s.tmp_0.arg3 = s.caps[2];
-    s.callLocIdx = 555; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 512; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24397.info = {"start":2943,"length":51,"line":121,"column":17,"endLine":121,"endColumn":68,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["sprite"]}
+inline__P53967.info = {"start":2943,"length":51,"line":121,"column":17,"endLine":121,"endColumn":68,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["sprite"]}
 
-function inline__P24397_mk(s) {
+function inline__P53967_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24397, depth: s.depth + 1,
+        parent: s, fn: inline__P53967, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -65193,7 +65481,7 @@ function inline__P24397_mk(s) {
 
 
 
-function inline__P24409(s) {
+function inline__P53979(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65207,9 +65495,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = Sprite_vx__P2029_mk(s);
+    s.tmp_1 = Sprite_vx__P31448_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 557; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 514; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -65218,9 +65506,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = Sprite_vy__P2031_mk(s);
+    s.tmp_2 = Sprite_vy__P31450_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 558; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 515; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
   case 2:
@@ -65228,9 +65516,9 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = Sprite_clearObstacles__P2084_mk(s);
+    s.tmp_4 = Sprite_clearObstacles__P31503_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 559; s.pc = 7; return s.tmp_4;
+    s.callLocIdx = 516; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
   case 3:
@@ -65239,12 +65527,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24409.info = {"start":3077,"length":66,"line":124,"column":29,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["s"]}
+inline__P53979.info = {"start":3077,"length":66,"line":124,"column":29,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P24409_mk(s) {
+function inline__P53979_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24409, depth: s.depth + 1,
+        parent: s, fn: inline__P53979, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65258,7 +65546,7 @@ function inline__P24409_mk(s) {
 
 
 
-function ArcadePhysicsEngine_spriteCollisions__P4222(s) {
+function ArcadePhysicsEngine_spriteCollisions__P33715(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65268,18 +65556,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ms___24682 = undefined;
-    s.unnamed104___U1 = undefined;
-    s.unnamed105___U2 = undefined;
-    s.sprite___24684 = undefined;
-    s.overSprites___24691 = undefined;
-    s.overlapper___24699 = undefined;
-    s.unnamed106___U6 = undefined;
-    s.unnamed107___U7 = undefined;
-    s.thisKind___24705 = undefined;
-    s.otherKind___24709 = undefined;
-    s.higher___24722 = undefined;
-    s.lower___24731 = undefined;
+    s.ms___54252 = undefined;
+    s.unnamed944___U1 = undefined;
+    s.unnamed945___U2 = undefined;
+    s.sprite___54254 = undefined;
+    s.overSprites___54261 = undefined;
+    s.overlapper___54269 = undefined;
+    s.unnamed946___U6 = undefined;
+    s.unnamed947___U7 = undefined;
+    s.thisKind___54275 = undefined;
+    s.otherKind___54279 = undefined;
+    s.higher___54292 = undefined;
+    s.lower___54301 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -65287,7 +65575,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = pxsim_Array__length(s.arg2);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -65299,20 +65587,20 @@ switch (step) {
     { step = 21; continue; }
   case 1:
   case 2:
-    s.ms___24682 = (undefined);
-    s.unnamed104___U1 = (s.arg1);
-    s.unnamed105___U2 = (0);
+    s.ms___54252 = (undefined);
+    s.unnamed944___U1 = (s.arg1);
+    s.unnamed945___U2 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed105___U2;
-    r0 = pxsim_Array__length(s.unnamed104___U1);
+    s.tmp_0 = r0 = s.unnamed945___U2;
+    r0 = pxsim_Array__length(s.unnamed944___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed104___U1, s.unnamed105___U2);
-    s.ms___24682 = (r0);
-    r0 = s.ms___24682.fields["sprite"];
-    s.sprite___24684 = (r0);
-    r0 = s.sprite___24684.fields["flags"];
+    r0 = pxsim_Array__getAt(s.unnamed944___U1, s.unnamed945___U2);
+    s.ms___54252 = (r0);
+    r0 = s.ms___54252.fields["sprite"];
+    s.sprite___54254 = (r0);
+    r0 = s.sprite___54254.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 515);
     s.tmp_0 = r0;
@@ -65321,27 +65609,27 @@ switch (step) {
     { step = 19; continue; }
   case 4:
   case 5:
-    s.tmp_2 = sprites_SpriteMap_overlaps__P2097_mk(s);
+    s.tmp_2 = sprites_SpriteMap_overlaps__P31516_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_2.arg0 = r0;
-    r0 = s.ms___24682.fields["sprite"];
+    r0 = s.ms___54252.fields["sprite"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 623; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 580; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
-    s.overSprites___24691 = (r0);
-    s.overlapper___24699 = (undefined);
-    s.unnamed106___U6 = (s.overSprites___24691);
-    s.unnamed107___U7 = (0);
+    s.overSprites___54261 = (r0);
+    s.overlapper___54269 = (undefined);
+    s.unnamed946___U6 = (s.overSprites___54261);
+    s.unnamed947___U7 = (0);
   case 6:
-    s.tmp_0 = r0 = s.unnamed107___U7;
-    r0 = pxsim_Array__length(s.unnamed106___U6);
+    s.tmp_0 = r0 = s.unnamed947___U7;
+    r0 = pxsim_Array__length(s.unnamed946___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 18; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed106___U6, s.unnamed107___U7);
-    s.overlapper___24699 = (r0);
-    r0 = s.overlapper___24699.fields["flags"];
+    r0 = pxsim_Array__getAt(s.unnamed946___U6, s.unnamed947___U7);
+    s.overlapper___54269 = (r0);
+    r0 = s.overlapper___54269.fields["flags"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 515);
     s.tmp_2 = r0;
@@ -65350,13 +65638,13 @@ switch (step) {
     { step = 17; continue; }
   case 7:
   case 8:
-    r0 = s.sprite___24684.fields["_kind"];
-    s.thisKind___24705 = (r0);
-    r0 = s.overlapper___24699.fields["_kind"];
-    s.otherKind___24709 = (r0);
-    r0 = s.sprite___24684.fields["_kindsOverlappedWith"];
+    r0 = s.sprite___54254.fields["_kind"];
+    s.thisKind___54275 = (r0);
+    r0 = s.overlapper___54269.fields["_kind"];
+    s.otherKind___54279 = (r0);
+    r0 = s.sprite___54254.fields["_kindsOverlappedWith"];
     s.tmp_2 = r0;
-    r0 = pxsim_Array_.indexOf(s.tmp_2, s.otherKind___24709, undefined);
+    r0 = pxsim_Array_.indexOf(s.tmp_2, s.otherKind___54279, undefined);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === -1);
     s.tmp_0 = r0;
@@ -65365,37 +65653,37 @@ switch (step) {
     { step = 17; continue; }
   case 9:
   case 10:
-    r0 = s.sprite___24684.fields["id"];
+    r0 = s.sprite___54254.fields["id"];
     s.tmp_4 = r0;
-    r0 = s.overlapper___24699.fields["id"];
+    r0 = s.overlapper___54269.fields["id"];
     s.tmp_5 = r0;
     r0 = (s.tmp_4 > s.tmp_5);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 11; continue; }
-    r0 = s.sprite___24684;
+    r0 = s.sprite___54254;
     { step = 12; continue; }
   case 11:
-    r0 = s.overlapper___24699;
+    r0 = s.overlapper___54269;
   case 12:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    s.higher___24722 = (s.tmp_6);
-    r0 = (s.higher___24722 === s.sprite___24684);
+    s.higher___54292 = (s.tmp_6);
+    r0 = (s.higher___54292 === s.sprite___54254);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = s.overlapper___24699;
+    r0 = s.overlapper___54269;
     { step = 14; continue; }
   case 13:
-    r0 = s.sprite___24684;
+    r0 = s.sprite___54254;
   case 14:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.lower___24731 = (s.tmp_1);
-    r0 = s.higher___24722.fields["_overlappers"];
+    s.lower___54301 = (s.tmp_1);
+    r0 = s.higher___54292.fields["_overlappers"];
     s.tmp_2 = r0;
-    r0 = s.lower___24731.fields["id"];
+    r0 = s.lower___54301.fields["id"];
     s.tmp_3 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_2, s.tmp_3, undefined);
     s.tmp_1 = r0;
@@ -65403,54 +65691,54 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = pxsim_pxtcore_mkAction(2, inline__P24751);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P54321);
     s.tmp_4 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.thisKind___24705);
-    r0 = pxsim_pxtrt_stclo(s.tmp_4, 1, s.otherKind___24709);
-    r0 = pxsim_pxtcore_mkAction(5, inline__P24773);
+    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.thisKind___54275);
+    r0 = pxsim_pxtrt_stclo(s.tmp_4, 1, s.otherKind___54279);
+    r0 = pxsim_pxtcore_mkAction(5, inline__P54343);
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.higher___24722);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 1, s.lower___24731);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 2, s.sprite___24684);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 3, s.overlapper___24699);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 4, s.thisKind___24705);
-    s.tmp_6 = helpers_arrayForEach__P107_mk(s);
-    s.tmp_7 = helpers_arrayFilter__P108_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.higher___54292);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 1, s.lower___54301);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 2, s.sprite___54254);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 3, s.overlapper___54269);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 4, s.thisKind___54275);
+    s.tmp_6 = helpers_arrayForEach__P29642_mk(s);
+    s.tmp_7 = helpers_arrayFilter__P29643_mk(s);
     s.tmp_7.arg0 = s.arg2;
     s.tmp_7.arg1 = s.tmp_4;
-    s.callLocIdx = 626; s.pc = 24; return s.tmp_7;
+    s.callLocIdx = 583; s.pc = 24; return s.tmp_7;
   case 24:
     r0 = s.retval;
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = s.tmp_5;
-    s.callLocIdx = 628; s.pc = 23; return s.tmp_6;
+    s.callLocIdx = 585; s.pc = 23; return s.tmp_6;
   case 23:
     r0 = s.retval;
   case 15:
   case 16:
   case 17:
-    r0 = (s.unnamed107___U7 + 1);
-    s.unnamed107___U7 = (r0);
+    r0 = (s.unnamed947___U7 + 1);
+    s.unnamed947___U7 = (r0);
     { step = 6; continue; }
   case 18:
-    s.unnamed106___U6 = (undefined);
+    s.unnamed946___U6 = (undefined);
   case 19:
-    r0 = (s.unnamed105___U2 + 1);
-    s.unnamed105___U2 = (r0);
+    r0 = (s.unnamed945___U2 + 1);
+    s.unnamed945___U2 = (r0);
     { step = 3; continue; }
   case 20:
-    s.unnamed104___U1 = (undefined);
+    s.unnamed944___U1 = (undefined);
   case 21:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_spriteCollisions__P4222.info = {"start":9599,"length":2254,"line":324,"column":4,"endLine":368,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"spriteCollisions","argumentNames":["this","movedSprites","handlers"]}
+ArcadePhysicsEngine_spriteCollisions__P33715.info = {"start":9599,"length":2254,"line":324,"column":4,"endLine":368,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"spriteCollisions","argumentNames":["this","movedSprites","handlers"]}
 
-function ArcadePhysicsEngine_spriteCollisions__P4222_mk(s) {
+function ArcadePhysicsEngine_spriteCollisions__P33715_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_spriteCollisions__P4222, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_spriteCollisions__P33715, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65460,18 +65748,18 @@ function ArcadePhysicsEngine_spriteCollisions__P4222_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  ms___24682: undefined,
-  unnamed104___U1: undefined,
-  unnamed105___U2: undefined,
-  sprite___24684: undefined,
-  overSprites___24691: undefined,
-  overlapper___24699: undefined,
-  unnamed106___U6: undefined,
-  unnamed107___U7: undefined,
-  thisKind___24705: undefined,
-  otherKind___24709: undefined,
-  higher___24722: undefined,
-  lower___24731: undefined,
+  ms___54252: undefined,
+  unnamed944___U1: undefined,
+  unnamed945___U2: undefined,
+  sprite___54254: undefined,
+  overSprites___54261: undefined,
+  overlapper___54269: undefined,
+  unnamed946___U6: undefined,
+  unnamed947___U7: undefined,
+  thisKind___54275: undefined,
+  otherKind___54279: undefined,
+  higher___54292: undefined,
+  lower___54301: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -65481,7 +65769,7 @@ function ArcadePhysicsEngine_spriteCollisions__P4222_mk(s) {
 
 
 
-function inline__P24751(s) {
+function inline__P54321(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65538,12 +65826,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24751.info = {"start":10958,"length":137,"line":350,"column":32,"endLine":351,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P54321.info = {"start":10958,"length":137,"line":350,"column":32,"endLine":351,"endColumn":81,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24751_mk(s) {
+function inline__P54321_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24751, depth: s.depth + 1,
+        parent: s, fn: inline__P54321, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65561,7 +65849,7 @@ function inline__P24751_mk(s) {
 
 
 
-function inline__P24773(s) {
+function inline__P54343(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65580,7 +65868,7 @@ switch (step) {
     r0 = s.caps[1].fields["id"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtcore_mkAction(6, inline__P24783);
+    r0 = pxsim_pxtcore_mkAction(6, inline__P54353);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.caps[2]);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.caps[3]);
@@ -65593,12 +65881,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24773.info = {"start":11155,"length":648,"line":353,"column":33,"endLine":364,"endColumn":25,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P54343.info = {"start":11155,"length":648,"line":353,"column":33,"endLine":364,"endColumn":25,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P24773_mk(s) {
+function inline__P54343_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24773, depth: s.depth + 1,
+        parent: s, fn: inline__P54343, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65609,7 +65897,7 @@ function inline__P24773_mk(s) {
 
 
 
-function inline__P24783(s) {
+function inline__P54353(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65665,12 +65953,12 @@ switch (step) {
     s.tmp_12.arg2 = s.tmp_11;
     if (!s.tmp_12.arg0.vtable.iface) {
       setupLambda(s.tmp_12, pxsim_pxtrt.mapGetByString(s.tmp_12.arg0, "handler"), 3);
-      s.callLocIdx = 627; s.pc = 7; return s.tmp_12;
+      s.callLocIdx = 584; s.pc = 7; return s.tmp_12;
     } else {
       s.tmp_12.fn = s.tmp_12.arg0.vtable.iface["handler"];
-      if (s.tmp_12.fn == null) { setupLambda(s.tmp_12, s.tmp_12.arg0.fields["handler"], 3); s.callLocIdx = 627; s.pc = 7; return s.tmp_12; }
-      else if (s.tmp_12.fn.isGetter) { s.tmp_12.stage2Call = true; s.callLocIdx = 627; s.pc = 7; return s.tmp_12;; }
-     else { s.callLocIdx = 627; s.pc = 7; return s.tmp_12; }
+      if (s.tmp_12.fn == null) { setupLambda(s.tmp_12, s.tmp_12.arg0.fields["handler"], 3); s.callLocIdx = 584; s.pc = 7; return s.tmp_12; }
+      else if (s.tmp_12.fn.isGetter) { s.tmp_12.stage2Call = true; s.callLocIdx = 584; s.pc = 7; return s.tmp_12;; }
+     else { s.callLocIdx = 584; s.pc = 7; return s.tmp_12; }
     }
   case 7:
     r0 = s.retval;
@@ -65685,12 +65973,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24783.info = {"start":11276,"length":499,"line":355,"column":50,"endLine":363,"endColumn":29,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":[]}
+inline__P54353.info = {"start":11276,"length":499,"line":355,"column":50,"endLine":363,"endColumn":29,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P24783_mk(s) {
+function inline__P54353_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24783, depth: s.depth + 1,
+        parent: s, fn: inline__P54353, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65711,7 +65999,7 @@ function inline__P24783_mk(s) {
 
 
 
-function sprites_SpriteMap_overlaps__P2097(s) {
+function sprites_SpriteMap_overlaps__P31516(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65721,47 +66009,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.n___24816 = undefined;
-    s.o___24820 = undefined;
+    s.n___54386 = undefined;
+    s.o___54390 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_neighbors__P2096_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_neighbors__P31515_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 491; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 448; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.n___24816 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P24822);
+    s.n___54386 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P54392);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayFilter__P108_mk(s);
-    s.tmp_1.arg0 = s.n___24816;
+    s.tmp_1 = helpers_arrayFilter__P29643_mk(s);
+    s.tmp_1.arg0 = s.n___54386;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 493; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 450; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    s.o___24820 = (r0);
-    r0 = s.o___24820;
+    s.o___54390 = (r0);
+    r0 = s.o___54390;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_overlaps__P2097.info = {"start":923,"length":189,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"overlaps","argumentNames":["this","sprite"]}
+sprites_SpriteMap_overlaps__P31516.info = {"start":923,"length":189,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"overlaps","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_overlaps__P2097_mk(s) {
+function sprites_SpriteMap_overlaps__P31516_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_overlaps__P2097, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_overlaps__P31516, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  n___24816: undefined,
-  o___24820: undefined,
+  n___54386: undefined,
+  o___54390: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -65770,7 +66058,7 @@ function sprites_SpriteMap_overlaps__P2097_mk(s) {
 
 
 
-function inline__P24822(s) {
+function inline__P54392(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65784,21 +66072,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Sprite_overlapsWith__P2080_mk(s);
+    s.tmp_0 = Sprite_overlapsWith__P31499_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 492; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 449; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P24822.info = {"start":1037,"length":41,"line":32,"column":31,"endLine":32,"endColumn":72,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["neighbor"]}
+inline__P54392.info = {"start":1037,"length":41,"line":32,"column":31,"endLine":32,"endColumn":72,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"inline","argumentNames":["neighbor"]}
 
-function inline__P24822_mk(s) {
+function inline__P54392_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P24822, depth: s.depth + 1,
+        parent: s, fn: inline__P54392, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -65808,7 +66096,7 @@ function inline__P24822_mk(s) {
 
 
 
-function sprites_SpriteMap_neighbors__P2096(s) {
+function sprites_SpriteMap_neighbors__P31515(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65818,112 +66106,112 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.n___24864 = undefined;
-    s.layer___24866 = undefined;
+    s.n___54434 = undefined;
+    s.layer___54436 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
-    s.n___24864 = (r0);
+    s.n___54434 = (r0);
     r0 = s.arg1.fields["layer"];
-    s.layer___24866 = (r0);
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
+    s.layer___54436 = (r0);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P33693_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_left__P2062_mk(s);
+    s.tmp_1 = Sprite_left__P31481_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 479; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 436; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_top__P2066_mk(s);
+    s.tmp_2 = Sprite_top__P31485_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 480; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 437; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___24866;
-    s.tmp_0.arg4 = s.n___24864;
-    s.callLocIdx = 481; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___54436;
+    s.tmp_0.arg4 = s.n___54434;
+    s.callLocIdx = 438; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P33693_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_left__P2062_mk(s);
+    s.tmp_1 = Sprite_left__P31481_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 482; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 439; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_bottom__P2068_mk(s);
+    s.tmp_2 = Sprite_bottom__P31487_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 483; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 440; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___24866;
-    s.tmp_0.arg4 = s.n___24864;
-    s.callLocIdx = 484; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___54436;
+    s.tmp_0.arg4 = s.n___54434;
+    s.callLocIdx = 441; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P33693_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_right__P2064_mk(s);
+    s.tmp_1 = Sprite_right__P31483_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 485; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 442; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_top__P2066_mk(s);
+    s.tmp_2 = Sprite_top__P31485_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 486; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 443; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___24866;
-    s.tmp_0.arg4 = s.n___24864;
-    s.callLocIdx = 487; s.pc = 7; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___54436;
+    s.tmp_0.arg4 = s.n___54434;
+    s.callLocIdx = 444; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P33693_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_right__P2064_mk(s);
+    s.tmp_1 = Sprite_right__P31483_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 488; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 445; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_bottom__P2068_mk(s);
+    s.tmp_2 = Sprite_bottom__P31487_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 489; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 446; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___24866;
-    s.tmp_0.arg4 = s.n___24864;
-    s.callLocIdx = 490; s.pc = 10; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___54436;
+    s.tmp_0.arg4 = s.n___54434;
+    s.callLocIdx = 447; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeElement(s.n___24864, s.arg1);
-    r0 = s.n___24864;
+    r0 = pxsim_Array_.removeElement(s.n___54434, s.arg1);
+    r0 = s.n___54434;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_neighbors__P2096.info = {"start":376,"length":442,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"neighbors","argumentNames":["this","sprite"]}
+sprites_SpriteMap_neighbors__P31515.info = {"start":376,"length":442,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"neighbors","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_neighbors__P2096_mk(s) {
+function sprites_SpriteMap_neighbors__P31515_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_neighbors__P2096, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_neighbors__P31515, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  n___24864: undefined,
-  layer___24866: undefined,
+  n___54434: undefined,
+  layer___54436: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -65932,7 +66220,7 @@ function sprites_SpriteMap_neighbors__P2096_mk(s) {
 
 
 
-function sprites_SpriteMap_mergeAtKey__P4200(s) {
+function sprites_SpriteMap_mergeAtKey__P33693(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65942,11 +66230,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.k___24907 = undefined;
-    s.bucket___24912 = undefined;
-    s.sprite___24919 = undefined;
-    s.unnamed100___U3 = undefined;
-    s.unnamed101___U4 = undefined;
+    s.k___54477 = undefined;
+    s.bucket___54482 = undefined;
+    s.sprite___54489 = undefined;
+    s.unnamed940___U3 = undefined;
+    s.unnamed941___U4 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -65956,33 +66244,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_key__P4198_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_key__P33691_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
-    s.callLocIdx = 517; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 474; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.k___24907 = (r0);
+    s.k___54477 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___24907);
-    s.bucket___24912 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.bucket___24912);
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___54477);
+    s.bucket___54482 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.bucket___54482);
     if (!r0) { step = 7; continue; }
-    s.sprite___24919 = (undefined);
-    s.unnamed100___U3 = (s.bucket___24912);
-    s.unnamed101___U4 = (0);
+    s.sprite___54489 = (undefined);
+    s.unnamed940___U3 = (s.bucket___54482);
+    s.unnamed941___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed101___U4;
-    r0 = pxsim_Array__length(s.unnamed100___U3);
+    s.tmp_0 = r0 = s.unnamed941___U4;
+    r0 = pxsim_Array__length(s.unnamed940___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed100___U3, s.unnamed101___U4);
-    s.sprite___24919 = (r0);
-    r0 = s.sprite___24919.fields["layer"];
+    r0 = pxsim_Array__getAt(s.unnamed940___U3, s.unnamed941___U4);
+    s.sprite___54489 = (r0);
+    r0 = s.sprite___54489.fields["layer"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & s.arg3);
     s.tmp_2 = r0;
@@ -65991,7 +66279,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    r0 = pxsim_Array_.indexOf(s.arg4, s.sprite___24919, undefined);
+    r0 = pxsim_Array_.indexOf(s.arg4, s.sprite___54489, undefined);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 < 0);
   case 3:
@@ -65999,26 +66287,26 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__push(s.arg4, s.sprite___24919);
+    r0 = pxsim_Array__push(s.arg4, s.sprite___54489);
   case 4:
   case 5:
-    r0 = (s.unnamed101___U4 + 1);
-    s.unnamed101___U4 = (r0);
+    r0 = (s.unnamed941___U4 + 1);
+    s.unnamed941___U4 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed100___U3 = (undefined);
+    s.unnamed940___U3 = (undefined);
   case 7:
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_mergeAtKey__P4200.info = {"start":3715,"length":384,"line":101,"column":8,"endLine":110,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"mergeAtKey","argumentNames":["this","x","y","layer","n"]}
+sprites_SpriteMap_mergeAtKey__P33693.info = {"start":3715,"length":384,"line":101,"column":8,"endLine":110,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"mergeAtKey","argumentNames":["this","x","y","layer","n"]}
 
-function sprites_SpriteMap_mergeAtKey__P4200_mk(s) {
+function sprites_SpriteMap_mergeAtKey__P33693_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_mergeAtKey__P4200, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_mergeAtKey__P33693, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66026,11 +66314,11 @@ function sprites_SpriteMap_mergeAtKey__P4200_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  k___24907: undefined,
-  bucket___24912: undefined,
-  sprite___24919: undefined,
-  unnamed100___U3: undefined,
-  unnamed101___U4: undefined,
+  k___54477: undefined,
+  bucket___54482: undefined,
+  sprite___54489: undefined,
+  unnamed940___U3: undefined,
+  unnamed941___U4: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -66042,7 +66330,7 @@ function sprites_SpriteMap_mergeAtKey__P4200_mk(s) {
 
 
 
-function sprites_SpriteMap_key__P4198(s) {
+function sprites_SpriteMap_key__P33691(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66052,8 +66340,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.xi___24940 = undefined;
-    s.yi___24952 = undefined;
+    s.xi___54510 = undefined;
+    s.yi___54522 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -66061,8 +66349,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P122_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P29657_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg0.fields["columnCount"];
     s.tmp_0.arg1 = r0;
@@ -66070,11 +66358,11 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.arg1, s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 505; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 462; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.xi___24940 = (r0);
-    s.tmp_0 = Math_clamp__P122_mk(s);
+    s.xi___54510 = (r0);
+    s.tmp_0 = Math_clamp__P29657_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg0.fields["rowCount"];
     s.tmp_0.arg1 = r0;
@@ -66082,31 +66370,31 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.arg2, s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 506; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 463; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.yi___24952 = (r0);
-    s.tmp_0 = r0 = s.xi___24940;
+    s.yi___54522 = (r0);
+    s.tmp_0 = r0 = s.xi___54510;
     r0 = s.arg0.fields["columnCount"];
     s.tmp_2 = r0;
-    r0 = (s.yi___24952 * s.tmp_2);
+    r0 = (s.yi___54522 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_key__P4198.info = {"start":2592,"length":270,"line":76,"column":8,"endLine":80,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"key","argumentNames":["this","x","y"]}
+sprites_SpriteMap_key__P33691.info = {"start":2592,"length":270,"line":76,"column":8,"endLine":80,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"key","argumentNames":["this","x","y"]}
 
-function sprites_SpriteMap_key__P4198_mk(s) {
+function sprites_SpriteMap_key__P33691_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_key__P4198, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_key__P33691, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  xi___24940: undefined,
-  yi___24952: undefined,
+  xi___54510: undefined,
+  yi___54522: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -66116,7 +66404,7 @@ function sprites_SpriteMap_key__P4198_mk(s) {
 
 
 
-function Sprite_overlapsWith__P2080(s) {
+function Sprite_overlapsWith__P31499(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66132,7 +66420,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = (s.arg1 == s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -66165,29 +66453,29 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = s.arg0.fields["_image"];
     s.tmp_6 = r0;
-    s.tmp_9 = Sprite_left__P2062_mk(s);
+    s.tmp_9 = Sprite_left__P31481_mk(s);
     s.tmp_9.arg0 = s.arg0;
-    s.callLocIdx = 409; s.pc = 8; return s.tmp_9;
+    s.callLocIdx = 366; s.pc = 8; return s.tmp_9;
   case 8:
     r0 = s.retval;
     s.tmp_8 = r0;
-    s.tmp_11 = Sprite_left__P2062_mk(s);
+    s.tmp_11 = Sprite_left__P31481_mk(s);
     s.tmp_11.arg0 = s.arg1;
-    s.callLocIdx = 410; s.pc = 9; return s.tmp_11;
+    s.callLocIdx = 367; s.pc = 9; return s.tmp_11;
   case 9:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = (s.tmp_8 - s.tmp_10);
     s.tmp_7 = r0;
-    s.tmp_14 = Sprite_top__P2066_mk(s);
+    s.tmp_14 = Sprite_top__P31485_mk(s);
     s.tmp_14.arg0 = s.arg0;
-    s.callLocIdx = 411; s.pc = 10; return s.tmp_14;
+    s.callLocIdx = 368; s.pc = 10; return s.tmp_14;
   case 10:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_16 = Sprite_top__P2066_mk(s);
+    s.tmp_16 = Sprite_top__P31485_mk(s);
     s.tmp_16.arg0 = s.arg1;
-    s.callLocIdx = 412; s.pc = 11; return s.tmp_16;
+    s.callLocIdx = 369; s.pc = 11; return s.tmp_16;
   case 11:
     r0 = s.retval;
     s.tmp_15 = r0;
@@ -66198,12 +66486,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_overlapsWith__P2080.info = {"start":24476,"length":434,"line":748,"column":4,"endLine":756,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"overlapsWith","argumentNames":["this","other"]}
+Sprite_overlapsWith__P31499.info = {"start":24476,"length":434,"line":748,"column":4,"endLine":756,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"overlapsWith","argumentNames":["this","other"]}
 
-function Sprite_overlapsWith__P2080_mk(s) {
+function Sprite_overlapsWith__P31499_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_overlapsWith__P2080, depth: s.depth + 1,
+        parent: s, fn: Sprite_overlapsWith__P31499, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66230,7 +66518,7 @@ function Sprite_overlapsWith__P2080_mk(s) {
 
 
 
-function ArcadePhysicsEngine_createMovingSprite__P4221(s) {
+function ArcadePhysicsEngine_createMovingSprite__P33714(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66240,16 +66528,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ovx___25154 = undefined;
-    s.ovy___25159 = undefined;
-    s.fx___25186 = undefined;
-    s.c___25193 = undefined;
-    s.fy___25236 = undefined;
-    s.c___25243 = undefined;
-    s.dx___25282 = undefined;
-    s.dy___25291 = undefined;
-    s.xStep___25300 = undefined;
-    s.yStep___25302 = undefined;
+    s.ovx___54724 = undefined;
+    s.ovy___54729 = undefined;
+    s.fx___54756 = undefined;
+    s.c___54763 = undefined;
+    s.fy___54806 = undefined;
+    s.c___54813 = undefined;
+    s.dx___54852 = undefined;
+    s.dy___54861 = undefined;
+    s.xStep___54870 = undefined;
+    s.yStep___54872 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -66258,23 +66546,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
-    s.tmp_0 = ArcadePhysicsEngine_constrain__P4226_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
+    s.tmp_0 = ArcadePhysicsEngine_constrain__P33719_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 586; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 543; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.ovx___25154 = (r0);
-    s.tmp_0 = ArcadePhysicsEngine_constrain__P4226_mk(s);
+    s.ovx___54724 = (r0);
+    s.tmp_0 = ArcadePhysicsEngine_constrain__P33719_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 587; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 544; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
-    s.ovy___25159 = (r0);
+    s.ovy___54729 = (r0);
     r0 = s.arg1.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.arg1).fields["_lastX"] = (s.tmp_0);
@@ -66312,41 +66600,41 @@ switch (step) {
     r0 = (s.tmp_3 >> 8);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 1000);
-    s.fx___25186 = (r0);
+    s.fx___54756 = (r0);
     r0 = s.arg1.fields["_vx"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.fx___25186);
-    s.c___25193 = (r0);
-    r0 = (s.c___25193 < 0);
+    r0 = (s.tmp_0 - s.fx___54756);
+    s.c___54763 = (r0);
+    r0 = (s.c___54763 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = Fx_min__P161_mk(s);
+    s.tmp_3 = Fx_min__P29696_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.fx___25186);
+    r0 = (s.tmp_4 + s.fx___54756);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 595; s.pc = 27; return s.tmp_3;
+    s.callLocIdx = 552; s.pc = 27; return s.tmp_3;
   case 27:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["_vx"] = (s.tmp_2);
     { step = 5; continue; }
   case 2:
-    r0 = (s.c___25193 > 0);
+    r0 = (s.c___54763 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = Fx_max__P162_mk(s);
+    s.tmp_3 = Fx_max__P29697_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.fx___25186);
+    r0 = (s.tmp_4 - s.fx___54756);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 597; s.pc = 28; return s.tmp_3;
+    s.callLocIdx = 554; s.pc = 28; return s.tmp_3;
   case 28:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -66390,41 +66678,41 @@ switch (step) {
     r0 = (s.tmp_3 >> 8);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 1000);
-    s.fy___25236 = (r0);
+    s.fy___54806 = (r0);
     r0 = s.arg1.fields["_vy"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.fy___25236);
-    s.c___25243 = (r0);
-    r0 = (s.c___25243 < 0);
+    r0 = (s.tmp_0 - s.fy___54806);
+    s.c___54813 = (r0);
+    r0 = (s.c___54813 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = Fx_min__P161_mk(s);
+    s.tmp_3 = Fx_min__P29696_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.fy___25236);
+    r0 = (s.tmp_4 + s.fy___54806);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 605; s.pc = 29; return s.tmp_3;
+    s.callLocIdx = 562; s.pc = 29; return s.tmp_3;
   case 29:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["_vy"] = (s.tmp_2);
     { step = 13; continue; }
   case 10:
-    r0 = (s.c___25243 > 0);
+    r0 = (s.c___54813 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = Fx_min__P161_mk(s);
+    s.tmp_3 = Fx_min__P29696_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.fy___25236);
+    r0 = (s.tmp_4 - s.fy___54806);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 607; s.pc = 30; return s.tmp_3;
+    s.callLocIdx = 564; s.pc = 30; return s.tmp_3;
   case 30:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -66438,51 +66726,51 @@ switch (step) {
   case 15:
   case 16:
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_2 = ArcadePhysicsEngine_constrain__P4226_mk(s);
+    s.tmp_2 = ArcadePhysicsEngine_constrain__P33719_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 608; s.pc = 31; return s.tmp_2;
+    s.callLocIdx = 565; s.pc = 31; return s.tmp_2;
   case 31:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vx"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_2 = ArcadePhysicsEngine_constrain__P4226_mk(s);
+    s.tmp_2 = ArcadePhysicsEngine_constrain__P33719_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 609; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 566; s.pc = 32; return s.tmp_2;
   case 32:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
     r0 = s.arg1.fields["_vx"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.ovx___25154);
+    r0 = (s.tmp_2 + s.ovx___54724);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.imul(s.tmp_1, s.arg3);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 8);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 1000);
-    s.dx___25282 = (r0);
+    s.dx___54852 = (r0);
     r0 = s.arg1.fields["_vy"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.ovy___25159);
+    r0 = (s.tmp_2 + s.ovy___54729);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.imul(s.tmp_1, s.arg3);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 8);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 1000);
-    s.dy___25291 = (r0);
-    s.xStep___25300 = (s.dx___25282);
-    s.yStep___25302 = (s.dy___25291);
+    s.dy___54861 = (r0);
+    s.xStep___54870 = (s.dx___54852);
+    s.yStep___54872 = (s.dy___54861);
   case 17:
-    s.tmp_2 = Fx_abs__P160_mk(s);
-    s.tmp_2.arg0 = s.xStep___25300;
-    s.callLocIdx = 616; s.pc = 33; return s.tmp_2;
+    s.tmp_2 = Fx_abs__P29695_mk(s);
+    s.tmp_2.arg0 = s.xStep___54870;
+    s.callLocIdx = 573; s.pc = 33; return s.tmp_2;
   case 33:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -66495,9 +66783,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    s.tmp_5 = Fx_abs__P160_mk(s);
-    s.tmp_5.arg0 = s.yStep___25302;
-    s.callLocIdx = 617; s.pc = 34; return s.tmp_5;
+    s.tmp_5 = Fx_abs__P29695_mk(s);
+    s.tmp_5.arg0 = s.yStep___54872;
+    s.callLocIdx = 574; s.pc = 34; return s.tmp_5;
   case 34:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -66509,9 +66797,9 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 24; continue; }
-    s.tmp_10 = Fx_abs__P160_mk(s);
-    s.tmp_10.arg0 = s.xStep___25300;
-    s.callLocIdx = 618; s.pc = 35; return s.tmp_10;
+    s.tmp_10 = Fx_abs__P29695_mk(s);
+    s.tmp_10.arg0 = s.xStep___54870;
+    s.callLocIdx = 575; s.pc = 35; return s.tmp_10;
   case 35:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -66521,13 +66809,13 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim.Math_.idiv(s.xStep___25300, 2);
-    s.xStep___25300 = (r0);
+    r0 = pxsim.Math_.idiv(s.xStep___54870, 2);
+    s.xStep___54870 = (r0);
   case 20:
   case 21:
-    s.tmp_2 = Fx_abs__P160_mk(s);
-    s.tmp_2.arg0 = s.yStep___25302;
-    s.callLocIdx = 620; s.pc = 36; return s.tmp_2;
+    s.tmp_2 = Fx_abs__P29695_mk(s);
+    s.tmp_2.arg0 = s.yStep___54872;
+    s.callLocIdx = 577; s.pc = 36; return s.tmp_2;
   case 36:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -66537,38 +66825,38 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = pxsim.Math_.idiv(s.yStep___25302, 2);
-    s.yStep___25302 = (r0);
+    r0 = pxsim.Math_.idiv(s.yStep___54872, 2);
+    s.yStep___54872 = (r0);
   case 22:
   case 23:
     { step = 17; continue; }
   case 24:
-    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C2171_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C31590_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = MovingSprite_constructor__P2172_mk(s);
+    s.tmp_1 = MovingSprite_constructor__P31591_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg1;
     r0 = s.arg1.fields["_vx"];
     s.tmp_1.arg2 = r0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_1.arg3 = r0;
-    s.tmp_1.arg4 = s.dx___25282;
-    s.tmp_1.arg5 = s.dy___25291;
-    s.tmp_1.arg6 = s.xStep___25300;
-    s.tmp_1.arg7 = s.yStep___25302;
-    s.callLocIdx = 622; s.pc = 37; return s.tmp_1;
+    s.tmp_1.arg4 = s.dx___54852;
+    s.tmp_1.arg5 = s.dy___54861;
+    s.tmp_1.arg6 = s.xStep___54870;
+    s.tmp_1.arg7 = s.yStep___54872;
+    s.callLocIdx = 579; s.pc = 37; return s.tmp_1;
   case 37:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_createMovingSprite__P4221.info = {"start":6528,"length":3065,"line":213,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"createMovingSprite","argumentNames":["this","sprite","dtMs","dt2"]}
+ArcadePhysicsEngine_createMovingSprite__P33714.info = {"start":6528,"length":3065,"line":213,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"createMovingSprite","argumentNames":["this","sprite","dtMs","dt2"]}
 
-function ArcadePhysicsEngine_createMovingSprite__P4221_mk(s) {
+function ArcadePhysicsEngine_createMovingSprite__P33714_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_createMovingSprite__P4221, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_createMovingSprite__P33714, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66582,16 +66870,16 @@ function ArcadePhysicsEngine_createMovingSprite__P4221_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  ovx___25154: undefined,
-  ovy___25159: undefined,
-  fx___25186: undefined,
-  c___25193: undefined,
-  fy___25236: undefined,
-  c___25243: undefined,
-  dx___25282: undefined,
-  dy___25291: undefined,
-  xStep___25300: undefined,
-  yStep___25302: undefined,
+  ovx___54724: undefined,
+  ovy___54729: undefined,
+  fx___54756: undefined,
+  c___54763: undefined,
+  fy___54806: undefined,
+  c___54813: undefined,
+  dx___54852: undefined,
+  dy___54861: undefined,
+  xStep___54870: undefined,
+  yStep___54872: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -66602,7 +66890,7 @@ function ArcadePhysicsEngine_createMovingSprite__P4221_mk(s) {
 
 
 
-function ArcadePhysicsEngine_constrain__P4226(s) {
+function ArcadePhysicsEngine_constrain__P33719(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66618,30 +66906,30 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
-    s.tmp_0 = Fx_max__P162_mk(s);
-    s.tmp_1 = Fx_min__P161_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
+    s.tmp_0 = Fx_max__P29697_mk(s);
+    s.tmp_1 = Fx_min__P29696_mk(s);
     r0 = s.arg0.fields["maxVelocity"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 771; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 728; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["maxNegativeVelocity"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 772; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 729; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_constrain__P4226.info = {"start":25298,"length":191,"line":751,"column":4,"endLine":759,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"constrain","argumentNames":["this","v"]}
+ArcadePhysicsEngine_constrain__P33719.info = {"start":25298,"length":191,"line":751,"column":4,"endLine":759,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"constrain","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_constrain__P4226_mk(s) {
+function ArcadePhysicsEngine_constrain__P33719_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_constrain__P4226, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_constrain__P33719, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66653,7 +66941,7 @@ function ArcadePhysicsEngine_constrain__P4226_mk(s) {
 
 
 
-function Fx_max__P162(s) {
+function Fx_max__P29697(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66684,12 +66972,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_max__P162.info = {"start":1797,"length":117,"line":56,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"max","argumentNames":["a","b"]}
+Fx_max__P29697.info = {"start":1797,"length":117,"line":56,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"max","argumentNames":["a","b"]}
 
-function Fx_max__P162_mk(s) {
+function Fx_max__P29697_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_max__P162, depth: s.depth + 1,
+        parent: s, fn: Fx_max__P29697, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -66700,7 +66988,7 @@ function Fx_max__P162_mk(s) {
 
 
 
-function Fx_compare__P159(s) {
+function Fx_compare__P29694(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66719,12 +67007,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_compare__P159.info = {"start":1395,"length":106,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"compare","argumentNames":["a","b"]}
+Fx_compare__P29694.info = {"start":1395,"length":106,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"compare","argumentNames":["a","b"]}
 
-function Fx_compare__P159_mk(s) {
+function Fx_compare__P29694_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_compare__P159, depth: s.depth + 1,
+        parent: s, fn: Fx_compare__P29694, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -66734,7 +67022,7 @@ function Fx_compare__P159_mk(s) {
 
 
 
-function sprites_SpriteMap_insertAABB__P2101(s) {
+function sprites_SpriteMap_insertAABB__P31520(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66744,31 +67032,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.left___24972 = undefined;
-    s.top___24975 = undefined;
-    s.xn___24978 = undefined;
-    s.yn___24989 = undefined;
-    s.x___25000 = undefined;
-    s.y___25005 = undefined;
+    s.left___54542 = undefined;
+    s.top___54545 = undefined;
+    s.xn___54548 = undefined;
+    s.yn___54559 = undefined;
+    s.x___54570 = undefined;
+    s.y___54575 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P2062_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P31481_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 508; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 465; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.left___24972 = (r0);
-    s.tmp_0 = Sprite_top__P2066_mk(s);
+    s.left___54542 = (r0);
+    s.tmp_0 = Sprite_top__P31485_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 509; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 466; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.top___24975 = (r0);
+    s.top___54545 = (r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_3);
@@ -66782,7 +67070,7 @@ switch (step) {
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_5);
-    s.xn___24978 = (r0);
+    s.xn___54548 = (r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
@@ -66796,75 +67084,75 @@ switch (step) {
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_5);
-    s.yn___24989 = (r0);
-    s.x___25000 = (0);
+    s.yn___54559 = (r0);
+    s.x___54570 = (0);
   case 1:
-    r0 = (s.x___25000 <= s.xn___24978);
+    r0 = (s.x___54570 <= s.xn___54548);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.y___25005 = (0);
+    s.y___54575 = (0);
   case 2:
-    r0 = (s.y___25005 <= s.yn___24989);
+    r0 = (s.y___54575 <= s.yn___54559);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = sprites_SpriteMap_insertAtKey__P4199_mk(s);
+    s.tmp_1 = sprites_SpriteMap_insertAtKey__P33692_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = r0 = s.left___24972;
-    s.tmp_4 = Math_min__P126_mk(s);
+    s.tmp_2 = r0 = s.left___54542;
+    s.tmp_4 = Math_min__P29661_mk(s);
     r0 = s.arg1.fields["_image"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4.arg0 = r0;
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_6 = r0;
-    r0 = (s.x___25000 * s.tmp_6);
+    r0 = (s.x___54570 * s.tmp_6);
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 513; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 470; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1.arg1 = r0;
-    s.tmp_7 = r0 = s.top___24975;
-    s.tmp_9 = Math_min__P126_mk(s);
+    s.tmp_7 = r0 = s.top___54545;
+    s.tmp_9 = Math_min__P29661_mk(s);
     r0 = s.arg1.fields["_image"];
     s.tmp_10 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_10);
     s.tmp_9.arg0 = r0;
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_11 = r0;
-    r0 = (s.y___25005 * s.tmp_11);
+    r0 = (s.y___54575 * s.tmp_11);
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 515; s.pc = 9; return s.tmp_9;
+    s.callLocIdx = 472; s.pc = 9; return s.tmp_9;
   case 9:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_1.arg2 = r0;
     s.tmp_1.arg3 = s.arg1;
-    s.callLocIdx = 516; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 473; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = (s.y___25005 + 1);
-    s.y___25005 = (r0);
+    r0 = (s.y___54575 + 1);
+    s.y___54575 = (r0);
     { step = 2; continue; }
   case 3:
-    r0 = (s.x___25000 + 1);
-    s.x___25000 = (r0);
+    r0 = (s.x___54570 + 1);
+    s.x___54570 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_insertAABB__P2101.info = {"start":3184,"length":521,"line":91,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"insertAABB","argumentNames":["this","sprite"]}
+sprites_SpriteMap_insertAABB__P31520.info = {"start":3184,"length":521,"line":91,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"insertAABB","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_insertAABB__P2101_mk(s) {
+function sprites_SpriteMap_insertAABB__P31520_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_insertAABB__P2101, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_insertAABB__P31520, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66878,12 +67166,12 @@ function sprites_SpriteMap_insertAABB__P2101_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  left___24972: undefined,
-  top___24975: undefined,
-  xn___24978: undefined,
-  yn___24989: undefined,
-  x___25000: undefined,
-  y___25005: undefined,
+  left___54542: undefined,
+  top___54545: undefined,
+  xn___54548: undefined,
+  yn___54559: undefined,
+  x___54570: undefined,
+  y___54575: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -66892,7 +67180,7 @@ function sprites_SpriteMap_insertAABB__P2101_mk(s) {
 
 
 
-function sprites_SpriteMap_insertAtKey__P4199(s) {
+function sprites_SpriteMap_insertAtKey__P33692(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66902,8 +67190,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.k___25040 = undefined;
-    s.bucket___25045 = undefined;
+    s.k___54610 = undefined;
+    s.bucket___54615 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -66912,20 +67200,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_key__P4198_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_key__P33691_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
-    s.callLocIdx = 507; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 464; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.k___25040 = (r0);
+    s.k___54610 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___25040);
-    s.bucket___25045 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.bucket___25045);
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___54610);
+    s.bucket___54615 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.bucket___54615);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -66933,40 +67221,40 @@ switch (step) {
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["buckets"];
     s.tmp_2 = r0;
-    s.tmp_3 = r0 = s.k___25040;
+    s.tmp_3 = r0 = s.k___54610;
     r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_2, s.tmp_3, s.tmp_4);
-    s.bucket___25045 = (s.tmp_4);
+    s.bucket___54615 = (s.tmp_4);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(s.bucket___25045, s.arg3, undefined);
+    r0 = pxsim_Array_.indexOf(s.bucket___54615, s.arg3, undefined);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_Array__push(s.bucket___25045, s.arg3);
+    r0 = pxsim_Array__push(s.bucket___54615, s.arg3);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_insertAtKey__P4199.info = {"start":2872,"length":302,"line":82,"column":8,"endLine":89,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"insertAtKey","argumentNames":["this","x","y","sprite"]}
+sprites_SpriteMap_insertAtKey__P33692.info = {"start":2872,"length":302,"line":82,"column":8,"endLine":89,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"insertAtKey","argumentNames":["this","x","y","sprite"]}
 
-function sprites_SpriteMap_insertAtKey__P4199_mk(s) {
+function sprites_SpriteMap_insertAtKey__P33692_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_insertAtKey__P4199, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_insertAtKey__P33692, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  k___25040: undefined,
-  bucket___25045: undefined,
+  k___54610: undefined,
+  bucket___54615: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -66977,7 +67265,7 @@ function sprites_SpriteMap_insertAtKey__P4199_mk(s) {
 
 
 
-function sprites_SpriteMap_clear__P2100(s) {
+function sprites_SpriteMap_clear__P31519(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66992,7 +67280,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -67001,12 +67289,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_clear__P2100.info = {"start":2532,"length":50,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"clear","argumentNames":["this"]}
+sprites_SpriteMap_clear__P31519.info = {"start":2532,"length":50,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"clear","argumentNames":["this"]}
 
-function sprites_SpriteMap_clear__P2100_mk(s) {
+function sprites_SpriteMap_clear__P31519_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_clear__P2100, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_clear__P31519, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67017,7 +67305,7 @@ function sprites_SpriteMap_clear__P2100_mk(s) {
 
 
 
-function sprites_SpriteMap_resizeBuckets__P2099(s) {
+function sprites_SpriteMap_resizeBuckets__P31518(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67027,121 +67315,121 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.maxWidth___25077 = undefined;
-    s.maxHeight___25078 = undefined;
-    s.sprite___25080 = undefined;
-    s.unnamed98___U3 = undefined;
-    s.unnamed99___U4 = undefined;
-    s.tMap___25096 = undefined;
-    s.areaWidth___25100 = undefined;
-    s.areaHeight___25107 = undefined;
+    s.maxWidth___54647 = undefined;
+    s.maxHeight___54648 = undefined;
+    s.sprite___54650 = undefined;
+    s.unnamed938___U3 = undefined;
+    s.unnamed939___U4 = undefined;
+    s.tMap___54666 = undefined;
+    s.areaWidth___54670 = undefined;
+    s.areaHeight___54677 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
-    s.maxWidth___25077 = (0);
-    s.maxHeight___25078 = (0);
-    s.sprite___25080 = (undefined);
-    s.unnamed98___U3 = (s.arg1);
-    s.unnamed99___U4 = (0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
+    s.maxWidth___54647 = (0);
+    s.maxHeight___54648 = (0);
+    s.sprite___54650 = (undefined);
+    s.unnamed938___U3 = (s.arg1);
+    s.unnamed939___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed99___U4;
-    r0 = pxsim_Array__length(s.unnamed98___U3);
+    s.tmp_0 = r0 = s.unnamed939___U4;
+    r0 = pxsim_Array__length(s.unnamed938___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed98___U3, s.unnamed99___U4);
-    s.sprite___25080 = (r0);
-    r0 = s.sprite___25080.fields["_image"];
+    r0 = pxsim_Array__getAt(s.unnamed938___U3, s.unnamed939___U4);
+    s.sprite___54650 = (r0);
+    r0 = s.sprite___54650.fields["_image"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 > s.maxWidth___25077);
+    r0 = (s.tmp_3 > s.maxWidth___54647);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 2; continue; }
-    r0 = s.sprite___25080.fields["_image"];
+    r0 = s.sprite___54650.fields["_image"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
-    s.maxWidth___25077 = (r0);
+    s.maxWidth___54647 = (r0);
   case 2:
   case 3:
-    r0 = s.sprite___25080.fields["_image"];
+    r0 = s.sprite___54650.fields["_image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.maxHeight___25078);
+    r0 = (s.tmp_1 > s.maxHeight___54648);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = s.sprite___25080.fields["_image"];
+    r0 = s.sprite___54650.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
-    s.maxHeight___25078 = (r0);
+    s.maxHeight___54648 = (r0);
   case 4:
   case 5:
-    r0 = (s.unnamed99___U4 + 1);
-    s.unnamed99___U4 = (r0);
+    r0 = (s.unnamed939___U4 + 1);
+    s.unnamed939___U4 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed98___U3 = (undefined);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 500; s.pc = 11; return s.tmp_0;
+    s.unnamed938___U3 = (undefined);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 457; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tMap___25096 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tMap___25096);
+    s.tMap___54666 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tMap___54666);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = tiles_TileMap_areaWidth__P2323_mk(s);
-    s.tmp_0.arg0 = s.tMap___25096;
-    s.callLocIdx = 501; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = tiles_TileMap_areaWidth__P31742_mk(s);
+    s.tmp_0.arg0 = s.tMap___54666;
+    s.callLocIdx = 458; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 8; continue; }
   case 7:
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.areaWidth___25100 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.tMap___25096);
+    s.areaWidth___54670 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.tMap___54666);
     if (!r0) { step = 9; continue; }
-    s.tmp_0 = tiles_TileMap_areaHeight__P2324_mk(s);
-    s.tmp_0.arg0 = s.tMap___25096;
-    s.callLocIdx = 502; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = tiles_TileMap_areaHeight__P31743_mk(s);
+    s.tmp_0.arg0 = s.tMap___54666;
+    s.callLocIdx = 459; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     { step = 10; continue; }
   case 9:
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.areaHeight___25107 = (s.tmp_1);
+    s.areaHeight___54677 = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_clamp__P122_mk(s);
+    s.tmp_2 = Math_clamp__P29657_mk(s);
     s.tmp_2.arg0 = 8;
-    r0 = (s.areaWidth___25100 >> 2);
+    r0 = (s.areaWidth___54670 >> 2);
     s.tmp_2.arg1 = r0;
-    r0 = (s.maxWidth___25077 * 2);
+    r0 = (s.maxWidth___54647 * 2);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 503; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 460; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cellWidth"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_clamp__P122_mk(s);
+    s.tmp_2 = Math_clamp__P29657_mk(s);
     s.tmp_2.arg0 = 8;
-    r0 = (s.areaHeight___25107 >> 2);
+    r0 = (s.areaHeight___54677 >> 2);
     s.tmp_2.arg1 = r0;
-    r0 = (s.maxHeight___25078 * 2);
+    r0 = (s.maxHeight___54648 * 2);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 504; s.pc = 15; return s.tmp_2;
+    s.callLocIdx = 461; s.pc = 15; return s.tmp_2;
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -67149,25 +67437,25 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.idiv(s.areaHeight___25107, s.tmp_2);
+    r0 = pxsim.Math_.idiv(s.areaHeight___54677, s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["rowCount"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.idiv(s.areaWidth___25100, s.tmp_2);
+    r0 = pxsim.Math_.idiv(s.areaWidth___54670, s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["columnCount"] = (s.tmp_1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_resizeBuckets__P2099.info = {"start":1696,"length":826,"line":52,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"resizeBuckets","argumentNames":["this","sprites"]}
+sprites_SpriteMap_resizeBuckets__P31518.info = {"start":1696,"length":826,"line":52,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"resizeBuckets","argumentNames":["this","sprites"]}
 
-function sprites_SpriteMap_resizeBuckets__P2099_mk(s) {
+function sprites_SpriteMap_resizeBuckets__P31518_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_resizeBuckets__P2099, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_resizeBuckets__P31518, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67175,14 +67463,14 @@ function sprites_SpriteMap_resizeBuckets__P2099_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  maxWidth___25077: undefined,
-  maxHeight___25078: undefined,
-  sprite___25080: undefined,
-  unnamed98___U3: undefined,
-  unnamed99___U4: undefined,
-  tMap___25096: undefined,
-  areaWidth___25100: undefined,
-  areaHeight___25107: undefined,
+  maxWidth___54647: undefined,
+  maxHeight___54648: undefined,
+  sprite___54650: undefined,
+  unnamed938___U3: undefined,
+  unnamed939___U4: undefined,
+  tMap___54666: undefined,
+  areaWidth___54670: undefined,
+  areaHeight___54677: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67191,7 +67479,7 @@ function sprites_SpriteMap_resizeBuckets__P2099_mk(s) {
 
 
 
-function Sprite_clearObstacles__P2084(s) {
+function Sprite_clearObstacles__P31503(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67206,7 +67494,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -67215,12 +67503,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_clearObstacles__P2084.info = {"start":26872,"length":54,"line":813,"column":4,"endLine":815,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"clearObstacles","argumentNames":["this"]}
+Sprite_clearObstacles__P31503.info = {"start":26872,"length":54,"line":813,"column":4,"endLine":815,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"clearObstacles","argumentNames":["this"]}
 
-function Sprite_clearObstacles__P2084_mk(s) {
+function Sprite_clearObstacles__P31503_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_clearObstacles__P2084, depth: s.depth + 1,
+        parent: s, fn: Sprite_clearObstacles__P31503, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67231,7 +67519,7 @@ function Sprite_clearObstacles__P2084_mk(s) {
 
 
 
-function Fx_idiv__P158(s) {
+function Fx_idiv__P29693(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67250,12 +67538,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_idiv__P158.info = {"start":1279,"length":111,"line":38,"column":4,"endLine":40,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"idiv","argumentNames":["a","b"]}
+Fx_idiv__P29693.info = {"start":1279,"length":111,"line":38,"column":4,"endLine":40,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"idiv","argumentNames":["a","b"]}
 
-function Fx_idiv__P158_mk(s) {
+function Fx_idiv__P29693_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_idiv__P158, depth: s.depth + 1,
+        parent: s, fn: Fx_idiv__P29693, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -67265,7 +67553,7 @@ function Fx_idiv__P158_mk(s) {
 
 
 
-function Fx_div__P157(s) {
+function Fx_div__P29692(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67286,12 +67574,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_div__P157.info = {"start":1145,"length":129,"line":35,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"div","argumentNames":["a","b"]}
+Fx_div__P29692.info = {"start":1145,"length":129,"line":35,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"div","argumentNames":["a","b"]}
 
-function Fx_div__P157_mk(s) {
+function Fx_div__P29692_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_div__P157, depth: s.depth + 1,
+        parent: s, fn: Fx_div__P29692, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -67302,7 +67590,7 @@ function Fx_div__P157_mk(s) {
 
 
 
-function helpers_arrayMap__P104(s) {
+function helpers_arrayMap__P29639(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67312,58 +67600,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___25371 = undefined;
-    s.len___25373 = undefined;
-    s.i___25376 = undefined;
+    s.res___54941 = undefined;
+    s.len___54943 = undefined;
+    s.i___54946 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___25371 = (r0);
+    s.res___54941 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___25373 = (r0);
-    s.i___25376 = (0);
+    s.len___54943 = (r0);
+    s.i___54946 = (0);
   case 1:
-    r0 = (s.i___25376 < s.len___25373);
+    r0 = (s.i___54946 < s.len___54943);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.res___25371;
+    s.tmp_1 = r0 = s.res___54941;
     s.tmp_3 = lambda_3_mk(s);
     s.tmp_3.argL = s.arg1;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___25376);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___54946);
     s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = s.i___25376;
+    s.tmp_3.arg1 = s.i___54946;
     setupLambda(s.tmp_3, s.tmp_3.argL);
     s.callLocIdx = 4; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___25376 + 1);
-    s.i___25376 = (r0);
+    r0 = (s.i___54946 + 1);
+    s.i___54946 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.res___25371;
+    r0 = s.res___54941;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayMap__P104.info = {"start":6528,"length":299,"line":229,"column":4,"endLine":236,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayMap","argumentNames":["arr","callbackfn"]}
+helpers_arrayMap__P29639.info = {"start":6528,"length":299,"line":229,"column":4,"endLine":236,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayMap","argumentNames":["arr","callbackfn"]}
 
-function helpers_arrayMap__P104_mk(s) {
+function helpers_arrayMap__P29639_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayMap__P104, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayMap__P29639, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  res___25371: undefined,
-  len___25373: undefined,
-  i___25376: undefined,
+  res___54941: undefined,
+  len___54943: undefined,
+  i___54946: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67372,7 +67660,7 @@ function helpers_arrayMap__P104_mk(s) {
 
 
 
-function ArcadePhysicsEngine_draw__P2184(s) {
+function ArcadePhysicsEngine_draw__P31603(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67387,23 +67675,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_draw__P2098_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_draw__P31517_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 550; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 507; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_draw__P2184.info = {"start":2506,"length":39,"line":105,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"draw","argumentNames":["this"]}
+ArcadePhysicsEngine_draw__P31603.info = {"start":2506,"length":39,"line":105,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"draw","argumentNames":["this"]}
 
-function ArcadePhysicsEngine_draw__P2184_mk(s) {
+function ArcadePhysicsEngine_draw__P31603_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_draw__P2184, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_draw__P31603, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -67413,7 +67701,7 @@ function ArcadePhysicsEngine_draw__P2184_mk(s) {
 
 
 
-function sprites_SpriteMap_draw__P2098(s) {
+function sprites_SpriteMap_draw__P31517(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67423,108 +67711,108 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x___25403 = undefined;
-    s.y___25409 = undefined;
-    s.left___25415 = undefined;
-    s.top___25420 = undefined;
-    s.k___25425 = undefined;
-    s.b___25430 = undefined;
+    s.x___54973 = undefined;
+    s.y___54979 = undefined;
+    s.left___54985 = undefined;
+    s.top___54990 = undefined;
+    s.k___54995 = undefined;
+    s.b___55000 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
-    s.x___25403 = (0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C31513_VT)) failedCast(r0);
+    s.x___54973 = (0);
   case 1:
     r0 = s.arg0.fields["columnCount"];
     s.tmp_1 = r0;
-    r0 = (s.x___25403 < s.tmp_1);
+    r0 = (s.x___54973 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.y___25409 = (0);
+    s.y___54979 = (0);
   case 2:
     r0 = s.arg0.fields["rowCount"];
     s.tmp_1 = r0;
-    r0 = (s.y___25409 < s.tmp_1);
+    r0 = (s.y___54979 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_2 = r0;
-    r0 = (s.x___25403 * s.tmp_2);
-    s.left___25415 = (r0);
+    r0 = (s.x___54973 * s.tmp_2);
+    s.left___54985 = (r0);
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_0 = r0;
-    r0 = (s.y___25409 * s.tmp_0);
-    s.top___25420 = (r0);
-    s.tmp_0 = sprites_SpriteMap_key__P4198_mk(s);
+    r0 = (s.y___54979 * s.tmp_0);
+    s.top___54990 = (r0);
+    s.tmp_0 = sprites_SpriteMap_key__P33691_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.left___25415;
-    s.tmp_0.arg2 = s.top___25420;
-    s.callLocIdx = 494; s.pc = 9; return s.tmp_0;
+    s.tmp_0.arg1 = s.left___54985;
+    s.tmp_0.arg2 = s.top___54990;
+    s.callLocIdx = 451; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.k___25425 = (r0);
+    s.k___54995 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___25425);
-    s.b___25430 = (r0);
-    s.tmp_0 = r0 = s.b___25430;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___54995);
+    s.b___55000 = (r0);
+    s.tmp_0 = r0 = s.b___55000;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = pxsim_Array__length(s.b___25430);
+    r0 = pxsim_Array__length(s.b___55000);
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = helpers_imageDrawRect__P1731_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
-    s.tmp_2.arg1 = s.left___25415;
-    s.tmp_2.arg2 = s.top___25420;
+    s.tmp_2 = helpers_imageDrawRect__P31149_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
+    s.tmp_2.arg1 = s.left___54985;
+    s.tmp_2.arg2 = s.top___54990;
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_2.arg3 = r0;
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_2.arg4 = r0;
     s.tmp_2.arg5 = 5;
-    s.callLocIdx = 495; s.pc = 10; return s.tmp_2;
+    s.callLocIdx = 452; s.pc = 10; return s.tmp_2;
   case 10:
     r0 = s.retval;
   case 5:
   case 6:
-    r0 = (s.y___25409 + 1);
-    s.y___25409 = (r0);
+    r0 = (s.y___54979 + 1);
+    s.y___54979 = (r0);
     { step = 2; continue; }
   case 7:
-    r0 = (s.x___25403 + 1);
-    s.x___25403 = (r0);
+    r0 = (s.x___54973 + 1);
+    s.x___54973 = (r0);
     { step = 1; continue; }
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_draw__P2098.info = {"start":1122,"length":496,"line":36,"column":8,"endLine":47,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"draw","argumentNames":["this"]}
+sprites_SpriteMap_draw__P31517.info = {"start":1122,"length":496,"line":36,"column":8,"endLine":47,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"draw","argumentNames":["this"]}
 
-function sprites_SpriteMap_draw__P2098_mk(s) {
+function sprites_SpriteMap_draw__P31517_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_draw__P2098, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_draw__P31517, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  x___25403: undefined,
-  y___25409: undefined,
-  left___25415: undefined,
-  top___25420: undefined,
-  k___25425: undefined,
-  b___25430: undefined,
+  x___54973: undefined,
+  y___54979: undefined,
+  left___54985: undefined,
+  top___54990: undefined,
+  k___54995: undefined,
+  b___55000: undefined,
   arg0: undefined,
 } }
 
@@ -67532,7 +67820,7 @@ function sprites_SpriteMap_draw__P2098_mk(s) {
 
 
 
-function ArcadePhysicsEngine_removeSprite__P2183(s) {
+function ArcadePhysicsEngine_removeSprite__P31602(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67548,7 +67836,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg0.fields["sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg1);
@@ -67556,12 +67844,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_removeSprite__P2183.info = {"start":2420,"length":80,"line":101,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
+ArcadePhysicsEngine_removeSprite__P31602.info = {"start":2420,"length":80,"line":101,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
 
-function ArcadePhysicsEngine_removeSprite__P2183_mk(s) {
+function ArcadePhysicsEngine_removeSprite__P31602_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_removeSprite__P2183, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_removeSprite__P31602, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -67572,7 +67860,7 @@ function ArcadePhysicsEngine_removeSprite__P2183_mk(s) {
 
 
 
-function ArcadePhysicsEngine_addSprite__P2182(s) {
+function ArcadePhysicsEngine_addSprite__P31601(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67582,33 +67870,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___25467 = undefined;
+    s.tm___55037 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C31592_VT)) failedCast(r0);
     r0 = s.arg0.fields["sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 548; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 505; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___25467 = (r0);
-    s.tmp_0 = r0 = s.tm___25467;
+    s.tm___55037 = (r0);
+    s.tmp_0 = r0 = s.tm___55037;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_1 = tiles_TileMap_isOnWall__P2338_mk(s);
-    s.tmp_1.arg0 = s.tm___25467;
+    s.tmp_1 = tiles_TileMap_isOnWall__P31757_mk(s);
+    s.tmp_1.arg0 = s.tm___55037;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 549; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 506; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
   case 2:
@@ -67628,12 +67916,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_addSprite__P2182.info = {"start":2194,"length":220,"line":93,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
+ArcadePhysicsEngine_addSprite__P31601.info = {"start":2194,"length":220,"line":93,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function ArcadePhysicsEngine_addSprite__P2182_mk(s) {
+function ArcadePhysicsEngine_addSprite__P31601_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_addSprite__P2182, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_addSprite__P31601, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67641,7 +67929,7 @@ function ArcadePhysicsEngine_addSprite__P2182_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  tm___25467: undefined,
+  tm___55037: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67650,7 +67938,7 @@ function ArcadePhysicsEngine_addSprite__P2182_mk(s) {
 
 
 
-function scene_BackgroundLayer_constructor__P2282(s) {
+function scene_BackgroundLayer_constructor__P31701(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67668,12 +67956,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_BackgroundLayer__C2275_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_BackgroundLayer__C31694_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
     s.tmp_2.arg0 = 1;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 876; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 833; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -67716,12 +68004,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_BackgroundLayer_constructor__P2282.info = {"start":1936,"length":1117,"line":72,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["this","distance","alignment","img"]}
+scene_BackgroundLayer_constructor__P31701.info = {"start":1936,"length":1117,"line":72,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"inline","argumentNames":["this","distance","alignment","img"]}
 
-function scene_BackgroundLayer_constructor__P2282_mk(s) {
+function scene_BackgroundLayer_constructor__P31701_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_BackgroundLayer_constructor__P2282, depth: s.depth + 1,
+        parent: s, fn: scene_BackgroundLayer_constructor__P31701, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67736,7 +68024,7 @@ function scene_BackgroundLayer_constructor__P2282_mk(s) {
 
 
 
-function scene_Camera_y__P2370(s) {
+function scene_Camera_y__P31789(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67751,10 +68039,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetY"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
@@ -67762,13 +68050,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_y__P2370.info = {"start":1398,"length":79,"line":49,"column":8,"endLine":51,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"y","argumentNames":["this"]}
-scene_Camera_y__P2370.isGetter = true;
+scene_Camera_y__P31789.info = {"start":1398,"length":79,"line":49,"column":8,"endLine":51,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"y","argumentNames":["this"]}
+scene_Camera_y__P31789.isGetter = true;
 
-function scene_Camera_y__P2370_mk(s) {
+function scene_Camera_y__P31789_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_y__P2370, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_y__P31789, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67780,7 +68068,7 @@ function scene_Camera_y__P2370_mk(s) {
 
 
 
-function scene_Camera_x__P2369(s) {
+function scene_Camera_x__P31788(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67795,10 +68083,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetX"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
@@ -67806,13 +68094,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_x__P2369.info = {"start":1311,"length":78,"line":46,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"x","argumentNames":["this"]}
-scene_Camera_x__P2369.isGetter = true;
+scene_Camera_x__P31788.info = {"start":1311,"length":78,"line":46,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"x","argumentNames":["this"]}
+scene_Camera_x__P31788.isGetter = true;
 
-function scene_Camera_x__P2369_mk(s) {
+function scene_Camera_x__P31788_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_x__P2369, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_x__P31788, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67824,7 +68112,7 @@ function scene_Camera_x__P2369_mk(s) {
 
 
 
-function particles_ParticleSource___draw__P2684(s) {
+function particles_ParticleSource___draw__P32103(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67834,18 +68122,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___25747 = undefined;
-    s.left___25750 = undefined;
-    s.top___25760 = undefined;
+    s.current___55317 = undefined;
+    s.left___55320 = undefined;
+    s.top___55330 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
     r0 = s.arg0.fields["head"];
-    s.current___25747 = (r0);
+    s.current___55317 = (r0);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -67863,7 +68151,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.left___25750 = (s.tmp_4);
+    s.left___55320 = (s.tmp_4);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -67881,49 +68169,49 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.top___25760 = (s.tmp_4);
+    s.top___55330 = (s.tmp_4);
   case 5:
-    r0 = pxsim_numops_toBoolDecr(s.current___25747);
+    r0 = pxsim_numops_toBoolDecr(s.current___55317);
     if (!r0) { step = 8; continue; }
-    r0 = s.current___25747.fields["lifespan"];
+    r0 = s.current___55317.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_2 = particles_ParticleSource_drawParticle__P4704_mk(s);
+    s.tmp_2 = particles_ParticleSource_drawParticle__P34197_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.current___25747;
-    s.tmp_2.arg2 = s.left___25750;
-    s.tmp_2.arg3 = s.top___25760;
-    s.callLocIdx = 1527; s.pc = 9; return s.tmp_2;
+    s.tmp_2.arg1 = s.current___55317;
+    s.tmp_2.arg2 = s.left___55320;
+    s.tmp_2.arg3 = s.top___55330;
+    s.callLocIdx = 1484; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
   case 6:
   case 7:
-    r0 = s.current___25747.fields["next"];
-    s.current___25747 = (r0);
+    r0 = s.current___55317.fields["next"];
+    s.current___55317 = (r0);
     { step = 5; continue; }
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource___draw__P2684.info = {"start":3199,"length":468,"line":111,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"__draw","argumentNames":["this","camera"]}
+particles_ParticleSource___draw__P32103.info = {"start":3199,"length":468,"line":111,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"__draw","argumentNames":["this","camera"]}
 
-function particles_ParticleSource___draw__P2684_mk(s) {
+function particles_ParticleSource___draw__P32103_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource___draw__P2684, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource___draw__P32103, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  current___25747: undefined,
-  left___25750: undefined,
-  top___25760: undefined,
+  current___55317: undefined,
+  left___55320: undefined,
+  top___55330: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67932,7 +68220,7 @@ function particles_ParticleSource___draw__P2684_mk(s) {
 
 
 
-function particles_ParticleSource_drawParticle__P4704(s) {
+function particles_ParticleSource_drawParticle__P34197(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67950,8 +68238,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleFactory__C2714_v1_4_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C32097_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleFactory__C32133_v1_4_mk(s);
     r0 = s.arg0.fields["_factory"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
@@ -67963,7 +68251,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - s.arg3);
     s.tmp_0.arg3 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C2714_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C32133_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.drawParticle;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -67972,12 +68260,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_drawParticle__P4704.info = {"start":8598,"length":174,"line":286,"column":8,"endLine":288,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"drawParticle","argumentNames":["this","p","screenLeft","screenTop"]}
+particles_ParticleSource_drawParticle__P34197.info = {"start":8598,"length":174,"line":286,"column":8,"endLine":288,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"drawParticle","argumentNames":["this","p","screenLeft","screenTop"]}
 
-function particles_ParticleSource_drawParticle__P4704_mk(s) {
+function particles_ParticleSource_drawParticle__P34197_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_drawParticle__P4704, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_drawParticle__P34197, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67992,7 +68280,7 @@ function particles_ParticleSource_drawParticle__P4704_mk(s) {
 
 
 
-function particles_ParticleFactory_drawParticle__P2717(s) {
+function particles_ParticleFactory_drawParticle__P32136(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68010,8 +68298,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleFactory__C2714_VT)) failedCast(r0);
-    s.tmp_0 = r0 = globals.screen___1802;
+    if (!checkSubtype(r0, particles_ParticleFactory__C32133_VT)) failedCast(r0);
+    s.tmp_0 = r0 = globals.screen___31220;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -68025,12 +68313,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_drawParticle__P2717.info = {"start":2265,"length":118,"line":85,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
+particles_ParticleFactory_drawParticle__P32136.info = {"start":2265,"length":118,"line":85,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
 
-function particles_ParticleFactory_drawParticle__P2717_mk(s) {
+function particles_ParticleFactory_drawParticle__P32136_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_drawParticle__P2717, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_drawParticle__P32136, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68047,7 +68335,7 @@ function particles_ParticleFactory_drawParticle__P2717_mk(s) {
 
 
 
-function particles_ShapeFactory_createParticle__P2744(s) {
+function particles_ShapeFactory_createParticle__P32163(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68057,47 +68345,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___25547 = undefined;
+    s.p___55117 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
-    s.tmp_0 = particles_AreaFactory_createParticle__P2730_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C32159_VT)) failedCast(r0);
+    s.tmp_0 = particles_AreaFactory_createParticle__P32149_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1621; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1578; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.p___25547 = (r0);
-    s.tmp_0 = r0 = s.p___25547;
-    s.tmp_2 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.p___55117 = (r0);
+    s.tmp_0 = r0 = s.p___55117;
+    s.tmp_2 = Math_FastRandom_randomRange__P32009_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 1;
     s.tmp_2.arg2 = 14;
-    s.callLocIdx = 1622; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 1579; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["color"] = (s.tmp_1);
-    r0 = s.p___25547;
+    r0 = s.p___55117;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_createParticle__P2744.info = {"start":7505,"length":178,"line":239,"column":8,"endLine":243,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_ShapeFactory_createParticle__P32163.info = {"start":7505,"length":178,"line":239,"column":8,"endLine":243,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_ShapeFactory_createParticle__P2744_mk(s) {
+function particles_ShapeFactory_createParticle__P32163_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_createParticle__P2744, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_createParticle__P32163, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  p___25547: undefined,
+  p___55117: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -68106,7 +68394,7 @@ function particles_ShapeFactory_createParticle__P2744_mk(s) {
 
 
 
-function particles_AreaFactory_createParticle__P2730(s) {
+function particles_AreaFactory_createParticle__P32149(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68116,42 +68404,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___25559 = undefined;
+    s.p___55129 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_AreaFactory__C2724_VT)) failedCast(r0);
-    s.tmp_0 = particles_SprayFactory_createParticle__P2720_mk(s);
+    if (!checkSubtype(r0, particles_AreaFactory__C32143_VT)) failedCast(r0);
+    s.tmp_0 = particles_SprayFactory_createParticle__P32139_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1603; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1560; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.p___25559 = (r0);
-    s.tmp_0 = r0 = s.p___25559;
-    s.tmp_2 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.p___55129 = (r0);
+    s.tmp_0 = r0 = s.p___55129;
+    s.tmp_2 = Math_FastRandom_randomRange__P32009_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_2.arg0 = r0;
     r0 = s.arg0.fields["minLifespan"];
     s.tmp_2.arg1 = r0;
     r0 = s.arg0.fields["maxLifespan"];
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 1604; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1561; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["lifespan"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.p___25559;
-    s.tmp_4 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.tmp_0 = r0 = s.p___55129;
+    s.tmp_4 = Math_FastRandom_randomRange__P32009_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = 0;
     r0 = s.arg0.fields["xRange"];
     s.tmp_4.arg2 = r0;
-    s.callLocIdx = 1605; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 1562; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -68161,7 +68449,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_3 - s.tmp_5);
     s.tmp_2 = r0;
-    r0 = s.p___25559.fields["_x"];
+    r0 = s.p___55129.fields["_x"];
     s.tmp_7 = r0;
     r0 = (s.tmp_2 << 8);
     s.tmp_8 = r0;
@@ -68176,7 +68464,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["height"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["height"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1608; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 1565; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -68191,7 +68479,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["height"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["height"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1609; s.pc = 7; return s.tmp_3; }
+     else { s.callLocIdx = 1566; s.pc = 7; return s.tmp_3; }
     }
   case 7:
     r0 = s.retval;
@@ -68203,36 +68491,36 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.tmp_5 = r0 = s.p___25559;
-    s.tmp_9 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.tmp_5 = r0 = s.p___55129;
+    s.tmp_9 = Math_FastRandom_randomRange__P32009_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = 0;
     r0 = s.arg0.fields["yRange"];
     s.tmp_9.arg2 = r0;
-    s.callLocIdx = 1607; s.pc = 8; return s.tmp_9;
+    s.callLocIdx = 1564; s.pc = 8; return s.tmp_9;
   case 8:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_8 - s.tmp_4);
     s.tmp_7 = r0;
-    r0 = s.p___25559.fields["_y"];
+    r0 = s.p___55129.fields["_y"];
     s.tmp_10 = r0;
     r0 = (s.tmp_7 << 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_11 + s.tmp_10);
     s.tmp_6 = r0;
     r0 = (s.tmp_5).fields["_y"] = (s.tmp_6);
-    r0 = s.p___25559;
+    r0 = s.p___55129;
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_createParticle__P2730.info = {"start":4334,"length":426,"line":148,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_AreaFactory_createParticle__P32149.info = {"start":4334,"length":426,"line":148,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_AreaFactory_createParticle__P2730_mk(s) {
+function particles_AreaFactory_createParticle__P32149_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_createParticle__P2730, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_createParticle__P32149, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68246,7 +68534,7 @@ function particles_AreaFactory_createParticle__P2730_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  p___25559: undefined,
+  p___55129: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -68255,7 +68543,7 @@ function particles_AreaFactory_createParticle__P2730_mk(s) {
 
 
 
-function particles_SprayFactory_createParticle__P2720(s) {
+function particles_SprayFactory_createParticle__P32139(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68265,39 +68553,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___25607 = undefined;
-    s.angle___25611 = undefined;
+    s.p___55177 = undefined;
+    s.angle___55181 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleFactory_createParticle__P2716_mk(s);
+    if (!checkSubtype(r0, particles_SprayFactory__C32137_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleFactory_createParticle__P32135_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1592; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1549; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.p___25607 = (r0);
+    s.p___55177 = (r0);
     r0 = s.arg0.fields["minAngle"];
     s.tmp_1 = r0;
-    s.tmp_3 = Math_FastRandom_randomRange__P2590_mk(s);
-    s.tmp_3.arg0 = globals.galois___4718;
+    s.tmp_3 = Math_FastRandom_randomRange__P32009_mk(s);
+    s.tmp_3.arg0 = globals.galois___34211;
     s.tmp_3.arg1 = 0;
     r0 = s.arg0.fields["spread"];
     s.tmp_3.arg2 = r0;
-    s.callLocIdx = 1593; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 1550; s.pc = 2; return s.tmp_3;
   case 2:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 % 100);
-    s.angle___25611 = (r0);
-    s.tmp_0 = r0 = s.p___25607;
-    r0 = pxsim_Array__getAt(globals.cachedSin___4713, s.angle___25611);
+    s.angle___55181 = (r0);
+    s.tmp_0 = r0 = s.p___55177;
+    r0 = pxsim_Array__getAt(globals.cachedSin___34206, s.angle___55181);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["speed"];
     s.tmp_3 = r0;
@@ -68306,8 +68594,8 @@ switch (step) {
     r0 = (s.tmp_4 >> 8);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["vx"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.p___25607;
-    r0 = pxsim_Array__getAt(globals.cachedCos___4714, s.angle___25611);
+    s.tmp_0 = r0 = s.p___55177;
+    r0 = pxsim_Array__getAt(globals.cachedCos___34207, s.angle___55181);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["speed"];
     s.tmp_3 = r0;
@@ -68316,24 +68604,24 @@ switch (step) {
     r0 = (s.tmp_4 >> 8);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["vy"] = (s.tmp_1);
-    r0 = s.p___25607;
+    r0 = s.p___55177;
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_createParticle__P2720.info = {"start":2851,"length":333,"line":105,"column":8,"endLine":113,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_SprayFactory_createParticle__P32139.info = {"start":2851,"length":333,"line":105,"column":8,"endLine":113,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_SprayFactory_createParticle__P2720_mk(s) {
+function particles_SprayFactory_createParticle__P32139_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_createParticle__P2720, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_createParticle__P32139, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  p___25607: undefined,
-  angle___25611: undefined,
+  p___55177: undefined,
+  angle___55181: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -68342,7 +68630,7 @@ function particles_SprayFactory_createParticle__P2720_mk(s) {
 
 
 
-function effects_ScreenEffect_startScreenEffect__P2795(s) {
+function effects_ScreenEffect_startScreenEffect__P32214(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68359,7 +68647,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ScreenEffect__C2793_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ScreenEffect__C32212_VT)) failedCast(r0);
     r0 = s.arg0.fields["sourceFactory"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -68378,10 +68666,10 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 4; continue; }
   case 3:
-    s.tmp_4 = particles_ParticleSource_enabled__P2690_mk(s);
+    s.tmp_4 = particles_ParticleSource_enabled__P32109_mk(s);
     r0 = s.arg0.fields["source"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 1634; s.pc = 14; return s.tmp_4;
+    s.callLocIdx = 1591; s.pc = 14; return s.tmp_4;
   case 14:
     r0 = s.retval;
   case 4:
@@ -68399,16 +68687,16 @@ switch (step) {
     { step = 13; continue; }
   case 7:
   case 8:
-    s.tmp_0 = effects_ScreenEffect_endScreenEffect__P2796_mk(s);
+    s.tmp_0 = effects_ScreenEffect_endScreenEffect__P32215_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1635; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1592; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(effects_SceneAnchor__C4746_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_SceneAnchor__C34239_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_SceneAnchor_constructor__P4751_mk(s);
+    s.tmp_1 = effects_SceneAnchor_constructor__P34244_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1636; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 1593; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -68427,12 +68715,12 @@ switch (step) {
     s.tmp_5.arg2 = s.tmp_2;
     if (!s.tmp_5.arg0.vtable.iface) {
       setupLambda(s.tmp_5, pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "sourceFactory"), 3);
-      s.callLocIdx = 1637; s.pc = 17; return s.tmp_5;
+      s.callLocIdx = 1594; s.pc = 17; return s.tmp_5;
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["sourceFactory"];
-      if (s.tmp_5.fn == null) { setupLambda(s.tmp_5, s.tmp_5.arg0.fields["sourceFactory"], 3); s.callLocIdx = 1637; s.pc = 17; return s.tmp_5; }
-      else if (s.tmp_5.fn.isGetter) { s.tmp_5.stage2Call = true; s.callLocIdx = 1637; s.pc = 17; return s.tmp_5;; }
-     else { s.callLocIdx = 1637; s.pc = 17; return s.tmp_5; }
+      if (s.tmp_5.fn == null) { setupLambda(s.tmp_5, s.tmp_5.arg0.fields["sourceFactory"], 3); s.callLocIdx = 1594; s.pc = 17; return s.tmp_5; }
+      else if (s.tmp_5.fn.isGetter) { s.tmp_5.stage2Call = true; s.callLocIdx = 1594; s.pc = 17; return s.tmp_5;; }
+     else { s.callLocIdx = 1594; s.pc = 17; return s.tmp_5; }
     }
   case 17:
     r0 = s.retval;
@@ -68453,12 +68741,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ScreenEffect_startScreenEffect__P2795.info = {"start":3680,"length":601,"line":97,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"startScreenEffect","argumentNames":["this","duration","particlesPerSecond"]}
+effects_ScreenEffect_startScreenEffect__P32214.info = {"start":3680,"length":601,"line":97,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"startScreenEffect","argumentNames":["this","duration","particlesPerSecond"]}
 
-function effects_ScreenEffect_startScreenEffect__P2795_mk(s) {
+function effects_ScreenEffect_startScreenEffect__P32214_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ScreenEffect_startScreenEffect__P2795, depth: s.depth + 1,
+        parent: s, fn: effects_ScreenEffect_startScreenEffect__P32214, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68476,7 +68764,7 @@ function effects_ScreenEffect_startScreenEffect__P2795_mk(s) {
 
 
 
-function effects_SceneAnchor_constructor__P4751(s) {
+function effects_SceneAnchor_constructor__P34244(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68491,10 +68779,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_SceneAnchor__C34239_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1630; s.pc = 1; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1587; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["camera"];
@@ -68504,12 +68792,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_constructor__P4751.info = {"start":2296,"length":79,"line":55,"column":8,"endLine":57,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this"]}
+effects_SceneAnchor_constructor__P34244.info = {"start":2296,"length":79,"line":55,"column":8,"endLine":57,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"inline","argumentNames":["this"]}
 
-function effects_SceneAnchor_constructor__P4751_mk(s) {
+function effects_SceneAnchor_constructor__P34244_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_constructor__P4751, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_constructor__P34244, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68521,7 +68809,7 @@ function effects_SceneAnchor_constructor__P4751_mk(s) {
 
 
 
-function effects_ScreenEffect_endScreenEffect__P2796(s) {
+function effects_ScreenEffect_endScreenEffect__P32215(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68536,15 +68824,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ScreenEffect__C2793_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ScreenEffect__C32212_VT)) failedCast(r0);
     r0 = s.arg0.fields["source"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = particles_ParticleSource_destroy__P2692_mk(s);
+    s.tmp_1 = particles_ParticleSource_destroy__P32111_mk(s);
     r0 = s.arg0.fields["source"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1638; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1595; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["source"] = (undefined);
@@ -68554,12 +68842,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ScreenEffect_endScreenEffect__P2796.info = {"start":4677,"length":160,"line":122,"column":8,"endLine":127,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"endScreenEffect","argumentNames":["this"]}
+effects_ScreenEffect_endScreenEffect__P32215.info = {"start":4677,"length":160,"line":122,"column":8,"endLine":127,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"endScreenEffect","argumentNames":["this"]}
 
-function effects_ScreenEffect_endScreenEffect__P2796_mk(s) {
+function effects_ScreenEffect_endScreenEffect__P32215_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ScreenEffect_endScreenEffect__P2796, depth: s.depth + 1,
+        parent: s, fn: effects_ScreenEffect_endScreenEffect__P32215, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68570,7 +68858,7 @@ function effects_ScreenEffect_endScreenEffect__P2796_mk(s) {
 
 
 
-function effects_ImageEffect_startScreenEffect__P2820(s) {
+function effects_ImageEffect_startScreenEffect__P32239(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68580,7 +68868,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.wasRunning___25699 = undefined;
+    s.wasRunning___55269 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -68588,9 +68876,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
-    s.tmp_4 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1656; s.pc = 8; return s.tmp_4;
+    if (!checkSubtype(r0, effects_ImageEffect__C32235_VT)) failedCast(r0);
+    s.tmp_4 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1613; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     r0 = r0.fields["background"];
@@ -68617,7 +68905,7 @@ switch (step) {
     r0 = s.arg0.fields["times"];
     s.tmp_9 = r0;
     r0 = (s.tmp_9 != undefined);
-    s.wasRunning___25699 = (r0);
+    s.wasRunning___55269 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 3; continue; }
     r0 = s.arg1;
@@ -68628,13 +68916,13 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_0 = r0;
     r0 = (s.arg0).fields["times"] = (s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(s.wasRunning___25699);
+    r0 = pxsim_numops_toBoolDecr(s.wasRunning___55269);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkAction(2, inline__P25712);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P55282);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.arg0);
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 1, s.arg2);
@@ -68646,12 +68934,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_startScreenEffect__P2820.info = {"start":1457,"length":637,"line":41,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"startScreenEffect","argumentNames":["this","times","delay"]}
+effects_ImageEffect_startScreenEffect__P32239.info = {"start":1457,"length":637,"line":41,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/game---hw/effects.ts","functionName":"startScreenEffect","argumentNames":["this","times","delay"]}
 
-function effects_ImageEffect_startScreenEffect__P2820_mk(s) {
+function effects_ImageEffect_startScreenEffect__P32239_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_startScreenEffect__P2820, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_startScreenEffect__P32239, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68663,7 +68951,7 @@ function effects_ImageEffect_startScreenEffect__P2820_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  wasRunning___25699: undefined,
+  wasRunning___55269: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -68673,7 +68961,7 @@ function effects_ImageEffect_startScreenEffect__P2820_mk(s) {
 
 
 
-function inline__P25712(s) {
+function inline__P55282(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68690,14 +68978,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = effects_ImageEffect_change__P2819_mk(s);
+    s.tmp_2 = effects_ImageEffect_change__P32238_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.tmp_3 = scene_backgroundImage__P2460_mk(s);
-    s.callLocIdx = 1658; s.pc = 6; return s.tmp_3;
+    s.tmp_3 = scene_backgroundImage__P31879_mk(s);
+    s.callLocIdx = 1615; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1659; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1616; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.caps[1]);
@@ -68709,9 +68997,9 @@ switch (step) {
   case 3:
     // jmp value (already in r0)
     s.tmp_0 = r0;
-    s.tmp_1 = pause__P402_mk(s);
+    s.tmp_1 = pause__P29937_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1660; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1617; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     s.tmp_0 = r0 = s.caps[0];
@@ -68727,12 +69015,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P25712.info = {"start":1764,"length":304,"line":47,"column":38,"endLine":54,"endColumn":17,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":[]}
+inline__P55282.info = {"start":1764,"length":304,"line":47,"column":38,"endLine":54,"endColumn":17,"fileName":"pxt_modules/game---hw/effects.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P25712_mk(s) {
+function inline__P55282_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P25712, depth: s.depth + 1,
+        parent: s, fn: inline__P55282, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68744,7 +69032,7 @@ function inline__P25712_mk(s) {
 
 
 
-function scene_backgroundImage__P2460(s) {
+function scene_backgroundImage__P31879(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68754,37 +69042,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___25731 = undefined;
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 1058; s.pc = 1; return s.tmp_0;
+    s.scene___55301 = undefined;
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 1015; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___25731 = (r0);
-    s.tmp_0 = scene_Background_image__P2271_mk(s);
-    r0 = s.scene___25731.fields["background"];
+    s.scene___55301 = (r0);
+    s.tmp_0 = scene_Background_image__P31690_mk(s);
+    r0 = s.scene___55301.fields["background"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1059; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1016; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_backgroundImage__P2460.info = {"start":2273,"length":130,"line":90,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"backgroundImage","argumentNames":[]}
+scene_backgroundImage__P31879.info = {"start":2273,"length":130,"line":90,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"backgroundImage","argumentNames":[]}
 
-function scene_backgroundImage__P2460_mk(s) {
+function scene_backgroundImage__P31879_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_backgroundImage__P2460, depth: s.depth + 1,
+        parent: s, fn: scene_backgroundImage__P31879, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___25731: undefined,
+  scene___55301: undefined,
 } }
 
 
 
 
 
-function scene_Background_hasBackgroundImage__P2273(s) {
+function scene_Background_hasBackgroundImage__P31692(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68799,7 +69087,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C31684_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
@@ -68812,12 +69100,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_hasBackgroundImage__P2273.info = {"start":1081,"length":75,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"hasBackgroundImage","argumentNames":["this"]}
+scene_Background_hasBackgroundImage__P31692.info = {"start":1081,"length":75,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"hasBackgroundImage","argumentNames":["this"]}
 
-function scene_Background_hasBackgroundImage__P2273_mk(s) {
+function scene_Background_hasBackgroundImage__P31692_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_hasBackgroundImage__P2273, depth: s.depth + 1,
+        parent: s, fn: scene_Background_hasBackgroundImage__P31692, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68830,7 +69118,41 @@ function scene_Background_hasBackgroundImage__P2273_mk(s) {
 
 
 
-function info_PlayerInfo_id__P2240(s) {
+function music_Melody_toString__P32287(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, music_Melody__C32278_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_text"];
+    return leave(s, r0)
+  default: oops()
+} } }
+music_Melody_toString__P32287.info = {"start":9640,"length":53,"line":303,"column":8,"endLine":305,"endColumn":9,"fileName":"pxt_modules/mixer---samd/melody.ts","functionName":"toString","argumentNames":["this"]}
+
+function music_Melody_toString__P32287_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_Melody_toString__P32287, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function info_PlayerInfo_id__P31659(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68845,17 +69167,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_PlayerInfo__C31645_VT)) failedCast(r0);
     r0 = s.arg0.fields["_player"];
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_id__P2240.info = {"start":17259,"length":57,"line":568,"column":8,"endLine":570,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"id","argumentNames":["this"]}
+info_PlayerInfo_id__P31659.info = {"start":17259,"length":57,"line":568,"column":8,"endLine":570,"endColumn":9,"fileName":"pxt_modules/game---hw/info.ts","functionName":"id","argumentNames":["this"]}
 
-function info_PlayerInfo_id__P2240_mk(s) {
+function info_PlayerInfo_id__P31659_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_id__P2240, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_id__P31659, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -68864,7 +69186,7 @@ function info_PlayerInfo_id__P2240_mk(s) {
 
 
 
-function Sprite_toString__P2090(s) {
+function Sprite_toString__P31509(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68879,7 +69201,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_9 = r0;
     r0 = s.arg0.fields["id"];
@@ -68897,9 +69219,9 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_String__concat(s.tmp_8, "(");
     s.tmp_7 = r0;
-    s.tmp_14 = Sprite_x__P2025_mk(s);
+    s.tmp_14 = Sprite_x__P31444_mk(s);
     s.tmp_14.arg0 = s.arg0;
-    s.callLocIdx = 475; s.pc = 2; return s.tmp_14;
+    s.callLocIdx = 432; s.pc = 2; return s.tmp_14;
   case 2:
     r0 = s.retval;
     s.tmp_13 = r0;
@@ -68916,9 +69238,9 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_6, ",");
     s.tmp_5 = r0;
-    s.tmp_17 = Sprite_y__P2027_mk(s);
+    s.tmp_17 = Sprite_y__P31446_mk(s);
     s.tmp_17.arg0 = s.arg0;
-    s.callLocIdx = 476; s.pc = 4; return s.tmp_17;
+    s.callLocIdx = 433; s.pc = 4; return s.tmp_17;
   case 4:
     r0 = s.retval;
     s.tmp_16 = r0;
@@ -68935,9 +69257,9 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_4, ")->(");
     s.tmp_3 = r0;
-    s.tmp_20 = Sprite_vx__P2029_mk(s);
+    s.tmp_20 = Sprite_vx__P31448_mk(s);
     s.tmp_20.arg0 = s.arg0;
-    s.callLocIdx = 477; s.pc = 6; return s.tmp_20;
+    s.callLocIdx = 434; s.pc = 6; return s.tmp_20;
   case 6:
     r0 = s.retval;
     s.tmp_19 = r0;
@@ -68954,9 +69276,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_23 = Sprite_vy__P2031_mk(s);
+    s.tmp_23 = Sprite_vy__P31450_mk(s);
     s.tmp_23.arg0 = s.arg0;
-    s.callLocIdx = 478; s.pc = 8; return s.tmp_23;
+    s.callLocIdx = 435; s.pc = 8; return s.tmp_23;
   case 8:
     r0 = s.retval;
     s.tmp_22 = r0;
@@ -68975,12 +69297,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_toString__P2090.info = {"start":33194,"length":93,"line":980,"column":4,"endLine":982,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"toString","argumentNames":["this"]}
+Sprite_toString__P31509.info = {"start":33194,"length":93,"line":980,"column":4,"endLine":982,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"toString","argumentNames":["this"]}
 
-function Sprite_toString__P2090_mk(s) {
+function Sprite_toString__P31509_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_toString__P2090, depth: s.depth + 1,
+        parent: s, fn: Sprite_toString__P31509, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69013,7 +69335,7 @@ function Sprite_toString__P2090_mk(s) {
 
 
 
-function Sprite___update__P2078(s) {
+function Sprite___update__P31497(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69023,8 +69345,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bounce___25868 = undefined;
-    s.tm___25873 = undefined;
+    s.bounce___55438 = undefined;
+    s.tm___55443 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -69032,7 +69354,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
@@ -69054,9 +69376,9 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["lifespan"] = (undefined);
-    s.tmp_0 = Sprite__destroyCore__P2088_mk(s);
+    s.tmp_0 = Sprite__destroyCore__P31507_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 379; s.pc = 33; return s.tmp_0;
+    s.callLocIdx = 336; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
   case 1:
@@ -69072,10 +69394,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_2 = Sprite_isOutOfScreen__P2076_mk(s);
+    s.tmp_2 = Sprite_isOutOfScreen__P31495_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 380; s.pc = 34; return s.tmp_2;
+    s.callLocIdx = 337; s.pc = 34; return s.tmp_2;
   case 34:
     r0 = s.retval;
   case 6:
@@ -69083,11 +69405,11 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = Sprite_destroy__P2087_mk(s);
+    s.tmp_4 = Sprite_destroy__P31506_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = undefined;
     s.tmp_4.arg2 = undefined;
-    s.callLocIdx = 381; s.pc = 35; return s.tmp_4;
+    s.callLocIdx = 338; s.pc = 35; return s.tmp_4;
   case 35:
     r0 = s.retval;
   case 7:
@@ -69095,13 +69417,13 @@ switch (step) {
     r0 = s.arg0.fields["flags"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 & 32);
-    s.bounce___25868 = (r0);
-    s.tmp_0 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 382; s.pc = 36; return s.tmp_0;
+    s.bounce___55438 = (r0);
+    s.tmp_0 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 339; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___25873 = (r0);
+    s.tm___55443 = (r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 8);
@@ -69111,13 +69433,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 9:
-    s.tmp_2 = r0 = s.bounce___25868;
+    s.tmp_2 = r0 = s.bounce___55438;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 10; continue; }
     r0 = s.tmp_2;
     { step = 11; continue; }
   case 10:
-    r0 = pxsim_numops_toBoolDecr(s.tm___25873);
+    r0 = pxsim_numops_toBoolDecr(s.tm___55443);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
   case 11:
@@ -69129,9 +69451,9 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 29; continue; }
-    s.tmp_8 = Sprite_left__P2062_mk(s);
+    s.tmp_8 = Sprite_left__P31481_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 383; s.pc = 37; return s.tmp_8;
+    s.callLocIdx = 340; s.pc = 37; return s.tmp_8;
   case 37:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -69141,41 +69463,41 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 15; continue; }
-    s.tmp_10 = Sprite_left__P2063_mk(s);
+    s.tmp_10 = Sprite_left__P31482_mk(s);
     s.tmp_10.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_10.arg1 = r0;
-    s.callLocIdx = 386; s.pc = 38; return s.tmp_10;
+    s.callLocIdx = 343; s.pc = 38; return s.tmp_10;
   case 38:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___25868);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___55438);
     if (!r0) { step = 13; continue; }
-    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    s.tmp_0 = Sprite_vx__P31449_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vx__P2029_mk(s);
+    s.tmp_2 = Sprite_vx__P31448_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 387; s.pc = 40; return s.tmp_2;
+    s.callLocIdx = 344; s.pc = 40; return s.tmp_2;
   case 40:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (0 - s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 388; s.pc = 39; return s.tmp_0;
+    s.callLocIdx = 345; s.pc = 39; return s.tmp_0;
   case 39:
     r0 = s.retval;
   case 13:
   case 14:
     { step = 20; continue; }
   case 15:
-    s.tmp_2 = Sprite_right__P2064_mk(s);
+    s.tmp_2 = Sprite_right__P31483_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 389; s.pc = 41; return s.tmp_2;
+    s.callLocIdx = 346; s.pc = 41; return s.tmp_2;
   case 41:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_4 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_3 = r0;
@@ -69183,30 +69505,30 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.tmp_6 = Sprite_right__P2065_mk(s);
+    s.tmp_6 = Sprite_right__P31484_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_7 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6.arg1 = r0;
-    s.callLocIdx = 392; s.pc = 42; return s.tmp_6;
+    s.callLocIdx = 349; s.pc = 42; return s.tmp_6;
   case 42:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___25868);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___55438);
     if (!r0) { step = 16; continue; }
-    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    s.tmp_0 = Sprite_vx__P31449_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vx__P2029_mk(s);
+    s.tmp_2 = Sprite_vx__P31448_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 393; s.pc = 44; return s.tmp_2;
+    s.callLocIdx = 350; s.pc = 44; return s.tmp_2;
   case 44:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (0 - s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 394; s.pc = 43; return s.tmp_0;
+    s.callLocIdx = 351; s.pc = 43; return s.tmp_0;
   case 43:
     r0 = s.retval;
   case 16:
@@ -69214,9 +69536,9 @@ switch (step) {
   case 18:
   case 19:
   case 20:
-    s.tmp_2 = Sprite_top__P2066_mk(s);
+    s.tmp_2 = Sprite_top__P31485_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 395; s.pc = 45; return s.tmp_2;
+    s.callLocIdx = 352; s.pc = 45; return s.tmp_2;
   case 45:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -69226,41 +69548,41 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 23; continue; }
-    s.tmp_4 = Sprite_top__P2067_mk(s);
+    s.tmp_4 = Sprite_top__P31486_mk(s);
     s.tmp_4.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 398; s.pc = 46; return s.tmp_4;
+    s.callLocIdx = 355; s.pc = 46; return s.tmp_4;
   case 46:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___25868);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___55438);
     if (!r0) { step = 21; continue; }
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vy__P2031_mk(s);
+    s.tmp_2 = Sprite_vy__P31450_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 399; s.pc = 48; return s.tmp_2;
+    s.callLocIdx = 356; s.pc = 48; return s.tmp_2;
   case 48:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (0 - s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 400; s.pc = 47; return s.tmp_0;
+    s.callLocIdx = 357; s.pc = 47; return s.tmp_0;
   case 47:
     r0 = s.retval;
   case 21:
   case 22:
     { step = 28; continue; }
   case 23:
-    s.tmp_2 = Sprite_bottom__P2068_mk(s);
+    s.tmp_2 = Sprite_bottom__P31487_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 401; s.pc = 49; return s.tmp_2;
+    s.callLocIdx = 358; s.pc = 49; return s.tmp_2;
   case 49:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_4 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_3 = r0;
@@ -69268,30 +69590,30 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    s.tmp_6 = Sprite_bottom__P2069_mk(s);
+    s.tmp_6 = Sprite_bottom__P31488_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_7 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6.arg1 = r0;
-    s.callLocIdx = 404; s.pc = 50; return s.tmp_6;
+    s.callLocIdx = 361; s.pc = 50; return s.tmp_6;
   case 50:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___25868);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___55438);
     if (!r0) { step = 24; continue; }
-    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0 = Sprite_vy__P31451_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vy__P2031_mk(s);
+    s.tmp_2 = Sprite_vy__P31450_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 405; s.pc = 52; return s.tmp_2;
+    s.callLocIdx = 362; s.pc = 52; return s.tmp_2;
   case 52:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (0 - s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 406; s.pc = 51; return s.tmp_0;
+    s.callLocIdx = 363; s.pc = 51; return s.tmp_0;
   case 51:
     r0 = s.retval;
   case 24:
@@ -69311,12 +69633,12 @@ switch (step) {
     s.tmp_1.arg2 = s.arg1;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "updateSay"), 3);
-      s.callLocIdx = 407; s.pc = 53; return s.tmp_1;
+      s.callLocIdx = 364; s.pc = 53; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["updateSay"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["updateSay"], 3); s.callLocIdx = 407; s.pc = 53; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 407; s.pc = 53; return s.tmp_1;; }
-     else { s.callLocIdx = 407; s.pc = 53; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["updateSay"], 3); s.callLocIdx = 364; s.pc = 53; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 364; s.pc = 53; return s.tmp_1;; }
+     else { s.callLocIdx = 364; s.pc = 53; return s.tmp_1; }
     }
   case 53:
     r0 = s.retval;
@@ -69326,12 +69648,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___update__P2078.info = {"start":22253,"length":1390,"line":682,"column":4,"endLine":721,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
+Sprite___update__P31497.info = {"start":22253,"length":1390,"line":682,"column":4,"endLine":721,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
 
-function Sprite___update__P2078_mk(s) {
+function Sprite___update__P31497_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___update__P2078, depth: s.depth + 1,
+        parent: s, fn: Sprite___update__P31497, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69344,8 +69666,8 @@ function Sprite___update__P2078_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  bounce___25868: undefined,
-  tm___25873: undefined,
+  bounce___55438: undefined,
+  tm___55443: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -69355,7 +69677,7 @@ function Sprite___update__P2078_mk(s) {
 
 
 
-function Sprite_isOutOfScreen__P2076(s) {
+function Sprite_isOutOfScreen__P31495(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69365,15 +69687,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___25950 = undefined;
-    s.oy___25958 = undefined;
+    s.ox___55520 = undefined;
+    s.oy___55528 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -69387,7 +69709,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.ox___25950 = (s.tmp_2);
+    s.ox___55520 = (s.tmp_2);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -69401,14 +69723,14 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___25958 = (s.tmp_2);
-    s.tmp_3 = Sprite_right__P2064_mk(s);
+    s.oy___55528 = (s.tmp_2);
+    s.tmp_3 = Sprite_right__P31483_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 348; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 305; s.pc = 11; return s.tmp_3;
   case 11:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.ox___25950);
+    r0 = (s.tmp_2 - s.ox___55520);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -69417,13 +69739,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_6 = Sprite_bottom__P2068_mk(s);
+    s.tmp_6 = Sprite_bottom__P31487_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 349; s.pc = 12; return s.tmp_6;
+    s.callLocIdx = 306; s.pc = 12; return s.tmp_6;
   case 12:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.oy___25958);
+    r0 = (s.tmp_5 - s.oy___55528);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 < 0);
   case 6:
@@ -69434,15 +69756,15 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 8; continue; }
   case 7:
-    s.tmp_10 = Sprite_left__P2062_mk(s);
+    s.tmp_10 = Sprite_left__P31481_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 350; s.pc = 13; return s.tmp_10;
+    s.callLocIdx = 307; s.pc = 13; return s.tmp_10;
   case 13:
     r0 = s.retval;
     s.tmp_9 = r0;
-    r0 = (s.tmp_9 - s.ox___25950);
+    r0 = (s.tmp_9 - s.ox___55520);
     s.tmp_8 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_11 = r0;
     r0 = (s.tmp_8 > s.tmp_11);
   case 8:
@@ -69453,15 +69775,15 @@ switch (step) {
     r0 = s.tmp_12;
     { step = 10; continue; }
   case 9:
-    s.tmp_15 = Sprite_top__P2066_mk(s);
+    s.tmp_15 = Sprite_top__P31485_mk(s);
     s.tmp_15.arg0 = s.arg0;
-    s.callLocIdx = 351; s.pc = 14; return s.tmp_15;
+    s.callLocIdx = 308; s.pc = 14; return s.tmp_15;
   case 14:
     r0 = s.retval;
     s.tmp_14 = r0;
-    r0 = (s.tmp_14 - s.oy___25958);
+    r0 = (s.tmp_14 - s.oy___55528);
     s.tmp_13 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_16 = r0;
     r0 = (s.tmp_13 > s.tmp_16);
   case 10:
@@ -69471,12 +69793,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_isOutOfScreen__P2076.info = {"start":20500,"length":358,"line":636,"column":4,"endLine":640,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isOutOfScreen","argumentNames":["this","camera"]}
+Sprite_isOutOfScreen__P31495.info = {"start":20500,"length":358,"line":636,"column":4,"endLine":640,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"isOutOfScreen","argumentNames":["this","camera"]}
 
-function Sprite_isOutOfScreen__P2076_mk(s) {
+function Sprite_isOutOfScreen__P31495_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isOutOfScreen__P2076, depth: s.depth + 1,
+        parent: s, fn: Sprite_isOutOfScreen__P31495, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69496,8 +69818,8 @@ function Sprite_isOutOfScreen__P2076_mk(s) {
   tmp_15: undefined,
   tmp_16: undefined,
   tmp_17: undefined,
-  ox___25950: undefined,
-  oy___25958: undefined,
+  ox___55520: undefined,
+  oy___55528: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -69506,7 +69828,7 @@ function Sprite_isOutOfScreen__P2076_mk(s) {
 
 
 
-function Sprite_data__P2042(s) {
+function Sprite_data__P31461(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69522,18 +69844,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_data"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_data__P2042.info = {"start":4292,"length":56,"line":165,"column":4,"endLine":167,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this","value"]}
+Sprite_data__P31461.info = {"start":4292,"length":56,"line":165,"column":4,"endLine":167,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"data","argumentNames":["this","value"]}
 
-function Sprite_data__P2042_mk(s) {
+function Sprite_data__P31461_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_data__P2042, depth: s.depth + 1,
+        parent: s, fn: Sprite_data__P31461, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -69543,7 +69865,7 @@ function Sprite_data__P2042_mk(s) {
 
 
 
-function sprites_BaseSprite___update__P1866(s) {
+function sprites_BaseSprite___update__P31285(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69560,17 +69882,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C31277_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___update__P1866.info = {"start":1027,"length":46,"line":45,"column":8,"endLine":45,"endColumn":54,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
+sprites_BaseSprite___update__P31285.info = {"start":1027,"length":46,"line":45,"column":8,"endLine":45,"endColumn":54,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
 
-function sprites_BaseSprite___update__P1866_mk(s) {
+function sprites_BaseSprite___update__P31285_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___update__P1866, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___update__P31285, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -69581,7 +69903,7 @@ function sprites_BaseSprite___update__P1866_mk(s) {
 
 
 
-function sprites_BaseSprite___draw__P1864(s) {
+function sprites_BaseSprite___draw__P31283(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69597,10 +69919,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
-    s.tmp_1 = sprites_BaseSprite__C1858_v0_1_mk(s);
+    if (!checkSubtype(r0, sprites_BaseSprite__C31277_VT)) failedCast(r0);
+    s.tmp_1 = sprites_BaseSprite__C31277_v0_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_1.arg0, sprites_BaseSprite__C1858_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, sprites_BaseSprite__C31277_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.__visible;
     s.pc = 3; return s.tmp_1;
   case 3:
@@ -69608,10 +69930,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = sprites_BaseSprite__C1858_v2_2_mk(s);
+    s.tmp_2 = sprites_BaseSprite__C31277_v2_2_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
-    if (!checkSubtype(s.tmp_2.arg0, sprites_BaseSprite__C1858_VT)) failedCast(s.tmp_2.arg0);
+    if (!checkSubtype(s.tmp_2.arg0, sprites_BaseSprite__C31277_VT)) failedCast(s.tmp_2.arg0);
     s.tmp_2.fn = s.tmp_2.arg0.vtable.methods.__drawCore;
     s.pc = 4; return s.tmp_2;
   case 4:
@@ -69622,12 +69944,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___draw__P1864.info = {"start":840,"length":131,"line":37,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__draw","argumentNames":["this","camera"]}
+sprites_BaseSprite___draw__P31283.info = {"start":840,"length":131,"line":37,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"__draw","argumentNames":["this","camera"]}
 
-function sprites_BaseSprite___draw__P1864_mk(s) {
+function sprites_BaseSprite___draw__P31283_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___draw__P1864, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___draw__P31283, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69640,7 +69962,7 @@ function sprites_BaseSprite___draw__P1864_mk(s) {
 
 
 
-function sprites_BaseSprite___drawCore__P1865(s) {
+function sprites_BaseSprite___drawCore__P31284(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69656,17 +69978,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C31277_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___drawCore__P1865.info = {"start":981,"length":36,"line":43,"column":8,"endLine":43,"endColumn":44,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+sprites_BaseSprite___drawCore__P31284.info = {"start":981,"length":36,"line":43,"column":8,"endLine":43,"endColumn":44,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function sprites_BaseSprite___drawCore__P1865_mk(s) {
+function sprites_BaseSprite___drawCore__P31284_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___drawCore__P1865, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___drawCore__P31284, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -69676,7 +69998,7 @@ function sprites_BaseSprite___drawCore__P1865_mk(s) {
 
 
 
-function sprites_BaseSprite___visible__P1861(s) {
+function sprites_BaseSprite___visible__P31280(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69691,17 +70013,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C31277_VT)) failedCast(r0);
     r0 = true;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___visible__P1861.info = {"start":524,"length":57,"line":22,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__visible","argumentNames":["this"]}
+sprites_BaseSprite___visible__P31280.info = {"start":524,"length":57,"line":22,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"__visible","argumentNames":["this"]}
 
-function sprites_BaseSprite___visible__P1861_mk(s) {
+function sprites_BaseSprite___visible__P31280_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___visible__P1861, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___visible__P31280, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -69710,7 +70032,7 @@ function sprites_BaseSprite___visible__P1861_mk(s) {
 
 
 
-function controller_AnyButton_isPressed__P4189(s) {
+function controller_AnyButton_isPressed__P33682(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69720,36 +70042,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctrl___26006 = undefined;
-    s.b___26010 = undefined;
-    s.unnamed96___U2 = undefined;
-    s.unnamed97___U3 = undefined;
+    s.ctrl___55576 = undefined;
+    s.b___55580 = undefined;
+    s.unnamed936___U2 = undefined;
+    s.unnamed937___U3 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_AnyButton__C4187_VT)) failedCast(r0);
-    s.tmp_0 = controller__player1__P1917_mk(s);
-    s.callLocIdx = 190; s.pc = 6; return s.tmp_0;
+    if (!checkSubtype(r0, controller_AnyButton__C33680_VT)) failedCast(r0);
+    s.tmp_0 = controller__player1__P31336_mk(s);
+    s.callLocIdx = 147; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.ctrl___26006 = (r0);
-    s.b___26010 = (undefined);
-    r0 = s.ctrl___26006.fields["buttons"];
-    s.unnamed96___U2 = (r0);
-    s.unnamed97___U3 = (0);
+    s.ctrl___55576 = (r0);
+    s.b___55580 = (undefined);
+    r0 = s.ctrl___55576.fields["buttons"];
+    s.unnamed936___U2 = (r0);
+    s.unnamed937___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed97___U3;
-    r0 = pxsim_Array__length(s.unnamed96___U2);
+    s.tmp_0 = r0 = s.unnamed937___U3;
+    r0 = pxsim_Array__length(s.unnamed936___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed96___U2, s.unnamed97___U3);
-    s.b___26010 = (r0);
-    s.tmp_3 = controller_Button__C1903_v0_1_mk(s);
-    s.tmp_3.arg0 = s.b___26010;
-    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_3.arg0);
+    r0 = pxsim_Array__getAt(s.unnamed936___U2, s.unnamed937___U3);
+    s.b___55580 = (r0);
+    s.tmp_3 = controller_Button__C31322_v0_1_mk(s);
+    s.tmp_3.arg0 = s.b___55580;
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C31322_VT)) failedCast(s.tmp_3.arg0);
     s.tmp_3.fn = s.tmp_3.arg0.vtable.methods.isPressed;
     s.pc = 7; return s.tmp_3;
   case 7:
@@ -69761,31 +70083,31 @@ switch (step) {
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.unnamed97___U3 + 1);
-    s.unnamed97___U3 = (r0);
+    r0 = (s.unnamed937___U3 + 1);
+    s.unnamed937___U3 = (r0);
     { step = 1; continue; }
   case 4:
-    s.unnamed96___U2 = (undefined);
+    s.unnamed936___U2 = (undefined);
     r0 = false;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-controller_AnyButton_isPressed__P4189.info = {"start":5874,"length":202,"line":185,"column":8,"endLine":192,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"isPressed","argumentNames":["this"]}
+controller_AnyButton_isPressed__P33682.info = {"start":5874,"length":202,"line":185,"column":8,"endLine":192,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"isPressed","argumentNames":["this"]}
 
-function controller_AnyButton_isPressed__P4189_mk(s) {
+function controller_AnyButton_isPressed__P33682_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_AnyButton_isPressed__P4189, depth: s.depth + 1,
+        parent: s, fn: controller_AnyButton_isPressed__P33682, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  ctrl___26006: undefined,
-  b___26010: undefined,
-  unnamed96___U2: undefined,
-  unnamed97___U3: undefined,
+  ctrl___55576: undefined,
+  b___55580: undefined,
+  unnamed936___U2: undefined,
+  unnamed937___U3: undefined,
   arg0: undefined,
 } }
 
@@ -69793,7 +70115,7 @@ function controller_AnyButton_isPressed__P4189_mk(s) {
 
 
 
-function controller_Button_toString__P1908(s) {
+function controller_Button_toString__P31327(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69808,7 +70130,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C31322_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -69848,12 +70170,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_toString__P1908.info = {"start":1479,"length":100,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"toString","argumentNames":["this"]}
+controller_Button_toString__P31327.info = {"start":1479,"length":100,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"toString","argumentNames":["this"]}
 
-function controller_Button_toString__P1908_mk(s) {
+function controller_Button_toString__P31327_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_toString__P1908, depth: s.depth + 1,
+        parent: s, fn: controller_Button_toString__P31327, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69869,7 +70191,7 @@ function controller_Button_toString__P1908_mk(s) {
 
 
 
-function effects_SceneAnchor_height__P4750(s) {
+function effects_SceneAnchor_height__P34243(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69884,18 +70206,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    if (!checkSubtype(r0, effects_SceneAnchor__C34239_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_height__P4750.info = {"start":2634,"length":58,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"height","argumentNames":["this"]}
-effects_SceneAnchor_height__P4750.isGetter = true;
+effects_SceneAnchor_height__P34243.info = {"start":2634,"length":58,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"height","argumentNames":["this"]}
+effects_SceneAnchor_height__P34243.isGetter = true;
 
-function effects_SceneAnchor_height__P4750_mk(s) {
+function effects_SceneAnchor_height__P34243_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_height__P4750, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_height__P34243, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -69904,7 +70226,7 @@ function effects_SceneAnchor_height__P4750_mk(s) {
 
 
 
-function effects_SceneAnchor_width__P4749(s) {
+function effects_SceneAnchor_width__P34242(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69919,18 +70241,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    if (!checkSubtype(r0, effects_SceneAnchor__C34239_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_width__P4749.info = {"start":2568,"length":56,"line":67,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"width","argumentNames":["this"]}
-effects_SceneAnchor_width__P4749.isGetter = true;
+effects_SceneAnchor_width__P34242.info = {"start":2568,"length":56,"line":67,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"width","argumentNames":["this"]}
+effects_SceneAnchor_width__P34242.isGetter = true;
 
-function effects_SceneAnchor_width__P4749_mk(s) {
+function effects_SceneAnchor_width__P34242_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_width__P4749, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_width__P34242, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -69939,7 +70261,7 @@ function effects_SceneAnchor_width__P4749_mk(s) {
 
 
 
-function effects_SceneAnchor_y__P4748(s) {
+function effects_SceneAnchor_y__P34241(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69954,12 +70276,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_SceneAnchor__C34239_VT)) failedCast(r0);
     r0 = s.arg0.fields["camera"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_offsetY"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    r0 = pxsim_ImageMethods.height(globals.screen___31220);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
@@ -69967,13 +70289,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_y__P4748.info = {"start":2476,"length":82,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"y","argumentNames":["this"]}
-effects_SceneAnchor_y__P4748.isGetter = true;
+effects_SceneAnchor_y__P34241.info = {"start":2476,"length":82,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"y","argumentNames":["this"]}
+effects_SceneAnchor_y__P34241.isGetter = true;
 
-function effects_SceneAnchor_y__P4748_mk(s) {
+function effects_SceneAnchor_y__P34241_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_y__P4748, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_y__P34241, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69986,7 +70308,7 @@ function effects_SceneAnchor_y__P4748_mk(s) {
 
 
 
-function effects_SceneAnchor_x__P4747(s) {
+function effects_SceneAnchor_x__P34240(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70001,12 +70323,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_SceneAnchor__C34239_VT)) failedCast(r0);
     r0 = s.arg0.fields["camera"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_offsetX"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    r0 = pxsim_ImageMethods.width(globals.screen___31220);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
@@ -70014,13 +70336,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_x__P4747.info = {"start":2385,"length":81,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"x","argumentNames":["this"]}
-effects_SceneAnchor_x__P4747.isGetter = true;
+effects_SceneAnchor_x__P34240.info = {"start":2385,"length":81,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game---hw/particleeffects.ts","functionName":"x","argumentNames":["this"]}
+effects_SceneAnchor_x__P34240.isGetter = true;
 
-function effects_SceneAnchor_x__P4747_mk(s) {
+function effects_SceneAnchor_x__P34240_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_x__P4747, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_x__P34240, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70033,7 +70355,7 @@ function effects_SceneAnchor_x__P4747_mk(s) {
 
 
 
-function sprites_StaticObstacle_width__P2156(s) {
+function sprites_StaticObstacle_width__P31575(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70048,20 +70370,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C31565_VT)) failedCast(r0);
     r0 = s.arg0.fields["image"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_0);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_width__P2156.info = {"start":1088,"length":68,"line":48,"column":8,"endLine":50,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"width","argumentNames":["this"]}
-sprites_StaticObstacle_width__P2156.isGetter = true;
+sprites_StaticObstacle_width__P31575.info = {"start":1088,"length":68,"line":48,"column":8,"endLine":50,"endColumn":9,"fileName":"pxt_modules/game---hw/obstacle.ts","functionName":"width","argumentNames":["this"]}
+sprites_StaticObstacle_width__P31575.isGetter = true;
 
-function sprites_StaticObstacle_width__P2156_mk(s) {
+function sprites_StaticObstacle_width__P31575_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_width__P2156, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_width__P31575, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -70071,7 +70393,7 @@ function sprites_StaticObstacle_width__P2156_mk(s) {
 
 
 
-function sprites_StaticObstacle_height__P2155(s) {
+function sprites_StaticObstacle_height__P31574(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70086,20 +70408,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C31565_VT)) failedCast(r0);
     r0 = s.arg0.fields["image"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_0);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_height__P2155.info = {"start":1008,"length":70,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"height","argumentNames":["this"]}
-sprites_StaticObstacle_height__P2155.isGetter = true;
+sprites_StaticObstacle_height__P31574.info = {"start":1008,"length":70,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game---hw/obstacle.ts","functionName":"height","argumentNames":["this"]}
+sprites_StaticObstacle_height__P31574.isGetter = true;
 
-function sprites_StaticObstacle_height__P2155_mk(s) {
+function sprites_StaticObstacle_height__P31574_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_height__P2155, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_height__P31574, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -70109,7 +70431,7 @@ function sprites_StaticObstacle_height__P2155_mk(s) {
 
 
 
-function sprites_StaticObstacle_y__P2154(s) {
+function sprites_StaticObstacle_y__P31573(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70124,7 +70446,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C31565_VT)) failedCast(r0);
     r0 = s.arg0.fields["top"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["image"];
@@ -70137,13 +70459,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_y__P2154.info = {"start":921,"length":77,"line":40,"column":8,"endLine":42,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"y","argumentNames":["this"]}
-sprites_StaticObstacle_y__P2154.isGetter = true;
+sprites_StaticObstacle_y__P31573.info = {"start":921,"length":77,"line":40,"column":8,"endLine":42,"endColumn":9,"fileName":"pxt_modules/game---hw/obstacle.ts","functionName":"y","argumentNames":["this"]}
+sprites_StaticObstacle_y__P31573.isGetter = true;
 
-function sprites_StaticObstacle_y__P2154_mk(s) {
+function sprites_StaticObstacle_y__P31573_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_y__P2154, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_y__P31573, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70156,7 +70478,7 @@ function sprites_StaticObstacle_y__P2154_mk(s) {
 
 
 
-function sprites_StaticObstacle_x__P2153(s) {
+function sprites_StaticObstacle_x__P31572(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70171,7 +70493,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C31565_VT)) failedCast(r0);
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["image"];
@@ -70184,13 +70506,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_x__P2153.info = {"start":834,"length":77,"line":36,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"x","argumentNames":["this"]}
-sprites_StaticObstacle_x__P2153.isGetter = true;
+sprites_StaticObstacle_x__P31572.info = {"start":834,"length":77,"line":36,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/game---hw/obstacle.ts","functionName":"x","argumentNames":["this"]}
+sprites_StaticObstacle_x__P31572.isGetter = true;
 
-function sprites_StaticObstacle_x__P2153_mk(s) {
+function sprites_StaticObstacle_x__P31572_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_x__P2153, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_x__P31572, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70203,7 +70525,7 @@ function sprites_StaticObstacle_x__P2153_mk(s) {
 
 
 
-function blockMenu_MenuSprite___drawCore__P3711(s) {
+function blockMenu_MenuSprite___drawCore__P33245(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70219,13 +70541,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["background"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_1.arg0 = globals.screen___1802;
+    s.tmp_1 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_1.arg0 = globals.screen___31220;
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["left"];
     s.tmp_1.arg1 = r0;
@@ -70240,7 +70562,7 @@ switch (step) {
     s.tmp_1.arg4 = r0;
     r0 = s.arg0.fields["background"];
     s.tmp_1.arg5 = r0;
-    s.callLocIdx = 1978; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1983; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
   case 1:
@@ -70251,16 +70573,16 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_drawGridMenu__P6108_mk(s);
+    s.tmp_2 = blockMenu_MenuSprite_drawGridMenu__P35630_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1979; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 1984; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    s.tmp_0 = blockMenu_MenuSprite_drawListMenu__P6109_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_drawListMenu__P35631_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1980; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1985; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 4:
@@ -70268,12 +70590,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite___drawCore__P3711.info = {"start":5414,"length":510,"line":176,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+blockMenu_MenuSprite___drawCore__P33245.info = {"start":5414,"length":510,"line":176,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function blockMenu_MenuSprite___drawCore__P3711_mk(s) {
+function blockMenu_MenuSprite___drawCore__P33245_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite___drawCore__P3711, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite___drawCore__P33245, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70286,7 +70608,7 @@ function blockMenu_MenuSprite___drawCore__P3711_mk(s) {
 
 
 
-function blockMenu_MenuSprite_drawListMenu__P6109(s) {
+function blockMenu_MenuSprite_drawListMenu__P35631(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70296,33 +70618,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___26107 = undefined;
-    s.top___26108 = undefined;
-    s.left___26115 = undefined;
-    s.i___26122 = undefined;
+    s.current___55677 = undefined;
+    s.top___55678 = undefined;
+    s.left___55685 = undefined;
+    s.i___55692 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["top"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___26108 = (r0);
+    s.top___55678 = (r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["left"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.left___26115 = (r0);
-    s.i___26122 = (0);
+    s.left___55685 = (r0);
+    s.i___55692 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___26122;
+    s.tmp_1 = r0 = s.i___55692;
     r0 = s.arg0.fields["labels"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -70333,26 +70655,26 @@ switch (step) {
     if (!r0) { step = 4; continue; }
     r0 = s.arg0.fields["labels"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_4, s.i___26122);
-    s.current___26107 = (r0);
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___55692);
+    s.current___55677 = (r0);
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
-    r0 = (s.i___26122 === s.tmp_1);
+    r0 = (s.i___55692 === s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
-    r0 = (s.left___26115 - 1);
+    s.tmp_2 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
+    r0 = (s.left___55685 - 1);
     s.tmp_2.arg1 = r0;
-    r0 = (s.top___26108 - 1);
+    r0 = (s.top___55678 - 1);
     s.tmp_2.arg2 = r0;
-    r0 = s.current___26107.fields["width"];
+    r0 = s.current___55677.fields["width"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_2.arg3 = r0;
     s.tmp_5 = if_charHeight_1_mk(s);
-    r0 = s.current___26107.fields["font"];
+    r0 = s.current___55677.fields["font"];
     s.tmp_5.arg0 = r0;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "charHeight");
@@ -70360,7 +70682,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1990; s.pc = 6; return s.tmp_5; }
+     else { s.callLocIdx = 1995; s.pc = 6; return s.tmp_5; }
     }
   case 6:
     r0 = s.retval;
@@ -70369,33 +70691,33 @@ switch (step) {
     s.tmp_2.arg4 = r0;
     r0 = s.arg0.fields["cursorBackground"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 1991; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1996; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
-    s.tmp_0.arg0 = s.current___26107;
-    s.tmp_0.arg1 = s.left___26115;
-    s.tmp_0.arg2 = s.top___26108;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P35634_mk(s);
+    s.tmp_0.arg0 = s.current___55677;
+    s.tmp_0.arg1 = s.left___55685;
+    s.tmp_0.arg2 = s.top___55678;
     r0 = s.arg0.fields["cursorForeground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1992; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1997; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     { step = 3; continue; }
   case 2:
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
-    s.tmp_0.arg0 = s.current___26107;
-    s.tmp_0.arg1 = s.left___26115;
-    s.tmp_0.arg2 = s.top___26108;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P35634_mk(s);
+    s.tmp_0.arg0 = s.current___55677;
+    s.tmp_0.arg1 = s.left___55685;
+    s.tmp_0.arg2 = s.top___55678;
     r0 = s.arg0.fields["foreground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1993; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1998; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 3:
-    s.tmp_0 = r0 = s.top___26108;
+    s.tmp_0 = r0 = s.top___55678;
     s.tmp_3 = if_charHeight_1_mk(s);
-    r0 = s.current___26107.fields["font"];
+    r0 = s.current___55677.fields["font"];
     s.tmp_3.arg0 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
@@ -70403,7 +70725,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1994; s.pc = 9; return s.tmp_3; }
+     else { s.callLocIdx = 1999; s.pc = 9; return s.tmp_3; }
     }
   case 9:
     r0 = s.retval;
@@ -70413,21 +70735,21 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___26108 = (r0);
-    r0 = (s.i___26122 + 1);
-    s.i___26122 = (r0);
+    s.top___55678 = (r0);
+    r0 = (s.i___55692 + 1);
+    s.i___55692 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_drawListMenu__P6109.info = {"start":7514,"length":733,"line":242,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawListMenu","argumentNames":["this"]}
+blockMenu_MenuSprite_drawListMenu__P35631.info = {"start":7514,"length":733,"line":242,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawListMenu","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_drawListMenu__P6109_mk(s) {
+function blockMenu_MenuSprite_drawListMenu__P35631_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_drawListMenu__P6109, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_drawListMenu__P35631, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70435,10 +70757,10 @@ function blockMenu_MenuSprite_drawListMenu__P6109_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  current___26107: undefined,
-  top___26108: undefined,
-  left___26115: undefined,
-  i___26122: undefined,
+  current___55677: undefined,
+  top___55678: undefined,
+  left___55685: undefined,
+  i___55692: undefined,
   arg0: undefined,
 } }
 
@@ -70446,7 +70768,7 @@ function blockMenu_MenuSprite_drawListMenu__P6109_mk(s) {
 
 
 
-function blockMenu_ScrollingLabel_draw__P6112(s) {
+function blockMenu_ScrollingLabel_draw__P35634(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70456,9 +70778,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.startIndex___26181 = undefined;
-    s.letterOffset___26189 = undefined;
-    s.i___26296 = undefined;
+    s.startIndex___55751 = undefined;
+    s.letterOffset___55759 = undefined;
+    s.i___55866 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -70467,7 +70789,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C6110_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C35632_VT)) failedCast(r0);
     r0 = s.arg0.fields["offset"];
     s.tmp_0 = r0;
     s.tmp_2 = if_charWidth_1_mk(s);
@@ -70479,14 +70801,14 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 2001; s.pc = 17; return s.tmp_2; }
+     else { s.callLocIdx = 2006; s.pc = 17; return s.tmp_2; }
     }
   case 17:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_1);
-    s.startIndex___26181 = (r0);
-    s.tmp_1 = r0 = s.startIndex___26181;
+    s.startIndex___55751 = (r0);
+    s.tmp_1 = r0 = s.startIndex___55751;
     s.tmp_3 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_3.arg0 = r0;
@@ -70496,7 +70818,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 2002; s.pc = 18; return s.tmp_3; }
+     else { s.callLocIdx = 2007; s.pc = 18; return s.tmp_3; }
     }
   case 18:
     r0 = s.retval;
@@ -70506,7 +70828,7 @@ switch (step) {
     r0 = s.arg0.fields["offset"];
     s.tmp_4 = r0;
     r0 = (s.tmp_0 - s.tmp_4);
-    s.letterOffset___26189 = (r0);
+    s.letterOffset___55759 = (r0);
     r0 = s.arg0.fields["scrolling"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -70545,11 +70867,11 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_3).fields["stage"] = (s.tmp_4);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_2 = Math_max__P29660_mk(s);
     r0 = s.arg0.fields["maxOffset"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 2003; s.pc = 19; return s.tmp_2;
+    s.callLocIdx = 2008; s.pc = 19; return s.tmp_2;
   case 19:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -70574,11 +70896,11 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
     s.tmp_2 = r0 = s.arg0;
-    s.tmp_4 = Math_max__P125_mk(s);
+    s.tmp_4 = Math_max__P29660_mk(s);
     r0 = s.arg0.fields["maxOffset"];
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = 0;
-    s.callLocIdx = 2004; s.pc = 20; return s.tmp_4;
+    s.callLocIdx = 2009; s.pc = 20; return s.tmp_4;
   case 20:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -70589,8 +70911,8 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["timer"];
     s.tmp_2 = r0;
-    s.tmp_4 = game_currentScene__P2532_mk(s);
-    s.callLocIdx = 2005; s.pc = 21; return s.tmp_4;
+    s.tmp_4 = game_currentScene__P31951_mk(s);
+    s.callLocIdx = 2010; s.pc = 21; return s.tmp_4;
   case 21:
     r0 = s.retval;
     r0 = r0.fields["eventContext"];
@@ -70620,37 +70942,37 @@ switch (step) {
   case 10:
   case 11:
   case 12:
-    r0 = pxsim_numops_toBoolDecr(s.letterOffset___26189);
+    r0 = pxsim_numops_toBoolDecr(s.letterOffset___55759);
     if (!r0) { step = 13; continue; }
     r0 = s.arg0.fields["partialCanvas"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, 0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
     r0 = s.arg0.fields["partialCanvas"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["text"];
     s.tmp_1 = r0;
-    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___26181);
+    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___55751);
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.letterOffset___26189;
+    s.tmp_0.arg2 = s.letterOffset___55759;
     s.tmp_0.arg3 = 0;
     s.tmp_0.arg4 = s.arg3;
     r0 = s.arg0.fields["font"];
     s.tmp_0.arg5 = r0;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 2006; s.pc = 22; return s.tmp_0;
+    s.callLocIdx = 2011; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
     r0 = s.arg0.fields["partialCanvas"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, s.tmp_0, s.arg1, s.arg2);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___31220, s.tmp_0, s.arg1, s.arg2);
     { step = 14; continue; }
   case 13:
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     r0 = s.arg0.fields["text"];
     s.tmp_1 = r0;
-    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___26181);
+    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___55751);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg2;
@@ -70658,28 +70980,28 @@ switch (step) {
     r0 = s.arg0.fields["font"];
     s.tmp_0.arg5 = r0;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 2007; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 2012; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
   case 14:
-    s.i___26296 = (1);
+    s.i___55866 = (1);
   case 15:
     r0 = s.arg0.fields["maxCharacters"];
     s.tmp_1 = r0;
-    r0 = (s.i___26296 < s.tmp_1);
+    r0 = (s.i___55866 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.tmp_2 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
+    s.tmp_2 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
     r0 = s.arg0.fields["text"];
     s.tmp_3 = r0;
-    r0 = (s.startIndex___26181 + s.i___26296);
+    r0 = (s.startIndex___55751 + s.i___55866);
     s.tmp_4 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_4);
     s.tmp_2.arg1 = r0;
     s.tmp_6 = r0 = s.arg1;
-    s.tmp_8 = r0 = s.i___26296;
+    s.tmp_8 = r0 = s.i___55866;
     s.tmp_10 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_10.arg0 = r0;
@@ -70689,7 +71011,7 @@ switch (step) {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["charWidth"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["charWidth"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 2008; s.pc = 25; return s.tmp_10; }
+     else { s.callLocIdx = 2013; s.pc = 25; return s.tmp_10; }
     }
   case 25:
     r0 = s.retval;
@@ -70698,30 +71020,30 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = (s.tmp_6 + s.tmp_7);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 + s.letterOffset___26189);
+    r0 = (s.tmp_5 + s.letterOffset___55759);
     s.tmp_2.arg2 = r0;
     s.tmp_2.arg3 = s.arg2;
     s.tmp_2.arg4 = s.arg3;
     r0 = s.arg0.fields["font"];
     s.tmp_2.arg5 = r0;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 2009; s.pc = 24; return s.tmp_2;
+    s.callLocIdx = 2014; s.pc = 24; return s.tmp_2;
   case 24:
     r0 = s.retval;
-    r0 = (s.i___26296 + 1);
-    s.i___26296 = (r0);
+    r0 = (s.i___55866 + 1);
+    s.i___55866 = (r0);
     { step = 15; continue; }
   case 16:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_ScrollingLabel_draw__P6112.info = {"start":9505,"length":1769,"line":301,"column":8,"endLine":349,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"draw","argumentNames":["this","left","top","color"]}
+blockMenu_ScrollingLabel_draw__P35634.info = {"start":9505,"length":1769,"line":301,"column":8,"endLine":349,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"draw","argumentNames":["this","left","top","color"]}
 
-function blockMenu_ScrollingLabel_draw__P6112_mk(s) {
+function blockMenu_ScrollingLabel_draw__P35634_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_ScrollingLabel_draw__P6112, depth: s.depth + 1,
+        parent: s, fn: blockMenu_ScrollingLabel_draw__P35634, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70734,9 +71056,9 @@ function blockMenu_ScrollingLabel_draw__P6112_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  startIndex___26181: undefined,
-  letterOffset___26189: undefined,
-  i___26296: undefined,
+  startIndex___55751: undefined,
+  letterOffset___55759: undefined,
+  i___55866: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -70747,7 +71069,7 @@ function blockMenu_ScrollingLabel_draw__P6112_mk(s) {
 
 
 
-function blockMenu_MenuSprite_drawGridMenu__P6108(s) {
+function blockMenu_MenuSprite_drawGridMenu__P35630(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70757,33 +71079,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___26328 = undefined;
-    s.top___26329 = undefined;
-    s.left___26336 = undefined;
-    s.i___26343 = undefined;
+    s.current___55898 = undefined;
+    s.top___55899 = undefined;
+    s.left___55906 = undefined;
+    s.i___55913 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["top"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___26329 = (r0);
+    s.top___55899 = (r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["left"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.left___26336 = (r0);
-    s.i___26343 = (0);
+    s.left___55906 = (r0);
+    s.i___55913 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___26343;
+    s.tmp_1 = r0 = s.i___55913;
     r0 = s.arg0.fields["labels"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -70794,26 +71116,26 @@ switch (step) {
     if (!r0) { step = 6; continue; }
     r0 = s.arg0.fields["labels"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_4, s.i___26343);
-    s.current___26328 = (r0);
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___55913);
+    s.current___55898 = (r0);
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
-    r0 = (s.i___26343 === s.tmp_1);
+    r0 = (s.i___55913 === s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
-    s.tmp_2.arg0 = globals.screen___1802;
-    r0 = (s.left___26336 - 1);
+    s.tmp_2 = helpers_imageFillRect__P31146_mk(s);
+    s.tmp_2.arg0 = globals.screen___31220;
+    r0 = (s.left___55906 - 1);
     s.tmp_2.arg1 = r0;
-    r0 = (s.top___26329 - 1);
+    r0 = (s.top___55899 - 1);
     s.tmp_2.arg2 = r0;
-    r0 = s.current___26328.fields["width"];
+    r0 = s.current___55898.fields["width"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_2.arg3 = r0;
     s.tmp_5 = if_charHeight_1_mk(s);
-    r0 = s.current___26328.fields["font"];
+    r0 = s.current___55898.fields["font"];
     s.tmp_5.arg0 = r0;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "charHeight");
@@ -70821,7 +71143,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1985; s.pc = 8; return s.tmp_5; }
+     else { s.callLocIdx = 1990; s.pc = 8; return s.tmp_5; }
     }
   case 8:
     r0 = s.retval;
@@ -70830,31 +71152,31 @@ switch (step) {
     s.tmp_2.arg4 = r0;
     r0 = s.arg0.fields["cursorBackground"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 1986; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1991; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
-    s.tmp_0.arg0 = s.current___26328;
-    s.tmp_0.arg1 = s.left___26336;
-    s.tmp_0.arg2 = s.top___26329;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P35634_mk(s);
+    s.tmp_0.arg0 = s.current___55898;
+    s.tmp_0.arg1 = s.left___55906;
+    s.tmp_0.arg2 = s.top___55899;
     r0 = s.arg0.fields["cursorForeground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1987; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1992; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     { step = 3; continue; }
   case 2:
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
-    s.tmp_0.arg0 = s.current___26328;
-    s.tmp_0.arg1 = s.left___26336;
-    s.tmp_0.arg2 = s.top___26329;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P35634_mk(s);
+    s.tmp_0.arg0 = s.current___55898;
+    s.tmp_0.arg1 = s.left___55906;
+    s.tmp_0.arg2 = s.top___55899;
     r0 = s.arg0.fields["foreground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1988; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1993; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 3:
-    r0 = (s.i___26343 % 2);
+    r0 = (s.i___55913 % 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 1);
     s.tmp_0 = r0;
@@ -70866,10 +71188,10 @@ switch (step) {
     r0 = s.arg0.fields["padding"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
-    s.left___26336 = (r0);
-    s.tmp_0 = r0 = s.top___26329;
+    s.left___55906 = (r0);
+    s.tmp_0 = r0 = s.top___55899;
     s.tmp_3 = if_charHeight_1_mk(s);
-    r0 = s.current___26328.fields["font"];
+    r0 = s.current___55898.fields["font"];
     s.tmp_3.arg0 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
@@ -70877,7 +71199,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1989; s.pc = 11; return s.tmp_3; }
+     else { s.callLocIdx = 1994; s.pc = 11; return s.tmp_3; }
     }
   case 11:
     r0 = s.retval;
@@ -70887,33 +71209,33 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___26329 = (r0);
+    s.top___55899 = (r0);
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = r0 = s.left___26336;
-    r0 = s.current___26328.fields["width"];
+    s.tmp_0 = r0 = s.left___55906;
+    r0 = s.current___55898.fields["width"];
     s.tmp_2 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.left___26336 = (r0);
+    s.left___55906 = (r0);
   case 5:
-    r0 = (s.i___26343 + 1);
-    s.i___26343 = (r0);
+    r0 = (s.i___55913 + 1);
+    s.i___55913 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_drawGridMenu__P6108.info = {"start":6552,"length":952,"line":215,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawGridMenu","argumentNames":["this"]}
+blockMenu_MenuSprite_drawGridMenu__P35630.info = {"start":6552,"length":952,"line":215,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawGridMenu","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_drawGridMenu__P6108_mk(s) {
+function blockMenu_MenuSprite_drawGridMenu__P35630_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_drawGridMenu__P6108, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_drawGridMenu__P35630, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70921,10 +71243,10 @@ function blockMenu_MenuSprite_drawGridMenu__P6108_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  current___26328: undefined,
-  top___26329: undefined,
-  left___26336: undefined,
-  i___26343: undefined,
+  current___55898: undefined,
+  top___55899: undefined,
+  left___55906: undefined,
+  i___55913: undefined,
   arg0: undefined,
 } }
 
@@ -70932,7 +71254,7 @@ function blockMenu_MenuSprite_drawGridMenu__P6108_mk(s) {
 
 
 
-function blockMenu_MenuSprite___visible__P3710(s) {
+function blockMenu_MenuSprite___visible__P33244(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70947,17 +71269,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C33226_VT)) failedCast(r0);
     r0 = s.arg0.fields["open"];
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite___visible__P3710.info = {"start":5342,"length":62,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__visible","argumentNames":["this"]}
+blockMenu_MenuSprite___visible__P33244.info = {"start":5342,"length":62,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__visible","argumentNames":["this"]}
 
-function blockMenu_MenuSprite___visible__P3710_mk(s) {
+function blockMenu_MenuSprite___visible__P33244_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite___visible__P3710, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite___visible__P33244, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -70966,7 +71288,7 @@ function blockMenu_MenuSprite___visible__P3710_mk(s) {
 
 
 
-function scene_Camera_top__P2373(s) {
+function scene_Camera_top__P31792(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70981,18 +71303,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetY"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_top__P2373.info = {"start":1638,"length":58,"line":58,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"top","argumentNames":["this"]}
-scene_Camera_top__P2373.isGetter = true;
+scene_Camera_top__P31792.info = {"start":1638,"length":58,"line":58,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"top","argumentNames":["this"]}
+scene_Camera_top__P31792.isGetter = true;
 
-function scene_Camera_top__P2373_mk(s) {
+function scene_Camera_top__P31792_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_top__P2373, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_top__P31792, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -71001,7 +71323,7 @@ function scene_Camera_top__P2373_mk(s) {
 
 
 
-function scene_Camera_left__P2371(s) {
+function scene_Camera_left__P31790(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71016,18 +71338,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C31779_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetX"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_left__P2371.info = {"start":1486,"length":59,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"left","argumentNames":["this"]}
-scene_Camera_left__P2371.isGetter = true;
+scene_Camera_left__P31790.info = {"start":1486,"length":59,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"left","argumentNames":["this"]}
+scene_Camera_left__P31790.isGetter = true;
 
-function scene_Camera_left__P2371_mk(s) {
+function scene_Camera_left__P31790_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_left__P2371, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_left__P31790, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -71036,7 +71358,7 @@ function scene_Camera_left__P2371_mk(s) {
 
 
 
-function particles_ShapeFactory_drawParticle__P2743(s) {
+function particles_ShapeFactory_drawParticle__P32162(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71046,7 +71368,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pImage___26429 = undefined;
+    s.pImage___55999 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -71055,23 +71377,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
-    s.tmp_1 = Math_FastRandom_pickRandom__P2591_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C32159_VT)) failedCast(r0);
+    s.tmp_1 = Math_FastRandom_pickRandom__P32010_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["sources"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1616; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1573; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_0);
-    s.pImage___26429 = (r0);
+    s.pImage___55999 = (r0);
     r0 = s.arg1.fields["color"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.replace(s.pImage___26429, 15, s.tmp_0);
-    s.tmp_0 = r0 = globals.screen___1802;
-    s.tmp_1 = r0 = s.pImage___26429;
+    r0 = pxsim_ImageMethods.replace(s.pImage___55999, 15, s.tmp_0);
+    s.tmp_0 = r0 = globals.screen___31220;
+    s.tmp_1 = r0 = s.pImage___55999;
     r0 = s.arg0.fields["ox"];
     s.tmp_4 = r0;
     r0 = (s.arg2 - s.tmp_4);
@@ -71093,12 +71415,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_drawParticle__P2743.info = {"start":7172,"length":323,"line":229,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
+particles_ShapeFactory_drawParticle__P32162.info = {"start":7172,"length":323,"line":229,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
 
-function particles_ShapeFactory_drawParticle__P2743_mk(s) {
+function particles_ShapeFactory_drawParticle__P32162_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_drawParticle__P2743, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_drawParticle__P32162, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71110,7 +71432,7 @@ function particles_ShapeFactory_drawParticle__P2743_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  pImage___26429: undefined,
+  pImage___55999: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -71121,7 +71443,7 @@ function particles_ShapeFactory_drawParticle__P2743_mk(s) {
 
 
 
-function Math_FastRandom_pickRandom__P2591(s) {
+function Math_FastRandom_pickRandom__P32010(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71137,7 +71459,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C32005_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -71160,14 +71482,14 @@ switch (step) {
   case 3:
   case 4:
     s.tmp_4 = r0 = s.arg1;
-    s.tmp_6 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.tmp_6 = Math_FastRandom_randomRange__P32009_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.tmp_6.arg1 = 0;
     r0 = pxsim_Array__length(s.arg1);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 - 1);
     s.tmp_6.arg2 = r0;
-    s.callLocIdx = 1345; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 1302; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -71176,12 +71498,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_pickRandom__P2591.info = {"start":2358,"length":192,"line":70,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"pickRandom","argumentNames":["this","list"]}
+Math_FastRandom_pickRandom__P32010.info = {"start":2358,"length":192,"line":70,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game---hw/mathUtil.ts","functionName":"pickRandom","argumentNames":["this","list"]}
 
-function Math_FastRandom_pickRandom__P2591_mk(s) {
+function Math_FastRandom_pickRandom__P32010_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_pickRandom__P2591, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_pickRandom__P32010, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71199,7 +71521,7 @@ function Math_FastRandom_pickRandom__P2591_mk(s) {
 
 
 
-function particles_AreaFactory_drawParticle__P2731(s) {
+function particles_AreaFactory_drawParticle__P32150(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71209,7 +71531,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.col___26475 = undefined;
+    s.col___56045 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -71218,7 +71540,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_AreaFactory__C2724_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_AreaFactory__C32143_VT)) failedCast(r0);
     r0 = s.arg1.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 500);
@@ -71245,8 +71567,8 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.col___26475 = (s.tmp_5);
-    s.tmp_0 = r0 = globals.screen___1802;
+    s.col___56045 = (s.tmp_5);
+    s.tmp_0 = r0 = globals.screen___31220;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -71255,17 +71577,17 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 8);
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_3, s.col___26475);
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_3, s.col___56045);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_drawParticle__P2731.info = {"start":4770,"length":222,"line":158,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
+particles_AreaFactory_drawParticle__P32150.info = {"start":4770,"length":222,"line":158,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
 
-function particles_AreaFactory_drawParticle__P2731_mk(s) {
+function particles_AreaFactory_drawParticle__P32150_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_drawParticle__P2731, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_drawParticle__P32150, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71273,7 +71595,7 @@ function particles_AreaFactory_drawParticle__P2731_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  col___26475: undefined,
+  col___56045: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -71284,7 +71606,7 @@ function particles_AreaFactory_drawParticle__P2731_mk(s) {
 
 
 
-function particles_SprayFactory_drawParticle__P2721(s) {
+function particles_SprayFactory_drawParticle__P32140(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71302,8 +71624,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
-    s.tmp_0 = r0 = globals.screen___1802;
+    if (!checkSubtype(r0, particles_SprayFactory__C32137_VT)) failedCast(r0);
+    s.tmp_0 = r0 = globals.screen___31220;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -71317,12 +71639,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_drawParticle__P2721.info = {"start":3194,"length":118,"line":115,"column":8,"endLine":117,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
+particles_SprayFactory_drawParticle__P32140.info = {"start":3194,"length":118,"line":115,"column":8,"endLine":117,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
 
-function particles_SprayFactory_drawParticle__P2721_mk(s) {
+function particles_SprayFactory_drawParticle__P32140_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_drawParticle__P2721, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_drawParticle__P32140, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71339,7 +71661,7 @@ function particles_SprayFactory_drawParticle__P2721_mk(s) {
 
 
 
-function scene_Renderable___drawCore__P2381(s) {
+function scene_Renderable___drawCore__P31800(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71355,19 +71677,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C2378_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C31797_VT)) failedCast(r0);
     s.tmp_0 = if_handler_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.screen___1802;
+    s.tmp_0.arg1 = globals.screen___31220;
     s.tmp_0.arg2 = s.arg1;
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 3);
-      s.callLocIdx = 1021; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 978; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 3); s.callLocIdx = 1021; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1021; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1021; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 3); s.callLocIdx = 978; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 978; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 978; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -71375,12 +71697,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable___drawCore__P2381.info = {"start":390,"length":86,"line":14,"column":8,"endLine":16,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+scene_Renderable___drawCore__P31800.info = {"start":390,"length":86,"line":14,"column":8,"endLine":16,"endColumn":9,"fileName":"pxt_modules/game---hw/renderable.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function scene_Renderable___drawCore__P2381_mk(s) {
+function scene_Renderable___drawCore__P31800_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable___drawCore__P2381, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable___drawCore__P31800, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -71391,7 +71713,7 @@ function scene_Renderable___drawCore__P2381_mk(s) {
 
 
 
-function scene_Renderable___visible__P2380(s) {
+function scene_Renderable___visible__P31799(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71406,29 +71728,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C2378_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C31797_VT)) failedCast(r0);
     s.tmp_0 = if_shouldBeVisible_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "shouldBeVisible"), 1);
-      s.callLocIdx = 1020; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 977; s.pc = 1; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["shouldBeVisible"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["shouldBeVisible"], 1); s.callLocIdx = 1020; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1020; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1020; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["shouldBeVisible"], 1); s.callLocIdx = 977; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 977; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 977; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable___visible__P2380.info = {"start":305,"length":75,"line":10,"column":8,"endLine":12,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"__visible","argumentNames":["this"]}
+scene_Renderable___visible__P31799.info = {"start":305,"length":75,"line":10,"column":8,"endLine":12,"endColumn":9,"fileName":"pxt_modules/game---hw/renderable.ts","functionName":"__visible","argumentNames":["this"]}
 
-function scene_Renderable___visible__P2380_mk(s) {
+function scene_Renderable___visible__P31799_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable___visible__P2380, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable___visible__P31799, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -71438,7 +71760,7 @@ function scene_Renderable___visible__P2380_mk(s) {
 
 
 
-function Sprite___drawCore__P2077(s) {
+function Sprite___drawCore__P31496(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71448,24 +71770,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___26506 = undefined;
-    s.oy___26514 = undefined;
-    s.l___26522 = undefined;
-    s.t___26526 = undefined;
-    s.font___26541 = undefined;
-    s.tx___26545 = undefined;
-    s.ty___26547 = undefined;
+    s.ox___56076 = undefined;
+    s.oy___56084 = undefined;
+    s.l___56092 = undefined;
+    s.t___56096 = undefined;
+    s.font___56111 = undefined;
+    s.tx___56115 = undefined;
+    s.ty___56117 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_isOutOfScreen__P2076_mk(s);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_isOutOfScreen__P31495_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 352; s.pc = 20; return s.tmp_1;
+    s.callLocIdx = 309; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -71487,7 +71809,7 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.ox___26506 = (s.tmp_4);
+    s.ox___56076 = (s.tmp_4);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -71501,35 +71823,35 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___26514 = (s.tmp_2);
-    s.tmp_1 = Sprite_left__P2062_mk(s);
+    s.oy___56084 = (s.tmp_2);
+    s.tmp_1 = Sprite_left__P31481_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 353; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 310; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.ox___26506);
-    s.l___26522 = (r0);
-    s.tmp_1 = Sprite_top__P2066_mk(s);
+    r0 = (s.tmp_0 - s.ox___56076);
+    s.l___56092 = (r0);
+    s.tmp_1 = Sprite_top__P31485_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 354; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 311; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.oy___26514);
-    s.t___26526 = (r0);
+    r0 = (s.tmp_0 - s.oy___56084);
+    s.t___56096 = (r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, s.tmp_0, s.l___26522, s.t___26526);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___31220, s.tmp_0, s.l___56092, s.t___56096);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 64);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.font___26541 = (globals.font5___1750);
-    s.tx___26545 = (s.l___26522);
-    s.tmp_1 = r0 = s.t___26526;
+    s.font___56111 = (globals.font5___31168);
+    s.tx___56115 = (s.l___56092);
+    s.tmp_1 = r0 = s.t___56096;
     r0 = s.arg0.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
@@ -71537,14 +71859,14 @@ switch (step) {
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 2);
-    s.ty___26547 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
+    s.ty___56117 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
-    s.tmp_7 = Sprite_x__P2025_mk(s);
+    s.tmp_7 = Sprite_x__P31444_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 356; s.pc = 24; return s.tmp_7;
+    s.callLocIdx = 313; s.pc = 24; return s.tmp_7;
   case 24:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -71563,9 +71885,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_11 = Sprite_y__P2027_mk(s);
+    s.tmp_11 = Sprite_y__P31446_mk(s);
     s.tmp_11.arg0 = s.arg0;
-    s.callLocIdx = 357; s.pc = 26; return s.tmp_11;
+    s.callLocIdx = 314; s.pc = 26; return s.tmp_11;
   case 26:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -71582,33 +71904,33 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_8);
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.tx___26545;
-    s.tmp_0.arg3 = s.ty___26547;
+    s.tmp_0.arg2 = s.tx___56115;
+    s.tmp_0.arg3 = s.ty___56117;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___26541;
+    s.tmp_0.arg5 = s.font___56111;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 358; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 315; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tx___26545;
+    s.tmp_0 = r0 = s.tx___56115;
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.font___26541;
+    s.tmp_2.arg0 = s.font___56111;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 359; s.pc = 28; return s.tmp_2; }
+     else { s.callLocIdx = 316; s.pc = 28; return s.tmp_2; }
     }
   case 28:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.tx___26545 = (r0);
-    s.tmp_1 = Sprite_vx__P2029_mk(s);
+    s.tx___56115 = (r0);
+    s.tmp_1 = Sprite_vx__P31448_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 360; s.pc = 29; return s.tmp_1;
+    s.callLocIdx = 317; s.pc = 29; return s.tmp_1;
   case 29:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -71617,9 +71939,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    s.tmp_2 = Sprite_vy__P2031_mk(s);
+    s.tmp_2 = Sprite_vy__P31450_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 361; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 318; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
   case 8:
@@ -71627,16 +71949,16 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 9; continue; }
-    s.tmp_4 = r0 = s.ty___26547;
+    s.tmp_4 = r0 = s.ty___56117;
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = s.font___26541;
+    s.tmp_7.arg0 = s.font___56111;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "charHeight");
     } else {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["charHeight"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["charHeight"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 362; s.pc = 31; return s.tmp_7; }
+     else { s.callLocIdx = 319; s.pc = 31; return s.tmp_7; }
     }
   case 31:
     r0 = s.retval;
@@ -71644,12 +71966,12 @@ switch (step) {
     r0 = (s.tmp_6 + 2);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
-    s.ty___26547 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_6 = Sprite_vx__P2029_mk(s);
+    s.ty___56117 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_6 = Sprite_vx__P31448_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 363; s.pc = 33; return s.tmp_6;
+    s.callLocIdx = 320; s.pc = 33; return s.tmp_6;
   case 33:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -71668,9 +71990,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_10 = Sprite_vy__P2031_mk(s);
+    s.tmp_10 = Sprite_vy__P31450_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 364; s.pc = 35; return s.tmp_10;
+    s.callLocIdx = 321; s.pc = 35; return s.tmp_10;
   case 35:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -71687,19 +72009,19 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_7);
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.tx___26545;
-    s.tmp_0.arg3 = s.ty___26547;
+    s.tmp_0.arg2 = s.tx___56115;
+    s.tmp_0.arg3 = s.ty___56117;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___26541;
+    s.tmp_0.arg5 = s.font___56111;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 365; s.pc = 32; return s.tmp_0;
+    s.callLocIdx = 322; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
   case 9:
   case 10:
-    s.tmp_1 = Sprite_ax__P2033_mk(s);
+    s.tmp_1 = Sprite_ax__P31452_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 366; s.pc = 37; return s.tmp_1;
+    s.callLocIdx = 323; s.pc = 37; return s.tmp_1;
   case 37:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -71708,9 +72030,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    s.tmp_2 = Sprite_ay__P2035_mk(s);
+    s.tmp_2 = Sprite_ay__P31454_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 367; s.pc = 38; return s.tmp_2;
+    s.callLocIdx = 324; s.pc = 38; return s.tmp_2;
   case 38:
     r0 = s.retval;
   case 12:
@@ -71718,16 +72040,16 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 13; continue; }
-    s.tmp_4 = r0 = s.ty___26547;
+    s.tmp_4 = r0 = s.ty___56117;
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = s.font___26541;
+    s.tmp_7.arg0 = s.font___56111;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "charHeight");
     } else {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["charHeight"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["charHeight"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 368; s.pc = 39; return s.tmp_7; }
+     else { s.callLocIdx = 325; s.pc = 39; return s.tmp_7; }
     }
   case 39:
     r0 = s.retval;
@@ -71735,12 +72057,12 @@ switch (step) {
     r0 = (s.tmp_6 + 2);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
-    s.ty___26547 = (r0);
-    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_6 = Sprite_ax__P2033_mk(s);
+    s.ty___56117 = (r0);
+    s.tmp_0 = helpers_imagePrint__P31178_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_6 = Sprite_ax__P31452_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 369; s.pc = 41; return s.tmp_6;
+    s.callLocIdx = 326; s.pc = 41; return s.tmp_6;
   case 41:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -71759,9 +72081,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_10 = Sprite_ay__P2035_mk(s);
+    s.tmp_10 = Sprite_ay__P31454_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 370; s.pc = 43; return s.tmp_10;
+    s.callLocIdx = 327; s.pc = 43; return s.tmp_10;
   case 43:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -71778,26 +72100,26 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_7);
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.tx___26545;
-    s.tmp_0.arg3 = s.ty___26547;
+    s.tmp_0.arg2 = s.tx___56115;
+    s.tmp_0.arg3 = s.ty___56117;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___26541;
+    s.tmp_0.arg5 = s.font___56111;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 371; s.pc = 40; return s.tmp_0;
+    s.callLocIdx = 328; s.pc = 40; return s.tmp_0;
   case 40:
     r0 = s.retval;
   case 13:
   case 14:
   case 15:
   case 16:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___2528);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___31947);
     if (!r0) { step = 17; continue; }
-    s.tmp_0 = helpers_imageDrawRect__P1731_mk(s);
-    s.tmp_0.arg0 = globals.screen___1802;
-    s.tmp_3 = game_Hitbox_left__P1966_mk(s);
+    s.tmp_0 = helpers_imageDrawRect__P31149_mk(s);
+    s.tmp_0.arg0 = globals.screen___31220;
+    s.tmp_3 = game_Hitbox_left__P31385_mk(s);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 372; s.pc = 46; return s.tmp_3;
+    s.callLocIdx = 329; s.pc = 46; return s.tmp_3;
   case 46:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -71805,12 +72127,12 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 8);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.ox___26506);
+    r0 = (s.tmp_1 - s.ox___56076);
     s.tmp_0.arg1 = r0;
-    s.tmp_7 = game_Hitbox_top__P1967_mk(s);
+    s.tmp_7 = game_Hitbox_top__P31386_mk(s);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 374; s.pc = 47; return s.tmp_7;
+    s.callLocIdx = 331; s.pc = 47; return s.tmp_7;
   case 47:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -71818,7 +72140,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 >> 8);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.oy___26514);
+    r0 = (s.tmp_5 - s.oy___56084);
     s.tmp_0.arg2 = r0;
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["width"];
@@ -71835,7 +72157,7 @@ switch (step) {
     r0 = (s.tmp_12 >> 8);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 378; s.pc = 45; return s.tmp_0;
+    s.callLocIdx = 335; s.pc = 45; return s.tmp_0;
   case 45:
     r0 = s.retval;
   case 17:
@@ -71845,12 +72167,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___drawCore__P2077.info = {"start":20864,"length":1383,"line":642,"column":4,"endLine":680,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+Sprite___drawCore__P31496.info = {"start":20864,"length":1383,"line":642,"column":4,"endLine":680,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function Sprite___drawCore__P2077_mk(s) {
+function Sprite___drawCore__P31496_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___drawCore__P2077, depth: s.depth + 1,
+        parent: s, fn: Sprite___drawCore__P31496, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71865,13 +72187,13 @@ function Sprite___drawCore__P2077_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  ox___26506: undefined,
-  oy___26514: undefined,
-  l___26522: undefined,
-  t___26526: undefined,
-  font___26541: undefined,
-  tx___26545: undefined,
-  ty___26547: undefined,
+  ox___56076: undefined,
+  oy___56084: undefined,
+  l___56092: undefined,
+  t___56096: undefined,
+  font___56111: undefined,
+  tx___56115: undefined,
+  ty___56117: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -71880,7 +72202,7 @@ function Sprite___drawCore__P2077_mk(s) {
 
 
 
-function Sprite___visible__P2059(s) {
+function Sprite___visible__P31478(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71895,7 +72217,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C31435_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 128);
@@ -71906,12 +72228,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___visible__P2059.info = {"start":8329,"length":72,"line":303,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__visible","argumentNames":["this"]}
+Sprite___visible__P31478.info = {"start":8329,"length":72,"line":303,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"__visible","argumentNames":["this"]}
 
-function Sprite___visible__P2059_mk(s) {
+function Sprite___visible__P31478_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___visible__P2059, depth: s.depth + 1,
+        parent: s, fn: Sprite___visible__P31478, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -72126,7 +72448,7 @@ function if_borderWidth_1_mk(s) {
 } }
 
 
-function PhysicsEngine__C2159_v2_4_mk(s) {
+function PhysicsEngine__C31578_v2_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72143,7 +72465,7 @@ function PhysicsEngine__C2159_v2_4_mk(s) {
 } }
 
 
-function PhysicsEngine__C2159_v0_2_mk(s) {
+function PhysicsEngine__C31578_v0_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72314,7 +72636,7 @@ function if_flags_1_mk(s) {
 } }
 
 
-function particles_ParticleFactory__C2714_v0_2_mk(s) {
+function particles_ParticleFactory__C32133_v0_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72329,7 +72651,7 @@ function particles_ParticleFactory__C2714_v0_2_mk(s) {
 } }
 
 
-function particles_ParticleSource__C2678_v4_3_mk(s) {
+function particles_ParticleSource__C32097_v4_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72373,7 +72695,7 @@ function if_y_1_mk(s) {
 } }
 
 
-function PhysicsEngine__C2159_v4_2_mk(s) {
+function PhysicsEngine__C31578_v4_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72404,7 +72726,7 @@ function if___update_3_mk(s) {
 } }
 
 
-function PhysicsEngine__C2159_v3_1_mk(s) {
+function PhysicsEngine__C31578_v3_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72461,7 +72783,7 @@ function if_id_1_mk(s) {
 } }
 
 
-function controller_Button__C1903_v0_1_mk(s) {
+function controller_Button__C31322_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72616,7 +72938,7 @@ function if_colorPrompt_1_mk(s) {
 } }
 
 
-function game_Dialog__C2494_v1_2_mk(s) {
+function game_Dialog__C31913_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72631,7 +72953,7 @@ function game_Dialog__C2494_v1_2_mk(s) {
 } }
 
 
-function game_BaseDialog__C2477_v0_1_mk(s) {
+function game_BaseDialog__C31896_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72645,7 +72967,7 @@ function game_BaseDialog__C2477_v0_1_mk(s) {
 } }
 
 
-function game_BaseDialog__C2477_v2_1_mk(s) {
+function game_BaseDialog__C31896_v2_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72691,7 +73013,7 @@ function if_sourceFactory_3_mk(s) {
 } }
 
 
-function PhysicsEngine__C2159_v1_2_mk(s) {
+function PhysicsEngine__C31578_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72734,7 +73056,7 @@ function if_startScreenEffect_1_mk(s) {
 } }
 
 
-function game_GameOverDialog__C2516_v0_1_mk(s) {
+function game_GameOverDialog__C31935_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72748,7 +73070,7 @@ function game_GameOverDialog__C2516_v0_1_mk(s) {
 } }
 
 
-function game_GameOverDialog__C2516_v2_1_mk(s) {
+function if_onPlayFinished_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72762,7 +73084,7 @@ function game_GameOverDialog__C2516_v2_1_mk(s) {
 } }
 
 
-function if_onPlayFinished_1_mk(s) {
+function lambda_5_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72773,10 +73095,14 @@ function if_onPlayFinished_1_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
+  arg4: undefined,
 } }
 
 
-function lambda_5_mk(s) {
+function game_GameOverDialog__C31935_v2_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72787,10 +73113,6 @@ function lambda_5_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
-  arg4: undefined,
 } }
 
 
@@ -73132,7 +73454,7 @@ function if_top_1_mk(s) {
 } }
 
 
-function particles_ParticleFactory__C2714_v1_4_mk(s) {
+function particles_ParticleFactory__C32133_v1_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -73179,7 +73501,7 @@ function if_updateSay_3_mk(s) {
 } }
 
 
-function sprites_BaseSprite__C1858_v0_1_mk(s) {
+function sprites_BaseSprite__C31277_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -73193,7 +73515,7 @@ function sprites_BaseSprite__C1858_v0_1_mk(s) {
 } }
 
 
-function sprites_BaseSprite__C1858_v2_2_mk(s) {
+function sprites_BaseSprite__C31277_v2_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -73307,14 +73629,14 @@ function if_width_1_mk(s) {
   arg0: undefined,
 } }
 
-const controller_Button__C1903_VT = mkVTable({
+const controller_Button__C31322_VT = mkVTable({
   name: "Button",
   numFields: 7,
   classNo: 16,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "isPressed": controller_Button_isPressed__P1912,
+    "isPressed": controller_Button_isPressed__P31331,
   },
   iface: {
     "_owner": null,
@@ -73331,26 +73653,26 @@ const controller_Button__C1903_VT = mkVTable({
     "set/_pressedElasped": null,
     "_repeatCount": null,
     "set/_repeatCount": null,
-    "toString": controller_Button_toString__P1908,
-    "raiseButtonUp": controller_Button_raiseButtonUp__P4184,
-    "raiseButtonDown": controller_Button_raiseButtonDown__P4185,
-    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P4186,
-    "onEvent": controller_Button_onEvent__P1910,
-    "isPressed": controller_Button_isPressed__P1912,
-    "pressureLevel": controller_Button_pressureLevel__P1913,
-    "setPressed": controller_Button_setPressed__P1914,
-    "__update": controller_Button___update__P1915,
+    "toString": controller_Button_toString__P31327,
+    "raiseButtonUp": controller_Button_raiseButtonUp__P33677,
+    "raiseButtonDown": controller_Button_raiseButtonDown__P33678,
+    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P33679,
+    "onEvent": controller_Button_onEvent__P31329,
+    "isPressed": controller_Button_isPressed__P31331,
+    "pressureLevel": controller_Button_pressureLevel__P31332,
+    "setPressed": controller_Button_setPressed__P31333,
+    "__update": controller_Button___update__P31334,
   },
-  toStringMethod: controller_Button_toString__P1908,
+  toStringMethod: controller_Button_toString__P31327,
 });
-const controller_AnyButton__C4187_VT = mkVTable({
+const controller_AnyButton__C33680_VT = mkVTable({
   name: "AnyButton",
   numFields: 7,
   classNo: 17,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "isPressed": controller_AnyButton_isPressed__P4189,
+    "isPressed": controller_AnyButton_isPressed__P33682,
   },
   iface: {
     "_owner": null,
@@ -73367,18 +73689,18 @@ const controller_AnyButton__C4187_VT = mkVTable({
     "set/_pressedElasped": null,
     "_repeatCount": null,
     "set/_repeatCount": null,
-    "isPressed": controller_AnyButton_isPressed__P4189,
-    "toString": controller_Button_toString__P1908,
-    "raiseButtonUp": controller_Button_raiseButtonUp__P4184,
-    "raiseButtonDown": controller_Button_raiseButtonDown__P4185,
-    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P4186,
-    "onEvent": controller_Button_onEvent__P1910,
-    "pressureLevel": controller_Button_pressureLevel__P1913,
-    "setPressed": controller_Button_setPressed__P1914,
-    "__update": controller_Button___update__P1915,
+    "isPressed": controller_AnyButton_isPressed__P33682,
+    "toString": controller_Button_toString__P31327,
+    "raiseButtonUp": controller_Button_raiseButtonUp__P33677,
+    "raiseButtonDown": controller_Button_raiseButtonDown__P33678,
+    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P33679,
+    "onEvent": controller_Button_onEvent__P31329,
+    "pressureLevel": controller_Button_pressureLevel__P31332,
+    "setPressed": controller_Button_setPressed__P31333,
+    "__update": controller_Button___update__P31334,
   },
 });
-const Math_FastRandom__C2586_VT = mkVTable({
+const Math_FastRandom__C32005_VT = mkVTable({
   name: "FastRandom",
   numFields: 2,
   classNo: 18,
@@ -73391,12 +73713,12 @@ const Math_FastRandom__C2586_VT = mkVTable({
     "set/lfsr": null,
     "seed": null,
     "set/seed": null,
-    "next": Math_FastRandom_next__P2589,
-    "randomRange": Math_FastRandom_randomRange__P2590,
-    "pickRandom": Math_FastRandom_pickRandom__P2591,
+    "next": Math_FastRandom_next__P32008,
+    "randomRange": Math_FastRandom_randomRange__P32009,
+    "pickRandom": Math_FastRandom_pickRandom__P32010,
   },
 });
-const texteffects_TextEffect__C2831_VT = mkVTable({
+const texteffects_TextEffect__C32250_VT = mkVTable({
   name: "TextEffect",
   numFields: 1,
   classNo: 19,
@@ -73409,7 +73731,7 @@ const texteffects_TextEffect__C2831_VT = mkVTable({
     "set/getState": null,
   },
 });
-const color_FadeState__C5981_VT = mkVTable({
+const color_FadeState__C35503_VT = mkVTable({
   name: "FadeState",
   numFields: 2,
   classNo: 20,
@@ -73424,42 +73746,42 @@ const color_FadeState__C5981_VT = mkVTable({
     "set/scene": null,
   },
 });
-const sprites_BaseSprite__C1858_VT = mkVTable({
+const sprites_BaseSprite__C31277_VT = mkVTable({
   name: "BaseSprite",
   numFields: 2,
   classNo: 21,
   lastSubtypeNo: 25,
   maxBgInstances: null,
   methods: {
-    "__visible": sprites_BaseSprite___visible__P1861,
-    "__draw": sprites_BaseSprite___draw__P1864,
-    "__drawCore": sprites_BaseSprite___drawCore__P1865,
-    "__update": sprites_BaseSprite___update__P1866,
+    "__visible": sprites_BaseSprite___visible__P31280,
+    "__draw": sprites_BaseSprite___draw__P31283,
+    "__drawCore": sprites_BaseSprite___drawCore__P31284,
+    "__update": sprites_BaseSprite___update__P31285,
   },
   iface: {
     "_z": null,
     "set/_z": null,
     "id": null,
     "set/id": null,
-    "__visible": sprites_BaseSprite___visible__P1861,
-    "z": sprites_BaseSprite_z__P1862,
-    "set/z": sprites_BaseSprite_z__P1863,
-    "__draw": sprites_BaseSprite___draw__P1864,
-    "__drawCore": sprites_BaseSprite___drawCore__P1865,
-    "__update": sprites_BaseSprite___update__P1866,
+    "__visible": sprites_BaseSprite___visible__P31280,
+    "z": sprites_BaseSprite_z__P31281,
+    "set/z": sprites_BaseSprite_z__P31282,
+    "__draw": sprites_BaseSprite___draw__P31283,
+    "__drawCore": sprites_BaseSprite___drawCore__P31284,
+    "__update": sprites_BaseSprite___update__P31285,
   },
 });
-const Sprite__C2016_VT = mkVTable({
+const Sprite__C31435_VT = mkVTable({
   name: "Sprite",
   numFields: 26,
   classNo: 22,
   lastSubtypeNo: 22,
   maxBgInstances: null,
   methods: {
-    "__visible": Sprite___visible__P2059,
-    "__draw": sprites_BaseSprite___draw__P1864,
-    "__drawCore": Sprite___drawCore__P2077,
-    "__update": Sprite___update__P2078,
+    "__visible": Sprite___visible__P31478,
+    "__draw": sprites_BaseSprite___draw__P31283,
+    "__drawCore": Sprite___drawCore__P31496,
+    "__update": Sprite___update__P31497,
   },
   iface: {
     "_z": null,
@@ -73514,62 +73836,62 @@ const Sprite__C2016_VT = mkVTable({
     "set/flags": null,
     "destroyHandler": null,
     "set/destroyHandler": null,
-    "x": Sprite_x__P2025,
-    "set/x": Sprite_x__P2026,
-    "y": Sprite_y__P2027,
-    "set/y": Sprite_y__P2028,
-    "vx": Sprite_vx__P2029,
-    "set/vx": Sprite_vx__P2030,
-    "vy": Sprite_vy__P2031,
-    "set/vy": Sprite_vy__P2032,
-    "ax": Sprite_ax__P2033,
-    "set/ax": Sprite_ax__P2034,
-    "ay": Sprite_ay__P2035,
-    "set/ay": Sprite_ay__P2036,
-    "fx": Sprite_fx__P2037,
-    "set/fx": Sprite_fx__P2038,
-    "fy": Sprite_fy__P2039,
-    "set/fy": Sprite_fy__P2040,
-    "data": Sprite_data__P2041,
-    "set/data": Sprite_data__P2042,
-    "image": Sprite_image__P2055,
-    "setImage": Sprite_setImage__P2056,
-    "setHitbox": Sprite_setHitbox__P2057,
-    "isStatic": Sprite_isStatic__P2058,
-    "__visible": Sprite___visible__P2059,
-    "width": Sprite_width__P2060,
-    "height": Sprite_height__P2061,
-    "left": Sprite_left__P2062,
-    "set/left": Sprite_left__P2063,
-    "right": Sprite_right__P2064,
-    "set/right": Sprite_right__P2065,
-    "top": Sprite_top__P2066,
-    "set/top": Sprite_top__P2067,
-    "bottom": Sprite_bottom__P2068,
-    "set/bottom": Sprite_bottom__P2069,
-    "kind": Sprite_kind__P2070,
-    "setKind": Sprite_setKind__P2071,
-    "setPosition": Sprite_setPosition__P2072,
-    "setVelocity": Sprite_setVelocity__P2073,
-    "isOutOfScreen": Sprite_isOutOfScreen__P2076,
-    "__drawCore": Sprite___drawCore__P2077,
-    "__update": Sprite___update__P2078,
-    "setFlag": Sprite_setFlag__P2079,
-    "overlapsWith": Sprite_overlapsWith__P2080,
-    "isHittingTile": Sprite_isHittingTile__P2081,
-    "clearObstacles": Sprite_clearObstacles__P2084,
-    "registerObstacle": Sprite_registerObstacle__P2085,
-    "destroy": Sprite_destroy__P2087,
-    "_destroyCore": Sprite__destroyCore__P2088,
-    "follow": Sprite_follow__P2089,
-    "toString": Sprite_toString__P2090,
-    "z": sprites_BaseSprite_z__P1862,
-    "set/z": sprites_BaseSprite_z__P1863,
-    "__draw": sprites_BaseSprite___draw__P1864,
+    "x": Sprite_x__P31444,
+    "set/x": Sprite_x__P31445,
+    "y": Sprite_y__P31446,
+    "set/y": Sprite_y__P31447,
+    "vx": Sprite_vx__P31448,
+    "set/vx": Sprite_vx__P31449,
+    "vy": Sprite_vy__P31450,
+    "set/vy": Sprite_vy__P31451,
+    "ax": Sprite_ax__P31452,
+    "set/ax": Sprite_ax__P31453,
+    "ay": Sprite_ay__P31454,
+    "set/ay": Sprite_ay__P31455,
+    "fx": Sprite_fx__P31456,
+    "set/fx": Sprite_fx__P31457,
+    "fy": Sprite_fy__P31458,
+    "set/fy": Sprite_fy__P31459,
+    "data": Sprite_data__P31460,
+    "set/data": Sprite_data__P31461,
+    "image": Sprite_image__P31474,
+    "setImage": Sprite_setImage__P31475,
+    "setHitbox": Sprite_setHitbox__P31476,
+    "isStatic": Sprite_isStatic__P31477,
+    "__visible": Sprite___visible__P31478,
+    "width": Sprite_width__P31479,
+    "height": Sprite_height__P31480,
+    "left": Sprite_left__P31481,
+    "set/left": Sprite_left__P31482,
+    "right": Sprite_right__P31483,
+    "set/right": Sprite_right__P31484,
+    "top": Sprite_top__P31485,
+    "set/top": Sprite_top__P31486,
+    "bottom": Sprite_bottom__P31487,
+    "set/bottom": Sprite_bottom__P31488,
+    "kind": Sprite_kind__P31489,
+    "setKind": Sprite_setKind__P31490,
+    "setPosition": Sprite_setPosition__P31491,
+    "setVelocity": Sprite_setVelocity__P31492,
+    "isOutOfScreen": Sprite_isOutOfScreen__P31495,
+    "__drawCore": Sprite___drawCore__P31496,
+    "__update": Sprite___update__P31497,
+    "setFlag": Sprite_setFlag__P31498,
+    "overlapsWith": Sprite_overlapsWith__P31499,
+    "isHittingTile": Sprite_isHittingTile__P31500,
+    "clearObstacles": Sprite_clearObstacles__P31503,
+    "registerObstacle": Sprite_registerObstacle__P31504,
+    "destroy": Sprite_destroy__P31506,
+    "_destroyCore": Sprite__destroyCore__P31507,
+    "follow": Sprite_follow__P31508,
+    "toString": Sprite_toString__P31509,
+    "z": sprites_BaseSprite_z__P31281,
+    "set/z": sprites_BaseSprite_z__P31282,
+    "__draw": sprites_BaseSprite___draw__P31283,
   },
-  toStringMethod: Sprite_toString__P2090,
+  toStringMethod: Sprite_toString__P31509,
 });
-const control_EventContext__C384_VT = mkVTable({
+const control_EventContext__C29919_VT = mkVTable({
   name: "EventContext",
   numFields: 9,
   classNo: 26,
@@ -73596,16 +73918,16 @@ const control_EventContext__C384_VT = mkVTable({
     "set/idleCallbacks": null,
     "runningCallbacks": null,
     "set/runningCallbacks": null,
-    "deltaTime": control_EventContext_deltaTime__P389,
-    "runCallbacks": control_EventContext_runCallbacks__P4029,
-    "registerFrameCallbacks": control_EventContext_registerFrameCallbacks__P4030,
-    "register": control_EventContext_register__P390,
-    "unregister": control_EventContext_unregister__P391,
-    "registerFrameHandler": control_EventContext_registerFrameHandler__P392,
-    "registerHandler": control_EventContext_registerHandler__P394,
+    "deltaTime": control_EventContext_deltaTime__P29924,
+    "runCallbacks": control_EventContext_runCallbacks__P33564,
+    "registerFrameCallbacks": control_EventContext_registerFrameCallbacks__P33565,
+    "register": control_EventContext_register__P29925,
+    "unregister": control_EventContext_unregister__P29926,
+    "registerFrameHandler": control_EventContext_registerFrameHandler__P29927,
+    "registerHandler": control_EventContext_registerHandler__P29929,
   },
 });
-const sprites_FollowingSprite__C1972_VT = mkVTable({
+const sprites_FollowingSprite__C31391_VT = mkVTable({
   name: "FollowingSprite",
   numFields: 4,
   classNo: 27,
@@ -73624,7 +73946,7 @@ const sprites_FollowingSprite__C1972_VT = mkVTable({
     "set/turnRate": null,
   },
 });
-const control_FrameCallback__C381_VT = mkVTable({
+const control_FrameCallback__C29916_VT = mkVTable({
   name: "FrameCallback",
   numFields: 2,
   classNo: 28,
@@ -73639,7 +73961,7 @@ const control_FrameCallback__C381_VT = mkVTable({
     "set/handler": null,
   },
 });
-const control_PollEvent__C4003_VT = mkVTable({
+const control_PollEvent__C33538_VT = mkVTable({
   name: "PollEvent",
   numFields: 6,
   classNo: 29,
@@ -73662,7 +73984,7 @@ const control_PollEvent__C4003_VT = mkVTable({
     "set/once": null,
   },
 });
-const control_EventHandler__C4024_VT = mkVTable({
+const control_EventHandler__C33559_VT = mkVTable({
   name: "EventHandler",
   numFields: 4,
   classNo: 30,
@@ -73679,11 +74001,11 @@ const control_EventHandler__C4024_VT = mkVTable({
     "set/handler": null,
     "flags": null,
     "set/flags": null,
-    "register": control_EventHandler_register__P4025,
-    "unregister": control_EventHandler_unregister__P4026,
+    "register": control_EventHandler_register__P33560,
+    "unregister": control_EventHandler_unregister__P33561,
   },
 });
-const tiles_TileMap__C2317_VT = mkVTable({
+const tiles_TileMap__C31736_VT = mkVTable({
   name: "TileMap",
   numFields: 3,
   classNo: 31,
@@ -73698,32 +74020,32 @@ const tiles_TileMap__C2317_VT = mkVTable({
     "set/_layer": null,
     "_map": null,
     "set/_map": null,
-    "scale": tiles_TileMap_scale__P2319,
-    "set/scale": tiles_TileMap_scale__P2320,
-    "data": tiles_TileMap_data__P4292,
-    "offsetX": tiles_TileMap_offsetX__P2321,
-    "offsetY": tiles_TileMap_offsetY__P2322,
-    "areaWidth": tiles_TileMap_areaWidth__P2323,
-    "areaHeight": tiles_TileMap_areaHeight__P2324,
-    "layer": tiles_TileMap_layer__P2325,
-    "enabled": tiles_TileMap_enabled__P2327,
-    "setData": tiles_TileMap_setData__P2328,
-    "getTile": tiles_TileMap_getTile__P2329,
-    "getTileIndex": tiles_TileMap_getTileIndex__P2330,
-    "setTileAt": tiles_TileMap_setTileAt__P2331,
-    "getImageType": tiles_TileMap_getImageType__P2332,
-    "setWallAt": tiles_TileMap_setWallAt__P2333,
-    "getTilesByType": tiles_TileMap_getTilesByType__P2334,
-    "sampleTilesByType": tiles_TileMap_sampleTilesByType__P2335,
-    "isInvalidIndex": tiles_TileMap_isInvalidIndex__P4293,
-    "draw": tiles_TileMap_draw__P4294,
-    "isObstacle": tiles_TileMap_isObstacle__P2336,
-    "getObstacle": tiles_TileMap_getObstacle__P2337,
-    "isOnWall": tiles_TileMap_isOnWall__P2338,
-    "getTileImage": tiles_TileMap_getTileImage__P2339,
+    "scale": tiles_TileMap_scale__P31738,
+    "set/scale": tiles_TileMap_scale__P31739,
+    "data": tiles_TileMap_data__P33785,
+    "offsetX": tiles_TileMap_offsetX__P31740,
+    "offsetY": tiles_TileMap_offsetY__P31741,
+    "areaWidth": tiles_TileMap_areaWidth__P31742,
+    "areaHeight": tiles_TileMap_areaHeight__P31743,
+    "layer": tiles_TileMap_layer__P31744,
+    "enabled": tiles_TileMap_enabled__P31746,
+    "setData": tiles_TileMap_setData__P31747,
+    "getTile": tiles_TileMap_getTile__P31748,
+    "getTileIndex": tiles_TileMap_getTileIndex__P31749,
+    "setTileAt": tiles_TileMap_setTileAt__P31750,
+    "getImageType": tiles_TileMap_getImageType__P31751,
+    "setWallAt": tiles_TileMap_setWallAt__P31752,
+    "getTilesByType": tiles_TileMap_getTilesByType__P31753,
+    "sampleTilesByType": tiles_TileMap_sampleTilesByType__P31754,
+    "isInvalidIndex": tiles_TileMap_isInvalidIndex__P33786,
+    "draw": tiles_TileMap_draw__P33787,
+    "isObstacle": tiles_TileMap_isObstacle__P31755,
+    "getObstacle": tiles_TileMap_getObstacle__P31756,
+    "isOnWall": tiles_TileMap_isOnWall__P31757,
+    "getTileImage": tiles_TileMap_getTileImage__P31758,
   },
 });
-const tiles_Location__C2289_VT = mkVTable({
+const tiles_Location__C31708_VT = mkVTable({
   name: "Location",
   numFields: 3,
   classNo: 32,
@@ -73738,15 +74060,15 @@ const tiles_Location__C2289_VT = mkVTable({
     "set/_col": null,
     "tileMap": null,
     "set/tileMap": null,
-    "col": tiles_Location_col__P2290,
-    "row": tiles_Location_row__P2291,
-    "x": tiles_Location_x__P2293,
-    "y": tiles_Location_y__P2294,
-    "tileSet": tiles_Location_tileSet__P2295,
-    "place": tiles_Location_place__P2296,
+    "col": tiles_Location_col__P31709,
+    "row": tiles_Location_row__P31710,
+    "x": tiles_Location_x__P31712,
+    "y": tiles_Location_y__P31713,
+    "tileSet": tiles_Location_tileSet__P31714,
+    "place": tiles_Location_place__P31715,
   },
 });
-const tiles_TileMapData__C2304_VT = mkVTable({
+const tiles_TileMapData__C31723_VT = mkVTable({
   name: "TileMapData",
   numFields: 7,
   classNo: 33,
@@ -73769,20 +74091,20 @@ const tiles_TileMapData__C2304_VT = mkVTable({
     "set/_width": null,
     "_height": null,
     "set/_height": null,
-    "width": tiles_TileMapData_width__P2306,
-    "height": tiles_TileMapData_height__P2307,
-    "scale": tiles_TileMapData_scale__P2308,
-    "set/scale": tiles_TileMapData_scale__P2309,
-    "getTile": tiles_TileMapData_getTile__P2310,
-    "setTile": tiles_TileMapData_setTile__P2311,
-    "getTileset": tiles_TileMapData_getTileset__P2312,
-    "getTileImage": tiles_TileMapData_getTileImage__P2313,
-    "setWall": tiles_TileMapData_setWall__P2314,
-    "isWall": tiles_TileMapData_isWall__P2315,
-    "isOutsideMap": tiles_TileMapData_isOutsideMap__P2316,
+    "width": tiles_TileMapData_width__P31725,
+    "height": tiles_TileMapData_height__P31726,
+    "scale": tiles_TileMapData_scale__P31727,
+    "set/scale": tiles_TileMapData_scale__P31728,
+    "getTile": tiles_TileMapData_getTile__P31729,
+    "setTile": tiles_TileMapData_setTile__P31730,
+    "getTileset": tiles_TileMapData_getTileset__P31731,
+    "getTileImage": tiles_TileMapData_getTileImage__P31732,
+    "setWall": tiles_TileMapData_setWall__P31733,
+    "isWall": tiles_TileMapData_isWall__P31734,
+    "isOutsideMap": tiles_TileMapData_isOutsideMap__P31735,
   },
 });
-const Heap__C3646_VT = mkVTable({
+const Heap__C33180_VT = mkVTable({
   name: "Heap",
   numFields: 2,
   classNo: 34,
@@ -73795,17 +74117,17 @@ const Heap__C3646_VT = mkVTable({
     "set/store": null,
     "comparator": null,
     "set/comparator": null,
-    "percolateDown": Heap_percolateDown__P6074,
-    "percolateUp": Heap_percolateUp__P6075,
-    "push": Heap_push__P3648,
-    "pop": Heap_pop__P3649,
-    "length": Heap_length__P3651,
-    "parent": Heap_parent__P6076,
-    "leftChild": Heap_leftChild__P6077,
-    "rightChild": Heap_rightChild__P6078,
+    "percolateDown": Heap_percolateDown__P35596,
+    "percolateUp": Heap_percolateUp__P35597,
+    "push": Heap_push__P33182,
+    "pop": Heap_pop__P33183,
+    "length": Heap_length__P33185,
+    "parent": Heap_parent__P35598,
+    "leftChild": Heap_leftChild__P35599,
+    "rightChild": Heap_rightChild__P35600,
   },
 });
-const scene_PrioritizedLocation__C6079_VT = mkVTable({
+const scene_PrioritizedLocation__C35601_VT = mkVTable({
   name: "PrioritizedLocation",
   numFields: 3,
   classNo: 35,
@@ -73822,7 +74144,7 @@ const scene_PrioritizedLocation__C6079_VT = mkVTable({
     "set/extraCost": null,
   },
 });
-const scene_LocationNode__C6081_VT = mkVTable({
+const scene_LocationNode__C35603_VT = mkVTable({
   name: "LocationNode",
   numFields: 4,
   classNo: 36,
@@ -73841,7 +74163,7 @@ const scene_LocationNode__C6081_VT = mkVTable({
     "set/lastCost": null,
   },
 });
-const scene_GameForeverHandler__C2398_VT = mkVTable({
+const scene_GameForeverHandler__C31817_VT = mkVTable({
   name: "GameForeverHandler",
   numFields: 2,
   classNo: 37,
@@ -73856,28 +74178,28 @@ const scene_GameForeverHandler__C2398_VT = mkVTable({
     "set/handler": null,
   },
 });
-const PhysicsEngine__C2159_VT = mkVTable({
+const PhysicsEngine__C31578_VT = mkVTable({
   name: "PhysicsEngine",
   numFields: 0,
   classNo: 38,
   lastSubtypeNo: 39,
   maxBgInstances: null,
   methods: {
-    "addSprite": PhysicsEngine_addSprite__P2161,
-    "removeSprite": PhysicsEngine_removeSprite__P2162,
-    "moveSprite": PhysicsEngine_moveSprite__P2163,
-    "draw": PhysicsEngine_draw__P2164,
-    "move": PhysicsEngine_move__P2165,
+    "addSprite": PhysicsEngine_addSprite__P31580,
+    "removeSprite": PhysicsEngine_removeSprite__P31581,
+    "moveSprite": PhysicsEngine_moveSprite__P31582,
+    "draw": PhysicsEngine_draw__P31583,
+    "move": PhysicsEngine_move__P31584,
   },
   iface: {
-    "addSprite": PhysicsEngine_addSprite__P2161,
-    "removeSprite": PhysicsEngine_removeSprite__P2162,
-    "moveSprite": PhysicsEngine_moveSprite__P2163,
-    "draw": PhysicsEngine_draw__P2164,
-    "move": PhysicsEngine_move__P2165,
+    "addSprite": PhysicsEngine_addSprite__P31580,
+    "removeSprite": PhysicsEngine_removeSprite__P31581,
+    "moveSprite": PhysicsEngine_moveSprite__P31582,
+    "draw": PhysicsEngine_draw__P31583,
+    "move": PhysicsEngine_move__P31584,
   },
 });
-const scene_Scene__C2419_VT = mkVTable({
+const scene_Scene__C31838_VT = mkVTable({
   name: "Scene",
   numFields: 23,
   classNo: 40,
@@ -73932,15 +74254,15 @@ const scene_Scene__C2419_VT = mkVTable({
     "set/_data": null,
     "previousScene": null,
     "set/previousScene": null,
-    "init": scene_Scene_init__P2441,
-    "data": scene_Scene_data__P2442,
-    "millis": scene_Scene_millis__P2443,
-    "addSprite": scene_Scene_addSprite__P2444,
-    "destroy": scene_Scene_destroy__P2445,
-    "render": scene_Scene_render__P2446,
+    "init": scene_Scene_init__P31860,
+    "data": scene_Scene_data__P31861,
+    "millis": scene_Scene_millis__P31862,
+    "addSprite": scene_Scene_addSprite__P31863,
+    "destroy": scene_Scene_destroy__P31864,
+    "render": scene_Scene_render__P31865,
   },
 });
-const info_PlayerInfo__C2226_VT = mkVTable({
+const info_PlayerInfo__C31645_VT = mkVTable({
   name: "PlayerInfo",
   numFields: 12,
   classNo: 41,
@@ -73973,21 +74295,21 @@ const info_PlayerInfo__C2226_VT = mkVTable({
     "set/left": null,
     "up": null,
     "set/up": null,
-    "init": info_PlayerInfo_init__P4282,
-    "getState": info_PlayerInfo_getState__P2239,
-    "id": info_PlayerInfo_id__P2240,
-    "score": info_PlayerInfo_score__P2241,
-    "setScore": info_PlayerInfo_setScore__P2242,
-    "changeScoreBy": info_PlayerInfo_changeScoreBy__P2243,
-    "hasScore": info_PlayerInfo_hasScore__P2244,
-    "hasLife": info_PlayerInfo_hasLife__P2248,
-    "raiseLifeZero": info_PlayerInfo_raiseLifeZero__P2250,
-    "drawPlayer": info_PlayerInfo_drawPlayer__P2251,
-    "drawScore": info_PlayerInfo_drawScore__P2252,
-    "drawLives": info_PlayerInfo_drawLives__P2253,
+    "init": info_PlayerInfo_init__P33775,
+    "getState": info_PlayerInfo_getState__P31658,
+    "id": info_PlayerInfo_id__P31659,
+    "score": info_PlayerInfo_score__P31660,
+    "setScore": info_PlayerInfo_setScore__P31661,
+    "changeScoreBy": info_PlayerInfo_changeScoreBy__P31662,
+    "hasScore": info_PlayerInfo_hasScore__P31663,
+    "hasLife": info_PlayerInfo_hasLife__P31667,
+    "raiseLifeZero": info_PlayerInfo_raiseLifeZero__P31669,
+    "drawPlayer": info_PlayerInfo_drawPlayer__P31670,
+    "drawScore": info_PlayerInfo_drawScore__P31671,
+    "drawLives": info_PlayerInfo_drawLives__P31672,
   },
 });
-const info_InfoState__C4227_VT = mkVTable({
+const info_InfoState__C33720_VT = mkVTable({
   name: "InfoState",
   numFields: 10,
   classNo: 42,
@@ -74018,17 +74340,17 @@ const info_InfoState__C4227_VT = mkVTable({
     "set/countdownEndHandler": null,
   },
 });
-const scene_Renderable__C2378_VT = mkVTable({
+const scene_Renderable__C31797_VT = mkVTable({
   name: "Renderable",
   numFields: 4,
   classNo: 23,
   lastSubtypeNo: 23,
   maxBgInstances: null,
   methods: {
-    "__visible": scene_Renderable___visible__P2380,
-    "__draw": sprites_BaseSprite___draw__P1864,
-    "__drawCore": scene_Renderable___drawCore__P2381,
-    "__update": sprites_BaseSprite___update__P1866,
+    "__visible": scene_Renderable___visible__P31799,
+    "__draw": sprites_BaseSprite___draw__P31283,
+    "__drawCore": scene_Renderable___drawCore__P31800,
+    "__update": sprites_BaseSprite___update__P31285,
   },
   iface: {
     "_z": null,
@@ -74039,15 +74361,15 @@ const scene_Renderable__C2378_VT = mkVTable({
     "set/handler": null,
     "shouldBeVisible": null,
     "set/shouldBeVisible": null,
-    "__visible": scene_Renderable___visible__P2380,
-    "__drawCore": scene_Renderable___drawCore__P2381,
-    "z": sprites_BaseSprite_z__P1862,
-    "set/z": sprites_BaseSprite_z__P1863,
-    "__draw": sprites_BaseSprite___draw__P1864,
-    "__update": sprites_BaseSprite___update__P1866,
+    "__visible": scene_Renderable___visible__P31799,
+    "__drawCore": scene_Renderable___drawCore__P31800,
+    "z": sprites_BaseSprite_z__P31281,
+    "set/z": sprites_BaseSprite_z__P31282,
+    "__draw": sprites_BaseSprite___draw__P31283,
+    "__update": sprites_BaseSprite___update__P31285,
   },
 });
-const info_PlayerState__C2197_VT = mkVTable({
+const info_PlayerState__C31616_VT = mkVTable({
   name: "PlayerState",
   numFields: 3,
   classNo: 43,
@@ -74064,7 +74386,7 @@ const info_PlayerState__C2197_VT = mkVTable({
     "set/lifeZeroHandler": null,
   },
 });
-const controller_Controller__C1923_VT = mkVTable({
+const controller_Controller__C31342_VT = mkVTable({
   name: "Controller",
   numFields: 5,
   classNo: 44,
@@ -74083,22 +74405,22 @@ const controller_Controller__C1923_VT = mkVTable({
     "set/_id": null,
     "_connected": null,
     "set/_connected": null,
-    "_controlledSprites": controller_Controller__controlledSprites__P1928,
-    "set/_controlledSprites": controller_Controller__controlledSprites__P1929,
-    "id": controller_Controller_id__P1930,
-    "left": controller_Controller_left__P1932,
-    "right": controller_Controller_right__P1933,
-    "up": controller_Controller_up__P1934,
-    "down": controller_Controller_down__P1935,
-    "moveSprite": controller_Controller_moveSprite__P1939,
-    "button": controller_Controller_button__P4192,
-    "connected": controller_Controller_connected__P1942,
-    "set/connected": controller_Controller_connected__P1943,
-    "__preUpdate": controller_Controller___preUpdate__P1947,
-    "__update": controller_Controller___update__P1948,
+    "_controlledSprites": controller_Controller__controlledSprites__P31347,
+    "set/_controlledSprites": controller_Controller__controlledSprites__P31348,
+    "id": controller_Controller_id__P31349,
+    "left": controller_Controller_left__P31351,
+    "right": controller_Controller_right__P31352,
+    "up": controller_Controller_up__P31353,
+    "down": controller_Controller_down__P31354,
+    "moveSprite": controller_Controller_moveSprite__P31358,
+    "button": controller_Controller_button__P33685,
+    "connected": controller_Controller_connected__P31361,
+    "set/connected": controller_Controller_connected__P31362,
+    "__preUpdate": controller_Controller___preUpdate__P31366,
+    "__update": controller_Controller___update__P31367,
   },
 });
-const controller_ControlledSprite__C1919_VT = mkVTable({
+const controller_ControlledSprite__C31338_VT = mkVTable({
   name: "ControlledSprite",
   numFields: 4,
   classNo: 45,
@@ -74117,7 +74439,7 @@ const controller_ControlledSprite__C1919_VT = mkVTable({
     "set/vy": null,
   },
 });
-const character_CharacterState__C6141_VT = mkVTable({
+const character_CharacterState__C35663_VT = mkVTable({
   name: "CharacterState",
   numFields: 12,
   classNo: 46,
@@ -74150,15 +74472,15 @@ const character_CharacterState__C6141_VT = mkVTable({
     "set/manualFlags": null,
     "sprite": null,
     "set/sprite": null,
-    "setFrames": character_CharacterState_setFrames__P6142,
-    "setLoopFrames": character_CharacterState_setLoopFrames__P6143,
-    "update": character_CharacterState_update__P6145,
-    "setEnabled": character_CharacterState_setEnabled__P6147,
-    "setManualFlags": character_CharacterState_setManualFlags__P6148,
-    "pickRule": character_CharacterState_pickRule__P6150,
+    "setFrames": character_CharacterState_setFrames__P35664,
+    "setLoopFrames": character_CharacterState_setLoopFrames__P35665,
+    "update": character_CharacterState_update__P35667,
+    "setEnabled": character_CharacterState_setEnabled__P35669,
+    "setManualFlags": character_CharacterState_setManualFlags__P35670,
+    "pickRule": character_CharacterState_pickRule__P35672,
   },
 });
-const character_CharacterAnimationSceneState__C6136_VT = mkVTable({
+const character_CharacterAnimationSceneState__C35658_VT = mkVTable({
   name: "CharacterAnimationSceneState",
   numFields: 1,
   classNo: 47,
@@ -74169,17 +74491,39 @@ const character_CharacterAnimationSceneState__C6136_VT = mkVTable({
   iface: {
     "characters": null,
     "set/characters": null,
-    "update": character_CharacterAnimationSceneState_update__P6137,
+    "update": character_CharacterAnimationSceneState_update__P35659,
   },
 });
-const effects_ImageEffect__C2816_VT = mkVTable({
-  name: "ImageEffect",
-  numFields: 4,
+const music_Melody__C32278_VT = mkVTable({
+  name: "Melody",
+  numFields: 2,
   classNo: 48,
   lastSubtypeNo: 48,
   maxBgInstances: null,
   methods: {
   },
+  iface: {
+    "_text": null,
+    "set/_text": null,
+    "_player": null,
+    "set/_player": null,
+    "stop": music_Melody_stop__P32283,
+    "registerMelody": music_Melody_registerMelody__P34336,
+    "unregisterMelody": music_Melody_unregisterMelody__P34337,
+    "playCore": music_Melody_playCore__P34338,
+    "play": music_Melody_play__P32285,
+    "toString": music_Melody_toString__P32287,
+  },
+  toStringMethod: music_Melody_toString__P32287,
+});
+const effects_ImageEffect__C32235_VT = mkVTable({
+  name: "ImageEffect",
+  numFields: 4,
+  classNo: 49,
+  lastSubtypeNo: 49,
+  maxBgInstances: null,
+  methods: {
+  },
   iface: {
     "preferredDelay": null,
     "set/preferredDelay": null,
@@ -74189,16 +74533,16 @@ const effects_ImageEffect__C2816_VT = mkVTable({
     "set/fastRandom": null,
     "times": null,
     "set/times": null,
-    "applyTo": effects_ImageEffect_applyTo__P2818,
-    "change": effects_ImageEffect_change__P2819,
-    "startScreenEffect": effects_ImageEffect_startScreenEffect__P2820,
+    "applyTo": effects_ImageEffect_applyTo__P32237,
+    "change": effects_ImageEffect_change__P32238,
+    "startScreenEffect": effects_ImageEffect_startScreenEffect__P32239,
   },
 });
-const effects_ParticleEffect__C2789_VT = mkVTable({
+const effects_ParticleEffect__C32208_VT = mkVTable({
   name: "ParticleEffect",
   numFields: 3,
-  classNo: 49,
-  lastSubtypeNo: 50,
+  classNo: 50,
+  lastSubtypeNo: 51,
   maxBgInstances: null,
   methods: {
   },
@@ -74209,15 +74553,15 @@ const effects_ParticleEffect__C2789_VT = mkVTable({
     "set/defaultRate": null,
     "defaultLifespan": null,
     "set/defaultLifespan": null,
-    "start": effects_ParticleEffect_start__P2791,
-    "destroy": effects_ParticleEffect_destroy__P2792,
+    "start": effects_ParticleEffect_start__P32210,
+    "destroy": effects_ParticleEffect_destroy__P32211,
   },
 });
-const effects_ScreenEffect__C2793_VT = mkVTable({
+const effects_ScreenEffect__C32212_VT = mkVTable({
   name: "ScreenEffect",
   numFields: 5,
-  classNo: 50,
-  lastSubtypeNo: 50,
+  classNo: 51,
+  lastSubtypeNo: 51,
   maxBgInstances: null,
   methods: {
   },
@@ -74232,36 +74576,36 @@ const effects_ScreenEffect__C2793_VT = mkVTable({
     "set/source": null,
     "sceneDefaultRate": null,
     "set/sceneDefaultRate": null,
-    "startScreenEffect": effects_ScreenEffect_startScreenEffect__P2795,
-    "endScreenEffect": effects_ScreenEffect_endScreenEffect__P2796,
-    "start": effects_ParticleEffect_start__P2791,
-    "destroy": effects_ParticleEffect_destroy__P2792,
+    "startScreenEffect": effects_ScreenEffect_startScreenEffect__P32214,
+    "endScreenEffect": effects_ScreenEffect_endScreenEffect__P32215,
+    "start": effects_ParticleEffect_start__P32210,
+    "destroy": effects_ParticleEffect_destroy__P32211,
   },
 });
-const particles_ParticleFactory__C2714_VT = mkVTable({
+const particles_ParticleFactory__C32133_VT = mkVTable({
   name: "ParticleFactory",
   numFields: 0,
-  classNo: 51,
-  lastSubtypeNo: 55,
+  classNo: 52,
+  lastSubtypeNo: 56,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ParticleFactory_createParticle__P2716,
-    "drawParticle": particles_ParticleFactory_drawParticle__P2717,
+    "createParticle": particles_ParticleFactory_createParticle__P32135,
+    "drawParticle": particles_ParticleFactory_drawParticle__P32136,
   },
   iface: {
-    "createParticle": particles_ParticleFactory_createParticle__P2716,
-    "drawParticle": particles_ParticleFactory_drawParticle__P2717,
+    "createParticle": particles_ParticleFactory_createParticle__P32135,
+    "drawParticle": particles_ParticleFactory_drawParticle__P32136,
   },
 });
-const particles_SprayFactory__C2718_VT = mkVTable({
+const particles_SprayFactory__C32137_VT = mkVTable({
   name: "SprayFactory",
   numFields: 3,
-  classNo: 52,
-  lastSubtypeNo: 55,
+  classNo: 53,
+  lastSubtypeNo: 56,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_SprayFactory_createParticle__P2720,
-    "drawParticle": particles_SprayFactory_drawParticle__P2721,
+    "createParticle": particles_SprayFactory_createParticle__P32139,
+    "drawParticle": particles_SprayFactory_drawParticle__P32140,
   },
   iface: {
     "speed": null,
@@ -74270,21 +74614,21 @@ const particles_SprayFactory__C2718_VT = mkVTable({
     "set/minAngle": null,
     "spread": null,
     "set/spread": null,
-    "createParticle": particles_SprayFactory_createParticle__P2720,
-    "drawParticle": particles_SprayFactory_drawParticle__P2721,
-    "setSpeed": particles_SprayFactory_setSpeed__P2722,
-    "setDirection": particles_SprayFactory_setDirection__P2723,
+    "createParticle": particles_SprayFactory_createParticle__P32139,
+    "drawParticle": particles_SprayFactory_drawParticle__P32140,
+    "setSpeed": particles_SprayFactory_setSpeed__P32141,
+    "setDirection": particles_SprayFactory_setDirection__P32142,
   },
 });
-const particles_AreaFactory__C2724_VT = mkVTable({
+const particles_AreaFactory__C32143_VT = mkVTable({
   name: "AreaFactory",
   numFields: 8,
-  classNo: 53,
-  lastSubtypeNo: 55,
+  classNo: 54,
+  lastSubtypeNo: 56,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_AreaFactory_createParticle__P2730,
-    "drawParticle": particles_AreaFactory_drawParticle__P2731,
+    "createParticle": particles_AreaFactory_createParticle__P32149,
+    "drawParticle": particles_AreaFactory_drawParticle__P32150,
   },
   iface: {
     "speed": null,
@@ -74303,21 +74647,21 @@ const particles_AreaFactory__C2724_VT = mkVTable({
     "set/maxLifespan": null,
     "galois": null,
     "set/galois": null,
-    "createParticle": particles_AreaFactory_createParticle__P2730,
-    "drawParticle": particles_AreaFactory_drawParticle__P2731,
-    "setSpeed": particles_SprayFactory_setSpeed__P2722,
-    "setDirection": particles_SprayFactory_setDirection__P2723,
+    "createParticle": particles_AreaFactory_createParticle__P32149,
+    "drawParticle": particles_AreaFactory_drawParticle__P32150,
+    "setSpeed": particles_SprayFactory_setSpeed__P32141,
+    "setDirection": particles_SprayFactory_setDirection__P32142,
   },
 });
-const particles_ShapeFactory__C2740_VT = mkVTable({
+const particles_ShapeFactory__C32159_VT = mkVTable({
   name: "ShapeFactory",
   numFields: 11,
-  classNo: 54,
-  lastSubtypeNo: 55,
+  classNo: 55,
+  lastSubtypeNo: 56,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ShapeFactory_createParticle__P2744,
-    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
+    "createParticle": particles_ShapeFactory_createParticle__P32163,
+    "drawParticle": particles_ShapeFactory_drawParticle__P32162,
   },
   iface: {
     "speed": null,
@@ -74342,22 +74686,22 @@ const particles_ShapeFactory__C2740_VT = mkVTable({
     "set/ox": null,
     "oy": null,
     "set/oy": null,
-    "addShape": particles_ShapeFactory_addShape__P2742,
-    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
-    "createParticle": particles_ShapeFactory_createParticle__P2744,
-    "setSpeed": particles_SprayFactory_setSpeed__P2722,
-    "setDirection": particles_SprayFactory_setDirection__P2723,
+    "addShape": particles_ShapeFactory_addShape__P32161,
+    "drawParticle": particles_ShapeFactory_drawParticle__P32162,
+    "createParticle": particles_ShapeFactory_createParticle__P32163,
+    "setSpeed": particles_SprayFactory_setSpeed__P32141,
+    "setDirection": particles_SprayFactory_setDirection__P32142,
   },
 });
-const particles_ConfettiFactory__C2745_VT = mkVTable({
+const particles_ConfettiFactory__C32164_VT = mkVTable({
   name: "ConfettiFactory",
   numFields: 11,
-  classNo: 55,
-  lastSubtypeNo: 55,
+  classNo: 56,
+  lastSubtypeNo: 56,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ShapeFactory_createParticle__P2744,
-    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
+    "createParticle": particles_ShapeFactory_createParticle__P32163,
+    "drawParticle": particles_ShapeFactory_drawParticle__P32162,
   },
   iface: {
     "speed": null,
@@ -74382,25 +74726,25 @@ const particles_ConfettiFactory__C2745_VT = mkVTable({
     "set/ox": null,
     "oy": null,
     "set/oy": null,
-    "addShape": particles_ShapeFactory_addShape__P2742,
-    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
-    "createParticle": particles_ShapeFactory_createParticle__P2744,
-    "setSpeed": particles_SprayFactory_setSpeed__P2722,
-    "setDirection": particles_SprayFactory_setDirection__P2723,
+    "addShape": particles_ShapeFactory_addShape__P32161,
+    "drawParticle": particles_ShapeFactory_drawParticle__P32162,
+    "createParticle": particles_ShapeFactory_createParticle__P32163,
+    "setSpeed": particles_SprayFactory_setSpeed__P32141,
+    "setDirection": particles_SprayFactory_setDirection__P32142,
   },
 });
-const particles_ParticleSource__C2678_VT = mkVTable({
+const particles_ParticleSource__C32097_VT = mkVTable({
   name: "ParticleSource",
   numFields: 13,
   classNo: 24,
   lastSubtypeNo: 24,
   maxBgInstances: null,
   methods: {
-    "__visible": sprites_BaseSprite___visible__P1861,
-    "__draw": particles_ParticleSource___draw__P2684,
-    "__drawCore": sprites_BaseSprite___drawCore__P1865,
-    "__update": sprites_BaseSprite___update__P1866,
-    "updateParticle": particles_ParticleSource_updateParticle__P4703,
+    "__visible": sprites_BaseSprite___visible__P31280,
+    "__draw": particles_ParticleSource___draw__P32103,
+    "__drawCore": sprites_BaseSprite___drawCore__P31284,
+    "__update": sprites_BaseSprite___update__P31285,
+    "updateParticle": particles_ParticleSource_updateParticle__P34196,
   },
   iface: {
     "_z": null,
@@ -74429,32 +74773,32 @@ const particles_ParticleSource__C2678_VT = mkVTable({
     "set/ax": null,
     "ay": null,
     "set/ay": null,
-    "__draw": particles_ParticleSource___draw__P2684,
-    "_update": particles_ParticleSource__update__P2685,
-    "_prune": particles_ParticleSource__prune__P2686,
-    "setAcceleration": particles_ParticleSource_setAcceleration__P2687,
-    "setRelativeToCamera": particles_ParticleSource_setRelativeToCamera__P2689,
-    "enabled": particles_ParticleSource_enabled__P2690,
-    "set/enabled": particles_ParticleSource_enabled__P2691,
-    "destroy": particles_ParticleSource_destroy__P2692,
-    "clear": particles_ParticleSource_clear__P2693,
-    "setAnchor": particles_ParticleSource_setAnchor__P2694,
-    "setRate": particles_ParticleSource_setRate__P2695,
-    "setFactory": particles_ParticleSource_setFactory__P2697,
-    "updateParticle": particles_ParticleSource_updateParticle__P4703,
-    "drawParticle": particles_ParticleSource_drawParticle__P4704,
-    "__visible": sprites_BaseSprite___visible__P1861,
-    "z": sprites_BaseSprite_z__P1862,
-    "set/z": sprites_BaseSprite_z__P1863,
-    "__drawCore": sprites_BaseSprite___drawCore__P1865,
-    "__update": sprites_BaseSprite___update__P1866,
+    "__draw": particles_ParticleSource___draw__P32103,
+    "_update": particles_ParticleSource__update__P32104,
+    "_prune": particles_ParticleSource__prune__P32105,
+    "setAcceleration": particles_ParticleSource_setAcceleration__P32106,
+    "setRelativeToCamera": particles_ParticleSource_setRelativeToCamera__P32108,
+    "enabled": particles_ParticleSource_enabled__P32109,
+    "set/enabled": particles_ParticleSource_enabled__P32110,
+    "destroy": particles_ParticleSource_destroy__P32111,
+    "clear": particles_ParticleSource_clear__P32112,
+    "setAnchor": particles_ParticleSource_setAnchor__P32113,
+    "setRate": particles_ParticleSource_setRate__P32114,
+    "setFactory": particles_ParticleSource_setFactory__P32116,
+    "updateParticle": particles_ParticleSource_updateParticle__P34196,
+    "drawParticle": particles_ParticleSource_drawParticle__P34197,
+    "__visible": sprites_BaseSprite___visible__P31280,
+    "z": sprites_BaseSprite_z__P31281,
+    "set/z": sprites_BaseSprite_z__P31282,
+    "__drawCore": sprites_BaseSprite___drawCore__P31284,
+    "__update": sprites_BaseSprite___update__P31285,
   },
 });
-const particles_Particle__C2659_VT = mkVTable({
+const particles_Particle__C32078_VT = mkVTable({
   name: "Particle",
   numFields: 8,
-  classNo: 56,
-  lastSubtypeNo: 56,
+  classNo: 57,
+  lastSubtypeNo: 57,
   maxBgInstances: 200,
   methods: {
   },
@@ -74477,11 +74821,11 @@ const particles_Particle__C2659_VT = mkVTable({
     "set/color": null,
   },
 });
-const scene_Camera__C2360_VT = mkVTable({
+const scene_Camera__C31779_VT = mkVTable({
   name: "Camera",
   numFields: 8,
-  classNo: 57,
-  lastSubtypeNo: 57,
+  classNo: 58,
+  lastSubtypeNo: 58,
   maxBgInstances: null,
   methods: {
   },
@@ -74502,22 +74846,22 @@ const scene_Camera__C2360_VT = mkVTable({
     "set/shakeDuration": null,
     "shakeAmplitude": null,
     "set/shakeAmplitude": null,
-    "offsetX": scene_Camera_offsetX__P2365,
-    "set/offsetX": scene_Camera_offsetX__P2366,
-    "offsetY": scene_Camera_offsetY__P2367,
-    "set/offsetY": scene_Camera_offsetY__P2368,
-    "x": scene_Camera_x__P2369,
-    "y": scene_Camera_y__P2370,
-    "left": scene_Camera_left__P2371,
-    "top": scene_Camera_top__P2373,
-    "update": scene_Camera_update__P2376,
+    "offsetX": scene_Camera_offsetX__P31784,
+    "set/offsetX": scene_Camera_offsetX__P31785,
+    "offsetY": scene_Camera_offsetY__P31786,
+    "set/offsetY": scene_Camera_offsetY__P31787,
+    "x": scene_Camera_x__P31788,
+    "y": scene_Camera_y__P31789,
+    "left": scene_Camera_left__P31790,
+    "top": scene_Camera_top__P31792,
+    "update": scene_Camera_update__P31795,
   },
 });
-const scene_Background__C2265_VT = mkVTable({
+const scene_Background__C31684_VT = mkVTable({
   name: "Background",
   numFields: 4,
-  classNo: 58,
-  lastSubtypeNo: 58,
+  classNo: 59,
+  lastSubtypeNo: 59,
   maxBgInstances: null,
   methods: {
   },
@@ -74530,17 +74874,17 @@ const scene_Background__C2265_VT = mkVTable({
     "set/camera": null,
     "_layers": null,
     "set/_layers": null,
-    "image": scene_Background_image__P2271,
-    "set/image": scene_Background_image__P2272,
-    "hasBackgroundImage": scene_Background_hasBackgroundImage__P2273,
-    "draw": scene_Background_draw__P2274,
+    "image": scene_Background_image__P31690,
+    "set/image": scene_Background_image__P31691,
+    "hasBackgroundImage": scene_Background_hasBackgroundImage__P31692,
+    "draw": scene_Background_draw__P31693,
   },
 });
-const scene_BackgroundLayer__C2275_VT = mkVTable({
+const scene_BackgroundLayer__C31694_VT = mkVTable({
   name: "BackgroundLayer",
   numFields: 6,
-  classNo: 59,
-  lastSubtypeNo: 59,
+  classNo: 60,
+  lastSubtypeNo: 60,
   maxBgInstances: null,
   methods: {
   },
@@ -74557,21 +74901,21 @@ const scene_BackgroundLayer__C2275_VT = mkVTable({
     "set/alignX": null,
     "alignY": null,
     "set/alignY": null,
-    "draw": scene_BackgroundLayer_draw__P2283,
+    "draw": scene_BackgroundLayer_draw__P31702,
   },
 });
-const ArcadePhysicsEngine__C2173_VT = mkVTable({
+const ArcadePhysicsEngine__C31592_VT = mkVTable({
   name: "ArcadePhysicsEngine",
   numFields: 6,
   classNo: 39,
   lastSubtypeNo: 39,
   maxBgInstances: null,
   methods: {
-    "addSprite": ArcadePhysicsEngine_addSprite__P2182,
-    "removeSprite": ArcadePhysicsEngine_removeSprite__P2183,
-    "moveSprite": ArcadePhysicsEngine_moveSprite__P2187,
-    "draw": ArcadePhysicsEngine_draw__P2184,
-    "move": ArcadePhysicsEngine_move__P2185,
+    "addSprite": ArcadePhysicsEngine_addSprite__P31601,
+    "removeSprite": ArcadePhysicsEngine_removeSprite__P31602,
+    "moveSprite": ArcadePhysicsEngine_moveSprite__P31606,
+    "draw": ArcadePhysicsEngine_draw__P31603,
+    "move": ArcadePhysicsEngine_move__P31604,
   },
   iface: {
     "sprites": null,
@@ -74586,30 +74930,30 @@ const ArcadePhysicsEngine__C2173_VT = mkVTable({
     "set/minSingleStep": null,
     "maxSingleStep": null,
     "set/maxSingleStep": null,
-    "maxSpeed": ArcadePhysicsEngine_maxSpeed__P2175,
-    "set/maxSpeed": ArcadePhysicsEngine_maxSpeed__P2176,
-    "minStep": ArcadePhysicsEngine_minStep__P2177,
-    "set/minStep": ArcadePhysicsEngine_minStep__P2178,
-    "maxStep": ArcadePhysicsEngine_maxStep__P2179,
-    "set/maxStep": ArcadePhysicsEngine_maxStep__P2180,
-    "addSprite": ArcadePhysicsEngine_addSprite__P2182,
-    "removeSprite": ArcadePhysicsEngine_removeSprite__P2183,
-    "draw": ArcadePhysicsEngine_draw__P2184,
-    "move": ArcadePhysicsEngine_move__P2185,
-    "createMovingSprite": ArcadePhysicsEngine_createMovingSprite__P4221,
-    "spriteCollisions": ArcadePhysicsEngine_spriteCollisions__P4222,
-    "tilemapCollisions": ArcadePhysicsEngine_tilemapCollisions__P4223,
-    "tilemapOverlaps": ArcadePhysicsEngine_tilemapOverlaps__P4224,
-    "moveSprite": ArcadePhysicsEngine_moveSprite__P2187,
-    "canResolveClipping": ArcadePhysicsEngine_canResolveClipping__P4225,
-    "constrain": ArcadePhysicsEngine_constrain__P4226,
+    "maxSpeed": ArcadePhysicsEngine_maxSpeed__P31594,
+    "set/maxSpeed": ArcadePhysicsEngine_maxSpeed__P31595,
+    "minStep": ArcadePhysicsEngine_minStep__P31596,
+    "set/minStep": ArcadePhysicsEngine_minStep__P31597,
+    "maxStep": ArcadePhysicsEngine_maxStep__P31598,
+    "set/maxStep": ArcadePhysicsEngine_maxStep__P31599,
+    "addSprite": ArcadePhysicsEngine_addSprite__P31601,
+    "removeSprite": ArcadePhysicsEngine_removeSprite__P31602,
+    "draw": ArcadePhysicsEngine_draw__P31603,
+    "move": ArcadePhysicsEngine_move__P31604,
+    "createMovingSprite": ArcadePhysicsEngine_createMovingSprite__P33714,
+    "spriteCollisions": ArcadePhysicsEngine_spriteCollisions__P33715,
+    "tilemapCollisions": ArcadePhysicsEngine_tilemapCollisions__P33716,
+    "tilemapOverlaps": ArcadePhysicsEngine_tilemapOverlaps__P33717,
+    "moveSprite": ArcadePhysicsEngine_moveSprite__P31606,
+    "canResolveClipping": ArcadePhysicsEngine_canResolveClipping__P33718,
+    "constrain": ArcadePhysicsEngine_constrain__P33719,
   },
 });
-const sprites_SpriteMap__C2094_VT = mkVTable({
+const sprites_SpriteMap__C31513_VT = mkVTable({
   name: "SpriteMap",
   numFields: 5,
-  classNo: 60,
-  lastSubtypeNo: 60,
+  classNo: 61,
+  lastSubtypeNo: 61,
   maxBgInstances: null,
   methods: {
   },
@@ -74624,42 +74968,20 @@ const sprites_SpriteMap__C2094_VT = mkVTable({
     "set/columnCount": null,
     "buckets": null,
     "set/buckets": null,
-    "neighbors": sprites_SpriteMap_neighbors__P2096,
-    "overlaps": sprites_SpriteMap_overlaps__P2097,
-    "draw": sprites_SpriteMap_draw__P2098,
-    "resizeBuckets": sprites_SpriteMap_resizeBuckets__P2099,
-    "clear": sprites_SpriteMap_clear__P2100,
-    "key": sprites_SpriteMap_key__P4198,
-    "insertAtKey": sprites_SpriteMap_insertAtKey__P4199,
-    "insertAABB": sprites_SpriteMap_insertAABB__P2101,
-    "mergeAtKey": sprites_SpriteMap_mergeAtKey__P4200,
-    "toString": sprites_SpriteMap_toString__P2102,
-  },
-  toStringMethod: sprites_SpriteMap_toString__P2102,
-});
-const music_Melody__C1598_VT = mkVTable({
-  name: "Melody",
-  numFields: 2,
-  classNo: 61,
-  lastSubtypeNo: 61,
-  maxBgInstances: null,
-  methods: {
-  },
-  iface: {
-    "_text": null,
-    "set/_text": null,
-    "_player": null,
-    "set/_player": null,
-    "stop": music_Melody_stop__P1603,
-    "registerMelody": music_Melody_registerMelody__P4071,
-    "unregisterMelody": music_Melody_unregisterMelody__P4072,
-    "playCore": music_Melody_playCore__P4073,
-    "play": music_Melody_play__P1605,
-    "toString": music_Melody_toString__P1607,
+    "neighbors": sprites_SpriteMap_neighbors__P31515,
+    "overlaps": sprites_SpriteMap_overlaps__P31516,
+    "draw": sprites_SpriteMap_draw__P31517,
+    "resizeBuckets": sprites_SpriteMap_resizeBuckets__P31518,
+    "clear": sprites_SpriteMap_clear__P31519,
+    "key": sprites_SpriteMap_key__P33691,
+    "insertAtKey": sprites_SpriteMap_insertAtKey__P33692,
+    "insertAABB": sprites_SpriteMap_insertAABB__P31520,
+    "mergeAtKey": sprites_SpriteMap_mergeAtKey__P33693,
+    "toString": sprites_SpriteMap_toString__P31521,
   },
-  toStringMethod: music_Melody_toString__P1607,
+  toStringMethod: sprites_SpriteMap_toString__P31521,
 });
-const character_CharacterAnimation__C6139_VT = mkVTable({
+const character_CharacterAnimation__C35661_VT = mkVTable({
   name: "CharacterAnimation",
   numFields: 5,
   classNo: 62,
@@ -74680,7 +75002,7 @@ const character_CharacterAnimation__C6139_VT = mkVTable({
     "set/rule": null,
   },
 });
-const color_Fade__C3551_VT = mkVTable({
+const color_Fade__C33085_VT = mkVTable({
   name: "Fade",
   numFields: 4,
   classNo: 63,
@@ -74697,16 +75019,16 @@ const color_Fade__C3551_VT = mkVTable({
     "set/_startPalette": null,
     "_endPalette": null,
     "set/_endPalette": null,
-    "startPalette": color_Fade_startPalette__P3553,
-    "isActive": color_Fade_isActive__P3555,
-    "start": color_Fade_start__P3556,
-    "setStartPalette": color_Fade_setStartPalette__P3559,
-    "setEndPalette": color_Fade_setEndPalette__P3561,
-    "step": color_Fade_step__P3563,
-    "pauseUntilDone": color_Fade_pauseUntilDone__P3565,
+    "startPalette": color_Fade_startPalette__P33087,
+    "isActive": color_Fade_isActive__P33089,
+    "start": color_Fade_start__P33090,
+    "setStartPalette": color_Fade_setStartPalette__P33093,
+    "setEndPalette": color_Fade_setEndPalette__P33095,
+    "step": color_Fade_step__P33097,
+    "pauseUntilDone": color_Fade_pauseUntilDone__P33099,
   },
 });
-const color_ColorBuffer__C3490_VT = mkVTable({
+const color_ColorBuffer__C33024_VT = mkVTable({
   name: "ColorBuffer",
   numFields: 2,
   classNo: 64,
@@ -74719,13 +75041,13 @@ const color_ColorBuffer__C3490_VT = mkVTable({
     "set/layout": null,
     "buf": null,
     "set/buf": null,
-    "stride": color_ColorBuffer_stride__P3495,
-    "length": color_ColorBuffer_length__P3496,
-    "color": color_ColorBuffer_color__P3497,
-    "setColor": color_ColorBuffer_setColor__P3498,
+    "stride": color_ColorBuffer_stride__P33029,
+    "length": color_ColorBuffer_length__P33030,
+    "color": color_ColorBuffer_color__P33031,
+    "setColor": color_ColorBuffer_setColor__P33032,
   },
 });
-const color_Palette__C3530_VT = mkVTable({
+const color_Palette__C33064_VT = mkVTable({
   name: "Palette",
   numFields: 2,
   classNo: 65,
@@ -74738,13 +75060,13 @@ const color_Palette__C3530_VT = mkVTable({
     "set/layout": null,
     "buf": null,
     "set/buf": null,
-    "stride": color_ColorBuffer_stride__P3495,
-    "length": color_ColorBuffer_length__P3496,
-    "color": color_ColorBuffer_color__P3497,
-    "setColor": color_ColorBuffer_setColor__P3498,
+    "stride": color_ColorBuffer_stride__P33029,
+    "length": color_ColorBuffer_length__P33030,
+    "color": color_ColorBuffer_color__P33031,
+    "setColor": color_ColorBuffer_setColor__P33032,
   },
 });
-const game_NumberPrompt__C2574_VT = mkVTable({
+const game_NumberPrompt__C31993_VT = mkVTable({
   name: "NumberPrompt",
   numFields: 15,
   classNo: 66,
@@ -74783,35 +75105,35 @@ const game_NumberPrompt__C2574_VT = mkVTable({
     "set/blink": null,
     "frameCount": null,
     "set/frameCount": null,
-    "show": game_NumberPrompt_show__P2580,
-    "draw": game_NumberPrompt_draw__P4582,
-    "drawPromptText": game_NumberPrompt_drawPromptText__P4583,
-    "drawInputarea": game_NumberPrompt_drawInputarea__P4584,
-    "drawNumpad": game_NumberPrompt_drawNumpad__P4585,
-    "drawBottomBar": game_NumberPrompt_drawBottomBar__P4586,
-    "updateButtons": game_NumberPrompt_updateButtons__P4587,
-    "updateCursor": game_NumberPrompt_updateCursor__P4588,
-    "updateSelectedInput": game_NumberPrompt_updateSelectedInput__P4589,
-    "updateKeyboard": game_NumberPrompt_updateKeyboard__P4590,
-    "drawInput": game_NumberPrompt_drawInput__P4591,
-    "registerHandlers": game_NumberPrompt_registerHandlers__P4592,
-    "moveVertical": game_NumberPrompt_moveVertical__P4593,
-    "moveHorizontal": game_NumberPrompt_moveHorizontal__P4594,
-    "confirm": game_NumberPrompt_confirm__P4595,
-    "delete": game_NumberPrompt_delete__P4596,
-    "changeInputIndex": game_NumberPrompt_changeInputIndex__P4597,
+    "show": game_NumberPrompt_show__P31999,
+    "draw": game_NumberPrompt_draw__P34075,
+    "drawPromptText": game_NumberPrompt_drawPromptText__P34076,
+    "drawInputarea": game_NumberPrompt_drawInputarea__P34077,
+    "drawNumpad": game_NumberPrompt_drawNumpad__P34078,
+    "drawBottomBar": game_NumberPrompt_drawBottomBar__P34079,
+    "updateButtons": game_NumberPrompt_updateButtons__P34080,
+    "updateCursor": game_NumberPrompt_updateCursor__P34081,
+    "updateSelectedInput": game_NumberPrompt_updateSelectedInput__P34082,
+    "updateKeyboard": game_NumberPrompt_updateKeyboard__P34083,
+    "drawInput": game_NumberPrompt_drawInput__P34084,
+    "registerHandlers": game_NumberPrompt_registerHandlers__P34085,
+    "moveVertical": game_NumberPrompt_moveVertical__P34086,
+    "moveHorizontal": game_NumberPrompt_moveHorizontal__P34087,
+    "confirm": game_NumberPrompt_confirm__P34088,
+    "delete": game_NumberPrompt_delete__P34089,
+    "changeInputIndex": game_NumberPrompt_changeInputIndex__P34090,
   },
 });
-const game_BaseDialog__C2477_VT = mkVTable({
+const game_BaseDialog__C31896_VT = mkVTable({
   name: "BaseDialog",
   numFields: 11,
   classNo: 67,
   lastSubtypeNo: 69,
   maxBgInstances: null,
   methods: {
-    "update": game_BaseDialog_update__P2490,
-    "setText": game_BaseDialog_setText__P2491,
-    "drawTextCore": game_BaseDialog_drawTextCore__P2492,
+    "update": game_BaseDialog_update__P31909,
+    "setText": game_BaseDialog_setText__P31910,
+    "drawTextCore": game_BaseDialog_drawTextCore__P31911,
   },
   iface: {
     "image": null,
@@ -74836,31 +75158,31 @@ const game_BaseDialog__C2477_VT = mkVTable({
     "set/font": null,
     "textColor": null,
     "set/textColor": null,
-    "update": game_BaseDialog_update__P2490,
-    "setText": game_BaseDialog_setText__P2491,
-    "drawTextCore": game_BaseDialog_drawTextCore__P2492,
-    "drawCursorRow": game_BaseDialog_drawCursorRow__P2493,
-    "drawBorder": game_BaseDialog_drawBorder__P4321,
-    "fastFill": game_BaseDialog_fastFill__P4322,
-    "clearInterior": game_BaseDialog_clearInterior__P4323,
-    "drawPartial": game_BaseDialog_drawPartial__P4324,
-    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P4325,
-    "rowHeight": game_BaseDialog_rowHeight__P4326,
-    "textAreaWidth": game_BaseDialog_textAreaWidth__P4327,
-    "textAreaHeight": game_BaseDialog_textAreaHeight__P4328,
-    "setFont": game_BaseDialog_setFont__P4329,
+    "update": game_BaseDialog_update__P31909,
+    "setText": game_BaseDialog_setText__P31910,
+    "drawTextCore": game_BaseDialog_drawTextCore__P31911,
+    "drawCursorRow": game_BaseDialog_drawCursorRow__P31912,
+    "drawBorder": game_BaseDialog_drawBorder__P33814,
+    "fastFill": game_BaseDialog_fastFill__P33815,
+    "clearInterior": game_BaseDialog_clearInterior__P33816,
+    "drawPartial": game_BaseDialog_drawPartial__P33817,
+    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P33818,
+    "rowHeight": game_BaseDialog_rowHeight__P33819,
+    "textAreaWidth": game_BaseDialog_textAreaWidth__P33820,
+    "textAreaHeight": game_BaseDialog_textAreaHeight__P33821,
+    "setFont": game_BaseDialog_setFont__P33822,
   },
 });
-const game_Dialog__C2494_VT = mkVTable({
+const game_Dialog__C31913_VT = mkVTable({
   name: "Dialog",
   numFields: 13,
   classNo: 68,
   lastSubtypeNo: 68,
   maxBgInstances: null,
   methods: {
-    "update": game_BaseDialog_update__P2490,
-    "setText": game_Dialog_setText__P2503,
-    "drawTextCore": game_Dialog_drawTextCore__P2504,
+    "update": game_BaseDialog_update__P31909,
+    "setText": game_Dialog_setText__P31922,
+    "drawTextCore": game_Dialog_drawTextCore__P31923,
   },
   iface: {
     "image": null,
@@ -74889,37 +75211,37 @@ const game_Dialog__C2494_VT = mkVTable({
     "set/chunks": null,
     "chunkIndex": null,
     "set/chunkIndex": null,
-    "hasNext": game_Dialog_hasNext__P2498,
-    "hasPrev": game_Dialog_hasPrev__P2499,
-    "nextPage": game_Dialog_nextPage__P2500,
-    "prevPage": game_Dialog_prevPage__P2501,
-    "chunkText": game_Dialog_chunkText__P2502,
-    "setText": game_Dialog_setText__P2503,
-    "drawTextCore": game_Dialog_drawTextCore__P2504,
-    "update": game_BaseDialog_update__P2490,
-    "drawCursorRow": game_BaseDialog_drawCursorRow__P2493,
-    "drawBorder": game_BaseDialog_drawBorder__P4321,
-    "fastFill": game_BaseDialog_fastFill__P4322,
-    "clearInterior": game_BaseDialog_clearInterior__P4323,
-    "drawPartial": game_BaseDialog_drawPartial__P4324,
-    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P4325,
-    "rowHeight": game_BaseDialog_rowHeight__P4326,
-    "textAreaWidth": game_BaseDialog_textAreaWidth__P4327,
-    "textAreaHeight": game_BaseDialog_textAreaHeight__P4328,
-    "setFont": game_BaseDialog_setFont__P4329,
+    "hasNext": game_Dialog_hasNext__P31917,
+    "hasPrev": game_Dialog_hasPrev__P31918,
+    "nextPage": game_Dialog_nextPage__P31919,
+    "prevPage": game_Dialog_prevPage__P31920,
+    "chunkText": game_Dialog_chunkText__P31921,
+    "setText": game_Dialog_setText__P31922,
+    "drawTextCore": game_Dialog_drawTextCore__P31923,
+    "update": game_BaseDialog_update__P31909,
+    "drawCursorRow": game_BaseDialog_drawCursorRow__P31912,
+    "drawBorder": game_BaseDialog_drawBorder__P33814,
+    "fastFill": game_BaseDialog_fastFill__P33815,
+    "clearInterior": game_BaseDialog_clearInterior__P33816,
+    "drawPartial": game_BaseDialog_drawPartial__P33817,
+    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P33818,
+    "rowHeight": game_BaseDialog_rowHeight__P33819,
+    "textAreaWidth": game_BaseDialog_textAreaWidth__P33820,
+    "textAreaHeight": game_BaseDialog_textAreaHeight__P33821,
+    "setFont": game_BaseDialog_setFont__P33822,
   },
 });
-const blockMenu_MenuSprite__C3692_VT = mkVTable({
+const blockMenu_MenuSprite__C33226_VT = mkVTable({
   name: "MenuSprite",
   numFields: 14,
   classNo: 25,
   lastSubtypeNo: 25,
   maxBgInstances: null,
   methods: {
-    "__visible": blockMenu_MenuSprite___visible__P3710,
-    "__draw": sprites_BaseSprite___draw__P1864,
-    "__drawCore": blockMenu_MenuSprite___drawCore__P3711,
-    "__update": sprites_BaseSprite___update__P1866,
+    "__visible": blockMenu_MenuSprite___visible__P33244,
+    "__draw": sprites_BaseSprite___draw__P31283,
+    "__drawCore": blockMenu_MenuSprite___drawCore__P33245,
+    "__update": sprites_BaseSprite___update__P31285,
   },
   iface: {
     "_z": null,
@@ -74950,32 +75272,32 @@ const blockMenu_MenuSprite__C3692_VT = mkVTable({
     "set/padding": null,
     "metrics": null,
     "set/metrics": null,
-    "setOptions": blockMenu_MenuSprite_setOptions__P3695,
-    "setColors": blockMenu_MenuSprite_setColors__P3696,
-    "setStyle": blockMenu_MenuSprite_setStyle__P3697,
-    "setLocation": blockMenu_MenuSprite_setLocation__P3698,
-    "selectedMenuOption": blockMenu_MenuSprite_selectedMenuOption__P3699,
-    "selectedMenuIndex": blockMenu_MenuSprite_selectedMenuIndex__P3700,
-    "setSelectedIndex": blockMenu_MenuSprite_setSelectedIndex__P3701,
-    "moveSelectionVertical": blockMenu_MenuSprite_moveSelectionVertical__P3702,
-    "moveSelectionHorizontal": blockMenu_MenuSprite_moveSelectionHorizontal__P3703,
-    "next": blockMenu_MenuSprite_next__P3704,
-    "previous": blockMenu_MenuSprite_previous__P3705,
-    "setMenuOpen": blockMenu_MenuSprite_setMenuOpen__P3708,
-    "destroy": blockMenu_MenuSprite_destroy__P3709,
-    "__visible": blockMenu_MenuSprite___visible__P3710,
-    "__drawCore": blockMenu_MenuSprite___drawCore__P3711,
-    "getMaxLabelWidth": blockMenu_MenuSprite_getMaxLabelWidth__P6106,
-    "recreateLabels": blockMenu_MenuSprite_recreateLabels__P6107,
-    "drawGridMenu": blockMenu_MenuSprite_drawGridMenu__P6108,
-    "drawListMenu": blockMenu_MenuSprite_drawListMenu__P6109,
-    "z": sprites_BaseSprite_z__P1862,
-    "set/z": sprites_BaseSprite_z__P1863,
-    "__draw": sprites_BaseSprite___draw__P1864,
-    "__update": sprites_BaseSprite___update__P1866,
+    "setOptions": blockMenu_MenuSprite_setOptions__P33229,
+    "setColors": blockMenu_MenuSprite_setColors__P33230,
+    "setStyle": blockMenu_MenuSprite_setStyle__P33231,
+    "setLocation": blockMenu_MenuSprite_setLocation__P33232,
+    "selectedMenuOption": blockMenu_MenuSprite_selectedMenuOption__P33233,
+    "selectedMenuIndex": blockMenu_MenuSprite_selectedMenuIndex__P33234,
+    "setSelectedIndex": blockMenu_MenuSprite_setSelectedIndex__P33235,
+    "moveSelectionVertical": blockMenu_MenuSprite_moveSelectionVertical__P33236,
+    "moveSelectionHorizontal": blockMenu_MenuSprite_moveSelectionHorizontal__P33237,
+    "next": blockMenu_MenuSprite_next__P33238,
+    "previous": blockMenu_MenuSprite_previous__P33239,
+    "setMenuOpen": blockMenu_MenuSprite_setMenuOpen__P33242,
+    "destroy": blockMenu_MenuSprite_destroy__P33243,
+    "__visible": blockMenu_MenuSprite___visible__P33244,
+    "__drawCore": blockMenu_MenuSprite___drawCore__P33245,
+    "getMaxLabelWidth": blockMenu_MenuSprite_getMaxLabelWidth__P35628,
+    "recreateLabels": blockMenu_MenuSprite_recreateLabels__P35629,
+    "drawGridMenu": blockMenu_MenuSprite_drawGridMenu__P35630,
+    "drawListMenu": blockMenu_MenuSprite_drawListMenu__P35631,
+    "z": sprites_BaseSprite_z__P31281,
+    "set/z": sprites_BaseSprite_z__P31282,
+    "__draw": sprites_BaseSprite___draw__P31283,
+    "__update": sprites_BaseSprite___update__P31285,
   },
 });
-const blockMenu__BlockMenuState__C3713_VT = mkVTable({
+const blockMenu__BlockMenuState__C33247_VT = mkVTable({
   name: "_BlockMenuState",
   numFields: 3,
   classNo: 70,
@@ -74990,11 +75312,11 @@ const blockMenu__BlockMenuState__C3713_VT = mkVTable({
     "set/handlers": null,
     "controlsEnabled": null,
     "set/controlsEnabled": null,
-    "addHandler": blockMenu__BlockMenuState_addHandler__P3718,
-    "destroy": blockMenu__BlockMenuState_destroy__P3720,
+    "addHandler": blockMenu__BlockMenuState_addHandler__P33252,
+    "destroy": blockMenu__BlockMenuState_destroy__P33254,
   },
 });
-const blockMenu_LayoutMetrics__C6101_VT = mkVTable({
+const blockMenu_LayoutMetrics__C35623_VT = mkVTable({
   name: "LayoutMetrics",
   numFields: 4,
   classNo: 71,
@@ -75013,7 +75335,7 @@ const blockMenu_LayoutMetrics__C6101_VT = mkVTable({
     "set/height": null,
   },
 });
-const blockMenu_ScrollingLabel__C6110_VT = mkVTable({
+const blockMenu_ScrollingLabel__C35632_VT = mkVTable({
   name: "ScrollingLabel",
   numFields: 11,
   classNo: 72,
@@ -75044,11 +75366,11 @@ const blockMenu_ScrollingLabel__C6110_VT = mkVTable({
     "set/partialCanvas": null,
     "text": null,
     "set/text": null,
-    "setScrolling": blockMenu_ScrollingLabel_setScrolling__P6111,
-    "draw": blockMenu_ScrollingLabel_draw__P6112,
+    "setScrolling": blockMenu_ScrollingLabel_setScrolling__P35633,
+    "draw": blockMenu_ScrollingLabel_draw__P35634,
   },
 });
-const game_Hitbox__C1959_VT = mkVTable({
+const game_Hitbox__C31378_VT = mkVTable({
   name: "Hitbox",
   numFields: 5,
   classNo: 73,
@@ -75067,13 +75389,13 @@ const game_Hitbox__C1959_VT = mkVTable({
     "set/width": null,
     "height": null,
     "set/height": null,
-    "left": game_Hitbox_left__P1966,
-    "top": game_Hitbox_top__P1967,
-    "right": game_Hitbox_right__P1968,
-    "bottom": game_Hitbox_bottom__P1969,
+    "left": game_Hitbox_left__P31385,
+    "top": game_Hitbox_top__P31386,
+    "right": game_Hitbox_right__P31387,
+    "bottom": game_Hitbox_bottom__P31388,
   },
 });
-const sprites_SpriteSet__C2111_VT = mkVTable({
+const sprites_SpriteSet__C31530_VT = mkVTable({
   name: "SpriteSet",
   numFields: 1,
   classNo: 74,
@@ -75084,16 +75406,16 @@ const sprites_SpriteSet__C2111_VT = mkVTable({
   iface: {
     "_sprites": null,
     "set/_sprites": null,
-    "length": sprites_SpriteSet_length__P2114,
-    "sprites": sprites_SpriteSet_sprites__P2115,
-    "add": sprites_SpriteSet_add__P2116,
-    "remove": sprites_SpriteSet_remove__P2118,
-    "contains": sprites_SpriteSet_contains__P2119,
-    "toString": sprites_SpriteSet_toString__P2122,
+    "length": sprites_SpriteSet_length__P31533,
+    "sprites": sprites_SpriteSet_sprites__P31534,
+    "add": sprites_SpriteSet_add__P31535,
+    "remove": sprites_SpriteSet_remove__P31537,
+    "contains": sprites_SpriteSet_contains__P31538,
+    "toString": sprites_SpriteSet_toString__P31541,
   },
-  toStringMethod: sprites_SpriteSet_toString__P2122,
+  toStringMethod: sprites_SpriteSet_toString__P31541,
 });
-const scene_OverlapHandler__C2392_VT = mkVTable({
+const scene_OverlapHandler__C31811_VT = mkVTable({
   name: "OverlapHandler",
   numFields: 3,
   classNo: 75,
@@ -75110,16 +75432,16 @@ const scene_OverlapHandler__C2392_VT = mkVTable({
     "set/handler": null,
   },
 });
-const game_GameOverDialog__C2516_VT = mkVTable({
+const game_GameOverDialog__C31935_VT = mkVTable({
   name: "GameOverDialog",
   numFields: 16,
   classNo: 69,
   lastSubtypeNo: 69,
   maxBgInstances: null,
   methods: {
-    "update": game_GameOverDialog_update__P2519,
-    "setText": game_BaseDialog_setText__P2491,
-    "drawTextCore": game_GameOverDialog_drawTextCore__P2520,
+    "update": game_GameOverDialog_update__P31938,
+    "setText": game_BaseDialog_setText__P31910,
+    "drawTextCore": game_GameOverDialog_drawTextCore__P31939,
   },
   iface: {
     "image": null,
@@ -75154,23 +75476,23 @@ const game_GameOverDialog__C2516_VT = mkVTable({
     "set/score": null,
     "highScore": null,
     "set/highScore": null,
-    "displayCursor": game_GameOverDialog_displayCursor__P2518,
-    "update": game_GameOverDialog_update__P2519,
-    "drawTextCore": game_GameOverDialog_drawTextCore__P2520,
-    "setText": game_BaseDialog_setText__P2491,
-    "drawCursorRow": game_BaseDialog_drawCursorRow__P2493,
-    "drawBorder": game_BaseDialog_drawBorder__P4321,
-    "fastFill": game_BaseDialog_fastFill__P4322,
-    "clearInterior": game_BaseDialog_clearInterior__P4323,
-    "drawPartial": game_BaseDialog_drawPartial__P4324,
-    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P4325,
-    "rowHeight": game_BaseDialog_rowHeight__P4326,
-    "textAreaWidth": game_BaseDialog_textAreaWidth__P4327,
-    "textAreaHeight": game_BaseDialog_textAreaHeight__P4328,
-    "setFont": game_BaseDialog_setFont__P4329,
+    "displayCursor": game_GameOverDialog_displayCursor__P31937,
+    "update": game_GameOverDialog_update__P31938,
+    "drawTextCore": game_GameOverDialog_drawTextCore__P31939,
+    "setText": game_BaseDialog_setText__P31910,
+    "drawCursorRow": game_BaseDialog_drawCursorRow__P31912,
+    "drawBorder": game_BaseDialog_drawBorder__P33814,
+    "fastFill": game_BaseDialog_fastFill__P33815,
+    "clearInterior": game_BaseDialog_clearInterior__P33816,
+    "drawPartial": game_BaseDialog_drawPartial__P33817,
+    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P33818,
+    "rowHeight": game_BaseDialog_rowHeight__P33819,
+    "textAreaWidth": game_BaseDialog_textAreaWidth__P33820,
+    "textAreaHeight": game_BaseDialog_textAreaHeight__P33821,
+    "setFont": game_BaseDialog_setFont__P33822,
   },
 });
-const music_MelodyPlayer__C1608_VT = mkVTable({
+const music_MelodyPlayer__C32288_VT = mkVTable({
   name: "MelodyPlayer",
   numFields: 2,
   classNo: 76,
@@ -75183,12 +75505,12 @@ const music_MelodyPlayer__C1608_VT = mkVTable({
     "set/melody": null,
     "onPlayFinished": null,
     "set/onPlayFinished": null,
-    "stop": music_MelodyPlayer_stop__P1612,
-    "queuePlayInstructions": music_MelodyPlayer_queuePlayInstructions__P4076,
-    "play": music_MelodyPlayer_play__P1613,
+    "stop": music_MelodyPlayer_stop__P32292,
+    "queuePlayInstructions": music_MelodyPlayer_queuePlayInstructions__P34341,
+    "play": music_MelodyPlayer_play__P32293,
   },
 });
-const scene_PathFollowingSprite__C6090_VT = mkVTable({
+const scene_PathFollowingSprite__C35612_VT = mkVTable({
   name: "PathFollowingSprite",
   numFields: 5,
   classNo: 77,
@@ -75209,7 +75531,7 @@ const scene_PathFollowingSprite__C6090_VT = mkVTable({
     "set/speed": null,
   },
 });
-const control_Interval__C3998_VT = mkVTable({
+const control_Interval__C33533_VT = mkVTable({
   name: "Interval",
   numFields: 4,
   classNo: 78,
@@ -75226,10 +75548,10 @@ const control_Interval__C3998_VT = mkVTable({
     "set/delay": null,
     "mode": null,
     "set/mode": null,
-    "work": control_Interval_work__P3999,
+    "work": control_Interval_work__P33534,
   },
 });
-const scene_TileOverlapHandler__C2396_VT = mkVTable({
+const scene_TileOverlapHandler__C31815_VT = mkVTable({
   name: "TileOverlapHandler",
   numFields: 3,
   classNo: 79,
@@ -75246,7 +75568,7 @@ const scene_TileOverlapHandler__C2396_VT = mkVTable({
     "set/handler": null,
   },
 });
-const scene_systemMenu_PauseMenu__C2622_VT = mkVTable({
+const scene_systemMenu_PauseMenu__C32041_VT = mkVTable({
   name: "PauseMenu",
   numFields: 7,
   classNo: 80,
@@ -75269,15 +75591,15 @@ const scene_systemMenu_PauseMenu__C2622_VT = mkVTable({
     "set/scrollOffset": null,
     "generator": null,
     "set/generator": null,
-    "show": scene_systemMenu_PauseMenu_show__P2624,
-    "onUpdate": scene_systemMenu_PauseMenu_onUpdate__P2625,
-    "setSelection": scene_systemMenu_PauseMenu_setSelection__P2626,
-    "drawText": scene_systemMenu_PauseMenu_drawText__P2627,
-    "dispose": scene_systemMenu_PauseMenu_dispose__P2628,
-    "updateScrollTarget": scene_systemMenu_PauseMenu_updateScrollTarget__P4603,
+    "show": scene_systemMenu_PauseMenu_show__P32043,
+    "onUpdate": scene_systemMenu_PauseMenu_onUpdate__P32044,
+    "setSelection": scene_systemMenu_PauseMenu_setSelection__P32045,
+    "drawText": scene_systemMenu_PauseMenu_drawText__P32046,
+    "dispose": scene_systemMenu_PauseMenu_dispose__P32047,
+    "updateScrollTarget": scene_systemMenu_PauseMenu_updateScrollTarget__P34096,
   },
 });
-const scene_systemMenu_MenuOption__C2614_VT = mkVTable({
+const scene_systemMenu_MenuOption__C32033_VT = mkVTable({
   name: "MenuOption",
   numFields: 8,
   classNo: 81,
@@ -75302,16 +75624,16 @@ const scene_systemMenu_MenuOption__C2614_VT = mkVTable({
     "set/getText": null,
     "action": null,
     "set/action": null,
-    "show": scene_systemMenu_MenuOption_show__P2616,
-    "position": scene_systemMenu_MenuOption_position__P2617,
-    "setOffset": scene_systemMenu_MenuOption_setOffset__P2618,
-    "setTheme": scene_systemMenu_MenuOption_setTheme__P2619,
-    "setState": scene_systemMenu_MenuOption_setState__P2620,
-    "dispose": scene_systemMenu_MenuOption_dispose__P2621,
-    "updateCard": scene_systemMenu_MenuOption_updateCard__P4602,
+    "show": scene_systemMenu_MenuOption_show__P32035,
+    "position": scene_systemMenu_MenuOption_position__P32036,
+    "setOffset": scene_systemMenu_MenuOption_setOffset__P32037,
+    "setTheme": scene_systemMenu_MenuOption_setTheme__P32038,
+    "setState": scene_systemMenu_MenuOption_setState__P32039,
+    "dispose": scene_systemMenu_MenuOption_dispose__P32040,
+    "updateCard": scene_systemMenu_MenuOption_updateCard__P34095,
   },
 });
-const MovingSprite__C2171_VT = mkVTable({
+const MovingSprite__C31590_VT = mkVTable({
   name: "MovingSprite",
   numFields: 7,
   classNo: 82,
@@ -75336,7 +75658,7 @@ const MovingSprite__C2171_VT = mkVTable({
     "set/yStep": null,
   },
 });
-const sprites_StaticObstacle__C2146_VT = mkVTable({
+const sprites_StaticObstacle__C31565_VT = mkVTable({
   name: "StaticObstacle",
   numFields: 5,
   classNo: 83,
@@ -75355,13 +75677,13 @@ const sprites_StaticObstacle__C2146_VT = mkVTable({
     "set/top": null,
     "left": null,
     "set/left": null,
-    "x": sprites_StaticObstacle_x__P2153,
-    "y": sprites_StaticObstacle_y__P2154,
-    "height": sprites_StaticObstacle_height__P2155,
-    "width": sprites_StaticObstacle_width__P2156,
+    "x": sprites_StaticObstacle_x__P31572,
+    "y": sprites_StaticObstacle_y__P31573,
+    "height": sprites_StaticObstacle_height__P31574,
+    "width": sprites_StaticObstacle_width__P31575,
   },
 });
-const effects_SceneAnchor__C4746_VT = mkVTable({
+const effects_SceneAnchor__C34239_VT = mkVTable({
   name: "SceneAnchor",
   numFields: 1,
   classNo: 84,
@@ -75372,14 +75694,14 @@ const effects_SceneAnchor__C4746_VT = mkVTable({
   iface: {
     "camera": null,
     "set/camera": null,
-    "x": effects_SceneAnchor_x__P4747,
-    "y": effects_SceneAnchor_y__P4748,
-    "width": effects_SceneAnchor_width__P4749,
-    "height": effects_SceneAnchor_height__P4750,
+    "x": effects_SceneAnchor_x__P34240,
+    "y": effects_SceneAnchor_y__P34241,
+    "width": effects_SceneAnchor_width__P34242,
+    "height": effects_SceneAnchor_height__P34243,
   },
 });
 
-const breakpoints = setupDebugger(1, ["NPC___45888","Map___45891","SurvivedPlayer___45894","SurvivedNPC___45897","in_game___45904","show_minimap___45907","sprite_map___45914","loading___45924","message___45955","tile12___3945","last_15___45971","paths___46005","player_made_it___46018","selected_option___46088","user_fish_count___46159","user_shark_count___46157","transparency16___3933","tile2___3935","tile3___3936","tile4___3937","tile8___3941","tile9___3942","tile11___3944","in_menu___46172","loading_start_time___46376","last_score_time___46141","shortest_distance___46139","sprite_closest_sprite___46137","map___46145","sprite_player_fish___46147","tile1___3934","tile5___3938","tile6___3939","tile7___3940","tile10___3943","tile14___3946","tile13___3947","tile15___3948","tile16___3949","left_fish_animations___46155","right_fish_animations___46154","local_choice___46153","sprite_fish___46151","location___46149","sprite_shark___46143"])
+const breakpoints = setupDebugger(1, ["NPC___97745","Map___97748","SurvivedPlayer___97751","SurvivedNPC___97754","in_game___97761","show_minimap___97764","sprite_map___97771","loading___97909","message___97940","tile12___33480","last_15___97956","paths___97881","player_made_it___98015","selected_option___97970","user_fish_count___98177","user_shark_count___98134","transparency16___33468","tile2___33470","tile3___33471","tile4___33472","tile8___33476","tile9___33477","tile11___33479","in_menu___98445","loading_start_time___98649","last_score_time___98429","shortest_distance___98427","sprite_closest_sprite___98425","map___98269","sprite_player_fish___98248","tile1___33469","tile5___33473","tile6___33474","tile7___33475","tile10___33478","tile14___33481","tile13___33482","tile15___33483","tile16___33484","left_fish_animations___97779","right_fish_animations___97794","local_choice___97809","sprite_fish___97817","location___97864","sprite_shark___98307"])
 
-return _main___P47772
+return _main___P99099
 })
diff --git a/assets/version.txt b/assets/version.txt
index 5975b14..434dcac 100644
--- a/assets/version.txt
+++ b/assets/version.txt
@@ -1 +1 @@
-1.2.8
\ No newline at end of file
+1.2.9
\ No newline at end of file
diff --git a/pxt.json b/pxt.json
index 2eda7ce..e06cdeb 100644
--- a/pxt.json
+++ b/pxt.json
@@ -1,6 +1,6 @@
 {
     "name": "Fishy Fishy Cross my Ocean! v1.2.2 atte",
-    "version": "1.2.8",
+    "version": "1.2.9",
     "description": "",
     "dependencies": {
         "device": "*",