From f5872be1b3a09b76573ae27460f2065fc7c894dc Mon Sep 17 00:00:00 2001
From: Eric Anderson <eanders@microsoft.com>
Date: Sun, 24 Jan 2021 11:47:34 -0800
Subject: [PATCH] 0.0.20

---
 assets/js/binary.js | 32777 +++++++++++++++++++++---------------------
 assets/version.txt  |     2 +-
 pxt.json            |     2 +-
 3 files changed, 16359 insertions(+), 16422 deletions(-)

diff --git a/assets/js/binary.js b/assets/js/binary.js
index de59a81..3f9c47c 100644
--- a/assets/js/binary.js
+++ b/assets/js/binary.js
@@ -1,5 +1,5 @@
-// meta={"simUrl":"https://trg-arcade.userpxt.io/v1.2.16/---simulator","cdnUrl":"https://pxt.azureedge.net","version":"0.0.19","target":"arcade","targetVersion":"1.2.16","repo":"eanders-ms/makekodu"}
-// total=2681126 new=51.11% cached=43.29% other=5.60%
+// meta={"simUrl":"https://trg-arcade.userpxt.io/v1.3.42/---simulator","cdnUrl":"https://pxt.azureedge.net","version":"0.0.20","target":"arcade","targetVersion":"1.3.42","repo":"eanders-ms/makekodu"}
+// total=2665701 new=51.27% cached=43.13% other=5.60%
 (function (ectx) {
 'use strict';
 const runtime = ectx.runtime;
@@ -28,7 +28,13 @@ const pxtrt = pxsim.pxtrt;
 let yieldSteps = 1;
 ectx.setupYield(function() { yieldSteps = 100; })
 pxsim.setTitle("makekodu");
-pxsim.setConfigData({}, {});
+pxsim.setConfigData({
+ "37": 160,
+ "38": 120
+}, {
+ "DISPLAY_WIDTH": 37,
+ "DISPLAY_HEIGHT": 38
+});
 pxtrt.mapKeyNames = [
  "",
  "A",
@@ -688,7 +694,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P579321(s) {
+function _main___P109939(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -698,218 +704,237 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___110562 = (undefined);
-    globals._pollEventQueue___110571 = (undefined);
-    globals.minPriority___106973 = (1);
+    globals._intervals___85346 = (undefined);
+    globals._pollEventQueue___85355 = (undefined);
+    globals.minPriority___81637 = (1);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, inline__P110574);
-    globals.listeners___110575 = (s.tmp_0);
-    globals.brightness___108220 = (100);
+    r0 = pxsim_Array__push(s.tmp_0, inline__P85358);
+    globals.listeners___85359 = (s.tmp_0);
+    globals.globalVolume___85412 = (null);
+    globals.playToneID___85419 = (0);
+    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C82871_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = music_Melody_constructor__P82874_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 = 1; return s.tmp_1;
+  case 1:
+    r0 = s.retval;
+    globals.wawawawaa___82888 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C82871_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = music_Melody_constructor__P82874_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 = 2; return s.tmp_1;
+  case 2:
+    r0 = s.retval;
+    globals.powerUp___82891 = (s.tmp_0);
+    globals.brightness___82997 = (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", _hex123152);
-    globals.font8___108241 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex98483);
+    globals.font8___83018 = (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", _hex123154);
-    globals.font12___108242 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex98485);
+    globals.font12___83019 = (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", _hex127564);
-    globals.font5___108246 = (s.tmp_0);
-    globals.__updated___110641 = (false);
-    r0 = pxsim.control.runInParallel(inline__P110644);
-    r0 = pxsim_pxtcore.setPalette(_hex110655);
-    s.tmp_0 = _screen_internal_createScreen__P108302_mk(s);
-    s.callLocIdx = 2; s.pc = 1; return s.tmp_0;
-  case 1:
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex102919);
+    globals.font5___83023 = (s.tmp_0);
+    globals.__updated___85456 = (false);
+    r0 = pxsim.control.runInParallel(inline__P85459);
+    r0 = pxsim_pxtcore.setPalette(_hex85470);
+    r0 = pxsim.image.create(160, 120);
+    globals.screen___83075 = (r0);
+    s.tmp_0 = control___screen_setupUpdate__P83037_mk(s);
+    s.tmp_0.arg0 = inline__P85477;
+    s.callLocIdx = 4; s.pc = 3; return s.tmp_0;
+  case 3:
     r0 = s.retval;
-    globals.screen___108298 = (r0);
-    globals.RUN_KEY___110661 = ("#run");
-    globals.SCOPE_KEY___110662 = ("#scope");
-    s.tmp_0 = settings_initScopes__P110673_mk(s);
-    s.callLocIdx = 3; s.pc = 2; return s.tmp_0;
-  case 2:
+    globals.control_EventContext_onStats___81660 = (inline__P85482);
+    globals.RUN_KEY___85487 = ("#run");
+    globals.SCOPE_KEY___85488 = ("#scope");
+    s.tmp_0 = settings_initScopes__P85499_mk(s);
+    s.callLocIdx = 5; s.pc = 4; return s.tmp_0;
+  case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 5;
     s.tmp_1.arg2 = 4;
-    s.callLocIdx = 4; s.pc = 3; return s.tmp_1;
-  case 3:
+    s.callLocIdx = 6; s.pc = 5; return s.tmp_1;
+  case 5:
     r0 = s.retval;
-    globals.A___108374 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    globals.A___83150 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 6;
     s.tmp_1.arg2 = 5;
-    s.callLocIdx = 5; s.pc = 4; return s.tmp_1;
-  case 4:
+    s.callLocIdx = 7; s.pc = 6; return s.tmp_1;
+  case 6:
     r0 = s.retval;
-    globals.B___108375 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    globals.B___83151 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.tmp_1.arg2 = 47;
-    s.callLocIdx = 6; s.pc = 5; return s.tmp_1;
-  case 5:
+    s.callLocIdx = 8; s.pc = 7; return s.tmp_1;
+  case 7:
     r0 = s.retval;
-    globals.left___108376 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    globals.left___83152 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 2;
     s.tmp_1.arg2 = 49;
-    s.callLocIdx = 7; s.pc = 6; return s.tmp_1;
-  case 6:
+    s.callLocIdx = 9; s.pc = 8; return s.tmp_1;
+  case 8:
     r0 = s.retval;
-    globals.up___108377 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    globals.up___83153 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 3;
     s.tmp_1.arg2 = 48;
-    s.callLocIdx = 8; s.pc = 7; return s.tmp_1;
-  case 7:
+    s.callLocIdx = 10; s.pc = 9; return s.tmp_1;
+  case 9:
     r0 = s.retval;
-    globals.right___108378 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    globals.right___83154 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 4;
     s.tmp_1.arg2 = 50;
-    s.callLocIdx = 9; s.pc = 8; return s.tmp_1;
-  case 8:
+    s.callLocIdx = 11; s.pc = 10; return s.tmp_1;
+  case 10:
     r0 = s.retval;
-    globals.down___108379 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    globals.down___83155 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 7;
     s.tmp_1.arg2 = 51;
-    s.callLocIdx = 10; s.pc = 9; return s.tmp_1;
-  case 9:
+    s.callLocIdx = 12; s.pc = 11; return s.tmp_1;
+  case 11:
     r0 = s.retval;
-    globals.menu___108380 = (s.tmp_0);
-    globals._userEventsEnabled___110700 = (true);
-    globals.defaultRepeatDelay___110702 = (500);
-    globals.defaultRepeatInterval___110704 = (30);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_AnyButton__C110710_VT);
+    globals.menu___83156 = (s.tmp_0);
+    globals._userEventsEnabled___85526 = (true);
+    globals.defaultRepeatDelay___85528 = (500);
+    globals.defaultRepeatInterval___85530 = (30);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_AnyButton__C85536_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_1 = controller_Button_constructor__P83182_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 0;
     s.tmp_1.arg2 = -1;
-    s.callLocIdx = 11; s.pc = 10; return s.tmp_1;
-  case 10:
-    r0 = s.retval;
-    globals.anyButton___108454 = (s.tmp_0);
-    s.tmp_0 = SpriteKind_create__P108624_mk(s);
-    s.callLocIdx = 12; s.pc = 11; return s.tmp_0;
-  case 11:
-    r0 = s.retval;
-    globals.Player___108625 = (r0);
-    s.tmp_0 = SpriteKind_create__P108624_mk(s);
-    s.callLocIdx = 13; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 13; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
-    globals.Food___108627 = (r0);
-    s.tmp_0 = SpriteKind_create__P108624_mk(s);
+    globals.anyButton___83230 = (s.tmp_0);
+    s.tmp_0 = SpriteKind_create__P83408_mk(s);
     s.callLocIdx = 14; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    globals.Enemy___108628 = (r0);
-    r0 = (100 * 256);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 | 0);
-    globals.MAX_TIME_STEP___108665 = (r0);
-    r0 = (0.1 * 256);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 | 0);
-    globals.MIN_MOVE_GAP___108667 = (r0);
-    globals.infoState___110753 = (undefined);
-    s.tmp_0 = game_addScenePushHandler__P109046_mk(s);
-    s.tmp_0.arg0 = inline__P110757;
-    s.callLocIdx = 17; s.pc = 14; return s.tmp_0;
+    globals.Player___83409 = (r0);
+    s.tmp_0 = SpriteKind_create__P83408_mk(s);
+    s.callLocIdx = 15; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P109048_mk(s);
-    s.tmp_0.arg0 = inline__P110772;
-    s.callLocIdx = 21; s.pc = 15; return s.tmp_0;
+    globals.Food___83411 = (r0);
+    s.tmp_0 = SpriteKind_create__P83408_mk(s);
+    s.callLocIdx = 16; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_Array__mk();
-    globals.scene_Scene_initializers___108936 = (r0);
-    globals.debug___109025 = (false);
-    globals.stats___109026 = (false);
-    globals.winEffect___109027 = (undefined);
-    globals.loseEffect___109028 = (undefined);
-    globals.loseSound___110868 = (undefined);
-    globals.winSound___110870 = (undefined);
-    s.tmp_0 = scene_systemMenu_initVolume__P111137_mk(s);
-    s.callLocIdx = 22; s.pc = 16; return s.tmp_0;
+    globals.Enemy___83412 = (r0);
+    r0 = (0.1 * 256);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 | 0);
+    globals.MIN_MOVE_GAP___83450 = (r0);
+    globals.infoState___85593 = (undefined);
+    s.tmp_0 = game_addScenePushHandler__P83825_mk(s);
+    s.tmp_0.arg0 = inline__P85597;
+    s.callLocIdx = 18; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_initScreen__P111138_mk(s);
-    s.callLocIdx = 23; s.pc = 17; return s.tmp_0;
+    s.tmp_0 = game_addScenePopHandler__P83827_mk(s);
+    s.tmp_0.arg0 = inline__P85612;
+    s.callLocIdx = 22; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
-    r0 = pxsim_Array__push(globals.scene_Scene_initializers___108936, scene_systemMenu_register__P109130);
-    r0 = pxsim.image.ofBuffer(_hex111145);
-    globals.CARD_NORMAL___109135 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111147);
-    globals.CARD_SELECTED___109136 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111149);
-    globals.CARD_ACTIVE___109137 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111151);
-    globals.VOLUME_UP_ICON___109138 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111153);
-    globals.BRIGHTNESS_DOWN_ICON___109139 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111155);
-    globals.CLOSE_MENU_ICON___109140 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111157);
-    globals.VOLUME_DOWN_ICON___109141 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111159);
-    globals.SLEEP_ICON___109142 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111161);
-    globals.CONSOLE_ICON___109143 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111163);
-    globals.BRIGHTNESS_UP_ICON___109144 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex111165);
-    globals.STATS_ICON___109145 = (r0);
-    globals.consoleColor___111168 = (1);
-    globals.tabSize___111171 = (8);
-    globals.consoleFont___111177 = (globals.font5___108246);
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_Array__mk();
+    globals.scene_Scene_initializers___83715 = (r0);
+    globals.debug___83804 = (false);
+    globals.stats___83805 = (false);
+    globals.winEffect___83806 = (undefined);
+    globals.loseEffect___83807 = (undefined);
+    globals.loseSound___85707 = (undefined);
+    globals.winSound___85709 = (undefined);
+    s.tmp_0 = scene_systemMenu_initVolume__P85976_mk(s);
+    s.callLocIdx = 23; s.pc = 18; return s.tmp_0;
+  case 18:
+    r0 = s.retval;
+    s.tmp_0 = scene_systemMenu_initScreen__P85977_mk(s);
+    s.callLocIdx = 24; s.pc = 19; return s.tmp_0;
+  case 19:
+    r0 = s.retval;
+    r0 = pxsim_Array__push(globals.scene_Scene_initializers___83715, scene_systemMenu_register__P83909);
+    r0 = pxsim.image.ofBuffer(_hex85984);
+    globals.CARD_NORMAL___83914 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex85986);
+    globals.CARD_SELECTED___83915 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex85988);
+    globals.CARD_ACTIVE___83916 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex85990);
+    globals.VOLUME_UP_ICON___83917 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex85992);
+    globals.BRIGHTNESS_DOWN_ICON___83918 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex85994);
+    globals.CLOSE_MENU_ICON___83919 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex85996);
+    globals.VOLUME_DOWN_ICON___83920 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex85998);
+    globals.SLEEP_ICON___83921 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex86000);
+    globals.CONSOLE_ICON___83922 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex86002);
+    globals.BRIGHTNESS_UP_ICON___83923 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex86004);
+    globals.STATS_ICON___83924 = (r0);
+    globals.consoleColor___86007 = (1);
+    globals.tabSize___86010 = (8);
+    globals.consoleFont___86016 = (globals.font5___83023);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_2 = r0;
     s.tmp_5 = if_charHeight_1_mk(s);
-    s.tmp_5.arg0 = globals.consoleFont___111177;
+    s.tmp_5.arg0 = globals.consoleFont___86016;
     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 = 24; s.pc = 18; return s.tmp_5; }
+     else { s.callLocIdx = 25; s.pc = 20; return s.tmp_5; }
     }
-  case 18:
+  case 20:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 2);
@@ -919,283 +944,263 @@ switch (step) {
     r0 = pxsim.Math_.floor(s.tmp_1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    globals.consoleLines___111182 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    globals.consoleLines___86021 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     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___111177;
+    s.tmp_4.arg0 = globals.consoleFont___86016;
     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 = 19; return s.tmp_4; }
+     else { s.callLocIdx = 26; s.pc = 21; return s.tmp_4; }
     }
-  case 19:
+  case 21:
     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___111192 = (r0);
-    s.tmp_0 = console_addListener__P106981_mk(s);
-    s.tmp_0.arg0 = game_consoleOverlay_listener__P111204;
-    s.callLocIdx = 26; s.pc = 20; return s.tmp_0;
-  case 20:
+    globals.consoleColumns___86031 = (r0);
+    s.tmp_0 = console_addListener__P81645_mk(s);
+    s.tmp_0.arg0 = game_consoleOverlay_listener__P86043;
+    s.callLocIdx = 27; s.pc = 22; return s.tmp_0;
+  case 22:
     r0 = s.retval;
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = inline__P111208;
+    s.tmp_0.argL = inline__P86047;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 28; s.pc = 21; return s.tmp_0;
-  case 21:
+    s.callLocIdx = 29; s.pc = 23; return s.tmp_0;
+  case 23:
     r0 = s.retval;
-    globals.MAX_SOURCES___111206 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C109215_VT);
+    globals.MAX_SOURCES___86045 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C83994_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_SprayFactory_constructor__P109216_mk(s);
+    s.tmp_1 = particles_SprayFactory_constructor__P83995_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 = 29; s.pc = 22; return s.tmp_1;
-  case 22:
+    s.callLocIdx = 30; s.pc = 24; return s.tmp_1;
+  case 24:
     r0 = s.retval;
-    globals.defaultFactory___109195 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C109083_VT);
+    globals.defaultFactory___83974 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C83862_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P109085_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P83864_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 30; s.pc = 23; return s.tmp_1;
-  case 23:
+    s.callLocIdx = 31; s.pc = 25; return s.tmp_1;
+  case 25:
     r0 = s.retval;
-    globals.galois___111241 = (s.tmp_0);
-    globals.angleSlice___111249 = (0.06283185307179587);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ScreenEffect__C109290_VT);
+    globals.galois___86080 = (s.tmp_0);
+    globals.angleSlice___86088 = (0.06283185307179587);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ScreenEffect__C84069_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_ScreenEffect_constructor__P109291_mk(s);
+    s.tmp_1 = effects_ScreenEffect_constructor__P84070_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__P121823;
-    s.callLocIdx = 36; s.pc = 24; return s.tmp_1;
-  case 24:
-    r0 = s.retval;
-    globals.confetti___109298 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C109313_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = effects_ImageEffect_constructor__P109314_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = 100;
-    s.tmp_1.arg2 = inline__P127053;
-    s.callLocIdx = 42; s.pc = 25; return s.tmp_1;
-  case 25:
-    r0 = s.retval;
-    globals.dissolve___109318 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C109313_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = effects_ImageEffect_constructor__P109314_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = 125;
-    s.tmp_1.arg2 = inline__P121715;
-    s.callLocIdx = 45; s.pc = 26; return s.tmp_1;
+    s.tmp_1.arg4 = inline__P97154;
+    s.callLocIdx = 37; s.pc = 26; return s.tmp_1;
   case 26:
     r0 = s.retval;
-    globals.melt___109319 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C109328_VT);
+    globals.confetti___84077 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C84092_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = texteffects_TextEffect_constructor__P109330_mk(s);
+    s.tmp_1 = effects_ImageEffect_constructor__P84093_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = inline__P111300;
-    s.callLocIdx = 46; s.pc = 27; return s.tmp_1;
+    s.tmp_1.arg1 = 100;
+    s.tmp_1.arg2 = inline__P102447;
+    s.callLocIdx = 43; s.pc = 27; return s.tmp_1;
   case 27:
     r0 = s.retval;
-    globals.shake___109331 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C109328_VT);
+    globals.dissolve___84097 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C84092_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = texteffects_TextEffect_constructor__P109330_mk(s);
+    s.tmp_1 = effects_ImageEffect_constructor__P84093_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = inline__P111313;
-    s.callLocIdx = 56; s.pc = 28; return s.tmp_1;
+    s.tmp_1.arg1 = 125;
+    s.tmp_1.arg2 = inline__P97046;
+    s.callLocIdx = 46; s.pc = 28; return s.tmp_1;
   case 28:
     r0 = s.retval;
-    globals.wave___109332 = (s.tmp_0);
-    globals.globalVolume___111358 = (null);
-    globals.playToneID___111365 = (0);
-    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C109356_VT);
+    globals.melt___84098 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C84107_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = music_Melody_constructor__P109359_mk(s);
+    s.tmp_1 = texteffects_TextEffect_constructor__P84109_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 = 57; s.pc = 29; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P86139;
+    s.callLocIdx = 47; s.pc = 29; return s.tmp_1;
   case 29:
     r0 = s.retval;
-    globals.wawawawaa___109373 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C109356_VT);
+    globals.shake___84110 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C84107_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = music_Melody_constructor__P109359_mk(s);
+    s.tmp_1 = texteffects_TextEffect_constructor__P84109_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 = 58; s.pc = 30; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P86152;
+    s.callLocIdx = 57; s.pc = 30; return s.tmp_1;
   case 30:
     r0 = s.retval;
-    globals.powerUp___109376 = (s.tmp_0);
-    s.tmp_0 = game_setWaitAnyButton__P109030_mk(s);
-    s.tmp_0.arg0 = controller_pauseUntilAnyButtonIsPressed__P108450;
-    s.callLocIdx = 59; s.pc = 31; return s.tmp_0;
+    globals.wave___84111 = (s.tmp_0);
+    s.tmp_0 = game_setWaitAnyButton__P83809_mk(s);
+    s.tmp_0.arg0 = controller_pauseUntilAnyButtonIsPressed__P83226;
+    s.callLocIdx = 58; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
-    s.tmp_0 = game_eventContext__P109032_mk(s);
-    s.callLocIdx = 60; s.pc = 32; return s.tmp_0;
+    s.tmp_0 = game_eventContext__P83811_mk(s);
+    s.callLocIdx = 59; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
-    s.tmp_0 = SpriteKind_create__P108624_mk(s);
-    s.callLocIdx = 61; s.pc = 33; return s.tmp_0;
+    s.tmp_0 = SpriteKind_create__P83408_mk(s);
+    s.callLocIdx = 60; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    globals.Text___110065 = (r0);
+    globals.Text___84817 = (r0);
     r0 = pxsim_pxtrt.mkMap();
-    globals.kodu_icons_reg___110154 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113721);
-    globals.MISSING___110158 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113578);
-    globals.ui_cursor___110159 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113709);
-    globals.ui_when___110160 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113713);
-    globals.ui_do___110161 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113633);
-    globals.btn_play___110162 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113637);
-    globals.btn_stop___110163 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113641);
-    globals.btn_object_mode___110164 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113645);
-    globals.btn_terrain_mode___110165 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113649);
-    globals.btn_focus___110166 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113653);
-    globals.btn_underline___110167 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113673);
-    globals.btn_edit___110168 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113677);
-    globals.btn_move___110169 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113681);
-    globals.btn_duplicate___110170 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113685);
-    globals.btn_delete___110171 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113689);
-    globals.btn_carry___110172 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113693);
-    globals.btn_cancel___110173 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113697);
-    globals.btn_ok___110174 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113701);
-    globals.btn_plus___110175 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113705);
-    globals.btn_new_file___110176 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113717);
-    globals.btn_insertion_point___110177 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113657);
-    globals.btn_bknd_white___110178 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113661);
-    globals.btn_bknd_beige___110179 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113665);
-    globals.btn_bknd_clear___110180 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113669);
-    globals.btn_bknd_danger___110181 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113597);
-    globals.char_kodu___110182 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113613);
-    globals.char_apple___110183 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113629);
-    globals.char_tree___110184 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113730);
-    globals.tile_see___110185 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113738);
-    globals.tile_dpad___110186 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113746);
-    globals.tile_button_a___110187 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113754);
-    globals.tile_button_b___110188 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113762);
-    globals.tile_bump___110189 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113770);
-    globals.tile_timer___110190 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113778);
-    globals.tile_page_1___110191 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113786);
-    globals.tile_page_2___110192 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113794);
-    globals.tile_page_3___110193 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113802);
-    globals.tile_page_4___110194 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113810);
-    globals.tile_page_5___110195 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113824);
-    globals.tile_express_none___110196 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113838);
-    globals.tile_express_happy___110197 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113852);
-    globals.tile_express_angry___110198 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113866);
-    globals.tile_express_sad___110199 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113880);
-    globals.tile_express_heart___110200 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113894);
-    globals.tile_me___110201 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113908);
-    globals.tile_it___110202 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113916);
-    globals.tile_faraway___110203 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113924);
-    globals.tile_nearby___110204 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113932);
-    globals.tile_timespan_short___110205 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113940);
-    globals.tile_timespan_long___110206 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113949);
-    globals.tile_move___110207 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113957);
-    globals.tile_switch_page___110208 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113965);
-    globals.tile_camera_follow___110209 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113973);
-    globals.tile_vanish___110210 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113981);
-    globals.tile_express___110211 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113989);
-    globals.tile_toward___110212 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex113997);
-    globals.tile_away___110213 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114005);
-    globals.tile_avoid___110214 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114013);
-    globals.tile_quickly___110215 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114021);
-    globals.tile_slowly___110216 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114029);
-    globals.rc_default___110217 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114036);
-    globals.rc_high___110218 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114043);
-    globals.rc_low___110219 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114050);
-    globals.rc_low_to_high___110220 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114057);
-    globals.rc_high_to_low___110221 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114064);
-    globals.emo_happy___110222 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114071);
-    globals.emo_angry___110223 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114078);
-    globals.emo_heart___110224 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex114085);
-    globals.emo_sad___110225 = (r0);
+    globals.kodu_icons_reg___84906 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88566);
+    globals.MISSING___84910 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88423);
+    globals.ui_cursor___84911 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88554);
+    globals.ui_when___84912 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88558);
+    globals.ui_do___84913 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88478);
+    globals.btn_play___84914 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88482);
+    globals.btn_stop___84915 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88486);
+    globals.btn_object_mode___84916 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88490);
+    globals.btn_terrain_mode___84917 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88494);
+    globals.btn_focus___84918 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88498);
+    globals.btn_underline___84919 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88518);
+    globals.btn_edit___84920 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88522);
+    globals.btn_move___84921 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88526);
+    globals.btn_duplicate___84922 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88530);
+    globals.btn_delete___84923 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88534);
+    globals.btn_carry___84924 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88538);
+    globals.btn_cancel___84925 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88542);
+    globals.btn_ok___84926 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88546);
+    globals.btn_plus___84927 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88550);
+    globals.btn_new_file___84928 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88562);
+    globals.btn_insertion_point___84929 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88502);
+    globals.btn_bknd_white___84930 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88506);
+    globals.btn_bknd_beige___84931 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88510);
+    globals.btn_bknd_clear___84932 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88514);
+    globals.btn_bknd_danger___84933 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88442);
+    globals.char_kodu___84934 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88458);
+    globals.char_apple___84935 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88474);
+    globals.char_tree___84936 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88575);
+    globals.tile_see___84937 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88583);
+    globals.tile_dpad___84938 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88591);
+    globals.tile_button_a___84939 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88599);
+    globals.tile_button_b___84940 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88607);
+    globals.tile_bump___84941 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88615);
+    globals.tile_timer___84942 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88623);
+    globals.tile_page_1___84943 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88631);
+    globals.tile_page_2___84944 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88639);
+    globals.tile_page_3___84945 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88647);
+    globals.tile_page_4___84946 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88655);
+    globals.tile_page_5___84947 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88669);
+    globals.tile_express_none___84948 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88683);
+    globals.tile_express_happy___84949 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88697);
+    globals.tile_express_angry___84950 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88711);
+    globals.tile_express_sad___84951 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88725);
+    globals.tile_express_heart___84952 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88739);
+    globals.tile_me___84953 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88753);
+    globals.tile_it___84954 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88761);
+    globals.tile_faraway___84955 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88769);
+    globals.tile_nearby___84956 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88777);
+    globals.tile_timespan_short___84957 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88785);
+    globals.tile_timespan_long___84958 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88794);
+    globals.tile_move___84959 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88802);
+    globals.tile_switch_page___84960 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88810);
+    globals.tile_camera_follow___84961 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88818);
+    globals.tile_vanish___84962 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88826);
+    globals.tile_express___84963 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88834);
+    globals.tile_toward___84964 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88842);
+    globals.tile_away___84965 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88850);
+    globals.tile_avoid___84966 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88858);
+    globals.tile_quickly___84967 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88866);
+    globals.tile_slowly___84968 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88874);
+    globals.rc_default___84969 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88881);
+    globals.rc_high___84970 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88888);
+    globals.rc_low___84971 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88895);
+    globals.rc_low_to_high___84972 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88902);
+    globals.rc_high_to_low___84973 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88910);
+    globals.emo_happy___84974 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88917);
+    globals.emo_angry___84975 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88924);
+    globals.emo_heart___84976 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex88931);
+    globals.emo_sad___84977 = (r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "DEFAULT", "RC0");
@@ -1203,7 +1208,7 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "LOW", "RC2");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "HIGH_TO_LOW", "RC3");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "LOW_TO_HIGH", "RC4");
-    globals.RuleCondition___110338 = (s.tmp_0);
+    globals.RuleCondition___85091 = (s.tmp_0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "always", "S1");
@@ -1265,20 +1270,20 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_4, "express_heart", "M19");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_4, "express_sad", "M20");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_1, "modifier", s.tmp_4);
-    globals.tid___110372 = (s.tmp_1);
+    globals.tid___85125 = (s.tmp_1);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "type", 1);
     s.tmp_2 = if_always_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 655; s.pc = 35; return s.tmp_3; }
+     else { s.callLocIdx = 654; s.pc = 35; return s.tmp_3; }
     }
   case 35:
     r0 = s.retval;
@@ -1289,7 +1294,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["always"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["always"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 656; s.pc = 34; return s.tmp_2; }
+     else { s.callLocIdx = 655; s.pc = 34; return s.tmp_2; }
     }
   case 34:
     r0 = s.retval;
@@ -1302,14 +1307,14 @@ switch (step) {
     s.tmp_4 = r0;
     s.tmp_6 = if_always_1_mk(s);
     s.tmp_7 = if_sensor_1_mk(s);
-    s.tmp_7.arg0 = globals.tid___110372;
+    s.tmp_7.arg0 = globals.tid___85125;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "sensor");
     } else {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["sensor"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["sensor"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 653; s.pc = 37; return s.tmp_7; }
+     else { s.callLocIdx = 652; s.pc = 37; return s.tmp_7; }
     }
   case 37:
     r0 = s.retval;
@@ -1320,7 +1325,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["always"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["always"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 654; s.pc = 36; return s.tmp_6; }
+     else { s.callLocIdx = 653; s.pc = 36; return s.tmp_6; }
     }
   case 36:
     r0 = s.retval;
@@ -1331,14 +1336,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_8, "type", 1);
     s.tmp_10 = if_see_1_mk(s);
     s.tmp_11 = if_sensor_1_mk(s);
-    s.tmp_11.arg0 = globals.tid___110372;
+    s.tmp_11.arg0 = globals.tid___85125;
     if (!s.tmp_11.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_11.arg0, "sensor");
     } else {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["sensor"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["sensor"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 659; s.pc = 39; return s.tmp_11; }
+     else { s.callLocIdx = 658; s.pc = 39; return s.tmp_11; }
     }
   case 39:
     r0 = s.retval;
@@ -1349,7 +1354,7 @@ switch (step) {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["see"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["see"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 660; s.pc = 38; return s.tmp_10; }
+     else { s.callLocIdx = 659; s.pc = 38; return s.tmp_10; }
     }
   case 38:
     r0 = s.retval;
@@ -1378,14 +1383,14 @@ switch (step) {
     s.tmp_16 = r0;
     s.tmp_18 = if_me_1_mk(s);
     s.tmp_19 = if_filter_1_mk(s);
-    s.tmp_19.arg0 = globals.tid___110372;
+    s.tmp_19.arg0 = globals.tid___85125;
     if (!s.tmp_19.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_19.arg0, "filter");
     } else {
       s.tmp_19.fn = s.tmp_19.arg0.vtable.iface["filter"];
       if (s.tmp_19.fn == null) { s.retval = s.tmp_19.arg0.fields["filter"]; }
       else if (!s.tmp_19.fn.isGetter) { s.retval = bind(s.tmp_19); }
-     else { s.callLocIdx = 661; s.pc = 41; return s.tmp_19; }
+     else { s.callLocIdx = 660; s.pc = 41; return s.tmp_19; }
     }
   case 41:
     r0 = s.retval;
@@ -1396,7 +1401,7 @@ switch (step) {
       s.tmp_18.fn = s.tmp_18.arg0.vtable.iface["me"];
       if (s.tmp_18.fn == null) { s.retval = s.tmp_18.arg0.fields["me"]; }
       else if (!s.tmp_18.fn.isGetter) { s.retval = bind(s.tmp_18); }
-     else { s.callLocIdx = 662; s.pc = 40; return s.tmp_18; }
+     else { s.callLocIdx = 661; s.pc = 40; return s.tmp_18; }
     }
   case 40:
     r0 = s.retval;
@@ -1409,14 +1414,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_8, "constraints", s.tmp_13);
     s.tmp_22 = if_see_1_mk(s);
     s.tmp_23 = if_sensor_1_mk(s);
-    s.tmp_23.arg0 = globals.tid___110372;
+    s.tmp_23.arg0 = globals.tid___85125;
     if (!s.tmp_23.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_23.arg0, "sensor");
     } else {
       s.tmp_23.fn = s.tmp_23.arg0.vtable.iface["sensor"];
       if (s.tmp_23.fn == null) { s.retval = s.tmp_23.arg0.fields["sensor"]; }
       else if (!s.tmp_23.fn.isGetter) { s.retval = bind(s.tmp_23); }
-     else { s.callLocIdx = 657; s.pc = 43; return s.tmp_23; }
+     else { s.callLocIdx = 656; s.pc = 43; return s.tmp_23; }
     }
   case 43:
     r0 = s.retval;
@@ -1427,7 +1432,7 @@ switch (step) {
       s.tmp_22.fn = s.tmp_22.arg0.vtable.iface["see"];
       if (s.tmp_22.fn == null) { s.retval = s.tmp_22.arg0.fields["see"]; }
       else if (!s.tmp_22.fn.isGetter) { s.retval = bind(s.tmp_22); }
-     else { s.callLocIdx = 658; s.pc = 42; return s.tmp_22; }
+     else { s.callLocIdx = 657; s.pc = 42; return s.tmp_22; }
     }
   case 42:
     r0 = s.retval;
@@ -1438,14 +1443,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_24, "type", 1);
     s.tmp_26 = if_bump_1_mk(s);
     s.tmp_27 = if_sensor_1_mk(s);
-    s.tmp_27.arg0 = globals.tid___110372;
+    s.tmp_27.arg0 = globals.tid___85125;
     if (!s.tmp_27.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_27.arg0, "sensor");
     } else {
       s.tmp_27.fn = s.tmp_27.arg0.vtable.iface["sensor"];
       if (s.tmp_27.fn == null) { s.retval = s.tmp_27.arg0.fields["sensor"]; }
       else if (!s.tmp_27.fn.isGetter) { s.retval = bind(s.tmp_27); }
-     else { s.callLocIdx = 665; s.pc = 45; return s.tmp_27; }
+     else { s.callLocIdx = 664; s.pc = 45; return s.tmp_27; }
     }
   case 45:
     r0 = s.retval;
@@ -1456,7 +1461,7 @@ switch (step) {
       s.tmp_26.fn = s.tmp_26.arg0.vtable.iface["bump"];
       if (s.tmp_26.fn == null) { s.retval = s.tmp_26.arg0.fields["bump"]; }
       else if (!s.tmp_26.fn.isGetter) { s.retval = bind(s.tmp_26); }
-     else { s.callLocIdx = 666; s.pc = 44; return s.tmp_26; }
+     else { s.callLocIdx = 665; s.pc = 44; return s.tmp_26; }
     }
   case 44:
     r0 = s.retval;
@@ -1484,14 +1489,14 @@ switch (step) {
     s.tmp_32 = r0;
     s.tmp_34 = if_me_1_mk(s);
     s.tmp_35 = if_filter_1_mk(s);
-    s.tmp_35.arg0 = globals.tid___110372;
+    s.tmp_35.arg0 = globals.tid___85125;
     if (!s.tmp_35.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_35.arg0, "filter");
     } else {
       s.tmp_35.fn = s.tmp_35.arg0.vtable.iface["filter"];
       if (s.tmp_35.fn == null) { s.retval = s.tmp_35.arg0.fields["filter"]; }
       else if (!s.tmp_35.fn.isGetter) { s.retval = bind(s.tmp_35); }
-     else { s.callLocIdx = 667; s.pc = 47; return s.tmp_35; }
+     else { s.callLocIdx = 666; s.pc = 47; return s.tmp_35; }
     }
   case 47:
     r0 = s.retval;
@@ -1502,7 +1507,7 @@ switch (step) {
       s.tmp_34.fn = s.tmp_34.arg0.vtable.iface["me"];
       if (s.tmp_34.fn == null) { s.retval = s.tmp_34.arg0.fields["me"]; }
       else if (!s.tmp_34.fn.isGetter) { s.retval = bind(s.tmp_34); }
-     else { s.callLocIdx = 668; s.pc = 46; return s.tmp_34; }
+     else { s.callLocIdx = 667; s.pc = 46; return s.tmp_34; }
     }
   case 46:
     r0 = s.retval;
@@ -1515,14 +1520,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_24, "constraints", s.tmp_29);
     s.tmp_38 = if_bump_1_mk(s);
     s.tmp_39 = if_sensor_1_mk(s);
-    s.tmp_39.arg0 = globals.tid___110372;
+    s.tmp_39.arg0 = globals.tid___85125;
     if (!s.tmp_39.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_39.arg0, "sensor");
     } else {
       s.tmp_39.fn = s.tmp_39.arg0.vtable.iface["sensor"];
       if (s.tmp_39.fn == null) { s.retval = s.tmp_39.arg0.fields["sensor"]; }
       else if (!s.tmp_39.fn.isGetter) { s.retval = bind(s.tmp_39); }
-     else { s.callLocIdx = 663; s.pc = 49; return s.tmp_39; }
+     else { s.callLocIdx = 662; s.pc = 49; return s.tmp_39; }
     }
   case 49:
     r0 = s.retval;
@@ -1533,7 +1538,7 @@ switch (step) {
       s.tmp_38.fn = s.tmp_38.arg0.vtable.iface["bump"];
       if (s.tmp_38.fn == null) { s.retval = s.tmp_38.arg0.fields["bump"]; }
       else if (!s.tmp_38.fn.isGetter) { s.retval = bind(s.tmp_38); }
-     else { s.callLocIdx = 664; s.pc = 48; return s.tmp_38; }
+     else { s.callLocIdx = 663; s.pc = 48; return s.tmp_38; }
     }
   case 48:
     r0 = s.retval;
@@ -1544,14 +1549,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_40, "type", 1);
     s.tmp_42 = if_dpad_1_mk(s);
     s.tmp_43 = if_sensor_1_mk(s);
-    s.tmp_43.arg0 = globals.tid___110372;
+    s.tmp_43.arg0 = globals.tid___85125;
     if (!s.tmp_43.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_43.arg0, "sensor");
     } else {
       s.tmp_43.fn = s.tmp_43.arg0.vtable.iface["sensor"];
       if (s.tmp_43.fn == null) { s.retval = s.tmp_43.arg0.fields["sensor"]; }
       else if (!s.tmp_43.fn.isGetter) { s.retval = bind(s.tmp_43); }
-     else { s.callLocIdx = 671; s.pc = 51; return s.tmp_43; }
+     else { s.callLocIdx = 670; s.pc = 51; return s.tmp_43; }
     }
   case 51:
     r0 = s.retval;
@@ -1562,7 +1567,7 @@ switch (step) {
       s.tmp_42.fn = s.tmp_42.arg0.vtable.iface["dpad"];
       if (s.tmp_42.fn == null) { s.retval = s.tmp_42.arg0.fields["dpad"]; }
       else if (!s.tmp_42.fn.isGetter) { s.retval = bind(s.tmp_42); }
-     else { s.callLocIdx = 672; s.pc = 50; return s.tmp_42; }
+     else { s.callLocIdx = 671; s.pc = 50; return s.tmp_42; }
     }
   case 50:
     r0 = s.retval;
@@ -1588,14 +1593,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_40, "constraints", s.tmp_45);
     s.tmp_49 = if_dpad_1_mk(s);
     s.tmp_50 = if_sensor_1_mk(s);
-    s.tmp_50.arg0 = globals.tid___110372;
+    s.tmp_50.arg0 = globals.tid___85125;
     if (!s.tmp_50.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_50.arg0, "sensor");
     } else {
       s.tmp_50.fn = s.tmp_50.arg0.vtable.iface["sensor"];
       if (s.tmp_50.fn == null) { s.retval = s.tmp_50.arg0.fields["sensor"]; }
       else if (!s.tmp_50.fn.isGetter) { s.retval = bind(s.tmp_50); }
-     else { s.callLocIdx = 669; s.pc = 53; return s.tmp_50; }
+     else { s.callLocIdx = 668; s.pc = 53; return s.tmp_50; }
     }
   case 53:
     r0 = s.retval;
@@ -1606,7 +1611,7 @@ switch (step) {
       s.tmp_49.fn = s.tmp_49.arg0.vtable.iface["dpad"];
       if (s.tmp_49.fn == null) { s.retval = s.tmp_49.arg0.fields["dpad"]; }
       else if (!s.tmp_49.fn.isGetter) { s.retval = bind(s.tmp_49); }
-     else { s.callLocIdx = 670; s.pc = 52; return s.tmp_49; }
+     else { s.callLocIdx = 669; s.pc = 52; return s.tmp_49; }
     }
   case 52:
     r0 = s.retval;
@@ -1617,14 +1622,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_51, "type", 1);
     s.tmp_53 = if_button_a_1_mk(s);
     s.tmp_54 = if_sensor_1_mk(s);
-    s.tmp_54.arg0 = globals.tid___110372;
+    s.tmp_54.arg0 = globals.tid___85125;
     if (!s.tmp_54.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_54.arg0, "sensor");
     } else {
       s.tmp_54.fn = s.tmp_54.arg0.vtable.iface["sensor"];
       if (s.tmp_54.fn == null) { s.retval = s.tmp_54.arg0.fields["sensor"]; }
       else if (!s.tmp_54.fn.isGetter) { s.retval = bind(s.tmp_54); }
-     else { s.callLocIdx = 675; s.pc = 55; return s.tmp_54; }
+     else { s.callLocIdx = 674; s.pc = 55; return s.tmp_54; }
     }
   case 55:
     r0 = s.retval;
@@ -1635,7 +1640,7 @@ switch (step) {
       s.tmp_53.fn = s.tmp_53.arg0.vtable.iface["button_a"];
       if (s.tmp_53.fn == null) { s.retval = s.tmp_53.arg0.fields["button_a"]; }
       else if (!s.tmp_53.fn.isGetter) { s.retval = bind(s.tmp_53); }
-     else { s.callLocIdx = 676; s.pc = 54; return s.tmp_53; }
+     else { s.callLocIdx = 675; s.pc = 54; return s.tmp_53; }
     }
   case 54:
     r0 = s.retval;
@@ -1659,14 +1664,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_51, "constraints", s.tmp_56);
     s.tmp_60 = if_button_a_1_mk(s);
     s.tmp_61 = if_sensor_1_mk(s);
-    s.tmp_61.arg0 = globals.tid___110372;
+    s.tmp_61.arg0 = globals.tid___85125;
     if (!s.tmp_61.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_61.arg0, "sensor");
     } else {
       s.tmp_61.fn = s.tmp_61.arg0.vtable.iface["sensor"];
       if (s.tmp_61.fn == null) { s.retval = s.tmp_61.arg0.fields["sensor"]; }
       else if (!s.tmp_61.fn.isGetter) { s.retval = bind(s.tmp_61); }
-     else { s.callLocIdx = 673; s.pc = 57; return s.tmp_61; }
+     else { s.callLocIdx = 672; s.pc = 57; return s.tmp_61; }
     }
   case 57:
     r0 = s.retval;
@@ -1677,7 +1682,7 @@ switch (step) {
       s.tmp_60.fn = s.tmp_60.arg0.vtable.iface["button_a"];
       if (s.tmp_60.fn == null) { s.retval = s.tmp_60.arg0.fields["button_a"]; }
       else if (!s.tmp_60.fn.isGetter) { s.retval = bind(s.tmp_60); }
-     else { s.callLocIdx = 674; s.pc = 56; return s.tmp_60; }
+     else { s.callLocIdx = 673; s.pc = 56; return s.tmp_60; }
     }
   case 56:
     r0 = s.retval;
@@ -1688,14 +1693,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_62, "type", 1);
     s.tmp_64 = if_button_b_1_mk(s);
     s.tmp_65 = if_sensor_1_mk(s);
-    s.tmp_65.arg0 = globals.tid___110372;
+    s.tmp_65.arg0 = globals.tid___85125;
     if (!s.tmp_65.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_65.arg0, "sensor");
     } else {
       s.tmp_65.fn = s.tmp_65.arg0.vtable.iface["sensor"];
       if (s.tmp_65.fn == null) { s.retval = s.tmp_65.arg0.fields["sensor"]; }
       else if (!s.tmp_65.fn.isGetter) { s.retval = bind(s.tmp_65); }
-     else { s.callLocIdx = 679; s.pc = 59; return s.tmp_65; }
+     else { s.callLocIdx = 678; s.pc = 59; return s.tmp_65; }
     }
   case 59:
     r0 = s.retval;
@@ -1706,7 +1711,7 @@ switch (step) {
       s.tmp_64.fn = s.tmp_64.arg0.vtable.iface["button_b"];
       if (s.tmp_64.fn == null) { s.retval = s.tmp_64.arg0.fields["button_b"]; }
       else if (!s.tmp_64.fn.isGetter) { s.retval = bind(s.tmp_64); }
-     else { s.callLocIdx = 680; s.pc = 58; return s.tmp_64; }
+     else { s.callLocIdx = 679; s.pc = 58; return s.tmp_64; }
     }
   case 58:
     r0 = s.retval;
@@ -1730,14 +1735,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_62, "constraints", s.tmp_67);
     s.tmp_71 = if_button_b_1_mk(s);
     s.tmp_72 = if_sensor_1_mk(s);
-    s.tmp_72.arg0 = globals.tid___110372;
+    s.tmp_72.arg0 = globals.tid___85125;
     if (!s.tmp_72.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_72.arg0, "sensor");
     } else {
       s.tmp_72.fn = s.tmp_72.arg0.vtable.iface["sensor"];
       if (s.tmp_72.fn == null) { s.retval = s.tmp_72.arg0.fields["sensor"]; }
       else if (!s.tmp_72.fn.isGetter) { s.retval = bind(s.tmp_72); }
-     else { s.callLocIdx = 677; s.pc = 61; return s.tmp_72; }
+     else { s.callLocIdx = 676; s.pc = 61; return s.tmp_72; }
     }
   case 61:
     r0 = s.retval;
@@ -1748,7 +1753,7 @@ switch (step) {
       s.tmp_71.fn = s.tmp_71.arg0.vtable.iface["button_b"];
       if (s.tmp_71.fn == null) { s.retval = s.tmp_71.arg0.fields["button_b"]; }
       else if (!s.tmp_71.fn.isGetter) { s.retval = bind(s.tmp_71); }
-     else { s.callLocIdx = 678; s.pc = 60; return s.tmp_71; }
+     else { s.callLocIdx = 677; s.pc = 60; return s.tmp_71; }
     }
   case 60:
     r0 = s.retval;
@@ -1759,14 +1764,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_73, "type", 1);
     s.tmp_75 = if_timer_1_mk(s);
     s.tmp_76 = if_sensor_1_mk(s);
-    s.tmp_76.arg0 = globals.tid___110372;
+    s.tmp_76.arg0 = globals.tid___85125;
     if (!s.tmp_76.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_76.arg0, "sensor");
     } else {
       s.tmp_76.fn = s.tmp_76.arg0.vtable.iface["sensor"];
       if (s.tmp_76.fn == null) { s.retval = s.tmp_76.arg0.fields["sensor"]; }
       else if (!s.tmp_76.fn.isGetter) { s.retval = bind(s.tmp_76); }
-     else { s.callLocIdx = 683; s.pc = 63; return s.tmp_76; }
+     else { s.callLocIdx = 682; s.pc = 63; return s.tmp_76; }
     }
   case 63:
     r0 = s.retval;
@@ -1777,7 +1782,7 @@ switch (step) {
       s.tmp_75.fn = s.tmp_75.arg0.vtable.iface["timer"];
       if (s.tmp_75.fn == null) { s.retval = s.tmp_75.arg0.fields["timer"]; }
       else if (!s.tmp_75.fn.isGetter) { s.retval = bind(s.tmp_75); }
-     else { s.callLocIdx = 684; s.pc = 62; return s.tmp_75; }
+     else { s.callLocIdx = 683; s.pc = 62; return s.tmp_75; }
     }
   case 62:
     r0 = s.retval;
@@ -1797,14 +1802,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_73, "constraints", s.tmp_79);
     s.tmp_81 = if_timer_1_mk(s);
     s.tmp_82 = if_sensor_1_mk(s);
-    s.tmp_82.arg0 = globals.tid___110372;
+    s.tmp_82.arg0 = globals.tid___85125;
     if (!s.tmp_82.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_82.arg0, "sensor");
     } else {
       s.tmp_82.fn = s.tmp_82.arg0.vtable.iface["sensor"];
       if (s.tmp_82.fn == null) { s.retval = s.tmp_82.arg0.fields["sensor"]; }
       else if (!s.tmp_82.fn.isGetter) { s.retval = bind(s.tmp_82); }
-     else { s.callLocIdx = 681; s.pc = 65; return s.tmp_82; }
+     else { s.callLocIdx = 680; s.pc = 65; return s.tmp_82; }
     }
   case 65:
     r0 = s.retval;
@@ -1815,7 +1820,7 @@ switch (step) {
       s.tmp_81.fn = s.tmp_81.arg0.vtable.iface["timer"];
       if (s.tmp_81.fn == null) { s.retval = s.tmp_81.arg0.fields["timer"]; }
       else if (!s.tmp_81.fn.isGetter) { s.retval = bind(s.tmp_81); }
-     else { s.callLocIdx = 682; s.pc = 64; return s.tmp_81; }
+     else { s.callLocIdx = 681; s.pc = 64; return s.tmp_81; }
     }
   case 64:
     r0 = s.retval;
@@ -1829,14 +1834,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_84, "type", 2);
     s.tmp_86 = if_kodu_1_mk(s);
     s.tmp_87 = if_filter_1_mk(s);
-    s.tmp_87.arg0 = globals.tid___110372;
+    s.tmp_87.arg0 = globals.tid___85125;
     if (!s.tmp_87.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_87.arg0, "filter");
     } else {
       s.tmp_87.fn = s.tmp_87.arg0.vtable.iface["filter"];
       if (s.tmp_87.fn == null) { s.retval = s.tmp_87.arg0.fields["filter"]; }
       else if (!s.tmp_87.fn.isGetter) { s.retval = bind(s.tmp_87); }
-     else { s.callLocIdx = 687; s.pc = 67; return s.tmp_87; }
+     else { s.callLocIdx = 686; s.pc = 67; return s.tmp_87; }
     }
   case 67:
     r0 = s.retval;
@@ -1847,7 +1852,7 @@ switch (step) {
       s.tmp_86.fn = s.tmp_86.arg0.vtable.iface["kodu"];
       if (s.tmp_86.fn == null) { s.retval = s.tmp_86.arg0.fields["kodu"]; }
       else if (!s.tmp_86.fn.isGetter) { s.retval = bind(s.tmp_86); }
-     else { s.callLocIdx = 688; s.pc = 66; return s.tmp_86; }
+     else { s.callLocIdx = 687; s.pc = 66; return s.tmp_86; }
     }
   case 66:
     r0 = s.retval;
@@ -1875,14 +1880,14 @@ switch (step) {
     s.tmp_92 = r0;
     s.tmp_94 = if_kodu_1_mk(s);
     s.tmp_95 = if_filter_1_mk(s);
-    s.tmp_95.arg0 = globals.tid___110372;
+    s.tmp_95.arg0 = globals.tid___85125;
     if (!s.tmp_95.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_95.arg0, "filter");
     } else {
       s.tmp_95.fn = s.tmp_95.arg0.vtable.iface["filter"];
       if (s.tmp_95.fn == null) { s.retval = s.tmp_95.arg0.fields["filter"]; }
       else if (!s.tmp_95.fn.isGetter) { s.retval = bind(s.tmp_95); }
-     else { s.callLocIdx = 685; s.pc = 69; return s.tmp_95; }
+     else { s.callLocIdx = 684; s.pc = 69; return s.tmp_95; }
     }
   case 69:
     r0 = s.retval;
@@ -1893,7 +1898,7 @@ switch (step) {
       s.tmp_94.fn = s.tmp_94.arg0.vtable.iface["kodu"];
       if (s.tmp_94.fn == null) { s.retval = s.tmp_94.arg0.fields["kodu"]; }
       else if (!s.tmp_94.fn.isGetter) { s.retval = bind(s.tmp_94); }
-     else { s.callLocIdx = 686; s.pc = 68; return s.tmp_94; }
+     else { s.callLocIdx = 685; s.pc = 68; return s.tmp_94; }
     }
   case 68:
     r0 = s.retval;
@@ -1904,14 +1909,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_96, "type", 2);
     s.tmp_98 = if_tree_1_mk(s);
     s.tmp_99 = if_filter_1_mk(s);
-    s.tmp_99.arg0 = globals.tid___110372;
+    s.tmp_99.arg0 = globals.tid___85125;
     if (!s.tmp_99.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_99.arg0, "filter");
     } else {
       s.tmp_99.fn = s.tmp_99.arg0.vtable.iface["filter"];
       if (s.tmp_99.fn == null) { s.retval = s.tmp_99.arg0.fields["filter"]; }
       else if (!s.tmp_99.fn.isGetter) { s.retval = bind(s.tmp_99); }
-     else { s.callLocIdx = 691; s.pc = 71; return s.tmp_99; }
+     else { s.callLocIdx = 690; s.pc = 71; return s.tmp_99; }
     }
   case 71:
     r0 = s.retval;
@@ -1922,7 +1927,7 @@ switch (step) {
       s.tmp_98.fn = s.tmp_98.arg0.vtable.iface["tree"];
       if (s.tmp_98.fn == null) { s.retval = s.tmp_98.arg0.fields["tree"]; }
       else if (!s.tmp_98.fn.isGetter) { s.retval = bind(s.tmp_98); }
-     else { s.callLocIdx = 692; s.pc = 70; return s.tmp_98; }
+     else { s.callLocIdx = 691; s.pc = 70; return s.tmp_98; }
     }
   case 70:
     r0 = s.retval;
@@ -1948,14 +1953,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_96, "constraints", s.tmp_101);
     s.tmp_105 = if_tree_1_mk(s);
     s.tmp_106 = if_filter_1_mk(s);
-    s.tmp_106.arg0 = globals.tid___110372;
+    s.tmp_106.arg0 = globals.tid___85125;
     if (!s.tmp_106.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_106.arg0, "filter");
     } else {
       s.tmp_106.fn = s.tmp_106.arg0.vtable.iface["filter"];
       if (s.tmp_106.fn == null) { s.retval = s.tmp_106.arg0.fields["filter"]; }
       else if (!s.tmp_106.fn.isGetter) { s.retval = bind(s.tmp_106); }
-     else { s.callLocIdx = 689; s.pc = 73; return s.tmp_106; }
+     else { s.callLocIdx = 688; s.pc = 73; return s.tmp_106; }
     }
   case 73:
     r0 = s.retval;
@@ -1966,7 +1971,7 @@ switch (step) {
       s.tmp_105.fn = s.tmp_105.arg0.vtable.iface["tree"];
       if (s.tmp_105.fn == null) { s.retval = s.tmp_105.arg0.fields["tree"]; }
       else if (!s.tmp_105.fn.isGetter) { s.retval = bind(s.tmp_105); }
-     else { s.callLocIdx = 690; s.pc = 72; return s.tmp_105; }
+     else { s.callLocIdx = 689; s.pc = 72; return s.tmp_105; }
     }
   case 72:
     r0 = s.retval;
@@ -1977,14 +1982,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_107, "type", 2);
     s.tmp_109 = if_apple_1_mk(s);
     s.tmp_110 = if_filter_1_mk(s);
-    s.tmp_110.arg0 = globals.tid___110372;
+    s.tmp_110.arg0 = globals.tid___85125;
     if (!s.tmp_110.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_110.arg0, "filter");
     } else {
       s.tmp_110.fn = s.tmp_110.arg0.vtable.iface["filter"];
       if (s.tmp_110.fn == null) { s.retval = s.tmp_110.arg0.fields["filter"]; }
       else if (!s.tmp_110.fn.isGetter) { s.retval = bind(s.tmp_110); }
-     else { s.callLocIdx = 695; s.pc = 75; return s.tmp_110; }
+     else { s.callLocIdx = 694; s.pc = 75; return s.tmp_110; }
     }
   case 75:
     r0 = s.retval;
@@ -1995,7 +2000,7 @@ switch (step) {
       s.tmp_109.fn = s.tmp_109.arg0.vtable.iface["apple"];
       if (s.tmp_109.fn == null) { s.retval = s.tmp_109.arg0.fields["apple"]; }
       else if (!s.tmp_109.fn.isGetter) { s.retval = bind(s.tmp_109); }
-     else { s.callLocIdx = 696; s.pc = 74; return s.tmp_109; }
+     else { s.callLocIdx = 695; s.pc = 74; return s.tmp_109; }
     }
   case 74:
     r0 = s.retval;
@@ -2021,14 +2026,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_107, "constraints", s.tmp_112);
     s.tmp_116 = if_apple_1_mk(s);
     s.tmp_117 = if_filter_1_mk(s);
-    s.tmp_117.arg0 = globals.tid___110372;
+    s.tmp_117.arg0 = globals.tid___85125;
     if (!s.tmp_117.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_117.arg0, "filter");
     } else {
       s.tmp_117.fn = s.tmp_117.arg0.vtable.iface["filter"];
       if (s.tmp_117.fn == null) { s.retval = s.tmp_117.arg0.fields["filter"]; }
       else if (!s.tmp_117.fn.isGetter) { s.retval = bind(s.tmp_117); }
-     else { s.callLocIdx = 693; s.pc = 77; return s.tmp_117; }
+     else { s.callLocIdx = 692; s.pc = 77; return s.tmp_117; }
     }
   case 77:
     r0 = s.retval;
@@ -2039,7 +2044,7 @@ switch (step) {
       s.tmp_116.fn = s.tmp_116.arg0.vtable.iface["apple"];
       if (s.tmp_116.fn == null) { s.retval = s.tmp_116.arg0.fields["apple"]; }
       else if (!s.tmp_116.fn.isGetter) { s.retval = bind(s.tmp_116); }
-     else { s.callLocIdx = 694; s.pc = 76; return s.tmp_116; }
+     else { s.callLocIdx = 693; s.pc = 76; return s.tmp_116; }
     }
   case 76:
     r0 = s.retval;
@@ -2050,14 +2055,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_118, "type", 2);
     s.tmp_120 = if_nearby_1_mk(s);
     s.tmp_121 = if_filter_1_mk(s);
-    s.tmp_121.arg0 = globals.tid___110372;
+    s.tmp_121.arg0 = globals.tid___85125;
     if (!s.tmp_121.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_121.arg0, "filter");
     } else {
       s.tmp_121.fn = s.tmp_121.arg0.vtable.iface["filter"];
       if (s.tmp_121.fn == null) { s.retval = s.tmp_121.arg0.fields["filter"]; }
       else if (!s.tmp_121.fn.isGetter) { s.retval = bind(s.tmp_121); }
-     else { s.callLocIdx = 699; s.pc = 79; return s.tmp_121; }
+     else { s.callLocIdx = 698; s.pc = 79; return s.tmp_121; }
     }
   case 79:
     r0 = s.retval;
@@ -2068,7 +2073,7 @@ switch (step) {
       s.tmp_120.fn = s.tmp_120.arg0.vtable.iface["nearby"];
       if (s.tmp_120.fn == null) { s.retval = s.tmp_120.arg0.fields["nearby"]; }
       else if (!s.tmp_120.fn.isGetter) { s.retval = bind(s.tmp_120); }
-     else { s.callLocIdx = 700; s.pc = 78; return s.tmp_120; }
+     else { s.callLocIdx = 699; s.pc = 78; return s.tmp_120; }
     }
   case 78:
     r0 = s.retval;
@@ -2087,14 +2092,14 @@ switch (step) {
     s.tmp_124 = r0;
     s.tmp_126 = if_faraway_1_mk(s);
     s.tmp_127 = if_filter_1_mk(s);
-    s.tmp_127.arg0 = globals.tid___110372;
+    s.tmp_127.arg0 = globals.tid___85125;
     if (!s.tmp_127.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_127.arg0, "filter");
     } else {
       s.tmp_127.fn = s.tmp_127.arg0.vtable.iface["filter"];
       if (s.tmp_127.fn == null) { s.retval = s.tmp_127.arg0.fields["filter"]; }
       else if (!s.tmp_127.fn.isGetter) { s.retval = bind(s.tmp_127); }
-     else { s.callLocIdx = 701; s.pc = 81; return s.tmp_127; }
+     else { s.callLocIdx = 700; s.pc = 81; return s.tmp_127; }
     }
   case 81:
     r0 = s.retval;
@@ -2105,7 +2110,7 @@ switch (step) {
       s.tmp_126.fn = s.tmp_126.arg0.vtable.iface["faraway"];
       if (s.tmp_126.fn == null) { s.retval = s.tmp_126.arg0.fields["faraway"]; }
       else if (!s.tmp_126.fn.isGetter) { s.retval = bind(s.tmp_126); }
-     else { s.callLocIdx = 702; s.pc = 80; return s.tmp_126; }
+     else { s.callLocIdx = 701; s.pc = 80; return s.tmp_126; }
     }
   case 80:
     r0 = s.retval;
@@ -2122,14 +2127,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_118, "constraints", s.tmp_123);
     s.tmp_131 = if_nearby_1_mk(s);
     s.tmp_132 = if_filter_1_mk(s);
-    s.tmp_132.arg0 = globals.tid___110372;
+    s.tmp_132.arg0 = globals.tid___85125;
     if (!s.tmp_132.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_132.arg0, "filter");
     } else {
       s.tmp_132.fn = s.tmp_132.arg0.vtable.iface["filter"];
       if (s.tmp_132.fn == null) { s.retval = s.tmp_132.arg0.fields["filter"]; }
       else if (!s.tmp_132.fn.isGetter) { s.retval = bind(s.tmp_132); }
-     else { s.callLocIdx = 697; s.pc = 83; return s.tmp_132; }
+     else { s.callLocIdx = 696; s.pc = 83; return s.tmp_132; }
     }
   case 83:
     r0 = s.retval;
@@ -2140,7 +2145,7 @@ switch (step) {
       s.tmp_131.fn = s.tmp_131.arg0.vtable.iface["nearby"];
       if (s.tmp_131.fn == null) { s.retval = s.tmp_131.arg0.fields["nearby"]; }
       else if (!s.tmp_131.fn.isGetter) { s.retval = bind(s.tmp_131); }
-     else { s.callLocIdx = 698; s.pc = 82; return s.tmp_131; }
+     else { s.callLocIdx = 697; s.pc = 82; return s.tmp_131; }
     }
   case 82:
     r0 = s.retval;
@@ -2151,14 +2156,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_133, "type", 2);
     s.tmp_135 = if_faraway_1_mk(s);
     s.tmp_136 = if_filter_1_mk(s);
-    s.tmp_136.arg0 = globals.tid___110372;
+    s.tmp_136.arg0 = globals.tid___85125;
     if (!s.tmp_136.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_136.arg0, "filter");
     } else {
       s.tmp_136.fn = s.tmp_136.arg0.vtable.iface["filter"];
       if (s.tmp_136.fn == null) { s.retval = s.tmp_136.arg0.fields["filter"]; }
       else if (!s.tmp_136.fn.isGetter) { s.retval = bind(s.tmp_136); }
-     else { s.callLocIdx = 705; s.pc = 85; return s.tmp_136; }
+     else { s.callLocIdx = 704; s.pc = 85; return s.tmp_136; }
     }
   case 85:
     r0 = s.retval;
@@ -2169,7 +2174,7 @@ switch (step) {
       s.tmp_135.fn = s.tmp_135.arg0.vtable.iface["faraway"];
       if (s.tmp_135.fn == null) { s.retval = s.tmp_135.arg0.fields["faraway"]; }
       else if (!s.tmp_135.fn.isGetter) { s.retval = bind(s.tmp_135); }
-     else { s.callLocIdx = 706; s.pc = 84; return s.tmp_135; }
+     else { s.callLocIdx = 705; s.pc = 84; return s.tmp_135; }
     }
   case 84:
     r0 = s.retval;
@@ -2188,14 +2193,14 @@ switch (step) {
     s.tmp_139 = r0;
     s.tmp_141 = if_nearby_1_mk(s);
     s.tmp_142 = if_filter_1_mk(s);
-    s.tmp_142.arg0 = globals.tid___110372;
+    s.tmp_142.arg0 = globals.tid___85125;
     if (!s.tmp_142.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_142.arg0, "filter");
     } else {
       s.tmp_142.fn = s.tmp_142.arg0.vtable.iface["filter"];
       if (s.tmp_142.fn == null) { s.retval = s.tmp_142.arg0.fields["filter"]; }
       else if (!s.tmp_142.fn.isGetter) { s.retval = bind(s.tmp_142); }
-     else { s.callLocIdx = 707; s.pc = 87; return s.tmp_142; }
+     else { s.callLocIdx = 706; s.pc = 87; return s.tmp_142; }
     }
   case 87:
     r0 = s.retval;
@@ -2206,7 +2211,7 @@ switch (step) {
       s.tmp_141.fn = s.tmp_141.arg0.vtable.iface["nearby"];
       if (s.tmp_141.fn == null) { s.retval = s.tmp_141.arg0.fields["nearby"]; }
       else if (!s.tmp_141.fn.isGetter) { s.retval = bind(s.tmp_141); }
-     else { s.callLocIdx = 708; s.pc = 86; return s.tmp_141; }
+     else { s.callLocIdx = 707; s.pc = 86; return s.tmp_141; }
     }
   case 86:
     r0 = s.retval;
@@ -2223,14 +2228,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_133, "constraints", s.tmp_138);
     s.tmp_146 = if_faraway_1_mk(s);
     s.tmp_147 = if_filter_1_mk(s);
-    s.tmp_147.arg0 = globals.tid___110372;
+    s.tmp_147.arg0 = globals.tid___85125;
     if (!s.tmp_147.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_147.arg0, "filter");
     } else {
       s.tmp_147.fn = s.tmp_147.arg0.vtable.iface["filter"];
       if (s.tmp_147.fn == null) { s.retval = s.tmp_147.arg0.fields["filter"]; }
       else if (!s.tmp_147.fn.isGetter) { s.retval = bind(s.tmp_147); }
-     else { s.callLocIdx = 703; s.pc = 89; return s.tmp_147; }
+     else { s.callLocIdx = 702; s.pc = 89; return s.tmp_147; }
     }
   case 89:
     r0 = s.retval;
@@ -2241,7 +2246,7 @@ switch (step) {
       s.tmp_146.fn = s.tmp_146.arg0.vtable.iface["faraway"];
       if (s.tmp_146.fn == null) { s.retval = s.tmp_146.arg0.fields["faraway"]; }
       else if (!s.tmp_146.fn.isGetter) { s.retval = bind(s.tmp_146); }
-     else { s.callLocIdx = 704; s.pc = 88; return s.tmp_146; }
+     else { s.callLocIdx = 703; s.pc = 88; return s.tmp_146; }
     }
   case 88:
     r0 = s.retval;
@@ -2252,14 +2257,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_148, "type", 2);
     s.tmp_150 = if_timespan_short_1_mk(s);
     s.tmp_151 = if_filter_1_mk(s);
-    s.tmp_151.arg0 = globals.tid___110372;
+    s.tmp_151.arg0 = globals.tid___85125;
     if (!s.tmp_151.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_151.arg0, "filter");
     } else {
       s.tmp_151.fn = s.tmp_151.arg0.vtable.iface["filter"];
       if (s.tmp_151.fn == null) { s.retval = s.tmp_151.arg0.fields["filter"]; }
       else if (!s.tmp_151.fn.isGetter) { s.retval = bind(s.tmp_151); }
-     else { s.callLocIdx = 711; s.pc = 91; return s.tmp_151; }
+     else { s.callLocIdx = 710; s.pc = 91; return s.tmp_151; }
     }
   case 91:
     r0 = s.retval;
@@ -2270,7 +2275,7 @@ switch (step) {
       s.tmp_150.fn = s.tmp_150.arg0.vtable.iface["timespan_short"];
       if (s.tmp_150.fn == null) { s.retval = s.tmp_150.arg0.fields["timespan_short"]; }
       else if (!s.tmp_150.fn.isGetter) { s.retval = bind(s.tmp_150); }
-     else { s.callLocIdx = 712; s.pc = 90; return s.tmp_150; }
+     else { s.callLocIdx = 711; s.pc = 90; return s.tmp_150; }
     }
   case 90:
     r0 = s.retval;
@@ -2284,14 +2289,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_148, "constraints", s.tmp_152);
     s.tmp_154 = if_timespan_short_1_mk(s);
     s.tmp_155 = if_filter_1_mk(s);
-    s.tmp_155.arg0 = globals.tid___110372;
+    s.tmp_155.arg0 = globals.tid___85125;
     if (!s.tmp_155.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_155.arg0, "filter");
     } else {
       s.tmp_155.fn = s.tmp_155.arg0.vtable.iface["filter"];
       if (s.tmp_155.fn == null) { s.retval = s.tmp_155.arg0.fields["filter"]; }
       else if (!s.tmp_155.fn.isGetter) { s.retval = bind(s.tmp_155); }
-     else { s.callLocIdx = 709; s.pc = 93; return s.tmp_155; }
+     else { s.callLocIdx = 708; s.pc = 93; return s.tmp_155; }
     }
   case 93:
     r0 = s.retval;
@@ -2302,7 +2307,7 @@ switch (step) {
       s.tmp_154.fn = s.tmp_154.arg0.vtable.iface["timespan_short"];
       if (s.tmp_154.fn == null) { s.retval = s.tmp_154.arg0.fields["timespan_short"]; }
       else if (!s.tmp_154.fn.isGetter) { s.retval = bind(s.tmp_154); }
-     else { s.callLocIdx = 710; s.pc = 92; return s.tmp_154; }
+     else { s.callLocIdx = 709; s.pc = 92; return s.tmp_154; }
     }
   case 92:
     r0 = s.retval;
@@ -2313,14 +2318,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_156, "type", 2);
     s.tmp_158 = if_timespan_long_1_mk(s);
     s.tmp_159 = if_filter_1_mk(s);
-    s.tmp_159.arg0 = globals.tid___110372;
+    s.tmp_159.arg0 = globals.tid___85125;
     if (!s.tmp_159.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_159.arg0, "filter");
     } else {
       s.tmp_159.fn = s.tmp_159.arg0.vtable.iface["filter"];
       if (s.tmp_159.fn == null) { s.retval = s.tmp_159.arg0.fields["filter"]; }
       else if (!s.tmp_159.fn.isGetter) { s.retval = bind(s.tmp_159); }
-     else { s.callLocIdx = 715; s.pc = 95; return s.tmp_159; }
+     else { s.callLocIdx = 714; s.pc = 95; return s.tmp_159; }
     }
   case 95:
     r0 = s.retval;
@@ -2331,7 +2336,7 @@ switch (step) {
       s.tmp_158.fn = s.tmp_158.arg0.vtable.iface["timespan_long"];
       if (s.tmp_158.fn == null) { s.retval = s.tmp_158.arg0.fields["timespan_long"]; }
       else if (!s.tmp_158.fn.isGetter) { s.retval = bind(s.tmp_158); }
-     else { s.callLocIdx = 716; s.pc = 94; return s.tmp_158; }
+     else { s.callLocIdx = 715; s.pc = 94; return s.tmp_158; }
     }
   case 94:
     r0 = s.retval;
@@ -2345,14 +2350,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_156, "constraints", s.tmp_160);
     s.tmp_162 = if_timespan_long_1_mk(s);
     s.tmp_163 = if_filter_1_mk(s);
-    s.tmp_163.arg0 = globals.tid___110372;
+    s.tmp_163.arg0 = globals.tid___85125;
     if (!s.tmp_163.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_163.arg0, "filter");
     } else {
       s.tmp_163.fn = s.tmp_163.arg0.vtable.iface["filter"];
       if (s.tmp_163.fn == null) { s.retval = s.tmp_163.arg0.fields["filter"]; }
       else if (!s.tmp_163.fn.isGetter) { s.retval = bind(s.tmp_163); }
-     else { s.callLocIdx = 713; s.pc = 97; return s.tmp_163; }
+     else { s.callLocIdx = 712; s.pc = 97; return s.tmp_163; }
     }
   case 97:
     r0 = s.retval;
@@ -2363,7 +2368,7 @@ switch (step) {
       s.tmp_162.fn = s.tmp_162.arg0.vtable.iface["timespan_long"];
       if (s.tmp_162.fn == null) { s.retval = s.tmp_162.arg0.fields["timespan_long"]; }
       else if (!s.tmp_162.fn.isGetter) { s.retval = bind(s.tmp_162); }
-     else { s.callLocIdx = 714; s.pc = 96; return s.tmp_162; }
+     else { s.callLocIdx = 713; s.pc = 96; return s.tmp_162; }
     }
   case 96:
     r0 = s.retval;
@@ -2374,14 +2379,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_164, "type", 2);
     s.tmp_166 = if_express_none_1_mk(s);
     s.tmp_167 = if_filter_1_mk(s);
-    s.tmp_167.arg0 = globals.tid___110372;
+    s.tmp_167.arg0 = globals.tid___85125;
     if (!s.tmp_167.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_167.arg0, "filter");
     } else {
       s.tmp_167.fn = s.tmp_167.arg0.vtable.iface["filter"];
       if (s.tmp_167.fn == null) { s.retval = s.tmp_167.arg0.fields["filter"]; }
       else if (!s.tmp_167.fn.isGetter) { s.retval = bind(s.tmp_167); }
-     else { s.callLocIdx = 719; s.pc = 99; return s.tmp_167; }
+     else { s.callLocIdx = 718; s.pc = 99; return s.tmp_167; }
     }
   case 99:
     r0 = s.retval;
@@ -2392,7 +2397,7 @@ switch (step) {
       s.tmp_166.fn = s.tmp_166.arg0.vtable.iface["express_none"];
       if (s.tmp_166.fn == null) { s.retval = s.tmp_166.arg0.fields["express_none"]; }
       else if (!s.tmp_166.fn.isGetter) { s.retval = bind(s.tmp_166); }
-     else { s.callLocIdx = 720; s.pc = 98; return s.tmp_166; }
+     else { s.callLocIdx = 719; s.pc = 98; return s.tmp_166; }
     }
   case 98:
     r0 = s.retval;
@@ -2413,14 +2418,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_164, "constraints", s.tmp_170);
     s.tmp_172 = if_express_none_1_mk(s);
     s.tmp_173 = if_filter_1_mk(s);
-    s.tmp_173.arg0 = globals.tid___110372;
+    s.tmp_173.arg0 = globals.tid___85125;
     if (!s.tmp_173.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_173.arg0, "filter");
     } else {
       s.tmp_173.fn = s.tmp_173.arg0.vtable.iface["filter"];
       if (s.tmp_173.fn == null) { s.retval = s.tmp_173.arg0.fields["filter"]; }
       else if (!s.tmp_173.fn.isGetter) { s.retval = bind(s.tmp_173); }
-     else { s.callLocIdx = 717; s.pc = 101; return s.tmp_173; }
+     else { s.callLocIdx = 716; s.pc = 101; return s.tmp_173; }
     }
   case 101:
     r0 = s.retval;
@@ -2431,7 +2436,7 @@ switch (step) {
       s.tmp_172.fn = s.tmp_172.arg0.vtable.iface["express_none"];
       if (s.tmp_172.fn == null) { s.retval = s.tmp_172.arg0.fields["express_none"]; }
       else if (!s.tmp_172.fn.isGetter) { s.retval = bind(s.tmp_172); }
-     else { s.callLocIdx = 718; s.pc = 100; return s.tmp_172; }
+     else { s.callLocIdx = 717; s.pc = 100; return s.tmp_172; }
     }
   case 100:
     r0 = s.retval;
@@ -2442,14 +2447,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_174, "type", 2);
     s.tmp_176 = if_express_happy_1_mk(s);
     s.tmp_177 = if_filter_1_mk(s);
-    s.tmp_177.arg0 = globals.tid___110372;
+    s.tmp_177.arg0 = globals.tid___85125;
     if (!s.tmp_177.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_177.arg0, "filter");
     } else {
       s.tmp_177.fn = s.tmp_177.arg0.vtable.iface["filter"];
       if (s.tmp_177.fn == null) { s.retval = s.tmp_177.arg0.fields["filter"]; }
       else if (!s.tmp_177.fn.isGetter) { s.retval = bind(s.tmp_177); }
-     else { s.callLocIdx = 723; s.pc = 103; return s.tmp_177; }
+     else { s.callLocIdx = 722; s.pc = 103; return s.tmp_177; }
     }
   case 103:
     r0 = s.retval;
@@ -2460,7 +2465,7 @@ switch (step) {
       s.tmp_176.fn = s.tmp_176.arg0.vtable.iface["express_happy"];
       if (s.tmp_176.fn == null) { s.retval = s.tmp_176.arg0.fields["express_happy"]; }
       else if (!s.tmp_176.fn.isGetter) { s.retval = bind(s.tmp_176); }
-     else { s.callLocIdx = 724; s.pc = 102; return s.tmp_176; }
+     else { s.callLocIdx = 723; s.pc = 102; return s.tmp_176; }
     }
   case 102:
     r0 = s.retval;
@@ -2481,14 +2486,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_174, "constraints", s.tmp_180);
     s.tmp_182 = if_express_happy_1_mk(s);
     s.tmp_183 = if_filter_1_mk(s);
-    s.tmp_183.arg0 = globals.tid___110372;
+    s.tmp_183.arg0 = globals.tid___85125;
     if (!s.tmp_183.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_183.arg0, "filter");
     } else {
       s.tmp_183.fn = s.tmp_183.arg0.vtable.iface["filter"];
       if (s.tmp_183.fn == null) { s.retval = s.tmp_183.arg0.fields["filter"]; }
       else if (!s.tmp_183.fn.isGetter) { s.retval = bind(s.tmp_183); }
-     else { s.callLocIdx = 721; s.pc = 105; return s.tmp_183; }
+     else { s.callLocIdx = 720; s.pc = 105; return s.tmp_183; }
     }
   case 105:
     r0 = s.retval;
@@ -2499,7 +2504,7 @@ switch (step) {
       s.tmp_182.fn = s.tmp_182.arg0.vtable.iface["express_happy"];
       if (s.tmp_182.fn == null) { s.retval = s.tmp_182.arg0.fields["express_happy"]; }
       else if (!s.tmp_182.fn.isGetter) { s.retval = bind(s.tmp_182); }
-     else { s.callLocIdx = 722; s.pc = 104; return s.tmp_182; }
+     else { s.callLocIdx = 721; s.pc = 104; return s.tmp_182; }
     }
   case 104:
     r0 = s.retval;
@@ -2510,14 +2515,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_184, "type", 2);
     s.tmp_186 = if_express_angry_1_mk(s);
     s.tmp_187 = if_filter_1_mk(s);
-    s.tmp_187.arg0 = globals.tid___110372;
+    s.tmp_187.arg0 = globals.tid___85125;
     if (!s.tmp_187.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_187.arg0, "filter");
     } else {
       s.tmp_187.fn = s.tmp_187.arg0.vtable.iface["filter"];
       if (s.tmp_187.fn == null) { s.retval = s.tmp_187.arg0.fields["filter"]; }
       else if (!s.tmp_187.fn.isGetter) { s.retval = bind(s.tmp_187); }
-     else { s.callLocIdx = 727; s.pc = 107; return s.tmp_187; }
+     else { s.callLocIdx = 726; s.pc = 107; return s.tmp_187; }
     }
   case 107:
     r0 = s.retval;
@@ -2528,7 +2533,7 @@ switch (step) {
       s.tmp_186.fn = s.tmp_186.arg0.vtable.iface["express_angry"];
       if (s.tmp_186.fn == null) { s.retval = s.tmp_186.arg0.fields["express_angry"]; }
       else if (!s.tmp_186.fn.isGetter) { s.retval = bind(s.tmp_186); }
-     else { s.callLocIdx = 728; s.pc = 106; return s.tmp_186; }
+     else { s.callLocIdx = 727; s.pc = 106; return s.tmp_186; }
     }
   case 106:
     r0 = s.retval;
@@ -2549,14 +2554,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_184, "constraints", s.tmp_190);
     s.tmp_192 = if_express_angry_1_mk(s);
     s.tmp_193 = if_filter_1_mk(s);
-    s.tmp_193.arg0 = globals.tid___110372;
+    s.tmp_193.arg0 = globals.tid___85125;
     if (!s.tmp_193.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_193.arg0, "filter");
     } else {
       s.tmp_193.fn = s.tmp_193.arg0.vtable.iface["filter"];
       if (s.tmp_193.fn == null) { s.retval = s.tmp_193.arg0.fields["filter"]; }
       else if (!s.tmp_193.fn.isGetter) { s.retval = bind(s.tmp_193); }
-     else { s.callLocIdx = 725; s.pc = 109; return s.tmp_193; }
+     else { s.callLocIdx = 724; s.pc = 109; return s.tmp_193; }
     }
   case 109:
     r0 = s.retval;
@@ -2567,7 +2572,7 @@ switch (step) {
       s.tmp_192.fn = s.tmp_192.arg0.vtable.iface["express_angry"];
       if (s.tmp_192.fn == null) { s.retval = s.tmp_192.arg0.fields["express_angry"]; }
       else if (!s.tmp_192.fn.isGetter) { s.retval = bind(s.tmp_192); }
-     else { s.callLocIdx = 726; s.pc = 108; return s.tmp_192; }
+     else { s.callLocIdx = 725; s.pc = 108; return s.tmp_192; }
     }
   case 108:
     r0 = s.retval;
@@ -2578,14 +2583,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_194, "type", 2);
     s.tmp_196 = if_express_heart_1_mk(s);
     s.tmp_197 = if_filter_1_mk(s);
-    s.tmp_197.arg0 = globals.tid___110372;
+    s.tmp_197.arg0 = globals.tid___85125;
     if (!s.tmp_197.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_197.arg0, "filter");
     } else {
       s.tmp_197.fn = s.tmp_197.arg0.vtable.iface["filter"];
       if (s.tmp_197.fn == null) { s.retval = s.tmp_197.arg0.fields["filter"]; }
       else if (!s.tmp_197.fn.isGetter) { s.retval = bind(s.tmp_197); }
-     else { s.callLocIdx = 731; s.pc = 111; return s.tmp_197; }
+     else { s.callLocIdx = 730; s.pc = 111; return s.tmp_197; }
     }
   case 111:
     r0 = s.retval;
@@ -2596,7 +2601,7 @@ switch (step) {
       s.tmp_196.fn = s.tmp_196.arg0.vtable.iface["express_heart"];
       if (s.tmp_196.fn == null) { s.retval = s.tmp_196.arg0.fields["express_heart"]; }
       else if (!s.tmp_196.fn.isGetter) { s.retval = bind(s.tmp_196); }
-     else { s.callLocIdx = 732; s.pc = 110; return s.tmp_196; }
+     else { s.callLocIdx = 731; s.pc = 110; return s.tmp_196; }
     }
   case 110:
     r0 = s.retval;
@@ -2617,14 +2622,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_194, "constraints", s.tmp_200);
     s.tmp_202 = if_express_heart_1_mk(s);
     s.tmp_203 = if_filter_1_mk(s);
-    s.tmp_203.arg0 = globals.tid___110372;
+    s.tmp_203.arg0 = globals.tid___85125;
     if (!s.tmp_203.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_203.arg0, "filter");
     } else {
       s.tmp_203.fn = s.tmp_203.arg0.vtable.iface["filter"];
       if (s.tmp_203.fn == null) { s.retval = s.tmp_203.arg0.fields["filter"]; }
       else if (!s.tmp_203.fn.isGetter) { s.retval = bind(s.tmp_203); }
-     else { s.callLocIdx = 729; s.pc = 113; return s.tmp_203; }
+     else { s.callLocIdx = 728; s.pc = 113; return s.tmp_203; }
     }
   case 113:
     r0 = s.retval;
@@ -2635,7 +2640,7 @@ switch (step) {
       s.tmp_202.fn = s.tmp_202.arg0.vtable.iface["express_heart"];
       if (s.tmp_202.fn == null) { s.retval = s.tmp_202.arg0.fields["express_heart"]; }
       else if (!s.tmp_202.fn.isGetter) { s.retval = bind(s.tmp_202); }
-     else { s.callLocIdx = 730; s.pc = 112; return s.tmp_202; }
+     else { s.callLocIdx = 729; s.pc = 112; return s.tmp_202; }
     }
   case 112:
     r0 = s.retval;
@@ -2646,14 +2651,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_204, "type", 2);
     s.tmp_206 = if_express_sad_1_mk(s);
     s.tmp_207 = if_filter_1_mk(s);
-    s.tmp_207.arg0 = globals.tid___110372;
+    s.tmp_207.arg0 = globals.tid___85125;
     if (!s.tmp_207.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_207.arg0, "filter");
     } else {
       s.tmp_207.fn = s.tmp_207.arg0.vtable.iface["filter"];
       if (s.tmp_207.fn == null) { s.retval = s.tmp_207.arg0.fields["filter"]; }
       else if (!s.tmp_207.fn.isGetter) { s.retval = bind(s.tmp_207); }
-     else { s.callLocIdx = 735; s.pc = 115; return s.tmp_207; }
+     else { s.callLocIdx = 734; s.pc = 115; return s.tmp_207; }
     }
   case 115:
     r0 = s.retval;
@@ -2664,7 +2669,7 @@ switch (step) {
       s.tmp_206.fn = s.tmp_206.arg0.vtable.iface["express_sad"];
       if (s.tmp_206.fn == null) { s.retval = s.tmp_206.arg0.fields["express_sad"]; }
       else if (!s.tmp_206.fn.isGetter) { s.retval = bind(s.tmp_206); }
-     else { s.callLocIdx = 736; s.pc = 114; return s.tmp_206; }
+     else { s.callLocIdx = 735; s.pc = 114; return s.tmp_206; }
     }
   case 114:
     r0 = s.retval;
@@ -2685,14 +2690,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_204, "constraints", s.tmp_210);
     s.tmp_212 = if_express_sad_1_mk(s);
     s.tmp_213 = if_filter_1_mk(s);
-    s.tmp_213.arg0 = globals.tid___110372;
+    s.tmp_213.arg0 = globals.tid___85125;
     if (!s.tmp_213.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_213.arg0, "filter");
     } else {
       s.tmp_213.fn = s.tmp_213.arg0.vtable.iface["filter"];
       if (s.tmp_213.fn == null) { s.retval = s.tmp_213.arg0.fields["filter"]; }
       else if (!s.tmp_213.fn.isGetter) { s.retval = bind(s.tmp_213); }
-     else { s.callLocIdx = 733; s.pc = 117; return s.tmp_213; }
+     else { s.callLocIdx = 732; s.pc = 117; return s.tmp_213; }
     }
   case 117:
     r0 = s.retval;
@@ -2703,7 +2708,7 @@ switch (step) {
       s.tmp_212.fn = s.tmp_212.arg0.vtable.iface["express_sad"];
       if (s.tmp_212.fn == null) { s.retval = s.tmp_212.arg0.fields["express_sad"]; }
       else if (!s.tmp_212.fn.isGetter) { s.retval = bind(s.tmp_212); }
-     else { s.callLocIdx = 734; s.pc = 116; return s.tmp_212; }
+     else { s.callLocIdx = 733; s.pc = 116; return s.tmp_212; }
     }
   case 116:
     r0 = s.retval;
@@ -2715,14 +2720,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_214, "type", 3);
     s.tmp_216 = if_move_1_mk(s);
     s.tmp_217 = if_actuator_1_mk(s);
-    s.tmp_217.arg0 = globals.tid___110372;
+    s.tmp_217.arg0 = globals.tid___85125;
     if (!s.tmp_217.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_217.arg0, "actuator");
     } else {
       s.tmp_217.fn = s.tmp_217.arg0.vtable.iface["actuator"];
       if (s.tmp_217.fn == null) { s.retval = s.tmp_217.arg0.fields["actuator"]; }
       else if (!s.tmp_217.fn.isGetter) { s.retval = bind(s.tmp_217); }
-     else { s.callLocIdx = 739; s.pc = 119; return s.tmp_217; }
+     else { s.callLocIdx = 738; s.pc = 119; return s.tmp_217; }
     }
   case 119:
     r0 = s.retval;
@@ -2733,7 +2738,7 @@ switch (step) {
       s.tmp_216.fn = s.tmp_216.arg0.vtable.iface["move"];
       if (s.tmp_216.fn == null) { s.retval = s.tmp_216.arg0.fields["move"]; }
       else if (!s.tmp_216.fn.isGetter) { s.retval = bind(s.tmp_216); }
-     else { s.callLocIdx = 740; s.pc = 118; return s.tmp_216; }
+     else { s.callLocIdx = 739; s.pc = 118; return s.tmp_216; }
     }
   case 118:
     r0 = s.retval;
@@ -2757,14 +2762,14 @@ switch (step) {
     s.tmp_221 = r0;
     s.tmp_223 = if_move_1_mk(s);
     s.tmp_224 = if_actuator_1_mk(s);
-    s.tmp_224.arg0 = globals.tid___110372;
+    s.tmp_224.arg0 = globals.tid___85125;
     if (!s.tmp_224.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_224.arg0, "actuator");
     } else {
       s.tmp_224.fn = s.tmp_224.arg0.vtable.iface["actuator"];
       if (s.tmp_224.fn == null) { s.retval = s.tmp_224.arg0.fields["actuator"]; }
       else if (!s.tmp_224.fn.isGetter) { s.retval = bind(s.tmp_224); }
-     else { s.callLocIdx = 737; s.pc = 121; return s.tmp_224; }
+     else { s.callLocIdx = 736; s.pc = 121; return s.tmp_224; }
     }
   case 121:
     r0 = s.retval;
@@ -2775,7 +2780,7 @@ switch (step) {
       s.tmp_223.fn = s.tmp_223.arg0.vtable.iface["move"];
       if (s.tmp_223.fn == null) { s.retval = s.tmp_223.arg0.fields["move"]; }
       else if (!s.tmp_223.fn.isGetter) { s.retval = bind(s.tmp_223); }
-     else { s.callLocIdx = 738; s.pc = 120; return s.tmp_223; }
+     else { s.callLocIdx = 737; s.pc = 120; return s.tmp_223; }
     }
   case 120:
     r0 = s.retval;
@@ -2786,14 +2791,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_225, "type", 3);
     s.tmp_227 = if_switch_page_1_mk(s);
     s.tmp_228 = if_actuator_1_mk(s);
-    s.tmp_228.arg0 = globals.tid___110372;
+    s.tmp_228.arg0 = globals.tid___85125;
     if (!s.tmp_228.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_228.arg0, "actuator");
     } else {
       s.tmp_228.fn = s.tmp_228.arg0.vtable.iface["actuator"];
       if (s.tmp_228.fn == null) { s.retval = s.tmp_228.arg0.fields["actuator"]; }
       else if (!s.tmp_228.fn.isGetter) { s.retval = bind(s.tmp_228); }
-     else { s.callLocIdx = 743; s.pc = 123; return s.tmp_228; }
+     else { s.callLocIdx = 742; s.pc = 123; return s.tmp_228; }
     }
   case 123:
     r0 = s.retval;
@@ -2804,7 +2809,7 @@ switch (step) {
       s.tmp_227.fn = s.tmp_227.arg0.vtable.iface["switch_page"];
       if (s.tmp_227.fn == null) { s.retval = s.tmp_227.arg0.fields["switch_page"]; }
       else if (!s.tmp_227.fn.isGetter) { s.retval = bind(s.tmp_227); }
-     else { s.callLocIdx = 744; s.pc = 122; return s.tmp_227; }
+     else { s.callLocIdx = 743; s.pc = 122; return s.tmp_227; }
     }
   case 122:
     r0 = s.retval;
@@ -2823,14 +2828,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_225, "constraints", s.tmp_231);
     s.tmp_233 = if_switch_page_1_mk(s);
     s.tmp_234 = if_actuator_1_mk(s);
-    s.tmp_234.arg0 = globals.tid___110372;
+    s.tmp_234.arg0 = globals.tid___85125;
     if (!s.tmp_234.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_234.arg0, "actuator");
     } else {
       s.tmp_234.fn = s.tmp_234.arg0.vtable.iface["actuator"];
       if (s.tmp_234.fn == null) { s.retval = s.tmp_234.arg0.fields["actuator"]; }
       else if (!s.tmp_234.fn.isGetter) { s.retval = bind(s.tmp_234); }
-     else { s.callLocIdx = 741; s.pc = 125; return s.tmp_234; }
+     else { s.callLocIdx = 740; s.pc = 125; return s.tmp_234; }
     }
   case 125:
     r0 = s.retval;
@@ -2841,7 +2846,7 @@ switch (step) {
       s.tmp_233.fn = s.tmp_233.arg0.vtable.iface["switch_page"];
       if (s.tmp_233.fn == null) { s.retval = s.tmp_233.arg0.fields["switch_page"]; }
       else if (!s.tmp_233.fn.isGetter) { s.retval = bind(s.tmp_233); }
-     else { s.callLocIdx = 742; s.pc = 124; return s.tmp_233; }
+     else { s.callLocIdx = 741; s.pc = 124; return s.tmp_233; }
     }
   case 124:
     r0 = s.retval;
@@ -2852,14 +2857,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_235, "type", 3);
     s.tmp_237 = if_express_1_mk(s);
     s.tmp_238 = if_actuator_1_mk(s);
-    s.tmp_238.arg0 = globals.tid___110372;
+    s.tmp_238.arg0 = globals.tid___85125;
     if (!s.tmp_238.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_238.arg0, "actuator");
     } else {
       s.tmp_238.fn = s.tmp_238.arg0.vtable.iface["actuator"];
       if (s.tmp_238.fn == null) { s.retval = s.tmp_238.arg0.fields["actuator"]; }
       else if (!s.tmp_238.fn.isGetter) { s.retval = bind(s.tmp_238); }
-     else { s.callLocIdx = 747; s.pc = 127; return s.tmp_238; }
+     else { s.callLocIdx = 746; s.pc = 127; return s.tmp_238; }
     }
   case 127:
     r0 = s.retval;
@@ -2870,7 +2875,7 @@ switch (step) {
       s.tmp_237.fn = s.tmp_237.arg0.vtable.iface["express"];
       if (s.tmp_237.fn == null) { s.retval = s.tmp_237.arg0.fields["express"]; }
       else if (!s.tmp_237.fn.isGetter) { s.retval = bind(s.tmp_237); }
-     else { s.callLocIdx = 748; s.pc = 126; return s.tmp_237; }
+     else { s.callLocIdx = 747; s.pc = 126; return s.tmp_237; }
     }
   case 126:
     r0 = s.retval;
@@ -2893,14 +2898,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_235, "constraints", s.tmp_240);
     s.tmp_244 = if_express_1_mk(s);
     s.tmp_245 = if_actuator_1_mk(s);
-    s.tmp_245.arg0 = globals.tid___110372;
+    s.tmp_245.arg0 = globals.tid___85125;
     if (!s.tmp_245.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_245.arg0, "actuator");
     } else {
       s.tmp_245.fn = s.tmp_245.arg0.vtable.iface["actuator"];
       if (s.tmp_245.fn == null) { s.retval = s.tmp_245.arg0.fields["actuator"]; }
       else if (!s.tmp_245.fn.isGetter) { s.retval = bind(s.tmp_245); }
-     else { s.callLocIdx = 745; s.pc = 129; return s.tmp_245; }
+     else { s.callLocIdx = 744; s.pc = 129; return s.tmp_245; }
     }
   case 129:
     r0 = s.retval;
@@ -2911,7 +2916,7 @@ switch (step) {
       s.tmp_244.fn = s.tmp_244.arg0.vtable.iface["express"];
       if (s.tmp_244.fn == null) { s.retval = s.tmp_244.arg0.fields["express"]; }
       else if (!s.tmp_244.fn.isGetter) { s.retval = bind(s.tmp_244); }
-     else { s.callLocIdx = 746; s.pc = 128; return s.tmp_244; }
+     else { s.callLocIdx = 745; s.pc = 128; return s.tmp_244; }
     }
   case 128:
     r0 = s.retval;
@@ -2922,14 +2927,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_246, "type", 3);
     s.tmp_248 = if_boom_1_mk(s);
     s.tmp_249 = if_actuator_1_mk(s);
-    s.tmp_249.arg0 = globals.tid___110372;
+    s.tmp_249.arg0 = globals.tid___85125;
     if (!s.tmp_249.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_249.arg0, "actuator");
     } else {
       s.tmp_249.fn = s.tmp_249.arg0.vtable.iface["actuator"];
       if (s.tmp_249.fn == null) { s.retval = s.tmp_249.arg0.fields["actuator"]; }
       else if (!s.tmp_249.fn.isGetter) { s.retval = bind(s.tmp_249); }
-     else { s.callLocIdx = 751; s.pc = 131; return s.tmp_249; }
+     else { s.callLocIdx = 750; s.pc = 131; return s.tmp_249; }
     }
   case 131:
     r0 = s.retval;
@@ -2940,7 +2945,7 @@ switch (step) {
       s.tmp_248.fn = s.tmp_248.arg0.vtable.iface["boom"];
       if (s.tmp_248.fn == null) { s.retval = s.tmp_248.arg0.fields["boom"]; }
       else if (!s.tmp_248.fn.isGetter) { s.retval = bind(s.tmp_248); }
-     else { s.callLocIdx = 752; s.pc = 130; return s.tmp_248; }
+     else { s.callLocIdx = 751; s.pc = 130; return s.tmp_248; }
     }
   case 130:
     r0 = s.retval;
@@ -2960,14 +2965,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_246, "constraints", s.tmp_252);
     s.tmp_254 = if_boom_1_mk(s);
     s.tmp_255 = if_actuator_1_mk(s);
-    s.tmp_255.arg0 = globals.tid___110372;
+    s.tmp_255.arg0 = globals.tid___85125;
     if (!s.tmp_255.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_255.arg0, "actuator");
     } else {
       s.tmp_255.fn = s.tmp_255.arg0.vtable.iface["actuator"];
       if (s.tmp_255.fn == null) { s.retval = s.tmp_255.arg0.fields["actuator"]; }
       else if (!s.tmp_255.fn.isGetter) { s.retval = bind(s.tmp_255); }
-     else { s.callLocIdx = 749; s.pc = 133; return s.tmp_255; }
+     else { s.callLocIdx = 748; s.pc = 133; return s.tmp_255; }
     }
   case 133:
     r0 = s.retval;
@@ -2978,7 +2983,7 @@ switch (step) {
       s.tmp_254.fn = s.tmp_254.arg0.vtable.iface["boom"];
       if (s.tmp_254.fn == null) { s.retval = s.tmp_254.arg0.fields["boom"]; }
       else if (!s.tmp_254.fn.isGetter) { s.retval = bind(s.tmp_254); }
-     else { s.callLocIdx = 750; s.pc = 132; return s.tmp_254; }
+     else { s.callLocIdx = 749; s.pc = 132; return s.tmp_254; }
     }
   case 132:
     r0 = s.retval;
@@ -2989,14 +2994,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_256, "type", 3);
     s.tmp_258 = if_vanish_1_mk(s);
     s.tmp_259 = if_actuator_1_mk(s);
-    s.tmp_259.arg0 = globals.tid___110372;
+    s.tmp_259.arg0 = globals.tid___85125;
     if (!s.tmp_259.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_259.arg0, "actuator");
     } else {
       s.tmp_259.fn = s.tmp_259.arg0.vtable.iface["actuator"];
       if (s.tmp_259.fn == null) { s.retval = s.tmp_259.arg0.fields["actuator"]; }
       else if (!s.tmp_259.fn.isGetter) { s.retval = bind(s.tmp_259); }
-     else { s.callLocIdx = 755; s.pc = 135; return s.tmp_259; }
+     else { s.callLocIdx = 754; s.pc = 135; return s.tmp_259; }
     }
   case 135:
     r0 = s.retval;
@@ -3007,7 +3012,7 @@ switch (step) {
       s.tmp_258.fn = s.tmp_258.arg0.vtable.iface["vanish"];
       if (s.tmp_258.fn == null) { s.retval = s.tmp_258.arg0.fields["vanish"]; }
       else if (!s.tmp_258.fn.isGetter) { s.retval = bind(s.tmp_258); }
-     else { s.callLocIdx = 756; s.pc = 134; return s.tmp_258; }
+     else { s.callLocIdx = 755; s.pc = 134; return s.tmp_258; }
     }
   case 134:
     r0 = s.retval;
@@ -3026,14 +3031,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_256, "constraints", s.tmp_262);
     s.tmp_264 = if_vanish_1_mk(s);
     s.tmp_265 = if_actuator_1_mk(s);
-    s.tmp_265.arg0 = globals.tid___110372;
+    s.tmp_265.arg0 = globals.tid___85125;
     if (!s.tmp_265.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_265.arg0, "actuator");
     } else {
       s.tmp_265.fn = s.tmp_265.arg0.vtable.iface["actuator"];
       if (s.tmp_265.fn == null) { s.retval = s.tmp_265.arg0.fields["actuator"]; }
       else if (!s.tmp_265.fn.isGetter) { s.retval = bind(s.tmp_265); }
-     else { s.callLocIdx = 753; s.pc = 137; return s.tmp_265; }
+     else { s.callLocIdx = 752; s.pc = 137; return s.tmp_265; }
     }
   case 137:
     r0 = s.retval;
@@ -3044,7 +3049,7 @@ switch (step) {
       s.tmp_264.fn = s.tmp_264.arg0.vtable.iface["vanish"];
       if (s.tmp_264.fn == null) { s.retval = s.tmp_264.arg0.fields["vanish"]; }
       else if (!s.tmp_264.fn.isGetter) { s.retval = bind(s.tmp_264); }
-     else { s.callLocIdx = 754; s.pc = 136; return s.tmp_264; }
+     else { s.callLocIdx = 753; s.pc = 136; return s.tmp_264; }
     }
   case 136:
     r0 = s.retval;
@@ -3055,14 +3060,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_266, "type", 3);
     s.tmp_268 = if_camera_follow_1_mk(s);
     s.tmp_269 = if_actuator_1_mk(s);
-    s.tmp_269.arg0 = globals.tid___110372;
+    s.tmp_269.arg0 = globals.tid___85125;
     if (!s.tmp_269.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_269.arg0, "actuator");
     } else {
       s.tmp_269.fn = s.tmp_269.arg0.vtable.iface["actuator"];
       if (s.tmp_269.fn == null) { s.retval = s.tmp_269.arg0.fields["actuator"]; }
       else if (!s.tmp_269.fn.isGetter) { s.retval = bind(s.tmp_269); }
-     else { s.callLocIdx = 759; s.pc = 139; return s.tmp_269; }
+     else { s.callLocIdx = 758; s.pc = 139; return s.tmp_269; }
     }
   case 139:
     r0 = s.retval;
@@ -3073,7 +3078,7 @@ switch (step) {
       s.tmp_268.fn = s.tmp_268.arg0.vtable.iface["camera_follow"];
       if (s.tmp_268.fn == null) { s.retval = s.tmp_268.arg0.fields["camera_follow"]; }
       else if (!s.tmp_268.fn.isGetter) { s.retval = bind(s.tmp_268); }
-     else { s.callLocIdx = 760; s.pc = 138; return s.tmp_268; }
+     else { s.callLocIdx = 759; s.pc = 138; return s.tmp_268; }
     }
   case 138:
     r0 = s.retval;
@@ -3092,14 +3097,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_266, "constraints", s.tmp_272);
     s.tmp_274 = if_camera_follow_1_mk(s);
     s.tmp_275 = if_actuator_1_mk(s);
-    s.tmp_275.arg0 = globals.tid___110372;
+    s.tmp_275.arg0 = globals.tid___85125;
     if (!s.tmp_275.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_275.arg0, "actuator");
     } else {
       s.tmp_275.fn = s.tmp_275.arg0.vtable.iface["actuator"];
       if (s.tmp_275.fn == null) { s.retval = s.tmp_275.arg0.fields["actuator"]; }
       else if (!s.tmp_275.fn.isGetter) { s.retval = bind(s.tmp_275); }
-     else { s.callLocIdx = 757; s.pc = 141; return s.tmp_275; }
+     else { s.callLocIdx = 756; s.pc = 141; return s.tmp_275; }
     }
   case 141:
     r0 = s.retval;
@@ -3110,7 +3115,7 @@ switch (step) {
       s.tmp_274.fn = s.tmp_274.arg0.vtable.iface["camera_follow"];
       if (s.tmp_274.fn == null) { s.retval = s.tmp_274.arg0.fields["camera_follow"]; }
       else if (!s.tmp_274.fn.isGetter) { s.retval = bind(s.tmp_274); }
-     else { s.callLocIdx = 758; s.pc = 140; return s.tmp_274; }
+     else { s.callLocIdx = 757; s.pc = 140; return s.tmp_274; }
     }
   case 140:
     r0 = s.retval;
@@ -3122,14 +3127,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_276, "type", 4);
     s.tmp_278 = if_me_1_mk(s);
     s.tmp_279 = if_modifier_1_mk(s);
-    s.tmp_279.arg0 = globals.tid___110372;
+    s.tmp_279.arg0 = globals.tid___85125;
     if (!s.tmp_279.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_279.arg0, "modifier");
     } else {
       s.tmp_279.fn = s.tmp_279.arg0.vtable.iface["modifier"];
       if (s.tmp_279.fn == null) { s.retval = s.tmp_279.arg0.fields["modifier"]; }
       else if (!s.tmp_279.fn.isGetter) { s.retval = bind(s.tmp_279); }
-     else { s.callLocIdx = 763; s.pc = 143; return s.tmp_279; }
+     else { s.callLocIdx = 762; s.pc = 143; return s.tmp_279; }
     }
   case 143:
     r0 = s.retval;
@@ -3140,7 +3145,7 @@ switch (step) {
       s.tmp_278.fn = s.tmp_278.arg0.vtable.iface["me"];
       if (s.tmp_278.fn == null) { s.retval = s.tmp_278.arg0.fields["me"]; }
       else if (!s.tmp_278.fn.isGetter) { s.retval = bind(s.tmp_278); }
-     else { s.callLocIdx = 764; s.pc = 142; return s.tmp_278; }
+     else { s.callLocIdx = 763; s.pc = 142; return s.tmp_278; }
     }
   case 142:
     r0 = s.retval;
@@ -3172,14 +3177,14 @@ switch (step) {
     s.tmp_285 = r0;
     s.tmp_287 = if_me_1_mk(s);
     s.tmp_288 = if_modifier_1_mk(s);
-    s.tmp_288.arg0 = globals.tid___110372;
+    s.tmp_288.arg0 = globals.tid___85125;
     if (!s.tmp_288.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_288.arg0, "modifier");
     } else {
       s.tmp_288.fn = s.tmp_288.arg0.vtable.iface["modifier"];
       if (s.tmp_288.fn == null) { s.retval = s.tmp_288.arg0.fields["modifier"]; }
       else if (!s.tmp_288.fn.isGetter) { s.retval = bind(s.tmp_288); }
-     else { s.callLocIdx = 761; s.pc = 145; return s.tmp_288; }
+     else { s.callLocIdx = 760; s.pc = 145; return s.tmp_288; }
     }
   case 145:
     r0 = s.retval;
@@ -3190,7 +3195,7 @@ switch (step) {
       s.tmp_287.fn = s.tmp_287.arg0.vtable.iface["me"];
       if (s.tmp_287.fn == null) { s.retval = s.tmp_287.arg0.fields["me"]; }
       else if (!s.tmp_287.fn.isGetter) { s.retval = bind(s.tmp_287); }
-     else { s.callLocIdx = 762; s.pc = 144; return s.tmp_287; }
+     else { s.callLocIdx = 761; s.pc = 144; return s.tmp_287; }
     }
   case 144:
     r0 = s.retval;
@@ -3201,14 +3206,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_289, "type", 4);
     s.tmp_291 = if_it_1_mk(s);
     s.tmp_292 = if_modifier_1_mk(s);
-    s.tmp_292.arg0 = globals.tid___110372;
+    s.tmp_292.arg0 = globals.tid___85125;
     if (!s.tmp_292.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_292.arg0, "modifier");
     } else {
       s.tmp_292.fn = s.tmp_292.arg0.vtable.iface["modifier"];
       if (s.tmp_292.fn == null) { s.retval = s.tmp_292.arg0.fields["modifier"]; }
       else if (!s.tmp_292.fn.isGetter) { s.retval = bind(s.tmp_292); }
-     else { s.callLocIdx = 767; s.pc = 147; return s.tmp_292; }
+     else { s.callLocIdx = 766; s.pc = 147; return s.tmp_292; }
     }
   case 147:
     r0 = s.retval;
@@ -3219,7 +3224,7 @@ switch (step) {
       s.tmp_291.fn = s.tmp_291.arg0.vtable.iface["it"];
       if (s.tmp_291.fn == null) { s.retval = s.tmp_291.arg0.fields["it"]; }
       else if (!s.tmp_291.fn.isGetter) { s.retval = bind(s.tmp_291); }
-     else { s.callLocIdx = 768; s.pc = 146; return s.tmp_291; }
+     else { s.callLocIdx = 767; s.pc = 146; return s.tmp_291; }
     }
   case 146:
     r0 = s.retval;
@@ -3249,14 +3254,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_289, "constraints", s.tmp_294);
     s.tmp_299 = if_it_1_mk(s);
     s.tmp_300 = if_modifier_1_mk(s);
-    s.tmp_300.arg0 = globals.tid___110372;
+    s.tmp_300.arg0 = globals.tid___85125;
     if (!s.tmp_300.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_300.arg0, "modifier");
     } else {
       s.tmp_300.fn = s.tmp_300.arg0.vtable.iface["modifier"];
       if (s.tmp_300.fn == null) { s.retval = s.tmp_300.arg0.fields["modifier"]; }
       else if (!s.tmp_300.fn.isGetter) { s.retval = bind(s.tmp_300); }
-     else { s.callLocIdx = 765; s.pc = 149; return s.tmp_300; }
+     else { s.callLocIdx = 764; s.pc = 149; return s.tmp_300; }
     }
   case 149:
     r0 = s.retval;
@@ -3267,7 +3272,7 @@ switch (step) {
       s.tmp_299.fn = s.tmp_299.arg0.vtable.iface["it"];
       if (s.tmp_299.fn == null) { s.retval = s.tmp_299.arg0.fields["it"]; }
       else if (!s.tmp_299.fn.isGetter) { s.retval = bind(s.tmp_299); }
-     else { s.callLocIdx = 766; s.pc = 148; return s.tmp_299; }
+     else { s.callLocIdx = 765; s.pc = 148; return s.tmp_299; }
     }
   case 148:
     r0 = s.retval;
@@ -3278,14 +3283,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_301, "type", 4);
     s.tmp_303 = if_kodu_1_mk(s);
     s.tmp_304 = if_modifier_1_mk(s);
-    s.tmp_304.arg0 = globals.tid___110372;
+    s.tmp_304.arg0 = globals.tid___85125;
     if (!s.tmp_304.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_304.arg0, "modifier");
     } else {
       s.tmp_304.fn = s.tmp_304.arg0.vtable.iface["modifier"];
       if (s.tmp_304.fn == null) { s.retval = s.tmp_304.arg0.fields["modifier"]; }
       else if (!s.tmp_304.fn.isGetter) { s.retval = bind(s.tmp_304); }
-     else { s.callLocIdx = 771; s.pc = 151; return s.tmp_304; }
+     else { s.callLocIdx = 770; s.pc = 151; return s.tmp_304; }
     }
   case 151:
     r0 = s.retval;
@@ -3296,7 +3301,7 @@ switch (step) {
       s.tmp_303.fn = s.tmp_303.arg0.vtable.iface["kodu"];
       if (s.tmp_303.fn == null) { s.retval = s.tmp_303.arg0.fields["kodu"]; }
       else if (!s.tmp_303.fn.isGetter) { s.retval = bind(s.tmp_303); }
-     else { s.callLocIdx = 772; s.pc = 150; return s.tmp_303; }
+     else { s.callLocIdx = 771; s.pc = 150; return s.tmp_303; }
     }
   case 150:
     r0 = s.retval;
@@ -3318,14 +3323,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_301, "constraints", s.tmp_307);
     s.tmp_309 = if_kodu_1_mk(s);
     s.tmp_310 = if_modifier_1_mk(s);
-    s.tmp_310.arg0 = globals.tid___110372;
+    s.tmp_310.arg0 = globals.tid___85125;
     if (!s.tmp_310.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_310.arg0, "modifier");
     } else {
       s.tmp_310.fn = s.tmp_310.arg0.vtable.iface["modifier"];
       if (s.tmp_310.fn == null) { s.retval = s.tmp_310.arg0.fields["modifier"]; }
       else if (!s.tmp_310.fn.isGetter) { s.retval = bind(s.tmp_310); }
-     else { s.callLocIdx = 769; s.pc = 153; return s.tmp_310; }
+     else { s.callLocIdx = 768; s.pc = 153; return s.tmp_310; }
     }
   case 153:
     r0 = s.retval;
@@ -3336,7 +3341,7 @@ switch (step) {
       s.tmp_309.fn = s.tmp_309.arg0.vtable.iface["kodu"];
       if (s.tmp_309.fn == null) { s.retval = s.tmp_309.arg0.fields["kodu"]; }
       else if (!s.tmp_309.fn.isGetter) { s.retval = bind(s.tmp_309); }
-     else { s.callLocIdx = 770; s.pc = 152; return s.tmp_309; }
+     else { s.callLocIdx = 769; s.pc = 152; return s.tmp_309; }
     }
   case 152:
     r0 = s.retval;
@@ -3347,14 +3352,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_311, "type", 4);
     s.tmp_313 = if_tree_1_mk(s);
     s.tmp_314 = if_modifier_1_mk(s);
-    s.tmp_314.arg0 = globals.tid___110372;
+    s.tmp_314.arg0 = globals.tid___85125;
     if (!s.tmp_314.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_314.arg0, "modifier");
     } else {
       s.tmp_314.fn = s.tmp_314.arg0.vtable.iface["modifier"];
       if (s.tmp_314.fn == null) { s.retval = s.tmp_314.arg0.fields["modifier"]; }
       else if (!s.tmp_314.fn.isGetter) { s.retval = bind(s.tmp_314); }
-     else { s.callLocIdx = 775; s.pc = 155; return s.tmp_314; }
+     else { s.callLocIdx = 774; s.pc = 155; return s.tmp_314; }
     }
   case 155:
     r0 = s.retval;
@@ -3365,7 +3370,7 @@ switch (step) {
       s.tmp_313.fn = s.tmp_313.arg0.vtable.iface["tree"];
       if (s.tmp_313.fn == null) { s.retval = s.tmp_313.arg0.fields["tree"]; }
       else if (!s.tmp_313.fn.isGetter) { s.retval = bind(s.tmp_313); }
-     else { s.callLocIdx = 776; s.pc = 154; return s.tmp_313; }
+     else { s.callLocIdx = 775; s.pc = 154; return s.tmp_313; }
     }
   case 154:
     r0 = s.retval;
@@ -3387,14 +3392,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_311, "constraints", s.tmp_317);
     s.tmp_319 = if_tree_1_mk(s);
     s.tmp_320 = if_modifier_1_mk(s);
-    s.tmp_320.arg0 = globals.tid___110372;
+    s.tmp_320.arg0 = globals.tid___85125;
     if (!s.tmp_320.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_320.arg0, "modifier");
     } else {
       s.tmp_320.fn = s.tmp_320.arg0.vtable.iface["modifier"];
       if (s.tmp_320.fn == null) { s.retval = s.tmp_320.arg0.fields["modifier"]; }
       else if (!s.tmp_320.fn.isGetter) { s.retval = bind(s.tmp_320); }
-     else { s.callLocIdx = 773; s.pc = 157; return s.tmp_320; }
+     else { s.callLocIdx = 772; s.pc = 157; return s.tmp_320; }
     }
   case 157:
     r0 = s.retval;
@@ -3405,7 +3410,7 @@ switch (step) {
       s.tmp_319.fn = s.tmp_319.arg0.vtable.iface["tree"];
       if (s.tmp_319.fn == null) { s.retval = s.tmp_319.arg0.fields["tree"]; }
       else if (!s.tmp_319.fn.isGetter) { s.retval = bind(s.tmp_319); }
-     else { s.callLocIdx = 774; s.pc = 156; return s.tmp_319; }
+     else { s.callLocIdx = 773; s.pc = 156; return s.tmp_319; }
     }
   case 156:
     r0 = s.retval;
@@ -3416,14 +3421,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_321, "type", 4);
     s.tmp_323 = if_apple_1_mk(s);
     s.tmp_324 = if_modifier_1_mk(s);
-    s.tmp_324.arg0 = globals.tid___110372;
+    s.tmp_324.arg0 = globals.tid___85125;
     if (!s.tmp_324.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_324.arg0, "modifier");
     } else {
       s.tmp_324.fn = s.tmp_324.arg0.vtable.iface["modifier"];
       if (s.tmp_324.fn == null) { s.retval = s.tmp_324.arg0.fields["modifier"]; }
       else if (!s.tmp_324.fn.isGetter) { s.retval = bind(s.tmp_324); }
-     else { s.callLocIdx = 779; s.pc = 159; return s.tmp_324; }
+     else { s.callLocIdx = 778; s.pc = 159; return s.tmp_324; }
     }
   case 159:
     r0 = s.retval;
@@ -3434,7 +3439,7 @@ switch (step) {
       s.tmp_323.fn = s.tmp_323.arg0.vtable.iface["apple"];
       if (s.tmp_323.fn == null) { s.retval = s.tmp_323.arg0.fields["apple"]; }
       else if (!s.tmp_323.fn.isGetter) { s.retval = bind(s.tmp_323); }
-     else { s.callLocIdx = 780; s.pc = 158; return s.tmp_323; }
+     else { s.callLocIdx = 779; s.pc = 158; return s.tmp_323; }
     }
   case 158:
     r0 = s.retval;
@@ -3456,14 +3461,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_321, "constraints", s.tmp_327);
     s.tmp_329 = if_apple_1_mk(s);
     s.tmp_330 = if_modifier_1_mk(s);
-    s.tmp_330.arg0 = globals.tid___110372;
+    s.tmp_330.arg0 = globals.tid___85125;
     if (!s.tmp_330.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_330.arg0, "modifier");
     } else {
       s.tmp_330.fn = s.tmp_330.arg0.vtable.iface["modifier"];
       if (s.tmp_330.fn == null) { s.retval = s.tmp_330.arg0.fields["modifier"]; }
       else if (!s.tmp_330.fn.isGetter) { s.retval = bind(s.tmp_330); }
-     else { s.callLocIdx = 777; s.pc = 161; return s.tmp_330; }
+     else { s.callLocIdx = 776; s.pc = 161; return s.tmp_330; }
     }
   case 161:
     r0 = s.retval;
@@ -3474,7 +3479,7 @@ switch (step) {
       s.tmp_329.fn = s.tmp_329.arg0.vtable.iface["apple"];
       if (s.tmp_329.fn == null) { s.retval = s.tmp_329.arg0.fields["apple"]; }
       else if (!s.tmp_329.fn.isGetter) { s.retval = bind(s.tmp_329); }
-     else { s.callLocIdx = 778; s.pc = 160; return s.tmp_329; }
+     else { s.callLocIdx = 777; s.pc = 160; return s.tmp_329; }
     }
   case 160:
     r0 = s.retval;
@@ -3485,14 +3490,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_331, "type", 4);
     s.tmp_333 = if_quickly_1_mk(s);
     s.tmp_334 = if_modifier_1_mk(s);
-    s.tmp_334.arg0 = globals.tid___110372;
+    s.tmp_334.arg0 = globals.tid___85125;
     if (!s.tmp_334.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_334.arg0, "modifier");
     } else {
       s.tmp_334.fn = s.tmp_334.arg0.vtable.iface["modifier"];
       if (s.tmp_334.fn == null) { s.retval = s.tmp_334.arg0.fields["modifier"]; }
       else if (!s.tmp_334.fn.isGetter) { s.retval = bind(s.tmp_334); }
-     else { s.callLocIdx = 783; s.pc = 163; return s.tmp_334; }
+     else { s.callLocIdx = 782; s.pc = 163; return s.tmp_334; }
     }
   case 163:
     r0 = s.retval;
@@ -3503,7 +3508,7 @@ switch (step) {
       s.tmp_333.fn = s.tmp_333.arg0.vtable.iface["quickly"];
       if (s.tmp_333.fn == null) { s.retval = s.tmp_333.arg0.fields["quickly"]; }
       else if (!s.tmp_333.fn.isGetter) { s.retval = bind(s.tmp_333); }
-     else { s.callLocIdx = 784; s.pc = 162; return s.tmp_333; }
+     else { s.callLocIdx = 783; s.pc = 162; return s.tmp_333; }
     }
   case 162:
     r0 = s.retval;
@@ -3516,14 +3521,14 @@ switch (step) {
     s.tmp_335 = r0;
     s.tmp_337 = if_slowly_1_mk(s);
     s.tmp_338 = if_modifier_1_mk(s);
-    s.tmp_338.arg0 = globals.tid___110372;
+    s.tmp_338.arg0 = globals.tid___85125;
     if (!s.tmp_338.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_338.arg0, "modifier");
     } else {
       s.tmp_338.fn = s.tmp_338.arg0.vtable.iface["modifier"];
       if (s.tmp_338.fn == null) { s.retval = s.tmp_338.arg0.fields["modifier"]; }
       else if (!s.tmp_338.fn.isGetter) { s.retval = bind(s.tmp_338); }
-     else { s.callLocIdx = 785; s.pc = 165; return s.tmp_338; }
+     else { s.callLocIdx = 784; s.pc = 165; return s.tmp_338; }
     }
   case 165:
     r0 = s.retval;
@@ -3534,7 +3539,7 @@ switch (step) {
       s.tmp_337.fn = s.tmp_337.arg0.vtable.iface["slowly"];
       if (s.tmp_337.fn == null) { s.retval = s.tmp_337.arg0.fields["slowly"]; }
       else if (!s.tmp_337.fn.isGetter) { s.retval = bind(s.tmp_337); }
-     else { s.callLocIdx = 786; s.pc = 164; return s.tmp_337; }
+     else { s.callLocIdx = 785; s.pc = 164; return s.tmp_337; }
     }
   case 164:
     r0 = s.retval;
@@ -3553,14 +3558,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_331, "constraints", s.tmp_340);
     s.tmp_343 = if_quickly_1_mk(s);
     s.tmp_344 = if_modifier_1_mk(s);
-    s.tmp_344.arg0 = globals.tid___110372;
+    s.tmp_344.arg0 = globals.tid___85125;
     if (!s.tmp_344.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_344.arg0, "modifier");
     } else {
       s.tmp_344.fn = s.tmp_344.arg0.vtable.iface["modifier"];
       if (s.tmp_344.fn == null) { s.retval = s.tmp_344.arg0.fields["modifier"]; }
       else if (!s.tmp_344.fn.isGetter) { s.retval = bind(s.tmp_344); }
-     else { s.callLocIdx = 781; s.pc = 167; return s.tmp_344; }
+     else { s.callLocIdx = 780; s.pc = 167; return s.tmp_344; }
     }
   case 167:
     r0 = s.retval;
@@ -3571,7 +3576,7 @@ switch (step) {
       s.tmp_343.fn = s.tmp_343.arg0.vtable.iface["quickly"];
       if (s.tmp_343.fn == null) { s.retval = s.tmp_343.arg0.fields["quickly"]; }
       else if (!s.tmp_343.fn.isGetter) { s.retval = bind(s.tmp_343); }
-     else { s.callLocIdx = 782; s.pc = 166; return s.tmp_343; }
+     else { s.callLocIdx = 781; s.pc = 166; return s.tmp_343; }
     }
   case 166:
     r0 = s.retval;
@@ -3582,14 +3587,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_345, "type", 4);
     s.tmp_347 = if_slowly_1_mk(s);
     s.tmp_348 = if_modifier_1_mk(s);
-    s.tmp_348.arg0 = globals.tid___110372;
+    s.tmp_348.arg0 = globals.tid___85125;
     if (!s.tmp_348.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_348.arg0, "modifier");
     } else {
       s.tmp_348.fn = s.tmp_348.arg0.vtable.iface["modifier"];
       if (s.tmp_348.fn == null) { s.retval = s.tmp_348.arg0.fields["modifier"]; }
       else if (!s.tmp_348.fn.isGetter) { s.retval = bind(s.tmp_348); }
-     else { s.callLocIdx = 789; s.pc = 169; return s.tmp_348; }
+     else { s.callLocIdx = 788; s.pc = 169; return s.tmp_348; }
     }
   case 169:
     r0 = s.retval;
@@ -3600,7 +3605,7 @@ switch (step) {
       s.tmp_347.fn = s.tmp_347.arg0.vtable.iface["slowly"];
       if (s.tmp_347.fn == null) { s.retval = s.tmp_347.arg0.fields["slowly"]; }
       else if (!s.tmp_347.fn.isGetter) { s.retval = bind(s.tmp_347); }
-     else { s.callLocIdx = 790; s.pc = 168; return s.tmp_347; }
+     else { s.callLocIdx = 789; s.pc = 168; return s.tmp_347; }
     }
   case 168:
     r0 = s.retval;
@@ -3613,14 +3618,14 @@ switch (step) {
     s.tmp_349 = r0;
     s.tmp_351 = if_quickly_1_mk(s);
     s.tmp_352 = if_modifier_1_mk(s);
-    s.tmp_352.arg0 = globals.tid___110372;
+    s.tmp_352.arg0 = globals.tid___85125;
     if (!s.tmp_352.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_352.arg0, "modifier");
     } else {
       s.tmp_352.fn = s.tmp_352.arg0.vtable.iface["modifier"];
       if (s.tmp_352.fn == null) { s.retval = s.tmp_352.arg0.fields["modifier"]; }
       else if (!s.tmp_352.fn.isGetter) { s.retval = bind(s.tmp_352); }
-     else { s.callLocIdx = 791; s.pc = 171; return s.tmp_352; }
+     else { s.callLocIdx = 790; s.pc = 171; return s.tmp_352; }
     }
   case 171:
     r0 = s.retval;
@@ -3631,7 +3636,7 @@ switch (step) {
       s.tmp_351.fn = s.tmp_351.arg0.vtable.iface["quickly"];
       if (s.tmp_351.fn == null) { s.retval = s.tmp_351.arg0.fields["quickly"]; }
       else if (!s.tmp_351.fn.isGetter) { s.retval = bind(s.tmp_351); }
-     else { s.callLocIdx = 792; s.pc = 170; return s.tmp_351; }
+     else { s.callLocIdx = 791; s.pc = 170; return s.tmp_351; }
     }
   case 170:
     r0 = s.retval;
@@ -3650,14 +3655,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_345, "constraints", s.tmp_354);
     s.tmp_357 = if_slowly_1_mk(s);
     s.tmp_358 = if_modifier_1_mk(s);
-    s.tmp_358.arg0 = globals.tid___110372;
+    s.tmp_358.arg0 = globals.tid___85125;
     if (!s.tmp_358.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_358.arg0, "modifier");
     } else {
       s.tmp_358.fn = s.tmp_358.arg0.vtable.iface["modifier"];
       if (s.tmp_358.fn == null) { s.retval = s.tmp_358.arg0.fields["modifier"]; }
       else if (!s.tmp_358.fn.isGetter) { s.retval = bind(s.tmp_358); }
-     else { s.callLocIdx = 787; s.pc = 173; return s.tmp_358; }
+     else { s.callLocIdx = 786; s.pc = 173; return s.tmp_358; }
     }
   case 173:
     r0 = s.retval;
@@ -3668,7 +3673,7 @@ switch (step) {
       s.tmp_357.fn = s.tmp_357.arg0.vtable.iface["slowly"];
       if (s.tmp_357.fn == null) { s.retval = s.tmp_357.arg0.fields["slowly"]; }
       else if (!s.tmp_357.fn.isGetter) { s.retval = bind(s.tmp_357); }
-     else { s.callLocIdx = 788; s.pc = 172; return s.tmp_357; }
+     else { s.callLocIdx = 787; s.pc = 172; return s.tmp_357; }
     }
   case 172:
     r0 = s.retval;
@@ -3679,14 +3684,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_359, "type", 4);
     s.tmp_361 = if_toward_1_mk(s);
     s.tmp_362 = if_modifier_1_mk(s);
-    s.tmp_362.arg0 = globals.tid___110372;
+    s.tmp_362.arg0 = globals.tid___85125;
     if (!s.tmp_362.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_362.arg0, "modifier");
     } else {
       s.tmp_362.fn = s.tmp_362.arg0.vtable.iface["modifier"];
       if (s.tmp_362.fn == null) { s.retval = s.tmp_362.arg0.fields["modifier"]; }
       else if (!s.tmp_362.fn.isGetter) { s.retval = bind(s.tmp_362); }
-     else { s.callLocIdx = 795; s.pc = 175; return s.tmp_362; }
+     else { s.callLocIdx = 794; s.pc = 175; return s.tmp_362; }
     }
   case 175:
     r0 = s.retval;
@@ -3697,7 +3702,7 @@ switch (step) {
       s.tmp_361.fn = s.tmp_361.arg0.vtable.iface["toward"];
       if (s.tmp_361.fn == null) { s.retval = s.tmp_361.arg0.fields["toward"]; }
       else if (!s.tmp_361.fn.isGetter) { s.retval = bind(s.tmp_361); }
-     else { s.callLocIdx = 796; s.pc = 174; return s.tmp_361; }
+     else { s.callLocIdx = 795; s.pc = 174; return s.tmp_361; }
     }
   case 174:
     r0 = s.retval;
@@ -3716,14 +3721,14 @@ switch (step) {
     s.tmp_365 = r0;
     s.tmp_367 = if_me_1_mk(s);
     s.tmp_368 = if_modifier_1_mk(s);
-    s.tmp_368.arg0 = globals.tid___110372;
+    s.tmp_368.arg0 = globals.tid___85125;
     if (!s.tmp_368.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_368.arg0, "modifier");
     } else {
       s.tmp_368.fn = s.tmp_368.arg0.vtable.iface["modifier"];
       if (s.tmp_368.fn == null) { s.retval = s.tmp_368.arg0.fields["modifier"]; }
       else if (!s.tmp_368.fn.isGetter) { s.retval = bind(s.tmp_368); }
-     else { s.callLocIdx = 797; s.pc = 177; return s.tmp_368; }
+     else { s.callLocIdx = 796; s.pc = 177; return s.tmp_368; }
     }
   case 177:
     r0 = s.retval;
@@ -3734,7 +3739,7 @@ switch (step) {
       s.tmp_367.fn = s.tmp_367.arg0.vtable.iface["me"];
       if (s.tmp_367.fn == null) { s.retval = s.tmp_367.arg0.fields["me"]; }
       else if (!s.tmp_367.fn.isGetter) { s.retval = bind(s.tmp_367); }
-     else { s.callLocIdx = 798; s.pc = 176; return s.tmp_367; }
+     else { s.callLocIdx = 797; s.pc = 176; return s.tmp_367; }
     }
   case 176:
     r0 = s.retval;
@@ -3751,14 +3756,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_359, "constraints", s.tmp_364);
     s.tmp_372 = if_toward_1_mk(s);
     s.tmp_373 = if_modifier_1_mk(s);
-    s.tmp_373.arg0 = globals.tid___110372;
+    s.tmp_373.arg0 = globals.tid___85125;
     if (!s.tmp_373.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_373.arg0, "modifier");
     } else {
       s.tmp_373.fn = s.tmp_373.arg0.vtable.iface["modifier"];
       if (s.tmp_373.fn == null) { s.retval = s.tmp_373.arg0.fields["modifier"]; }
       else if (!s.tmp_373.fn.isGetter) { s.retval = bind(s.tmp_373); }
-     else { s.callLocIdx = 793; s.pc = 179; return s.tmp_373; }
+     else { s.callLocIdx = 792; s.pc = 179; return s.tmp_373; }
     }
   case 179:
     r0 = s.retval;
@@ -3769,7 +3774,7 @@ switch (step) {
       s.tmp_372.fn = s.tmp_372.arg0.vtable.iface["toward"];
       if (s.tmp_372.fn == null) { s.retval = s.tmp_372.arg0.fields["toward"]; }
       else if (!s.tmp_372.fn.isGetter) { s.retval = bind(s.tmp_372); }
-     else { s.callLocIdx = 794; s.pc = 178; return s.tmp_372; }
+     else { s.callLocIdx = 793; s.pc = 178; return s.tmp_372; }
     }
   case 178:
     r0 = s.retval;
@@ -3780,14 +3785,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_374, "type", 4);
     s.tmp_376 = if_away_1_mk(s);
     s.tmp_377 = if_modifier_1_mk(s);
-    s.tmp_377.arg0 = globals.tid___110372;
+    s.tmp_377.arg0 = globals.tid___85125;
     if (!s.tmp_377.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_377.arg0, "modifier");
     } else {
       s.tmp_377.fn = s.tmp_377.arg0.vtable.iface["modifier"];
       if (s.tmp_377.fn == null) { s.retval = s.tmp_377.arg0.fields["modifier"]; }
       else if (!s.tmp_377.fn.isGetter) { s.retval = bind(s.tmp_377); }
-     else { s.callLocIdx = 801; s.pc = 181; return s.tmp_377; }
+     else { s.callLocIdx = 800; s.pc = 181; return s.tmp_377; }
     }
   case 181:
     r0 = s.retval;
@@ -3798,7 +3803,7 @@ switch (step) {
       s.tmp_376.fn = s.tmp_376.arg0.vtable.iface["away"];
       if (s.tmp_376.fn == null) { s.retval = s.tmp_376.arg0.fields["away"]; }
       else if (!s.tmp_376.fn.isGetter) { s.retval = bind(s.tmp_376); }
-     else { s.callLocIdx = 802; s.pc = 180; return s.tmp_376; }
+     else { s.callLocIdx = 801; s.pc = 180; return s.tmp_376; }
     }
   case 180:
     r0 = s.retval;
@@ -3817,14 +3822,14 @@ switch (step) {
     s.tmp_380 = r0;
     s.tmp_382 = if_me_1_mk(s);
     s.tmp_383 = if_modifier_1_mk(s);
-    s.tmp_383.arg0 = globals.tid___110372;
+    s.tmp_383.arg0 = globals.tid___85125;
     if (!s.tmp_383.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_383.arg0, "modifier");
     } else {
       s.tmp_383.fn = s.tmp_383.arg0.vtable.iface["modifier"];
       if (s.tmp_383.fn == null) { s.retval = s.tmp_383.arg0.fields["modifier"]; }
       else if (!s.tmp_383.fn.isGetter) { s.retval = bind(s.tmp_383); }
-     else { s.callLocIdx = 803; s.pc = 183; return s.tmp_383; }
+     else { s.callLocIdx = 802; s.pc = 183; return s.tmp_383; }
     }
   case 183:
     r0 = s.retval;
@@ -3835,7 +3840,7 @@ switch (step) {
       s.tmp_382.fn = s.tmp_382.arg0.vtable.iface["me"];
       if (s.tmp_382.fn == null) { s.retval = s.tmp_382.arg0.fields["me"]; }
       else if (!s.tmp_382.fn.isGetter) { s.retval = bind(s.tmp_382); }
-     else { s.callLocIdx = 804; s.pc = 182; return s.tmp_382; }
+     else { s.callLocIdx = 803; s.pc = 182; return s.tmp_382; }
     }
   case 182:
     r0 = s.retval;
@@ -3852,14 +3857,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_374, "constraints", s.tmp_379);
     s.tmp_387 = if_away_1_mk(s);
     s.tmp_388 = if_modifier_1_mk(s);
-    s.tmp_388.arg0 = globals.tid___110372;
+    s.tmp_388.arg0 = globals.tid___85125;
     if (!s.tmp_388.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_388.arg0, "modifier");
     } else {
       s.tmp_388.fn = s.tmp_388.arg0.vtable.iface["modifier"];
       if (s.tmp_388.fn == null) { s.retval = s.tmp_388.arg0.fields["modifier"]; }
       else if (!s.tmp_388.fn.isGetter) { s.retval = bind(s.tmp_388); }
-     else { s.callLocIdx = 799; s.pc = 185; return s.tmp_388; }
+     else { s.callLocIdx = 798; s.pc = 185; return s.tmp_388; }
     }
   case 185:
     r0 = s.retval;
@@ -3870,7 +3875,7 @@ switch (step) {
       s.tmp_387.fn = s.tmp_387.arg0.vtable.iface["away"];
       if (s.tmp_387.fn == null) { s.retval = s.tmp_387.arg0.fields["away"]; }
       else if (!s.tmp_387.fn.isGetter) { s.retval = bind(s.tmp_387); }
-     else { s.callLocIdx = 800; s.pc = 184; return s.tmp_387; }
+     else { s.callLocIdx = 799; s.pc = 184; return s.tmp_387; }
     }
   case 184:
     r0 = s.retval;
@@ -3881,14 +3886,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_389, "type", 4);
     s.tmp_391 = if_avoid_1_mk(s);
     s.tmp_392 = if_modifier_1_mk(s);
-    s.tmp_392.arg0 = globals.tid___110372;
+    s.tmp_392.arg0 = globals.tid___85125;
     if (!s.tmp_392.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_392.arg0, "modifier");
     } else {
       s.tmp_392.fn = s.tmp_392.arg0.vtable.iface["modifier"];
       if (s.tmp_392.fn == null) { s.retval = s.tmp_392.arg0.fields["modifier"]; }
       else if (!s.tmp_392.fn.isGetter) { s.retval = bind(s.tmp_392); }
-     else { s.callLocIdx = 807; s.pc = 187; return s.tmp_392; }
+     else { s.callLocIdx = 806; s.pc = 187; return s.tmp_392; }
     }
   case 187:
     r0 = s.retval;
@@ -3899,7 +3904,7 @@ switch (step) {
       s.tmp_391.fn = s.tmp_391.arg0.vtable.iface["avoid"];
       if (s.tmp_391.fn == null) { s.retval = s.tmp_391.arg0.fields["avoid"]; }
       else if (!s.tmp_391.fn.isGetter) { s.retval = bind(s.tmp_391); }
-     else { s.callLocIdx = 808; s.pc = 186; return s.tmp_391; }
+     else { s.callLocIdx = 807; s.pc = 186; return s.tmp_391; }
     }
   case 186:
     r0 = s.retval;
@@ -3918,14 +3923,14 @@ switch (step) {
     s.tmp_395 = r0;
     s.tmp_397 = if_me_1_mk(s);
     s.tmp_398 = if_modifier_1_mk(s);
-    s.tmp_398.arg0 = globals.tid___110372;
+    s.tmp_398.arg0 = globals.tid___85125;
     if (!s.tmp_398.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_398.arg0, "modifier");
     } else {
       s.tmp_398.fn = s.tmp_398.arg0.vtable.iface["modifier"];
       if (s.tmp_398.fn == null) { s.retval = s.tmp_398.arg0.fields["modifier"]; }
       else if (!s.tmp_398.fn.isGetter) { s.retval = bind(s.tmp_398); }
-     else { s.callLocIdx = 809; s.pc = 189; return s.tmp_398; }
+     else { s.callLocIdx = 808; s.pc = 189; return s.tmp_398; }
     }
   case 189:
     r0 = s.retval;
@@ -3936,7 +3941,7 @@ switch (step) {
       s.tmp_397.fn = s.tmp_397.arg0.vtable.iface["me"];
       if (s.tmp_397.fn == null) { s.retval = s.tmp_397.arg0.fields["me"]; }
       else if (!s.tmp_397.fn.isGetter) { s.retval = bind(s.tmp_397); }
-     else { s.callLocIdx = 810; s.pc = 188; return s.tmp_397; }
+     else { s.callLocIdx = 809; s.pc = 188; return s.tmp_397; }
     }
   case 188:
     r0 = s.retval;
@@ -3953,14 +3958,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_389, "constraints", s.tmp_394);
     s.tmp_402 = if_avoid_1_mk(s);
     s.tmp_403 = if_modifier_1_mk(s);
-    s.tmp_403.arg0 = globals.tid___110372;
+    s.tmp_403.arg0 = globals.tid___85125;
     if (!s.tmp_403.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_403.arg0, "modifier");
     } else {
       s.tmp_403.fn = s.tmp_403.arg0.vtable.iface["modifier"];
       if (s.tmp_403.fn == null) { s.retval = s.tmp_403.arg0.fields["modifier"]; }
       else if (!s.tmp_403.fn.isGetter) { s.retval = bind(s.tmp_403); }
-     else { s.callLocIdx = 805; s.pc = 191; return s.tmp_403; }
+     else { s.callLocIdx = 804; s.pc = 191; return s.tmp_403; }
     }
   case 191:
     r0 = s.retval;
@@ -3971,7 +3976,7 @@ switch (step) {
       s.tmp_402.fn = s.tmp_402.arg0.vtable.iface["avoid"];
       if (s.tmp_402.fn == null) { s.retval = s.tmp_402.arg0.fields["avoid"]; }
       else if (!s.tmp_402.fn.isGetter) { s.retval = bind(s.tmp_402); }
-     else { s.callLocIdx = 806; s.pc = 190; return s.tmp_402; }
+     else { s.callLocIdx = 805; s.pc = 190; return s.tmp_402; }
     }
   case 190:
     r0 = s.retval;
@@ -3982,14 +3987,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_404, "type", 4);
     s.tmp_406 = if_page_1_1_mk(s);
     s.tmp_407 = if_modifier_1_mk(s);
-    s.tmp_407.arg0 = globals.tid___110372;
+    s.tmp_407.arg0 = globals.tid___85125;
     if (!s.tmp_407.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_407.arg0, "modifier");
     } else {
       s.tmp_407.fn = s.tmp_407.arg0.vtable.iface["modifier"];
       if (s.tmp_407.fn == null) { s.retval = s.tmp_407.arg0.fields["modifier"]; }
       else if (!s.tmp_407.fn.isGetter) { s.retval = bind(s.tmp_407); }
-     else { s.callLocIdx = 813; s.pc = 193; return s.tmp_407; }
+     else { s.callLocIdx = 812; s.pc = 193; return s.tmp_407; }
     }
   case 193:
     r0 = s.retval;
@@ -4000,7 +4005,7 @@ switch (step) {
       s.tmp_406.fn = s.tmp_406.arg0.vtable.iface["page_1"];
       if (s.tmp_406.fn == null) { s.retval = s.tmp_406.arg0.fields["page_1"]; }
       else if (!s.tmp_406.fn.isGetter) { s.retval = bind(s.tmp_406); }
-     else { s.callLocIdx = 814; s.pc = 192; return s.tmp_406; }
+     else { s.callLocIdx = 813; s.pc = 192; return s.tmp_406; }
     }
   case 192:
     r0 = s.retval;
@@ -4018,14 +4023,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_404, "constraints", s.tmp_409);
     s.tmp_411 = if_page_1_1_mk(s);
     s.tmp_412 = if_modifier_1_mk(s);
-    s.tmp_412.arg0 = globals.tid___110372;
+    s.tmp_412.arg0 = globals.tid___85125;
     if (!s.tmp_412.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_412.arg0, "modifier");
     } else {
       s.tmp_412.fn = s.tmp_412.arg0.vtable.iface["modifier"];
       if (s.tmp_412.fn == null) { s.retval = s.tmp_412.arg0.fields["modifier"]; }
       else if (!s.tmp_412.fn.isGetter) { s.retval = bind(s.tmp_412); }
-     else { s.callLocIdx = 811; s.pc = 195; return s.tmp_412; }
+     else { s.callLocIdx = 810; s.pc = 195; return s.tmp_412; }
     }
   case 195:
     r0 = s.retval;
@@ -4036,7 +4041,7 @@ switch (step) {
       s.tmp_411.fn = s.tmp_411.arg0.vtable.iface["page_1"];
       if (s.tmp_411.fn == null) { s.retval = s.tmp_411.arg0.fields["page_1"]; }
       else if (!s.tmp_411.fn.isGetter) { s.retval = bind(s.tmp_411); }
-     else { s.callLocIdx = 812; s.pc = 194; return s.tmp_411; }
+     else { s.callLocIdx = 811; s.pc = 194; return s.tmp_411; }
     }
   case 194:
     r0 = s.retval;
@@ -4047,14 +4052,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_413, "type", 4);
     s.tmp_415 = if_page_2_1_mk(s);
     s.tmp_416 = if_modifier_1_mk(s);
-    s.tmp_416.arg0 = globals.tid___110372;
+    s.tmp_416.arg0 = globals.tid___85125;
     if (!s.tmp_416.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_416.arg0, "modifier");
     } else {
       s.tmp_416.fn = s.tmp_416.arg0.vtable.iface["modifier"];
       if (s.tmp_416.fn == null) { s.retval = s.tmp_416.arg0.fields["modifier"]; }
       else if (!s.tmp_416.fn.isGetter) { s.retval = bind(s.tmp_416); }
-     else { s.callLocIdx = 817; s.pc = 197; return s.tmp_416; }
+     else { s.callLocIdx = 816; s.pc = 197; return s.tmp_416; }
     }
   case 197:
     r0 = s.retval;
@@ -4065,7 +4070,7 @@ switch (step) {
       s.tmp_415.fn = s.tmp_415.arg0.vtable.iface["page_2"];
       if (s.tmp_415.fn == null) { s.retval = s.tmp_415.arg0.fields["page_2"]; }
       else if (!s.tmp_415.fn.isGetter) { s.retval = bind(s.tmp_415); }
-     else { s.callLocIdx = 818; s.pc = 196; return s.tmp_415; }
+     else { s.callLocIdx = 817; s.pc = 196; return s.tmp_415; }
     }
   case 196:
     r0 = s.retval;
@@ -4083,14 +4088,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_413, "constraints", s.tmp_418);
     s.tmp_420 = if_page_2_1_mk(s);
     s.tmp_421 = if_modifier_1_mk(s);
-    s.tmp_421.arg0 = globals.tid___110372;
+    s.tmp_421.arg0 = globals.tid___85125;
     if (!s.tmp_421.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_421.arg0, "modifier");
     } else {
       s.tmp_421.fn = s.tmp_421.arg0.vtable.iface["modifier"];
       if (s.tmp_421.fn == null) { s.retval = s.tmp_421.arg0.fields["modifier"]; }
       else if (!s.tmp_421.fn.isGetter) { s.retval = bind(s.tmp_421); }
-     else { s.callLocIdx = 815; s.pc = 199; return s.tmp_421; }
+     else { s.callLocIdx = 814; s.pc = 199; return s.tmp_421; }
     }
   case 199:
     r0 = s.retval;
@@ -4101,7 +4106,7 @@ switch (step) {
       s.tmp_420.fn = s.tmp_420.arg0.vtable.iface["page_2"];
       if (s.tmp_420.fn == null) { s.retval = s.tmp_420.arg0.fields["page_2"]; }
       else if (!s.tmp_420.fn.isGetter) { s.retval = bind(s.tmp_420); }
-     else { s.callLocIdx = 816; s.pc = 198; return s.tmp_420; }
+     else { s.callLocIdx = 815; s.pc = 198; return s.tmp_420; }
     }
   case 198:
     r0 = s.retval;
@@ -4112,14 +4117,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_422, "type", 4);
     s.tmp_424 = if_page_3_1_mk(s);
     s.tmp_425 = if_modifier_1_mk(s);
-    s.tmp_425.arg0 = globals.tid___110372;
+    s.tmp_425.arg0 = globals.tid___85125;
     if (!s.tmp_425.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_425.arg0, "modifier");
     } else {
       s.tmp_425.fn = s.tmp_425.arg0.vtable.iface["modifier"];
       if (s.tmp_425.fn == null) { s.retval = s.tmp_425.arg0.fields["modifier"]; }
       else if (!s.tmp_425.fn.isGetter) { s.retval = bind(s.tmp_425); }
-     else { s.callLocIdx = 821; s.pc = 201; return s.tmp_425; }
+     else { s.callLocIdx = 820; s.pc = 201; return s.tmp_425; }
     }
   case 201:
     r0 = s.retval;
@@ -4130,7 +4135,7 @@ switch (step) {
       s.tmp_424.fn = s.tmp_424.arg0.vtable.iface["page_3"];
       if (s.tmp_424.fn == null) { s.retval = s.tmp_424.arg0.fields["page_3"]; }
       else if (!s.tmp_424.fn.isGetter) { s.retval = bind(s.tmp_424); }
-     else { s.callLocIdx = 822; s.pc = 200; return s.tmp_424; }
+     else { s.callLocIdx = 821; s.pc = 200; return s.tmp_424; }
     }
   case 200:
     r0 = s.retval;
@@ -4148,14 +4153,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_422, "constraints", s.tmp_427);
     s.tmp_429 = if_page_3_1_mk(s);
     s.tmp_430 = if_modifier_1_mk(s);
-    s.tmp_430.arg0 = globals.tid___110372;
+    s.tmp_430.arg0 = globals.tid___85125;
     if (!s.tmp_430.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_430.arg0, "modifier");
     } else {
       s.tmp_430.fn = s.tmp_430.arg0.vtable.iface["modifier"];
       if (s.tmp_430.fn == null) { s.retval = s.tmp_430.arg0.fields["modifier"]; }
       else if (!s.tmp_430.fn.isGetter) { s.retval = bind(s.tmp_430); }
-     else { s.callLocIdx = 819; s.pc = 203; return s.tmp_430; }
+     else { s.callLocIdx = 818; s.pc = 203; return s.tmp_430; }
     }
   case 203:
     r0 = s.retval;
@@ -4166,7 +4171,7 @@ switch (step) {
       s.tmp_429.fn = s.tmp_429.arg0.vtable.iface["page_3"];
       if (s.tmp_429.fn == null) { s.retval = s.tmp_429.arg0.fields["page_3"]; }
       else if (!s.tmp_429.fn.isGetter) { s.retval = bind(s.tmp_429); }
-     else { s.callLocIdx = 820; s.pc = 202; return s.tmp_429; }
+     else { s.callLocIdx = 819; s.pc = 202; return s.tmp_429; }
     }
   case 202:
     r0 = s.retval;
@@ -4177,14 +4182,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_431, "type", 4);
     s.tmp_433 = if_page_4_1_mk(s);
     s.tmp_434 = if_modifier_1_mk(s);
-    s.tmp_434.arg0 = globals.tid___110372;
+    s.tmp_434.arg0 = globals.tid___85125;
     if (!s.tmp_434.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_434.arg0, "modifier");
     } else {
       s.tmp_434.fn = s.tmp_434.arg0.vtable.iface["modifier"];
       if (s.tmp_434.fn == null) { s.retval = s.tmp_434.arg0.fields["modifier"]; }
       else if (!s.tmp_434.fn.isGetter) { s.retval = bind(s.tmp_434); }
-     else { s.callLocIdx = 825; s.pc = 205; return s.tmp_434; }
+     else { s.callLocIdx = 824; s.pc = 205; return s.tmp_434; }
     }
   case 205:
     r0 = s.retval;
@@ -4195,7 +4200,7 @@ switch (step) {
       s.tmp_433.fn = s.tmp_433.arg0.vtable.iface["page_4"];
       if (s.tmp_433.fn == null) { s.retval = s.tmp_433.arg0.fields["page_4"]; }
       else if (!s.tmp_433.fn.isGetter) { s.retval = bind(s.tmp_433); }
-     else { s.callLocIdx = 826; s.pc = 204; return s.tmp_433; }
+     else { s.callLocIdx = 825; s.pc = 204; return s.tmp_433; }
     }
   case 204:
     r0 = s.retval;
@@ -4213,14 +4218,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_431, "constraints", s.tmp_436);
     s.tmp_438 = if_page_4_1_mk(s);
     s.tmp_439 = if_modifier_1_mk(s);
-    s.tmp_439.arg0 = globals.tid___110372;
+    s.tmp_439.arg0 = globals.tid___85125;
     if (!s.tmp_439.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_439.arg0, "modifier");
     } else {
       s.tmp_439.fn = s.tmp_439.arg0.vtable.iface["modifier"];
       if (s.tmp_439.fn == null) { s.retval = s.tmp_439.arg0.fields["modifier"]; }
       else if (!s.tmp_439.fn.isGetter) { s.retval = bind(s.tmp_439); }
-     else { s.callLocIdx = 823; s.pc = 207; return s.tmp_439; }
+     else { s.callLocIdx = 822; s.pc = 207; return s.tmp_439; }
     }
   case 207:
     r0 = s.retval;
@@ -4231,7 +4236,7 @@ switch (step) {
       s.tmp_438.fn = s.tmp_438.arg0.vtable.iface["page_4"];
       if (s.tmp_438.fn == null) { s.retval = s.tmp_438.arg0.fields["page_4"]; }
       else if (!s.tmp_438.fn.isGetter) { s.retval = bind(s.tmp_438); }
-     else { s.callLocIdx = 824; s.pc = 206; return s.tmp_438; }
+     else { s.callLocIdx = 823; s.pc = 206; return s.tmp_438; }
     }
   case 206:
     r0 = s.retval;
@@ -4242,14 +4247,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_440, "type", 4);
     s.tmp_442 = if_page_5_1_mk(s);
     s.tmp_443 = if_modifier_1_mk(s);
-    s.tmp_443.arg0 = globals.tid___110372;
+    s.tmp_443.arg0 = globals.tid___85125;
     if (!s.tmp_443.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_443.arg0, "modifier");
     } else {
       s.tmp_443.fn = s.tmp_443.arg0.vtable.iface["modifier"];
       if (s.tmp_443.fn == null) { s.retval = s.tmp_443.arg0.fields["modifier"]; }
       else if (!s.tmp_443.fn.isGetter) { s.retval = bind(s.tmp_443); }
-     else { s.callLocIdx = 829; s.pc = 209; return s.tmp_443; }
+     else { s.callLocIdx = 828; s.pc = 209; return s.tmp_443; }
     }
   case 209:
     r0 = s.retval;
@@ -4260,7 +4265,7 @@ switch (step) {
       s.tmp_442.fn = s.tmp_442.arg0.vtable.iface["page_5"];
       if (s.tmp_442.fn == null) { s.retval = s.tmp_442.arg0.fields["page_5"]; }
       else if (!s.tmp_442.fn.isGetter) { s.retval = bind(s.tmp_442); }
-     else { s.callLocIdx = 830; s.pc = 208; return s.tmp_442; }
+     else { s.callLocIdx = 829; s.pc = 208; return s.tmp_442; }
     }
   case 208:
     r0 = s.retval;
@@ -4278,14 +4283,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_440, "constraints", s.tmp_445);
     s.tmp_447 = if_page_5_1_mk(s);
     s.tmp_448 = if_modifier_1_mk(s);
-    s.tmp_448.arg0 = globals.tid___110372;
+    s.tmp_448.arg0 = globals.tid___85125;
     if (!s.tmp_448.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_448.arg0, "modifier");
     } else {
       s.tmp_448.fn = s.tmp_448.arg0.vtable.iface["modifier"];
       if (s.tmp_448.fn == null) { s.retval = s.tmp_448.arg0.fields["modifier"]; }
       else if (!s.tmp_448.fn.isGetter) { s.retval = bind(s.tmp_448); }
-     else { s.callLocIdx = 827; s.pc = 211; return s.tmp_448; }
+     else { s.callLocIdx = 826; s.pc = 211; return s.tmp_448; }
     }
   case 211:
     r0 = s.retval;
@@ -4296,7 +4301,7 @@ switch (step) {
       s.tmp_447.fn = s.tmp_447.arg0.vtable.iface["page_5"];
       if (s.tmp_447.fn == null) { s.retval = s.tmp_447.arg0.fields["page_5"]; }
       else if (!s.tmp_447.fn.isGetter) { s.retval = bind(s.tmp_447); }
-     else { s.callLocIdx = 828; s.pc = 210; return s.tmp_447; }
+     else { s.callLocIdx = 827; s.pc = 210; return s.tmp_447; }
     }
   case 210:
     r0 = s.retval;
@@ -4307,14 +4312,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_449, "type", 4);
     s.tmp_451 = if_express_none_1_mk(s);
     s.tmp_452 = if_modifier_1_mk(s);
-    s.tmp_452.arg0 = globals.tid___110372;
+    s.tmp_452.arg0 = globals.tid___85125;
     if (!s.tmp_452.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_452.arg0, "modifier");
     } else {
       s.tmp_452.fn = s.tmp_452.arg0.vtable.iface["modifier"];
       if (s.tmp_452.fn == null) { s.retval = s.tmp_452.arg0.fields["modifier"]; }
       else if (!s.tmp_452.fn.isGetter) { s.retval = bind(s.tmp_452); }
-     else { s.callLocIdx = 833; s.pc = 213; return s.tmp_452; }
+     else { s.callLocIdx = 832; s.pc = 213; return s.tmp_452; }
     }
   case 213:
     r0 = s.retval;
@@ -4325,7 +4330,7 @@ switch (step) {
       s.tmp_451.fn = s.tmp_451.arg0.vtable.iface["express_none"];
       if (s.tmp_451.fn == null) { s.retval = s.tmp_451.arg0.fields["express_none"]; }
       else if (!s.tmp_451.fn.isGetter) { s.retval = bind(s.tmp_451); }
-     else { s.callLocIdx = 834; s.pc = 212; return s.tmp_451; }
+     else { s.callLocIdx = 833; s.pc = 212; return s.tmp_451; }
     }
   case 212:
     r0 = s.retval;
@@ -4350,14 +4355,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_449, "constraints", s.tmp_454);
     s.tmp_458 = if_express_none_1_mk(s);
     s.tmp_459 = if_modifier_1_mk(s);
-    s.tmp_459.arg0 = globals.tid___110372;
+    s.tmp_459.arg0 = globals.tid___85125;
     if (!s.tmp_459.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_459.arg0, "modifier");
     } else {
       s.tmp_459.fn = s.tmp_459.arg0.vtable.iface["modifier"];
       if (s.tmp_459.fn == null) { s.retval = s.tmp_459.arg0.fields["modifier"]; }
       else if (!s.tmp_459.fn.isGetter) { s.retval = bind(s.tmp_459); }
-     else { s.callLocIdx = 831; s.pc = 215; return s.tmp_459; }
+     else { s.callLocIdx = 830; s.pc = 215; return s.tmp_459; }
     }
   case 215:
     r0 = s.retval;
@@ -4368,7 +4373,7 @@ switch (step) {
       s.tmp_458.fn = s.tmp_458.arg0.vtable.iface["express_none"];
       if (s.tmp_458.fn == null) { s.retval = s.tmp_458.arg0.fields["express_none"]; }
       else if (!s.tmp_458.fn.isGetter) { s.retval = bind(s.tmp_458); }
-     else { s.callLocIdx = 832; s.pc = 214; return s.tmp_458; }
+     else { s.callLocIdx = 831; s.pc = 214; return s.tmp_458; }
     }
   case 214:
     r0 = s.retval;
@@ -4379,14 +4384,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_460, "type", 4);
     s.tmp_462 = if_express_happy_1_mk(s);
     s.tmp_463 = if_modifier_1_mk(s);
-    s.tmp_463.arg0 = globals.tid___110372;
+    s.tmp_463.arg0 = globals.tid___85125;
     if (!s.tmp_463.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_463.arg0, "modifier");
     } else {
       s.tmp_463.fn = s.tmp_463.arg0.vtable.iface["modifier"];
       if (s.tmp_463.fn == null) { s.retval = s.tmp_463.arg0.fields["modifier"]; }
       else if (!s.tmp_463.fn.isGetter) { s.retval = bind(s.tmp_463); }
-     else { s.callLocIdx = 837; s.pc = 217; return s.tmp_463; }
+     else { s.callLocIdx = 836; s.pc = 217; return s.tmp_463; }
     }
   case 217:
     r0 = s.retval;
@@ -4397,7 +4402,7 @@ switch (step) {
       s.tmp_462.fn = s.tmp_462.arg0.vtable.iface["express_happy"];
       if (s.tmp_462.fn == null) { s.retval = s.tmp_462.arg0.fields["express_happy"]; }
       else if (!s.tmp_462.fn.isGetter) { s.retval = bind(s.tmp_462); }
-     else { s.callLocIdx = 838; s.pc = 216; return s.tmp_462; }
+     else { s.callLocIdx = 837; s.pc = 216; return s.tmp_462; }
     }
   case 216:
     r0 = s.retval;
@@ -4422,14 +4427,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_460, "constraints", s.tmp_465);
     s.tmp_469 = if_express_happy_1_mk(s);
     s.tmp_470 = if_modifier_1_mk(s);
-    s.tmp_470.arg0 = globals.tid___110372;
+    s.tmp_470.arg0 = globals.tid___85125;
     if (!s.tmp_470.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_470.arg0, "modifier");
     } else {
       s.tmp_470.fn = s.tmp_470.arg0.vtable.iface["modifier"];
       if (s.tmp_470.fn == null) { s.retval = s.tmp_470.arg0.fields["modifier"]; }
       else if (!s.tmp_470.fn.isGetter) { s.retval = bind(s.tmp_470); }
-     else { s.callLocIdx = 835; s.pc = 219; return s.tmp_470; }
+     else { s.callLocIdx = 834; s.pc = 219; return s.tmp_470; }
     }
   case 219:
     r0 = s.retval;
@@ -4440,7 +4445,7 @@ switch (step) {
       s.tmp_469.fn = s.tmp_469.arg0.vtable.iface["express_happy"];
       if (s.tmp_469.fn == null) { s.retval = s.tmp_469.arg0.fields["express_happy"]; }
       else if (!s.tmp_469.fn.isGetter) { s.retval = bind(s.tmp_469); }
-     else { s.callLocIdx = 836; s.pc = 218; return s.tmp_469; }
+     else { s.callLocIdx = 835; s.pc = 218; return s.tmp_469; }
     }
   case 218:
     r0 = s.retval;
@@ -4451,14 +4456,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_471, "type", 4);
     s.tmp_473 = if_express_angry_1_mk(s);
     s.tmp_474 = if_modifier_1_mk(s);
-    s.tmp_474.arg0 = globals.tid___110372;
+    s.tmp_474.arg0 = globals.tid___85125;
     if (!s.tmp_474.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_474.arg0, "modifier");
     } else {
       s.tmp_474.fn = s.tmp_474.arg0.vtable.iface["modifier"];
       if (s.tmp_474.fn == null) { s.retval = s.tmp_474.arg0.fields["modifier"]; }
       else if (!s.tmp_474.fn.isGetter) { s.retval = bind(s.tmp_474); }
-     else { s.callLocIdx = 841; s.pc = 221; return s.tmp_474; }
+     else { s.callLocIdx = 840; s.pc = 221; return s.tmp_474; }
     }
   case 221:
     r0 = s.retval;
@@ -4469,7 +4474,7 @@ switch (step) {
       s.tmp_473.fn = s.tmp_473.arg0.vtable.iface["express_angry"];
       if (s.tmp_473.fn == null) { s.retval = s.tmp_473.arg0.fields["express_angry"]; }
       else if (!s.tmp_473.fn.isGetter) { s.retval = bind(s.tmp_473); }
-     else { s.callLocIdx = 842; s.pc = 220; return s.tmp_473; }
+     else { s.callLocIdx = 841; s.pc = 220; return s.tmp_473; }
     }
   case 220:
     r0 = s.retval;
@@ -4494,14 +4499,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_471, "constraints", s.tmp_476);
     s.tmp_480 = if_express_angry_1_mk(s);
     s.tmp_481 = if_modifier_1_mk(s);
-    s.tmp_481.arg0 = globals.tid___110372;
+    s.tmp_481.arg0 = globals.tid___85125;
     if (!s.tmp_481.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_481.arg0, "modifier");
     } else {
       s.tmp_481.fn = s.tmp_481.arg0.vtable.iface["modifier"];
       if (s.tmp_481.fn == null) { s.retval = s.tmp_481.arg0.fields["modifier"]; }
       else if (!s.tmp_481.fn.isGetter) { s.retval = bind(s.tmp_481); }
-     else { s.callLocIdx = 839; s.pc = 223; return s.tmp_481; }
+     else { s.callLocIdx = 838; s.pc = 223; return s.tmp_481; }
     }
   case 223:
     r0 = s.retval;
@@ -4512,7 +4517,7 @@ switch (step) {
       s.tmp_480.fn = s.tmp_480.arg0.vtable.iface["express_angry"];
       if (s.tmp_480.fn == null) { s.retval = s.tmp_480.arg0.fields["express_angry"]; }
       else if (!s.tmp_480.fn.isGetter) { s.retval = bind(s.tmp_480); }
-     else { s.callLocIdx = 840; s.pc = 222; return s.tmp_480; }
+     else { s.callLocIdx = 839; s.pc = 222; return s.tmp_480; }
     }
   case 222:
     r0 = s.retval;
@@ -4523,14 +4528,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_482, "type", 4);
     s.tmp_484 = if_express_heart_1_mk(s);
     s.tmp_485 = if_modifier_1_mk(s);
-    s.tmp_485.arg0 = globals.tid___110372;
+    s.tmp_485.arg0 = globals.tid___85125;
     if (!s.tmp_485.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_485.arg0, "modifier");
     } else {
       s.tmp_485.fn = s.tmp_485.arg0.vtable.iface["modifier"];
       if (s.tmp_485.fn == null) { s.retval = s.tmp_485.arg0.fields["modifier"]; }
       else if (!s.tmp_485.fn.isGetter) { s.retval = bind(s.tmp_485); }
-     else { s.callLocIdx = 845; s.pc = 225; return s.tmp_485; }
+     else { s.callLocIdx = 844; s.pc = 225; return s.tmp_485; }
     }
   case 225:
     r0 = s.retval;
@@ -4541,7 +4546,7 @@ switch (step) {
       s.tmp_484.fn = s.tmp_484.arg0.vtable.iface["express_heart"];
       if (s.tmp_484.fn == null) { s.retval = s.tmp_484.arg0.fields["express_heart"]; }
       else if (!s.tmp_484.fn.isGetter) { s.retval = bind(s.tmp_484); }
-     else { s.callLocIdx = 846; s.pc = 224; return s.tmp_484; }
+     else { s.callLocIdx = 845; s.pc = 224; return s.tmp_484; }
     }
   case 224:
     r0 = s.retval;
@@ -4566,14 +4571,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_482, "constraints", s.tmp_487);
     s.tmp_491 = if_express_heart_1_mk(s);
     s.tmp_492 = if_modifier_1_mk(s);
-    s.tmp_492.arg0 = globals.tid___110372;
+    s.tmp_492.arg0 = globals.tid___85125;
     if (!s.tmp_492.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_492.arg0, "modifier");
     } else {
       s.tmp_492.fn = s.tmp_492.arg0.vtable.iface["modifier"];
       if (s.tmp_492.fn == null) { s.retval = s.tmp_492.arg0.fields["modifier"]; }
       else if (!s.tmp_492.fn.isGetter) { s.retval = bind(s.tmp_492); }
-     else { s.callLocIdx = 843; s.pc = 227; return s.tmp_492; }
+     else { s.callLocIdx = 842; s.pc = 227; return s.tmp_492; }
     }
   case 227:
     r0 = s.retval;
@@ -4584,7 +4589,7 @@ switch (step) {
       s.tmp_491.fn = s.tmp_491.arg0.vtable.iface["express_heart"];
       if (s.tmp_491.fn == null) { s.retval = s.tmp_491.arg0.fields["express_heart"]; }
       else if (!s.tmp_491.fn.isGetter) { s.retval = bind(s.tmp_491); }
-     else { s.callLocIdx = 844; s.pc = 226; return s.tmp_491; }
+     else { s.callLocIdx = 843; s.pc = 226; return s.tmp_491; }
     }
   case 226:
     r0 = s.retval;
@@ -4595,14 +4600,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_493, "type", 4);
     s.tmp_495 = if_express_sad_1_mk(s);
     s.tmp_496 = if_modifier_1_mk(s);
-    s.tmp_496.arg0 = globals.tid___110372;
+    s.tmp_496.arg0 = globals.tid___85125;
     if (!s.tmp_496.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_496.arg0, "modifier");
     } else {
       s.tmp_496.fn = s.tmp_496.arg0.vtable.iface["modifier"];
       if (s.tmp_496.fn == null) { s.retval = s.tmp_496.arg0.fields["modifier"]; }
       else if (!s.tmp_496.fn.isGetter) { s.retval = bind(s.tmp_496); }
-     else { s.callLocIdx = 849; s.pc = 229; return s.tmp_496; }
+     else { s.callLocIdx = 848; s.pc = 229; return s.tmp_496; }
     }
   case 229:
     r0 = s.retval;
@@ -4613,7 +4618,7 @@ switch (step) {
       s.tmp_495.fn = s.tmp_495.arg0.vtable.iface["express_sad"];
       if (s.tmp_495.fn == null) { s.retval = s.tmp_495.arg0.fields["express_sad"]; }
       else if (!s.tmp_495.fn.isGetter) { s.retval = bind(s.tmp_495); }
-     else { s.callLocIdx = 850; s.pc = 228; return s.tmp_495; }
+     else { s.callLocIdx = 849; s.pc = 228; return s.tmp_495; }
     }
   case 228:
     r0 = s.retval;
@@ -4638,14 +4643,14 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_493, "constraints", s.tmp_498);
     s.tmp_502 = if_express_sad_1_mk(s);
     s.tmp_503 = if_modifier_1_mk(s);
-    s.tmp_503.arg0 = globals.tid___110372;
+    s.tmp_503.arg0 = globals.tid___85125;
     if (!s.tmp_503.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_503.arg0, "modifier");
     } else {
       s.tmp_503.fn = s.tmp_503.arg0.vtable.iface["modifier"];
       if (s.tmp_503.fn == null) { s.retval = s.tmp_503.arg0.fields["modifier"]; }
       else if (!s.tmp_503.fn.isGetter) { s.retval = bind(s.tmp_503); }
-     else { s.callLocIdx = 847; s.pc = 231; return s.tmp_503; }
+     else { s.callLocIdx = 846; s.pc = 231; return s.tmp_503; }
     }
   case 231:
     r0 = s.retval;
@@ -4656,14 +4661,14 @@ switch (step) {
       s.tmp_502.fn = s.tmp_502.arg0.vtable.iface["express_sad"];
       if (s.tmp_502.fn == null) { s.retval = s.tmp_502.arg0.fields["express_sad"]; }
       else if (!s.tmp_502.fn.isGetter) { s.retval = bind(s.tmp_502); }
-     else { s.callLocIdx = 848; s.pc = 230; return s.tmp_502; }
+     else { s.callLocIdx = 847; s.pc = 230; return s.tmp_502; }
     }
   case 230:
     r0 = s.retval;
     s.tmp_501 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_285, s.tmp_501, s.tmp_493);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_83, "modifiers", s.tmp_285);
-    globals.tiles___110373 = (s.tmp_83);
+    globals.tiles___85126 = (s.tmp_83);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "id", "kodu");
@@ -4711,20 +4716,20 @@ switch (step) {
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_7 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_7, "characters", s.tmp_2);
-    globals.chardb___110401 = (s.tmp_7);
+    globals.chardb___85154 = (s.tmp_7);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "noop", inline__P117065);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "noop", inline__P91954);
     s.tmp_2 = if_always_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 879; s.pc = 233; return s.tmp_3; }
+     else { s.callLocIdx = 878; s.pc = 233; return s.tmp_3; }
     }
   case 233:
     r0 = s.retval;
@@ -4735,22 +4740,22 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["always"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["always"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 880; s.pc = 232; return s.tmp_2; }
+     else { s.callLocIdx = 879; s.pc = 232; return s.tmp_2; }
     }
   case 232:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_1, inline__P117072);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_1, inline__P91961);
     s.tmp_5 = if_see_1_mk(s);
     s.tmp_6 = if_sensor_1_mk(s);
-    s.tmp_6.arg0 = globals.tid___110372;
+    s.tmp_6.arg0 = globals.tid___85125;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "sensor");
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["sensor"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["sensor"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 881; s.pc = 235; return s.tmp_6; }
+     else { s.callLocIdx = 880; s.pc = 235; return s.tmp_6; }
     }
   case 235:
     r0 = s.retval;
@@ -4761,22 +4766,22 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["see"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["see"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 882; s.pc = 234; return s.tmp_5; }
+     else { s.callLocIdx = 881; s.pc = 234; return s.tmp_5; }
     }
   case 234:
     r0 = s.retval;
     s.tmp_4 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_4, inline__P117083);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_4, inline__P91973);
     s.tmp_8 = if_bump_1_mk(s);
     s.tmp_9 = if_sensor_1_mk(s);
-    s.tmp_9.arg0 = globals.tid___110372;
+    s.tmp_9.arg0 = globals.tid___85125;
     if (!s.tmp_9.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_9.arg0, "sensor");
     } else {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["sensor"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["sensor"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 892; s.pc = 237; return s.tmp_9; }
+     else { s.callLocIdx = 891; s.pc = 237; return s.tmp_9; }
     }
   case 237:
     r0 = s.retval;
@@ -4787,22 +4792,22 @@ switch (step) {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["bump"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["bump"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 893; s.pc = 236; return s.tmp_8; }
+     else { s.callLocIdx = 892; s.pc = 236; return s.tmp_8; }
     }
   case 236:
     r0 = s.retval;
     s.tmp_7 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_7, inline__P117157);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_7, inline__P92035);
     s.tmp_11 = if_dpad_1_mk(s);
     s.tmp_12 = if_sensor_1_mk(s);
-    s.tmp_12.arg0 = globals.tid___110372;
+    s.tmp_12.arg0 = globals.tid___85125;
     if (!s.tmp_12.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_12.arg0, "sensor");
     } else {
       s.tmp_12.fn = s.tmp_12.arg0.vtable.iface["sensor"];
       if (s.tmp_12.fn == null) { s.retval = s.tmp_12.arg0.fields["sensor"]; }
       else if (!s.tmp_12.fn.isGetter) { s.retval = bind(s.tmp_12); }
-     else { s.callLocIdx = 896; s.pc = 239; return s.tmp_12; }
+     else { s.callLocIdx = 895; s.pc = 239; return s.tmp_12; }
     }
   case 239:
     r0 = s.retval;
@@ -4813,22 +4818,22 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["dpad"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["dpad"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 897; s.pc = 238; return s.tmp_11; }
+     else { s.callLocIdx = 896; s.pc = 238; return s.tmp_11; }
     }
   case 238:
     r0 = s.retval;
     s.tmp_10 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_10, inline__P117193);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_10, inline__P92066);
     s.tmp_14 = if_button_a_1_mk(s);
     s.tmp_15 = if_sensor_1_mk(s);
-    s.tmp_15.arg0 = globals.tid___110372;
+    s.tmp_15.arg0 = globals.tid___85125;
     if (!s.tmp_15.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_15.arg0, "sensor");
     } else {
       s.tmp_15.fn = s.tmp_15.arg0.vtable.iface["sensor"];
       if (s.tmp_15.fn == null) { s.retval = s.tmp_15.arg0.fields["sensor"]; }
       else if (!s.tmp_15.fn.isGetter) { s.retval = bind(s.tmp_15); }
-     else { s.callLocIdx = 899; s.pc = 241; return s.tmp_15; }
+     else { s.callLocIdx = 898; s.pc = 241; return s.tmp_15; }
     }
   case 241:
     r0 = s.retval;
@@ -4839,22 +4844,22 @@ switch (step) {
       s.tmp_14.fn = s.tmp_14.arg0.vtable.iface["button_a"];
       if (s.tmp_14.fn == null) { s.retval = s.tmp_14.arg0.fields["button_a"]; }
       else if (!s.tmp_14.fn.isGetter) { s.retval = bind(s.tmp_14); }
-     else { s.callLocIdx = 900; s.pc = 240; return s.tmp_14; }
+     else { s.callLocIdx = 899; s.pc = 240; return s.tmp_14; }
     }
   case 240:
     r0 = s.retval;
     s.tmp_13 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_13, inline__P117243);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_13, inline__P92114);
     s.tmp_17 = if_button_b_1_mk(s);
     s.tmp_18 = if_sensor_1_mk(s);
-    s.tmp_18.arg0 = globals.tid___110372;
+    s.tmp_18.arg0 = globals.tid___85125;
     if (!s.tmp_18.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_18.arg0, "sensor");
     } else {
       s.tmp_18.fn = s.tmp_18.arg0.vtable.iface["sensor"];
       if (s.tmp_18.fn == null) { s.retval = s.tmp_18.arg0.fields["sensor"]; }
       else if (!s.tmp_18.fn.isGetter) { s.retval = bind(s.tmp_18); }
-     else { s.callLocIdx = 901; s.pc = 243; return s.tmp_18; }
+     else { s.callLocIdx = 900; s.pc = 243; return s.tmp_18; }
     }
   case 243:
     r0 = s.retval;
@@ -4865,22 +4870,22 @@ switch (step) {
       s.tmp_17.fn = s.tmp_17.arg0.vtable.iface["button_b"];
       if (s.tmp_17.fn == null) { s.retval = s.tmp_17.arg0.fields["button_b"]; }
       else if (!s.tmp_17.fn.isGetter) { s.retval = bind(s.tmp_17); }
-     else { s.callLocIdx = 902; s.pc = 242; return s.tmp_17; }
+     else { s.callLocIdx = 901; s.pc = 242; return s.tmp_17; }
     }
   case 242:
     r0 = s.retval;
     s.tmp_16 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_16, inline__P117256);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_16, inline__P92126);
     s.tmp_20 = if_timer_1_mk(s);
     s.tmp_21 = if_sensor_1_mk(s);
-    s.tmp_21.arg0 = globals.tid___110372;
+    s.tmp_21.arg0 = globals.tid___85125;
     if (!s.tmp_21.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_21.arg0, "sensor");
     } else {
       s.tmp_21.fn = s.tmp_21.arg0.vtable.iface["sensor"];
       if (s.tmp_21.fn == null) { s.retval = s.tmp_21.arg0.fields["sensor"]; }
       else if (!s.tmp_21.fn.isGetter) { s.retval = bind(s.tmp_21); }
-     else { s.callLocIdx = 903; s.pc = 245; return s.tmp_21; }
+     else { s.callLocIdx = 902; s.pc = 245; return s.tmp_21; }
     }
   case 245:
     r0 = s.retval;
@@ -4891,22 +4896,22 @@ switch (step) {
       s.tmp_20.fn = s.tmp_20.arg0.vtable.iface["timer"];
       if (s.tmp_20.fn == null) { s.retval = s.tmp_20.arg0.fields["timer"]; }
       else if (!s.tmp_20.fn.isGetter) { s.retval = bind(s.tmp_20); }
-     else { s.callLocIdx = 904; s.pc = 244; return s.tmp_20; }
+     else { s.callLocIdx = 903; s.pc = 244; return s.tmp_20; }
     }
   case 244:
     r0 = s.retval;
     s.tmp_19 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_19, inline__P117269);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_19, inline__P92138);
     s.tmp_23 = if_me_1_mk(s);
     s.tmp_24 = if_filter_1_mk(s);
-    s.tmp_24.arg0 = globals.tid___110372;
+    s.tmp_24.arg0 = globals.tid___85125;
     if (!s.tmp_24.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_24.arg0, "filter");
     } else {
       s.tmp_24.fn = s.tmp_24.arg0.vtable.iface["filter"];
       if (s.tmp_24.fn == null) { s.retval = s.tmp_24.arg0.fields["filter"]; }
       else if (!s.tmp_24.fn.isGetter) { s.retval = bind(s.tmp_24); }
-     else { s.callLocIdx = 905; s.pc = 247; return s.tmp_24; }
+     else { s.callLocIdx = 904; s.pc = 247; return s.tmp_24; }
     }
   case 247:
     r0 = s.retval;
@@ -4917,22 +4922,22 @@ switch (step) {
       s.tmp_23.fn = s.tmp_23.arg0.vtable.iface["me"];
       if (s.tmp_23.fn == null) { s.retval = s.tmp_23.arg0.fields["me"]; }
       else if (!s.tmp_23.fn.isGetter) { s.retval = bind(s.tmp_23); }
-     else { s.callLocIdx = 906; s.pc = 246; return s.tmp_23; }
+     else { s.callLocIdx = 905; s.pc = 246; return s.tmp_23; }
     }
   case 246:
     r0 = s.retval;
     s.tmp_22 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_22, inline__P117314);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_22, inline__P92178);
     s.tmp_26 = if_it_1_mk(s);
     s.tmp_27 = if_filter_1_mk(s);
-    s.tmp_27.arg0 = globals.tid___110372;
+    s.tmp_27.arg0 = globals.tid___85125;
     if (!s.tmp_27.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_27.arg0, "filter");
     } else {
       s.tmp_27.fn = s.tmp_27.arg0.vtable.iface["filter"];
       if (s.tmp_27.fn == null) { s.retval = s.tmp_27.arg0.fields["filter"]; }
       else if (!s.tmp_27.fn.isGetter) { s.retval = bind(s.tmp_27); }
-     else { s.callLocIdx = 908; s.pc = 249; return s.tmp_27; }
+     else { s.callLocIdx = 907; s.pc = 249; return s.tmp_27; }
     }
   case 249:
     r0 = s.retval;
@@ -4943,22 +4948,22 @@ switch (step) {
       s.tmp_26.fn = s.tmp_26.arg0.vtable.iface["it"];
       if (s.tmp_26.fn == null) { s.retval = s.tmp_26.arg0.fields["it"]; }
       else if (!s.tmp_26.fn.isGetter) { s.retval = bind(s.tmp_26); }
-     else { s.callLocIdx = 909; s.pc = 248; return s.tmp_26; }
+     else { s.callLocIdx = 908; s.pc = 248; return s.tmp_26; }
     }
   case 248:
     r0 = s.retval;
     s.tmp_25 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_25, inline__P117335);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_25, inline__P92195);
     s.tmp_29 = if_nearby_1_mk(s);
     s.tmp_30 = if_filter_1_mk(s);
-    s.tmp_30.arg0 = globals.tid___110372;
+    s.tmp_30.arg0 = globals.tid___85125;
     if (!s.tmp_30.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_30.arg0, "filter");
     } else {
       s.tmp_30.fn = s.tmp_30.arg0.vtable.iface["filter"];
       if (s.tmp_30.fn == null) { s.retval = s.tmp_30.arg0.fields["filter"]; }
       else if (!s.tmp_30.fn.isGetter) { s.retval = bind(s.tmp_30); }
-     else { s.callLocIdx = 911; s.pc = 251; return s.tmp_30; }
+     else { s.callLocIdx = 910; s.pc = 251; return s.tmp_30; }
     }
   case 251:
     r0 = s.retval;
@@ -4969,22 +4974,22 @@ switch (step) {
       s.tmp_29.fn = s.tmp_29.arg0.vtable.iface["nearby"];
       if (s.tmp_29.fn == null) { s.retval = s.tmp_29.arg0.fields["nearby"]; }
       else if (!s.tmp_29.fn.isGetter) { s.retval = bind(s.tmp_29); }
-     else { s.callLocIdx = 912; s.pc = 250; return s.tmp_29; }
+     else { s.callLocIdx = 911; s.pc = 250; return s.tmp_29; }
     }
   case 250:
     r0 = s.retval;
     s.tmp_28 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_28, inline__P117367);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_28, inline__P92224);
     s.tmp_32 = if_faraway_1_mk(s);
     s.tmp_33 = if_filter_1_mk(s);
-    s.tmp_33.arg0 = globals.tid___110372;
+    s.tmp_33.arg0 = globals.tid___85125;
     if (!s.tmp_33.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_33.arg0, "filter");
     } else {
       s.tmp_33.fn = s.tmp_33.arg0.vtable.iface["filter"];
       if (s.tmp_33.fn == null) { s.retval = s.tmp_33.arg0.fields["filter"]; }
       else if (!s.tmp_33.fn.isGetter) { s.retval = bind(s.tmp_33); }
-     else { s.callLocIdx = 915; s.pc = 253; return s.tmp_33; }
+     else { s.callLocIdx = 914; s.pc = 253; return s.tmp_33; }
     }
   case 253:
     r0 = s.retval;
@@ -4995,22 +5000,22 @@ switch (step) {
       s.tmp_32.fn = s.tmp_32.arg0.vtable.iface["faraway"];
       if (s.tmp_32.fn == null) { s.retval = s.tmp_32.arg0.fields["faraway"]; }
       else if (!s.tmp_32.fn.isGetter) { s.retval = bind(s.tmp_32); }
-     else { s.callLocIdx = 916; s.pc = 252; return s.tmp_32; }
+     else { s.callLocIdx = 915; s.pc = 252; return s.tmp_32; }
     }
   case 252:
     r0 = s.retval;
     s.tmp_31 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_31, inline__P117422);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_31, inline__P92272);
     s.tmp_35 = if_kodu_1_mk(s);
     s.tmp_36 = if_filter_1_mk(s);
-    s.tmp_36.arg0 = globals.tid___110372;
+    s.tmp_36.arg0 = globals.tid___85125;
     if (!s.tmp_36.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_36.arg0, "filter");
     } else {
       s.tmp_36.fn = s.tmp_36.arg0.vtable.iface["filter"];
       if (s.tmp_36.fn == null) { s.retval = s.tmp_36.arg0.fields["filter"]; }
       else if (!s.tmp_36.fn.isGetter) { s.retval = bind(s.tmp_36); }
-     else { s.callLocIdx = 919; s.pc = 255; return s.tmp_36; }
+     else { s.callLocIdx = 918; s.pc = 255; return s.tmp_36; }
     }
   case 255:
     r0 = s.retval;
@@ -5021,22 +5026,22 @@ switch (step) {
       s.tmp_35.fn = s.tmp_35.arg0.vtable.iface["kodu"];
       if (s.tmp_35.fn == null) { s.retval = s.tmp_35.arg0.fields["kodu"]; }
       else if (!s.tmp_35.fn.isGetter) { s.retval = bind(s.tmp_35); }
-     else { s.callLocIdx = 920; s.pc = 254; return s.tmp_35; }
+     else { s.callLocIdx = 919; s.pc = 254; return s.tmp_35; }
     }
   case 254:
     r0 = s.retval;
     s.tmp_34 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_34, inline__P117477);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_34, inline__P92320);
     s.tmp_38 = if_apple_1_mk(s);
     s.tmp_39 = if_filter_1_mk(s);
-    s.tmp_39.arg0 = globals.tid___110372;
+    s.tmp_39.arg0 = globals.tid___85125;
     if (!s.tmp_39.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_39.arg0, "filter");
     } else {
       s.tmp_39.fn = s.tmp_39.arg0.vtable.iface["filter"];
       if (s.tmp_39.fn == null) { s.retval = s.tmp_39.arg0.fields["filter"]; }
       else if (!s.tmp_39.fn.isGetter) { s.retval = bind(s.tmp_39); }
-     else { s.callLocIdx = 924; s.pc = 257; return s.tmp_39; }
+     else { s.callLocIdx = 923; s.pc = 257; return s.tmp_39; }
     }
   case 257:
     r0 = s.retval;
@@ -5047,22 +5052,22 @@ switch (step) {
       s.tmp_38.fn = s.tmp_38.arg0.vtable.iface["apple"];
       if (s.tmp_38.fn == null) { s.retval = s.tmp_38.arg0.fields["apple"]; }
       else if (!s.tmp_38.fn.isGetter) { s.retval = bind(s.tmp_38); }
-     else { s.callLocIdx = 925; s.pc = 256; return s.tmp_38; }
+     else { s.callLocIdx = 924; s.pc = 256; return s.tmp_38; }
     }
   case 256:
     r0 = s.retval;
     s.tmp_37 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_37, inline__P117513);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_37, inline__P92353);
     s.tmp_41 = if_tree_1_mk(s);
     s.tmp_42 = if_filter_1_mk(s);
-    s.tmp_42.arg0 = globals.tid___110372;
+    s.tmp_42.arg0 = globals.tid___85125;
     if (!s.tmp_42.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_42.arg0, "filter");
     } else {
       s.tmp_42.fn = s.tmp_42.arg0.vtable.iface["filter"];
       if (s.tmp_42.fn == null) { s.retval = s.tmp_42.arg0.fields["filter"]; }
       else if (!s.tmp_42.fn.isGetter) { s.retval = bind(s.tmp_42); }
-     else { s.callLocIdx = 929; s.pc = 259; return s.tmp_42; }
+     else { s.callLocIdx = 928; s.pc = 259; return s.tmp_42; }
     }
   case 259:
     r0 = s.retval;
@@ -5073,22 +5078,22 @@ switch (step) {
       s.tmp_41.fn = s.tmp_41.arg0.vtable.iface["tree"];
       if (s.tmp_41.fn == null) { s.retval = s.tmp_41.arg0.fields["tree"]; }
       else if (!s.tmp_41.fn.isGetter) { s.retval = bind(s.tmp_41); }
-     else { s.callLocIdx = 930; s.pc = 258; return s.tmp_41; }
+     else { s.callLocIdx = 929; s.pc = 258; return s.tmp_41; }
     }
   case 258:
     r0 = s.retval;
     s.tmp_40 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_40, inline__P117548);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_40, inline__P92385);
     s.tmp_44 = if_timespan_short_1_mk(s);
     s.tmp_45 = if_filter_1_mk(s);
-    s.tmp_45.arg0 = globals.tid___110372;
+    s.tmp_45.arg0 = globals.tid___85125;
     if (!s.tmp_45.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_45.arg0, "filter");
     } else {
       s.tmp_45.fn = s.tmp_45.arg0.vtable.iface["filter"];
       if (s.tmp_45.fn == null) { s.retval = s.tmp_45.arg0.fields["filter"]; }
       else if (!s.tmp_45.fn.isGetter) { s.retval = bind(s.tmp_45); }
-     else { s.callLocIdx = 934; s.pc = 261; return s.tmp_45; }
+     else { s.callLocIdx = 933; s.pc = 261; return s.tmp_45; }
     }
   case 261:
     r0 = s.retval;
@@ -5099,22 +5104,22 @@ switch (step) {
       s.tmp_44.fn = s.tmp_44.arg0.vtable.iface["timespan_short"];
       if (s.tmp_44.fn == null) { s.retval = s.tmp_44.arg0.fields["timespan_short"]; }
       else if (!s.tmp_44.fn.isGetter) { s.retval = bind(s.tmp_44); }
-     else { s.callLocIdx = 935; s.pc = 260; return s.tmp_44; }
+     else { s.callLocIdx = 934; s.pc = 260; return s.tmp_44; }
     }
   case 260:
     r0 = s.retval;
     s.tmp_43 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_43, inline__P117583);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_43, inline__P92417);
     s.tmp_47 = if_timespan_long_1_mk(s);
     s.tmp_48 = if_filter_1_mk(s);
-    s.tmp_48.arg0 = globals.tid___110372;
+    s.tmp_48.arg0 = globals.tid___85125;
     if (!s.tmp_48.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_48.arg0, "filter");
     } else {
       s.tmp_48.fn = s.tmp_48.arg0.vtable.iface["filter"];
       if (s.tmp_48.fn == null) { s.retval = s.tmp_48.arg0.fields["filter"]; }
       else if (!s.tmp_48.fn.isGetter) { s.retval = bind(s.tmp_48); }
-     else { s.callLocIdx = 936; s.pc = 263; return s.tmp_48; }
+     else { s.callLocIdx = 935; s.pc = 263; return s.tmp_48; }
     }
   case 263:
     r0 = s.retval;
@@ -5125,22 +5130,22 @@ switch (step) {
       s.tmp_47.fn = s.tmp_47.arg0.vtable.iface["timespan_long"];
       if (s.tmp_47.fn == null) { s.retval = s.tmp_47.arg0.fields["timespan_long"]; }
       else if (!s.tmp_47.fn.isGetter) { s.retval = bind(s.tmp_47); }
-     else { s.callLocIdx = 937; s.pc = 262; return s.tmp_47; }
+     else { s.callLocIdx = 936; s.pc = 262; return s.tmp_47; }
     }
   case 262:
     r0 = s.retval;
     s.tmp_46 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_46, inline__P117604);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_46, inline__P92436);
     s.tmp_50 = if_express_none_1_mk(s);
     s.tmp_51 = if_filter_1_mk(s);
-    s.tmp_51.arg0 = globals.tid___110372;
+    s.tmp_51.arg0 = globals.tid___85125;
     if (!s.tmp_51.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_51.arg0, "filter");
     } else {
       s.tmp_51.fn = s.tmp_51.arg0.vtable.iface["filter"];
       if (s.tmp_51.fn == null) { s.retval = s.tmp_51.arg0.fields["filter"]; }
       else if (!s.tmp_51.fn.isGetter) { s.retval = bind(s.tmp_51); }
-     else { s.callLocIdx = 938; s.pc = 265; return s.tmp_51; }
+     else { s.callLocIdx = 937; s.pc = 265; return s.tmp_51; }
     }
   case 265:
     r0 = s.retval;
@@ -5151,22 +5156,22 @@ switch (step) {
       s.tmp_50.fn = s.tmp_50.arg0.vtable.iface["express_none"];
       if (s.tmp_50.fn == null) { s.retval = s.tmp_50.arg0.fields["express_none"]; }
       else if (!s.tmp_50.fn.isGetter) { s.retval = bind(s.tmp_50); }
-     else { s.callLocIdx = 939; s.pc = 264; return s.tmp_50; }
+     else { s.callLocIdx = 938; s.pc = 264; return s.tmp_50; }
     }
   case 264:
     r0 = s.retval;
     s.tmp_49 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_49, inline__P117626);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_49, inline__P92456);
     s.tmp_53 = if_express_happy_1_mk(s);
     s.tmp_54 = if_filter_1_mk(s);
-    s.tmp_54.arg0 = globals.tid___110372;
+    s.tmp_54.arg0 = globals.tid___85125;
     if (!s.tmp_54.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_54.arg0, "filter");
     } else {
       s.tmp_54.fn = s.tmp_54.arg0.vtable.iface["filter"];
       if (s.tmp_54.fn == null) { s.retval = s.tmp_54.arg0.fields["filter"]; }
       else if (!s.tmp_54.fn.isGetter) { s.retval = bind(s.tmp_54); }
-     else { s.callLocIdx = 943; s.pc = 267; return s.tmp_54; }
+     else { s.callLocIdx = 942; s.pc = 267; return s.tmp_54; }
     }
   case 267:
     r0 = s.retval;
@@ -5177,22 +5182,22 @@ switch (step) {
       s.tmp_53.fn = s.tmp_53.arg0.vtable.iface["express_happy"];
       if (s.tmp_53.fn == null) { s.retval = s.tmp_53.arg0.fields["express_happy"]; }
       else if (!s.tmp_53.fn.isGetter) { s.retval = bind(s.tmp_53); }
-     else { s.callLocIdx = 944; s.pc = 266; return s.tmp_53; }
+     else { s.callLocIdx = 943; s.pc = 266; return s.tmp_53; }
     }
   case 266:
     r0 = s.retval;
     s.tmp_52 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_52, inline__P117665);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_52, inline__P92491);
     s.tmp_56 = if_express_angry_1_mk(s);
     s.tmp_57 = if_filter_1_mk(s);
-    s.tmp_57.arg0 = globals.tid___110372;
+    s.tmp_57.arg0 = globals.tid___85125;
     if (!s.tmp_57.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_57.arg0, "filter");
     } else {
       s.tmp_57.fn = s.tmp_57.arg0.vtable.iface["filter"];
       if (s.tmp_57.fn == null) { s.retval = s.tmp_57.arg0.fields["filter"]; }
       else if (!s.tmp_57.fn.isGetter) { s.retval = bind(s.tmp_57); }
-     else { s.callLocIdx = 948; s.pc = 269; return s.tmp_57; }
+     else { s.callLocIdx = 947; s.pc = 269; return s.tmp_57; }
     }
   case 269:
     r0 = s.retval;
@@ -5203,22 +5208,22 @@ switch (step) {
       s.tmp_56.fn = s.tmp_56.arg0.vtable.iface["express_angry"];
       if (s.tmp_56.fn == null) { s.retval = s.tmp_56.arg0.fields["express_angry"]; }
       else if (!s.tmp_56.fn.isGetter) { s.retval = bind(s.tmp_56); }
-     else { s.callLocIdx = 949; s.pc = 268; return s.tmp_56; }
+     else { s.callLocIdx = 948; s.pc = 268; return s.tmp_56; }
     }
   case 268:
     r0 = s.retval;
     s.tmp_55 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_55, inline__P117704);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_55, inline__P92525);
     s.tmp_59 = if_express_heart_1_mk(s);
     s.tmp_60 = if_filter_1_mk(s);
-    s.tmp_60.arg0 = globals.tid___110372;
+    s.tmp_60.arg0 = globals.tid___85125;
     if (!s.tmp_60.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_60.arg0, "filter");
     } else {
       s.tmp_60.fn = s.tmp_60.arg0.vtable.iface["filter"];
       if (s.tmp_60.fn == null) { s.retval = s.tmp_60.arg0.fields["filter"]; }
       else if (!s.tmp_60.fn.isGetter) { s.retval = bind(s.tmp_60); }
-     else { s.callLocIdx = 953; s.pc = 271; return s.tmp_60; }
+     else { s.callLocIdx = 952; s.pc = 271; return s.tmp_60; }
     }
   case 271:
     r0 = s.retval;
@@ -5229,22 +5234,22 @@ switch (step) {
       s.tmp_59.fn = s.tmp_59.arg0.vtable.iface["express_heart"];
       if (s.tmp_59.fn == null) { s.retval = s.tmp_59.arg0.fields["express_heart"]; }
       else if (!s.tmp_59.fn.isGetter) { s.retval = bind(s.tmp_59); }
-     else { s.callLocIdx = 954; s.pc = 270; return s.tmp_59; }
+     else { s.callLocIdx = 953; s.pc = 270; return s.tmp_59; }
     }
   case 270:
     r0 = s.retval;
     s.tmp_58 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_58, inline__P117743);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_58, inline__P92559);
     s.tmp_62 = if_express_sad_1_mk(s);
     s.tmp_63 = if_filter_1_mk(s);
-    s.tmp_63.arg0 = globals.tid___110372;
+    s.tmp_63.arg0 = globals.tid___85125;
     if (!s.tmp_63.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_63.arg0, "filter");
     } else {
       s.tmp_63.fn = s.tmp_63.arg0.vtable.iface["filter"];
       if (s.tmp_63.fn == null) { s.retval = s.tmp_63.arg0.fields["filter"]; }
       else if (!s.tmp_63.fn.isGetter) { s.retval = bind(s.tmp_63); }
-     else { s.callLocIdx = 958; s.pc = 273; return s.tmp_63; }
+     else { s.callLocIdx = 957; s.pc = 273; return s.tmp_63; }
     }
   case 273:
     r0 = s.retval;
@@ -5255,22 +5260,22 @@ switch (step) {
       s.tmp_62.fn = s.tmp_62.arg0.vtable.iface["express_sad"];
       if (s.tmp_62.fn == null) { s.retval = s.tmp_62.arg0.fields["express_sad"]; }
       else if (!s.tmp_62.fn.isGetter) { s.retval = bind(s.tmp_62); }
-     else { s.callLocIdx = 959; s.pc = 272; return s.tmp_62; }
+     else { s.callLocIdx = 958; s.pc = 272; return s.tmp_62; }
     }
   case 272:
     r0 = s.retval;
     s.tmp_61 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_61, inline__P117782);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_61, inline__P92593);
     s.tmp_65 = if_move_1_mk(s);
     s.tmp_66 = if_actuator_1_mk(s);
-    s.tmp_66.arg0 = globals.tid___110372;
+    s.tmp_66.arg0 = globals.tid___85125;
     if (!s.tmp_66.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_66.arg0, "actuator");
     } else {
       s.tmp_66.fn = s.tmp_66.arg0.vtable.iface["actuator"];
       if (s.tmp_66.fn == null) { s.retval = s.tmp_66.arg0.fields["actuator"]; }
       else if (!s.tmp_66.fn.isGetter) { s.retval = bind(s.tmp_66); }
-     else { s.callLocIdx = 963; s.pc = 275; return s.tmp_66; }
+     else { s.callLocIdx = 962; s.pc = 275; return s.tmp_66; }
     }
   case 275:
     r0 = s.retval;
@@ -5281,22 +5286,22 @@ switch (step) {
       s.tmp_65.fn = s.tmp_65.arg0.vtable.iface["move"];
       if (s.tmp_65.fn == null) { s.retval = s.tmp_65.arg0.fields["move"]; }
       else if (!s.tmp_65.fn.isGetter) { s.retval = bind(s.tmp_65); }
-     else { s.callLocIdx = 964; s.pc = 274; return s.tmp_65; }
+     else { s.callLocIdx = 963; s.pc = 274; return s.tmp_65; }
     }
   case 274:
     r0 = s.retval;
     s.tmp_64 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_64, inline__P117821);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_64, inline__P92627);
     s.tmp_68 = if_switch_page_1_mk(s);
     s.tmp_69 = if_actuator_1_mk(s);
-    s.tmp_69.arg0 = globals.tid___110372;
+    s.tmp_69.arg0 = globals.tid___85125;
     if (!s.tmp_69.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_69.arg0, "actuator");
     } else {
       s.tmp_69.fn = s.tmp_69.arg0.vtable.iface["actuator"];
       if (s.tmp_69.fn == null) { s.retval = s.tmp_69.arg0.fields["actuator"]; }
       else if (!s.tmp_69.fn.isGetter) { s.retval = bind(s.tmp_69); }
-     else { s.callLocIdx = 969; s.pc = 277; return s.tmp_69; }
+     else { s.callLocIdx = 968; s.pc = 277; return s.tmp_69; }
     }
   case 277:
     r0 = s.retval;
@@ -5307,22 +5312,22 @@ switch (step) {
       s.tmp_68.fn = s.tmp_68.arg0.vtable.iface["switch_page"];
       if (s.tmp_68.fn == null) { s.retval = s.tmp_68.arg0.fields["switch_page"]; }
       else if (!s.tmp_68.fn.isGetter) { s.retval = bind(s.tmp_68); }
-     else { s.callLocIdx = 970; s.pc = 276; return s.tmp_68; }
+     else { s.callLocIdx = 969; s.pc = 276; return s.tmp_68; }
     }
   case 276:
     r0 = s.retval;
     s.tmp_67 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_67, inline__P117867);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_67, inline__P92665);
     s.tmp_71 = if_vanish_1_mk(s);
     s.tmp_72 = if_actuator_1_mk(s);
-    s.tmp_72.arg0 = globals.tid___110372;
+    s.tmp_72.arg0 = globals.tid___85125;
     if (!s.tmp_72.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_72.arg0, "actuator");
     } else {
       s.tmp_72.fn = s.tmp_72.arg0.vtable.iface["actuator"];
       if (s.tmp_72.fn == null) { s.retval = s.tmp_72.arg0.fields["actuator"]; }
       else if (!s.tmp_72.fn.isGetter) { s.retval = bind(s.tmp_72); }
-     else { s.callLocIdx = 973; s.pc = 279; return s.tmp_72; }
+     else { s.callLocIdx = 972; s.pc = 279; return s.tmp_72; }
     }
   case 279:
     r0 = s.retval;
@@ -5333,22 +5338,22 @@ switch (step) {
       s.tmp_71.fn = s.tmp_71.arg0.vtable.iface["vanish"];
       if (s.tmp_71.fn == null) { s.retval = s.tmp_71.arg0.fields["vanish"]; }
       else if (!s.tmp_71.fn.isGetter) { s.retval = bind(s.tmp_71); }
-     else { s.callLocIdx = 974; s.pc = 278; return s.tmp_71; }
+     else { s.callLocIdx = 973; s.pc = 278; return s.tmp_71; }
     }
   case 278:
     r0 = s.retval;
     s.tmp_70 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_70, inline__P117888);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_70, inline__P92683);
     s.tmp_74 = if_camera_follow_1_mk(s);
     s.tmp_75 = if_actuator_1_mk(s);
-    s.tmp_75.arg0 = globals.tid___110372;
+    s.tmp_75.arg0 = globals.tid___85125;
     if (!s.tmp_75.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_75.arg0, "actuator");
     } else {
       s.tmp_75.fn = s.tmp_75.arg0.vtable.iface["actuator"];
       if (s.tmp_75.fn == null) { s.retval = s.tmp_75.arg0.fields["actuator"]; }
       else if (!s.tmp_75.fn.isGetter) { s.retval = bind(s.tmp_75); }
-     else { s.callLocIdx = 977; s.pc = 281; return s.tmp_75; }
+     else { s.callLocIdx = 976; s.pc = 281; return s.tmp_75; }
     }
   case 281:
     r0 = s.retval;
@@ -5359,22 +5364,22 @@ switch (step) {
       s.tmp_74.fn = s.tmp_74.arg0.vtable.iface["camera_follow"];
       if (s.tmp_74.fn == null) { s.retval = s.tmp_74.arg0.fields["camera_follow"]; }
       else if (!s.tmp_74.fn.isGetter) { s.retval = bind(s.tmp_74); }
-     else { s.callLocIdx = 978; s.pc = 280; return s.tmp_74; }
+     else { s.callLocIdx = 977; s.pc = 280; return s.tmp_74; }
     }
   case 280:
     r0 = s.retval;
     s.tmp_73 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_73, inline__P117916);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_73, inline__P92708);
     s.tmp_77 = if_express_1_mk(s);
     s.tmp_78 = if_actuator_1_mk(s);
-    s.tmp_78.arg0 = globals.tid___110372;
+    s.tmp_78.arg0 = globals.tid___85125;
     if (!s.tmp_78.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_78.arg0, "actuator");
     } else {
       s.tmp_78.fn = s.tmp_78.arg0.vtable.iface["actuator"];
       if (s.tmp_78.fn == null) { s.retval = s.tmp_78.arg0.fields["actuator"]; }
       else if (!s.tmp_78.fn.isGetter) { s.retval = bind(s.tmp_78); }
-     else { s.callLocIdx = 983; s.pc = 283; return s.tmp_78; }
+     else { s.callLocIdx = 982; s.pc = 283; return s.tmp_78; }
     }
   case 283:
     r0 = s.retval;
@@ -5385,22 +5390,22 @@ switch (step) {
       s.tmp_77.fn = s.tmp_77.arg0.vtable.iface["express"];
       if (s.tmp_77.fn == null) { s.retval = s.tmp_77.arg0.fields["express"]; }
       else if (!s.tmp_77.fn.isGetter) { s.retval = bind(s.tmp_77); }
-     else { s.callLocIdx = 984; s.pc = 282; return s.tmp_77; }
+     else { s.callLocIdx = 983; s.pc = 282; return s.tmp_77; }
     }
   case 282:
     r0 = s.retval;
     s.tmp_76 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_76, inline__P117948);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_76, inline__P92735);
     s.tmp_80 = if_me_1_mk(s);
     s.tmp_81 = if_modifier_1_mk(s);
-    s.tmp_81.arg0 = globals.tid___110372;
+    s.tmp_81.arg0 = globals.tid___85125;
     if (!s.tmp_81.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_81.arg0, "modifier");
     } else {
       s.tmp_81.fn = s.tmp_81.arg0.vtable.iface["modifier"];
       if (s.tmp_81.fn == null) { s.retval = s.tmp_81.arg0.fields["modifier"]; }
       else if (!s.tmp_81.fn.isGetter) { s.retval = bind(s.tmp_81); }
-     else { s.callLocIdx = 988; s.pc = 285; return s.tmp_81; }
+     else { s.callLocIdx = 987; s.pc = 285; return s.tmp_81; }
     }
   case 285:
     r0 = s.retval;
@@ -5411,22 +5416,22 @@ switch (step) {
       s.tmp_80.fn = s.tmp_80.arg0.vtable.iface["me"];
       if (s.tmp_80.fn == null) { s.retval = s.tmp_80.arg0.fields["me"]; }
       else if (!s.tmp_80.fn.isGetter) { s.retval = bind(s.tmp_80); }
-     else { s.callLocIdx = 989; s.pc = 284; return s.tmp_80; }
+     else { s.callLocIdx = 988; s.pc = 284; return s.tmp_80; }
     }
   case 284:
     r0 = s.retval;
     s.tmp_79 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_79, inline__P117984);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_79, inline__P92765);
     s.tmp_83 = if_it_1_mk(s);
     s.tmp_84 = if_modifier_1_mk(s);
-    s.tmp_84.arg0 = globals.tid___110372;
+    s.tmp_84.arg0 = globals.tid___85125;
     if (!s.tmp_84.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_84.arg0, "modifier");
     } else {
       s.tmp_84.fn = s.tmp_84.arg0.vtable.iface["modifier"];
       if (s.tmp_84.fn == null) { s.retval = s.tmp_84.arg0.fields["modifier"]; }
       else if (!s.tmp_84.fn.isGetter) { s.retval = bind(s.tmp_84); }
-     else { s.callLocIdx = 991; s.pc = 287; return s.tmp_84; }
+     else { s.callLocIdx = 990; s.pc = 287; return s.tmp_84; }
     }
   case 287:
     r0 = s.retval;
@@ -5437,22 +5442,22 @@ switch (step) {
       s.tmp_83.fn = s.tmp_83.arg0.vtable.iface["it"];
       if (s.tmp_83.fn == null) { s.retval = s.tmp_83.arg0.fields["it"]; }
       else if (!s.tmp_83.fn.isGetter) { s.retval = bind(s.tmp_83); }
-     else { s.callLocIdx = 992; s.pc = 286; return s.tmp_83; }
+     else { s.callLocIdx = 991; s.pc = 286; return s.tmp_83; }
     }
   case 286:
     r0 = s.retval;
     s.tmp_82 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_82, inline__P118008);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_82, inline__P92785);
     s.tmp_86 = if_quickly_1_mk(s);
     s.tmp_87 = if_modifier_1_mk(s);
-    s.tmp_87.arg0 = globals.tid___110372;
+    s.tmp_87.arg0 = globals.tid___85125;
     if (!s.tmp_87.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_87.arg0, "modifier");
     } else {
       s.tmp_87.fn = s.tmp_87.arg0.vtable.iface["modifier"];
       if (s.tmp_87.fn == null) { s.retval = s.tmp_87.arg0.fields["modifier"]; }
       else if (!s.tmp_87.fn.isGetter) { s.retval = bind(s.tmp_87); }
-     else { s.callLocIdx = 994; s.pc = 289; return s.tmp_87; }
+     else { s.callLocIdx = 993; s.pc = 289; return s.tmp_87; }
     }
   case 289:
     r0 = s.retval;
@@ -5463,22 +5468,22 @@ switch (step) {
       s.tmp_86.fn = s.tmp_86.arg0.vtable.iface["quickly"];
       if (s.tmp_86.fn == null) { s.retval = s.tmp_86.arg0.fields["quickly"]; }
       else if (!s.tmp_86.fn.isGetter) { s.retval = bind(s.tmp_86); }
-     else { s.callLocIdx = 995; s.pc = 288; return s.tmp_86; }
+     else { s.callLocIdx = 994; s.pc = 288; return s.tmp_86; }
     }
   case 288:
     r0 = s.retval;
     s.tmp_85 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_85, inline__P118043);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_85, inline__P92816);
     s.tmp_89 = if_slowly_1_mk(s);
     s.tmp_90 = if_modifier_1_mk(s);
-    s.tmp_90.arg0 = globals.tid___110372;
+    s.tmp_90.arg0 = globals.tid___85125;
     if (!s.tmp_90.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_90.arg0, "modifier");
     } else {
       s.tmp_90.fn = s.tmp_90.arg0.vtable.iface["modifier"];
       if (s.tmp_90.fn == null) { s.retval = s.tmp_90.arg0.fields["modifier"]; }
       else if (!s.tmp_90.fn.isGetter) { s.retval = bind(s.tmp_90); }
-     else { s.callLocIdx = 1001; s.pc = 291; return s.tmp_90; }
+     else { s.callLocIdx = 1000; s.pc = 291; return s.tmp_90; }
     }
   case 291:
     r0 = s.retval;
@@ -5489,22 +5494,22 @@ switch (step) {
       s.tmp_89.fn = s.tmp_89.arg0.vtable.iface["slowly"];
       if (s.tmp_89.fn == null) { s.retval = s.tmp_89.arg0.fields["slowly"]; }
       else if (!s.tmp_89.fn.isGetter) { s.retval = bind(s.tmp_89); }
-     else { s.callLocIdx = 1002; s.pc = 290; return s.tmp_89; }
+     else { s.callLocIdx = 1001; s.pc = 290; return s.tmp_89; }
     }
   case 290:
     r0 = s.retval;
     s.tmp_88 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_88, inline__P118083);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_88, inline__P92846);
     s.tmp_92 = if_toward_1_mk(s);
     s.tmp_93 = if_modifier_1_mk(s);
-    s.tmp_93.arg0 = globals.tid___110372;
+    s.tmp_93.arg0 = globals.tid___85125;
     if (!s.tmp_93.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_93.arg0, "modifier");
     } else {
       s.tmp_93.fn = s.tmp_93.arg0.vtable.iface["modifier"];
       if (s.tmp_93.fn == null) { s.retval = s.tmp_93.arg0.fields["modifier"]; }
       else if (!s.tmp_93.fn.isGetter) { s.retval = bind(s.tmp_93); }
-     else { s.callLocIdx = 1006; s.pc = 293; return s.tmp_93; }
+     else { s.callLocIdx = 1005; s.pc = 293; return s.tmp_93; }
     }
   case 293:
     r0 = s.retval;
@@ -5515,22 +5520,22 @@ switch (step) {
       s.tmp_92.fn = s.tmp_92.arg0.vtable.iface["toward"];
       if (s.tmp_92.fn == null) { s.retval = s.tmp_92.arg0.fields["toward"]; }
       else if (!s.tmp_92.fn.isGetter) { s.retval = bind(s.tmp_92); }
-     else { s.callLocIdx = 1007; s.pc = 292; return s.tmp_92; }
+     else { s.callLocIdx = 1006; s.pc = 292; return s.tmp_92; }
     }
   case 292:
     r0 = s.retval;
     s.tmp_91 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_91, inline__P118115);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_91, inline__P92871);
     s.tmp_95 = if_away_1_mk(s);
     s.tmp_96 = if_modifier_1_mk(s);
-    s.tmp_96.arg0 = globals.tid___110372;
+    s.tmp_96.arg0 = globals.tid___85125;
     if (!s.tmp_96.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_96.arg0, "modifier");
     } else {
       s.tmp_96.fn = s.tmp_96.arg0.vtable.iface["modifier"];
       if (s.tmp_96.fn == null) { s.retval = s.tmp_96.arg0.fields["modifier"]; }
       else if (!s.tmp_96.fn.isGetter) { s.retval = bind(s.tmp_96); }
-     else { s.callLocIdx = 1018; s.pc = 295; return s.tmp_96; }
+     else { s.callLocIdx = 1017; s.pc = 295; return s.tmp_96; }
     }
   case 295:
     r0 = s.retval;
@@ -5541,22 +5546,22 @@ switch (step) {
       s.tmp_95.fn = s.tmp_95.arg0.vtable.iface["away"];
       if (s.tmp_95.fn == null) { s.retval = s.tmp_95.arg0.fields["away"]; }
       else if (!s.tmp_95.fn.isGetter) { s.retval = bind(s.tmp_95); }
-     else { s.callLocIdx = 1019; s.pc = 294; return s.tmp_95; }
+     else { s.callLocIdx = 1018; s.pc = 294; return s.tmp_95; }
     }
   case 294:
     r0 = s.retval;
     s.tmp_94 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_94, inline__P118185);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_94, inline__P92934);
     s.tmp_98 = if_avoid_1_mk(s);
     s.tmp_99 = if_modifier_1_mk(s);
-    s.tmp_99.arg0 = globals.tid___110372;
+    s.tmp_99.arg0 = globals.tid___85125;
     if (!s.tmp_99.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_99.arg0, "modifier");
     } else {
       s.tmp_99.fn = s.tmp_99.arg0.vtable.iface["modifier"];
       if (s.tmp_99.fn == null) { s.retval = s.tmp_99.arg0.fields["modifier"]; }
       else if (!s.tmp_99.fn.isGetter) { s.retval = bind(s.tmp_99); }
-     else { s.callLocIdx = 1030; s.pc = 297; return s.tmp_99; }
+     else { s.callLocIdx = 1029; s.pc = 297; return s.tmp_99; }
     }
   case 297:
     r0 = s.retval;
@@ -5567,22 +5572,22 @@ switch (step) {
       s.tmp_98.fn = s.tmp_98.arg0.vtable.iface["avoid"];
       if (s.tmp_98.fn == null) { s.retval = s.tmp_98.arg0.fields["avoid"]; }
       else if (!s.tmp_98.fn.isGetter) { s.retval = bind(s.tmp_98); }
-     else { s.callLocIdx = 1031; s.pc = 296; return s.tmp_98; }
+     else { s.callLocIdx = 1030; s.pc = 296; return s.tmp_98; }
     }
   case 296:
     r0 = s.retval;
     s.tmp_97 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_97, inline__P118257);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_97, inline__P92999);
     s.tmp_101 = if_page_1_1_mk(s);
     s.tmp_102 = if_modifier_1_mk(s);
-    s.tmp_102.arg0 = globals.tid___110372;
+    s.tmp_102.arg0 = globals.tid___85125;
     if (!s.tmp_102.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_102.arg0, "modifier");
     } else {
       s.tmp_102.fn = s.tmp_102.arg0.vtable.iface["modifier"];
       if (s.tmp_102.fn == null) { s.retval = s.tmp_102.arg0.fields["modifier"]; }
       else if (!s.tmp_102.fn.isGetter) { s.retval = bind(s.tmp_102); }
-     else { s.callLocIdx = 1053; s.pc = 299; return s.tmp_102; }
+     else { s.callLocIdx = 1052; s.pc = 299; return s.tmp_102; }
     }
   case 299:
     r0 = s.retval;
@@ -5593,22 +5598,22 @@ switch (step) {
       s.tmp_101.fn = s.tmp_101.arg0.vtable.iface["page_1"];
       if (s.tmp_101.fn == null) { s.retval = s.tmp_101.arg0.fields["page_1"]; }
       else if (!s.tmp_101.fn.isGetter) { s.retval = bind(s.tmp_101); }
-     else { s.callLocIdx = 1054; s.pc = 298; return s.tmp_101; }
+     else { s.callLocIdx = 1053; s.pc = 298; return s.tmp_101; }
     }
   case 298:
     r0 = s.retval;
     s.tmp_100 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_100, inline__P118369);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_100, inline__P93101);
     s.tmp_104 = if_page_2_1_mk(s);
     s.tmp_105 = if_modifier_1_mk(s);
-    s.tmp_105.arg0 = globals.tid___110372;
+    s.tmp_105.arg0 = globals.tid___85125;
     if (!s.tmp_105.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_105.arg0, "modifier");
     } else {
       s.tmp_105.fn = s.tmp_105.arg0.vtable.iface["modifier"];
       if (s.tmp_105.fn == null) { s.retval = s.tmp_105.arg0.fields["modifier"]; }
       else if (!s.tmp_105.fn.isGetter) { s.retval = bind(s.tmp_105); }
-     else { s.callLocIdx = 1055; s.pc = 301; return s.tmp_105; }
+     else { s.callLocIdx = 1054; s.pc = 301; return s.tmp_105; }
     }
   case 301:
     r0 = s.retval;
@@ -5619,22 +5624,22 @@ switch (step) {
       s.tmp_104.fn = s.tmp_104.arg0.vtable.iface["page_2"];
       if (s.tmp_104.fn == null) { s.retval = s.tmp_104.arg0.fields["page_2"]; }
       else if (!s.tmp_104.fn.isGetter) { s.retval = bind(s.tmp_104); }
-     else { s.callLocIdx = 1056; s.pc = 300; return s.tmp_104; }
+     else { s.callLocIdx = 1055; s.pc = 300; return s.tmp_104; }
     }
   case 300:
     r0 = s.retval;
     s.tmp_103 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_103, inline__P118380);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_103, inline__P93111);
     s.tmp_107 = if_page_3_1_mk(s);
     s.tmp_108 = if_modifier_1_mk(s);
-    s.tmp_108.arg0 = globals.tid___110372;
+    s.tmp_108.arg0 = globals.tid___85125;
     if (!s.tmp_108.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_108.arg0, "modifier");
     } else {
       s.tmp_108.fn = s.tmp_108.arg0.vtable.iface["modifier"];
       if (s.tmp_108.fn == null) { s.retval = s.tmp_108.arg0.fields["modifier"]; }
       else if (!s.tmp_108.fn.isGetter) { s.retval = bind(s.tmp_108); }
-     else { s.callLocIdx = 1057; s.pc = 303; return s.tmp_108; }
+     else { s.callLocIdx = 1056; s.pc = 303; return s.tmp_108; }
     }
   case 303:
     r0 = s.retval;
@@ -5645,22 +5650,22 @@ switch (step) {
       s.tmp_107.fn = s.tmp_107.arg0.vtable.iface["page_3"];
       if (s.tmp_107.fn == null) { s.retval = s.tmp_107.arg0.fields["page_3"]; }
       else if (!s.tmp_107.fn.isGetter) { s.retval = bind(s.tmp_107); }
-     else { s.callLocIdx = 1058; s.pc = 302; return s.tmp_107; }
+     else { s.callLocIdx = 1057; s.pc = 302; return s.tmp_107; }
     }
   case 302:
     r0 = s.retval;
     s.tmp_106 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_106, inline__P118391);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_106, inline__P93121);
     s.tmp_110 = if_page_4_1_mk(s);
     s.tmp_111 = if_modifier_1_mk(s);
-    s.tmp_111.arg0 = globals.tid___110372;
+    s.tmp_111.arg0 = globals.tid___85125;
     if (!s.tmp_111.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_111.arg0, "modifier");
     } else {
       s.tmp_111.fn = s.tmp_111.arg0.vtable.iface["modifier"];
       if (s.tmp_111.fn == null) { s.retval = s.tmp_111.arg0.fields["modifier"]; }
       else if (!s.tmp_111.fn.isGetter) { s.retval = bind(s.tmp_111); }
-     else { s.callLocIdx = 1059; s.pc = 305; return s.tmp_111; }
+     else { s.callLocIdx = 1058; s.pc = 305; return s.tmp_111; }
     }
   case 305:
     r0 = s.retval;
@@ -5671,22 +5676,22 @@ switch (step) {
       s.tmp_110.fn = s.tmp_110.arg0.vtable.iface["page_4"];
       if (s.tmp_110.fn == null) { s.retval = s.tmp_110.arg0.fields["page_4"]; }
       else if (!s.tmp_110.fn.isGetter) { s.retval = bind(s.tmp_110); }
-     else { s.callLocIdx = 1060; s.pc = 304; return s.tmp_110; }
+     else { s.callLocIdx = 1059; s.pc = 304; return s.tmp_110; }
     }
   case 304:
     r0 = s.retval;
     s.tmp_109 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_109, inline__P118402);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_109, inline__P93131);
     s.tmp_113 = if_page_5_1_mk(s);
     s.tmp_114 = if_modifier_1_mk(s);
-    s.tmp_114.arg0 = globals.tid___110372;
+    s.tmp_114.arg0 = globals.tid___85125;
     if (!s.tmp_114.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_114.arg0, "modifier");
     } else {
       s.tmp_114.fn = s.tmp_114.arg0.vtable.iface["modifier"];
       if (s.tmp_114.fn == null) { s.retval = s.tmp_114.arg0.fields["modifier"]; }
       else if (!s.tmp_114.fn.isGetter) { s.retval = bind(s.tmp_114); }
-     else { s.callLocIdx = 1061; s.pc = 307; return s.tmp_114; }
+     else { s.callLocIdx = 1060; s.pc = 307; return s.tmp_114; }
     }
   case 307:
     r0 = s.retval;
@@ -5697,22 +5702,22 @@ switch (step) {
       s.tmp_113.fn = s.tmp_113.arg0.vtable.iface["page_5"];
       if (s.tmp_113.fn == null) { s.retval = s.tmp_113.arg0.fields["page_5"]; }
       else if (!s.tmp_113.fn.isGetter) { s.retval = bind(s.tmp_113); }
-     else { s.callLocIdx = 1062; s.pc = 306; return s.tmp_113; }
+     else { s.callLocIdx = 1061; s.pc = 306; return s.tmp_113; }
     }
   case 306:
     r0 = s.retval;
     s.tmp_112 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_112, inline__P118413);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_112, inline__P93141);
     s.tmp_116 = if_express_none_1_mk(s);
     s.tmp_117 = if_modifier_1_mk(s);
-    s.tmp_117.arg0 = globals.tid___110372;
+    s.tmp_117.arg0 = globals.tid___85125;
     if (!s.tmp_117.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_117.arg0, "modifier");
     } else {
       s.tmp_117.fn = s.tmp_117.arg0.vtable.iface["modifier"];
       if (s.tmp_117.fn == null) { s.retval = s.tmp_117.arg0.fields["modifier"]; }
       else if (!s.tmp_117.fn.isGetter) { s.retval = bind(s.tmp_117); }
-     else { s.callLocIdx = 1063; s.pc = 309; return s.tmp_117; }
+     else { s.callLocIdx = 1062; s.pc = 309; return s.tmp_117; }
     }
   case 309:
     r0 = s.retval;
@@ -5723,22 +5728,22 @@ switch (step) {
       s.tmp_116.fn = s.tmp_116.arg0.vtable.iface["express_none"];
       if (s.tmp_116.fn == null) { s.retval = s.tmp_116.arg0.fields["express_none"]; }
       else if (!s.tmp_116.fn.isGetter) { s.retval = bind(s.tmp_116); }
-     else { s.callLocIdx = 1064; s.pc = 308; return s.tmp_116; }
+     else { s.callLocIdx = 1063; s.pc = 308; return s.tmp_116; }
     }
   case 308:
     r0 = s.retval;
     s.tmp_115 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_115, inline__P118424);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_115, inline__P93151);
     s.tmp_119 = if_express_happy_1_mk(s);
     s.tmp_120 = if_modifier_1_mk(s);
-    s.tmp_120.arg0 = globals.tid___110372;
+    s.tmp_120.arg0 = globals.tid___85125;
     if (!s.tmp_120.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_120.arg0, "modifier");
     } else {
       s.tmp_120.fn = s.tmp_120.arg0.vtable.iface["modifier"];
       if (s.tmp_120.fn == null) { s.retval = s.tmp_120.arg0.fields["modifier"]; }
       else if (!s.tmp_120.fn.isGetter) { s.retval = bind(s.tmp_120); }
-     else { s.callLocIdx = 1066; s.pc = 311; return s.tmp_120; }
+     else { s.callLocIdx = 1065; s.pc = 311; return s.tmp_120; }
     }
   case 311:
     r0 = s.retval;
@@ -5749,22 +5754,22 @@ switch (step) {
       s.tmp_119.fn = s.tmp_119.arg0.vtable.iface["express_happy"];
       if (s.tmp_119.fn == null) { s.retval = s.tmp_119.arg0.fields["express_happy"]; }
       else if (!s.tmp_119.fn.isGetter) { s.retval = bind(s.tmp_119); }
-     else { s.callLocIdx = 1067; s.pc = 310; return s.tmp_119; }
+     else { s.callLocIdx = 1066; s.pc = 310; return s.tmp_119; }
     }
   case 310:
     r0 = s.retval;
     s.tmp_118 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_118, inline__P118438);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_118, inline__P93163);
     s.tmp_122 = if_express_angry_1_mk(s);
     s.tmp_123 = if_modifier_1_mk(s);
-    s.tmp_123.arg0 = globals.tid___110372;
+    s.tmp_123.arg0 = globals.tid___85125;
     if (!s.tmp_123.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_123.arg0, "modifier");
     } else {
       s.tmp_123.fn = s.tmp_123.arg0.vtable.iface["modifier"];
       if (s.tmp_123.fn == null) { s.retval = s.tmp_123.arg0.fields["modifier"]; }
       else if (!s.tmp_123.fn.isGetter) { s.retval = bind(s.tmp_123); }
-     else { s.callLocIdx = 1069; s.pc = 313; return s.tmp_123; }
+     else { s.callLocIdx = 1068; s.pc = 313; return s.tmp_123; }
     }
   case 313:
     r0 = s.retval;
@@ -5775,22 +5780,22 @@ switch (step) {
       s.tmp_122.fn = s.tmp_122.arg0.vtable.iface["express_angry"];
       if (s.tmp_122.fn == null) { s.retval = s.tmp_122.arg0.fields["express_angry"]; }
       else if (!s.tmp_122.fn.isGetter) { s.retval = bind(s.tmp_122); }
-     else { s.callLocIdx = 1070; s.pc = 312; return s.tmp_122; }
+     else { s.callLocIdx = 1069; s.pc = 312; return s.tmp_122; }
     }
   case 312:
     r0 = s.retval;
     s.tmp_121 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_121, inline__P118452);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_121, inline__P93175);
     s.tmp_125 = if_express_heart_1_mk(s);
     s.tmp_126 = if_modifier_1_mk(s);
-    s.tmp_126.arg0 = globals.tid___110372;
+    s.tmp_126.arg0 = globals.tid___85125;
     if (!s.tmp_126.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_126.arg0, "modifier");
     } else {
       s.tmp_126.fn = s.tmp_126.arg0.vtable.iface["modifier"];
       if (s.tmp_126.fn == null) { s.retval = s.tmp_126.arg0.fields["modifier"]; }
       else if (!s.tmp_126.fn.isGetter) { s.retval = bind(s.tmp_126); }
-     else { s.callLocIdx = 1072; s.pc = 315; return s.tmp_126; }
+     else { s.callLocIdx = 1071; s.pc = 315; return s.tmp_126; }
     }
   case 315:
     r0 = s.retval;
@@ -5801,22 +5806,22 @@ switch (step) {
       s.tmp_125.fn = s.tmp_125.arg0.vtable.iface["express_heart"];
       if (s.tmp_125.fn == null) { s.retval = s.tmp_125.arg0.fields["express_heart"]; }
       else if (!s.tmp_125.fn.isGetter) { s.retval = bind(s.tmp_125); }
-     else { s.callLocIdx = 1073; s.pc = 314; return s.tmp_125; }
+     else { s.callLocIdx = 1072; s.pc = 314; return s.tmp_125; }
     }
   case 314:
     r0 = s.retval;
     s.tmp_124 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_124, inline__P118466);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_124, inline__P93187);
     s.tmp_128 = if_express_sad_1_mk(s);
     s.tmp_129 = if_modifier_1_mk(s);
-    s.tmp_129.arg0 = globals.tid___110372;
+    s.tmp_129.arg0 = globals.tid___85125;
     if (!s.tmp_129.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_129.arg0, "modifier");
     } else {
       s.tmp_129.fn = s.tmp_129.arg0.vtable.iface["modifier"];
       if (s.tmp_129.fn == null) { s.retval = s.tmp_129.arg0.fields["modifier"]; }
       else if (!s.tmp_129.fn.isGetter) { s.retval = bind(s.tmp_129); }
-     else { s.callLocIdx = 1075; s.pc = 317; return s.tmp_129; }
+     else { s.callLocIdx = 1074; s.pc = 317; return s.tmp_129; }
     }
   case 317:
     r0 = s.retval;
@@ -5827,13 +5832,13 @@ switch (step) {
       s.tmp_128.fn = s.tmp_128.arg0.vtable.iface["express_sad"];
       if (s.tmp_128.fn == null) { s.retval = s.tmp_128.arg0.fields["express_sad"]; }
       else if (!s.tmp_128.fn.isGetter) { s.retval = bind(s.tmp_128); }
-     else { s.callLocIdx = 1076; s.pc = 316; return s.tmp_128; }
+     else { s.callLocIdx = 1075; s.pc = 316; return s.tmp_128; }
     }
   case 316:
     r0 = s.retval;
     s.tmp_127 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_127, inline__P118480);
-    globals.librarydb___117059 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, s.tmp_127, inline__P93199);
+    globals.librarydb___91948 = (s.tmp_0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "None", "feel.0");
@@ -5841,31 +5846,31 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "Angry", "feel.2");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "Heart", "feel.3");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "Sad", "feel.4");
-    globals.Feeling___136331 = (s.tmp_0);
-    globals.SAVEGAME___565300 = ("saveGame5");
-    globals.STAGE_ID___565304 = ("world");
-    globals.kodu_WorldStage_ID___565307 = (globals.STAGE_ID___565304);
-    globals.STAGE_ID___511062 = ("kode");
-    globals.kodu_KodeStage_ID___511065 = (globals.STAGE_ID___511062);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_App__C110406_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = kodu_App_constructor__P110409_mk(s);
+    globals.Feeling___85159 = (s.tmp_0);
+    globals.SAVEGAME___94045 = ("saveGame5");
+    globals.STAGE_ID___94049 = ("world");
+    globals.kodu_WorldStage_ID___85218 = (globals.STAGE_ID___94049);
+    globals.STAGE_ID___96035 = ("kode");
+    globals.kodu_KodeStage_ID___85246 = (globals.STAGE_ID___96035);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_App__C85189_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = kodu_App_constructor__P85192_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 1628; s.pc = 318; return s.tmp_1;
   case 318:
     r0 = s.retval;
-    globals.app___110079 = (s.tmp_0);
+    globals.app___84831 = (s.tmp_0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P579321.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/arcade-text/main.ts","functionName":"<main>","argumentNames":[]}
-_main___P579321.continuations = [  ]
+_main___P109939.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/arcade-text/main.ts","functionName":"<main>","argumentNames":[]}
+_main___P109939.continuations = [  ]
 
-function _main___P579321_mk(s) {
+function _main___P109939_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P579321, depth: s.depth + 1,
+        parent: s, fn: _main___P109939, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6373,94 +6378,94 @@ function _main___P579321_mk(s) {
   tmp_503: undefined,
 } }
 
-const _hex123152 = pxsim.BufferMethods.createBufferFromHex("2000000000000000210000005e0000002200000e000e0000230028fe28fe280024004c92ff926400250002651248a64026006c92926ca000270000000e000000280000007c82000029000000827c00002a005438103854002b0010107c1010002c000000907000002d001010101010002e000000606000002f000060100806003000003c42423c00310000447e4000003200004462524c00330000424a4e320034003028247e20003500004e4a4a32003600003c4a4a30003700000262120e00380000344a4a34003900000c52523c003a0000006c6c00003b000000967600003c001028284444003d002828282828003e004444282810003f0000025909060040003c425a560800410078141214780042007e4a4a4a34004300003c424224004400007e42423c004500007e4a4a42004600007e0a0a02004700003c425234004800007e08087e00490000427e4200004a002040423e02004b00007e081462004c00007e404040004d007e0418047e004e00007e04087e004f003c4242423c005000007e12120c005100003c5262bc005200007e12126c00530000244a522400540002027e0202005500003e40403e005600001e70701e0057007e2018207e00580042241824420059000608700806005a000062524a46005b00007e424200005c000006081060005d000042427e00005e000804020408005f00808080808000600000000204000061000030484878006200007e4848300063000030484848006400003048487e006500003068585000660000107c12040067000018a4a478006800007e08087000690000487a4000006a000040847d00006b00007e102840006c0000427e4000006d007808300870006e000078080870006f00003048483000700000fc24241800710000182424fc0072000078100810007300005058682800740000083e48200075000038404078007600001860601800770038403040380078000048303048007900005ca0a07c007a000048685848007b000008364100007c000000fe0000007d000041360800007e00000804080400a000000000000000a10000007a000000a200003048fc4800a30090fc92928400a400542844285400a5002a2c782c2a00a6000000ee000000a7000094aaaa5200a800000200020000a9003e414955413eaa0000242a2e0000ab00102854284400ac00001010107000ad00001010101000ae003e415d45413eaf00000202020200b000000814140800b1008888be888800b2000024322c0000b30000222a140000b400000004020000b50000f840207800b6000c1e7e027e00b700000010000000b800000080400000b90000243e200000ba0000242a240000bb00442854281000bc00025f70f84000bd00021f90c8b000be0011557af84000bf000030484d2000c000601916186000c100601816196000c200601a151a6000c300601a151a6100c400601914196000c500601a151a6000c6007c0a7e4a4200c700001ea1611200c800007c55564400c900007c56554400ca00007c56554600cb00007c55544500cc0000457e440000cd0000447e450000ce0000467d460000cf0000457c450000d000087e4a423c00d100007e09127d00d200003845463800d300003846453800d400003846453a00d500003a45463900d600003845443900d700442810284400d80000fc724e3f00d900003c41423c00da00003c42413c00db00003c42413e00dc00003c41403d00dd00040872090400de00007e24241800df00007c025a2400e0000030494a7800e10000304a497800e20000304a497a00e3000032494a7900e40000304a487a00e50000304a4d7a00e600304878685000e7000018a4642400e8000030695a5000e90000306a595000ea0000306a595200eb0000306a585200ec0000497a400000ed0000487a410000ee00004a79420000ef00004a78420000f00000304a4b3d00f100007a090a7100f2000030494a3000f30000304a493000f40000304a493200f5000032494a3100f60000304a483200f700101054101000f800007068583800f900003841427800fa00003842417800fb00003842417a00fc00003842407a00fd0000b84241f800fe0000ff24241800ff00005ca1a07d000001601915196000010100304a4a7a000201611a16196000030100314a4a790004013c0a094abc00050100182464bc000601003846452800070100304a4948000801003846452a00090100304a494a000a010038444528000b010030484a48000c010038454629000d010030494a49000e01007c454639000f0100314a497e001001087e4a423c00110130484c7e04001201007d55554500130100326a5a52001401007d56564500150100316a5a51001601007c55544400170100306a5850001801003f65a521001901001874ac28001a01007c555645001b010030695a51001c010038465536001d0100304a49f2001e010039465635001f0100314a4af100200100384455340021010018a4a578002201001ea1691a0023010018a6a578002401007812117a0025017e080a7102002601047e147e04002701047e0c08700028010002457e450029010002497a41002a0100457d4500002b01004a7a4200002c0100014a7a49002d0100014a7a41002e0100217fa100002f0100247da00000300100447d440000310100487840000032017e0022423e0033013d0040847d0034012040463d0600350100800af90200360100bf440a3100370100bf4814200038010078102848003901007c404241003a0100467d4000003b01003fa06020003c0100a17f2000003d01007c414241003e0100457e4100003f01007e40484000400100427e4008004101107e48404000420100527e4800004301007c0a117c00440100780a097000450100bf42043f00460100bc440438004701007c09127d00480100790a09700049010a06780870004a01003f02847f004b01003c048478004c013945454539004d0100324a4a32004e013946464639004f0100314a4a310050013a4544463900510132494832010052013c427e4a420053013048306850005401007c163548005501007812091000560100bf49093600570100bc480408005801007d1635480059010079120910005a010048565524005b0100505a6928005c010048565526005d0100505a692a005e010012a56912005f010028ac741400600100485556250061010050596a290062010101bf410100630100049f641000640104057e050400650100083d4a2100660102127e120200670100183e5820006801003a414239006901003a414279006a01003d41413d006b01003a42427a006c010039424239006d010039424279006e01003a45453a006f01003a45457a0070013a41403a010071013a41407a01007201001f60a01f007301001c60a03c00740178221122780075013842314238007601081261120800770100b84241fa00780104097009040079010064564d44007a0100486a5948007b010064544d44007c010048685a48007d010064554e45007e010048695a49007f0100087c0204008f01003452523c00920100887e090200a0013c42423c0806a101003048483008af01003e403e0806b001003840781008b501006a5a4a4e00b601005878585800d101003845463900d2010030494a3100e601003845563500e7010030494af100fa0100742a750000fb0100304c4a7d00fc0178147e554400fd0130487a695000fe010078744e3d00ff0100706a59380018020012a569120019020028ac7414001a020101bf4101001b0200049f641000bb0200000c0a0000bc0200000a060000bd020000060a0000c602000201020000c702000102010000c902000202020000d802000102020100d902000002000000da02000205020000db02000040800000dc02000201020100dd02020100020100740300000201000075030000804000007a030000c08000007e03000096760000840300000300000085030200030002008603037c12127c008703000010000000880303007e4a4200890303007e087e008a030300427e42008c03033c42423c008e0303000e700e008f03035c62625c00900302003b400200910378141214780092037e4a4a4a34009303007e0202020094036058465860009503007e4a4a420096030062524a46009703007e08087e0098033c4a4a4a3c00990300427e4200009a03007e081462009b036018061860009c037e0418047e009d03007e04087e009e0300424a4a42009f033c4242423c00a003007e02027e00a103007e12120c00a30300665a424200a40302027e020200a503060870080600a60318247e241800a703422418244200a8030e107e100e00a9035c6202625c00aa0300457c450000ab03040970090400ac030030484a7900ad030030685a5100ae0378100a09f000af03003a41200000b0033a4043403a00b103003048487800b20300fe25251a00b3030c30c0300c00b403344a4a4a3000b503003068585000b603021aa6a24200b7033c080404f800b803003c4a4a3c00b903003840200000ba03007820504800bb03641212227c00bc03fc2020103c00bd03182040201800be03112d2ba94100bf03003048483000c003087808780800c103f82424241800c2031824a4a44800c303304848582800c403000838482800c503384040403800c6031c20f8241800c703c4281028c400c8031c20fc201c00c903304820483000ca03000238422000cb03384240423800cc0330484a493000cd03384042413800ce03304822493000d0033c52525c2000d10310344a3c0800d203067804020400d303120a7c020400d4030d7009040800d5031824ff241800d603384828483800d70348302221d800da031c2221a14200db031824a4a44200dc037e1212020200dd0300fc24240400de033e2010087c00df030c0ac9281800e003700c621c7000e10301092516f800e2039ea0bea07e00e30398a0b8a07800e4030c1214107e00e503001028207800e603be9088887000e70348544e443800e803245252524c00e903285454544800ea0364524c526400eb03086458640800ec03385454542200ed03306848682400ee03184a7e4a1800ef031848ff0a0800f003483020205800f10378a4a4a49800f203304848485000f303006080847d00f4033c4a4a4a3c00f5030030585848000004007c555644000104007c55544500020401013f8579000304007c0605040004043c4a4a422400050400244a522400060400427e420000070400457c45000008042040423e020009047c027e4830000a047e087e4830000b0402027e0a72000c04007c102a45000d047c2112087c000e040c5152523d000f043f20e0203f00100478141214780011047e4a4a4a300012047e4a4a4a34001304007e020202001404c07c427ec0001504007e4a4a4200160476087e087600170424424a4a34001804007e08047e001904007d120a7d001a04007e081462001b04403c02027e001c047e0418047e001d04007e08087e001e043c4242423c001f047e0202027e002004007e12120c002104003c42422400220402027e02020023040e5050503e00240418247e241800250442241824420026043f2020bf600027040e1010107e0028047e407e407e0029043f203fa07f002a04027e484830002b047e4848307e002c04007e484830002d0424424a4a3c002e047e183c423c002f04006c12127e0030043048487840003104003c4a4a3100320400786850200033040078080808003404c0704878c000350430686850000036044830783048003704004058683000380478402010780039047942221279003a040078203048003b044030080878003c047810201078003d047810101078003e043048484830003f047808080878004004fc24242418004104304848485000420408087808080043041ca0a0a07c0044041824ff241800450400483030480046043c2020bc60004704182020207800480478407840780049043c203ca07c004a040878505020004b047850502078004c040078505020004d044858683000004e047830304830004f0450282878000050040030696a500051040032686a50005204023f0a887000530400780a09080054040030685848005504005058682800560400487a4000005704004a784200005804004080847d0059047008785020005a047810785020005b04047e141060005c040078223148005d047841221078005e0418a1a2a279005f043c20e0203c006204027f4a4830006304087e5850200070040e107e100e00710418207820180072043c4a4a4a3c0073043068586830007404001e70180c0075040018603010009004007e020203009104007808080c009204087e0a0a0200930420782808080096043b043f043be0970424183c1824c09a04003f040a31c09b04003c101824c0ae04060870080600af040c10e0100c00b004161870181600b1042c30e0302c00b20421120c1221c0b3040024181824c0ba047e0808087000bb04007e08087000d804003452523c00d904002868583000e20400457d450000e304004a7a420000e8043c4a4a4a3c00e904003058583000ee04003d41413d00ef04003a42427a00d005681020285000d105484848784000d205004830600000d305080808780800d405680808087800d505000008780000d605080818680800d705087808087800d805784050487800d905000008180000da0504040404fc00db05484848483800dc050e4848281800dd05087848487800de05582010487000df05000004fc0000e005004040487800e105000878483800e205487840281800e305041c0404fc00e405485848483800e50504f820140800e605485060685000e705f40424241c00e805080808087000e905785058403800ea05487808087800f005087800087800f105081800087800f205081800081800f305000010080000f405100800100800021e7c5455542800031e007e484930000a1e007c454438000b1e003049487e001e1e007c151404001f1e001079140800401e7e0419047e00411e780832087000561e007c15140800571e00fc25241800601e004854552400611e0050586a28006a1e04047d0404006b1e00083d482000801e7c2112207c00811e384132403800821e7c2012217c00831e384032413800841e7c2110217c00851e384230423800f21e040972080400f31e00b84142f800a3207e0a7a120a00a420a8fcaa828400a720087e2a1c0800ab200098a4a6bf02ac20183c5a5a4200af20627f224438009021103854101000912108047e0408009221101054381000932110207e201000942110381010381095212844fe442800")
-const _hex123154 = pxsim.BufferMethods.createBufferFromHex("20000000000000000000000000000000000000000000000000002100000000000006fc0000000000000000000000000000000000220000001c00000000001c0000000000000000000000000000002300a000f807a000f807a00000000000000000000000000000002400000018022404460c8803000000000000000000000000000025003802c4017800200390040803000000000000000000000000260080037804a4041803800340040000000000000000000000002700000000001c00000000000000000000000000000000000000280000000000f8010606010800000000000000000000000000002900000001080606f801000000000000000000000000000000002a00040014000e001400040000000000000000000000000000002b0040004000f8034000400000000000000000000000000000002c000000000000090006000000000000000000000000000000002d000000800080008000000000000000000000000000000000002e000000000000060000000000000000000000000000000000002f00000c800360001c000300000000000000000000000000000030000000f80304040404f80300000000000000000000000000003100000004040404fc07000400040000000000000000000000003200000008060405c4043804000000000000000000000000000033000000080244044404b803000000000000000000000000000034000000800170010801fc070001000000000000000000000000350000023c0424042404c403000000000000000000000000000036000000f0034804440488030000000000000000000000000000370000000400c40734000c00000000000000000000000000000038000000b80344044404b803000000000000000000000000000039000000780284048802f00100000000000000000000000000003a000000000030060000000000000000000000000000000000003b000000000018090006000000000000000000000000000000003c004000a000a000a000100100000000000000000000000000003d002001200120012001200100000000000000000000000000003e0000001001a000a000a00040000000000000000000000000003f000000080084066400180000000000000000000000000000004000f0030c04c20822092409f80900000000000000000000000041000007f8008400f8000007000000000000000000000000000042000000fc0744044404b803000000000000000000000000000043000000f001080204040404080200000000000000000000000044000000fc0704040802f001000000000000000000000000000045000000fc07440444044404000000000000000000000000000046000000fc07440044004400000000000000000000000000000047000000f00108024404c803000000000000000000000000000048000000fc0740004000fc070000000000000000000000000000490000000404fc070404040400000000000000000000000000004a000000000200040004fc0300000000000000000000000000004b000000fc074000f0000c0304040000000000000000000000004c000000fc0700040004000400000000000000000000000000004d000000fc0738007000fc0700000000000000000000000000004e000000fc073800c003fc0700000000000000000000000000004f000000f80304040404f803000000000000000000000000000050000000fc07840084004400780000000000000000000000000051000000fc0102020206fc09000000000000000000000000000052000000fc074400c4013806000000000000000000000000000053000000180224044404880300000000000000000000000000005400000004000400fc070400040000000000000000000000000055000000fc0300040004fc03000000000000000000000000000056000c00f0030004f0030c00000000000000000000000000000057007c008007e001f0010007fc0000000000000000000000000058000404b8034000b80304040000000000000000000000000000590004003800c00730000c0000000000000000000000000000005a0004040407e4041c04040400000000000000000000000000005b0000000000ff0f0108010800000000000000000000000000005c0003001c0060008003000c00000000000000000000000000005d00000001080108ff0f000000000000000000000000000000005e004000380004003800400000000000000000000000000000005f00000800080008000800080000000000000000000000000000600000000000020004000000000000000000000000000000000061000000200390049004e007000000000000000000000000000062000000fc0710041004e003000000000000000000000000000063000000c001200210043004000200000000000000000000000064000000e00310041004fc07000000000000000000000000000065000000e00390049004e0040000000000000000000000000000660000001000f80714001400000000000000000000000000000067000000b806440944093c09040600000000000000000000000068000000fc0710001000e0070000000000000000000000000000690000000000f4070000000000000000000000000000000000006a00000800080008fd07000000000000000000000000000000006b000000fe078000e001100610040000000000000000000000006c0000000000fc030004000400000000000000000000000000006d00f00710001000e0071000e0070000000000000000000000006e000000f00710001000e00700000000000000000000000000006f000000e00310041004e003000000000000000000000000000070000000fc0f04010401f800000000000000000000000000000071000000f80004010401fc0f000000000000000000000000000072000000f00720001000100000000000000000000000000000007300000060029004900420030000000000000000000000000000740000001000fc0310041004000000000000000000000000000075000000f00300040004f007000000000000000000000000000076003000c0030004c003300000000000000000000000000000007700f0000007e003c0010007f000000000000000000000000000780010046003800060031004000000000000000000000000000079000c0870088007f0000c0000000000000000000000000000007a000000000410079004700410040000000000000000000000007b0000004000be070108010800000000000000000000000000007c0000000000ff0f0000000000000000000000000000000000007d00000001080108be07400000000000000000000000000000007e00800040004000800080004000000000000000000000000000")
-const _hex127564 = pxsim.BufferMethods.createBufferFromHex("20000000000000002100001700000000220000030003000023000a1f0a1f0a0024000a17151d0a00250013090412190026000a15150a100027000003000000002800000e11000000290000110e0000002a00000a040a00002b0000040e0400002c000010080000002d000004040400002e000008000000002f0010080402010030000e11110e0000310000121f100000320019151512000033000911150b000034000c0a091f080035001715151509003600081416150800370011090503010038000a1515150a00390002150d0502003a00000a000000003b0000100a0000003c0000040a1100003d00000a0a0a00003e0000110a0400003f0002011505020040000e1115090e0041001e05051e000042001f15150a000043000e111111000044001f11110e000045001f151511000046001f050501000047000e1111150c0048001f04041f00004900111f110000004a000911110f01004b001f040a1100004c001f10101000004d001f0204021f004e001f0204081f004f000e11110e000050001f0505020000510006091916000052001f05050a10005300121515090000540001011f01010055000f10100f0000560007081008070057001f0804081f0058001b04041b0000590001021c0201005a001915131100005b00001f111100005c000102040810005d000011111f00005e000002010200005f00101010101000600000010200000061000c12121e100062001f141408000063000c121212000064000814141f000065000e15151200006600041e0501000067000215150f000068001f04041800006900001d000000006a000010100d00006b001f040a1000006c00000f101000006d001e0204021e006e001e02021c00006f000c12120c000070001e0a0a0400007100040a0a1e000072001c0202020000730010140a0200007400000f1414100075000e10101e1000760006081008060077001e1008101e007800120c0c12000079001214080402007a00121a161200007b0000041f1100007c00001f000000007d00111f040000007e00000404080800d3000c1213130c00f3000c12130d000004010e05051e100005010609191f080006010c121313120007010c121313000018010f0b1b19000019010e151d1a000041011f14121000004201100f1412000043011f0205081f0044011e03031c00005a0110140b0302005b0110140b0300007901121a171300007a01121a171300007b01121b171200007c01121b17120000")
-const _hex110655 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
-const _hex111145 = pxsim.BufferMethods.createBufferFromHex("8704240024000000001111111111111111111111111111111100000010313333333333333333333333333333130100001113111111111111111111111111111131110000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000111311111111111111111111111111113111000010313333333333333333333333333333130100000011111111111111111111111111111111000000")
-const _hex111147 = pxsim.BufferMethods.createBufferFromHex("8704240024000000002222222222222222222222222222222200000020323333333333333333333333333333230200002223222222222222222222222222222232220000322211111111111111111111111111112223000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003222111111111111111111111111111122230000222322222222222222222222222222223222000020323333333333333333333333333333230200000022222222222222222222222222222222000000")
-const _hex111149 = pxsim.BufferMethods.createBufferFromHex("8704240024000000004444444444444444444444444444444400000040343333333333333333333333333333430400004443444444444444444444444444444434440000344411111111111111111111111111114443000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003444111111111111111111111111111144430000444344444444444444444444444444443444000040343333333333333333333333333333430400000044444444444444444444444444444444000000")
-const _hex111151 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d00000000000000000000000070666607000000000000000000000000006776000000000000000000000000660700007066000000000000000000006766777766760000000000000000000060666666660600000000000000000066006766667600660000000000000000667600000000676600000000000000006766767777676676000000000000000060666666666666060000000000000000006766666666760000000000000000000000676666760000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex111153 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0bb000000000000000000000000b000404500b0000000000000000000005b0b000400540b0000000000000000b0550400000054b5000000000000000000440040bb0040040000000000000000000040d4ddbb0000000000000000000000004055ddbd000000000000000000004b005455d5dd0b400b000000000000005b045411d5dd0b540b000000000000004b005411d5dd0b400b0000000000000000004055ddbd00000000000000000000000040d4ddbb0000000000000000000000440040bb0040040000000000000000b0550400000054b50000000000000000005b04000400540b000000000000000000b000404500b0000000000000000000000000b0bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex111155 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020020000000000002002000000000000202200000000000022020000000000000022020000000020220000000000000000202200000000220200000000000000000022020000202200000000000000000000202200002202000000000000000000000022022022000000000000000000000000202222020000000000000000000000000022220000000000000000000000000000222200000000000000000000000000202222020000000000000000000000002202202200000000000000000000002022000022020000000000000000000022020000202200000000000000000020220000000022020000000000000000220200000000202200000000000000202200000000000022020000000000002002000000000000200200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex111157 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d0000000000000000000000007066660700000000000000000000000000677600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex111159 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0cbcc0c0000000000000000000000b0db55d5cd0c00000000000000000000db555555ddcd000000000000000000b055555555d59d0b0000000000000000db55555555d59db900000000000000005b55555555d5ddb900000000000000b05db5cccc5bdddd990b000000000000b055ccccccccdddd9d0b000000000000b0b5ccccccccdbdd9d0b000000000000b0c5ccccccccdcdd9d0b000000000000b0c5ccdccbccdcdd9d0c000000000000b0cdcc5b55ccdcdd9d0c00000000000000ccdc55b5ccdcddc90000000000000000cccc5b55ccdbddc90000000000000000c0ccdccbccdd9d0c000000000000000000ccccccdbddcd00000000000000000000c0dcddddcd0c0000000000000000000000c0cccc0c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex111161 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc00000000000000b0bbbbbbbbcb00c0cd000000000000001bddddddddbd0c1ccd000000000000b011cbccccccbc0c1ccd000000000000b01d6c666666bc0cbccd000000000000b01d6c616661bc0c1ccd000000000000b01d6c161666bccc1bcd000000000000b01d6c666166bcccbbcd000000000000b01d6c666666bccc1bcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666661bcccbbcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666666bc0c1ccd000000000000b01dcbccccccbc0cbccd000000000000c0b1bbbbbbbbbb0cdccb000000000000c0bbbbbbbbbbcb00dc0c00000000000000cccccccccc0c00cc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex111163 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004004000000000000000000000000000054450000000000000000000000440b00bbbb00b0440000000000000040550b00000000b0550400000000000040b5000044bb00005b04000000000000b00b0044ddddbb00b00b0000000000000000405d55d5dd0b00000000000000000000d4555555ddbd0000000000000000000054555555d5bd0000000000000000b44055555555d5dd0b4b000000000040b54055555555d5dd0b5b040000000040b54055555555d5dd0b5b040000000000b44055115555d5dd0b4b000000000000000054115555d5bd00000000000000000000d4555555ddbd00000000000000000000405d55d5dd0b0000000000000000b00b0044ddddbb00b00b00000000000040b5000044bb00005b0400000000000040550b00000000b0550400000000000000440b00bbbb00b0440000000000000000000000544500000000000000000000000000004004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex111165 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bbbb00000000000000000000000000b055bb00bbbbbb000000000000000000b0b5bdbcbbbbddcb0000000000000000b0dbcb5b5555bbdd0c00000000000000b0cbdcbdbb5b55dbcd0000000000000000c0dddb11d15bb5bd0c00000000000000bbbd111111b155bb0c00000000000000db1b111111115bb5cb00000000000000db1bb11d1199b9d5cb00000000000000db1b11bb9199b955cb000000000000005b1b11b19b99995bcb000000000000005b1d1111bb99995ccb00000000000000b0b511bbbb99995ccb00000000000000b0d51d919999d95b0b00000000000000005bdb919999c9d50b0000000000000000b0d51b99d9bcb5000000000000000000005bd5bbbc550b00000000000000000000b05b5555bd000000000000000000000000b0bbbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113721 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000020222222220200002002000020020000202000000202000020000220000200002000200200020000200020020002000020000220000200002020000002020000200200002002000020222222220200000000000000000000000000000000000000000000000000")
-const _hex113578 = pxsim.BufferMethods.createBufferFromHex("870407000700000000ff0f00005f0f00ff5fff0f5f55550fff5fff0f005f0f0000ff0f00")
-const _hex113709 = pxsim.BufferMethods.createBufferFromHex("8704090015000000000000000000000000000000777777777777777777770c00777777c177171c7c177c0c0077171c1c7c171c1c1c7c0c0017111c111c111c1c1c7c0c00171c7c171c1c1c1c1c7c0c00171c1c111c1c7c11c1770c00777777777777777777770c00000000000000000000000000")
-const _hex113713 = pxsim.BufferMethods.createBufferFromHex("8704090015000000000000000000000000000000888888888888888888880c0088888888888811c188880c0088888818c1188cc188880c00888888c1181c8cc188880c00888888c1181c8cc188880c0088888818c18811c188880c00888888888888888888880c00000000000000000000000000")
-const _hex113633 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0ffffffffff0000f077777777f70000007f7777770f000000f07777f700000000007f770f0000000000f0f7000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113637 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000002f2222f2000000002f2222f2000000002f2222f2000000002f2222f2000000002f2222f2000000002f2222f200000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113641 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000f0ff0f00000000f09f99f9000000009f3933f9000000009f133ff9000000009f3333f9000000009f133ff900000000f0ffffff00000000007f770ff00f0000007f77f7ef0f0000007f77eeee0f0000007f77eeee0f0000007f77f7ff0f0000007f77f70000000000f0ff0f0000000000000000000000")
-const _hex113645 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000f0ffff0f00000000efdfdd0f0000f0ffefdfdd0f0000efeeeedfdd0f0000efeeeedfdd0f0000f0ffefdfdd0f00000000efdfdd0f00000000f0ffff0f0000000000000000000066064404aa0a000066064404aa0a000066064404aa0a000066064404aa0a0000000000000000000000000000000000")
-const _hex113649 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000000")
-const _hex113653 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f0")
-const _hex113673 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0f0000f0aa444444fe0000f033555555ee0f00f033555555eeff00f033555555ee0f00f0aa444444fe000000ffffffff0f00000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113677 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000f0000000000000005f0f0000000000f055f50000000000f055f500000000f00f5f0fff0000005ff55fff550f00f05555555555f500005ff55fff550f0000f00f5f0fff00000000f055f50000000000f055f50000000000005f0f000000000000f0000000000000000000000000")
-const _hex113681 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f9000000000000ff0fff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f9000000000000ff0f000000000000000000000000000000000000")
-const _hex113685 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000ff00f00f000000f0220f2ff2000000f022f222f2000000002f22220f00000000f022f200000000002f22220f000000f022f222f2000000f0220f2ff200000000ff00f00f0000000000000000000000000000000000000000000000000000")
-const _hex113689 = pxsim.BufferMethods.createBufferFromHex("870407000700000000ff0f00009f0f00ff9fff0f9f99990fff9fff0f009f0f0000ff0f00")
-const _hex113693 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000cc0bc0bc00000000ccbcccbc00000000c0cccc0b0000000000ccbc0000000000c0cccc0b00000000ccbcccbc00000000cc0bc0bc000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113697 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000000000000000000070770b00000000007077b700000000000077b7000000000070770b000000000077b7000000000070770b000000000077b7000000000000770b000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113701 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffff0000000000f055f50000000000f055f500000000ffff55f5ff0f00005f555555550f00005f555555550f00005f555555550f0000ffff55f5ff0f000000f055f50000000000f055f50000000000f0ffff000000000000000000000000000000000000000000000000000000")
-const _hex113705 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000ffffff0f000000f0dfdddd0f0000005fdfdddd0f0000f055dfdddd0f0000ffffdfdddd0f0000dfdddddddd0f0000dfdddddddd0f0000dfdddddddd0f0000ffffffffff0f000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113717 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000110c000000000000110c00000000001111110c000000001111110c0000000000110c000000000000110c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113657 = pxsim.BufferMethods.createBufferFromHex("8704100010000000101111111111110c11111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c1101111111111110c")
-const _hex113661 = pxsim.BufferMethods.createBufferFromHex("8704100010000000d0dddddddddddd0cddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdd0dddddddddddd0c")
-const _hex113665 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex113669 = pxsim.BufferMethods.createBufferFromHex("87041000100000001011111111111102111111111111112111111111111111211111111111111121111111111111112111111111111111211111111111111121111111111111112111111111111111211111111111111121111111111111112111111111111111211111111111111121111111111111112111111111111111211011111111111102")
-const _hex113597 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000ffffff00000000ff9999990f0000f099363396f600009f36333393f600009f33f13f93f600009f33333393f600009f33333393f600009f33f13f93f600009f36333393f60000f099363396f6000000ff9999990f00000000ffffff000000000000000000000000000000000000")
-const _hex113613 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000ffff0000000000f02222ff000000004f2222c20f0000004f2222c20f0000f04f2422c20f0000efee2422c20f0000ef4f2222c20f0000f04f2222c20f0000004f2222c20f000000f04f44ff0000000000f0ff000000000000000000000000000000000000000000000000000000")
-const _hex113629 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ff0000000000007f770f00000000f07777f700000000f07777f700ff00007f77f7fefffe00007f77f7eeeefe00007f77efeeeefe00007f77efeeeefe00007f77eff7fffe00007f77f7f700ff00007f7777f700000000f07f770f0000000000f0ff000000000000000000000000")
-const _hex113730 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffff0f000000f0666666f60000006f999999660f00f099191199690f00f09911119199f600f099f1ff9199f600f09919ff9999f600f09999999999f600f09919119999f600f09911119199f600009ff1ff91690f0000f019ff99f900000000ffffff0f000000000000000000000000000000000000")
-const _hex113738 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffff0f000000f0661161f60000006f661161660f00f06666116166f600f066b6bbbb66f600f011b1ccbc11f100f011b1ccbc11f100f011b1ccbc11f100f066b6bbbb66f600f06666116166f600006f661161660f0000f0661161f600000000ffffff0f000000000000000000000000000000000000")
-const _hex113746 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000ffffff0f000000f0666666f60000006f666666660f00006f161111660f00006f111111660f00006f611666660f00006f611666660f00006f161111660f00006f666666660f0000f0666666f600000000ffffff0f0000000000000000000000000000000000000000000000000000")
-const _hex113754 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000ffffff0f000000f0666666f60000006f666666660f00006f111111610f00006f111111610f00006f611666610f00006f611666610f00006f166111660f00006f666666660f0000f0666666f600000000ffffff0f0000000000000000000000000000000000000000000000000000")
-const _hex113762 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000ff0f0000000000f066f600000000009f99660f000000009ff1690f000000009f99690f00000050f0f1f95000000000555f5f0500000050f022f250000000004f22220f000000004f24220f000000004f24220f00000000f044f4000000000000ff0f00000000000000000000000000000000000000")
-const _hex113770 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffff0f000000f0111111f10000001fb1b1b1110f00f01111b11111f100f0b1111111b1f100f01111111111f100f0b19b2911bbf100f09199291111f100f0b1992911b1f100f01199291111f100001fb129b1110f0000f0111111f100000000ffffff0f000000000000000000000000000000000000")
-const _hex113778 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff999999f90000f0f9999999f90000ffff999999f900009f99f999f9f900009f99f9fffff900009f999999f9f900009f99999999f900009f99999999f90000ffffffffffff00000000000000000000000000000000000000000000000000")
-const _hex113786 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff555555f50000f0f5555555f50000ffff555ff5f500005f55f555fff500005f55f5f5f5f500005f55555ff5f500005f55555555f500005f55555555f50000ffffffffffff00000000000000000000000000000000000000000000000000")
-const _hex113794 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff444444f40000f0f4444444f40000ffff444444f400004f44f444f4f400004f44f4f4f4f400004f44444f4ff400004f44444444f400004f44444444f40000ffffffffffff00000000000000000000000000000000000000000000000000")
-const _hex113802 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff333333f30000f0f3333333f30000fffff3ff33f300003f3333f333f300003f33f3fffff300003f3333f333f300003f33333333f300003f33333333f30000ffffffffffff00000000000000000000000000000000000000000000000000")
-const _hex113810 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff777777f70000f0f7777777f70000fffff7fff7f700007f77f7f7f7f700007f77f7f7f7f700007f77f7777ff700007f77777777f700007f77777777f70000ffffffffffff00000000000000000000000000000000000000000000000000")
-const _hex113824 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f0bbbbfbf1f10000dfddddbb1ff100f0dd11ddbdfb0f00f0ddf1dddffb0000f0dddddddffb0000f0ddf1dddffb0000f0dd11ddddfb000000dfdddddd0f000000f0ddddfd0000000000ffff0f0000000000000000000000")
-const _hex113838 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f06666f6f1f100009f99f9661ff100f09911996ff60f00f099f1999ff60000f09999999ff60000f099f1999ff60000f09911999ff60000009f99f9990f000000f09999f90000000000ffff0f0000000000000000000000")
-const _hex113852 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f02222f2f1f10000ff4444221ff100f0441f412ff20f00f044f44f4ff20000f04444444ff20000f044f44f4ff20000f0441f414ff2000000ff4444440f000000f04444f40000000000ffff0f0000000000000000000000")
-const _hex113866 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f0ccccfcf1f10000bfbbbbcc1ff100f0bb11b9cbfc0f00f0bbf1b9bffc0000f0bbbbbbbffc0000f0bbf1b9bffc0000f0bb11b9bbfc000000bfbbbbbb0f000000f0bbbbfb0000000000ffff0f0000000000000000000000")
-const _hex113880 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f10000f0ff0ff011f100002f22f2f0f1f100f0242222ff11f100f0242222f2ff0f00004f2222220f000000f0242222f20000004f2222220f0000f0242222f2000000f02422220f000000004f44f40000000000f0ff0f000000000000000000000000")
-const _hex113894 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000ff0f0000000000f066f600000000009ff1690f000000009f99690f000000009ff1690f00000000f099f9000000000000ffbf0c0000000000dcbb0c0000000000dcbd0c0000000000c0cc000000000000000000000000000000000000000000000000000000")
-const _hex113908 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000cc0c0000000000c0bbcb0000000000dccdbd0c00000000dcddbd0c00000000dccdbd0c00000000c0ddcd000000000000cc2c0f00000000004f220f00000000004f240f0000000000f0ff000000000000000000000000000000000000000000000000000000")
-const _hex113916 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000f0ffffff0f000000f04444440f000000f05555c50f000000005f55550f000000005f55cc0f000000005f55550f00000000f055c50f00000000f055550f00000000005fcc0f00000000005f550f000000f00f5fc50f0000002ff2f0550f0000004ff2f0550f000000f00f00ff0f000000000000000000")
-const _hex113924 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffffff0f0000f022f244440f00004f22225fc50f00004f24225f550f00004f24225fcc0f0000f044f455550f000000ffff55c50f00000000f055550f00000000005fcc0f00000000005f550f00000000005fc50f0000000000f0550f0000000000f0550f000000000000ff0f000000000000000000")
-const _hex113932 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffff00000000001f11110f000000f011b111f10000001fb1b1b1110f00001f111111110f00009fbb29b11b0f00009f991211110f00009f29b1b1110f0000f019b111f1000000001f11110f00000000f0ffff000000000000000000000000000000000000000000000000000000")
-const _hex113940 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffff00000000001f11110f000000f011b111f90000001fb1b121990f00001f111192990f00009fbb29b99b0f00009f999999990f00009fb9b9b9990f0000f099b999f9000000009f99990f00000000f0ffff000000000000000000000000000000000000000000000000000000")
-const _hex113949 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000001000100000000000101010000000000010101000000000000000000000000000f0ffff00000000009f66660f000000f0999969f6000000f0191199f6000000f019ff99f6000000f0999999f6000000f0191199f6000000001fff990f00000000f0ffff00000000000000000000000000000000000000")
-const _hex113957 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffffff00000000ff9999f9000000f0f999f9ff000000ffff99f9f50000009f9999f9f50000009f99f9fff5ff0000ffffff5555f5000000f0f75f55ff000000fffff7f5f70000007f77777ff70000007f777777f7000000ffffffffff0000000000000000000000000000000000")
-const _hex113965 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000ffff0ff000000000afca0f0f00000000afcaff0000000000afcaff0000000000ffff0f0f00000000f0fa00f000000000afca0f0000000000ffff0ff0ff0000000000006f660f00000000f09969f600000000f0199ff600000000f09999f600000000001f9f0f0000000000f0ff00000000000000000000")
-const _hex113973 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000900000000000100010009000000000090000010000100000ff0f0010000009f0ddfd0009000000dff1dd0f00001009dfdddd0f19000000dff1dd0f00000001f0ddfd000100900000ff0f00900000000900000900000010001000100000000000900000000000000000000000000000000000000000")
-const _hex113981 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000f0ffff00000000009f66660f000000f0191169f6000000f0f91f99f6000000f0999999f6000000f0f91f99f60000ffff191199f600f011f1ff99990f00f0f111f1ffff0000f011110f00000000f0f1f10000000000f011f1000000000000ff0f000000000000000000000000000000000000000000")
-const _hex113989 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000ff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f90000000000005f0f0000000000f05fff00000000005f55550f00000000f055f50000000000005f220f00000000004f220f00000000004f240f0000000000f0ff0000000000000000000000")
-const _hex113997 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000f0000000000000005f0f0000000000f055f500000000005f55550f00000000f05fff0000000000f0f1f600000000009f99690f000000009ff1690f000000009f99690f00000000f099f9000000000000ff2f0f00000000004f220f00000000004f240f0000000000f0ff0000000000000000000000")
-const _hex114005 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000ff0f0000000000f024f20000000000f024f20000000000f044f2f0ff00000000ff0f6f660f0000fffff0199ff600005f55ff9999f600005ff5f0199ff600005f55ff9f990f00005f5f55ffff000000f0f0ff00000000000000000000000000000000000000000000000000000000")
-const _hex114013 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000010000000000000101000000000000010101000000000001010100000000000000000000000000000ff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f9000000000000ff0f00000000000000000000000000000000000000")
-const _hex114021 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0ff0000000000006f660f00000000f09999f600000000f099f1f600000000f09999f600000000009ff10f0000000000f0ff0000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex114029 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
-const _hex114036 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0569666f60c0000f0566666f60c0000f0569666f60c0000f0566666f60c0000f0569666f60c0000f0566666f60c0000f0569666f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
-const _hex114043 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0669656f60c0000f0666656f60c0000f0669656f60c0000f0666656f60c0000f0669656f60c0000f0666656f60c0000f0669656f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
-const _hex114050 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0669656f60c0000f0666656f60c0000f0669656f60c0000f0565555f60c0000f0569666f60c0000f0566666f60c0000f0569666f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
-const _hex114057 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0569666f60c0000f0566666f60c0000f0569666f60c0000f0565555f60c0000f0669656f60c0000f0666656f60c0000f0669656f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
-const _hex114064 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ffff0f00000000f06666f6000000009f11f9660f0000009ff1996f0f0000009f99996f0f0000009ff1999f0f0000009f11f9990f000000f09999f90000000000ffff0f00000000")
-const _hex114071 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ffff0f00000000f02222f2000000004f1f44220f0000004ff4442f0f0000004f44442f0f0000004ff4444f0f0000004f1f44440f000000f04444f40000000000ffff0f00000000")
-const _hex114078 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ff0f0000000000f022f200000000004f22220f000000004f2222f200000000f02422220f0000004f2222f2000000004f22420f00000000f044f4000000000000ff0f0000000000")
-const _hex114085 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ffff0f00000000f0ccccfc00000000bf11b9cc0f000000bff1b9cf0f000000bfbbbbcf0f000000bff1b9bf0f000000bf11b9bb0f000000f0bbbbfb0000000000ffff0f00000000")
-
-
-
-
-function inline__P110644(s) {
+const _hex98483 = pxsim.BufferMethods.createBufferFromHex("2000000000000000210000005e0000002200000e000e0000230028fe28fe280024004c92ff926400250002651248a64026006c92926ca000270000000e000000280000007c82000029000000827c00002a005438103854002b0010107c1010002c000000907000002d001010101010002e000000606000002f000060100806003000003c42423c00310000447e4000003200004462524c00330000424a4e320034003028247e20003500004e4a4a32003600003c4a4a30003700000262120e00380000344a4a34003900000c52523c003a0000006c6c00003b000000967600003c001028284444003d002828282828003e004444282810003f0000025909060040003c425a560800410078141214780042007e4a4a4a34004300003c424224004400007e42423c004500007e4a4a42004600007e0a0a02004700003c425234004800007e08087e00490000427e4200004a002040423e02004b00007e081462004c00007e404040004d007e0418047e004e00007e04087e004f003c4242423c005000007e12120c005100003c5262bc005200007e12126c00530000244a522400540002027e0202005500003e40403e005600001e70701e0057007e2018207e00580042241824420059000608700806005a000062524a46005b00007e424200005c000006081060005d000042427e00005e000804020408005f00808080808000600000000204000061000030484878006200007e4848300063000030484848006400003048487e006500003068585000660000107c12040067000018a4a478006800007e08087000690000487a4000006a000040847d00006b00007e102840006c0000427e4000006d007808300870006e000078080870006f00003048483000700000fc24241800710000182424fc0072000078100810007300005058682800740000083e48200075000038404078007600001860601800770038403040380078000048303048007900005ca0a07c007a000048685848007b000008364100007c000000fe0000007d000041360800007e00000804080400a000000000000000a10000007a000000a200003048fc4800a30090fc92928400a400542844285400a5002a2c782c2a00a6000000ee000000a7000094aaaa5200a800000200020000a9003e414955413eaa0000242a2e0000ab00102854284400ac00001010107000ad00001010101000ae003e415d45413eaf00000202020200b000000814140800b1008888be888800b2000024322c0000b30000222a140000b400000004020000b50000f840207800b6000c1e7e027e00b700000010000000b800000080400000b90000243e200000ba0000242a240000bb00442854281000bc00025f70f84000bd00021f90c8b000be0011557af84000bf000030484d2000c000601916186000c100601816196000c200601a151a6000c300601a151a6100c400601914196000c500601a151a6000c6007c0a7e4a4200c700001ea1611200c800007c55564400c900007c56554400ca00007c56554600cb00007c55544500cc0000457e440000cd0000447e450000ce0000467d460000cf0000457c450000d000087e4a423c00d100007e09127d00d200003845463800d300003846453800d400003846453a00d500003a45463900d600003845443900d700442810284400d80000fc724e3f00d900003c41423c00da00003c42413c00db00003c42413e00dc00003c41403d00dd00040872090400de00007e24241800df00007c025a2400e0000030494a7800e10000304a497800e20000304a497a00e3000032494a7900e40000304a487a00e50000304a4d7a00e600304878685000e7000018a4642400e8000030695a5000e90000306a595000ea0000306a595200eb0000306a585200ec0000497a400000ed0000487a410000ee00004a79420000ef00004a78420000f00000304a4b3d00f100007a090a7100f2000030494a3000f30000304a493000f40000304a493200f5000032494a3100f60000304a483200f700101054101000f800007068583800f900003841427800fa00003842417800fb00003842417a00fc00003842407a00fd0000b84241f800fe0000ff24241800ff00005ca1a07d000001601915196000010100304a4a7a000201611a16196000030100314a4a790004013c0a094abc00050100182464bc000601003846452800070100304a4948000801003846452a00090100304a494a000a010038444528000b010030484a48000c010038454629000d010030494a49000e01007c454639000f0100314a497e001001087e4a423c00110130484c7e04001201007d55554500130100326a5a52001401007d56564500150100316a5a51001601007c55544400170100306a5850001801003f65a521001901001874ac28001a01007c555645001b010030695a51001c010038465536001d0100304a49f2001e010039465635001f0100314a4af100200100384455340021010018a4a578002201001ea1691a0023010018a6a578002401007812117a0025017e080a7102002601047e147e04002701047e0c08700028010002457e450029010002497a41002a0100457d4500002b01004a7a4200002c0100014a7a49002d0100014a7a41002e0100217fa100002f0100247da00000300100447d440000310100487840000032017e0022423e0033013d0040847d0034012040463d0600350100800af90200360100bf440a3100370100bf4814200038010078102848003901007c404241003a0100467d4000003b01003fa06020003c0100a17f2000003d01007c414241003e0100457e4100003f01007e40484000400100427e4008004101107e48404000420100527e4800004301007c0a117c00440100780a097000450100bf42043f00460100bc440438004701007c09127d00480100790a09700049010a06780870004a01003f02847f004b01003c048478004c013945454539004d0100324a4a32004e013946464639004f0100314a4a310050013a4544463900510132494832010052013c427e4a420053013048306850005401007c163548005501007812091000560100bf49093600570100bc480408005801007d1635480059010079120910005a010048565524005b0100505a6928005c010048565526005d0100505a692a005e010012a56912005f010028ac741400600100485556250061010050596a290062010101bf410100630100049f641000640104057e050400650100083d4a2100660102127e120200670100183e5820006801003a414239006901003a414279006a01003d41413d006b01003a42427a006c010039424239006d010039424279006e01003a45453a006f01003a45457a0070013a41403a010071013a41407a01007201001f60a01f007301001c60a03c00740178221122780075013842314238007601081261120800770100b84241fa00780104097009040079010064564d44007a0100486a5948007b010064544d44007c010048685a48007d010064554e45007e010048695a49007f0100087c0204008f01003452523c00920100887e090200a0013c42423c0806a101003048483008af01003e403e0806b001003840781008b501006a5a4a4e00b601005878585800d101003845463900d2010030494a3100e601003845563500e7010030494af100fa0100742a750000fb0100304c4a7d00fc0178147e554400fd0130487a695000fe010078744e3d00ff0100706a59380018020012a569120019020028ac7414001a020101bf4101001b0200049f641000bb0200000c0a0000bc0200000a060000bd020000060a0000c602000201020000c702000102010000c902000202020000d802000102020100d902000002000000da02000205020000db02000040800000dc02000201020100dd02020100020100740300000201000075030000804000007a030000c08000007e03000096760000840300000300000085030200030002008603037c12127c008703000010000000880303007e4a4200890303007e087e008a030300427e42008c03033c42423c008e0303000e700e008f03035c62625c00900302003b400200910378141214780092037e4a4a4a34009303007e0202020094036058465860009503007e4a4a420096030062524a46009703007e08087e0098033c4a4a4a3c00990300427e4200009a03007e081462009b036018061860009c037e0418047e009d03007e04087e009e0300424a4a42009f033c4242423c00a003007e02027e00a103007e12120c00a30300665a424200a40302027e020200a503060870080600a60318247e241800a703422418244200a8030e107e100e00a9035c6202625c00aa0300457c450000ab03040970090400ac030030484a7900ad030030685a5100ae0378100a09f000af03003a41200000b0033a4043403a00b103003048487800b20300fe25251a00b3030c30c0300c00b403344a4a4a3000b503003068585000b603021aa6a24200b7033c080404f800b803003c4a4a3c00b903003840200000ba03007820504800bb03641212227c00bc03fc2020103c00bd03182040201800be03112d2ba94100bf03003048483000c003087808780800c103f82424241800c2031824a4a44800c303304848582800c403000838482800c503384040403800c6031c20f8241800c703c4281028c400c8031c20fc201c00c903304820483000ca03000238422000cb03384240423800cc0330484a493000cd03384042413800ce03304822493000d0033c52525c2000d10310344a3c0800d203067804020400d303120a7c020400d4030d7009040800d5031824ff241800d603384828483800d70348302221d800da031c2221a14200db031824a4a44200dc037e1212020200dd0300fc24240400de033e2010087c00df030c0ac9281800e003700c621c7000e10301092516f800e2039ea0bea07e00e30398a0b8a07800e4030c1214107e00e503001028207800e603be9088887000e70348544e443800e803245252524c00e903285454544800ea0364524c526400eb03086458640800ec03385454542200ed03306848682400ee03184a7e4a1800ef031848ff0a0800f003483020205800f10378a4a4a49800f203304848485000f303006080847d00f4033c4a4a4a3c00f5030030585848000004007c555644000104007c55544500020401013f8579000304007c0605040004043c4a4a422400050400244a522400060400427e420000070400457c45000008042040423e020009047c027e4830000a047e087e4830000b0402027e0a72000c04007c102a45000d047c2112087c000e040c5152523d000f043f20e0203f00100478141214780011047e4a4a4a300012047e4a4a4a34001304007e020202001404c07c427ec0001504007e4a4a4200160476087e087600170424424a4a34001804007e08047e001904007d120a7d001a04007e081462001b04403c02027e001c047e0418047e001d04007e08087e001e043c4242423c001f047e0202027e002004007e12120c002104003c42422400220402027e02020023040e5050503e00240418247e241800250442241824420026043f2020bf600027040e1010107e0028047e407e407e0029043f203fa07f002a04027e484830002b047e4848307e002c04007e484830002d0424424a4a3c002e047e183c423c002f04006c12127e0030043048487840003104003c4a4a3100320400786850200033040078080808003404c0704878c000350430686850000036044830783048003704004058683000380478402010780039047942221279003a040078203048003b044030080878003c047810201078003d047810101078003e043048484830003f047808080878004004fc24242418004104304848485000420408087808080043041ca0a0a07c0044041824ff241800450400483030480046043c2020bc60004704182020207800480478407840780049043c203ca07c004a040878505020004b047850502078004c040078505020004d044858683000004e047830304830004f0450282878000050040030696a500051040032686a50005204023f0a887000530400780a09080054040030685848005504005058682800560400487a4000005704004a784200005804004080847d0059047008785020005a047810785020005b04047e141060005c040078223148005d047841221078005e0418a1a2a279005f043c20e0203c006204027f4a4830006304087e5850200070040e107e100e00710418207820180072043c4a4a4a3c0073043068586830007404001e70180c0075040018603010009004007e020203009104007808080c009204087e0a0a0200930420782808080096043b043f043be0970424183c1824c09a04003f040a31c09b04003c101824c0ae04060870080600af040c10e0100c00b004161870181600b1042c30e0302c00b20421120c1221c0b3040024181824c0ba047e0808087000bb04007e08087000d804003452523c00d904002868583000e20400457d450000e304004a7a420000e8043c4a4a4a3c00e904003058583000ee04003d41413d00ef04003a42427a00d005681020285000d105484848784000d205004830600000d305080808780800d405680808087800d505000008780000d605080818680800d705087808087800d805784050487800d905000008180000da0504040404fc00db05484848483800dc050e4848281800dd05087848487800de05582010487000df05000004fc0000e005004040487800e105000878483800e205487840281800e305041c0404fc00e405485848483800e50504f820140800e605485060685000e705f40424241c00e805080808087000e905785058403800ea05487808087800f005087800087800f105081800087800f205081800081800f305000010080000f405100800100800021e7c5455542800031e007e484930000a1e007c454438000b1e003049487e001e1e007c151404001f1e001079140800401e7e0419047e00411e780832087000561e007c15140800571e00fc25241800601e004854552400611e0050586a28006a1e04047d0404006b1e00083d482000801e7c2112207c00811e384132403800821e7c2012217c00831e384032413800841e7c2110217c00851e384230423800f21e040972080400f31e00b84142f800a3207e0a7a120a00a420a8fcaa828400a720087e2a1c0800ab200098a4a6bf02ac20183c5a5a4200af20627f224438009021103854101000912108047e0408009221101054381000932110207e201000942110381010381095212844fe442800")
+const _hex98485 = pxsim.BufferMethods.createBufferFromHex("20000000000000000000000000000000000000000000000000002100000000000006fc0000000000000000000000000000000000220000001c00000000001c0000000000000000000000000000002300a000f807a000f807a00000000000000000000000000000002400000018022404460c8803000000000000000000000000000025003802c4017800200390040803000000000000000000000000260080037804a4041803800340040000000000000000000000002700000000001c00000000000000000000000000000000000000280000000000f8010606010800000000000000000000000000002900000001080606f801000000000000000000000000000000002a00040014000e001400040000000000000000000000000000002b0040004000f8034000400000000000000000000000000000002c000000000000090006000000000000000000000000000000002d000000800080008000000000000000000000000000000000002e000000000000060000000000000000000000000000000000002f00000c800360001c000300000000000000000000000000000030000000f80304040404f80300000000000000000000000000003100000004040404fc07000400040000000000000000000000003200000008060405c4043804000000000000000000000000000033000000080244044404b803000000000000000000000000000034000000800170010801fc070001000000000000000000000000350000023c0424042404c403000000000000000000000000000036000000f0034804440488030000000000000000000000000000370000000400c40734000c00000000000000000000000000000038000000b80344044404b803000000000000000000000000000039000000780284048802f00100000000000000000000000000003a000000000030060000000000000000000000000000000000003b000000000018090006000000000000000000000000000000003c004000a000a000a000100100000000000000000000000000003d002001200120012001200100000000000000000000000000003e0000001001a000a000a00040000000000000000000000000003f000000080084066400180000000000000000000000000000004000f0030c04c20822092409f80900000000000000000000000041000007f8008400f8000007000000000000000000000000000042000000fc0744044404b803000000000000000000000000000043000000f001080204040404080200000000000000000000000044000000fc0704040802f001000000000000000000000000000045000000fc07440444044404000000000000000000000000000046000000fc07440044004400000000000000000000000000000047000000f00108024404c803000000000000000000000000000048000000fc0740004000fc070000000000000000000000000000490000000404fc070404040400000000000000000000000000004a000000000200040004fc0300000000000000000000000000004b000000fc074000f0000c0304040000000000000000000000004c000000fc0700040004000400000000000000000000000000004d000000fc0738007000fc0700000000000000000000000000004e000000fc073800c003fc0700000000000000000000000000004f000000f80304040404f803000000000000000000000000000050000000fc07840084004400780000000000000000000000000051000000fc0102020206fc09000000000000000000000000000052000000fc074400c4013806000000000000000000000000000053000000180224044404880300000000000000000000000000005400000004000400fc070400040000000000000000000000000055000000fc0300040004fc03000000000000000000000000000056000c00f0030004f0030c00000000000000000000000000000057007c008007e001f0010007fc0000000000000000000000000058000404b8034000b80304040000000000000000000000000000590004003800c00730000c0000000000000000000000000000005a0004040407e4041c04040400000000000000000000000000005b0000000000ff0f0108010800000000000000000000000000005c0003001c0060008003000c00000000000000000000000000005d00000001080108ff0f000000000000000000000000000000005e004000380004003800400000000000000000000000000000005f00000800080008000800080000000000000000000000000000600000000000020004000000000000000000000000000000000061000000200390049004e007000000000000000000000000000062000000fc0710041004e003000000000000000000000000000063000000c001200210043004000200000000000000000000000064000000e00310041004fc07000000000000000000000000000065000000e00390049004e0040000000000000000000000000000660000001000f80714001400000000000000000000000000000067000000b806440944093c09040600000000000000000000000068000000fc0710001000e0070000000000000000000000000000690000000000f4070000000000000000000000000000000000006a00000800080008fd07000000000000000000000000000000006b000000fe078000e001100610040000000000000000000000006c0000000000fc030004000400000000000000000000000000006d00f00710001000e0071000e0070000000000000000000000006e000000f00710001000e00700000000000000000000000000006f000000e00310041004e003000000000000000000000000000070000000fc0f04010401f800000000000000000000000000000071000000f80004010401fc0f000000000000000000000000000072000000f00720001000100000000000000000000000000000007300000060029004900420030000000000000000000000000000740000001000fc0310041004000000000000000000000000000075000000f00300040004f007000000000000000000000000000076003000c0030004c003300000000000000000000000000000007700f0000007e003c0010007f000000000000000000000000000780010046003800060031004000000000000000000000000000079000c0870088007f0000c0000000000000000000000000000007a000000000410079004700410040000000000000000000000007b0000004000be070108010800000000000000000000000000007c0000000000ff0f0000000000000000000000000000000000007d00000001080108be07400000000000000000000000000000007e00800040004000800080004000000000000000000000000000")
+const _hex102919 = pxsim.BufferMethods.createBufferFromHex("20000000000000002100001700000000220000030003000023000a1f0a1f0a0024000a17151d0a00250013090412190026000a15150a100027000003000000002800000e11000000290000110e0000002a00000a040a00002b0000040e0400002c000010080000002d000004040400002e000008000000002f0010080402010030000e11110e0000310000121f100000320019151512000033000911150b000034000c0a091f080035001715151509003600081416150800370011090503010038000a1515150a00390002150d0502003a00000a000000003b0000100a0000003c0000040a1100003d00000a0a0a00003e0000110a0400003f0002011505020040000e1115090e0041001e05051e000042001f15150a000043000e111111000044001f11110e000045001f151511000046001f050501000047000e1111150c0048001f04041f00004900111f110000004a000911110f01004b001f040a1100004c001f10101000004d001f0204021f004e001f0204081f004f000e11110e000050001f0505020000510006091916000052001f05050a10005300121515090000540001011f01010055000f10100f0000560007081008070057001f0804081f0058001b04041b0000590001021c0201005a001915131100005b00001f111100005c000102040810005d000011111f00005e000002010200005f00101010101000600000010200000061000c12121e100062001f141408000063000c121212000064000814141f000065000e15151200006600041e0501000067000215150f000068001f04041800006900001d000000006a000010100d00006b001f040a1000006c00000f101000006d001e0204021e006e001e02021c00006f000c12120c000070001e0a0a0400007100040a0a1e000072001c0202020000730010140a0200007400000f1414100075000e10101e1000760006081008060077001e1008101e007800120c0c12000079001214080402007a00121a161200007b0000041f1100007c00001f000000007d00111f040000007e00000404080800d3000c1213130c00f3000c12130d000004010e05051e100005010609191f080006010c121313120007010c121313000018010f0b1b19000019010e151d1a000041011f14121000004201100f1412000043011f0205081f0044011e03031c00005a0110140b0302005b0110140b0300007901121a171300007a01121a171300007b01121b171200007c01121b17120000")
+const _hex85470 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
+const _hex85984 = pxsim.BufferMethods.createBufferFromHex("8704240024000000001111111111111111111111111111111100000010313333333333333333333333333333130100001113111111111111111111111111111131110000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000111311111111111111111111111111113111000010313333333333333333333333333333130100000011111111111111111111111111111111000000")
+const _hex85986 = pxsim.BufferMethods.createBufferFromHex("8704240024000000002222222222222222222222222222222200000020323333333333333333333333333333230200002223222222222222222222222222222232220000322211111111111111111111111111112223000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003222111111111111111111111111111122230000222322222222222222222222222222223222000020323333333333333333333333333333230200000022222222222222222222222222222222000000")
+const _hex85988 = pxsim.BufferMethods.createBufferFromHex("8704240024000000004444444444444444444444444444444400000040343333333333333333333333333333430400004443444444444444444444444444444434440000344411111111111111111111111111114443000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003444111111111111111111111111111144430000444344444444444444444444444444443444000040343333333333333333333333333333430400000044444444444444444444444444444444000000")
+const _hex85990 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d00000000000000000000000070666607000000000000000000000000006776000000000000000000000000660700007066000000000000000000006766777766760000000000000000000060666666660600000000000000000066006766667600660000000000000000667600000000676600000000000000006766767777676676000000000000000060666666666666060000000000000000006766666666760000000000000000000000676666760000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex85992 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0bb000000000000000000000000b000404500b0000000000000000000005b0b000400540b0000000000000000b0550400000054b5000000000000000000440040bb0040040000000000000000000040d4ddbb0000000000000000000000004055ddbd000000000000000000004b005455d5dd0b400b000000000000005b045411d5dd0b540b000000000000004b005411d5dd0b400b0000000000000000004055ddbd00000000000000000000000040d4ddbb0000000000000000000000440040bb0040040000000000000000b0550400000054b50000000000000000005b04000400540b000000000000000000b000404500b0000000000000000000000000b0bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex85994 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020020000000000002002000000000000202200000000000022020000000000000022020000000020220000000000000000202200000000220200000000000000000022020000202200000000000000000000202200002202000000000000000000000022022022000000000000000000000000202222020000000000000000000000000022220000000000000000000000000000222200000000000000000000000000202222020000000000000000000000002202202200000000000000000000002022000022020000000000000000000022020000202200000000000000000020220000000022020000000000000000220200000000202200000000000000202200000000000022020000000000002002000000000000200200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex85996 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d0000000000000000000000007066660700000000000000000000000000677600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex85998 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0cbcc0c0000000000000000000000b0db55d5cd0c00000000000000000000db555555ddcd000000000000000000b055555555d59d0b0000000000000000db55555555d59db900000000000000005b55555555d5ddb900000000000000b05db5cccc5bdddd990b000000000000b055ccccccccdddd9d0b000000000000b0b5ccccccccdbdd9d0b000000000000b0c5ccccccccdcdd9d0b000000000000b0c5ccdccbccdcdd9d0c000000000000b0cdcc5b55ccdcdd9d0c00000000000000ccdc55b5ccdcddc90000000000000000cccc5b55ccdbddc90000000000000000c0ccdccbccdd9d0c000000000000000000ccccccdbddcd00000000000000000000c0dcddddcd0c0000000000000000000000c0cccc0c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex86000 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc00000000000000b0bbbbbbbbcb00c0cd000000000000001bddddddddbd0c1ccd000000000000b011cbccccccbc0c1ccd000000000000b01d6c666666bc0cbccd000000000000b01d6c616661bc0c1ccd000000000000b01d6c161666bccc1bcd000000000000b01d6c666166bcccbbcd000000000000b01d6c666666bccc1bcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666661bcccbbcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666666bc0c1ccd000000000000b01dcbccccccbc0cbccd000000000000c0b1bbbbbbbbbb0cdccb000000000000c0bbbbbbbbbbcb00dc0c00000000000000cccccccccc0c00cc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex86002 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004004000000000000000000000000000054450000000000000000000000440b00bbbb00b0440000000000000040550b00000000b0550400000000000040b5000044bb00005b04000000000000b00b0044ddddbb00b00b0000000000000000405d55d5dd0b00000000000000000000d4555555ddbd0000000000000000000054555555d5bd0000000000000000b44055555555d5dd0b4b000000000040b54055555555d5dd0b5b040000000040b54055555555d5dd0b5b040000000000b44055115555d5dd0b4b000000000000000054115555d5bd00000000000000000000d4555555ddbd00000000000000000000405d55d5dd0b0000000000000000b00b0044ddddbb00b00b00000000000040b5000044bb00005b0400000000000040550b00000000b0550400000000000000440b00bbbb00b0440000000000000000000000544500000000000000000000000000004004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex86004 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bbbb00000000000000000000000000b055bb00bbbbbb000000000000000000b0b5bdbcbbbbddcb0000000000000000b0dbcb5b5555bbdd0c00000000000000b0cbdcbdbb5b55dbcd0000000000000000c0dddb11d15bb5bd0c00000000000000bbbd111111b155bb0c00000000000000db1b111111115bb5cb00000000000000db1bb11d1199b9d5cb00000000000000db1b11bb9199b955cb000000000000005b1b11b19b99995bcb000000000000005b1d1111bb99995ccb00000000000000b0b511bbbb99995ccb00000000000000b0d51d919999d95b0b00000000000000005bdb919999c9d50b0000000000000000b0d51b99d9bcb5000000000000000000005bd5bbbc550b00000000000000000000b05b5555bd000000000000000000000000b0bbbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88566 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000020222222220200002002000020020000202000000202000020000220000200002000200200020000200020020002000020000220000200002020000002020000200200002002000020222222220200000000000000000000000000000000000000000000000000")
+const _hex88423 = pxsim.BufferMethods.createBufferFromHex("870407000700000000ff0f00005f0f00ff5fff0f5f55550fff5fff0f005f0f0000ff0f00")
+const _hex88554 = pxsim.BufferMethods.createBufferFromHex("8704090015000000000000000000000000000000777777777777777777770c00777777c177171c7c177c0c0077171c1c7c171c1c1c7c0c0017111c111c111c1c1c7c0c00171c7c171c1c1c1c1c7c0c00171c1c111c1c7c11c1770c00777777777777777777770c00000000000000000000000000")
+const _hex88558 = pxsim.BufferMethods.createBufferFromHex("8704090015000000000000000000000000000000888888888888888888880c0088888888888811c188880c0088888818c1188cc188880c00888888c1181c8cc188880c00888888c1181c8cc188880c0088888818c18811c188880c00888888888888888888880c00000000000000000000000000")
+const _hex88478 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0ffffffffff0000f077777777f70000007f7777770f000000f07777f700000000007f770f0000000000f0f7000000000000000f0000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88482 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000002f2222f2000000002f2222f2000000002f2222f2000000002f2222f2000000002f2222f2000000002f2222f200000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88486 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000f0ff0f00000000f09f99f9000000009f3933f9000000009f133ff9000000009f3333f9000000009f133ff900000000f0ffffff00000000007f770ff00f0000007f77f7ef0f0000007f77eeee0f0000007f77eeee0f0000007f77f7ff0f0000007f77f70000000000f0ff0f0000000000000000000000")
+const _hex88490 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000f0ffff0f00000000efdfdd0f0000f0ffefdfdd0f0000efeeeedfdd0f0000efeeeedfdd0f0000f0ffefdfdd0f00000000efdfdd0f00000000f0ffff0f0000000000000000000066064404aa0a000066064404aa0a000066064404aa0a000066064404aa0a0000000000000000000000000000000000")
+const _hex88494 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000050000000000000005000000000000000500000000000000000")
+const _hex88498 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f000000000000000f0")
+const _hex88518 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff0f0000f0aa444444fe0000f033555555ee0f00f033555555eeff00f033555555ee0f00f0aa444444fe000000ffffffff0f00000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88522 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000f0000000000000005f0f0000000000f055f50000000000f055f500000000f00f5f0fff0000005ff55fff550f00f05555555555f500005ff55fff550f0000f00f5f0fff00000000f055f50000000000f055f50000000000005f0f000000000000f0000000000000000000000000")
+const _hex88526 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f9000000000000ff0fff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f9000000000000ff0f000000000000000000000000000000000000")
+const _hex88530 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000ff00f00f000000f0220f2ff2000000f022f222f2000000002f22220f00000000f022f200000000002f22220f000000f022f222f2000000f0220f2ff200000000ff00f00f0000000000000000000000000000000000000000000000000000")
+const _hex88534 = pxsim.BufferMethods.createBufferFromHex("870407000700000000ff0f00009f0f00ff9fff0f9f99990fff9fff0f009f0f0000ff0f00")
+const _hex88538 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000cc0bc0bc00000000ccbcccbc00000000c0cccc0b0000000000ccbc0000000000c0cccc0b00000000ccbcccbc00000000cc0bc0bc000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88542 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000000000000000000070770b00000000007077b700000000000077b7000000000070770b000000000077b7000000000070770b000000000077b7000000000000770b000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88546 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffff0000000000f055f50000000000f055f500000000ffff55f5ff0f00005f555555550f00005f555555550f00005f555555550f0000ffff55f5ff0f000000f055f50000000000f055f50000000000f0ffff000000000000000000000000000000000000000000000000000000")
+const _hex88550 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000ffffff0f000000f0dfdddd0f0000005fdfdddd0f0000f055dfdddd0f0000ffffdfdddd0f0000dfdddddddd0f0000dfdddddddd0f0000dfdddddddd0f0000ffffffffff0f000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88562 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000110c000000000000110c00000000001111110c000000001111110c0000000000110c000000000000110c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88502 = pxsim.BufferMethods.createBufferFromHex("8704100010000000101111111111110c11111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c111111111111111c1101111111111110c")
+const _hex88506 = pxsim.BufferMethods.createBufferFromHex("8704100010000000d0dddddddddddd0cddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdddddddddddddddcdd0dddddddddddd0c")
+const _hex88510 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88514 = pxsim.BufferMethods.createBufferFromHex("87041000100000001011111111111102111111111111112111111111111111211111111111111121111111111111112111111111111111211111111111111121111111111111112111111111111111211111111111111121111111111111112111111111111111211111111111111121111111111111112111111111111111211011111111111102")
+const _hex88442 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000ffffff00000000ff9999990f0000f099363396f600009f36333393f600009f33f13f93f600009f33333393f600009f33333393f600009f33f13f93f600009f36333393f60000f099363396f6000000ff9999990f00000000ffffff000000000000000000000000000000000000")
+const _hex88458 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000ffff0000000000f02222ff000000004f2222c20f0000004f2222c20f0000f04f2422c20f0000efee2422c20f0000ef4f2222c20f0000f04f2222c20f0000004f2222c20f000000f04f44ff0000000000f0ff000000000000000000000000000000000000000000000000000000")
+const _hex88474 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ff0000000000007f770f00000000f07777f700000000f07777f700ff00007f77f7fefffe00007f77f7eeeefe00007f77efeeeefe00007f77efeeeefe00007f77eff7fffe00007f77f7f700ff00007f7777f700000000f07f770f0000000000f0ff000000000000000000000000")
+const _hex88575 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffff0f000000f0666666f60000006f999999660f00f099191199690f00f09911119199f600f099f1ff9199f600f09919ff9999f600f09999999999f600f09919119999f600f09911119199f600009ff1ff91690f0000f019ff99f900000000ffffff0f000000000000000000000000000000000000")
+const _hex88583 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffff0f000000f0661161f60000006f661161660f00f06666116166f600f066b6bbbb66f600f011b1ccbc11f100f011b1ccbc11f100f011b1ccbc11f100f066b6bbbb66f600f06666116166f600006f661161660f0000f0661161f600000000ffffff0f000000000000000000000000000000000000")
+const _hex88591 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000ffffff0f000000f0666666f60000006f666666660f00006f161111660f00006f111111660f00006f611666660f00006f611666660f00006f161111660f00006f666666660f0000f0666666f600000000ffffff0f0000000000000000000000000000000000000000000000000000")
+const _hex88599 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000ffffff0f000000f0666666f60000006f666666660f00006f111111610f00006f111111610f00006f611666610f00006f611666610f00006f166111660f00006f666666660f0000f0666666f600000000ffffff0f0000000000000000000000000000000000000000000000000000")
+const _hex88607 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000ff0f0000000000f066f600000000009f99660f000000009ff1690f000000009f99690f00000050f0f1f95000000000555f5f0500000050f022f250000000004f22220f000000004f24220f000000004f24220f00000000f044f4000000000000ff0f00000000000000000000000000000000000000")
+const _hex88615 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffff0f000000f0111111f10000001fb1b1b1110f00f01111b11111f100f0b1111111b1f100f01111111111f100f0b19b2911bbf100f09199291111f100f0b1992911b1f100f01199291111f100001fb129b1110f0000f0111111f100000000ffffff0f000000000000000000000000000000000000")
+const _hex88623 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff999999f90000f0f9999999f90000ffff999999f900009f99f999f9f900009f99f9fffff900009f999999f9f900009f99999999f900009f99999999f90000ffffffffffff00000000000000000000000000000000000000000000000000")
+const _hex88631 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff555555f50000f0f5555555f50000ffff555ff5f500005f55f555fff500005f55f5f5f5f500005f55555ff5f500005f55555555f500005f55555555f50000ffffffffffff00000000000000000000000000000000000000000000000000")
+const _hex88639 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff444444f40000f0f4444444f40000ffff444444f400004f44f444f4f400004f44f4f4f4f400004f44444f4ff400004f44444444f400004f44444444f40000ffffffffffff00000000000000000000000000000000000000000000000000")
+const _hex88647 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff333333f30000f0f3333333f30000fffff3ff33f300003f3333f333f300003f33f3fffff300003f3333f333f300003f33333333f300003f33333333f30000ffffffffffff00000000000000000000000000000000000000000000000000")
+const _hex88655 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000f0ffffffff000000ff777777f70000f0f7777777f70000fffff7fff7f700007f77f7f7f7f700007f77f7f7f7f700007f77f7777ff700007f77777777f700007f77777777f70000ffffffffffff00000000000000000000000000000000000000000000000000")
+const _hex88669 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f0bbbbfbf1f10000dfddddbb1ff100f0dd11ddbdfb0f00f0ddf1dddffb0000f0dddddddffb0000f0ddf1dddffb0000f0dd11ddddfb000000dfdddddd0f000000f0ddddfd0000000000ffff0f0000000000000000000000")
+const _hex88683 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f06666f6f1f100009f99f9661ff100f09911996ff60f00f099f1999ff60000f09999999ff60000f099f1999ff60000f09911999ff60000009f99f9990f000000f09999f90000000000ffff0f0000000000000000000000")
+const _hex88697 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f02222f2f1f10000ff4444221ff100f0441f412ff20f00f044f44f4ff20000f04444444ff20000f044f44f4ff20000f0441f414ff2000000ff4444440f000000f04444f40000000000ffff0f0000000000000000000000")
+const _hex88711 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f1000000ffffff11f10000f0ccccfcf1f10000bfbbbbcc1ff100f0bb11b9cbfc0f00f0bbf1b9bffc0000f0bbbbbbbffc0000f0bbf1b9bffc0000f0bb11b9bbfc000000bfbbbbbb0f000000f0bbbbfb0000000000ffff0f0000000000000000000000")
+const _hex88725 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000ffff0000000000f011f10000000000f0f1f10000f0ff0ff011f100002f22f2f0f1f100f0242222ff11f100f0242222f2ff0f00004f2222220f000000f0242222f20000004f2222220f0000f0242222f2000000f02422220f000000004f44f40000000000f0ff0f000000000000000000000000")
+const _hex88739 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000ff0f0000000000f066f600000000009ff1690f000000009f99690f000000009ff1690f00000000f099f9000000000000ffbf0c0000000000dcbb0c0000000000dcbd0c0000000000c0cc000000000000000000000000000000000000000000000000000000")
+const _hex88753 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000000000000000000000cc0c0000000000c0bbcb0000000000dccdbd0c00000000dcddbd0c00000000dccdbd0c00000000c0ddcd000000000000cc2c0f00000000004f220f00000000004f240f0000000000f0ff000000000000000000000000000000000000000000000000000000")
+const _hex88761 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000f0ffffff0f000000f04444440f000000f05555c50f000000005f55550f000000005f55cc0f000000005f55550f00000000f055c50f00000000f055550f00000000005fcc0f00000000005f550f000000f00f5fc50f0000002ff2f0550f0000004ff2f0550f000000f00f00ff0f000000000000000000")
+const _hex88769 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000ffffffff0f0000f022f244440f00004f22225fc50f00004f24225f550f00004f24225fcc0f0000f044f455550f000000ffff55c50f00000000f055550f00000000005fcc0f00000000005f550f00000000005fc50f0000000000f0550f0000000000f0550f000000000000ff0f000000000000000000")
+const _hex88777 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffff00000000001f11110f000000f011b111f10000001fb1b1b1110f00001f111111110f00009fbb29b11b0f00009f991211110f00009f29b1b1110f0000f019b111f1000000001f11110f00000000f0ffff000000000000000000000000000000000000000000000000000000")
+const _hex88785 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffff00000000001f11110f000000f011b111f90000001fb1b121990f00001f111192990f00009fbb29b99b0f00009f999999990f00009fb9b9b9990f0000f099b999f9000000009f99990f00000000f0ffff000000000000000000000000000000000000000000000000000000")
+const _hex88794 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000001000100000000000101010000000000010101000000000000000000000000000f0ffff00000000009f66660f000000f0999969f6000000f0191199f6000000f019ff99f6000000f0999999f6000000f0191199f6000000001fff990f00000000f0ffff00000000000000000000000000000000000000")
+const _hex88802 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000f0ffffff00000000ff9999f9000000f0f999f9ff000000ffff99f9f50000009f9999f9f50000009f99f9fff5ff0000ffffff5555f5000000f0f75f55ff000000fffff7f5f70000007f77777ff70000007f777777f7000000ffffffffff0000000000000000000000000000000000")
+const _hex88810 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000ffff0ff000000000afca0f0f00000000afcaff0000000000afcaff0000000000ffff0f0f00000000f0fa00f000000000afca0f0000000000ffff0ff0ff0000000000006f660f00000000f09969f600000000f0199ff600000000f09999f600000000001f9f0f0000000000f0ff00000000000000000000")
+const _hex88818 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000900000000000100010009000000000090000010000100000ff0f0010000009f0ddfd0009000000dff1dd0f00001009dfdddd0f19000000dff1dd0f00000001f0ddfd000100900000ff0f00900000000900000900000010001000100000000000900000000000000000000000000000000000000000")
+const _hex88826 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000f0ffff00000000009f66660f000000f0191169f6000000f0f91f99f6000000f0999999f6000000f0f91f99f60000ffff191199f600f011f1ff99990f00f0f111f1ffff0000f011110f00000000f0f1f10000000000f011f1000000000000ff0f000000000000000000000000000000000000000000")
+const _hex88834 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000ff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f90000000000005f0f0000000000f05fff00000000005f55550f00000000f055f50000000000005f220f00000000004f220f00000000004f240f0000000000f0ff0000000000000000000000")
+const _hex88842 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000f0000000000000005f0f0000000000f055f500000000005f55550f00000000f05fff0000000000f0f1f600000000009f99690f000000009ff1690f000000009f99690f00000000f099f9000000000000ff2f0f00000000004f220f00000000004f240f0000000000f0ff0000000000000000000000")
+const _hex88850 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000000000000000000000000000000000ff0f0000000000f024f20000000000f024f20000000000f044f2f0ff00000000ff0f6f660f0000fffff0199ff600005f55ff9999f600005ff5f0199ff600005f55ff9f990f00005f5f55ffff000000f0f0ff00000000000000000000000000000000000000000000000000000000")
+const _hex88858 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000010000000000000101000000000000010101000000000001010100000000000000000000000000000ff0f0000000000f066f600000000009f99690f000000009ff1690f000000009f99690f00000000f0f1f9000000000000ff0f00000000000000000000000000000000000000")
+const _hex88866 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0ff0000000000006f660f00000000f09999f600000000f099f1f600000000f09999f600000000009ff10f0000000000f0ff0000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88874 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c0000f0666666f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88881 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0569666f60c0000f0566666f60c0000f0569666f60c0000f0566666f60c0000f0569666f60c0000f0566666f60c0000f0569666f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88888 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0669656f60c0000f0666656f60c0000f0669656f60c0000f0666656f60c0000f0669656f60c0000f0666656f60c0000f0669656f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88895 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0669656f60c0000f0666656f60c0000f0669656f60c0000f0565555f60c0000f0569666f60c0000f0566666f60c0000f0569666f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88902 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000ffffffcf000000f0569666f60c0000f0566666f60c0000f0569666f60c0000f0565555f60c0000f0669656f60c0000f0666656f60c0000f0669656f60c000000ffffffcf00000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88910 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ffff0f00000000f06666f6000000009f11f9660f0000009ff1996f0f0000009f99996f0f0000009ff1999f0f0000009f11f9990f000000f09999f90000000000ffff0f00000000")
+const _hex88917 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ffff0f00000000f02222f2000000004f1f44220f0000004ff4442f0f0000004f44442f0f0000004ff4444f0f0000004f1f44440f000000f04444f40000000000ffff0f00000000")
+const _hex88924 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ff0f0000000000f022f200000000004f22220f000000004f2222f200000000f02422220f0000004f2222f2000000004f22420f00000000f044f4000000000000ff0f0000000000")
+const _hex88931 = pxsim.BufferMethods.createBufferFromHex("870409000900000000ffff0f00000000f0ccccfc00000000bf11b9cc0f000000bff1b9cf0f000000bfbbbbcf0f000000bff1b9bf0f000000bf11b9bb0f000000f0bbbbfb0000000000ffff0f00000000")
+
+
+
+
+function inline__P85459(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6473,23 +6478,23 @@ switch (step) {
   case 1:
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 4; continue; }
-    globals.__updated___110641 = (false);
-    s.tmp_0 = pause__P107011_mk(s);
+    globals.__updated___85456 = (false);
+    s.tmp_0 = pause__P81675_mk(s);
     s.tmp_0.arg0 = 200;
-    s.callLocIdx = 0; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 2; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.__updated___110641);
+    r0 = pxsim_numops_toBoolDecr(globals.__updated___85456);
     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__P108259_mk(s);
-    s.callLocIdx = 1; s.pc = 6; return s.tmp_2;
+    s.tmp_2 = control___screen_update__P83036_mk(s);
+    s.callLocIdx = 3; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
-    globals.__updated___110641 = (true);
+    globals.__updated___85456 = (true);
   case 2:
   case 3:
     { step = 1; continue; }
@@ -6498,12 +6503,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P110644.info = {"start":396,"length":211,"line":17,"column":26,"endLine":26,"endColumn":5,"fileName":"pxt_modules/screen---st7735/frame.ts","functionName":"inline","argumentNames":[]}
+inline__P85459.info = {"start":396,"length":211,"line":17,"column":26,"endLine":26,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P110644_mk(s) {
+function inline__P85459_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P110644, depth: s.depth + 1,
+        parent: s, fn: inline__P85459, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6514,7 +6519,35 @@ function inline__P110644_mk(s) {
 
 
 
-function inline__P110757(s) {
+function inline__P85477(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___83075);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P85477.info = {"start":753,"length":26,"line":22,"column":33,"endLine":22,"endColumn":59,"fileName":"pxt_modules/screen/targetoverrides.ts","functionName":"inline","argumentNames":[]}
+
+function inline__P85477_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P85477, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+} }
+
+
+
+
+
+function inline__P85482(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6528,36 +6561,69 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals.infoState___110753);
+    r0 = pxsim_pxtcore.updateStats(s.arg0);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P85482.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__P85482_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P85482, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function inline__P85597(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___85593);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_numops_toBoolDecr(globals.infoStateStack___110755);
+    r0 = pxsim_numops_toBoolDecr(globals.infoStateStack___85595);
     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___110755 = (r0);
+    globals.infoStateStack___85595 = (r0);
   case 1:
   case 2:
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "state", globals.infoState___110753);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "state", globals.infoState___85593);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "scene", s.arg0);
-    r0 = pxsim_Array__push(globals.infoStateStack___110755, s.tmp_0);
-    globals.infoState___110753 = (undefined);
+    r0 = pxsim_Array__push(globals.infoStateStack___85595, s.tmp_0);
+    globals.infoState___85593 = (undefined);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P110757.info = {"start":1920,"length":259,"line":73,"column":29,"endLine":82,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P85597.info = {"start":1920,"length":259,"line":73,"column":29,"endLine":82,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P110757_mk(s) {
+function inline__P85597_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P110757, depth: s.depth + 1,
+        parent: s, fn: inline__P85597, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6568,7 +6634,7 @@ function inline__P110757_mk(s) {
 
 
 
-function inline__P110772(s) {
+function inline__P85612(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6578,61 +6644,61 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___110773 = undefined;
-    s.nextState___110782 = undefined;
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 18; s.pc = 7; return s.tmp_0;
+    s.scene___85613 = undefined;
+    s.nextState___85622 = undefined;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 19; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.scene___110773 = (r0);
-    globals.infoState___110753 = (undefined);
-    s.tmp_0 = r0 = globals.infoStateStack___110755;
+    s.scene___85613 = (r0);
+    globals.infoState___85593 = (undefined);
+    s.tmp_0 = r0 = globals.infoStateStack___85595;
     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___110755);
+    r0 = pxsim_Array__length(globals.infoStateStack___85595);
   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___110755);
-    s.nextState___110782 = (r0);
+    r0 = pxsim_Array_.pop(globals.infoStateStack___85595);
+    s.nextState___85622 = (r0);
     s.tmp_2 = if_scene_1_mk(s);
-    s.tmp_2.arg0 = s.nextState___110782;
+    s.tmp_2.arg0 = s.nextState___85622;
     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 = 19; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 20; s.pc = 8; return s.tmp_2; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.scene___110773);
+    r0 = (s.tmp_1 == s.scene___85613);
     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___110782;
+    s.tmp_3.arg0 = s.nextState___85622;
     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 = 20; s.pc = 9; return s.tmp_3; }
+     else { s.callLocIdx = 21; s.pc = 9; return s.tmp_3; }
     }
   case 9:
     r0 = s.retval;
-    globals.infoState___110753 = (r0);
+    globals.infoState___85593 = (r0);
     { step = 4; continue; }
   case 3:
-    r0 = pxsim_Array__push(globals.infoStateStack___110755, s.nextState___110782);
+    r0 = pxsim_Array__push(globals.infoStateStack___85595, s.nextState___85622);
   case 4:
   case 5:
   case 6:
@@ -6640,26 +6706,26 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P110772.info = {"start":2211,"length":376,"line":84,"column":28,"endLine":95,"endColumn":5,"fileName":"pxt_modules/game---hw/info.ts","functionName":"inline","argumentNames":[]}
+inline__P85612.info = {"start":2211,"length":376,"line":84,"column":28,"endLine":95,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P110772_mk(s) {
+function inline__P85612_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P110772, depth: s.depth + 1,
+        parent: s, fn: inline__P85612, 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___110773: undefined,
-  nextState___110782: undefined,
+  scene___85613: undefined,
+  nextState___85622: undefined,
 } }
 
 
 
 
 
-function inline__P111208(s) {
+function inline__P86047(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6669,13 +6735,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sz___111209 = undefined;
-    s.tmp_0 = control_ramSize__P106944_mk(s);
-    s.callLocIdx = 27; s.pc = 6; return s.tmp_0;
+    s.sz___86048 = undefined;
+    s.tmp_0 = control_ramSize__P81608_mk(s);
+    s.callLocIdx = 28; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.sz___111209 = (r0);
-    r0 = (s.sz___111209 <= 102400);
+    s.sz___86048 = (r0);
+    r0 = (s.sz___86048 <= 102400);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -6683,7 +6749,7 @@ switch (step) {
     { step = 5; continue; }
     { step = 4; continue; }
   case 1:
-    r0 = (s.sz___111209 <= 204800);
+    r0 = (s.sz___86048 <= 204800);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 2; continue; }
@@ -6700,23 +6766,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P111208.info = {"start":223,"length":217,"line":8,"column":25,"endLine":17,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":[]}
+inline__P86047.info = {"start":223,"length":217,"line":8,"column":25,"endLine":17,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P111208_mk(s) {
+function inline__P86047_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P111208, depth: s.depth + 1,
+        parent: s, fn: inline__P86047, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  sz___111209: undefined,
+  sz___86048: undefined,
 } }
 
 
 
 
 
-function inline__P111300(s) {
+function inline__P86139(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6746,12 +6812,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P111300.info = {"start":860,"length":117,"line":31,"column":40,"endLine":34,"endColumn":5,"fileName":"pxt_modules/game---hw/texteffects.ts","functionName":"inline","argumentNames":[]}
+inline__P86139.info = {"start":860,"length":117,"line":31,"column":40,"endLine":34,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P111300_mk(s) {
+function inline__P86139_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P111300, depth: s.depth + 1,
+        parent: s, fn: inline__P86139, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6766,7 +6832,7 @@ function inline__P111300_mk(s) {
 
 
 
-function inline__P111313(s) {
+function inline__P86152(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6795,10 +6861,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__P106733_mk(s);
+    s.tmp_7 = Math_sign__P81397_mk(s);
     r0 = pxsim.Math_.sin(s.arg0);
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 47; s.pc = 7; return s.tmp_7;
+    s.callLocIdx = 48; s.pc = 7; return s.tmp_7;
   case 7:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -6816,7 +6882,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 = 48; s.pc = 8; return s.tmp_1; }
+     else { s.callLocIdx = 49; s.pc = 8; return s.tmp_1; }
     }
   case 8:
     r0 = s.retval;
@@ -6841,7 +6907,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 = 49; s.pc = 10; return s.tmp_6; }
+     else { s.callLocIdx = 50; s.pc = 10; return s.tmp_6; }
     }
   case 10:
     r0 = s.retval;
@@ -6856,11 +6922,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 = 50; s.pc = 9; return s.tmp_3; }
+     else { s.callLocIdx = 51; s.pc = 9; return s.tmp_3; }
     }
   case 9:
     r0 = s.retval;
-    s.tmp_2 = Math_abs__P106732_mk(s);
+    s.tmp_2 = Math_abs__P81396_mk(s);
     s.tmp_3 = if_yOffset_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -6869,12 +6935,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 = 51; s.pc = 12; return s.tmp_3; }
+     else { s.callLocIdx = 52; s.pc = 12; return s.tmp_3; }
     }
   case 12:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 52; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 53; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -6890,7 +6956,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 = 53; s.pc = 13; return s.tmp_6; }
+     else { s.callLocIdx = 54; s.pc = 13; return s.tmp_6; }
     }
   case 13:
     r0 = s.retval;
@@ -6908,7 +6974,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 = 54; s.pc = 14; return s.tmp_7; }
+     else { s.callLocIdx = 55; s.pc = 14; return s.tmp_7; }
     }
   case 14:
     r0 = s.retval;
@@ -6924,7 +6990,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 = 55; s.pc = 15; return s.tmp_9; }
+     else { s.callLocIdx = 56; s.pc = 15; return s.tmp_9; }
     }
   case 15:
     r0 = s.retval;
@@ -6932,12 +6998,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P111313.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"]}
+inline__P86152.info = {"start":1127,"length":417,"line":42,"column":39,"endLine":55,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["index","state"]}
 
-function inline__P111313_mk(s) {
+function inline__P86152_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P111313, depth: s.depth + 1,
+        parent: s, fn: inline__P86152, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6957,7 +7023,7 @@ function inline__P111313_mk(s) {
 
 
 
-function inline__P117065(s) {
+function inline__P91954(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6975,12 +7041,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117065.info = {"start":497,"length":19,"line":22,"column":16,"endLine":22,"endColumn":35,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P91954.info = {"start":497,"length":19,"line":22,"column":16,"endLine":22,"endColumn":35,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117065_mk(s) {
+function inline__P91954_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117065, depth: s.depth + 1,
+        parent: s, fn: inline__P91954, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -6989,7 +7055,7 @@ function inline__P117065_mk(s) {
 
 
 
-function inline__P117072(s) {
+function inline__P91961(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7010,12 +7076,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117072.info = {"start":592,"length":66,"line":27,"column":29,"endLine":29,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P91961.info = {"start":592,"length":66,"line":27,"column":29,"endLine":29,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117072_mk(s) {
+function inline__P91961_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117072, depth: s.depth + 1,
+        parent: s, fn: inline__P91961, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -7025,7 +7091,7 @@ function inline__P117072_mk(s) {
 
 
 
-function inline__P117083(s) {
+function inline__P91973(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7035,16 +7101,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.chars___117085 = undefined;
-    s.targets___117113 = undefined;
+    s.chars___91975 = undefined;
+    s.targets___91996 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P117088);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P91978);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
@@ -7052,32 +7118,32 @@ switch (step) {
     r0 = r0.fields["components"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 885; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 884; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.chars___117085 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P117119);
+    s.chars___91975 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P92002);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arraySort__P106712_mk(s);
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_2.arg0 = s.chars___117085;
+    s.tmp_1 = helpers_arraySort__P81374_mk(s);
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_2.arg0 = s.chars___91975;
     s.tmp_2.arg1 = s.tmp_0;
-    s.callLocIdx = 888; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 887; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P117115;
-    s.callLocIdx = 891; s.pc = 2; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P91998;
+    s.callLocIdx = 890; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    s.targets___117113 = (r0);
+    s.targets___91996 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117113);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___91996);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117113);
+    r0 = pxsim_Array__length(s.targets___91996);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -7086,18 +7152,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117083.info = {"start":687,"length":722,"line":31,"column":26,"endLine":46,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P91973.info = {"start":687,"length":722,"line":31,"column":26,"endLine":46,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117083_mk(s) {
+function inline__P91973_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117083, depth: s.depth + 1,
+        parent: s, fn: inline__P91973, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  chars___117085: undefined,
-  targets___117113: undefined,
+  chars___91975: undefined,
+  targets___91996: undefined,
   arg0: undefined,
 } }
 
@@ -7105,7 +7171,7 @@ function inline__P117083_mk(s) {
 
 
 
-function inline__P117088(s) {
+function inline__P91978(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7141,12 +7207,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117088.info = {"start":851,"length":60,"line":34,"column":24,"endLine":34,"endColumn":84,"fileName":"library.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P91978.info = {"start":851,"length":60,"line":34,"column":24,"endLine":34,"endColumn":84,"fileName":"library.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P117088_mk(s) {
+function inline__P91978_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117088, depth: s.depth + 1,
+        parent: s, fn: inline__P91978, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7160,7 +7226,7 @@ function inline__P117088_mk(s) {
 
 
 
-function inline__P117119(s) {
+function inline__P92002(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7177,7 +7243,7 @@ switch (step) {
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "char", s.arg0);
-    s.tmp_2 = util_distSqBetweenSprites__P110100_mk(s);
+    s.tmp_2 = util_distSqBetweenSprites__P84852_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_2.arg0 = r0;
     r0 = s.caps[0].fields["page"];
@@ -7185,7 +7251,7 @@ switch (step) {
     r0 = r0.fields["char"];
     r0 = r0.fields["kelpie"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 887; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 886; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -7194,12 +7260,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117119.info = {"start":1030,"length":216,"line":37,"column":21,"endLine":42,"endColumn":17,"fileName":"library.ts","functionName":"inline","argumentNames":["char"]}
+inline__P92002.info = {"start":1030,"length":216,"line":37,"column":21,"endLine":42,"endColumn":17,"fileName":"library.ts","functionName":"inline","argumentNames":["char"]}
 
-function inline__P117119_mk(s) {
+function inline__P92002_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117119, depth: s.depth + 1,
+        parent: s, fn: inline__P92002, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7211,7 +7277,7 @@ function inline__P117119_mk(s) {
 
 
 
-function inline__P117115(s) {
+function inline__P91998(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7234,7 +7300,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["distSq"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["distSq"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 889; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 888; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -7247,7 +7313,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["distSq"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["distSq"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 890; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 889; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -7256,12 +7322,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117115.info = {"start":1270,"length":29,"line":43,"column":22,"endLine":43,"endColumn":51,"fileName":"library.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P91998.info = {"start":1270,"length":29,"line":43,"column":22,"endLine":43,"endColumn":51,"fileName":"library.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P117115_mk(s) {
+function inline__P91998_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117115, depth: s.depth + 1,
+        parent: s, fn: inline__P91998, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7275,7 +7341,7 @@ function inline__P117115_mk(s) {
 
 
 
-function inline__P117157(s) {
+function inline__P92035(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7285,8 +7351,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.chars___117159 = undefined;
-    s.targets___117169 = undefined;
+    s.chars___92037 = undefined;
+    s.targets___92044 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -7305,20 +7371,20 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.chars___117159 = (s.tmp_1);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.chars___117159;
-    s.tmp_0.arg1 = inline__P117171;
-    s.callLocIdx = 895; s.pc = 3; return s.tmp_0;
+    s.chars___92037 = (s.tmp_1);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.chars___92037;
+    s.tmp_0.arg1 = inline__P92046;
+    s.callLocIdx = 894; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.targets___117169 = (r0);
+    s.targets___92044 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117169);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92044);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117169);
+    r0 = pxsim_Array__length(s.targets___92044);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -7327,18 +7393,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117157.info = {"start":1439,"length":437,"line":48,"column":27,"endLine":60,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92035.info = {"start":1439,"length":437,"line":48,"column":27,"endLine":60,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117157_mk(s) {
+function inline__P92035_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117157, depth: s.depth + 1,
+        parent: s, fn: inline__P92035, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  chars___117159: undefined,
-  targets___117169: undefined,
+  chars___92037: undefined,
+  targets___92044: undefined,
   arg0: undefined,
 } }
 
@@ -7346,7 +7412,7 @@ function inline__P117157_mk(s) {
 
 
 
-function inline__P117171(s) {
+function inline__P92046(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7368,12 +7434,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117171.info = {"start":1610,"length":156,"line":52,"column":21,"endLine":57,"endColumn":17,"fileName":"library.ts","functionName":"inline","argumentNames":["char"]}
+inline__P92046.info = {"start":1610,"length":156,"line":52,"column":21,"endLine":57,"endColumn":17,"fileName":"library.ts","functionName":"inline","argumentNames":["char"]}
 
-function inline__P117171_mk(s) {
+function inline__P92046_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117171, depth: s.depth + 1,
+        parent: s, fn: inline__P92046, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -7383,7 +7449,7 @@ function inline__P117171_mk(s) {
 
 
 
-function inline__P117193(s) {
+function inline__P92066(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7393,21 +7459,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.direction___117195 = undefined;
+    s.direction___92068 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_mkVec2__P110429_mk(s);
+    s.tmp_0 = kodu_mkVec2__P85212_mk(s);
     s.tmp_0.arg0 = 0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 898; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 897; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.direction___117195 = (r0);
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.up___108377;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.direction___92068 = (r0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.up___83153;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 14; return s.tmp_1;
   case 14:
@@ -7415,7 +7481,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = r0 = s.direction___117195;
+    s.tmp_2 = r0 = s.direction___92068;
     r0 = s.tmp_2.fields["y"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 - 1);
@@ -7423,9 +7489,9 @@ switch (step) {
     r0 = (s.tmp_2).fields["y"] = (s.tmp_3);
   case 1:
   case 2:
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.down___108379;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.down___83155;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 15; return s.tmp_1;
   case 15:
@@ -7433,7 +7499,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = r0 = s.direction___117195;
+    s.tmp_2 = r0 = s.direction___92068;
     r0 = s.tmp_2.fields["y"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 1);
@@ -7441,9 +7507,9 @@ switch (step) {
     r0 = (s.tmp_2).fields["y"] = (s.tmp_3);
   case 3:
   case 4:
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.left___108376;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.left___83152;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 16; return s.tmp_1;
   case 16:
@@ -7451,7 +7517,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = r0 = s.direction___117195;
+    s.tmp_2 = r0 = s.direction___92068;
     r0 = s.tmp_2.fields["x"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 - 1);
@@ -7459,9 +7525,9 @@ switch (step) {
     r0 = (s.tmp_2).fields["x"] = (s.tmp_3);
   case 5:
   case 6:
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.right___108378;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.right___83154;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 17; return s.tmp_1;
   case 17:
@@ -7469,7 +7535,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_2 = r0 = s.direction___117195;
+    s.tmp_2 = r0 = s.direction___92068;
     r0 = s.tmp_2.fields["x"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 1);
@@ -7477,14 +7543,14 @@ switch (step) {
     r0 = (s.tmp_2).fields["x"] = (s.tmp_3);
   case 7:
   case 8:
-    r0 = s.direction___117195.fields["x"];
+    r0 = s.direction___92068.fields["x"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 9; continue; }
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 9:
-    r0 = s.direction___117195.fields["y"];
+    r0 = s.direction___92068.fields["y"];
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -7495,26 +7561,26 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_2, "exec", true);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "direction", s.direction___117195);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "direction", s.direction___92068);
   case 11:
   case 12:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117193.info = {"start":1906,"length":490,"line":62,"column":27,"endLine":72,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92066.info = {"start":1906,"length":490,"line":62,"column":27,"endLine":72,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117193_mk(s) {
+function inline__P92066_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117193, depth: s.depth + 1,
+        parent: s, fn: inline__P92066, 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,
-  direction___117195: undefined,
+  direction___92068: undefined,
   arg0: undefined,
 } }
 
@@ -7522,7 +7588,7 @@ function inline__P117193_mk(s) {
 
 
 
-function inline__P117243(s) {
+function inline__P92114(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7536,9 +7602,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.A___108374;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.A___83150;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 3; return s.tmp_1;
   case 3:
@@ -7555,12 +7621,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117243.info = {"start":2430,"length":128,"line":74,"column":31,"endLine":78,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92114.info = {"start":2430,"length":128,"line":74,"column":31,"endLine":78,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117243_mk(s) {
+function inline__P92114_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117243, depth: s.depth + 1,
+        parent: s, fn: inline__P92114, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7572,7 +7638,7 @@ function inline__P117243_mk(s) {
 
 
 
-function inline__P117256(s) {
+function inline__P92126(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7586,9 +7652,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.B___108375;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.B___83151;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 3; return s.tmp_1;
   case 3:
@@ -7605,12 +7671,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117256.info = {"start":2592,"length":128,"line":80,"column":31,"endLine":84,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92126.info = {"start":2592,"length":128,"line":80,"column":31,"endLine":84,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117256_mk(s) {
+function inline__P92126_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117256, depth: s.depth + 1,
+        parent: s, fn: inline__P92126, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7622,7 +7688,7 @@ function inline__P117256_mk(s) {
 
 
 
-function inline__P117269(s) {
+function inline__P92138(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7632,10 +7698,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.timerStart___117271 = undefined;
-    s.now___117284 = undefined;
-    s.timespan___117287 = undefined;
-    s.elapsed___117293 = undefined;
+    s.timerStart___92140 = undefined;
+    s.now___92151 = undefined;
+    s.timespan___92154 = undefined;
+    s.elapsed___92159 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -7653,12 +7719,12 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.timerStart___117271 = (s.tmp_2);
+    s.timerStart___92140 = (s.tmp_2);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timerStart", s.timerStart___117271);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timerStart", s.timerStart___92140);
     r0 = pxsim.control.millis();
-    s.now___117284 = (r0);
+    s.now___92151 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_1, "timespan");
@@ -7672,10 +7738,10 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.timespan___117287 = (s.tmp_2);
-    r0 = (s.now___117284 - s.timerStart___117271);
-    s.elapsed___117293 = (r0);
-    r0 = (s.elapsed___117293 >= s.timespan___117287);
+    s.timespan___92154 = (s.tmp_2);
+    r0 = (s.now___92151 - s.timerStart___92140);
+    s.elapsed___92159 = (r0);
+    r0 = (s.elapsed___92159 >= s.timespan___92154);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -7684,27 +7750,27 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_1, "exec", true);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timerStart", s.now___117284);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timerStart", s.now___92151);
   case 5:
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117269.info = {"start":2751,"length":452,"line":86,"column":28,"endLine":96,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92138.info = {"start":2751,"length":452,"line":86,"column":28,"endLine":96,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117269_mk(s) {
+function inline__P92138_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117269, depth: s.depth + 1,
+        parent: s, fn: inline__P92138, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  timerStart___117271: undefined,
-  now___117284: undefined,
-  timespan___117287: undefined,
-  elapsed___117293: undefined,
+  timerStart___92140: undefined,
+  now___92151: undefined,
+  timespan___92154: undefined,
+  elapsed___92159: undefined,
   arg0: undefined,
 } }
 
@@ -7712,7 +7778,7 @@ function inline__P117269_mk(s) {
 
 
 
-function inline__P117314(s) {
+function inline__P92178(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7747,12 +7813,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117314.info = {"start":3275,"length":197,"line":101,"column":25,"endLine":107,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92178.info = {"start":3275,"length":197,"line":101,"column":25,"endLine":107,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117314_mk(s) {
+function inline__P92178_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117314, depth: s.depth + 1,
+        parent: s, fn: inline__P92178, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7765,7 +7831,7 @@ function inline__P117314_mk(s) {
 
 
 
-function inline__P117335(s) {
+function inline__P92195(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7775,7 +7841,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117337 = undefined;
+    s.targets___92197 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -7783,8 +7849,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117337 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117337);
+    s.targets___92197 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92197);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -7793,7 +7859,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(s.targets___117337);
+    r0 = pxsim_Array__length(s.targets___92197);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -7806,20 +7872,20 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = helpers_arraySlice__P106721_mk(s);
-    s.tmp_5.arg0 = s.targets___117337;
+    s.tmp_5 = helpers_arraySlice__P81384_mk(s);
+    s.tmp_5.arg0 = s.targets___92197;
     s.tmp_5.arg1 = 0;
     s.tmp_5.arg2 = 1;
-    s.callLocIdx = 910; s.pc = 6; return s.tmp_5;
+    s.callLocIdx = 909; s.pc = 6; return s.tmp_5;
   case 6:
     r0 = s.retval;
-    s.targets___117337 = (r0);
+    s.targets___92197 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117337);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92197);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117337);
+    r0 = pxsim_Array__length(s.targets___92197);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -7829,12 +7895,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117335.info = {"start":3500,"length":284,"line":109,"column":25,"endLine":115,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92195.info = {"start":3500,"length":284,"line":109,"column":25,"endLine":115,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117335_mk(s) {
+function inline__P92195_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117335, depth: s.depth + 1,
+        parent: s, fn: inline__P92195, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7842,7 +7908,7 @@ function inline__P117335_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  targets___117337: undefined,
+  targets___92197: undefined,
   arg0: undefined,
 } }
 
@@ -7850,7 +7916,7 @@ function inline__P117335_mk(s) {
 
 
 
-function inline__P117367(s) {
+function inline__P92224(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7860,8 +7926,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117369 = undefined;
-    s.distCutoffSq___117391 = undefined;
+    s.targets___92226 = undefined;
+    s.distCutoffSq___92244 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -7869,8 +7935,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117369 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117369);
+    s.targets___92226 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92226);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -7905,23 +7971,23 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "dist_cutoff_sq");
-    s.distCutoffSq___117391 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P117399);
+    s.distCutoffSq___92244 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P92251);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.distCutoffSq___117391);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_1.arg0 = s.targets___117369;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.distCutoffSq___92244);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_1.arg0 = s.targets___92226;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 914; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 913; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    s.targets___117369 = (r0);
+    s.targets___92226 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117369);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92226);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117369);
+    r0 = pxsim_Array__length(s.targets___92226);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -7931,12 +7997,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117367.info = {"start":3816,"length":567,"line":117,"column":29,"endLine":129,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92224.info = {"start":3816,"length":567,"line":117,"column":29,"endLine":129,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117367_mk(s) {
+function inline__P92224_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117367, depth: s.depth + 1,
+        parent: s, fn: inline__P92224, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7945,8 +8011,8 @@ function inline__P117367_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  targets___117369: undefined,
-  distCutoffSq___117391: undefined,
+  targets___92226: undefined,
+  distCutoffSq___92244: undefined,
   arg0: undefined,
 } }
 
@@ -7954,7 +8020,7 @@ function inline__P117367_mk(s) {
 
 
 
-function inline__P117399(s) {
+function inline__P92251(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7976,7 +8042,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["distSq"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["distSq"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 913; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 912; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -7985,12 +8051,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117399.info = {"start":4239,"length":34,"line":126,"column":37,"endLine":126,"endColumn":71,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92251.info = {"start":4239,"length":34,"line":126,"column":37,"endLine":126,"endColumn":71,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117399_mk(s) {
+function inline__P92251_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117399, depth: s.depth + 1,
+        parent: s, fn: inline__P92251, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8001,7 +8067,7 @@ function inline__P117399_mk(s) {
 
 
 
-function inline__P117422(s) {
+function inline__P92272(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8011,8 +8077,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117424 = undefined;
-    s.distCutoffSq___117446 = undefined;
+    s.targets___92274 = undefined;
+    s.distCutoffSq___92292 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8020,8 +8086,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117424 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117424);
+    s.targets___92274 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92274);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8056,23 +8122,23 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "dist_cutoff_sq");
-    s.distCutoffSq___117446 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P117454);
+    s.distCutoffSq___92292 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P92299);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.distCutoffSq___117446);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_1.arg0 = s.targets___117424;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.distCutoffSq___92292);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_1.arg0 = s.targets___92274;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 918; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 917; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    s.targets___117424 = (r0);
+    s.targets___92274 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117424);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92274);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117424);
+    r0 = pxsim_Array__length(s.targets___92274);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -8082,12 +8148,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117422.info = {"start":4416,"length":568,"line":131,"column":30,"endLine":143,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92272.info = {"start":4416,"length":568,"line":131,"column":30,"endLine":143,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117422_mk(s) {
+function inline__P92272_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117422, depth: s.depth + 1,
+        parent: s, fn: inline__P92272, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8096,8 +8162,8 @@ function inline__P117422_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  targets___117424: undefined,
-  distCutoffSq___117446: undefined,
+  targets___92274: undefined,
+  distCutoffSq___92292: undefined,
   arg0: undefined,
 } }
 
@@ -8105,7 +8171,7 @@ function inline__P117422_mk(s) {
 
 
 
-function inline__P117454(s) {
+function inline__P92299(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8127,7 +8193,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["distSq"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["distSq"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 917; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 916; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -8136,12 +8202,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117454.info = {"start":4839,"length":35,"line":140,"column":37,"endLine":140,"endColumn":72,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92299.info = {"start":4839,"length":35,"line":140,"column":37,"endLine":140,"endColumn":72,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117454_mk(s) {
+function inline__P92299_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117454, depth: s.depth + 1,
+        parent: s, fn: inline__P92299, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8152,7 +8218,7 @@ function inline__P117454_mk(s) {
 
 
 
-function inline__P117477(s) {
+function inline__P92320(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8162,7 +8228,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117479 = undefined;
+    s.targets___92322 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8170,8 +8236,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117479 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117479);
+    s.targets___92322 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92322);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8180,19 +8246,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117479;
-    s.tmp_2.arg1 = inline__P117488;
-    s.callLocIdx = 923; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92322;
+    s.tmp_2.arg1 = inline__P92330;
+    s.callLocIdx = 922; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117479 = (r0);
+    s.targets___92322 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117479);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92322);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117479);
+    r0 = pxsim_Array__length(s.targets___92322);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -8202,17 +8268,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117477.info = {"start":5015,"length":298,"line":145,"column":28,"endLine":151,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92320.info = {"start":5015,"length":298,"line":145,"column":28,"endLine":151,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117477_mk(s) {
+function inline__P92320_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117477, depth: s.depth + 1,
+        parent: s, fn: inline__P92320, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117479: undefined,
+  targets___92322: undefined,
   arg0: undefined,
 } }
 
@@ -8220,7 +8286,7 @@ function inline__P117477_mk(s) {
 
 
 
-function inline__P117488(s) {
+function inline__P92330(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8243,7 +8309,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 921; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 920; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -8255,7 +8321,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["id"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["id"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 922; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 921; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -8264,12 +8330,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117488.info = {"start":5167,"length":36,"line":148,"column":37,"endLine":148,"endColumn":73,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92330.info = {"start":5167,"length":36,"line":148,"column":37,"endLine":148,"endColumn":73,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117488_mk(s) {
+function inline__P92330_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117488, depth: s.depth + 1,
+        parent: s, fn: inline__P92330, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8281,7 +8347,7 @@ function inline__P117488_mk(s) {
 
 
 
-function inline__P117513(s) {
+function inline__P92353(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8291,7 +8357,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117515 = undefined;
+    s.targets___92355 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8299,8 +8365,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117515 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117515);
+    s.targets___92355 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92355);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8309,19 +8375,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117515;
-    s.tmp_2.arg1 = inline__P117524;
-    s.callLocIdx = 928; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92355;
+    s.tmp_2.arg1 = inline__P92363;
+    s.callLocIdx = 927; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117515 = (r0);
+    s.targets___92355 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117515);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92355);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117515);
+    r0 = pxsim_Array__length(s.targets___92355);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -8331,17 +8397,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117513.info = {"start":5345,"length":299,"line":153,"column":29,"endLine":159,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92353.info = {"start":5345,"length":299,"line":153,"column":29,"endLine":159,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117513_mk(s) {
+function inline__P92353_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117513, depth: s.depth + 1,
+        parent: s, fn: inline__P92353, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117515: undefined,
+  targets___92355: undefined,
   arg0: undefined,
 } }
 
@@ -8349,7 +8415,7 @@ function inline__P117513_mk(s) {
 
 
 
-function inline__P117524(s) {
+function inline__P92363(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8372,7 +8438,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 926; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 925; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -8384,7 +8450,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["id"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["id"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 927; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 926; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -8393,12 +8459,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117524.info = {"start":5497,"length":37,"line":156,"column":37,"endLine":156,"endColumn":74,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92363.info = {"start":5497,"length":37,"line":156,"column":37,"endLine":156,"endColumn":74,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117524_mk(s) {
+function inline__P92363_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117524, depth: s.depth + 1,
+        parent: s, fn: inline__P92363, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8410,7 +8476,7 @@ function inline__P117524_mk(s) {
 
 
 
-function inline__P117548(s) {
+function inline__P92385(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8420,7 +8486,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117550 = undefined;
+    s.targets___92387 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8428,8 +8494,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117550 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117550);
+    s.targets___92387 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92387);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8438,19 +8504,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117550;
-    s.tmp_2.arg1 = inline__P117559;
-    s.callLocIdx = 933; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92387;
+    s.tmp_2.arg1 = inline__P92395;
+    s.callLocIdx = 932; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117550 = (r0);
+    s.targets___92387 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117550);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92387);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117550);
+    r0 = pxsim_Array__length(s.targets___92387);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -8460,17 +8526,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117548.info = {"start":5675,"length":298,"line":161,"column":28,"endLine":167,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92385.info = {"start":5675,"length":298,"line":161,"column":28,"endLine":167,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117548_mk(s) {
+function inline__P92385_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117548, depth: s.depth + 1,
+        parent: s, fn: inline__P92385, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117550: undefined,
+  targets___92387: undefined,
   arg0: undefined,
 } }
 
@@ -8478,7 +8544,7 @@ function inline__P117548_mk(s) {
 
 
 
-function inline__P117559(s) {
+function inline__P92395(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8501,7 +8567,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 931; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 930; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -8513,7 +8579,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["id"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["id"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 932; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 931; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -8522,12 +8588,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117559.info = {"start":5827,"length":36,"line":164,"column":37,"endLine":164,"endColumn":73,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92395.info = {"start":5827,"length":36,"line":164,"column":37,"endLine":164,"endColumn":73,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117559_mk(s) {
+function inline__P92395_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117559, depth: s.depth + 1,
+        parent: s, fn: inline__P92395, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8539,7 +8605,7 @@ function inline__P117559_mk(s) {
 
 
 
-function inline__P117583(s) {
+function inline__P92417(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8549,7 +8615,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.timespan___117585 = undefined;
+    s.timespan___92419 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8567,27 +8633,27 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.timespan___117585 = (s.tmp_2);
-    r0 = (s.timespan___117585 / 2);
-    s.timespan___117585 = (r0);
+    s.timespan___92419 = (s.tmp_2);
+    r0 = (s.timespan___92419 / 2);
+    s.timespan___92419 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timespan", s.timespan___117585);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timespan", s.timespan___92419);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117583.info = {"start":6013,"length":170,"line":169,"column":37,"endLine":173,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92417.info = {"start":6013,"length":170,"line":169,"column":37,"endLine":173,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117583_mk(s) {
+function inline__P92417_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117583, depth: s.depth + 1,
+        parent: s, fn: inline__P92417, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  timespan___117585: undefined,
+  timespan___92419: undefined,
   arg0: undefined,
 } }
 
@@ -8595,7 +8661,7 @@ function inline__P117583_mk(s) {
 
 
 
-function inline__P117604(s) {
+function inline__P92436(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8605,7 +8671,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.timespan___117606 = undefined;
+    s.timespan___92438 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8623,27 +8689,27 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.timespan___117606 = (s.tmp_2);
-    r0 = (s.timespan___117606 + 1000);
-    s.timespan___117606 = (r0);
+    s.timespan___92438 = (s.tmp_2);
+    r0 = (s.timespan___92438 + 1000);
+    s.timespan___92438 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timespan", s.timespan___117606);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "timespan", s.timespan___92438);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117604.info = {"start":6222,"length":171,"line":175,"column":36,"endLine":179,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92436.info = {"start":6222,"length":171,"line":175,"column":36,"endLine":179,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117604_mk(s) {
+function inline__P92436_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117604, depth: s.depth + 1,
+        parent: s, fn: inline__P92436, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  timespan___117606: undefined,
+  timespan___92438: undefined,
   arg0: undefined,
 } }
 
@@ -8651,7 +8717,7 @@ function inline__P117604_mk(s) {
 
 
 
-function inline__P117626(s) {
+function inline__P92456(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8661,7 +8727,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117628 = undefined;
+    s.targets___92458 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8669,8 +8735,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117628 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117628);
+    s.targets___92458 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92458);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8679,19 +8745,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117628;
-    s.tmp_2.arg1 = inline__P117637;
-    s.callLocIdx = 942; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92458;
+    s.tmp_2.arg1 = inline__P92466;
+    s.callLocIdx = 941; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117628 = (r0);
+    s.targets___92458 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117628);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92458);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117628);
+    r0 = pxsim_Array__length(s.targets___92458);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -8701,17 +8767,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117626.info = {"start":6431,"length":309,"line":181,"column":35,"endLine":187,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92456.info = {"start":6431,"length":309,"line":181,"column":35,"endLine":187,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117626_mk(s) {
+function inline__P92456_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117626, depth: s.depth + 1,
+        parent: s, fn: inline__P92456, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117628: undefined,
+  targets___92458: undefined,
   arg0: undefined,
 } }
 
@@ -8719,7 +8785,7 @@ function inline__P117626_mk(s) {
 
 
 
-function inline__P117637(s) {
+function inline__P92466(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8741,7 +8807,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["char"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["char"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 940; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 939; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -8749,14 +8815,14 @@ switch (step) {
     r0 = r0.fields["feeling"];
     s.tmp_0 = r0;
     s.tmp_3 = if_None_1_mk(s);
-    s.tmp_3.arg0 = globals.Feeling___136331;
+    s.tmp_3.arg0 = globals.Feeling___85159;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "None");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["None"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["None"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 941; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 940; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -8765,12 +8831,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117637.info = {"start":6583,"length":47,"line":184,"column":37,"endLine":184,"endColumn":84,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92466.info = {"start":6583,"length":47,"line":184,"column":37,"endLine":184,"endColumn":84,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117637_mk(s) {
+function inline__P92466_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117637, depth: s.depth + 1,
+        parent: s, fn: inline__P92466, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8783,7 +8849,7 @@ function inline__P117637_mk(s) {
 
 
 
-function inline__P117665(s) {
+function inline__P92491(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8793,7 +8859,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117667 = undefined;
+    s.targets___92493 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8801,8 +8867,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117667 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117667);
+    s.targets___92493 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92493);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8811,19 +8877,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117667;
-    s.tmp_2.arg1 = inline__P117676;
-    s.callLocIdx = 947; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92493;
+    s.tmp_2.arg1 = inline__P92501;
+    s.callLocIdx = 946; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117667 = (r0);
+    s.targets___92493 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117667);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92493);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117667);
+    r0 = pxsim_Array__length(s.targets___92493);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -8833,17 +8899,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117665.info = {"start":6779,"length":310,"line":189,"column":36,"endLine":195,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92491.info = {"start":6779,"length":310,"line":189,"column":36,"endLine":195,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117665_mk(s) {
+function inline__P92491_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117665, depth: s.depth + 1,
+        parent: s, fn: inline__P92491, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117667: undefined,
+  targets___92493: undefined,
   arg0: undefined,
 } }
 
@@ -8851,7 +8917,7 @@ function inline__P117665_mk(s) {
 
 
 
-function inline__P117676(s) {
+function inline__P92501(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8873,7 +8939,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["char"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["char"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 945; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 944; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -8881,14 +8947,14 @@ switch (step) {
     r0 = r0.fields["feeling"];
     s.tmp_0 = r0;
     s.tmp_3 = if_Happy_1_mk(s);
-    s.tmp_3.arg0 = globals.Feeling___136331;
+    s.tmp_3.arg0 = globals.Feeling___85159;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "Happy");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["Happy"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["Happy"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 946; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 945; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -8897,12 +8963,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117676.info = {"start":6931,"length":48,"line":192,"column":37,"endLine":192,"endColumn":85,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92501.info = {"start":6931,"length":48,"line":192,"column":37,"endLine":192,"endColumn":85,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117676_mk(s) {
+function inline__P92501_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117676, depth: s.depth + 1,
+        parent: s, fn: inline__P92501, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8915,7 +8981,7 @@ function inline__P117676_mk(s) {
 
 
 
-function inline__P117704(s) {
+function inline__P92525(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8925,7 +8991,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117706 = undefined;
+    s.targets___92527 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -8933,8 +8999,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117706 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117706);
+    s.targets___92527 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92527);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -8943,19 +9009,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117706;
-    s.tmp_2.arg1 = inline__P117715;
-    s.callLocIdx = 952; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92527;
+    s.tmp_2.arg1 = inline__P92535;
+    s.callLocIdx = 951; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117706 = (r0);
+    s.targets___92527 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117706);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92527);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117706);
+    r0 = pxsim_Array__length(s.targets___92527);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -8965,17 +9031,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117704.info = {"start":7128,"length":310,"line":197,"column":36,"endLine":203,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92525.info = {"start":7128,"length":310,"line":197,"column":36,"endLine":203,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117704_mk(s) {
+function inline__P92525_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117704, depth: s.depth + 1,
+        parent: s, fn: inline__P92525, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117706: undefined,
+  targets___92527: undefined,
   arg0: undefined,
 } }
 
@@ -8983,7 +9049,7 @@ function inline__P117704_mk(s) {
 
 
 
-function inline__P117715(s) {
+function inline__P92535(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9005,7 +9071,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["char"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["char"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 950; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 949; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -9013,14 +9079,14 @@ switch (step) {
     r0 = r0.fields["feeling"];
     s.tmp_0 = r0;
     s.tmp_3 = if_Angry_1_mk(s);
-    s.tmp_3.arg0 = globals.Feeling___136331;
+    s.tmp_3.arg0 = globals.Feeling___85159;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "Angry");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["Angry"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["Angry"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 951; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 950; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -9029,12 +9095,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117715.info = {"start":7280,"length":48,"line":200,"column":37,"endLine":200,"endColumn":85,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92535.info = {"start":7280,"length":48,"line":200,"column":37,"endLine":200,"endColumn":85,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117715_mk(s) {
+function inline__P92535_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117715, depth: s.depth + 1,
+        parent: s, fn: inline__P92535, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -9047,7 +9113,7 @@ function inline__P117715_mk(s) {
 
 
 
-function inline__P117743(s) {
+function inline__P92559(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9057,7 +9123,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117745 = undefined;
+    s.targets___92561 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9065,8 +9131,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117745 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117745);
+    s.targets___92561 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92561);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -9075,19 +9141,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117745;
-    s.tmp_2.arg1 = inline__P117754;
-    s.callLocIdx = 957; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92561;
+    s.tmp_2.arg1 = inline__P92569;
+    s.callLocIdx = 956; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117745 = (r0);
+    s.targets___92561 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117745);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92561);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117745);
+    r0 = pxsim_Array__length(s.targets___92561);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -9097,17 +9163,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117743.info = {"start":7477,"length":310,"line":205,"column":36,"endLine":211,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92559.info = {"start":7477,"length":310,"line":205,"column":36,"endLine":211,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117743_mk(s) {
+function inline__P92559_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117743, depth: s.depth + 1,
+        parent: s, fn: inline__P92559, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117745: undefined,
+  targets___92561: undefined,
   arg0: undefined,
 } }
 
@@ -9115,7 +9181,7 @@ function inline__P117743_mk(s) {
 
 
 
-function inline__P117754(s) {
+function inline__P92569(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9137,7 +9203,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["char"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["char"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 955; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 954; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -9145,14 +9211,14 @@ switch (step) {
     r0 = r0.fields["feeling"];
     s.tmp_0 = r0;
     s.tmp_3 = if_Heart_1_mk(s);
-    s.tmp_3.arg0 = globals.Feeling___136331;
+    s.tmp_3.arg0 = globals.Feeling___85159;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "Heart");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["Heart"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["Heart"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 956; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 955; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -9161,12 +9227,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117754.info = {"start":7629,"length":48,"line":208,"column":37,"endLine":208,"endColumn":85,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92569.info = {"start":7629,"length":48,"line":208,"column":37,"endLine":208,"endColumn":85,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117754_mk(s) {
+function inline__P92569_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117754, depth: s.depth + 1,
+        parent: s, fn: inline__P92569, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -9179,7 +9245,7 @@ function inline__P117754_mk(s) {
 
 
 
-function inline__P117782(s) {
+function inline__P92593(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9189,7 +9255,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117784 = undefined;
+    s.targets___92595 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9197,8 +9263,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117784 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___117784);
+    s.targets___92595 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92595);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -9207,19 +9273,19 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.targets___117784;
-    s.tmp_2.arg1 = inline__P117793;
-    s.callLocIdx = 962; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.targets___92595;
+    s.tmp_2.arg1 = inline__P92603;
+    s.callLocIdx = 961; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.targets___117784 = (r0);
+    s.targets___92595 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117784);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92595);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.targets___117784);
+    r0 = pxsim_Array__length(s.targets___92595);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
     s.tmp_1 = r0;
@@ -9229,17 +9295,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117782.info = {"start":7824,"length":308,"line":213,"column":34,"endLine":219,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92593.info = {"start":7824,"length":308,"line":213,"column":34,"endLine":219,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117782_mk(s) {
+function inline__P92593_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117782, depth: s.depth + 1,
+        parent: s, fn: inline__P92593, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117784: undefined,
+  targets___92595: undefined,
   arg0: undefined,
 } }
 
@@ -9247,7 +9313,7 @@ function inline__P117782_mk(s) {
 
 
 
-function inline__P117793(s) {
+function inline__P92603(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9269,7 +9335,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["char"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["char"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 960; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 959; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -9277,14 +9343,14 @@ switch (step) {
     r0 = r0.fields["feeling"];
     s.tmp_0 = r0;
     s.tmp_3 = if_Sad_1_mk(s);
-    s.tmp_3.arg0 = globals.Feeling___136331;
+    s.tmp_3.arg0 = globals.Feeling___85159;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "Sad");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["Sad"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["Sad"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 961; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 960; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -9293,12 +9359,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117793.info = {"start":7976,"length":46,"line":216,"column":37,"endLine":216,"endColumn":83,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
+inline__P92603.info = {"start":7976,"length":46,"line":216,"column":37,"endLine":216,"endColumn":83,"fileName":"library.ts","functionName":"inline","argumentNames":["targ"]}
 
-function inline__P117793_mk(s) {
+function inline__P92603_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117793, depth: s.depth + 1,
+        parent: s, fn: inline__P92603, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -9311,7 +9377,7 @@ function inline__P117793_mk(s) {
 
 
 
-function inline__P117821(s) {
+function inline__P92627(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9321,10 +9387,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dir___117823 = undefined;
-    s.actor___117830 = undefined;
-    s.speed___117836 = undefined;
-    s.impulseType___117849 = undefined;
+    s.dir___92629 = undefined;
+    s.actor___92635 = undefined;
+    s.speed___92639 = undefined;
+    s.impulseType___92649 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9332,8 +9398,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "direction");
-    s.dir___117823 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.dir___117823);
+    s.dir___92629 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.dir___92629);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -9345,7 +9411,7 @@ switch (step) {
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.actor___117830 = (r0);
+    s.actor___92635 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_1, "speed");
@@ -9357,7 +9423,7 @@ switch (step) {
   case 3:
     s.tmp_2 = if_speed_1_mk(s);
     s.tmp_3 = if_defaults_1_mk(s);
-    r0 = s.actor___117830.fields["defn"];
+    r0 = s.actor___92635.fields["defn"];
     s.tmp_3.arg0 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "defaults");
@@ -9365,7 +9431,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["defaults"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["defaults"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 966; s.pc = 9; return s.tmp_3; }
+     else { s.callLocIdx = 965; s.pc = 9; return s.tmp_3; }
     }
   case 9:
     r0 = s.retval;
@@ -9376,14 +9442,14 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["speed"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["speed"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 967; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 966; s.pc = 8; return s.tmp_2; }
     }
   case 8:
     r0 = s.retval;
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.speed___117836 = (s.tmp_4);
+    s.speed___92639 = (s.tmp_4);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_1, "exclusive-move");
@@ -9397,13 +9463,13 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.impulseType___117849 = (s.tmp_2);
-    s.tmp_0 = kodu_Character_queueImpulse__P538177_mk(s);
-    s.tmp_0.arg0 = s.actor___117830;
-    s.tmp_0.arg1 = s.dir___117823;
-    s.tmp_0.arg2 = s.speed___117836;
-    s.tmp_0.arg3 = s.impulseType___117849;
-    s.callLocIdx = 968; s.pc = 10; return s.tmp_0;
+    s.impulseType___92649 = (s.tmp_2);
+    s.tmp_0 = kodu_Character_queueImpulse__P85024_mk(s);
+    s.tmp_0.arg0 = s.actor___92635;
+    s.tmp_0.arg1 = s.dir___92629;
+    s.tmp_0.arg2 = s.speed___92639;
+    s.tmp_0.arg3 = s.impulseType___92649;
+    s.callLocIdx = 967; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 7:
@@ -9411,22 +9477,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117821.info = {"start":8210,"length":406,"line":224,"column":29,"endLine":231,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92627.info = {"start":8210,"length":406,"line":224,"column":29,"endLine":231,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117821_mk(s) {
+function inline__P92627_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117821, depth: s.depth + 1,
+        parent: s, fn: inline__P92627, 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,
-  dir___117823: undefined,
-  actor___117830: undefined,
-  speed___117836: undefined,
-  impulseType___117849: undefined,
+  dir___92629: undefined,
+  actor___92635: undefined,
+  speed___92639: undefined,
+  impulseType___92649: undefined,
   arg0: undefined,
 } }
 
@@ -9434,7 +9500,7 @@ function inline__P117821_mk(s) {
 
 
 
-function inline__P117867(s) {
+function inline__P92665(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9444,7 +9510,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.page___117869 = undefined;
+    s.page___92667 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9452,17 +9518,17 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "page");
-    s.page___117869 = (r0);
-    r0 = (s.page___117869 !== undefined);
+    s.page___92667 = (r0);
+    r0 = (s.page___92667 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Program_switchPage__P136370_mk(s);
+    s.tmp_1 = kodu_Program_switchPage__P85171_mk(s);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.page___117869;
-    s.callLocIdx = 972; s.pc = 3; return s.tmp_1;
+    s.tmp_1.arg1 = s.page___92667;
+    s.callLocIdx = 971; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
   case 1:
@@ -9471,16 +9537,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117867.info = {"start":8655,"length":176,"line":233,"column":36,"endLine":238,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92665.info = {"start":8655,"length":176,"line":233,"column":36,"endLine":238,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117867_mk(s) {
+function inline__P92665_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117867, depth: s.depth + 1,
+        parent: s, fn: inline__P92665, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  page___117869: undefined,
+  page___92667: undefined,
   arg0: undefined,
 } }
 
@@ -9488,7 +9554,7 @@ function inline__P117867_mk(s) {
 
 
 
-function inline__P117888(s) {
+function inline__P92683(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9498,8 +9564,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117890 = undefined;
-    s.vanishee___117895 = undefined;
+    s.targets___92685 = undefined;
+    s.vanishee___92689 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9507,25 +9573,25 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117890 = (r0);
+    s.targets___92685 = (r0);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.vanishee___117895 = (r0);
-    s.tmp_0 = r0 = s.targets___117890;
+    s.vanishee___92689 = (r0);
+    s.tmp_0 = r0 = s.targets___92685;
     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(s.targets___117890);
+    r0 = pxsim_Array__length(s.targets___92685);
   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 = if_char_1_mk(s);
-    r0 = pxsim_Array__getAt(s.targets___117890, 0);
+    r0 = pxsim_Array__getAt(s.targets___92685, 0);
     s.tmp_2.arg0 = r0;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "char");
@@ -9533,18 +9599,18 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 976; s.pc = 7; return s.tmp_2; }
+     else { s.callLocIdx = 975; s.pc = 7; return s.tmp_2; }
     }
   case 7:
     r0 = s.retval;
-    s.vanishee___117895 = (r0);
+    s.vanishee___92689 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.vanishee___117895);
+    r0 = pxsim_numops_toBoolDecr(s.vanishee___92689);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = kodu_Character__C538168_v0_1_mk(s);
-    s.tmp_0.arg0 = s.vanishee___117895;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Character__C538168_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0 = kodu_Character__C85005_v0_1_mk(s);
+    s.tmp_0.arg0 = s.vanishee___92689;
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Character__C85005_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 8; return s.tmp_0;
   case 8:
@@ -9555,18 +9621,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117888.info = {"start":8865,"length":323,"line":240,"column":31,"endLine":249,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92683.info = {"start":8865,"length":323,"line":240,"column":31,"endLine":249,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117888_mk(s) {
+function inline__P92683_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117888, depth: s.depth + 1,
+        parent: s, fn: inline__P92683, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117890: undefined,
-  vanishee___117895: undefined,
+  targets___92685: undefined,
+  vanishee___92689: undefined,
   arg0: undefined,
 } }
 
@@ -9574,7 +9640,7 @@ function inline__P117888_mk(s) {
 
 
 
-function inline__P117916(s) {
+function inline__P92708(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9584,8 +9650,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117918 = undefined;
-    s.target___117923 = undefined;
+    s.targets___92710 = undefined;
+    s.target___92714 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9593,25 +9659,25 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___117918 = (r0);
+    s.targets___92710 = (r0);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.target___117923 = (r0);
-    s.tmp_0 = r0 = s.targets___117918;
+    s.target___92714 = (r0);
+    s.tmp_0 = r0 = s.targets___92710;
     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(s.targets___117918);
+    r0 = pxsim_Array__length(s.targets___92710);
   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 = if_char_1_mk(s);
-    r0 = pxsim_Array__getAt(s.targets___117918, 0);
+    r0 = pxsim_Array__getAt(s.targets___92710, 0);
     s.tmp_2.arg0 = r0;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "char");
@@ -9619,21 +9685,21 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 980; s.pc = 7; return s.tmp_2; }
+     else { s.callLocIdx = 979; s.pc = 7; return s.tmp_2; }
     }
   case 7:
     r0 = s.retval;
-    s.target___117923 = (r0);
+    s.target___92714 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.target___117923);
+    r0 = pxsim_numops_toBoolDecr(s.target___92714);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = kodu_Program_cameraFollow__P136371_mk(s);
+    s.tmp_0 = kodu_Program_cameraFollow__P85172_mk(s);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.target___117923;
-    s.callLocIdx = 982; s.pc = 8; return s.tmp_0;
+    s.tmp_0.arg1 = s.target___92714;
+    s.callLocIdx = 981; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 5:
@@ -9642,18 +9708,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117916.info = {"start":9229,"length":329,"line":251,"column":38,"endLine":260,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92708.info = {"start":9229,"length":329,"line":251,"column":38,"endLine":260,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117916_mk(s) {
+function inline__P92708_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117916, depth: s.depth + 1,
+        parent: s, fn: inline__P92708, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117918: undefined,
-  target___117923: undefined,
+  targets___92710: undefined,
+  target___92714: undefined,
   arg0: undefined,
 } }
 
@@ -9661,7 +9727,7 @@ function inline__P117916_mk(s) {
 
 
 
-function inline__P117948(s) {
+function inline__P92735(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9671,8 +9737,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.expressee___117950 = undefined;
-    s.feeling___117965 = undefined;
+    s.expressee___92737 = undefined;
+    s.feeling___92748 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9680,7 +9746,7 @@ switch (step) {
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.expressee___117950 = (r0);
+    s.expressee___92737 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_1, "direct-target");
@@ -9698,34 +9764,34 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 986; s.pc = 7; return s.tmp_2; }
+     else { s.callLocIdx = 985; s.pc = 7; return s.tmp_2; }
     }
   case 7:
     r0 = s.retval;
-    s.expressee___117950 = (r0);
+    s.expressee___92737 = (r0);
   case 1:
   case 2:
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "feeling");
-    s.feeling___117965 = (r0);
-    s.tmp_0 = r0 = s.expressee___117950;
+    s.feeling___92748 = (r0);
+    s.tmp_0 = r0 = s.expressee___92737;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = (s.feeling___117965 !== undefined);
+    r0 = (s.feeling___92748 !== undefined);
   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 = kodu_Program_feel__P136372_mk(s);
-    r0 = s.expressee___117950.fields["prog"];
+    s.tmp_2 = kodu_Program_feel__P85173_mk(s);
+    r0 = s.expressee___92737.fields["prog"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = s.feeling___117965;
-    s.callLocIdx = 987; s.pc = 8; return s.tmp_2;
+    s.tmp_2.arg1 = s.feeling___92748;
+    s.callLocIdx = 986; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
   case 5:
@@ -9734,19 +9800,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117948.info = {"start":9593,"length":368,"line":262,"column":32,"endLine":271,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92735.info = {"start":9593,"length":368,"line":262,"column":32,"endLine":271,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117948_mk(s) {
+function inline__P92735_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117948, depth: s.depth + 1,
+        parent: s, fn: inline__P92735, 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,
-  expressee___117950: undefined,
-  feeling___117965: undefined,
+  expressee___92737: undefined,
+  feeling___92748: undefined,
   arg0: undefined,
 } }
 
@@ -9754,7 +9820,7 @@ function inline__P117948_mk(s) {
 
 
 
-function inline__P117984(s) {
+function inline__P92765(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9764,7 +9830,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___117986 = undefined;
+    s.targets___92767 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9780,30 +9846,30 @@ switch (step) {
     r0 = pxsim_Array__mk();
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_0);
-    s.targets___117986 = (s.tmp_2);
+    s.targets___92767 = (s.tmp_2);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___117986);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92767);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.targets___117986, 0);
+    r0 = pxsim_Array__getAt(s.targets___92767, 0);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "direct-target", s.tmp_1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117984.info = {"start":10037,"length":247,"line":276,"column":27,"endLine":283,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92765.info = {"start":10037,"length":247,"line":276,"column":27,"endLine":283,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P117984_mk(s) {
+function inline__P92765_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117984, depth: s.depth + 1,
+        parent: s, fn: inline__P92765, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  targets___117986: undefined,
+  targets___92767: undefined,
   arg0: undefined,
 } }
 
@@ -9811,7 +9877,7 @@ function inline__P117984_mk(s) {
 
 
 
-function inline__P118008(s) {
+function inline__P92785(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9821,7 +9887,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___118010 = undefined;
+    s.targets___92787 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9829,11 +9895,11 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___118010 = (r0);
+    s.targets___92787 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", undefined);
-    r0 = pxsim_numops_toBoolDecr(s.targets___118010);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92787);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -9842,7 +9908,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(s.targets___118010);
+    r0 = pxsim_Array__length(s.targets___92787);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -9855,20 +9921,20 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = helpers_arraySlice__P106721_mk(s);
-    s.tmp_5.arg0 = s.targets___118010;
+    s.tmp_5 = helpers_arraySlice__P81384_mk(s);
+    s.tmp_5.arg0 = s.targets___92787;
     s.tmp_5.arg1 = 0;
     s.tmp_5.arg2 = 1;
-    s.callLocIdx = 993; s.pc = 6; return s.tmp_5;
+    s.callLocIdx = 992; s.pc = 6; return s.tmp_5;
   case 6:
     r0 = s.retval;
-    s.targets___118010 = (r0);
+    s.targets___92787 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___118010);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "targets", s.targets___92787);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.targets___118010, 0);
+    r0 = pxsim_Array__getAt(s.targets___92787, 0);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "direct-target", s.tmp_1);
   case 5:
@@ -9876,12 +9942,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118008.info = {"start":10314,"length":334,"line":285,"column":27,"endLine":292,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92785.info = {"start":10314,"length":334,"line":285,"column":27,"endLine":292,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118008_mk(s) {
+function inline__P92785_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118008, depth: s.depth + 1,
+        parent: s, fn: inline__P92785, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -9889,7 +9955,7 @@ function inline__P118008_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  targets___118010: undefined,
+  targets___92787: undefined,
   arg0: undefined,
 } }
 
@@ -9897,7 +9963,7 @@ function inline__P118008_mk(s) {
 
 
 
-function inline__P118043(s) {
+function inline__P92816(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9907,8 +9973,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.actor___118045 = undefined;
-    s.speed___118051 = undefined;
+    s.actor___92818 = undefined;
+    s.speed___92822 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -9916,7 +9982,7 @@ switch (step) {
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.actor___118045 = (r0);
+    s.actor___92818 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_1, "speed");
@@ -9928,7 +9994,7 @@ switch (step) {
   case 1:
     s.tmp_2 = if_speed_1_mk(s);
     s.tmp_3 = if_defaults_1_mk(s);
-    r0 = s.actor___118045.fields["defn"];
+    r0 = s.actor___92818.fields["defn"];
     s.tmp_3.arg0 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "defaults");
@@ -9936,7 +10002,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["defaults"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["defaults"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 997; s.pc = 4; return s.tmp_3; }
+     else { s.callLocIdx = 996; s.pc = 4; return s.tmp_3; }
     }
   case 4:
     r0 = s.retval;
@@ -9947,20 +10013,20 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["speed"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["speed"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 998; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 997; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.speed___118051 = (s.tmp_4);
+    s.speed___92822 = (s.tmp_4);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    s.tmp_2 = r0 = s.speed___118051;
+    s.tmp_2 = r0 = s.speed___92822;
     s.tmp_5 = if_speed_1_mk(s);
     s.tmp_6 = if_defaults_1_mk(s);
-    r0 = s.actor___118045.fields["defn"];
+    r0 = s.actor___92818.fields["defn"];
     s.tmp_6.arg0 = r0;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "defaults");
@@ -9968,7 +10034,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["defaults"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["defaults"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 999; s.pc = 6; return s.tmp_6; }
+     else { s.callLocIdx = 998; s.pc = 6; return s.tmp_6; }
     }
   case 6:
     r0 = s.retval;
@@ -9979,7 +10045,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["speed"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["speed"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1000; s.pc = 5; return s.tmp_5; }
+     else { s.callLocIdx = 999; s.pc = 5; return s.tmp_5; }
     }
   case 5:
     r0 = s.retval;
@@ -9993,12 +10059,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118043.info = {"start":10683,"length":220,"line":294,"column":32,"endLine":298,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92816.info = {"start":10683,"length":220,"line":294,"column":32,"endLine":298,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118043_mk(s) {
+function inline__P92816_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118043, depth: s.depth + 1,
+        parent: s, fn: inline__P92816, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10007,8 +10073,8 @@ function inline__P118043_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  actor___118045: undefined,
-  speed___118051: undefined,
+  actor___92818: undefined,
+  speed___92822: undefined,
   arg0: undefined,
 } }
 
@@ -10016,7 +10082,7 @@ function inline__P118043_mk(s) {
 
 
 
-function inline__P118083(s) {
+function inline__P92846(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10026,8 +10092,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.actor___118085 = undefined;
-    s.speed___118091 = undefined;
+    s.actor___92848 = undefined;
+    s.speed___92852 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -10035,7 +10101,7 @@ switch (step) {
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.actor___118085 = (r0);
+    s.actor___92848 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_1, "speed");
@@ -10047,7 +10113,7 @@ switch (step) {
   case 1:
     s.tmp_2 = if_speed_1_mk(s);
     s.tmp_3 = if_defaults_1_mk(s);
-    r0 = s.actor___118085.fields["defn"];
+    r0 = s.actor___92848.fields["defn"];
     s.tmp_3.arg0 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "defaults");
@@ -10055,7 +10121,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["defaults"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["defaults"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1004; s.pc = 4; return s.tmp_3; }
+     else { s.callLocIdx = 1003; s.pc = 4; return s.tmp_3; }
     }
   case 4:
     r0 = s.retval;
@@ -10066,37 +10132,37 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["speed"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["speed"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1005; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1004; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.speed___118091 = (s.tmp_4);
+    s.speed___92852 = (s.tmp_4);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = (s.speed___118091 * 0.75);
+    r0 = (s.speed___92852 * 0.75);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "speed", s.tmp_1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118083.info = {"start":10937,"length":193,"line":300,"column":31,"endLine":304,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92846.info = {"start":10937,"length":193,"line":300,"column":31,"endLine":304,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118083_mk(s) {
+function inline__P92846_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118083, depth: s.depth + 1,
+        parent: s, fn: inline__P92846, 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,
-  actor___118085: undefined,
-  speed___118091: undefined,
+  actor___92848: undefined,
+  speed___92852: undefined,
   arg0: undefined,
 } }
 
@@ -10104,7 +10170,7 @@ function inline__P118083_mk(s) {
 
 
 
-function inline__P118115(s) {
+function inline__P92871(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10114,12 +10180,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___118117 = undefined;
-    s.target___118129 = undefined;
-    s.actor___118132 = undefined;
-    s.dx___118138 = undefined;
-    s.dy___118146 = undefined;
-    s.dist___118154 = undefined;
+    s.targets___92873 = undefined;
+    s.target___92884 = undefined;
+    s.actor___92887 = undefined;
+    s.dx___92891 = undefined;
+    s.dy___92898 = undefined;
+    s.dist___92905 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -10127,8 +10193,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___118117 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___118117);
+    s.targets___92873 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92873);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -10137,7 +10203,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(s.targets___118117);
+    r0 = pxsim_Array__length(s.targets___92873);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -10150,86 +10216,86 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = pxsim_Array__getAt(s.targets___118117, 0);
-    s.target___118129 = (r0);
+    r0 = pxsim_Array__getAt(s.targets___92873, 0);
+    s.target___92884 = (r0);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.actor___118132 = (r0);
-    s.tmp_1 = kodu_Character_x__P538093_mk(s);
+    s.actor___92887 = (r0);
+    s.tmp_1 = kodu_Character_x__P85014_mk(s);
     s.tmp_2 = if_char_1_mk(s);
-    s.tmp_2.arg0 = s.target___118129;
+    s.tmp_2.arg0 = s.target___92884;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "char");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1009; s.pc = 9; return s.tmp_2; }
+     else { s.callLocIdx = 1008; s.pc = 9; return s.tmp_2; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1010; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 1009; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_4 = kodu_Character_x__P538093_mk(s);
-    s.tmp_4.arg0 = s.actor___118132;
-    s.callLocIdx = 1011; s.pc = 10; return s.tmp_4;
+    s.tmp_4 = kodu_Character_x__P85014_mk(s);
+    s.tmp_4.arg0 = s.actor___92887;
+    s.callLocIdx = 1010; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
-    s.dx___118138 = (r0);
-    s.tmp_1 = kodu_Character_y__P538094_mk(s);
+    s.dx___92891 = (r0);
+    s.tmp_1 = kodu_Character_y__P85016_mk(s);
     s.tmp_2 = if_char_1_mk(s);
-    s.tmp_2.arg0 = s.target___118129;
+    s.tmp_2.arg0 = s.target___92884;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "char");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1012; s.pc = 12; return s.tmp_2; }
+     else { s.callLocIdx = 1011; s.pc = 12; return s.tmp_2; }
     }
   case 12:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1013; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 1012; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_4 = kodu_Character_y__P538094_mk(s);
-    s.tmp_4.arg0 = s.actor___118132;
-    s.callLocIdx = 1014; s.pc = 13; return s.tmp_4;
+    s.tmp_4 = kodu_Character_y__P85016_mk(s);
+    s.tmp_4.arg0 = s.actor___92887;
+    s.callLocIdx = 1013; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
-    s.dy___118146 = (r0);
-    s.tmp_0 = util_distBetweenSprites__P110101_mk(s);
+    s.dy___92898 = (r0);
+    s.tmp_0 = util_distBetweenSprites__P84853_mk(s);
     s.tmp_1 = if_char_1_mk(s);
-    s.tmp_1.arg0 = s.target___118129;
+    s.tmp_1.arg0 = s.target___92884;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "char");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["char"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["char"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1015; s.pc = 15; return s.tmp_1; }
+     else { s.callLocIdx = 1014; s.pc = 15; return s.tmp_1; }
     }
   case 15:
     r0 = s.retval;
     r0 = r0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    r0 = s.actor___118132.fields["kelpie"];
+    r0 = s.actor___92887.fields["kelpie"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1016; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1015; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.dist___118154 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.dist___118154);
+    s.dist___92905 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.dist___92905);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -10238,16 +10304,16 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    r0 = (s.dx___118138 / s.dist___118154);
-    s.dx___118138 = (r0);
-    r0 = (s.dy___118146 / s.dist___118154);
-    s.dy___118146 = (r0);
+    r0 = (s.dx___92891 / s.dist___92905);
+    s.dx___92891 = (r0);
+    r0 = (s.dy___92898 / s.dist___92905);
+    s.dy___92898 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_mkVec2__P110429_mk(s);
-    s.tmp_2.arg0 = s.dx___118138;
-    s.tmp_2.arg1 = s.dy___118146;
-    s.callLocIdx = 1017; s.pc = 16; return s.tmp_2;
+    s.tmp_2 = kodu_mkVec2__P85212_mk(s);
+    s.tmp_2.arg0 = s.dx___92891;
+    s.tmp_2.arg1 = s.dy___92898;
+    s.callLocIdx = 1016; s.pc = 16; return s.tmp_2;
   case 16:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -10257,24 +10323,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118115.info = {"start":11164,"length":541,"line":306,"column":31,"endLine":318,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92871.info = {"start":11164,"length":541,"line":306,"column":31,"endLine":318,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118115_mk(s) {
+function inline__P92871_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118115, depth: s.depth + 1,
+        parent: s, fn: inline__P92871, 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,
-  targets___118117: undefined,
-  target___118129: undefined,
-  actor___118132: undefined,
-  dx___118138: undefined,
-  dy___118146: undefined,
-  dist___118154: undefined,
+  targets___92873: undefined,
+  target___92884: undefined,
+  actor___92887: undefined,
+  dx___92891: undefined,
+  dy___92898: undefined,
+  dist___92905: undefined,
   arg0: undefined,
 } }
 
@@ -10282,7 +10348,7 @@ function inline__P118115_mk(s) {
 
 
 
-function inline__P118185(s) {
+function inline__P92934(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10292,12 +10358,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___118187 = undefined;
-    s.target___118199 = undefined;
-    s.actor___118202 = undefined;
-    s.dx___118208 = undefined;
-    s.dy___118216 = undefined;
-    s.dist___118224 = undefined;
+    s.targets___92936 = undefined;
+    s.target___92947 = undefined;
+    s.actor___92950 = undefined;
+    s.dx___92954 = undefined;
+    s.dy___92961 = undefined;
+    s.dist___92968 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -10305,8 +10371,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___118187 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___118187);
+    s.targets___92936 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___92936);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -10315,7 +10381,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(s.targets___118187);
+    r0 = pxsim_Array__length(s.targets___92936);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -10328,86 +10394,86 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = pxsim_Array__getAt(s.targets___118187, 0);
-    s.target___118199 = (r0);
+    r0 = pxsim_Array__getAt(s.targets___92936, 0);
+    s.target___92947 = (r0);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.actor___118202 = (r0);
-    s.tmp_1 = kodu_Character_x__P538093_mk(s);
+    s.actor___92950 = (r0);
+    s.tmp_1 = kodu_Character_x__P85014_mk(s);
     s.tmp_2 = if_char_1_mk(s);
-    s.tmp_2.arg0 = s.target___118199;
+    s.tmp_2.arg0 = s.target___92947;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "char");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1021; s.pc = 9; return s.tmp_2; }
+     else { s.callLocIdx = 1020; s.pc = 9; return s.tmp_2; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1022; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 1021; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_4 = kodu_Character_x__P538093_mk(s);
-    s.tmp_4.arg0 = s.actor___118202;
-    s.callLocIdx = 1023; s.pc = 10; return s.tmp_4;
+    s.tmp_4 = kodu_Character_x__P85014_mk(s);
+    s.tmp_4.arg0 = s.actor___92950;
+    s.callLocIdx = 1022; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
-    s.dx___118208 = (r0);
-    s.tmp_1 = kodu_Character_y__P538094_mk(s);
+    s.dx___92954 = (r0);
+    s.tmp_1 = kodu_Character_y__P85016_mk(s);
     s.tmp_2 = if_char_1_mk(s);
-    s.tmp_2.arg0 = s.target___118199;
+    s.tmp_2.arg0 = s.target___92947;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "char");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1024; s.pc = 12; return s.tmp_2; }
+     else { s.callLocIdx = 1023; s.pc = 12; return s.tmp_2; }
     }
   case 12:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1025; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 1024; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_4 = kodu_Character_y__P538094_mk(s);
-    s.tmp_4.arg0 = s.actor___118202;
-    s.callLocIdx = 1026; s.pc = 13; return s.tmp_4;
+    s.tmp_4 = kodu_Character_y__P85016_mk(s);
+    s.tmp_4.arg0 = s.actor___92950;
+    s.callLocIdx = 1025; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
-    s.dy___118216 = (r0);
-    s.tmp_0 = util_distBetweenSprites__P110101_mk(s);
+    s.dy___92961 = (r0);
+    s.tmp_0 = util_distBetweenSprites__P84853_mk(s);
     s.tmp_1 = if_char_1_mk(s);
-    s.tmp_1.arg0 = s.target___118199;
+    s.tmp_1.arg0 = s.target___92947;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "char");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["char"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["char"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1027; s.pc = 15; return s.tmp_1; }
+     else { s.callLocIdx = 1026; s.pc = 15; return s.tmp_1; }
     }
   case 15:
     r0 = s.retval;
     r0 = r0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    r0 = s.actor___118202.fields["kelpie"];
+    r0 = s.actor___92950.fields["kelpie"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1028; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1027; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.dist___118224 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.dist___118224);
+    s.dist___92968 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.dist___92968);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -10416,18 +10482,18 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    r0 = (s.dx___118208 / s.dist___118224);
-    s.dx___118208 = (r0);
-    r0 = (s.dy___118216 / s.dist___118224);
-    s.dy___118216 = (r0);
+    r0 = (s.dx___92954 / s.dist___92968);
+    s.dx___92954 = (r0);
+    r0 = (s.dy___92961 / s.dist___92968);
+    s.dy___92961 = (r0);
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_mkVec2__P110429_mk(s);
-    r0 = (0 - s.dx___118208);
+    s.tmp_2 = kodu_mkVec2__P85212_mk(s);
+    r0 = (0 - s.dx___92954);
     s.tmp_2.arg0 = r0;
-    r0 = (0 - s.dy___118216);
+    r0 = (0 - s.dy___92961);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1029; s.pc = 16; return s.tmp_2;
+    s.callLocIdx = 1028; s.pc = 16; return s.tmp_2;
   case 16:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -10437,24 +10503,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118185.info = {"start":11737,"length":543,"line":320,"column":29,"endLine":332,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92934.info = {"start":11737,"length":543,"line":320,"column":29,"endLine":332,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118185_mk(s) {
+function inline__P92934_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118185, depth: s.depth + 1,
+        parent: s, fn: inline__P92934, 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,
-  targets___118187: undefined,
-  target___118199: undefined,
-  actor___118202: undefined,
-  dx___118208: undefined,
-  dy___118216: undefined,
-  dist___118224: undefined,
+  targets___92936: undefined,
+  target___92947: undefined,
+  actor___92950: undefined,
+  dx___92954: undefined,
+  dy___92961: undefined,
+  dist___92968: undefined,
   arg0: undefined,
 } }
 
@@ -10462,7 +10528,7 @@ function inline__P118185_mk(s) {
 
 
 
-function inline__P118257(s) {
+function inline__P92999(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10472,15 +10538,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.targets___118259 = undefined;
-    s.target___118271 = undefined;
-    s.actor___118274 = undefined;
-    s.vToTarget___118280 = undefined;
-    s.vToTargetN___118289 = undefined;
-    s.direction___118294 = undefined;
-    s.dot___118299 = undefined;
-    s.vSignDir___118306 = undefined;
-    s.vTranspose___118310 = undefined;
+    s.targets___93001 = undefined;
+    s.target___93012 = undefined;
+    s.actor___93015 = undefined;
+    s.vToTarget___93019 = undefined;
+    s.vToTargetN___93027 = undefined;
+    s.direction___93032 = undefined;
+    s.dot___93036 = undefined;
+    s.vSignDir___93043 = undefined;
+    s.vTranspose___93047 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -10488,8 +10554,8 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "targets");
-    s.targets___118259 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.targets___118259);
+    s.targets___93001 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.targets___93001);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -10498,7 +10564,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(s.targets___118259);
+    r0 = pxsim_Array__length(s.targets___93001);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -10511,94 +10577,94 @@ switch (step) {
     { step = 15; continue; }
   case 3:
   case 4:
-    r0 = pxsim_Array__getAt(s.targets___118259, 0);
-    s.target___118271 = (r0);
+    r0 = pxsim_Array__getAt(s.targets___93001, 0);
+    s.target___93012 = (r0);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
-    s.actor___118274 = (r0);
-    s.tmp_0 = kodu_Vec2_Sub__P110417_mk(s);
-    s.tmp_1 = kodu_Character_pos__P538172_mk(s);
+    s.actor___93015 = (r0);
+    s.tmp_0 = kodu_Vec2_Sub__P85200_mk(s);
+    s.tmp_1 = kodu_Character_pos__P85018_mk(s);
     s.tmp_2 = if_char_1_mk(s);
-    s.tmp_2.arg0 = s.target___118271;
+    s.tmp_2.arg0 = s.target___93012;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "char");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["char"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["char"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1033; s.pc = 18; return s.tmp_2; }
+     else { s.callLocIdx = 1032; s.pc = 18; return s.tmp_2; }
     }
   case 18:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1034; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 1033; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = kodu_Character_pos__P538172_mk(s);
-    s.tmp_3.arg0 = s.actor___118274;
-    s.callLocIdx = 1035; s.pc = 19; return s.tmp_3;
+    s.tmp_3 = kodu_Character_pos__P85018_mk(s);
+    s.tmp_3.arg0 = s.actor___93015;
+    s.callLocIdx = 1034; s.pc = 19; return s.tmp_3;
   case 19:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1036; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1035; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.vToTarget___118280 = (r0);
-    s.tmp_0 = kodu_Vec2_Normal__P110423_mk(s);
-    s.tmp_0.arg0 = s.vToTarget___118280;
+    s.vToTarget___93019 = (r0);
+    s.tmp_0 = kodu_Vec2_Normal__P85206_mk(s);
+    s.tmp_0.arg0 = s.vToTarget___93019;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 1037; s.pc = 20; return s.tmp_0;
+    s.callLocIdx = 1036; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
-    s.vToTargetN___118289 = (r0);
-    s.tmp_0 = kodu_Character_nextDirection__P538179_mk(s);
-    s.tmp_0.arg0 = s.actor___118274;
-    s.callLocIdx = 1038; s.pc = 21; return s.tmp_0;
+    s.vToTargetN___93027 = (r0);
+    s.tmp_0 = kodu_Character_nextDirection__P85026_mk(s);
+    s.tmp_0.arg0 = s.actor___93015;
+    s.callLocIdx = 1037; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.direction___118294 = (r0);
-    s.tmp_0 = kodu_Vec2_Dot__P110427_mk(s);
-    s.tmp_0.arg0 = s.direction___118294;
-    s.tmp_0.arg1 = s.vToTargetN___118289;
-    s.callLocIdx = 1039; s.pc = 22; return s.tmp_0;
+    s.direction___93032 = (r0);
+    s.tmp_0 = kodu_Vec2_Dot__P85210_mk(s);
+    s.tmp_0.arg0 = s.direction___93032;
+    s.tmp_0.arg1 = s.vToTargetN___93027;
+    s.callLocIdx = 1038; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
-    s.dot___118299 = (r0);
-    r0 = (s.dot___118299 < 0);
+    s.dot___93036 = (r0);
+    r0 = (s.dot___93036 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
     { step = 15; continue; }
   case 5:
   case 6:
-    s.tmp_1 = kodu_mkVec2__P110429_mk(s);
+    s.tmp_1 = kodu_mkVec2__P85212_mk(s);
     s.tmp_1.arg0 = -1;
     s.tmp_1.arg1 = 1;
-    s.callLocIdx = 1040; s.pc = 23; return s.tmp_1;
+    s.callLocIdx = 1039; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
-    s.vSignDir___118306 = (r0);
-    s.tmp_0 = kodu_Vec2_Transpose__P110421_mk(s);
-    s.tmp_0.arg0 = s.vToTargetN___118289;
-    s.callLocIdx = 1041; s.pc = 24; return s.tmp_0;
+    s.vSignDir___93043 = (r0);
+    s.tmp_0 = kodu_Vec2_Transpose__P85204_mk(s);
+    s.tmp_0.arg0 = s.vToTargetN___93027;
+    s.callLocIdx = 1040; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.vTranspose___118310 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.direction___118294);
+    s.vTranspose___93047 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.direction___93032);
     if (!r0) { step = 13; continue; }
-    s.tmp_2 = Math_abs__P106732_mk(s);
-    r0 = s.direction___118294.fields["x"];
+    s.tmp_2 = Math_abs__P81396_mk(s);
+    r0 = s.direction___93032.fields["x"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1042; s.pc = 25; return s.tmp_2;
+    s.callLocIdx = 1041; s.pc = 25; return s.tmp_2;
   case 25:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Math_abs__P106732_mk(s);
-    r0 = s.direction___118294.fields["y"];
+    s.tmp_4 = Math_abs__P81396_mk(s);
+    r0 = s.direction___93032.fields["y"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 1043; s.pc = 26; return s.tmp_4;
+    s.callLocIdx = 1042; s.pc = 26; return s.tmp_4;
   case 26:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -10606,27 +10672,27 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_7 = kodu_Character_y__P538094_mk(s);
-    s.tmp_7.arg0 = s.actor___118274;
-    s.callLocIdx = 1044; s.pc = 27; return s.tmp_7;
+    s.tmp_7 = kodu_Character_y__P85016_mk(s);
+    s.tmp_7.arg0 = s.actor___93015;
+    s.callLocIdx = 1043; s.pc = 27; return s.tmp_7;
   case 27:
     r0 = s.retval;
     s.tmp_6 = r0;
-    s.tmp_9 = kodu_Character_y__P538094_mk(s);
+    s.tmp_9 = kodu_Character_y__P85016_mk(s);
     s.tmp_10 = if_char_1_mk(s);
-    s.tmp_10.arg0 = s.target___118271;
+    s.tmp_10.arg0 = s.target___93012;
     if (!s.tmp_10.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_10.arg0, "char");
     } else {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["char"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["char"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 1045; s.pc = 29; return s.tmp_10; }
+     else { s.callLocIdx = 1044; s.pc = 29; return s.tmp_10; }
     }
   case 29:
     r0 = s.retval;
     s.tmp_9.arg0 = r0;
-    s.callLocIdx = 1046; s.pc = 28; return s.tmp_9;
+    s.callLocIdx = 1045; s.pc = 28; return s.tmp_9;
   case 28:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -10641,39 +10707,39 @@ switch (step) {
   case 8:
     // jmp value (already in r0)
     s.tmp_11 = r0;
-    r0 = (s.vSignDir___118306).fields["y"] = (s.tmp_11);
-    s.tmp_0 = r0 = s.vTranspose___118310;
-    s.tmp_2 = Math_abs__P106732_mk(s);
-    r0 = s.vTranspose___118310.fields["y"];
+    r0 = (s.vSignDir___93043).fields["y"] = (s.tmp_11);
+    s.tmp_0 = r0 = s.vTranspose___93047;
+    s.tmp_2 = Math_abs__P81396_mk(s);
+    r0 = s.vTranspose___93047.fields["y"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1047; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 1046; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["y"] = (s.tmp_1);
     { step = 12; continue; }
   case 9:
-    s.tmp_2 = kodu_Character_x__P538093_mk(s);
-    s.tmp_2.arg0 = s.actor___118274;
-    s.callLocIdx = 1048; s.pc = 31; return s.tmp_2;
+    s.tmp_2 = kodu_Character_x__P85014_mk(s);
+    s.tmp_2.arg0 = s.actor___93015;
+    s.callLocIdx = 1047; s.pc = 31; return s.tmp_2;
   case 31:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = kodu_Character_x__P538093_mk(s);
+    s.tmp_4 = kodu_Character_x__P85014_mk(s);
     s.tmp_5 = if_char_1_mk(s);
-    s.tmp_5.arg0 = s.target___118271;
+    s.tmp_5.arg0 = s.target___93012;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "char");
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["char"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["char"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1049; s.pc = 33; return s.tmp_5; }
+     else { s.callLocIdx = 1048; s.pc = 33; return s.tmp_5; }
     }
   case 33:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 1050; s.pc = 32; return s.tmp_4;
+    s.callLocIdx = 1049; s.pc = 32; return s.tmp_4;
   case 32:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -10688,12 +10754,12 @@ switch (step) {
   case 11:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    r0 = (s.vSignDir___118306).fields["x"] = (s.tmp_6);
-    s.tmp_0 = r0 = s.vTranspose___118310;
-    s.tmp_2 = Math_abs__P106732_mk(s);
-    r0 = s.vTranspose___118310.fields["x"];
+    r0 = (s.vSignDir___93043).fields["x"] = (s.tmp_6);
+    s.tmp_0 = r0 = s.vTranspose___93047;
+    s.tmp_2 = Math_abs__P81396_mk(s);
+    r0 = s.vTranspose___93047.fields["x"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1051; s.pc = 34; return s.tmp_2;
+    s.callLocIdx = 1050; s.pc = 34; return s.tmp_2;
   case 34:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -10703,10 +10769,10 @@ switch (step) {
   case 14:
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_Vec2_Mul__P110418_mk(s);
-    s.tmp_2.arg0 = s.vTranspose___118310;
-    s.tmp_2.arg1 = s.vSignDir___118306;
-    s.callLocIdx = 1052; s.pc = 35; return s.tmp_2;
+    s.tmp_2 = kodu_Vec2_Mul__P85201_mk(s);
+    s.tmp_2.arg0 = s.vTranspose___93047;
+    s.tmp_2.arg1 = s.vSignDir___93043;
+    s.callLocIdx = 1051; s.pc = 35; return s.tmp_2;
   case 35:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -10716,12 +10782,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118257.info = {"start":12313,"length":1256,"line":334,"column":30,"endLine":359,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P92999.info = {"start":12313,"length":1256,"line":334,"column":30,"endLine":359,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118257_mk(s) {
+function inline__P92999_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118257, depth: s.depth + 1,
+        parent: s, fn: inline__P92999, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10735,15 +10801,15 @@ function inline__P118257_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  targets___118259: undefined,
-  target___118271: undefined,
-  actor___118274: undefined,
-  vToTarget___118280: undefined,
-  vToTargetN___118289: undefined,
-  direction___118294: undefined,
-  dot___118299: undefined,
-  vSignDir___118306: undefined,
-  vTranspose___118310: undefined,
+  targets___93001: undefined,
+  target___93012: undefined,
+  actor___93015: undefined,
+  vToTarget___93019: undefined,
+  vToTargetN___93027: undefined,
+  direction___93032: undefined,
+  dot___93036: undefined,
+  vSignDir___93043: undefined,
+  vTranspose___93047: undefined,
   arg0: undefined,
 } }
 
@@ -10751,7 +10817,7 @@ function inline__P118257_mk(s) {
 
 
 
-function inline__P118369(s) {
+function inline__P93101(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10772,12 +10838,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118369.info = {"start":13603,"length":63,"line":361,"column":31,"endLine":363,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93101.info = {"start":13603,"length":63,"line":361,"column":31,"endLine":363,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118369_mk(s) {
+function inline__P93101_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118369, depth: s.depth + 1,
+        parent: s, fn: inline__P93101, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10787,7 +10853,7 @@ function inline__P118369_mk(s) {
 
 
 
-function inline__P118380(s) {
+function inline__P93111(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10808,12 +10874,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118380.info = {"start":13700,"length":63,"line":365,"column":31,"endLine":367,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93111.info = {"start":13700,"length":63,"line":365,"column":31,"endLine":367,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118380_mk(s) {
+function inline__P93111_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118380, depth: s.depth + 1,
+        parent: s, fn: inline__P93111, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10823,7 +10889,7 @@ function inline__P118380_mk(s) {
 
 
 
-function inline__P118391(s) {
+function inline__P93121(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10844,12 +10910,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118391.info = {"start":13805,"length":63,"line":369,"column":31,"endLine":371,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93121.info = {"start":13805,"length":63,"line":369,"column":31,"endLine":371,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118391_mk(s) {
+function inline__P93121_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118391, depth: s.depth + 1,
+        parent: s, fn: inline__P93121, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10859,7 +10925,7 @@ function inline__P118391_mk(s) {
 
 
 
-function inline__P118402(s) {
+function inline__P93131(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10880,12 +10946,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118402.info = {"start":13910,"length":63,"line":373,"column":31,"endLine":375,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93131.info = {"start":13910,"length":63,"line":373,"column":31,"endLine":375,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118402_mk(s) {
+function inline__P93131_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118402, depth: s.depth + 1,
+        parent: s, fn: inline__P93131, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10895,7 +10961,7 @@ function inline__P118402_mk(s) {
 
 
 
-function inline__P118413(s) {
+function inline__P93141(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10916,12 +10982,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118413.info = {"start":14015,"length":63,"line":377,"column":31,"endLine":379,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93141.info = {"start":14015,"length":63,"line":377,"column":31,"endLine":379,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118413_mk(s) {
+function inline__P93141_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118413, depth: s.depth + 1,
+        parent: s, fn: inline__P93141, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10931,7 +10997,7 @@ function inline__P118413_mk(s) {
 
 
 
-function inline__P118424(s) {
+function inline__P93151(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10948,14 +11014,14 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     s.tmp_2 = if_None_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "None");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["None"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["None"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1065; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1064; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -10965,12 +11031,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118424.info = {"start":14118,"length":77,"line":381,"column":37,"endLine":383,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93151.info = {"start":14118,"length":77,"line":381,"column":37,"endLine":383,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118424_mk(s) {
+function inline__P93151_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118424, depth: s.depth + 1,
+        parent: s, fn: inline__P93151, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10982,7 +11048,7 @@ function inline__P118424_mk(s) {
 
 
 
-function inline__P118438(s) {
+function inline__P93163(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10999,14 +11065,14 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     s.tmp_2 = if_Happy_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Happy");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Happy"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Happy"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1068; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1067; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -11016,12 +11082,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118438.info = {"start":14236,"length":78,"line":385,"column":38,"endLine":387,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93163.info = {"start":14236,"length":78,"line":385,"column":38,"endLine":387,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118438_mk(s) {
+function inline__P93163_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118438, depth: s.depth + 1,
+        parent: s, fn: inline__P93163, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11033,7 +11099,7 @@ function inline__P118438_mk(s) {
 
 
 
-function inline__P118452(s) {
+function inline__P93175(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11050,14 +11116,14 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     s.tmp_2 = if_Angry_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Angry");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Angry"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Angry"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1071; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1070; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -11067,12 +11133,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118452.info = {"start":14363,"length":78,"line":389,"column":38,"endLine":391,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93175.info = {"start":14363,"length":78,"line":389,"column":38,"endLine":391,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118452_mk(s) {
+function inline__P93175_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118452, depth: s.depth + 1,
+        parent: s, fn: inline__P93175, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11084,7 +11150,7 @@ function inline__P118452_mk(s) {
 
 
 
-function inline__P118466(s) {
+function inline__P93187(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11101,14 +11167,14 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     s.tmp_2 = if_Heart_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Heart");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Heart"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Heart"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1074; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1073; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -11118,12 +11184,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118466.info = {"start":14490,"length":78,"line":393,"column":38,"endLine":395,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93187.info = {"start":14490,"length":78,"line":393,"column":38,"endLine":395,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118466_mk(s) {
+function inline__P93187_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118466, depth: s.depth + 1,
+        parent: s, fn: inline__P93187, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11135,7 +11201,7 @@ function inline__P118466_mk(s) {
 
 
 
-function inline__P118480(s) {
+function inline__P93199(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11152,14 +11218,14 @@ switch (step) {
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
     s.tmp_2 = if_Sad_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Sad");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Sad"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Sad"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1077; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1076; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -11169,12 +11235,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118480.info = {"start":14615,"length":76,"line":397,"column":36,"endLine":399,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P93199.info = {"start":14615,"length":76,"line":397,"column":36,"endLine":399,"endColumn":9,"fileName":"library.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P118480_mk(s) {
+function inline__P93199_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118480, depth: s.depth + 1,
+        parent: s, fn: inline__P93199, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11186,7 +11252,7 @@ function inline__P118480_mk(s) {
 
 
 
-function kodu_App_constructor__P110409(s) {
+function kodu_App_constructor__P85192(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11201,26 +11267,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_App__C110406_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P118491);
+    if (!checkSubtype(r0, kodu_App__C85189_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P93820);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = setTimeout__P107021_mk(s);
+    s.tmp_1 = setTimeout__P81685_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
-    s.callLocIdx = 1158; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1157; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_App_constructor__P110409.info = {"start":117,"length":349,"line":5,"column":8,"endLine":13,"endColumn":9,"fileName":"app.ts","functionName":"inline","argumentNames":["this"]}
+kodu_App_constructor__P85192.info = {"start":117,"length":349,"line":5,"column":8,"endLine":13,"endColumn":9,"fileName":"app.ts","functionName":"inline","argumentNames":["this"]}
 
-function kodu_App_constructor__P110409_mk(s) {
+function kodu_App_constructor__P85192_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_App_constructor__P110409, depth: s.depth + 1,
+        parent: s, fn: kodu_App_constructor__P85192, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11231,7 +11297,7 @@ function kodu_App_constructor__P110409_mk(s) {
 
 
 
-function inline__P118491(s) {
+function inline__P93820(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11241,44 +11307,44 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_icons_init__P110156_mk(s);
-    s.callLocIdx = 1154; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = kodu_icons_init__P84908_mk(s);
+    s.callLocIdx = 1153; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_StageManager__C468989_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_StageManager__C85066_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_StageManager_constructor__P468992_mk(s);
+    s.tmp_1 = kodu_StageManager_constructor__P85068_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1155; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1154; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = (s.caps[0]).fields["stageManager"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_WorldStage__C565268_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_WorldStage__C85217_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_WorldStage_constructor__P565295_mk(s);
+    s.tmp_1 = kodu_WorldStage_constructor__P85227_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.caps[0];
-    s.callLocIdx = 1156; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1155; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.caps[0]).fields["worldStage"] = (s.tmp_0);
-    s.tmp_0 = kodu_App_pushStage__P110411_mk(s);
+    s.tmp_0 = kodu_App_pushStage__P85194_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["worldStage"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1157; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1156; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P118491.info = {"start":239,"length":212,"line":7,"column":23,"endLine":12,"endColumn":13,"fileName":"app.ts","functionName":"inline","argumentNames":[]}
+inline__P93820.info = {"start":239,"length":212,"line":7,"column":23,"endLine":12,"endColumn":13,"fileName":"app.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P118491_mk(s) {
+function inline__P93820_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P118491, depth: s.depth + 1,
+        parent: s, fn: inline__P93820, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11288,7 +11354,7 @@ function inline__P118491_mk(s) {
 
 
 
-function kodu_App_pushStage__P110411(s) {
+function kodu_App_pushStage__P85194(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11304,24 +11370,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_App__C110406_VT)) failedCast(r0);
-    s.tmp_0 = kodu_StageManager_push__P468990_mk(s);
+    if (!checkSubtype(r0, kodu_App__C85189_VT)) failedCast(r0);
+    s.tmp_0 = kodu_StageManager_push__P85069_mk(s);
     r0 = s.arg0.fields["stageManager"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1160; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1159; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_App_pushStage__P110411.info = {"start":554,"length":85,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"app.ts","functionName":"pushStage","argumentNames":["this","stage"]}
+kodu_App_pushStage__P85194.info = {"start":554,"length":85,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"app.ts","functionName":"pushStage","argumentNames":["this","stage"]}
 
-function kodu_App_pushStage__P110411_mk(s) {
+function kodu_App_pushStage__P85194_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_App_pushStage__P110411, depth: s.depth + 1,
+        parent: s, fn: kodu_App_pushStage__P85194, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11332,7 +11398,7 @@ function kodu_App_pushStage__P110411_mk(s) {
 
 
 
-function kodu_StageManager_push__P468990(s) {
+function kodu_StageManager_push__P85069(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11348,17 +11414,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_StageManager__C468989_VT)) failedCast(r0);
-    s.tmp_0 = game_pushScene__P109033_mk(s);
-    s.callLocIdx = 488; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, kodu_StageManager__C85066_VT)) failedCast(r0);
+    s.tmp_0 = game_pushScene__P83812_mk(s);
+    s.callLocIdx = 487; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = s.arg0.fields["stack"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
-    s.tmp_0 = kodu_Stage__C468688_v8_1_mk(s);
+    s.tmp_0 = kodu_Stage__C85045_v8_1_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.initScene;
     s.pc = 2; return s.tmp_0;
   case 2:
@@ -11367,12 +11433,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_StageManager_push__P468990.info = {"start":3223,"length":134,"line":110,"column":8,"endLine":114,"endColumn":9,"fileName":"stage.ts","functionName":"push","argumentNames":["this","stage"]}
+kodu_StageManager_push__P85069.info = {"start":3223,"length":134,"line":110,"column":8,"endLine":114,"endColumn":9,"fileName":"stage.ts","functionName":"push","argumentNames":["this","stage"]}
 
-function kodu_StageManager_push__P468990_mk(s) {
+function kodu_StageManager_push__P85069_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_StageManager_push__P468990, depth: s.depth + 1,
+        parent: s, fn: kodu_StageManager_push__P85069, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11383,7 +11449,7 @@ function kodu_StageManager_push__P468990_mk(s) {
 
 
 
-function kodu_Stage_initScene__P468701(s) {
+function kodu_Stage_initScene__P85063(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11398,69 +11464,69 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["components"] = (s.tmp_1);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Camera__C530755_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Camera__C84878_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Camera_constructor__P530783_mk(s);
+    s.tmp_1 = kodu_Camera_constructor__P84886_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 474; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 473; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["camera"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Cursor__C549528_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Cursor__C84979_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Cursor_constructor__P549571_mk(s);
+    s.tmp_1 = kodu_Cursor_constructor__P84990_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 475; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 474; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["cursor"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P468919);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90022);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.A___108374;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.A___83150;
     s.tmp_1.arg1 = 2049;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 477; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 476; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P468924);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90027);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.B___108375;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.B___83151;
     s.tmp_1.arg1 = 2049;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 478; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 477; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P468929);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90032);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.menu___108380;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.menu___83156;
     s.tmp_1.arg1 = 2049;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 479; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 478; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_initScene__P468701.info = {"start":1270,"length":532,"line":46,"column":8,"endLine":59,"endColumn":9,"fileName":"stage.ts","functionName":"initScene","argumentNames":["this"]}
+kodu_Stage_initScene__P85063.info = {"start":1270,"length":532,"line":46,"column":8,"endLine":59,"endColumn":9,"fileName":"stage.ts","functionName":"initScene","argumentNames":["this"]}
 
-function kodu_Stage_initScene__P468701_mk(s) {
+function kodu_Stage_initScene__P85063_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_initScene__P468701, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_initScene__P85063, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11471,7 +11537,7 @@ function kodu_Stage_initScene__P468701_mk(s) {
 
 
 
-function inline__P468919(s) {
+function inline__P90022(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11481,21 +11547,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_Stage_handleAPressed__P468694_mk(s);
+    s.tmp_0 = kodu_Stage_handleAPressed__P85056_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 476; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 475; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468919.info = {"start":1470,"length":60,"line":50,"column":64,"endLine":52,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
+inline__P90022.info = {"start":1470,"length":60,"line":50,"column":64,"endLine":52,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P468919_mk(s) {
+function inline__P90022_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468919, depth: s.depth + 1,
+        parent: s, fn: inline__P90022, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -11504,7 +11570,7 @@ function inline__P468919_mk(s) {
 
 
 
-function inline__P468924(s) {
+function inline__P90027(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11514,9 +11580,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_Stage__C468688_v2_1_mk(s);
+    s.tmp_0 = kodu_Stage__C85045_v2_1_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.handleBPressed;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -11525,12 +11591,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468924.info = {"start":1597,"length":60,"line":53,"column":64,"endLine":55,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
+inline__P90027.info = {"start":1597,"length":60,"line":53,"column":64,"endLine":55,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P468924_mk(s) {
+function inline__P90027_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468924, depth: s.depth + 1,
+        parent: s, fn: inline__P90027, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -11539,7 +11605,7 @@ function inline__P468924_mk(s) {
 
 
 
-function inline__P468929(s) {
+function inline__P90032(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11549,9 +11615,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_Stage__C468688_v3_1_mk(s);
+    s.tmp_0 = kodu_Stage__C85045_v3_1_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.handleMenuPressed;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -11560,12 +11626,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468929.info = {"start":1727,"length":63,"line":56,"column":67,"endLine":58,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
+inline__P90032.info = {"start":1727,"length":63,"line":56,"column":67,"endLine":58,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P468929_mk(s) {
+function inline__P90032_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468929, depth: s.depth + 1,
+        parent: s, fn: inline__P90032, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -11574,7 +11640,7 @@ function inline__P468929_mk(s) {
 
 
 
-function kodu_Stage_handleMenuPressed__P468696(s) {
+function kodu_Stage_handleMenuPressed__P85058(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11589,17 +11655,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_handleMenuPressed__P468696.info = {"start":1020,"length":22,"line":39,"column":8,"endLine":39,"endColumn":30,"fileName":"stage.ts","functionName":"handleMenuPressed","argumentNames":["this"]}
+kodu_Stage_handleMenuPressed__P85058.info = {"start":1020,"length":22,"line":39,"column":8,"endLine":39,"endColumn":30,"fileName":"stage.ts","functionName":"handleMenuPressed","argumentNames":["this"]}
 
-function kodu_Stage_handleMenuPressed__P468696_mk(s) {
+function kodu_Stage_handleMenuPressed__P85058_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_handleMenuPressed__P468696, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_handleMenuPressed__P85058, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -11608,7 +11674,7 @@ function kodu_Stage_handleMenuPressed__P468696_mk(s) {
 
 
 
-function kodu_Stage_handleBPressed__P468695(s) {
+function kodu_Stage_handleBPressed__P85057(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11623,23 +11689,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Cursor_handleBPressed__P549538_mk(s);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Cursor_handleBPressed__P84997_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 473; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 472; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_handleBPressed__P468695.info = {"start":940,"length":70,"line":35,"column":8,"endLine":37,"endColumn":9,"fileName":"stage.ts","functionName":"handleBPressed","argumentNames":["this"]}
+kodu_Stage_handleBPressed__P85057.info = {"start":940,"length":70,"line":35,"column":8,"endLine":37,"endColumn":9,"fileName":"stage.ts","functionName":"handleBPressed","argumentNames":["this"]}
 
-function kodu_Stage_handleBPressed__P468695_mk(s) {
+function kodu_Stage_handleBPressed__P85057_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_handleBPressed__P468695, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_handleBPressed__P85057, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11649,7 +11715,7 @@ function kodu_Stage_handleBPressed__P468695_mk(s) {
 
 
 
-function kodu_Cursor_handleBPressed__P549538(s) {
+function kodu_Cursor_handleBPressed__P84997(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11664,7 +11730,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = s.arg0.fields["disabled"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -11674,26 +11740,26 @@ switch (step) {
   case 2:
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_1 = r0;
-    s.tmp_3 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_3 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 367; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 366; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_1, "x", s.tmp_2);
-    s.tmp_5 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_5 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 368; s.pc = 5; return s.tmp_5;
+    s.callLocIdx = 367; s.pc = 5; return s.tmp_5;
   case 5:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_1, "y", s.tmp_4);
-    s.tmp_6 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_6 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = "cursor:cancel";
     s.tmp_6.arg2 = s.tmp_1;
-    if (!checkSubtype(s.tmp_6.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_6.arg0);
+    if (!checkSubtype(s.tmp_6.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_6.arg0);
     s.tmp_6.fn = s.tmp_6.arg0.vtable.methods.notify;
     s.pc = 6; return s.tmp_6;
   case 6:
@@ -11703,12 +11769,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_handleBPressed__P549538.info = {"start":3522,"length":145,"line":103,"column":8,"endLine":106,"endColumn":9,"fileName":"cursor.ts","functionName":"handleBPressed","argumentNames":["this"]}
+kodu_Cursor_handleBPressed__P84997.info = {"start":3522,"length":145,"line":103,"column":8,"endLine":106,"endColumn":9,"fileName":"cursor.ts","functionName":"handleBPressed","argumentNames":["this"]}
 
-function kodu_Cursor_handleBPressed__P549538_mk(s) {
+function kodu_Cursor_handleBPressed__P84997_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_handleBPressed__P549538, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_handleBPressed__P84997, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11724,7 +11790,7 @@ function kodu_Cursor_handleBPressed__P549538_mk(s) {
 
 
 
-function kodu_Cursor_y__P549462(s) {
+function kodu_Cursor_y__P84987(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11739,23 +11805,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_y__P110491_mk(s);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_y__P85274_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 316; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 315; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Cursor_y__P549462.info = {"start":588,"length":38,"line":17,"column":8,"endLine":17,"endColumn":46,"fileName":"cursor.ts","functionName":"y","argumentNames":["this"]}
-kodu_Cursor_y__P549462.isGetter = true;
+kodu_Cursor_y__P84987.info = {"start":588,"length":38,"line":17,"column":8,"endLine":17,"endColumn":46,"fileName":"cursor.ts","functionName":"y","argumentNames":["this"]}
+kodu_Cursor_y__P84987.isGetter = true;
 
-function kodu_Cursor_y__P549462_mk(s) {
+function kodu_Cursor_y__P84987_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_y__P549462, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_y__P84987, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11765,7 +11831,7 @@ function kodu_Cursor_y__P549462_mk(s) {
 
 
 
-function kodu_Kelpie_y__P110491(s) {
+function kodu_Kelpie_y__P85274(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11780,20 +11846,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = s.arg0.fields["_y"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_y__P110491.info = {"start":647,"length":67,"line":27,"column":8,"endLine":29,"endColumn":9,"fileName":"kelpie.ts","functionName":"y","argumentNames":["this"]}
-kodu_Kelpie_y__P110491.isGetter = true;
+kodu_Kelpie_y__P85274.info = {"start":647,"length":67,"line":27,"column":8,"endLine":29,"endColumn":9,"fileName":"kelpie.ts","functionName":"y","argumentNames":["this"]}
+kodu_Kelpie_y__P85274.isGetter = true;
 
-function kodu_Kelpie_y__P110491_mk(s) {
+function kodu_Kelpie_y__P85274_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_y__P110491, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_y__P85274, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11803,7 +11869,7 @@ function kodu_Kelpie_y__P110491_mk(s) {
 
 
 
-function Fx_toFloat__P106775(s) {
+function Fx_toFloat__P81439(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11821,12 +11887,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toFloat__P106775.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__P81439.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__P106775_mk(s) {
+function Fx_toFloat__P81439_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toFloat__P106775, depth: s.depth + 1,
+        parent: s, fn: Fx_toFloat__P81439, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -11835,7 +11901,7 @@ function Fx_toFloat__P106775_mk(s) {
 
 
 
-function kodu_Cursor_x__P549461(s) {
+function kodu_Cursor_x__P84986(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11850,23 +11916,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110489_mk(s);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85272_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 315; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 314; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Cursor_x__P549461.info = {"start":541,"length":38,"line":16,"column":8,"endLine":16,"endColumn":46,"fileName":"cursor.ts","functionName":"x","argumentNames":["this"]}
-kodu_Cursor_x__P549461.isGetter = true;
+kodu_Cursor_x__P84986.info = {"start":541,"length":38,"line":16,"column":8,"endLine":16,"endColumn":46,"fileName":"cursor.ts","functionName":"x","argumentNames":["this"]}
+kodu_Cursor_x__P84986.isGetter = true;
 
-function kodu_Cursor_x__P549461_mk(s) {
+function kodu_Cursor_x__P84986_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_x__P549461, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_x__P84986, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11876,7 +11942,7 @@ function kodu_Cursor_x__P549461_mk(s) {
 
 
 
-function kodu_Kelpie_x__P110489(s) {
+function kodu_Kelpie_x__P85272(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11891,20 +11957,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = s.arg0.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_x__P110489.info = {"start":453,"length":67,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"kelpie.ts","functionName":"x","argumentNames":["this"]}
-kodu_Kelpie_x__P110489.isGetter = true;
+kodu_Kelpie_x__P85272.info = {"start":453,"length":67,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"kelpie.ts","functionName":"x","argumentNames":["this"]}
+kodu_Kelpie_x__P85272.isGetter = true;
 
-function kodu_Kelpie_x__P110489_mk(s) {
+function kodu_Kelpie_x__P85272_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_x__P110489, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_x__P85272, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11914,7 +11980,7 @@ function kodu_Kelpie_x__P110489_mk(s) {
 
 
 
-function kodu_Stage_notify__P468704(s) {
+function kodu_Stage_notify__P85065(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11924,12 +11990,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x___468971 = undefined;
-    s.y___468972 = undefined;
-    s.button___468977 = undefined;
-    s.char___468981 = undefined;
-    s.x___468982 = undefined;
-    s.y___468983 = undefined;
+    s.x___90073 = undefined;
+    s.y___90074 = undefined;
+    s.button___90079 = undefined;
+    s.char___90083 = undefined;
+    s.x___90084 = undefined;
+    s.y___90085 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -11937,7 +12003,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtcore.switch_eq("cursor:canvasClick", s.tmp_0);
     if (r0) { step = 1; continue; }
@@ -11959,11 +12025,11 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["x"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["x"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 482; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 481; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
-    s.x___468971 = (r0);
+    s.x___90073 = (r0);
     s.tmp_3 = if_y_1_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -11972,16 +12038,16 @@ 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 = 483; s.pc = 7; return s.tmp_3; }
+     else { s.callLocIdx = 482; s.pc = 7; return s.tmp_3; }
     }
   case 7:
     r0 = s.retval;
-    s.y___468972 = (r0);
-    s.tmp_0 = kodu_Stage__C468688_v4_3_mk(s);
+    s.y___90074 = (r0);
+    s.tmp_0 = kodu_Stage__C85045_v4_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.x___468971;
-    s.tmp_0.arg2 = s.y___468972;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.x___90073;
+    s.tmp_0.arg2 = s.y___90074;
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.handleCursorCanvasClick;
     s.pc = 8; return s.tmp_0;
   case 8:
@@ -11996,15 +12062,15 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["button"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["button"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 484; s.pc = 9; return s.tmp_0; }
+     else { s.callLocIdx = 483; s.pc = 9; return s.tmp_0; }
     }
   case 9:
     r0 = s.retval;
-    s.button___468977 = (r0);
-    s.tmp_0 = kodu_Stage__C468688_v5_2_mk(s);
+    s.button___90079 = (r0);
+    s.tmp_0 = kodu_Stage__C85045_v5_2_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.button___468977;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.button___90079;
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.handleCursorButtonClick;
     s.pc = 10; return s.tmp_0;
   case 10:
@@ -12020,11 +12086,11 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["char"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["char"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 485; s.pc = 11; return s.tmp_0; }
+     else { s.callLocIdx = 484; s.pc = 11; return s.tmp_0; }
     }
   case 11:
     r0 = s.retval;
-    s.char___468981 = (r0);
+    s.char___90083 = (r0);
     s.tmp_2 = if_x_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -12033,11 +12099,11 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["x"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["x"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 486; s.pc = 12; return s.tmp_2; }
+     else { s.callLocIdx = 485; s.pc = 12; return s.tmp_2; }
     }
   case 12:
     r0 = s.retval;
-    s.x___468982 = (r0);
+    s.x___90084 = (r0);
     s.tmp_3 = if_y_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -12046,26 +12112,26 @@ 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 = 487; s.pc = 13; return s.tmp_3; }
+     else { s.callLocIdx = 486; s.pc = 13; return s.tmp_3; }
     }
   case 13:
     r0 = s.retval;
-    s.y___468983 = (r0);
-    s.tmp_0 = kodu_Stage__C468688_v6_4_mk(s);
+    s.y___90085 = (r0);
+    s.tmp_0 = kodu_Stage__C85045_v6_4_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.char___468981;
-    s.tmp_0.arg2 = s.x___468982;
-    s.tmp_0.arg3 = s.y___468983;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.char___90083;
+    s.tmp_0.arg2 = s.x___90084;
+    s.tmp_0.arg3 = s.y___90085;
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.handleCursorCharacterClick;
     s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = kodu_Stage__C468688_v7_1_mk(s);
+    s.tmp_0 = kodu_Stage__C85045_v7_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.handleCursorCancel;
     s.pc = 15; return s.tmp_0;
   case 15:
@@ -12075,23 +12141,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_notify__P468704.info = {"start":2277,"length":809,"line":78,"column":8,"endLine":100,"endColumn":9,"fileName":"stage.ts","functionName":"notify","argumentNames":["this","event","parm"]}
+kodu_Stage_notify__P85065.info = {"start":2277,"length":809,"line":78,"column":8,"endLine":100,"endColumn":9,"fileName":"stage.ts","functionName":"notify","argumentNames":["this","event","parm"]}
 
-function kodu_Stage_notify__P468704_mk(s) {
+function kodu_Stage_notify__P85065_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_notify__P468704, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_notify__P85065, 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,
-  x___468971: undefined,
-  y___468972: undefined,
-  button___468977: undefined,
-  char___468981: undefined,
-  x___468982: undefined,
-  y___468983: undefined,
+  x___90073: undefined,
+  y___90074: undefined,
+  button___90079: undefined,
+  char___90083: undefined,
+  x___90084: undefined,
+  y___90085: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -12101,7 +12167,7 @@ function kodu_Stage_notify__P468704_mk(s) {
 
 
 
-function kodu_Stage_handleCursorCancel__P468700(s) {
+function kodu_Stage_handleCursorCancel__P85062(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12116,17 +12182,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_handleCursorCancel__P468700.info = {"start":1237,"length":23,"line":44,"column":8,"endLine":44,"endColumn":31,"fileName":"stage.ts","functionName":"handleCursorCancel","argumentNames":["this"]}
+kodu_Stage_handleCursorCancel__P85062.info = {"start":1237,"length":23,"line":44,"column":8,"endLine":44,"endColumn":31,"fileName":"stage.ts","functionName":"handleCursorCancel","argumentNames":["this"]}
 
-function kodu_Stage_handleCursorCancel__P468700_mk(s) {
+function kodu_Stage_handleCursorCancel__P85062_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_handleCursorCancel__P468700, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_handleCursorCancel__P85062, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -12135,7 +12201,7 @@ function kodu_Stage_handleCursorCancel__P468700_mk(s) {
 
 
 
-function kodu_Stage_handleCursorCharacterClick__P468699(s) {
+function kodu_Stage_handleCursorCharacterClick__P85061(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12153,17 +12219,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_handleCursorCharacterClick__P468699.info = {"start":1160,"length":68,"line":43,"column":8,"endLine":43,"endColumn":76,"fileName":"stage.ts","functionName":"handleCursorCharacterClick","argumentNames":["this","char","x","y"]}
+kodu_Stage_handleCursorCharacterClick__P85061.info = {"start":1160,"length":68,"line":43,"column":8,"endLine":43,"endColumn":76,"fileName":"stage.ts","functionName":"handleCursorCharacterClick","argumentNames":["this","char","x","y"]}
 
-function kodu_Stage_handleCursorCharacterClick__P468699_mk(s) {
+function kodu_Stage_handleCursorCharacterClick__P85061_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_handleCursorCharacterClick__P468699, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_handleCursorCharacterClick__P85061, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12175,7 +12241,7 @@ function kodu_Stage_handleCursorCharacterClick__P468699_mk(s) {
 
 
 
-function kodu_Stage_handleCursorButtonClick__P468698(s) {
+function kodu_Stage_handleCursorButtonClick__P85060(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12191,17 +12257,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_handleCursorButtonClick__P468698.info = {"start":1109,"length":42,"line":42,"column":8,"endLine":42,"endColumn":50,"fileName":"stage.ts","functionName":"handleCursorButtonClick","argumentNames":["this","button"]}
+kodu_Stage_handleCursorButtonClick__P85060.info = {"start":1109,"length":42,"line":42,"column":8,"endLine":42,"endColumn":50,"fileName":"stage.ts","functionName":"handleCursorButtonClick","argumentNames":["this","button"]}
 
-function kodu_Stage_handleCursorButtonClick__P468698_mk(s) {
+function kodu_Stage_handleCursorButtonClick__P85060_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_handleCursorButtonClick__P468698, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_handleCursorButtonClick__P85060, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12211,7 +12277,7 @@ function kodu_Stage_handleCursorButtonClick__P468698_mk(s) {
 
 
 
-function kodu_Stage_handleCursorCanvasClick__P468697(s) {
+function kodu_Stage_handleCursorCanvasClick__P85059(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12228,17 +12294,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_handleCursorCanvasClick__P468697.info = {"start":1052,"length":48,"line":41,"column":8,"endLine":41,"endColumn":56,"fileName":"stage.ts","functionName":"handleCursorCanvasClick","argumentNames":["this","x","y"]}
+kodu_Stage_handleCursorCanvasClick__P85059.info = {"start":1052,"length":48,"line":41,"column":8,"endLine":41,"endColumn":56,"fileName":"stage.ts","functionName":"handleCursorCanvasClick","argumentNames":["this","x","y"]}
 
-function kodu_Stage_handleCursorCanvasClick__P468697_mk(s) {
+function kodu_Stage_handleCursorCanvasClick__P85059_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_handleCursorCanvasClick__P468697, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_handleCursorCanvasClick__P85059, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12249,7 +12315,7 @@ function kodu_Stage_handleCursorCanvasClick__P468697_mk(s) {
 
 
 
-function kodu_Stage_handleAPressed__P468694(s) {
+function kodu_Stage_handleAPressed__P85056(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12264,23 +12330,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Cursor_handleAPressed__P549537_mk(s);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Cursor_handleAPressed__P84996_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 472; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 471; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_handleAPressed__P468694.info = {"start":860,"length":70,"line":31,"column":8,"endLine":33,"endColumn":9,"fileName":"stage.ts","functionName":"handleAPressed","argumentNames":["this"]}
+kodu_Stage_handleAPressed__P85056.info = {"start":860,"length":70,"line":31,"column":8,"endLine":33,"endColumn":9,"fileName":"stage.ts","functionName":"handleAPressed","argumentNames":["this"]}
 
-function kodu_Stage_handleAPressed__P468694_mk(s) {
+function kodu_Stage_handleAPressed__P85056_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_handleAPressed__P468694, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_handleAPressed__P85056, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12290,7 +12356,7 @@ function kodu_Stage_handleAPressed__P468694_mk(s) {
 
 
 
-function kodu_Cursor_handleAPressed__P549537(s) {
+function kodu_Cursor_handleAPressed__P84996(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12300,17 +12366,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.overlaps___549677 = undefined;
-    s.buttons___549688 = undefined;
-    s.button___549708 = undefined;
-    s.chars___549719 = undefined;
-    s.char___549735 = undefined;
+    s.overlaps___89144 = undefined;
+    s.buttons___89155 = undefined;
+    s.button___89175 = undefined;
+    s.chars___89186 = undefined;
+    s.char___89202 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = s.arg0.fields["disabled"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -12318,13 +12384,13 @@ switch (step) {
     { step = 9; continue; }
   case 1:
   case 2:
-    s.tmp_1 = kodu_Cursor_getAllOverlapping__P549536_mk(s);
+    s.tmp_1 = kodu_Cursor_getAllOverlapping__P84995_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 348; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 347; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.overlaps___549677 = (r0);
-    r0 = pxsim_Array__length(s.overlaps___549677);
+    s.overlaps___89144 = (r0);
+    r0 = pxsim_Array__length(s.overlaps___89144);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -12334,26 +12400,26 @@ switch (step) {
     if (!r0) { step = 3; continue; }
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_3 = r0;
-    s.tmp_5 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_5 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 349; s.pc = 11; return s.tmp_5;
+    s.callLocIdx = 348; s.pc = 11; return s.tmp_5;
   case 11:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_3, "x", s.tmp_4);
-    s.tmp_7 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_7 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 350; s.pc = 12; return s.tmp_7;
+    s.callLocIdx = 349; s.pc = 12; return s.tmp_7;
   case 12:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_3, "y", s.tmp_6);
-    s.tmp_8 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_8 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_8.arg0 = r0;
     s.tmp_8.arg1 = "cursor:canvasClick";
     s.tmp_8.arg2 = s.tmp_3;
-    if (!checkSubtype(s.tmp_8.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_8.arg0);
+    if (!checkSubtype(s.tmp_8.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_8.arg0);
     s.tmp_8.fn = s.tmp_8.arg0.vtable.methods.notify;
     s.pc = 13; return s.tmp_8;
   case 13:
@@ -12361,52 +12427,52 @@ switch (step) {
     { step = 9; continue; }
   case 3:
   case 4:
-    s.tmp_0 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_1 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.overlaps___549677;
-    s.tmp_2.arg1 = inline__P549695;
-    s.callLocIdx = 352; s.pc = 16; return s.tmp_2;
+    s.tmp_0 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_1 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.overlaps___89144;
+    s.tmp_2.arg1 = inline__P89162;
+    s.callLocIdx = 351; s.pc = 16; return s.tmp_2;
   case 16:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P549701;
-    s.callLocIdx = 354; s.pc = 15; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P89168;
+    s.callLocIdx = 353; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P549690;
-    s.callLocIdx = 356; s.pc = 14; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P89157;
+    s.callLocIdx = 355; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.buttons___549688 = (r0);
-    r0 = pxsim_Array_.removeAt(s.buttons___549688, 0);
-    s.button___549708 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.button___549708);
+    s.buttons___89155 = (r0);
+    r0 = pxsim_Array_.removeAt(s.buttons___89155, 0);
+    s.button___89175 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.button___89175);
     if (!r0) { step = 5; continue; }
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "button", s.button___549708);
-    s.tmp_2 = kodu_Cursor_x__P549461_mk(s);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "button", s.button___89175);
+    s.tmp_2 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 358; s.pc = 17; return s.tmp_2;
+    s.callLocIdx = 357; s.pc = 17; return s.tmp_2;
   case 17:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "x", s.tmp_1);
-    s.tmp_4 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_4 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 359; s.pc = 18; return s.tmp_4;
+    s.callLocIdx = 358; s.pc = 18; return s.tmp_4;
   case 18:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "y", s.tmp_3);
-    s.tmp_5 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_5 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = "cursor:buttonClick";
     s.tmp_5.arg2 = s.tmp_0;
-    if (!checkSubtype(s.tmp_5.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_5.arg0);
     s.tmp_5.fn = s.tmp_5.arg0.vtable.methods.notify;
     s.pc = 19; return s.tmp_5;
   case 19:
@@ -12414,46 +12480,46 @@ switch (step) {
     { step = 9; continue; }
   case 5:
   case 6:
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_1.arg0 = s.overlaps___549677;
-    s.tmp_1.arg1 = inline__P549726;
-    s.callLocIdx = 361; s.pc = 21; return s.tmp_1;
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_1.arg0 = s.overlaps___89144;
+    s.tmp_1.arg1 = inline__P89193;
+    s.callLocIdx = 360; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P549722;
-    s.callLocIdx = 363; s.pc = 20; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P89189;
+    s.callLocIdx = 362; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
-    s.chars___549719 = (r0);
-    r0 = pxsim_Array_.removeAt(s.chars___549719, 0);
-    s.char___549735 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.char___549735);
+    s.chars___89186 = (r0);
+    r0 = pxsim_Array_.removeAt(s.chars___89186, 0);
+    s.char___89202 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.char___89202);
     if (!r0) { step = 7; continue; }
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "char", s.char___549735);
-    s.tmp_2 = kodu_Cursor_x__P549461_mk(s);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "char", s.char___89202);
+    s.tmp_2 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 365; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 364; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "x", s.tmp_1);
-    s.tmp_4 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_4 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 366; s.pc = 23; return s.tmp_4;
+    s.callLocIdx = 365; s.pc = 23; return s.tmp_4;
   case 23:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "y", s.tmp_3);
-    s.tmp_5 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_5 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = "cursor:characterClick";
     s.tmp_5.arg2 = s.tmp_0;
-    if (!checkSubtype(s.tmp_5.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_5.arg0);
     s.tmp_5.fn = s.tmp_5.arg0.vtable.methods.notify;
     s.pc = 24; return s.tmp_5;
   case 24:
@@ -12466,12 +12532,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_handleAPressed__P549537.info = {"start":2216,"length":1296,"line":71,"column":8,"endLine":101,"endColumn":9,"fileName":"cursor.ts","functionName":"handleAPressed","argumentNames":["this"]}
+kodu_Cursor_handleAPressed__P84996.info = {"start":2216,"length":1296,"line":71,"column":8,"endLine":101,"endColumn":9,"fileName":"cursor.ts","functionName":"handleAPressed","argumentNames":["this"]}
 
-function kodu_Cursor_handleAPressed__P549537_mk(s) {
+function kodu_Cursor_handleAPressed__P84996_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_handleAPressed__P549537, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_handleAPressed__P84996, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12482,11 +12548,11 @@ function kodu_Cursor_handleAPressed__P549537_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  overlaps___549677: undefined,
-  buttons___549688: undefined,
-  button___549708: undefined,
-  chars___549719: undefined,
-  char___549735: undefined,
+  overlaps___89144: undefined,
+  buttons___89155: undefined,
+  button___89175: undefined,
+  chars___89186: undefined,
+  char___89202: undefined,
   arg0: undefined,
 } }
 
@@ -12494,7 +12560,7 @@ function kodu_Cursor_handleAPressed__P549537_mk(s) {
 
 
 
-function inline__P549695(s) {
+function inline__P89162(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12508,9 +12574,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_2 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 351; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 350; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -12520,12 +12586,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P549695.info = {"start":2632,"length":40,"line":81,"column":28,"endLine":81,"endColumn":68,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
+inline__P89162.info = {"start":2632,"length":40,"line":81,"column":28,"endLine":81,"endColumn":68,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P549695_mk(s) {
+function inline__P89162_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P549695, depth: s.depth + 1,
+        parent: s, fn: inline__P89162, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12537,7 +12603,7 @@ function inline__P549695_mk(s) {
 
 
 
-function inline__P549701(s) {
+function inline__P89168(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12551,9 +12617,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 353; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 352; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -12561,12 +12627,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P549701.info = {"start":2699,"length":32,"line":82,"column":25,"endLine":82,"endColumn":57,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
+inline__P89168.info = {"start":2699,"length":32,"line":82,"column":25,"endLine":82,"endColumn":57,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P549701_mk(s) {
+function inline__P89168_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P549701, depth: s.depth + 1,
+        parent: s, fn: inline__P89168, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12577,7 +12643,7 @@ function inline__P549701_mk(s) {
 
 
 
-function inline__P549690(s) {
+function inline__P89157(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12597,12 +12663,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P549690.info = {"start":2774,"length":26,"line":83,"column":28,"endLine":83,"endColumn":54,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
+inline__P89157.info = {"start":2774,"length":26,"line":83,"column":28,"endLine":83,"endColumn":54,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P549690_mk(s) {
+function inline__P89157_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P549690, depth: s.depth + 1,
+        parent: s, fn: inline__P89157, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12612,7 +12678,7 @@ function inline__P549690_mk(s) {
 
 
 
-function inline__P549726(s) {
+function inline__P89193(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12626,9 +12692,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_2 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 360; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 359; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -12638,12 +12704,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P549726.info = {"start":3155,"length":43,"line":93,"column":28,"endLine":93,"endColumn":71,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
+inline__P89193.info = {"start":3155,"length":43,"line":93,"column":28,"endLine":93,"endColumn":71,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P549726_mk(s) {
+function inline__P89193_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P549726, depth: s.depth + 1,
+        parent: s, fn: inline__P89193, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12655,7 +12721,7 @@ function inline__P549726_mk(s) {
 
 
 
-function inline__P549722(s) {
+function inline__P89189(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12669,9 +12735,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 362; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 361; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -12679,12 +12745,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P549722.info = {"start":3225,"length":32,"line":94,"column":25,"endLine":94,"endColumn":57,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
+inline__P89189.info = {"start":3225,"length":32,"line":94,"column":25,"endLine":94,"endColumn":57,"fileName":"cursor.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P549722_mk(s) {
+function inline__P89189_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P549722, depth: s.depth + 1,
+        parent: s, fn: inline__P89189, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12695,7 +12761,7 @@ function inline__P549722_mk(s) {
 
 
 
-function helpers_arrayShift__P106709(s) {
+function helpers_arrayShift__P81371(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12713,12 +12779,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayShift__P106709.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__P81371.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__P106709_mk(s) {
+function helpers_arrayShift__P81371_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayShift__P106709, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayShift__P81371, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -12727,7 +12793,7 @@ function helpers_arrayShift__P106709_mk(s) {
 
 
 
-function kodu_Button_clickable__P522437(s) {
+function kodu_Button_clickable__P84870(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12742,19 +12808,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["onClick"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 != null);
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_clickable__P522437.info = {"start":2811,"length":51,"line":88,"column":8,"endLine":88,"endColumn":59,"fileName":"button.ts","functionName":"clickable","argumentNames":["this"]}
+kodu_Button_clickable__P84870.info = {"start":2811,"length":51,"line":88,"column":8,"endLine":88,"endColumn":59,"fileName":"button.ts","functionName":"clickable","argumentNames":["this"]}
 
-function kodu_Button_clickable__P522437_mk(s) {
+function kodu_Button_clickable__P84870_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_clickable__P522437, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_clickable__P84870, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12764,7 +12830,7 @@ function kodu_Button_clickable__P522437_mk(s) {
 
 
 
-function kodu_Kelpie_data__P110501(s) {
+function kodu_Kelpie_data__P85284(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12779,7 +12845,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = s.arg0.fields["_data"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -12798,13 +12864,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_data__P110501.info = {"start":1751,"length":104,"line":69,"column":8,"endLine":72,"endColumn":9,"fileName":"kelpie.ts","functionName":"data","argumentNames":["this"]}
-kodu_Kelpie_data__P110501.isGetter = true;
+kodu_Kelpie_data__P85284.info = {"start":1751,"length":104,"line":69,"column":8,"endLine":72,"endColumn":9,"fileName":"kelpie.ts","functionName":"data","argumentNames":["this"]}
+kodu_Kelpie_data__P85284.isGetter = true;
 
-function kodu_Kelpie_data__P110501_mk(s) {
+function kodu_Kelpie_data__P85284_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_data__P110501, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_data__P85284, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12818,7 +12884,7 @@ function kodu_Kelpie_data__P110501_mk(s) {
 
 
 
-function kodu_Cursor_getAllOverlapping__P549536(s) {
+function kodu_Cursor_getAllOverlapping__P84995(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12833,37 +12899,37 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P549660);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89127);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arraySort__P106712_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3 = util_getAllOverlapping__P110085_mk(s);
+    s.tmp_1 = helpers_arraySort__P81374_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3 = util_getAllOverlapping__P84837_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 340; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 339; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_0;
-    s.callLocIdx = 344; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 343; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P549666;
-    s.callLocIdx = 347; s.pc = 1; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P89133;
+    s.callLocIdx = 346; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_getAllOverlapping__P549536.info = {"start":2006,"length":200,"line":65,"column":8,"endLine":69,"endColumn":9,"fileName":"cursor.ts","functionName":"getAllOverlapping","argumentNames":["this"]}
+kodu_Cursor_getAllOverlapping__P84995.info = {"start":2006,"length":200,"line":65,"column":8,"endLine":69,"endColumn":9,"fileName":"cursor.ts","functionName":"getAllOverlapping","argumentNames":["this"]}
 
-function kodu_Cursor_getAllOverlapping__P549536_mk(s) {
+function kodu_Cursor_getAllOverlapping__P84995_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_getAllOverlapping__P549536, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_getAllOverlapping__P84995, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12876,7 +12942,7 @@ function kodu_Cursor_getAllOverlapping__P549536_mk(s) {
 
 
 
-function inline__P549660(s) {
+function inline__P89127(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12890,32 +12956,32 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = util_pointInSprite__P110083_mk(s);
+    s.tmp_0 = util_pointInSprite__P84835_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_1 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_1.arg0 = s.caps[0];
-    s.callLocIdx = 341; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 340; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_2 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 342; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 341; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 343; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 342; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P549660.info = {"start":2105,"length":46,"line":67,"column":24,"endLine":67,"endColumn":70,"fileName":"cursor.ts","functionName":"inline","argumentNames":["spr"]}
+inline__P89127.info = {"start":2105,"length":46,"line":67,"column":24,"endLine":67,"endColumn":70,"fileName":"cursor.ts","functionName":"inline","argumentNames":["spr"]}
 
-function inline__P549660_mk(s) {
+function inline__P89127_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P549660, depth: s.depth + 1,
+        parent: s, fn: inline__P89127, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12927,7 +12993,7 @@ function inline__P549660_mk(s) {
 
 
 
-function inline__P549666(s) {
+function inline__P89133(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12950,12 +13016,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P549666.info = {"start":2175,"length":19,"line":68,"column":22,"endLine":68,"endColumn":41,"fileName":"cursor.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P89133.info = {"start":2175,"length":19,"line":68,"column":22,"endLine":68,"endColumn":41,"fileName":"cursor.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P549666_mk(s) {
+function inline__P89133_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P549666, depth: s.depth + 1,
+        parent: s, fn: inline__P89133, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12967,7 +13033,7 @@ function inline__P549666_mk(s) {
 
 
 
-function sprites_BaseSprite_z__P108359(s) {
+function sprites_BaseSprite_z__P83135(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12982,18 +13048,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C108355_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C83131_VT)) failedCast(r0);
     r0 = s.arg0.fields["_z"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_z__P108359.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__P108359.isGetter = true;
+sprites_BaseSprite_z__P83135.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__P83135.isGetter = true;
 
-function sprites_BaseSprite_z__P108359_mk(s) {
+function sprites_BaseSprite_z__P83135_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_z__P108359, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_z__P83135, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -13002,7 +13068,7 @@ function sprites_BaseSprite_z__P108359_mk(s) {
 
 
 
-function util_pointInSprite__P110083(s) {
+function util_pointInSprite__P84835(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13012,8 +13078,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.wOver2___112555 = undefined;
-    s.hOver2___112559 = undefined;
+    s.wOver2___87392 = undefined;
+    s.hOver2___87396 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -13025,21 +13091,21 @@ switch (step) {
     r0 = pxsim_ImageMethods.width(s.tmp_1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    s.wOver2___112555 = (r0);
+    s.wOver2___87392 = (r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    s.hOver2___112559 = (r0);
+    s.hOver2___87396 = (r0);
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_4 = kodu_Kelpie_x__P110489_mk(s);
+    s.tmp_4 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 64; s.pc = 7; return s.tmp_4;
+    s.callLocIdx = 63; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 - s.wOver2___112555);
+    r0 = (s.tmp_3 - s.wOver2___87392);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 >= s.tmp_2);
     s.tmp_0 = r0;
@@ -13049,13 +13115,13 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_5 = r0 = s.arg1;
-    s.tmp_8 = kodu_Kelpie_x__P110489_mk(s);
+    s.tmp_8 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 65; s.pc = 8; return s.tmp_8;
+    s.callLocIdx = 64; s.pc = 8; return s.tmp_8;
   case 8:
     r0 = s.retval;
     s.tmp_7 = r0;
-    r0 = (s.tmp_7 + s.wOver2___112555);
+    r0 = (s.tmp_7 + s.wOver2___87392);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 <= s.tmp_6);
   case 2:
@@ -13067,13 +13133,13 @@ switch (step) {
     { step = 4; continue; }
   case 3:
     s.tmp_10 = r0 = s.arg2;
-    s.tmp_13 = kodu_Kelpie_y__P110491_mk(s);
+    s.tmp_13 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_13.arg0 = s.arg0;
-    s.callLocIdx = 66; s.pc = 9; return s.tmp_13;
+    s.callLocIdx = 65; s.pc = 9; return s.tmp_13;
   case 9:
     r0 = s.retval;
     s.tmp_12 = r0;
-    r0 = (s.tmp_12 - s.hOver2___112559);
+    r0 = (s.tmp_12 - s.hOver2___87396);
     s.tmp_11 = r0;
     r0 = (s.tmp_10 >= s.tmp_11);
   case 4:
@@ -13085,13 +13151,13 @@ switch (step) {
     { step = 6; continue; }
   case 5:
     s.tmp_15 = r0 = s.arg2;
-    s.tmp_18 = kodu_Kelpie_y__P110491_mk(s);
+    s.tmp_18 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_18.arg0 = s.arg0;
-    s.callLocIdx = 67; s.pc = 10; return s.tmp_18;
+    s.callLocIdx = 66; s.pc = 10; return s.tmp_18;
   case 10:
     r0 = s.retval;
     s.tmp_17 = r0;
-    r0 = (s.tmp_17 + s.hOver2___112559);
+    r0 = (s.tmp_17 + s.hOver2___87396);
     s.tmp_16 = r0;
     r0 = (s.tmp_15 <= s.tmp_16);
   case 6:
@@ -13101,12 +13167,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-util_pointInSprite__P110083.info = {"start":266,"length":276,"line":7,"column":4,"endLine":11,"endColumn":5,"fileName":"extras.ts","functionName":"pointInSprite","argumentNames":["kel","x","y"]}
+util_pointInSprite__P84835.info = {"start":266,"length":276,"line":7,"column":4,"endLine":11,"endColumn":5,"fileName":"extras.ts","functionName":"pointInSprite","argumentNames":["kel","x","y"]}
 
-function util_pointInSprite__P110083_mk(s) {
+function util_pointInSprite__P84835_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_pointInSprite__P110083, depth: s.depth + 1,
+        parent: s, fn: util_pointInSprite__P84835, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13128,8 +13194,8 @@ function util_pointInSprite__P110083_mk(s) {
   tmp_17: undefined,
   tmp_18: undefined,
   tmp_19: undefined,
-  wOver2___112555: undefined,
-  hOver2___112559: undefined,
+  wOver2___87392: undefined,
+  hOver2___87396: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -13139,7 +13205,7 @@ function util_pointInSprite__P110083_mk(s) {
 
 
 
-function kodu_Kelpie_height__P110494(s) {
+function kodu_Kelpie_height__P85277(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13154,20 +13220,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_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()
 } } }
-kodu_Kelpie_height__P110494.info = {"start":970,"length":63,"line":39,"column":8,"endLine":41,"endColumn":9,"fileName":"kelpie.ts","functionName":"height","argumentNames":["this"]}
-kodu_Kelpie_height__P110494.isGetter = true;
+kodu_Kelpie_height__P85277.info = {"start":970,"length":63,"line":39,"column":8,"endLine":41,"endColumn":9,"fileName":"kelpie.ts","functionName":"height","argumentNames":["this"]}
+kodu_Kelpie_height__P85277.isGetter = true;
 
-function kodu_Kelpie_height__P110494_mk(s) {
+function kodu_Kelpie_height__P85277_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_height__P110494, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_height__P85277, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -13177,7 +13243,7 @@ function kodu_Kelpie_height__P110494_mk(s) {
 
 
 
-function kodu_Kelpie_width__P110493(s) {
+function kodu_Kelpie_width__P85276(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13192,20 +13258,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_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()
 } } }
-kodu_Kelpie_width__P110493.info = {"start":845,"length":61,"line":35,"column":8,"endLine":37,"endColumn":9,"fileName":"kelpie.ts","functionName":"width","argumentNames":["this"]}
-kodu_Kelpie_width__P110493.isGetter = true;
+kodu_Kelpie_width__P85276.info = {"start":845,"length":61,"line":35,"column":8,"endLine":37,"endColumn":9,"fileName":"kelpie.ts","functionName":"width","argumentNames":["this"]}
+kodu_Kelpie_width__P85276.isGetter = true;
 
-function kodu_Kelpie_width__P110493_mk(s) {
+function kodu_Kelpie_width__P85276_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_width__P110493, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_width__P85276, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -13215,7 +13281,7 @@ function kodu_Kelpie_width__P110493_mk(s) {
 
 
 
-function util_getAllOverlapping__P110085(s) {
+function util_getAllOverlapping__P84837(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13225,17 +13291,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.srcHitbox___112631 = undefined;
-    s.srcHitboxBounds___112641 = undefined;
-    s.scene___112645 = undefined;
-    s.kelpies___112648 = undefined;
+    s.srcHitbox___87468 = undefined;
+    s.srcHitboxBounds___87478 = undefined;
+    s.scene___87482 = undefined;
+    s.kelpies___87485 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_2 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 79; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 78; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -13246,15 +13312,15 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_4 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_4 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 80; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 79; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_6 = util_calculateHitbox__P110099_mk(s);
+    s.tmp_6 = util_calculateHitbox__P84851_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 81; s.pc = 5; return s.tmp_6;
+    s.callLocIdx = 80; s.pc = 5; return s.tmp_6;
   case 5:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -13263,71 +13329,71 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.srcHitbox___112631 = (s.tmp_7);
-    r0 = pxsim_pxtcore_mkClassInstance(util_HitboxBounds__C110089_VT);
+    s.srcHitbox___87468 = (s.tmp_7);
+    r0 = pxsim_pxtcore_mkClassInstance(util_HitboxBounds__C84841_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = util_HitboxBounds_constructor__P110097_mk(s);
+    s.tmp_1 = util_HitboxBounds_constructor__P84849_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 82; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 81; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    s.srcHitboxBounds___112641 = (s.tmp_0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 83; s.pc = 7; return s.tmp_0;
+    s.srcHitboxBounds___87478 = (s.tmp_0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 82; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.scene___112645 = (r0);
-    r0 = s.scene___112645.fields["allSprites"];
-    s.kelpies___112648 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P112665);
+    s.scene___87482 = (r0);
+    r0 = s.scene___87482.fields["allSprites"];
+    s.kelpies___87485 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P87502);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2.arg0 = s.kelpies___112648;
-    s.tmp_2.arg1 = inline__P112655;
-    s.callLocIdx = 84; s.pc = 9; return s.tmp_2;
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2.arg0 = s.kelpies___87485;
+    s.tmp_2.arg1 = inline__P87492;
+    s.callLocIdx = 83; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 85; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 84; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.kelpies___112648 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P112682);
+    s.kelpies___87485 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P87519);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.srcHitboxBounds___112641);
-    s.tmp_1 = helpers_arraySort__P106712_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3.arg0 = s.kelpies___112648;
-    s.tmp_3.arg1 = inline__P112677;
-    s.callLocIdx = 87; s.pc = 12; return s.tmp_3;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.srcHitboxBounds___87478);
+    s.tmp_1 = helpers_arraySort__P81374_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3.arg0 = s.kelpies___87485;
+    s.tmp_3.arg1 = inline__P87514;
+    s.callLocIdx = 86; s.pc = 12; return s.tmp_3;
   case 12:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_0;
-    s.callLocIdx = 90; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 89; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P112691;
-    s.callLocIdx = 95; s.pc = 10; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P87528;
+    s.callLocIdx = 94; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.kelpies___112648 = (r0);
-    r0 = s.kelpies___112648;
+    s.kelpies___87485 = (r0);
+    r0 = s.kelpies___87485;
     return leave(s, r0)
   default: oops()
 } } }
-util_getAllOverlapping__P110085.info = {"start":1004,"length":869,"line":23,"column":4,"endLine":39,"endColumn":5,"fileName":"extras.ts","functionName":"getAllOverlapping","argumentNames":["src"]}
+util_getAllOverlapping__P84837.info = {"start":1004,"length":869,"line":23,"column":4,"endLine":39,"endColumn":5,"fileName":"extras.ts","functionName":"getAllOverlapping","argumentNames":["src"]}
 
-function util_getAllOverlapping__P110085_mk(s) {
+function util_getAllOverlapping__P84837_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_getAllOverlapping__P110085, depth: s.depth + 1,
+        parent: s, fn: util_getAllOverlapping__P84837, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13337,10 +13403,10 @@ function util_getAllOverlapping__P110085_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  srcHitbox___112631: undefined,
-  srcHitboxBounds___112641: undefined,
-  scene___112645: undefined,
-  kelpies___112648: undefined,
+  srcHitbox___87468: undefined,
+  srcHitboxBounds___87478: undefined,
+  scene___87482: undefined,
+  kelpies___87485: undefined,
   arg0: undefined,
 } }
 
@@ -13348,7 +13414,7 @@ function util_getAllOverlapping__P110085_mk(s) {
 
 
 
-function inline__P112655(s) {
+function inline__P87492(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13381,12 +13447,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P112655.info = {"start":1369,"length":65,"line":29,"column":20,"endLine":29,"endColumn":85,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
+inline__P87492.info = {"start":1369,"length":65,"line":29,"column":20,"endLine":29,"endColumn":85,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P112655_mk(s) {
+function inline__P87492_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P112655, depth: s.depth + 1,
+        parent: s, fn: inline__P87492, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13399,7 +13465,7 @@ function inline__P112655_mk(s) {
 
 
 
-function inline__P112665(s) {
+function inline__P87502(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13427,12 +13493,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P112665.info = {"start":1492,"length":31,"line":30,"column":20,"endLine":30,"endColumn":51,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
+inline__P87502.info = {"start":1492,"length":31,"line":30,"column":20,"endLine":30,"endColumn":51,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P112665_mk(s) {
+function inline__P87502_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P112665, depth: s.depth + 1,
+        parent: s, fn: inline__P87502, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13443,7 +13509,7 @@ function inline__P112665_mk(s) {
 
 
 
-function inline__P112677(s) {
+function inline__P87514(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13457,9 +13523,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = kodu_Kelpie_invisible__P110507_mk(s);
+    s.tmp_2 = kodu_Kelpie_invisible__P85290_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 86; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 85; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -13469,12 +13535,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P112677.info = {"start":1572,"length":25,"line":32,"column":20,"endLine":32,"endColumn":45,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
+inline__P87514.info = {"start":1572,"length":25,"line":32,"column":20,"endLine":32,"endColumn":45,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P112677_mk(s) {
+function inline__P87514_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P112677, depth: s.depth + 1,
+        parent: s, fn: inline__P87514, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13486,7 +13552,7 @@ function inline__P112677_mk(s) {
 
 
 
-function inline__P112682(s) {
+function inline__P87519(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13496,39 +13562,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.valHitboxBounds___112684 = undefined;
+    s.valHitboxBounds___87521 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(util_HitboxBounds__C110089_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(util_HitboxBounds__C84841_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = util_HitboxBounds_constructor__P110097_mk(s);
+    s.tmp_1 = util_HitboxBounds_constructor__P84849_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 88; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 87; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.valHitboxBounds___112684 = (s.tmp_0);
-    s.tmp_0 = util_hitboxBoundsOverlap__P110084_mk(s);
-    s.tmp_0.arg0 = s.valHitboxBounds___112684;
+    s.valHitboxBounds___87521 = (s.tmp_0);
+    s.tmp_0 = util_hitboxBoundsOverlap__P84836_mk(s);
+    s.tmp_0.arg0 = s.valHitboxBounds___87521;
     s.tmp_0.arg1 = s.caps[0];
-    s.callLocIdx = 89; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 88; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P112682.info = {"start":1619,"length":167,"line":33,"column":20,"endLine":36,"endColumn":13,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
+inline__P87519.info = {"start":1619,"length":167,"line":33,"column":20,"endLine":36,"endColumn":13,"fileName":"extras.ts","functionName":"inline","argumentNames":["value"]}
 
-function inline__P112682_mk(s) {
+function inline__P87519_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P112682, depth: s.depth + 1,
+        parent: s, fn: inline__P87519, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  valHitboxBounds___112684: undefined,
+  valHitboxBounds___87521: undefined,
   arg0: undefined,
 } }
 
@@ -13536,7 +13602,7 @@ function inline__P112682_mk(s) {
 
 
 
-function inline__P112691(s) {
+function inline__P87528(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13551,29 +13617,29 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = kodu_Kelpie_x__P110489_mk(s);
+    s.tmp_2 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 91; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 90; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = kodu_Kelpie_x__P110489_mk(s);
+    s.tmp_4 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_4.arg0 = s.arg1;
-    s.callLocIdx = 92; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 91; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_1 - s.tmp_3);
     s.tmp_0 = r0;
-    s.tmp_7 = kodu_Kelpie_y__P110491_mk(s);
+    s.tmp_7 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 93; s.pc = 3; return s.tmp_7;
+    s.callLocIdx = 92; s.pc = 3; return s.tmp_7;
   case 3:
     r0 = s.retval;
     s.tmp_6 = r0;
-    s.tmp_9 = kodu_Kelpie_y__P110491_mk(s);
+    s.tmp_9 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_9.arg0 = s.arg1;
-    s.callLocIdx = 94; s.pc = 4; return s.tmp_9;
+    s.callLocIdx = 93; s.pc = 4; return s.tmp_9;
   case 4:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -13583,12 +13649,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P112691.info = {"start":1806,"length":35,"line":37,"column":18,"endLine":37,"endColumn":53,"fileName":"extras.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P87528.info = {"start":1806,"length":35,"line":37,"column":18,"endLine":37,"endColumn":53,"fileName":"extras.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P112691_mk(s) {
+function inline__P87528_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P112691, depth: s.depth + 1,
+        parent: s, fn: inline__P87528, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13608,7 +13674,7 @@ function inline__P112691_mk(s) {
 
 
 
-function util_hitboxBoundsOverlap__P110084(s) {
+function util_hitboxBoundsOverlap__P84836(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13618,16 +13684,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dimA___112593 = undefined;
-    s.dimB___112600 = undefined;
-    s.maxSq___112607 = undefined;
-    s.distSq___112615 = undefined;
+    s.dimA___87430 = undefined;
+    s.dimB___87437 = undefined;
+    s.maxSq___87444 = undefined;
+    s.distSq___87452 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_max__P106734_mk(s);
+    s.tmp_0 = Math_max__P81398_mk(s);
     r0 = s.arg0.fields["right"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["left"];
@@ -13640,11 +13706,11 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 70; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 69; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.dimA___112593 = (r0);
-    s.tmp_0 = Math_max__P106734_mk(s);
+    s.dimA___87430 = (r0);
+    s.tmp_0 = Math_max__P81398_mk(s);
     r0 = s.arg1.fields["right"];
     s.tmp_1 = r0;
     r0 = s.arg1.fields["left"];
@@ -13657,39 +13723,39 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 73; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 72; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.dimB___112600 = (r0);
-    r0 = (s.dimA___112593 * s.dimA___112593);
+    s.dimB___87437 = (r0);
+    r0 = (s.dimA___87430 * s.dimA___87430);
     s.tmp_0 = r0;
-    r0 = (s.dimB___112600 * s.dimB___112600);
+    r0 = (s.dimB___87437 * s.dimB___87437);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.maxSq___112607 = (r0);
-    s.tmp_0 = kodu_Vec2_MagnitudeSq__P110426_mk(s);
-    s.tmp_1 = kodu_Vec2_Sub__P110417_mk(s);
-    s.tmp_2 = util_HitboxBounds_center__P110096_mk(s);
+    s.maxSq___87444 = (r0);
+    s.tmp_0 = kodu_Vec2_MagnitudeSq__P85209_mk(s);
+    s.tmp_1 = kodu_Vec2_Sub__P85200_mk(s);
+    s.tmp_2 = util_HitboxBounds_center__P84848_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 74; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 73; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_3 = util_HitboxBounds_center__P110096_mk(s);
+    s.tmp_3 = util_HitboxBounds_center__P84848_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 75; s.pc = 9; return s.tmp_3;
+    s.callLocIdx = 74; s.pc = 9; return s.tmp_3;
   case 9:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 76; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 75; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 77; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 76; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.distSq___112615 = (r0);
-    r0 = (s.distSq___112615 > s.maxSq___112607);
+    s.distSq___87452 = (r0);
+    r0 = (s.distSq___87452 > s.maxSq___87444);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -13697,32 +13763,32 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_1 = util_HitboxBounds_Intersects__P110098_mk(s);
+    s.tmp_1 = util_HitboxBounds_Intersects__P84850_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 78; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 77; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-util_hitboxBoundsOverlap__P110084.info = {"start":548,"length":450,"line":13,"column":4,"endLine":21,"endColumn":5,"fileName":"extras.ts","functionName":"hitboxBoundsOverlap","argumentNames":["a","b"]}
+util_hitboxBoundsOverlap__P84836.info = {"start":548,"length":450,"line":13,"column":4,"endLine":21,"endColumn":5,"fileName":"extras.ts","functionName":"hitboxBoundsOverlap","argumentNames":["a","b"]}
 
-function util_hitboxBoundsOverlap__P110084_mk(s) {
+function util_hitboxBoundsOverlap__P84836_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_hitboxBoundsOverlap__P110084, depth: s.depth + 1,
+        parent: s, fn: util_hitboxBoundsOverlap__P84836, 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,
-  dimA___112593: undefined,
-  dimB___112600: undefined,
-  maxSq___112607: undefined,
-  distSq___112615: undefined,
+  dimA___87430: undefined,
+  dimB___87437: undefined,
+  maxSq___87444: undefined,
+  distSq___87452: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -13731,7 +13797,7 @@ function util_hitboxBoundsOverlap__P110084_mk(s) {
 
 
 
-function util_HitboxBounds_Intersects__P110098(s) {
+function util_HitboxBounds_Intersects__P84850(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13746,13 +13812,13 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_1 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg0.fields["left"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["top"];
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = s.arg1;
-    s.callLocIdx = 106; s.pc = 18; return s.tmp_1;
+    s.callLocIdx = 105; s.pc = 18; return s.tmp_1;
   case 18:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -13762,13 +13828,13 @@ switch (step) {
     { step = 17; continue; }
   case 1:
   case 2:
-    s.tmp_3 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_3 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg0.fields["right"];
     s.tmp_3.arg0 = r0;
     r0 = s.arg0.fields["top"];
     s.tmp_3.arg1 = r0;
     s.tmp_3.arg2 = s.arg1;
-    s.callLocIdx = 107; s.pc = 19; return s.tmp_3;
+    s.callLocIdx = 106; s.pc = 19; return s.tmp_3;
   case 19:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -13778,13 +13844,13 @@ switch (step) {
     { step = 17; continue; }
   case 3:
   case 4:
-    s.tmp_5 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_5 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg0.fields["left"];
     s.tmp_5.arg0 = r0;
     r0 = s.arg0.fields["bottom"];
     s.tmp_5.arg1 = r0;
     s.tmp_5.arg2 = s.arg1;
-    s.callLocIdx = 108; s.pc = 20; return s.tmp_5;
+    s.callLocIdx = 107; s.pc = 20; return s.tmp_5;
   case 20:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -13794,13 +13860,13 @@ switch (step) {
     { step = 17; continue; }
   case 5:
   case 6:
-    s.tmp_7 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_7 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg0.fields["right"];
     s.tmp_7.arg0 = r0;
     r0 = s.arg0.fields["bottom"];
     s.tmp_7.arg1 = r0;
     s.tmp_7.arg2 = s.arg1;
-    s.callLocIdx = 109; s.pc = 21; return s.tmp_7;
+    s.callLocIdx = 108; s.pc = 21; return s.tmp_7;
   case 21:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -13810,13 +13876,13 @@ switch (step) {
     { step = 17; continue; }
   case 7:
   case 8:
-    s.tmp_9 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_9 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg1.fields["left"];
     s.tmp_9.arg0 = r0;
     r0 = s.arg1.fields["top"];
     s.tmp_9.arg1 = r0;
     s.tmp_9.arg2 = s.arg0;
-    s.callLocIdx = 110; s.pc = 22; return s.tmp_9;
+    s.callLocIdx = 109; s.pc = 22; return s.tmp_9;
   case 22:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -13826,13 +13892,13 @@ switch (step) {
     { step = 17; continue; }
   case 9:
   case 10:
-    s.tmp_11 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_11 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg1.fields["right"];
     s.tmp_11.arg0 = r0;
     r0 = s.arg1.fields["top"];
     s.tmp_11.arg1 = r0;
     s.tmp_11.arg2 = s.arg0;
-    s.callLocIdx = 111; s.pc = 23; return s.tmp_11;
+    s.callLocIdx = 110; s.pc = 23; return s.tmp_11;
   case 23:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -13842,13 +13908,13 @@ switch (step) {
     { step = 17; continue; }
   case 11:
   case 12:
-    s.tmp_13 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_13 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg1.fields["left"];
     s.tmp_13.arg0 = r0;
     r0 = s.arg1.fields["bottom"];
     s.tmp_13.arg1 = r0;
     s.tmp_13.arg2 = s.arg0;
-    s.callLocIdx = 112; s.pc = 24; return s.tmp_13;
+    s.callLocIdx = 111; s.pc = 24; return s.tmp_13;
   case 24:
     r0 = s.retval;
     s.tmp_12 = r0;
@@ -13858,13 +13924,13 @@ switch (step) {
     { step = 17; continue; }
   case 13:
   case 14:
-    s.tmp_15 = util_pointInHitboxBounds__P110082_mk(s);
+    s.tmp_15 = util_pointInHitboxBounds__P84834_mk(s);
     r0 = s.arg1.fields["right"];
     s.tmp_15.arg0 = r0;
     r0 = s.arg1.fields["bottom"];
     s.tmp_15.arg1 = r0;
     s.tmp_15.arg2 = s.arg0;
-    s.callLocIdx = 113; s.pc = 25; return s.tmp_15;
+    s.callLocIdx = 112; s.pc = 25; return s.tmp_15;
   case 25:
     r0 = s.retval;
     s.tmp_14 = r0;
@@ -13879,12 +13945,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-util_HitboxBounds_Intersects__P110098.info = {"start":2896,"length":697,"line":72,"column":8,"endLine":82,"endColumn":9,"fileName":"extras.ts","functionName":"Intersects","argumentNames":["a","b"]}
+util_HitboxBounds_Intersects__P84850.info = {"start":2896,"length":697,"line":72,"column":8,"endLine":82,"endColumn":9,"fileName":"extras.ts","functionName":"Intersects","argumentNames":["a","b"]}
 
-function util_HitboxBounds_Intersects__P110098_mk(s) {
+function util_HitboxBounds_Intersects__P84850_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_HitboxBounds_Intersects__P110098, depth: s.depth + 1,
+        parent: s, fn: util_HitboxBounds_Intersects__P84850, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13910,7 +13976,7 @@ function util_HitboxBounds_Intersects__P110098_mk(s) {
 
 
 
-function util_pointInHitboxBounds__P110082(s) {
+function util_pointInHitboxBounds__P84834(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13967,12 +14033,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-util_pointInHitboxBounds__P110082.info = {"start":61,"length":199,"line":3,"column":4,"endLine":5,"endColumn":5,"fileName":"extras.ts","functionName":"pointInHitboxBounds","argumentNames":["x","y","bounds"]}
+util_pointInHitboxBounds__P84834.info = {"start":61,"length":199,"line":3,"column":4,"endLine":5,"endColumn":5,"fileName":"extras.ts","functionName":"pointInHitboxBounds","argumentNames":["x","y","bounds"]}
 
-function util_pointInHitboxBounds__P110082_mk(s) {
+function util_pointInHitboxBounds__P84834_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_pointInHitboxBounds__P110082, depth: s.depth + 1,
+        parent: s, fn: util_pointInHitboxBounds__P84834, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13991,7 +14057,7 @@ function util_pointInHitboxBounds__P110082_mk(s) {
 
 
 
-function util_HitboxBounds_center__P110096(s) {
+function util_HitboxBounds_center__P84848(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14006,8 +14072,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, util_HitboxBounds__C110089_VT)) failedCast(r0);
-    s.tmp_0 = kodu_mkVec2__P110429_mk(s);
+    if (!checkSubtype(r0, util_HitboxBounds__C84841_VT)) failedCast(r0);
+    s.tmp_0 = kodu_mkVec2__P85212_mk(s);
     r0 = s.arg0.fields["left"];
     s.tmp_2 = r0;
     r0 = s.arg0.fields["right"];
@@ -14024,19 +14090,19 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 96; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 95; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-util_HitboxBounds_center__P110096.info = {"start":2457,"length":109,"line":62,"column":8,"endLine":62,"endColumn":117,"fileName":"extras.ts","functionName":"center","argumentNames":["this"]}
-util_HitboxBounds_center__P110096.isGetter = true;
+util_HitboxBounds_center__P84848.info = {"start":2457,"length":109,"line":62,"column":8,"endLine":62,"endColumn":117,"fileName":"extras.ts","functionName":"center","argumentNames":["this"]}
+util_HitboxBounds_center__P84848.isGetter = true;
 
-function util_HitboxBounds_center__P110096_mk(s) {
+function util_HitboxBounds_center__P84848_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_HitboxBounds_center__P110096, depth: s.depth + 1,
+        parent: s, fn: util_HitboxBounds_center__P84848, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14052,7 +14118,7 @@ function util_HitboxBounds_center__P110096_mk(s) {
 
 
 
-function kodu_Vec2_MagnitudeSq__P110426(s) {
+function kodu_Vec2_MagnitudeSq__P85209(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14082,12 +14148,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_MagnitudeSq__P110426.info = {"start":1782,"length":98,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"vec2.ts","functionName":"MagnitudeSq","argumentNames":["v"]}
+kodu_Vec2_MagnitudeSq__P85209.info = {"start":1782,"length":98,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"vec2.ts","functionName":"MagnitudeSq","argumentNames":["v"]}
 
-function kodu_Vec2_MagnitudeSq__P110426_mk(s) {
+function kodu_Vec2_MagnitudeSq__P85209_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_MagnitudeSq__P110426, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_MagnitudeSq__P85209, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14102,7 +14168,7 @@ function kodu_Vec2_MagnitudeSq__P110426_mk(s) {
 
 
 
-function util_HitboxBounds_height__P110095(s) {
+function util_HitboxBounds_height__P84847(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14117,7 +14183,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, util_HitboxBounds__C110089_VT)) failedCast(r0);
+    if (!checkSubtype(r0, util_HitboxBounds__C84841_VT)) failedCast(r0);
     r0 = s.arg0.fields["bottom"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["top"];
@@ -14126,13 +14192,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-util_HitboxBounds_height__P110095.info = {"start":2393,"length":55,"line":61,"column":8,"endLine":61,"endColumn":63,"fileName":"extras.ts","functionName":"height","argumentNames":["this"]}
-util_HitboxBounds_height__P110095.isGetter = true;
+util_HitboxBounds_height__P84847.info = {"start":2393,"length":55,"line":61,"column":8,"endLine":61,"endColumn":63,"fileName":"extras.ts","functionName":"height","argumentNames":["this"]}
+util_HitboxBounds_height__P84847.isGetter = true;
 
-function util_HitboxBounds_height__P110095_mk(s) {
+function util_HitboxBounds_height__P84847_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_HitboxBounds_height__P110095, depth: s.depth + 1,
+        parent: s, fn: util_HitboxBounds_height__P84847, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14143,7 +14209,7 @@ function util_HitboxBounds_height__P110095_mk(s) {
 
 
 
-function util_HitboxBounds_width__P110094(s) {
+function util_HitboxBounds_width__P84846(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14158,7 +14224,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, util_HitboxBounds__C110089_VT)) failedCast(r0);
+    if (!checkSubtype(r0, util_HitboxBounds__C84841_VT)) failedCast(r0);
     r0 = s.arg0.fields["right"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["left"];
@@ -14167,13 +14233,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-util_HitboxBounds_width__P110094.info = {"start":2330,"length":54,"line":60,"column":8,"endLine":60,"endColumn":62,"fileName":"extras.ts","functionName":"width","argumentNames":["this"]}
-util_HitboxBounds_width__P110094.isGetter = true;
+util_HitboxBounds_width__P84846.info = {"start":2330,"length":54,"line":60,"column":8,"endLine":60,"endColumn":62,"fileName":"extras.ts","functionName":"width","argumentNames":["this"]}
+util_HitboxBounds_width__P84846.isGetter = true;
 
-function util_HitboxBounds_width__P110094_mk(s) {
+function util_HitboxBounds_width__P84846_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_HitboxBounds_width__P110094, depth: s.depth + 1,
+        parent: s, fn: util_HitboxBounds_width__P84846, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14184,7 +14250,7 @@ function util_HitboxBounds_width__P110094_mk(s) {
 
 
 
-function Math_max__P106734(s) {
+function Math_max__P81398(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14212,12 +14278,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_max__P106734.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__P81398.info = {"start":16099,"length":105,"line":542,"column":4,"endLine":545,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"max","argumentNames":["a","b"]}
 
-function Math_max__P106734_mk(s) {
+function Math_max__P81398_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_max__P106734, depth: s.depth + 1,
+        parent: s, fn: Math_max__P81398, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -14228,7 +14294,7 @@ function Math_max__P106734_mk(s) {
 
 
 
-function kodu_Kelpie_invisible__P110507(s) {
+function kodu_Kelpie_invisible__P85290(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14243,7 +14309,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = s.arg0.fields["_flags"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 & 1);
@@ -14258,13 +14324,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_invisible__P110507.info = {"start":2443,"length":67,"line":91,"column":8,"endLine":91,"endColumn":75,"fileName":"kelpie.ts","functionName":"invisible","argumentNames":["this"]}
-kodu_Kelpie_invisible__P110507.isGetter = true;
+kodu_Kelpie_invisible__P85290.info = {"start":2443,"length":67,"line":91,"column":8,"endLine":91,"endColumn":75,"fileName":"kelpie.ts","functionName":"invisible","argumentNames":["this"]}
+kodu_Kelpie_invisible__P85290.isGetter = true;
 
-function kodu_Kelpie_invisible__P110507_mk(s) {
+function kodu_Kelpie_invisible__P85290_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_invisible__P110507, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_invisible__P85290, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14278,7 +14344,7 @@ function kodu_Kelpie_invisible__P110507_mk(s) {
 
 
 
-function util_HitboxBounds_constructor__P110097(s) {
+function util_HitboxBounds_constructor__P84849(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14288,17 +14354,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.box___112753 = undefined;
+    s.box___87590 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, util_HitboxBounds__C110089_VT)) failedCast(r0);
-    s.tmp_2 = kodu_Kelpie_data__P110501_mk(s);
+    if (!checkSubtype(r0, util_HitboxBounds__C84841_VT)) failedCast(r0);
+    s.tmp_2 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 97; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 96; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -14309,15 +14375,15 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_4 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_4 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_4.arg0 = s.arg1;
-    s.callLocIdx = 98; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 97; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_6 = util_calculateHitbox__P110099_mk(s);
+    s.tmp_6 = util_calculateHitbox__P84851_mk(s);
     s.tmp_6.arg0 = s.arg1;
-    s.callLocIdx = 99; s.pc = 5; return s.tmp_6;
+    s.callLocIdx = 98; s.pc = 5; return s.tmp_6;
   case 5:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -14326,23 +14392,23 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.box___112753 = (s.tmp_7);
+    s.box___87590 = (s.tmp_7);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = kodu_Kelpie_x__P110489_mk(s);
+    s.tmp_3 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 100; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 99; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2 = r0;
     s.tmp_5 = if_minX_1_mk(s);
-    s.tmp_5.arg0 = s.box___112753;
+    s.tmp_5.arg0 = s.box___87590;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "minX");
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["minX"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["minX"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 101; s.pc = 7; return s.tmp_5; }
+     else { s.callLocIdx = 100; s.pc = 7; return s.tmp_5; }
     }
   case 7:
     r0 = s.retval;
@@ -14351,21 +14417,21 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["left"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = kodu_Kelpie_y__P110491_mk(s);
+    s.tmp_3 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 102; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 101; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
     s.tmp_5 = if_minY_1_mk(s);
-    s.tmp_5.arg0 = s.box___112753;
+    s.tmp_5.arg0 = s.box___87590;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "minY");
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["minY"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["minY"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 103; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 102; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
@@ -14377,14 +14443,14 @@ switch (step) {
     r0 = s.arg0.fields["left"];
     s.tmp_2 = r0;
     s.tmp_4 = if_width_1_mk(s);
-    s.tmp_4.arg0 = s.box___112753;
+    s.tmp_4.arg0 = s.box___87590;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "width");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["width"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["width"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 104; s.pc = 10; return s.tmp_4; }
+     else { s.callLocIdx = 103; s.pc = 10; return s.tmp_4; }
     }
   case 10:
     r0 = s.retval;
@@ -14396,14 +14462,14 @@ switch (step) {
     r0 = s.arg0.fields["top"];
     s.tmp_2 = r0;
     s.tmp_4 = if_height_1_mk(s);
-    s.tmp_4.arg0 = s.box___112753;
+    s.tmp_4.arg0 = s.box___87590;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "height");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["height"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["height"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 105; s.pc = 11; return s.tmp_4; }
+     else { s.callLocIdx = 104; s.pc = 11; return s.tmp_4; }
     }
   case 11:
     r0 = s.retval;
@@ -14415,12 +14481,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-util_HitboxBounds_constructor__P110097.info = {"start":2584,"length":302,"line":64,"column":8,"endLine":70,"endColumn":9,"fileName":"extras.ts","functionName":"inline","argumentNames":["this","s"]}
+util_HitboxBounds_constructor__P84849.info = {"start":2584,"length":302,"line":64,"column":8,"endLine":70,"endColumn":9,"fileName":"extras.ts","functionName":"inline","argumentNames":["this","s"]}
 
-function util_HitboxBounds_constructor__P110097_mk(s) {
+function util_HitboxBounds_constructor__P84849_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_HitboxBounds_constructor__P110097, depth: s.depth + 1,
+        parent: s, fn: util_HitboxBounds_constructor__P84849, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14430,7 +14496,7 @@ function util_HitboxBounds_constructor__P110097_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  box___112753: undefined,
+  box___87590: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -14439,7 +14505,7 @@ function util_HitboxBounds_constructor__P110097_mk(s) {
 
 
 
-function util_calculateHitbox__P110099(s) {
+function util_calculateHitbox__P84851(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14449,131 +14515,131 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___112846 = undefined;
-    s.minX___112849 = undefined;
-    s.minY___112852 = undefined;
-    s.maxX___112855 = undefined;
-    s.maxY___112856 = undefined;
-    s.c___112857 = undefined;
-    s.r___112863 = undefined;
-    s.width___112894 = undefined;
-    s.height___112900 = undefined;
+    s.i___87683 = undefined;
+    s.minX___87686 = undefined;
+    s.minY___87689 = undefined;
+    s.maxX___87692 = undefined;
+    s.maxY___87693 = undefined;
+    s.c___87694 = undefined;
+    s.r___87700 = undefined;
+    s.width___87731 = undefined;
+    s.height___87737 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0.fields["_image"];
-    s.i___112846 = (r0);
-    r0 = pxsim_ImageMethods.width(s.i___112846);
-    s.minX___112849 = (r0);
-    r0 = pxsim_ImageMethods.height(s.i___112846);
-    s.minY___112852 = (r0);
-    s.maxX___112855 = (0);
-    s.maxY___112856 = (0);
-    s.c___112857 = (0);
-  case 1:
-    s.tmp_1 = r0 = s.c___112857;
-    r0 = pxsim_ImageMethods.width(s.i___112846);
+    s.i___87683 = (r0);
+    r0 = pxsim_ImageMethods.width(s.i___87683);
+    s.minX___87686 = (r0);
+    r0 = pxsim_ImageMethods.height(s.i___87683);
+    s.minY___87689 = (r0);
+    s.maxX___87692 = (0);
+    s.maxY___87693 = (0);
+    s.c___87694 = (0);
+  case 1:
+    s.tmp_1 = r0 = s.c___87694;
+    r0 = pxsim_ImageMethods.width(s.i___87683);
     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___112863 = (0);
+    s.r___87700 = (0);
   case 2:
-    s.tmp_1 = r0 = s.r___112863;
-    r0 = pxsim_ImageMethods.height(s.i___112846);
+    s.tmp_1 = r0 = s.r___87700;
+    r0 = pxsim_ImageMethods.height(s.i___87683);
     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___112846, s.c___112857, s.r___112863);
+    r0 = pxsim_ImageMethods.getPixel(s.i___87683, s.c___87694, s.r___87700);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = Math_min__P106735_mk(s);
-    s.tmp_4.arg0 = s.minX___112849;
-    s.tmp_4.arg1 = s.c___112857;
-    s.callLocIdx = 115; s.pc = 7; return s.tmp_4;
+    s.tmp_4 = Math_min__P81399_mk(s);
+    s.tmp_4.arg0 = s.minX___87686;
+    s.tmp_4.arg1 = s.c___87694;
+    s.callLocIdx = 114; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
-    s.minX___112849 = (r0);
-    s.tmp_0 = Math_min__P106735_mk(s);
-    s.tmp_0.arg0 = s.minY___112852;
-    s.tmp_0.arg1 = s.r___112863;
-    s.callLocIdx = 116; s.pc = 8; return s.tmp_0;
+    s.minX___87686 = (r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
+    s.tmp_0.arg0 = s.minY___87689;
+    s.tmp_0.arg1 = s.r___87700;
+    s.callLocIdx = 115; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.minY___112852 = (r0);
-    s.tmp_0 = Math_max__P106734_mk(s);
-    s.tmp_0.arg0 = s.maxX___112855;
-    s.tmp_0.arg1 = s.c___112857;
-    s.callLocIdx = 117; s.pc = 9; return s.tmp_0;
+    s.minY___87689 = (r0);
+    s.tmp_0 = Math_max__P81398_mk(s);
+    s.tmp_0.arg0 = s.maxX___87692;
+    s.tmp_0.arg1 = s.c___87694;
+    s.callLocIdx = 116; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.maxX___112855 = (r0);
-    s.tmp_0 = Math_max__P106734_mk(s);
-    s.tmp_0.arg0 = s.maxY___112856;
-    s.tmp_0.arg1 = s.r___112863;
-    s.callLocIdx = 118; s.pc = 10; return s.tmp_0;
+    s.maxX___87692 = (r0);
+    s.tmp_0 = Math_max__P81398_mk(s);
+    s.tmp_0.arg0 = s.maxY___87693;
+    s.tmp_0.arg1 = s.r___87700;
+    s.callLocIdx = 117; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.maxY___112856 = (r0);
+    s.maxY___87693 = (r0);
   case 3:
   case 4:
-    r0 = (s.r___112863 + 1);
-    s.r___112863 = (r0);
+    r0 = (s.r___87700 + 1);
+    s.r___87700 = (r0);
     { step = 2; continue; }
   case 5:
-    r0 = (s.c___112857 + 1);
-    s.c___112857 = (r0);
+    r0 = (s.c___87694 + 1);
+    s.c___87694 = (r0);
     { step = 1; continue; }
   case 6:
-    r0 = (s.maxX___112855 - s.minX___112849);
+    r0 = (s.maxX___87692 - s.minX___87686);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.width___112894 = (r0);
-    r0 = (s.maxY___112856 - s.minY___112852);
+    s.width___87731 = (r0);
+    r0 = (s.maxY___87693 - s.minY___87689);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.height___112900 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(util_Hitbox__C110087_VT);
+    s.height___87737 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(util_Hitbox__C84839_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = util_Hitbox_constructor__P110088_mk(s);
+    s.tmp_1 = util_Hitbox_constructor__P84840_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.width___112894;
-    s.tmp_1.arg2 = s.height___112900;
-    s.tmp_1.arg3 = s.minX___112849;
-    s.tmp_1.arg4 = s.minY___112852;
-    s.callLocIdx = 119; s.pc = 11; return s.tmp_1;
+    s.tmp_1.arg1 = s.width___87731;
+    s.tmp_1.arg2 = s.height___87737;
+    s.tmp_1.arg3 = s.minX___87686;
+    s.tmp_1.arg4 = s.minY___87689;
+    s.callLocIdx = 118; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-util_calculateHitbox__P110099.info = {"start":3605,"length":686,"line":85,"column":4,"endLine":107,"endColumn":5,"fileName":"extras.ts","functionName":"calculateHitbox","argumentNames":["s"]}
+util_calculateHitbox__P84851.info = {"start":3605,"length":686,"line":85,"column":4,"endLine":107,"endColumn":5,"fileName":"extras.ts","functionName":"calculateHitbox","argumentNames":["s"]}
 
-function util_calculateHitbox__P110099_mk(s) {
+function util_calculateHitbox__P84851_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_calculateHitbox__P110099, depth: s.depth + 1,
+        parent: s, fn: util_calculateHitbox__P84851, 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___112846: undefined,
-  minX___112849: undefined,
-  minY___112852: undefined,
-  maxX___112855: undefined,
-  maxY___112856: undefined,
-  c___112857: undefined,
-  r___112863: undefined,
-  width___112894: undefined,
-  height___112900: undefined,
+  i___87683: undefined,
+  minX___87686: undefined,
+  minY___87689: undefined,
+  maxX___87692: undefined,
+  maxY___87693: undefined,
+  c___87694: undefined,
+  r___87700: undefined,
+  width___87731: undefined,
+  height___87737: undefined,
   arg0: undefined,
 } }
 
@@ -14581,7 +14647,7 @@ function util_calculateHitbox__P110099_mk(s) {
 
 
 
-function util_Hitbox_constructor__P110088(s) {
+function util_Hitbox_constructor__P84840(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14600,7 +14666,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, util_Hitbox__C110087_VT)) failedCast(r0);
+    if (!checkSubtype(r0, util_Hitbox__C84839_VT)) failedCast(r0);
     r0 = (s.arg0).fields["width"] = (s.arg1);
     r0 = (s.arg0).fields["height"] = (s.arg2);
     r0 = (s.arg0).fields["minX"] = (s.arg3);
@@ -14609,12 +14675,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-util_Hitbox_constructor__P110088.info = {"start":2041,"length":150,"line":47,"column":8,"endLine":51,"endColumn":35,"fileName":"extras.ts","functionName":"inline","argumentNames":["this","width","height","minX","minY"]}
+util_Hitbox_constructor__P84840.info = {"start":2041,"length":150,"line":47,"column":8,"endLine":51,"endColumn":35,"fileName":"extras.ts","functionName":"inline","argumentNames":["this","width","height","minX","minY"]}
 
-function util_Hitbox_constructor__P110088_mk(s) {
+function util_Hitbox_constructor__P84840_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_Hitbox_constructor__P110088, depth: s.depth + 1,
+        parent: s, fn: util_Hitbox_constructor__P84840, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -14627,7 +14693,7 @@ function util_Hitbox_constructor__P110088_mk(s) {
 
 
 
-function Math_min__P106735(s) {
+function Math_min__P81399(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14655,12 +14721,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_min__P106735.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__P81399.info = {"start":16314,"length":105,"line":551,"column":4,"endLine":554,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"min","argumentNames":["a","b"]}
 
-function Math_min__P106735_mk(s) {
+function Math_min__P81399_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_min__P106735, depth: s.depth + 1,
+        parent: s, fn: Math_min__P81399, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -14671,7 +14737,7 @@ function Math_min__P106735_mk(s) {
 
 
 
-function kodu_Kelpie_image__P110503(s) {
+function kodu_Kelpie_image__P85286(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14686,18 +14752,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_image__P110503.info = {"start":1992,"length":62,"line":78,"column":8,"endLine":80,"endColumn":9,"fileName":"kelpie.ts","functionName":"image","argumentNames":["this"]}
-kodu_Kelpie_image__P110503.isGetter = true;
+kodu_Kelpie_image__P85286.info = {"start":1992,"length":62,"line":78,"column":8,"endLine":80,"endColumn":9,"fileName":"kelpie.ts","functionName":"image","argumentNames":["this"]}
+kodu_Kelpie_image__P85286.isGetter = true;
 
-function kodu_Kelpie_image__P110503_mk(s) {
+function kodu_Kelpie_image__P85286_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_image__P110503, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_image__P85286, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -14706,7 +14772,7 @@ function kodu_Kelpie_image__P110503_mk(s) {
 
 
 
-function controller_Button_onEvent__P108407(s) {
+function controller_Button_onEvent__P83183(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14723,26 +14789,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
-    s.tmp_0 = control_onEvent__P106989_mk(s);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
+    s.tmp_0 = control_onEvent__P81653_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 = 179; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 188; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_onEvent__P108407.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"]}
+controller_Button_onEvent__P83183.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"]}
 
-function controller_Button_onEvent__P108407_mk(s) {
+function controller_Button_onEvent__P83183_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_onEvent__P108407, depth: s.depth + 1,
+        parent: s, fn: controller_Button_onEvent__P83183, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -14754,7 +14820,7 @@ function controller_Button_onEvent__P108407_mk(s) {
 
 
 
-function control_onEvent__P106989(s) {
+function control_onEvent__P81653(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14764,7 +14830,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___121518 = undefined;
+    s.ctx___96849 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -14772,12 +14838,12 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = control_eventContext__P107006_mk(s);
+    s.tmp_0 = control_eventContext__P81670_mk(s);
     s.callLocIdx = 85; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.ctx___121518 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___121518);
+    s.ctx___96849 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___96849);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -14786,8 +14852,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__P107003_mk(s);
-    s.tmp_0.arg0 = s.ctx___121518;
+    s.tmp_0 = control_EventContext_registerHandler__P81667_mk(s);
+    s.tmp_0.arg0 = s.ctx___96849;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg2;
@@ -14800,16 +14866,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_onEvent__P106989.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__P81653.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__P106989_mk(s) {
+function control_onEvent__P81653_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_onEvent__P106989, depth: s.depth + 1,
+        parent: s, fn: control_onEvent__P81653, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  ctx___121518: undefined,
+  ctx___96849: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -14820,7 +14886,7 @@ function control_onEvent__P106989_mk(s) {
 
 
 
-function control_eventContext__P107006(s) {
+function control_eventContext__P81670(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14830,10 +14896,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___110597);
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___85381);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = r0 = globals.eventContexts___110597;
-    r0 = pxsim_Array__length(globals.eventContexts___110597);
+    s.tmp_0 = r0 = globals.eventContexts___85381;
+    r0 = pxsim_Array__length(globals.eventContexts___85381);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_1 = r0;
@@ -14848,12 +14914,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_eventContext__P107006.info = {"start":6907,"length":136,"line":209,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
+control_eventContext__P81670.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__P107006_mk(s) {
+function control_eventContext__P81670_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_eventContext__P107006, depth: s.depth + 1,
+        parent: s, fn: control_eventContext__P81670, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14865,7 +14931,7 @@ function control_eventContext__P107006_mk(s) {
 
 
 
-function control_EventContext_registerHandler__P107003(s) {
+function control_EventContext_registerHandler__P81667(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14875,10 +14941,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___121541 = undefined;
-    s.unnamed16742___U1 = undefined;
-    s.unnamed16743___U2 = undefined;
-    s.hn___121564 = undefined;
+    s.h___96872 = undefined;
+    s.unnamed1794___U1 = undefined;
+    s.unnamed1795___U2 = undefined;
+    s.hn___96895 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -14888,20 +14954,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
-    s.h___121541 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C81657_VT)) failedCast(r0);
+    s.h___96872 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed16742___U1 = (r0);
-    s.unnamed16743___U2 = (0);
+    s.unnamed1794___U1 = (r0);
+    s.unnamed1795___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16743___U2;
-    r0 = pxsim_Array__length(s.unnamed16742___U1);
+    s.tmp_0 = r0 = s.unnamed1795___U2;
+    r0 = pxsim_Array__length(s.unnamed1794___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16742___U1, s.unnamed16743___U2);
-    s.h___121541 = (r0);
-    r0 = s.h___121541.fields["src"];
+    r0 = pxsim_Array__getAt(s.unnamed1794___U1, s.unnamed1795___U2);
+    s.h___96872 = (r0);
+    r0 = s.h___96872.fields["src"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 == s.arg1);
     s.tmp_2 = r0;
@@ -14910,7 +14976,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    r0 = s.h___121541.fields["value"];
+    r0 = s.h___96872.fields["value"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 == s.arg2);
   case 3:
@@ -14918,19 +14984,19 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 4; continue; }
-    r0 = (s.h___121541).fields["flags"] = (s.arg4);
-    r0 = (s.h___121541).fields["handler"] = (s.arg3);
+    r0 = (s.h___96872).fields["flags"] = (s.arg4);
+    r0 = (s.h___96872).fields["handler"] = (s.arg3);
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed16743___U2 + 1);
-    s.unnamed16743___U2 = (r0);
+    r0 = (s.unnamed1795___U2 + 1);
+    s.unnamed1795___U2 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed16742___U1 = (undefined);
-    r0 = pxsim_pxtcore_mkClassInstance(control_EventHandler__C110589_VT);
+    s.unnamed1794___U1 = (undefined);
+    r0 = pxsim_pxtcore_mkClassInstance(control_EventHandler__C85373_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_EventHandler_constructor__P110592_mk(s);
+    s.tmp_1 = control_EventHandler_constructor__P85376_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
@@ -14939,12 +15005,12 @@ switch (step) {
     s.callLocIdx = 98; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.hn___121564 = (s.tmp_0);
+    s.hn___96895 = (s.tmp_0);
     r0 = s.arg0.fields["handlers"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.hn___121564);
-    s.tmp_0 = control_EventHandler_register__P110590_mk(s);
-    s.tmp_0.arg0 = s.hn___121564;
+    r0 = pxsim_Array__push(s.tmp_0, s.hn___96895);
+    s.tmp_0 = control_EventHandler_register__P85374_mk(s);
+    s.tmp_0.arg0 = s.hn___96895;
     s.callLocIdx = 99; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
@@ -14953,12 +15019,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerHandler__P107003.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__P81667.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__P107003_mk(s) {
+function control_EventContext_registerHandler__P81667_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerHandler__P107003, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerHandler__P81667, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14966,10 +15032,10 @@ function control_EventContext_registerHandler__P107003_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  h___121541: undefined,
-  unnamed16742___U1: undefined,
-  unnamed16743___U2: undefined,
-  hn___121564: undefined,
+  h___96872: undefined,
+  unnamed1794___U1: undefined,
+  unnamed1795___U2: undefined,
+  hn___96895: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -14981,7 +15047,7 @@ function control_EventContext_registerHandler__P107003_mk(s) {
 
 
 
-function control_EventHandler_constructor__P110592(s) {
+function control_EventHandler_constructor__P85376(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15000,7 +15066,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C110589_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventHandler__C85373_VT)) failedCast(r0);
     r0 = (s.arg0).fields["src"] = (s.arg1);
     r0 = (s.arg0).fields["value"] = (s.arg2);
     r0 = (s.arg0).fields["handler"] = (s.arg3);
@@ -15009,12 +15075,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_constructor__P110592.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__P85376.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__P110592_mk(s) {
+function control_EventHandler_constructor__P85376_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_constructor__P110592, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_constructor__P85376, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -15027,7 +15093,7 @@ function control_EventHandler_constructor__P110592_mk(s) {
 
 
 
-function control_EventHandler_register__P110590(s) {
+function control_EventHandler_register__P85374(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15042,8 +15108,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C110589_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P121585);
+    if (!checkSubtype(r0, control_EventHandler__C85373_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96916);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = s.arg0.fields["src"];
@@ -15057,12 +15123,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_register__P110590.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__P85374.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__P110590_mk(s) {
+function control_EventHandler_register__P85374_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_register__P110590, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_register__P85374, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15075,7 +15141,7 @@ function control_EventHandler_register__P110590_mk(s) {
 
 
 
-function inline__P121585(s) {
+function inline__P96916(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15108,12 +15174,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P121585.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+inline__P96916.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P121585_mk(s) {
+function inline__P96916_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P121585, depth: s.depth + 1,
+        parent: s, fn: inline__P96916, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15123,7 +15189,7 @@ function inline__P121585_mk(s) {
 
 
 
-function kodu_Cursor_constructor__P549571(s) {
+function kodu_Cursor_constructor__P84990(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15139,92 +15205,92 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "cursor";
-    s.callLocIdx = 321; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 320; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C110487_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C85270_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Kelpie_constructor__P110509_mk(s);
+    s.tmp_1 = kodu_Kelpie_constructor__P85292_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = kodu_icons_get__P110155_mk(s);
+    s.tmp_2 = kodu_icons_get__P84907_mk(s);
     s.tmp_2.arg0 = "cursor";
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 322; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 321; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 323; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 322; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["kel0"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C110487_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C85270_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Kelpie_constructor__P110509_mk(s);
+    s.tmp_1 = kodu_Kelpie_constructor__P85292_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = kodu_icons_get__P110155_mk(s);
+    s.tmp_2 = kodu_icons_get__P84907_mk(s);
     s.tmp_2.arg0 = "carry";
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 324; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 323; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 325; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 324; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["kel1"] = (s.tmp_0);
-    s.tmp_0 = kodu_Kelpie_invisible__P110508_mk(s);
+    s.tmp_0 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 326; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 325; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_invisible__P110508_mk(s);
+    s.tmp_0 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["kel1"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 327; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 326; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 1000;
-    s.callLocIdx = 328; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 327; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["kel1"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 1000;
-    s.callLocIdx = 329; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 328; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 330; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 329; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "kind", "cursor");
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 331; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 330; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "component", s.arg0);
-    s.tmp_0 = kodu_Cursor_setCursorMode__P549532_mk(s);
+    s.tmp_0 = kodu_Cursor_setCursorMode__P84991_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = "free";
-    s.callLocIdx = 332; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 331; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     r0 = (s.arg0).fields["moveStartMs"] = (0);
@@ -15233,12 +15299,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_constructor__P549571.info = {"start":840,"length":533,"line":27,"column":8,"endLine":40,"endColumn":9,"fileName":"cursor.ts","functionName":"inline","argumentNames":["this","stage"]}
+kodu_Cursor_constructor__P84990.info = {"start":840,"length":533,"line":27,"column":8,"endLine":40,"endColumn":9,"fileName":"cursor.ts","functionName":"inline","argumentNames":["this","stage"]}
 
-function kodu_Cursor_constructor__P549571_mk(s) {
+function kodu_Cursor_constructor__P84990_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_constructor__P549571, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_constructor__P84990, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15251,7 +15317,7 @@ function kodu_Cursor_constructor__P549571_mk(s) {
 
 
 
-function kodu_Cursor_setCursorMode__P549532(s) {
+function kodu_Cursor_setCursorMode__P84991(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15267,34 +15333,34 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = (s.arg0).fields["cursorMode"] = (s.arg1);
-    s.tmp_0 = kodu_Kelpie_invisible__P110508_mk(s);
+    s.tmp_0 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
     r0 = (s.arg1 !== "free");
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 333; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 332; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_invisible__P110508_mk(s);
+    s.tmp_0 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["kel1"];
     s.tmp_0.arg0 = r0;
     r0 = (s.arg1 !== "burdened");
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 334; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 333; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_setCursorMode__P549532.info = {"start":1383,"length":192,"line":42,"column":8,"endLine":46,"endColumn":9,"fileName":"cursor.ts","functionName":"setCursorMode","argumentNames":["this","mode"]}
+kodu_Cursor_setCursorMode__P84991.info = {"start":1383,"length":192,"line":42,"column":8,"endLine":46,"endColumn":9,"fileName":"cursor.ts","functionName":"setCursorMode","argumentNames":["this","mode"]}
 
-function kodu_Cursor_setCursorMode__P549532_mk(s) {
+function kodu_Cursor_setCursorMode__P84991_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_setCursorMode__P549532, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_setCursorMode__P84991, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -15305,7 +15371,7 @@ function kodu_Cursor_setCursorMode__P549532_mk(s) {
 
 
 
-function sprites_BaseSprite_z__P108360(s) {
+function sprites_BaseSprite_z__P83136(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15321,7 +15387,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C108355_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C83131_VT)) failedCast(r0);
     r0 = s.arg0.fields["_z"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== s.arg1);
@@ -15329,8 +15395,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__P109029_mk(s);
-    s.callLocIdx = 168; s.pc = 3; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 177; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -15345,12 +15411,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_z__P108360.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"]}
+sprites_BaseSprite_z__P83136.info = {"start":656,"length":174,"line":30,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"z","argumentNames":["this","v"]}
 
-function sprites_BaseSprite_z__P108360_mk(s) {
+function sprites_BaseSprite_z__P83136_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_z__P108360, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_z__P83136, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15364,7 +15430,7 @@ function sprites_BaseSprite_z__P108360_mk(s) {
 
 
 
-function kodu_Kelpie_invisible__P110508(s) {
+function kodu_Kelpie_invisible__P85291(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15380,7 +15446,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -15405,12 +15471,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_invisible__P110508.info = {"start":2519,"length":111,"line":92,"column":8,"endLine":92,"endColumn":119,"fileName":"kelpie.ts","functionName":"invisible","argumentNames":["this","b"]}
+kodu_Kelpie_invisible__P85291.info = {"start":2519,"length":111,"line":92,"column":8,"endLine":92,"endColumn":119,"fileName":"kelpie.ts","functionName":"invisible","argumentNames":["this","b"]}
 
-function kodu_Kelpie_invisible__P110508_mk(s) {
+function kodu_Kelpie_invisible__P85291_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_invisible__P110508, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_invisible__P85291, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15426,7 +15492,7 @@ function kodu_Kelpie_invisible__P110508_mk(s) {
 
 
 
-function kodu_icons_get__P110155(s) {
+function kodu_icons_get__P84907(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15436,15 +15502,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.icon___113564 = undefined;
+    s.icon___88409 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtrt.mapGetGeneric(globals.kodu_icons_reg___110154, s.arg0);
-    s.icon___113564 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.icon___113564);
+    r0 = pxsim_pxtrt.mapGetGeneric(globals.kodu_icons_reg___84906, s.arg0);
+    s.icon___88409 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.icon___88409);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -15461,26 +15527,26 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtrt.mapGetGeneric(globals.kodu_icons_reg___110154, "MISSING");
-    s.icon___113564 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(globals.kodu_icons_reg___84906, "MISSING");
+    s.icon___88409 = (r0);
   case 3:
   case 4:
-    r0 = s.icon___113564;
+    r0 = s.icon___88409;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_icons_get__P110155.info = {"start":173,"length":238,"line":6,"column":8,"endLine":12,"endColumn":9,"fileName":"assets.ts","functionName":"get","argumentNames":["name","nullIfMissing"]}
+kodu_icons_get__P84907.info = {"start":173,"length":238,"line":6,"column":8,"endLine":12,"endColumn":9,"fileName":"assets.ts","functionName":"get","argumentNames":["name","nullIfMissing"]}
 
-function kodu_icons_get__P110155_mk(s) {
+function kodu_icons_get__P84907_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_icons_get__P110155, depth: s.depth + 1,
+        parent: s, fn: kodu_icons_get__P84907, 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,
-  icon___113564: undefined,
+  icon___88409: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -15489,7 +15555,7 @@ function kodu_icons_get__P110155_mk(s) {
 
 
 
-function kodu_Kelpie_constructor__P110509(s) {
+function kodu_Kelpie_constructor__P85292(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15505,15 +15571,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P108357_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P83133_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 1609; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.arg1);
     s.tmp_5 = r0;
@@ -15527,7 +15593,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___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.arg1);
     s.tmp_5 = r0;
@@ -15540,14 +15606,14 @@ switch (step) {
     r0 = (s.tmp_6 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1612; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "kelpie", 1);
-    s.tmp_0 = kodu_Kelpie_setImage__P110504_mk(s);
+    s.tmp_0 = kodu_Kelpie_setImage__P85287_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 1613; s.pc = 3; return s.tmp_0;
@@ -15557,12 +15623,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_constructor__P110509.info = {"start":2640,"length":301,"line":94,"column":8,"endLine":100,"endColumn":9,"fileName":"kelpie.ts","functionName":"inline","argumentNames":["this","img"]}
+kodu_Kelpie_constructor__P85292.info = {"start":2640,"length":301,"line":94,"column":8,"endLine":100,"endColumn":9,"fileName":"kelpie.ts","functionName":"inline","argumentNames":["this","img"]}
 
-function kodu_Kelpie_constructor__P110509_mk(s) {
+function kodu_Kelpie_constructor__P85292_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_constructor__P110509, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_constructor__P85292, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15579,7 +15645,7 @@ function kodu_Kelpie_constructor__P110509_mk(s) {
 
 
 
-function kodu_Kelpie_setImage__P110504(s) {
+function kodu_Kelpie_setImage__P85287(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15595,7 +15661,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -15611,12 +15677,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_setImage__P110504.info = {"start":2063,"length":93,"line":81,"column":8,"endLine":84,"endColumn":9,"fileName":"kelpie.ts","functionName":"setImage","argumentNames":["this","img"]}
+kodu_Kelpie_setImage__P85287.info = {"start":2063,"length":93,"line":81,"column":8,"endLine":84,"endColumn":9,"fileName":"kelpie.ts","functionName":"setImage","argumentNames":["this","img"]}
 
-function kodu_Kelpie_setImage__P110504_mk(s) {
+function kodu_Kelpie_setImage__P85287_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_setImage__P110504, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_setImage__P85287, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15628,7 +15694,7 @@ function kodu_Kelpie_setImage__P110504_mk(s) {
 
 
 
-function sprites_BaseSprite_constructor__P108357(s) {
+function sprites_BaseSprite_constructor__P83133(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15644,33 +15710,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C108355_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    if (!checkSubtype(r0, sprites_BaseSprite__C83131_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 165; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 174; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = scene_Scene_addSprite__P108941_mk(s);
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 166; s.pc = 3; return s.tmp_1;
+    s.tmp_0 = scene_Scene_addSprite__P83720_mk(s);
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 175; 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 = 167; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 176; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_constructor__P108357.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"]}
+sprites_BaseSprite_constructor__P83133.info = {"start":344,"length":170,"line":15,"column":8,"endLine":20,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"inline","argumentNames":["this","z"]}
 
-function sprites_BaseSprite_constructor__P108357_mk(s) {
+function sprites_BaseSprite_constructor__P83133_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_constructor__P108357, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_constructor__P83133, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15682,7 +15748,7 @@ function sprites_BaseSprite_constructor__P108357_mk(s) {
 
 
 
-function scene_Scene_addSprite__P108941(s) {
+function scene_Scene_addSprite__P83720(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15698,7 +15764,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C108916_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C83695_VT)) failedCast(r0);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
@@ -15717,7 +15783,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 = 839; s.pc = 1; return s.tmp_3; }
+     else { s.callLocIdx = 843; s.pc = 1; return s.tmp_3; }
     }
   case 1:
     r0 = s.retval;
@@ -15725,12 +15791,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_addSprite__P108941.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"]}
+scene_Scene_addSprite__P83720.info = {"start":6859,"length":128,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function scene_Scene_addSprite__P108941_mk(s) {
+function scene_Scene_addSprite__P83720_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_addSprite__P108941, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_addSprite__P83720, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15744,7 +15810,7 @@ function scene_Scene_addSprite__P108941_mk(s) {
 
 
 
-function kodu_Component_constructor__P345119(s) {
+function kodu_Component_constructor__P84896(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15761,26 +15827,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Component__C345109_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Component__C84895_VT)) failedCast(r0);
     r0 = (s.arg0).fields["stage"] = (s.arg1);
     r0 = (s.arg0).fields["kind"] = (s.arg2);
-    s.tmp_0 = kodu_Stage_add__P468693_mk(s);
+    s.tmp_0 = kodu_Stage_add__P85055_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 214; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 213; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Component_constructor__P345119.info = {"start":54,"length":99,"line":2,"column":8,"endLine":4,"endColumn":9,"fileName":"component.ts","functionName":"inline","argumentNames":["this","stage","kind"]}
+kodu_Component_constructor__P84896.info = {"start":54,"length":99,"line":2,"column":8,"endLine":4,"endColumn":9,"fileName":"component.ts","functionName":"inline","argumentNames":["this","stage","kind"]}
 
-function kodu_Component_constructor__P345119_mk(s) {
+function kodu_Component_constructor__P84896_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Component_constructor__P345119, depth: s.depth + 1,
+        parent: s, fn: kodu_Component_constructor__P84896, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -15792,7 +15858,7 @@ function kodu_Component_constructor__P345119_mk(s) {
 
 
 
-function kodu_Stage_add__P468693(s) {
+function kodu_Stage_add__P85055(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15802,34 +15868,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fd___468875 = undefined;
+    s.fd___89977 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P468870);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89972);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_2 = helpers_arraySome__P106714_mk(s);
+    s.tmp_2 = helpers_arraySome__P81376_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_0;
-    s.callLocIdx = 470; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 469; 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.fd___468875 = (0);
+    s.fd___89977 = (0);
   case 1:
   case 2:
-    s.tmp_0 = kodu_Stage_remove__P468692_mk(s);
+    s.tmp_0 = kodu_Stage_remove__P85054_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 471; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 470; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = s.arg0.fields["components"];
@@ -15840,17 +15906,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_add__P468693.info = {"start":604,"length":246,"line":22,"column":8,"endLine":29,"endColumn":9,"fileName":"stage.ts","functionName":"add","argumentNames":["this","comp"]}
+kodu_Stage_add__P85055.info = {"start":604,"length":246,"line":22,"column":8,"endLine":29,"endColumn":9,"fileName":"stage.ts","functionName":"add","argumentNames":["this","comp"]}
 
-function kodu_Stage_add__P468693_mk(s) {
+function kodu_Stage_add__P85055_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_add__P468693, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_add__P85055, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  fd___468875: undefined,
+  fd___89977: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -15859,7 +15925,7 @@ function kodu_Stage_add__P468693_mk(s) {
 
 
 
-function inline__P468870(s) {
+function inline__P89972(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15877,12 +15943,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468870.info = {"start":671,"length":21,"line":23,"column":37,"endLine":23,"endColumn":58,"fileName":"stage.ts","functionName":"inline","argumentNames":["item"]}
+inline__P89972.info = {"start":671,"length":21,"line":23,"column":37,"endLine":23,"endColumn":58,"fileName":"stage.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P468870_mk(s) {
+function inline__P89972_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468870, depth: s.depth + 1,
+        parent: s, fn: inline__P89972, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -15891,7 +15957,7 @@ function inline__P468870_mk(s) {
 
 
 
-function kodu_Stage_remove__P468692(s) {
+function kodu_Stage_remove__P85054(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15907,16 +15973,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P468857);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89959);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_arrayFilter__P106717_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 469; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 468; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -15926,12 +15992,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_remove__P468692.info = {"start":450,"length":144,"line":17,"column":8,"endLine":20,"endColumn":9,"fileName":"stage.ts","functionName":"remove","argumentNames":["this","comp"]}
+kodu_Stage_remove__P85054.info = {"start":450,"length":144,"line":17,"column":8,"endLine":20,"endColumn":9,"fileName":"stage.ts","functionName":"remove","argumentNames":["this","comp"]}
 
-function kodu_Stage_remove__P468692_mk(s) {
+function kodu_Stage_remove__P85054_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_remove__P468692, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_remove__P85054, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15945,7 +16011,7 @@ function kodu_Stage_remove__P468692_mk(s) {
 
 
 
-function inline__P468857(s) {
+function inline__P89959(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15963,12 +16029,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468857.info = {"start":536,"length":15,"line":18,"column":53,"endLine":18,"endColumn":68,"fileName":"stage.ts","functionName":"inline","argumentNames":["c"]}
+inline__P89959.info = {"start":536,"length":15,"line":18,"column":53,"endLine":18,"endColumn":68,"fileName":"stage.ts","functionName":"inline","argumentNames":["c"]}
 
-function inline__P468857_mk(s) {
+function inline__P89959_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468857, depth: s.depth + 1,
+        parent: s, fn: inline__P89959, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -15977,7 +16043,7 @@ function inline__P468857_mk(s) {
 
 
 
-function helpers_arraySome__P106714(s) {
+function helpers_arraySome__P81376(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15987,26 +16053,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___125778 = undefined;
-    s.i___125781 = undefined;
+    s.len___101171 = undefined;
+    s.i___101174 = 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___125778 = (r0);
-    s.i___125781 = (0);
+    s.len___101171 = (r0);
+    s.i___101174 = (0);
   case 1:
-    r0 = (s.i___125781 < s.len___125778);
+    r0 = (s.i___101174 < s.len___101171);
     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___125781);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___101174);
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = s.i___125781;
+    s.tmp_2.arg1 = s.i___101174;
     setupLambda(s.tmp_2, s.tmp_2.argL);
     s.callLocIdx = 4; s.pc = 6; return s.tmp_2;
   case 6:
@@ -16018,8 +16084,8 @@ switch (step) {
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___125781 + 1);
-    s.i___125781 = (r0);
+    r0 = (s.i___101174 + 1);
+    s.i___101174 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = false;
@@ -16027,18 +16093,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySome__P106714.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__P81376.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__P106714_mk(s) {
+function helpers_arraySome__P81376_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySome__P106714, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySome__P81376, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___125778: undefined,
-  i___125781: undefined,
+  len___101171: undefined,
+  i___101174: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -16047,7 +16113,7 @@ function helpers_arraySome__P106714_mk(s) {
 
 
 
-function kodu_Camera_constructor__P530783(s) {
+function kodu_Camera_constructor__P84886(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16063,26 +16129,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Camera__C530755_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    if (!checkSubtype(r0, kodu_Camera__C84878_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "camera";
-    s.callLocIdx = 188; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 187; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = scene_cameraProperty__P108965_mk(s);
+    s.tmp_2 = scene_cameraProperty__P83744_mk(s);
     s.tmp_2.arg0 = 0;
-    s.callLocIdx = 189; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 188; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["x"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = scene_cameraProperty__P108965_mk(s);
+    s.tmp_2 = scene_cameraProperty__P83744_mk(s);
     s.tmp_2.arg0 = 1;
-    s.callLocIdx = 190; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 189; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -16091,12 +16157,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Camera_constructor__P530783.info = {"start":347,"length":195,"line":11,"column":8,"endLine":15,"endColumn":9,"fileName":"camera.ts","functionName":"inline","argumentNames":["this","stage"]}
+kodu_Camera_constructor__P84886.info = {"start":347,"length":195,"line":11,"column":8,"endLine":15,"endColumn":9,"fileName":"camera.ts","functionName":"inline","argumentNames":["this","stage"]}
 
-function kodu_Camera_constructor__P530783_mk(s) {
+function kodu_Camera_constructor__P84886_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Camera_constructor__P530783, depth: s.depth + 1,
+        parent: s, fn: kodu_Camera_constructor__P84886, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16109,7 +16175,7 @@ function kodu_Camera_constructor__P530783_mk(s) {
 
 
 
-function scene_cameraProperty__P108965(s) {
+function scene_cameraProperty__P83744(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16119,16 +16185,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___125865 = undefined;
+    s.scene___101258 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 852; s.pc = 9; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 856; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.scene___125865 = (r0);
+    s.scene___101258 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_pxtcore.switch_eq(0, s.tmp_0);
     if (r0) { step = 1; continue; }
@@ -16145,52 +16211,52 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 1:
-    r0 = s.scene___125865.fields["camera"];
+    r0 = s.scene___101258.fields["camera"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["drawOffsetX"];
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     { step = 8; continue; }
   case 2:
-    r0 = s.scene___125865.fields["camera"];
+    r0 = s.scene___101258.fields["camera"];
     s.tmp_5 = r0;
     r0 = s.tmp_5.fields["drawOffsetY"];
     s.tmp_6 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_8 = r0;
     r0 = (s.tmp_8 >> 1);
     s.tmp_7 = r0;
     r0 = (s.tmp_6 + s.tmp_7);
     { step = 8; continue; }
   case 3:
-    r0 = s.scene___125865.fields["camera"];
+    r0 = s.scene___101258.fields["camera"];
     s.tmp_9 = r0;
     r0 = s.tmp_9.fields["drawOffsetX"];
     { step = 8; continue; }
   case 4:
-    r0 = s.scene___125865.fields["camera"];
+    r0 = s.scene___101258.fields["camera"];
     s.tmp_10 = r0;
     r0 = s.tmp_10.fields["drawOffsetX"];
     s.tmp_11 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_12 = r0;
     r0 = (s.tmp_11 + s.tmp_12);
     { step = 8; continue; }
   case 5:
-    r0 = s.scene___125865.fields["camera"];
+    r0 = s.scene___101258.fields["camera"];
     s.tmp_13 = r0;
     r0 = s.tmp_13.fields["drawOffsetY"];
     { step = 8; continue; }
   case 6:
-    r0 = s.scene___125865.fields["camera"];
+    r0 = s.scene___101258.fields["camera"];
     s.tmp_14 = r0;
     r0 = s.tmp_14.fields["drawOffsetY"];
     s.tmp_15 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_16 = r0;
     r0 = (s.tmp_15 + s.tmp_16);
     { step = 8; continue; }
@@ -16200,12 +16266,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_cameraProperty__P108965.info = {"start":5500,"length":529,"line":192,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"cameraProperty","argumentNames":["property"]}
+scene_cameraProperty__P83744.info = {"start":5500,"length":529,"line":192,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"cameraProperty","argumentNames":["property"]}
 
-function scene_cameraProperty__P108965_mk(s) {
+function scene_cameraProperty__P83744_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_cameraProperty__P108965, depth: s.depth + 1,
+        parent: s, fn: scene_cameraProperty__P83744, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16224,7 +16290,7 @@ function scene_cameraProperty__P108965_mk(s) {
   tmp_14: undefined,
   tmp_15: undefined,
   tmp_16: undefined,
-  scene___125865: undefined,
+  scene___101258: undefined,
   arg0: undefined,
 } }
 
@@ -16232,7 +16298,7 @@ function scene_cameraProperty__P108965_mk(s) {
 
 
 
-function scene_Camera_bottom__P108871(s) {
+function scene_Camera_bottom__P83650(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16247,22 +16313,22 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetY"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_bottom__P108871.info = {"start":1705,"length":77,"line":61,"column":8,"endLine":63,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"bottom","argumentNames":["this"]}
-scene_Camera_bottom__P108871.isGetter = true;
+scene_Camera_bottom__P83650.info = {"start":1705,"length":77,"line":61,"column":8,"endLine":63,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"bottom","argumentNames":["this"]}
+scene_Camera_bottom__P83650.isGetter = true;
 
-function scene_Camera_bottom__P108871_mk(s) {
+function scene_Camera_bottom__P83650_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_bottom__P108871, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_bottom__P83650, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16273,7 +16339,7 @@ function scene_Camera_bottom__P108871_mk(s) {
 
 
 
-function scene_Camera_top__P108870(s) {
+function scene_Camera_top__P83649(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16288,18 +16354,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetY"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_top__P108870.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__P108870.isGetter = true;
+scene_Camera_top__P83649.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__P83649.isGetter = true;
 
-function scene_Camera_top__P108870_mk(s) {
+function scene_Camera_top__P83649_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_top__P108870, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_top__P83649, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -16308,7 +16374,7 @@ function scene_Camera_top__P108870_mk(s) {
 
 
 
-function scene_Camera_right__P108869(s) {
+function scene_Camera_right__P83648(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16323,22 +16389,22 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetX"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_right__P108869.info = {"start":1554,"length":75,"line":55,"column":8,"endLine":57,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"right","argumentNames":["this"]}
-scene_Camera_right__P108869.isGetter = true;
+scene_Camera_right__P83648.info = {"start":1554,"length":75,"line":55,"column":8,"endLine":57,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"right","argumentNames":["this"]}
+scene_Camera_right__P83648.isGetter = true;
 
-function scene_Camera_right__P108869_mk(s) {
+function scene_Camera_right__P83648_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_right__P108869, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_right__P83648, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16349,7 +16415,7 @@ function scene_Camera_right__P108869_mk(s) {
 
 
 
-function scene_Camera_left__P108868(s) {
+function scene_Camera_left__P83647(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16364,18 +16430,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetX"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_left__P108868.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__P108868.isGetter = true;
+scene_Camera_left__P83647.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__P83647.isGetter = true;
 
-function scene_Camera_left__P108868_mk(s) {
+function scene_Camera_left__P83647_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_left__P108868, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_left__P83647, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -16384,7 +16450,7 @@ function scene_Camera_left__P108868_mk(s) {
 
 
 
-function scene_Camera_y__P108867(s) {
+function scene_Camera_y__P83646(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16399,10 +16465,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetY"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
@@ -16410,13 +16476,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_y__P108867.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__P108867.isGetter = true;
+scene_Camera_y__P83646.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__P83646.isGetter = true;
 
-function scene_Camera_y__P108867_mk(s) {
+function scene_Camera_y__P83646_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_y__P108867, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_y__P83646, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16428,7 +16494,7 @@ function scene_Camera_y__P108867_mk(s) {
 
 
 
-function scene_Camera_x__P108866(s) {
+function scene_Camera_x__P83645(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16443,10 +16509,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetX"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
@@ -16454,13 +16520,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_x__P108866.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__P108866.isGetter = true;
+scene_Camera_x__P83645.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__P83645.isGetter = true;
 
-function scene_Camera_x__P108866_mk(s) {
+function scene_Camera_x__P83645_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_x__P108866, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_x__P83645, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16472,7 +16538,7 @@ function scene_Camera_x__P108866_mk(s) {
 
 
 
-function game_pushScene__P109033(s) {
+function game_pushScene__P83812(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16482,45 +16548,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.oldScene___125700 = undefined;
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 864; s.pc = 5; return s.tmp_0;
+    s.oldScene___101084 = undefined;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 868; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.oldScene___125700 = (r0);
-    s.tmp_0 = particles_clearAll__P109205_mk(s);
-    s.callLocIdx = 865; s.pc = 6; return s.tmp_0;
+    s.oldScene___101084 = (r0);
+    s.tmp_0 = particles_clearAll__P83984_mk(s);
+    s.callLocIdx = 869; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = particles_disableAll__P109206_mk(s);
-    s.callLocIdx = 866; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = particles_disableAll__P83985_mk(s);
+    s.callLocIdx = 870; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals._sceneStack___110872);
+    r0 = pxsim_numops_toBoolDecr(globals._sceneStack___85711);
     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___110872 = (r0);
+    globals._sceneStack___85711 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array__push(globals._sceneStack___110872, globals._scene___110871);
-    s.tmp_0 = game_init__P110879_mk(s);
+    r0 = pxsim_Array__push(globals._sceneStack___85711, globals._scene___85710);
+    s.tmp_0 = game_init__P85718_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 867; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 871; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___110873);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___85712);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P125717);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P101101);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___125700);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1.arg0 = globals._scenePushHandlers___110873;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___101084);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1.arg0 = globals._scenePushHandlers___85712;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 869; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 873; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
   case 3:
@@ -16529,23 +16595,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_pushScene__P109033.info = {"start":1660,"length":367,"line":62,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"pushScene","argumentNames":[]}
+game_pushScene__P83812.info = {"start":1660,"length":367,"line":62,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"pushScene","argumentNames":[]}
 
-function game_pushScene__P109033_mk(s) {
+function game_pushScene__P83812_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_pushScene__P109033, depth: s.depth + 1,
+        parent: s, fn: game_pushScene__P83812, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  oldScene___125700: undefined,
+  oldScene___101084: undefined,
 } }
 
 
 
 
 
-function inline__P125717(s) {
+function inline__P101101(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16563,19 +16629,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 = 868; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 872; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P125717.info = {"start":1991,"length":18,"line":71,"column":39,"endLine":71,"endColumn":57,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":["cb"]}
+inline__P101101.info = {"start":1991,"length":18,"line":71,"column":39,"endLine":71,"endColumn":57,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["cb"]}
 
-function inline__P125717_mk(s) {
+function inline__P101101_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P125717, depth: s.depth + 1,
+        parent: s, fn: inline__P101101, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -16585,7 +16651,7 @@ function inline__P125717_mk(s) {
 
 
 
-function game_init__P110879(s) {
+function game_init__P85718(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16599,7 +16665,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scene___110871);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___85710);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -16614,73 +16680,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__C108916_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Scene__C83695_VT);
     s.tmp_3 = r0;
-    s.tmp_4 = scene_Scene_constructor__P108937_mk(s);
+    s.tmp_4 = scene_Scene_constructor__P83716_mk(s);
     s.tmp_4.arg0 = s.tmp_3;
-    s.tmp_5 = control_pushEventContext__P107007_mk(s);
-    s.callLocIdx = 861; s.pc = 14; return s.tmp_5;
+    s.tmp_5 = control_pushEventContext__P81671_mk(s);
+    s.callLocIdx = 865; s.pc = 14; return s.tmp_5;
   case 14:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
-    s.tmp_4.arg2 = globals._scene___110871;
-    s.callLocIdx = 862; s.pc = 13; return s.tmp_4;
+    s.tmp_4.arg2 = globals._scene___85710;
+    s.callLocIdx = 866; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
-    globals._scene___110871 = (s.tmp_3);
+    globals._scene___85710 = (s.tmp_3);
   case 3:
   case 4:
-    s.tmp_0 = scene_Scene_init__P108938_mk(s);
-    s.tmp_0.arg0 = globals._scene___110871;
-    s.callLocIdx = 863; s.pc = 15; return s.tmp_0;
+    s.tmp_0 = scene_Scene_init__P83717_mk(s);
+    s.tmp_0.arg0 = globals._scene___85710;
+    s.callLocIdx = 867; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.winEffect___109027);
+    r0 = pxsim_numops_toBoolDecr(globals.winEffect___83806);
     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___109027 = (globals.confetti___109298);
+    globals.winEffect___83806 = (globals.confetti___84077);
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(globals.loseEffect___109028);
+    r0 = pxsim_numops_toBoolDecr(globals.loseEffect___83807);
     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___109028 = (globals.melt___109319);
+    globals.loseEffect___83807 = (globals.melt___84098);
   case 7:
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals.winSound___110870);
+    r0 = pxsim_numops_toBoolDecr(globals.winSound___85709);
     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___110870 = (globals.powerUp___109376);
+    globals.winSound___85709 = (globals.powerUp___82891);
   case 9:
   case 10:
-    r0 = pxsim_numops_toBoolDecr(globals.loseSound___110868);
+    r0 = pxsim_numops_toBoolDecr(globals.loseSound___85707);
     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___110868 = (globals.wawawawaa___109373);
+    globals.loseSound___85707 = (globals.wawawawaa___82888);
   case 11:
   case 12:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_init__P110879.info = {"start":1202,"length":452,"line":45,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"init","argumentNames":["forceNewScene"]}
+game_init__P85718.info = {"start":1202,"length":452,"line":45,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"init","argumentNames":["forceNewScene"]}
 
-function game_init__P110879_mk(s) {
+function game_init__P85718_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_init__P110879, depth: s.depth + 1,
+        parent: s, fn: game_init__P85718, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16695,44 +16761,7 @@ function game_init__P110879_mk(s) {
 
 
 
-function music_Melody_constructor__P109359(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__C109356_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["_text"] = (s.arg1);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_constructor__P109359.info = {"start":6328,"length":67,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"inline","argumentNames":["this","text"]}
-
-function music_Melody_constructor__P109359_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_constructor__P109359, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function inline__P121715(s) {
+function inline__P97046(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16742,11 +16771,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rounds___121718 = undefined;
-    s.j___121726 = undefined;
-    s.x___121731 = undefined;
-    s.y___121737 = undefined;
-    s.c___121743 = undefined;
+    s.rounds___97049 = undefined;
+    s.j___97057 = undefined;
+    s.x___97062 = undefined;
+    s.y___97068 = undefined;
+    s.c___97074 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -16759,70 +16788,70 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 5);
-    s.rounds___121718 = (r0);
-    s.j___121726 = (0);
+    s.rounds___97049 = (r0);
+    s.j___97057 = (0);
   case 1:
-    r0 = (s.j___121726 < s.rounds___121718);
+    r0 = (s.j___97057 < s.rounds___97049);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.tmp_1 = Math_FastRandom_randomRange__P83866_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 = 43; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 44; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.x___121731 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.x___97062 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P83866_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 = 44; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 45; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.y___121737 = (r0);
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___121731, s.y___121737);
-    s.c___121743 = (r0);
+    s.y___97068 = (r0);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___97062, s.y___97068);
+    s.c___97074 = (r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.x___121731;
-    r0 = (s.y___121737 + 1);
+    s.tmp_1 = r0 = s.x___97062;
+    r0 = (s.y___97068 + 1);
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___121743);
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___97074);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.x___121731;
-    r0 = (s.y___121737 + 2);
+    s.tmp_1 = r0 = s.x___97062;
+    r0 = (s.y___97068 + 2);
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___121743);
-    r0 = (s.j___121726 + 1);
-    s.j___121726 = (r0);
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___97074);
+    r0 = (s.j___97057 + 1);
+    s.j___97057 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P121715.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"]}
+inline__P97046.info = {"start":2652,"length":386,"line":72,"column":45,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["input","r"]}
 
-function inline__P121715_mk(s) {
+function inline__P97046_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P121715, depth: s.depth + 1,
+        parent: s, fn: inline__P97046, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  rounds___121718: undefined,
-  j___121726: undefined,
-  x___121731: undefined,
-  y___121737: undefined,
-  c___121743: undefined,
+  rounds___97049: undefined,
+  j___97057: undefined,
+  x___97062: undefined,
+  y___97068: undefined,
+  c___97074: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -16831,7 +16860,7 @@ function inline__P121715_mk(s) {
 
 
 
-function Math_FastRandom_randomRange__P109087(s) {
+function Math_FastRandom_randomRange__P83866(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16848,14 +16877,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C109083_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C83862_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__P109086_mk(s);
+    s.tmp_2 = Math_FastRandom_next__P83865_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 916; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 920; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -16874,12 +16903,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_randomRange__P109087.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"]}
+Math_FastRandom_randomRange__P83866.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__P109087_mk(s) {
+function Math_FastRandom_randomRange__P83866_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_randomRange__P109087, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_randomRange__P83866, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16896,7 +16925,7 @@ function Math_FastRandom_randomRange__P109087_mk(s) {
 
 
 
-function Math_FastRandom_next__P109086(s) {
+function Math_FastRandom_next__P83865(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16911,7 +16940,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C109083_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C83862_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["lfsr"];
     s.tmp_3 = r0;
@@ -16932,12 +16961,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_next__P109086.info = {"start":1713,"length":107,"line":53,"column":8,"endLine":55,"endColumn":9,"fileName":"pxt_modules/game---hw/mathUtil.ts","functionName":"next","argumentNames":["this"]}
+Math_FastRandom_next__P83865.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__P109086_mk(s) {
+function Math_FastRandom_next__P83865_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_next__P109086, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_next__P83865, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16954,7 +16983,7 @@ function Math_FastRandom_next__P109086_mk(s) {
 
 
 
-function effects_ImageEffect_constructor__P109314(s) {
+function effects_ImageEffect_constructor__P84093(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16971,14 +17000,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C109313_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C84092_VT)) failedCast(r0);
     r0 = (s.arg0).fields["effect"] = (s.arg2);
-    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C109083_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C83862_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P109085_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P83864_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1209; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1213; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["fastRandom"] = (s.tmp_0);
@@ -16988,12 +17017,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_constructor__P109314.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"]}
+effects_ImageEffect_constructor__P84093.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__P109314_mk(s) {
+function effects_ImageEffect_constructor__P84093_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_constructor__P109314, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_constructor__P84093, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17006,7 +17035,7 @@ function effects_ImageEffect_constructor__P109314_mk(s) {
 
 
 
-function inline__P121823(s) {
+function inline__P97154(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17016,13 +17045,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.factory___121826 = undefined;
+    s.factory___97157 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ConfettiFactory__C109242_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ConfettiFactory__C84021_VT);
     s.tmp_0 = r0;
     s.tmp_2 = if_width_1_mk(s);
     s.tmp_2.arg0 = s.arg0;
@@ -17032,7 +17061,7 @@ switch (step) {
       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 = 31; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 32; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
@@ -17047,7 +17076,7 @@ switch (step) {
       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 = 32; s.pc = 4; return s.tmp_3; }
+     else { s.callLocIdx = 33; s.pc = 4; return s.tmp_3; }
     }
   case 4:
     r0 = s.retval;
@@ -17057,40 +17086,40 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.tmp_5 = particles_ConfettiFactory_constructor__P109243_mk(s);
+    s.tmp_5 = particles_ConfettiFactory_constructor__P84022_mk(s);
     s.tmp_5.arg0 = s.tmp_0;
     s.tmp_5.arg1 = s.tmp_4;
     s.tmp_5.arg2 = 16;
-    s.callLocIdx = 33; s.pc = 5; return s.tmp_5;
+    s.callLocIdx = 34; s.pc = 5; return s.tmp_5;
   case 5:
     r0 = s.retval;
-    s.factory___121826 = (s.tmp_0);
-    s.tmp_0 = particles_SprayFactory_setSpeed__P109219_mk(s);
-    s.tmp_0.arg0 = s.factory___121826;
+    s.factory___97157 = (s.tmp_0);
+    s.tmp_0 = particles_SprayFactory_setSpeed__P83998_mk(s);
+    s.tmp_0.arg0 = s.factory___97157;
     s.tmp_0.arg1 = 30;
-    s.callLocIdx = 34; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 35; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C109175_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C83954_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_ParticleSource_constructor__P109180_mk(s);
+    s.tmp_1 = particles_ParticleSource_constructor__P83959_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___121826;
-    s.callLocIdx = 35; s.pc = 7; return s.tmp_1;
+    s.tmp_1.arg3 = s.factory___97157;
+    s.callLocIdx = 36; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P121823.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"]}
+inline__P97154.info = {"start":7534,"length":284,"line":191,"column":59,"endLine":195,"endColumn":5,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["anchor","particlesPerSecond"]}
 
-function inline__P121823_mk(s) {
+function inline__P97154_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P121823, depth: s.depth + 1,
+        parent: s, fn: inline__P97154, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17098,7 +17127,7 @@ function inline__P121823_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  factory___121826: undefined,
+  factory___97157: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -17107,7 +17136,7 @@ function inline__P121823_mk(s) {
 
 
 
-function particles_ParticleSource_constructor__P109180(s) {
+function particles_ParticleSource_constructor__P83959(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17117,8 +17146,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___121847 = undefined;
-    s.removedSource___121856 = undefined;
+    s.sources___97178 = undefined;
+    s.removedSource___97187 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -17127,65 +17156,65 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P108357_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P83133_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1085; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1089; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = particles_init__P111229_mk(s);
-    s.callLocIdx = 1086; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = particles_init__P86068_mk(s);
+    s.callLocIdx = 1090; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = particles_particleSources__P111235_mk(s);
-    s.callLocIdx = 1087; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = particles_particleSources__P86074_mk(s);
+    s.callLocIdx = 1091; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.sources___121847 = (r0);
-    r0 = pxsim_Array__length(s.sources___121847);
+    s.sources___97178 = (r0);
+    r0 = pxsim_Array__length(s.sources___97178);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 >= globals.MAX_SOURCES___111206);
+    r0 = (s.tmp_1 >= globals.MAX_SOURCES___86045);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = particles_sortSources__P111232_mk(s);
-    s.tmp_2.arg0 = s.sources___121847;
-    s.callLocIdx = 1088; s.pc = 8; return s.tmp_2;
+    s.tmp_2 = particles_sortSources__P86071_mk(s);
+    s.tmp_2.arg0 = s.sources___97178;
+    s.callLocIdx = 1092; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeAt(s.sources___121847, 0);
-    s.removedSource___121856 = (r0);
-    s.tmp_0 = particles_ParticleSource_clear__P109190_mk(s);
-    s.tmp_0.arg0 = s.removedSource___121856;
-    s.callLocIdx = 1090; s.pc = 9; return s.tmp_0;
+    r0 = pxsim_Array_.removeAt(s.sources___97178, 0);
+    s.removedSource___97187 = (r0);
+    s.tmp_0 = particles_ParticleSource_clear__P83969_mk(s);
+    s.tmp_0.arg0 = s.removedSource___97187;
+    s.callLocIdx = 1094; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_destroy__P109189_mk(s);
-    s.tmp_0.arg0 = s.removedSource___121856;
-    s.callLocIdx = 1091; s.pc = 10; return s.tmp_0;
+    s.tmp_0 = particles_ParticleSource_destroy__P83968_mk(s);
+    s.tmp_0.arg0 = s.removedSource___97187;
+    s.callLocIdx = 1095; 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__P109192_mk(s);
+    s.tmp_0 = particles_ParticleSource_setRate__P83971_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1092; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1096; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_setAcceleration__P109184_mk(s);
+    s.tmp_0 = particles_ParticleSource_setAcceleration__P83963_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    s.callLocIdx = 1093; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1097; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_setAnchor__P109191_mk(s);
+    s.tmp_0 = particles_ParticleSource_setAnchor__P83970_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1094; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1098; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = (s.arg0).fields["lifespan"] = (undefined);
@@ -17197,39 +17226,39 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = globals.defaultFactory___109195;
+    r0 = globals.defaultFactory___83974;
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = particles_ParticleSource_setFactory__P109194_mk(s);
+    s.tmp_2 = particles_ParticleSource_setFactory__P83973_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 1095; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 1099; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.sources___121847, s.arg0);
-    s.tmp_0 = particles_ParticleSource_enabled__P109188_mk(s);
+    r0 = pxsim_Array__push(s.sources___97178, s.arg0);
+    s.tmp_0 = particles_ParticleSource_enabled__P83967_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1096; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1100; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_constructor__P109180.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"]}
+particles_ParticleSource_constructor__P83959.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"]}
 
-function particles_ParticleSource_constructor__P109180_mk(s) {
+function particles_ParticleSource_constructor__P83959_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_constructor__P109180, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_constructor__P83959, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  sources___121847: undefined,
-  removedSource___121856: undefined,
+  sources___97178: undefined,
+  removedSource___97187: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -17240,7 +17269,7 @@ function particles_ParticleSource_constructor__P109180_mk(s) {
 
 
 
-function particles_particleSources__P111235(s) {
+function particles_particleSources__P86074(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17250,33 +17279,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___122164 = undefined;
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 1147; s.pc = 1; return s.tmp_0;
+    s.sources___97495 = undefined;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 1151; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["particleSources"];
-    s.sources___122164 = (r0);
-    r0 = s.sources___122164;
+    s.sources___97495 = (r0);
+    r0 = s.sources___97495;
     return leave(s, r0)
   default: oops()
 } } }
-particles_particleSources__P111235.info = {"start":12831,"length":119,"line":420,"column":4,"endLine":423,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"particleSources","argumentNames":[]}
+particles_particleSources__P86074.info = {"start":12831,"length":119,"line":420,"column":4,"endLine":423,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"particleSources","argumentNames":[]}
 
-function particles_particleSources__P111235_mk(s) {
+function particles_particleSources__P86074_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_particleSources__P111235, depth: s.depth + 1,
+        parent: s, fn: particles_particleSources__P86074, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___122164: undefined,
+  sources___97495: undefined,
 } }
 
 
 
 
 
-function particles_sortSources__P111232(s) {
+function particles_sortSources__P86071(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17290,22 +17319,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_arraySort__P106712_mk(s);
+    s.tmp_0 = helpers_arraySort__P81374_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = inline__P122150;
-    s.callLocIdx = 1134; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P97481;
+    s.callLocIdx = 1138; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_sortSources__P111232.info = {"start":10009,"length":129,"line":331,"column":4,"endLine":333,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"sortSources","argumentNames":["sources"]}
+particles_sortSources__P86071.info = {"start":10009,"length":129,"line":331,"column":4,"endLine":333,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"sortSources","argumentNames":["sources"]}
 
-function particles_sortSources__P111232_mk(s) {
+function particles_sortSources__P86071_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_sortSources__P111232, depth: s.depth + 1,
+        parent: s, fn: particles_sortSources__P86071, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -17315,7 +17344,7 @@ function particles_sortSources__P111232_mk(s) {
 
 
 
-function inline__P122150(s) {
+function inline__P97481(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17353,12 +17382,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122150.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"]}
+inline__P97481.info = {"start":10080,"length":50,"line":332,"column":21,"endLine":332,"endColumn":71,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P122150_mk(s) {
+function inline__P97481_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122150, depth: s.depth + 1,
+        parent: s, fn: inline__P97481, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17374,7 +17403,7 @@ function inline__P122150_mk(s) {
 
 
 
-function particles_init__P111229(s) {
+function particles_init__P86068(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17384,34 +17413,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___122169 = undefined;
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 1124; s.pc = 4; return s.tmp_0;
+    s.scene___97500 = undefined;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 1128; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.scene___122169 = (r0);
-    r0 = s.scene___122169.fields["particleSources"];
+    s.scene___97500 = (r0);
+    r0 = s.scene___97500.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___122169;
+    s.tmp_1 = r0 = s.scene___97500;
     r0 = pxsim_Array__mk();
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["particleSources"] = (s.tmp_2);
     r0 = pxsim.control.millis();
-    globals.lastUpdate___111224 = (r0);
-    s.tmp_0 = game_onUpdate__P109040_mk(s);
-    s.tmp_0.arg0 = particles_updateParticles__P111230;
-    s.callLocIdx = 1125; s.pc = 5; return s.tmp_0;
+    globals.lastUpdate___86063 = (r0);
+    s.tmp_0 = game_onUpdate__P83819_mk(s);
+    s.tmp_0.arg0 = particles_updateParticles__P86069;
+    s.callLocIdx = 1129; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_onUpdateInterval__P109041_mk(s);
+    s.tmp_0 = game_onUpdateInterval__P83820_mk(s);
     s.tmp_0.arg0 = 250;
-    s.tmp_0.arg1 = particles_pruneParticles__P111231;
-    s.callLocIdx = 1126; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg1 = particles_pruneParticles__P86070;
+    s.callLocIdx = 1130; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -17419,24 +17448,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_init__P111229.info = {"start":9219,"length":276,"line":303,"column":4,"endLine":310,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"init","argumentNames":[]}
+particles_init__P86068.info = {"start":9219,"length":276,"line":303,"column":4,"endLine":310,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"init","argumentNames":[]}
 
-function particles_init__P111229_mk(s) {
+function particles_init__P86068_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_init__P111229, depth: s.depth + 1,
+        parent: s, fn: particles_init__P86068, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  scene___122169: undefined,
+  scene___97500: undefined,
 } }
 
 
 
 
 
-function particles_pruneParticles__P111231(s) {
+function particles_pruneParticles__P86070(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17446,26 +17475,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___122184 = undefined;
-    s.tmp_0 = particles_particleSources__P111235_mk(s);
-    s.callLocIdx = 1130; s.pc = 3; return s.tmp_0;
+    s.sources___97515 = undefined;
+    s.tmp_0 = particles_particleSources__P86074_mk(s);
+    s.callLocIdx = 1134; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___122184 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___122184);
+    s.sources___97515 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___97515);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1 = helpers_arraySlice__P106721_mk(s);
-    s.tmp_1.arg0 = s.sources___122184;
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1 = helpers_arraySlice__P81384_mk(s);
+    s.tmp_1.arg0 = s.sources___97515;
     s.tmp_1.arg1 = 0;
-    r0 = pxsim_Array__length(s.sources___122184);
+    r0 = pxsim_Array__length(s.sources___97515);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1131; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1135; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P122193;
-    s.callLocIdx = 1133; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P97524;
+    s.callLocIdx = 1137; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -17474,23 +17503,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_pruneParticles__P111231.info = {"start":9847,"length":156,"line":326,"column":4,"endLine":329,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"pruneParticles","argumentNames":[]}
+particles_pruneParticles__P86070.info = {"start":9847,"length":156,"line":326,"column":4,"endLine":329,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"pruneParticles","argumentNames":[]}
 
-function particles_pruneParticles__P111231_mk(s) {
+function particles_pruneParticles__P86070_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_pruneParticles__P111231, depth: s.depth + 1,
+        parent: s, fn: particles_pruneParticles__P86070, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  sources___122184: undefined,
+  sources___97515: undefined,
 } }
 
 
 
 
 
-function inline__P122193(s) {
+function inline__P97524(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17504,21 +17533,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource__prune__P109183_mk(s);
+    s.tmp_0 = particles_ParticleSource__prune__P83962_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1132; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1136; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122193.info = {"start":9980,"length":15,"line":328,"column":62,"endLine":328,"endColumn":77,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P97524.info = {"start":9980,"length":15,"line":328,"column":62,"endLine":328,"endColumn":77,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P122193_mk(s) {
+function inline__P97524_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122193, depth: s.depth + 1,
+        parent: s, fn: inline__P97524, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -17528,7 +17557,7 @@ function inline__P122193_mk(s) {
 
 
 
-function particles_ParticleSource__prune__P109183(s) {
+function particles_ParticleSource__prune__P83962(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17538,15 +17567,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___122101 = undefined;
-    s.sources___122109 = undefined;
-    s.current___122123 = undefined;
+    s.scene___97432 = undefined;
+    s.sources___97440 = undefined;
+    s.current___97454 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
   case 1:
     r0 = s.arg0.fields["head"];
     s.tmp_0 = r0;
@@ -17589,36 +17618,36 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 13; continue; }
-    s.tmp_5 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 1105; s.pc = 21; return s.tmp_5;
+    s.tmp_5 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 1109; s.pc = 21; return s.tmp_5;
   case 21:
     r0 = s.retval;
-    s.scene___122101 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.scene___122101);
+    s.scene___97432 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.scene___97432);
     if (!r0) { step = 7; continue; }
-    r0 = s.scene___122101.fields["allSprites"];
+    r0 = s.scene___97432.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg0);
   case 7:
   case 8:
-    s.tmp_0 = particles_particleSources__P111235_mk(s);
-    s.callLocIdx = 1106; s.pc = 22; return s.tmp_0;
+    s.tmp_0 = particles_particleSources__P86074_mk(s);
+    s.callLocIdx = 1110; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
-    s.sources___122109 = (r0);
-    s.tmp_0 = r0 = s.sources___122109;
+    s.sources___97440 = (r0);
+    s.tmp_0 = r0 = s.sources___97440;
     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___122109);
+    r0 = pxsim_Array__length(s.sources___97440);
   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___122109, s.arg0);
+    r0 = pxsim_Array_.removeElement(s.sources___97440, s.arg0);
   case 11:
   case 12:
     r0 = s.arg0.fields["anchor"];
@@ -17627,35 +17656,35 @@ switch (step) {
   case 13:
   case 14:
     r0 = s.arg0.fields["head"];
-    s.current___122123 = (r0);
+    s.current___97454 = (r0);
   case 15:
-    s.tmp_0 = r0 = s.current___122123;
+    s.tmp_0 = r0 = s.current___97454;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 16; continue; }
     r0 = s.tmp_0;
     { step = 17; continue; }
   case 16:
-    r0 = s.current___122123.fields["next"];
+    r0 = s.current___97454.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___122123.fields["next"];
+    r0 = s.current___97454.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___122123.fields["next"];
+    r0 = s.current___97454.fields["next"];
     r0 = r0.fields["next"];
     s.tmp_4 = r0;
-    r0 = (s.current___122123).fields["next"] = (s.tmp_4);
+    r0 = (s.current___97454).fields["next"] = (s.tmp_4);
     { step = 19; continue; }
   case 18:
-    r0 = s.current___122123.fields["next"];
-    s.current___122123 = (r0);
+    r0 = s.current___97454.fields["next"];
+    s.current___97454 = (r0);
   case 19:
     { step = 15; continue; }
   case 20:
@@ -17663,12 +17692,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource__prune__P109183.info = {"start":5087,"length":830,"line":165,"column":8,"endLine":188,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"_prune","argumentNames":["this"]}
+particles_ParticleSource__prune__P83962.info = {"start":5087,"length":830,"line":165,"column":8,"endLine":188,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"_prune","argumentNames":["this"]}
 
-function particles_ParticleSource__prune__P109183_mk(s) {
+function particles_ParticleSource__prune__P83962_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource__prune__P109183, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource__prune__P83962, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17676,9 +17705,9 @@ function particles_ParticleSource__prune__P109183_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___122101: undefined,
-  sources___122109: undefined,
-  current___122123: undefined,
+  scene___97432: undefined,
+  sources___97440: undefined,
+  current___97454: undefined,
   arg0: undefined,
 } }
 
@@ -17686,7 +17715,7 @@ function particles_ParticleSource__prune__P109183_mk(s) {
 
 
 
-function particles_updateParticles__P111230(s) {
+function particles_updateParticles__P86069(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17696,16 +17725,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___122197 = undefined;
-    s.time___122204 = undefined;
-    s.dt___122207 = undefined;
-    s.i___122213 = undefined;
-    s.tmp_0 = particles_particleSources__P111235_mk(s);
-    s.callLocIdx = 1127; s.pc = 6; return s.tmp_0;
+    s.sources___97528 = undefined;
+    s.time___97535 = undefined;
+    s.dt___97538 = undefined;
+    s.i___97544 = undefined;
+    s.tmp_0 = particles_particleSources__P86074_mk(s);
+    s.callLocIdx = 1131; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.sources___122197 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___122197);
+    s.sources___97528 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___97528);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -17714,34 +17743,34 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_2 = particles_sortSources__P111232_mk(s);
-    s.tmp_2.arg0 = s.sources___122197;
-    s.callLocIdx = 1128; s.pc = 7; return s.tmp_2;
+    s.tmp_2 = particles_sortSources__P86071_mk(s);
+    s.tmp_2.arg0 = s.sources___97528;
+    s.callLocIdx = 1132; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     r0 = pxsim.control.millis();
-    s.time___122204 = (r0);
-    r0 = (s.time___122204 - globals.lastUpdate___111224);
-    s.dt___122207 = (r0);
-    globals.lastUpdate___111224 = (s.time___122204);
-    s.i___122213 = (0);
+    s.time___97535 = (r0);
+    r0 = (s.time___97535 - globals.lastUpdate___86063);
+    s.dt___97538 = (r0);
+    globals.lastUpdate___86063 = (s.time___97535);
+    s.i___97544 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___122213;
-    r0 = pxsim_Array__length(s.sources___122197);
+    s.tmp_1 = r0 = s.i___97544;
+    r0 = pxsim_Array__length(s.sources___97528);
     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__P109182_mk(s);
-    r0 = pxsim_Array__getAt(s.sources___122197, s.i___122213);
+    s.tmp_3 = particles_ParticleSource__update__P83961_mk(s);
+    r0 = pxsim_Array__getAt(s.sources___97528, s.i___97544);
     s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = s.dt___122207;
-    s.callLocIdx = 1129; s.pc = 8; return s.tmp_3;
+    s.tmp_3.arg1 = s.dt___97538;
+    s.callLocIdx = 1133; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
-    r0 = (s.i___122213 + 1);
-    s.i___122213 = (r0);
+    r0 = (s.i___97544 + 1);
+    s.i___97544 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -17749,28 +17778,28 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_updateParticles__P111230.info = {"start":9501,"length":340,"line":312,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"updateParticles","argumentNames":[]}
+particles_updateParticles__P86069.info = {"start":9501,"length":340,"line":312,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"updateParticles","argumentNames":[]}
 
-function particles_updateParticles__P111230_mk(s) {
+function particles_updateParticles__P86069_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_updateParticles__P111230, depth: s.depth + 1,
+        parent: s, fn: particles_updateParticles__P86069, 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___122197: undefined,
-  time___122204: undefined,
-  dt___122207: undefined,
-  i___122213: undefined,
+  sources___97528: undefined,
+  time___97535: undefined,
+  dt___97538: undefined,
+  i___97544: undefined,
 } }
 
 
 
 
 
-function particles_ParticleSource__update__P109182(s) {
+function particles_ParticleSource__update__P83961(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17780,16 +17809,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___122276 = undefined;
-    s.current___122295 = undefined;
-    s.fixedDt___122303 = undefined;
+    s.p___97607 = undefined;
+    s.current___97626 = undefined;
+    s.fixedDt___97634 = 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__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["timer"];
     s.tmp_2 = r0;
@@ -17815,9 +17844,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__P109189_mk(s);
+    s.tmp_0 = particles_ParticleSource_destroy__P83968_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1100; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1104; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
   case 1:
@@ -17840,7 +17869,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 = 1101; s.pc = 29; return s.tmp_2; }
+     else { s.callLocIdx = 1105; s.pc = 29; return s.tmp_2; }
     }
   case 29:
     r0 = s.retval;
@@ -17863,7 +17892,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 = 1102; s.pc = 30; return s.tmp_5; }
+     else { s.callLocIdx = 1106; s.pc = 30; return s.tmp_5; }
     }
   case 30:
     r0 = s.retval;
@@ -17888,9 +17917,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 13; continue; }
   case 12:
-    s.tmp_2 = particles_ParticleSource_enabled__P109187_mk(s);
+    s.tmp_2 = particles_ParticleSource_enabled__P83966_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1103; s.pc = 31; return s.tmp_2;
+    s.callLocIdx = 1107; s.pc = 31; return s.tmp_2;
   case 31:
     r0 = s.retval;
   case 13:
@@ -17906,18 +17935,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__C109211_v0_2_mk(s);
+    s.tmp_0 = particles_ParticleFactory__C83990_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__C109211_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C83990_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___122276 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.p___122276);
+    s.p___97607 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.p___97607);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -17928,8 +17957,8 @@ switch (step) {
   case 15:
     r0 = s.arg0.fields["head"];
     s.tmp_2 = r0;
-    r0 = (s.p___122276).fields["next"] = (s.tmp_2);
-    r0 = (s.arg0).fields["head"] = (s.p___122276);
+    r0 = (s.p___97607).fields["next"] = (s.tmp_2);
+    r0 = (s.arg0).fields["head"] = (s.p___97607);
     { step = 11; continue; }
   case 16:
     r0 = s.arg0.fields["head"];
@@ -17944,7 +17973,7 @@ switch (step) {
   case 17:
   case 18:
     r0 = s.arg0.fields["head"];
-    s.current___122295 = (r0);
+    s.current___97626 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["_dt"];
     s.tmp_2 = r0;
@@ -17956,36 +17985,36 @@ switch (step) {
     r0 = (s.tmp_0 * 256);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 | 0);
-    s.fixedDt___122303 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.fixedDt___122303);
+    s.fixedDt___97634 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.fixedDt___97634);
     if (!r0) { step = 23; continue; }
   case 19:
-    r0 = s.current___122295.fields["lifespan"];
+    r0 = s.current___97626.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___122295;
+    s.tmp_2 = r0 = s.current___97626;
     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__C109175_v4_3_mk(s);
+    s.tmp_0 = particles_ParticleSource__C83954_v4_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.current___122295;
-    s.tmp_0.arg2 = s.fixedDt___122303;
-    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleSource__C109175_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.current___97626;
+    s.tmp_0.arg2 = s.fixedDt___97634;
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleSource__C83954_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___122295.fields["next"];
+    r0 = s.current___97626.fields["next"];
     s.tmp_0 = r0;
-    s.current___122295 = (r0);
+    s.current___97626 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
     { step = 19; continue; }
@@ -17994,15 +18023,15 @@ switch (step) {
     { step = 26; continue; }
   case 23:
   case 24:
-    s.tmp_0 = r0 = s.current___122295;
+    s.tmp_0 = r0 = s.current___97626;
     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___122295.fields["next"];
+    r0 = s.current___97626.fields["next"];
     s.tmp_0 = r0;
-    s.current___122295 = (r0);
+    s.current___97626 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 25; continue; }
     { step = 24; continue; }
@@ -18013,12 +18042,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource__update__P109182.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"]}
+particles_ParticleSource__update__P83961.info = {"start":3677,"length":1400,"line":123,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"_update","argumentNames":["this","dt"]}
 
-function particles_ParticleSource__update__P109182_mk(s) {
+function particles_ParticleSource__update__P83961_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource__update__P109182, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource__update__P83961, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18028,9 +18057,9 @@ function particles_ParticleSource__update__P109182_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  p___122276: undefined,
-  current___122295: undefined,
-  fixedDt___122303: undefined,
+  p___97607: undefined,
+  current___97626: undefined,
+  fixedDt___97634: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -18039,7 +18068,7 @@ function particles_ParticleSource__update__P109182_mk(s) {
 
 
 
-function particles_ParticleSource_updateParticle__P111226(s) {
+function particles_ParticleSource_updateParticle__P86065(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18056,7 +18085,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     r0 = (s.arg2 >> 10);
     s.arg2 = (r0);
     s.tmp_0 = r0 = s.arg1;
@@ -18111,12 +18140,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_updateParticle__P111226.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"]}
+particles_ParticleSource_updateParticle__P86065.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"]}
 
-function particles_ParticleSource_updateParticle__P111226_mk(s) {
+function particles_ParticleSource_updateParticle__P86065_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_updateParticle__P111226, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_updateParticle__P86065, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18133,7 +18162,7 @@ function particles_ParticleSource_updateParticle__P111226_mk(s) {
 
 
 
-function Fx_rightShift__P106773(s) {
+function Fx_rightShift__P81437(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18152,12 +18181,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_rightShift__P106773.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__P81437.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__P106773_mk(s) {
+function Fx_rightShift__P81437_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_rightShift__P106773, depth: s.depth + 1,
+        parent: s, fn: Fx_rightShift__P81437, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -18167,7 +18196,7 @@ function Fx_rightShift__P106773_mk(s) {
 
 
 
-function Fx_mul__P106764(s) {
+function Fx_mul__P81428(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18188,12 +18217,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_mul__P106764.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__P81428.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__P106764_mk(s) {
+function Fx_mul__P81428_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_mul__P106764, depth: s.depth + 1,
+        parent: s, fn: Fx_mul__P81428, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -18204,7 +18233,7 @@ function Fx_mul__P106764_mk(s) {
 
 
 
-function Fx_add__P106761(s) {
+function Fx_add__P81425(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18223,12 +18252,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_add__P106761.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__P81425.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__P106761_mk(s) {
+function Fx_add__P81425_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_add__P106761, depth: s.depth + 1,
+        parent: s, fn: Fx_add__P81425, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -18238,7 +18267,7 @@ function Fx_add__P106761_mk(s) {
 
 
 
-function particles_ParticleFactory_createParticle__P109213(s) {
+function particles_ParticleFactory_createParticle__P83992(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18248,17 +18277,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___122400 = undefined;
+    s.p___97731 = 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__C109211_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(particles_Particle__C109156_VT);
-    s.p___122400 = (r0);
-    s.tmp_0 = r0 = s.p___122400;
+    if (!checkSubtype(r0, particles_ParticleFactory__C83990_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_Particle__C83935_VT);
+    s.p___97731 = (r0);
+    s.tmp_0 = r0 = s.p___97731;
     s.tmp_3 = if_x_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -18267,7 +18296,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 = 1154; s.pc = 1; return s.tmp_3; }
+     else { s.callLocIdx = 1158; s.pc = 1; return s.tmp_3; }
     }
   case 1:
     r0 = s.retval;
@@ -18277,7 +18306,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___122400;
+    s.tmp_0 = r0 = s.p___97731;
     s.tmp_3 = if_y_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -18286,7 +18315,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 = 1156; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 1160; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -18296,26 +18325,26 @@ switch (step) {
     r0 = (s.tmp_4 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    r0 = (s.p___122400).fields["vx"] = (0);
-    r0 = (s.p___122400).fields["vy"] = (0);
-    r0 = (s.p___122400).fields["lifespan"] = (500);
-    r0 = s.p___122400;
+    r0 = (s.p___97731).fields["vx"] = (0);
+    r0 = (s.p___97731).fields["vy"] = (0);
+    r0 = (s.p___97731).fields["lifespan"] = (500);
+    r0 = s.p___97731;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_createParticle__P109213.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"]}
+particles_ParticleFactory_createParticle__P83992.info = {"start":1822,"length":282,"line":67,"column":8,"endLine":77,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_ParticleFactory_createParticle__P109213_mk(s) {
+function particles_ParticleFactory_createParticle__P83992_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_createParticle__P109213, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_createParticle__P83992, 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___122400: undefined,
+  p___97731: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -18324,7 +18353,7 @@ function particles_ParticleFactory_createParticle__P109213_mk(s) {
 
 
 
-function game_onUpdateInterval__P109041(s) {
+function game_onUpdateInterval__P83820(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18334,15 +18363,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.timer___121234 = undefined;
+    s.timer___96565 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P110879_mk(s);
+    s.tmp_0 = game_init__P85718_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 900; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 904; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
@@ -18364,22 +18393,22 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_pxtrt.mklocRef();
-    s.timer___121234 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.timer___121234, 0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P121238);
+    s.timer___96565 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.timer___96565, 0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P96569);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.timer___121234);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.timer___96565);
     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__P107001_mk(s);
-    s.tmp_2 = game_eventContext__P109032_mk(s);
-    s.callLocIdx = 901; s.pc = 8; return s.tmp_2;
+    s.tmp_1 = control_EventContext_registerFrameHandler__P81665_mk(s);
+    s.tmp_2 = game_eventContext__P83811_mk(s);
+    s.callLocIdx = 905; 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 = 905; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 909; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
   case 5:
@@ -18387,17 +18416,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onUpdateInterval__P109041.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"]}
+game_onUpdateInterval__P83820.info = {"start":7929,"length":417,"line":256,"column":4,"endLine":267,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onUpdateInterval","argumentNames":["period","a"]}
 
-function game_onUpdateInterval__P109041_mk(s) {
+function game_onUpdateInterval__P83820_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onUpdateInterval__P109041, depth: s.depth + 1,
+        parent: s, fn: game_onUpdateInterval__P83820, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  timer___121234: undefined,
+  timer___96565: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -18406,7 +18435,7 @@ function game_onUpdateInterval__P109041_mk(s) {
 
 
 
-function inline__P121238(s) {
+function inline__P96569(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18416,28 +18445,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.time___121239 = undefined;
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 902; s.pc = 3; return s.tmp_1;
+    s.time___96570 = undefined;
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 906; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_millis"];
-    s.time___121239 = (r0);
+    s.time___96570 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.time___121239);
+    r0 = (s.tmp_1 <= s.time___96570);
     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___121239 + s.caps[1]);
+    r0 = (s.time___96570 + 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 = 904; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 908; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -18446,25 +18475,25 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P121238.info = {"start":8159,"length":179,"line":260,"column":81,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":[]}
+inline__P96569.info = {"start":8159,"length":179,"line":260,"column":81,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P121238_mk(s) {
+function inline__P96569_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P121238, depth: s.depth + 1,
+        parent: s, fn: inline__P96569, 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___121239: undefined,
+  time___96570: undefined,
 } }
 
 
 
 
 
-function scene_Scene_millis__P108940(s) {
+function scene_Scene_millis__P83719(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18479,17 +18508,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C108916_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C83695_VT)) failedCast(r0);
     r0 = s.arg0.fields["_millis"];
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_millis__P108940.info = {"start":6788,"length":61,"line":189,"column":8,"endLine":191,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"millis","argumentNames":["this"]}
+scene_Scene_millis__P83719.info = {"start":6788,"length":61,"line":189,"column":8,"endLine":191,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"millis","argumentNames":["this"]}
 
-function scene_Scene_millis__P108940_mk(s) {
+function scene_Scene_millis__P83719_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_millis__P108940, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_millis__P83719, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -18498,7 +18527,7 @@ function scene_Scene_millis__P108940_mk(s) {
 
 
 
-function control_EventContext_registerFrameHandler__P107001(s) {
+function control_EventContext_registerFrameHandler__P81665(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18508,8 +18537,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fn___121266 = undefined;
-    s.i___121275 = undefined;
+    s.fn___96597 = undefined;
+    s.i___96606 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -18517,7 +18546,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C81657_VT)) failedCast(r0);
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -18530,20 +18559,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__P110595_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameCallbacks__P85379_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 97; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(control_FrameCallback__C106990_VT);
-    s.fn___121266 = (r0);
-    r0 = (s.fn___121266).fields["order"] = (s.arg1);
-    r0 = (s.fn___121266).fields["handler"] = (s.arg2);
-    s.i___121275 = (0);
+    r0 = pxsim_pxtcore_mkClassInstance(control_FrameCallback__C81654_VT);
+    s.fn___96597 = (r0);
+    r0 = (s.fn___96597).fields["order"] = (s.arg1);
+    r0 = (s.fn___96597).fields["handler"] = (s.arg2);
+    s.i___96606 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___121275;
+    s.tmp_1 = r0 = s.i___96606;
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -18554,7 +18583,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___121275);
+    r0 = pxsim_Array__getAt(s.tmp_6, s.i___96606);
     r0 = r0.fields["order"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > s.arg1);
@@ -18563,29 +18592,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___121275, s.fn___121266);
-    r0 = s.fn___121266;
+    r0 = pxsim_Array_.insertAt(s.tmp_7, s.i___96606, s.fn___96597);
+    r0 = s.fn___96597;
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.i___121275 + 1);
-    s.i___121275 = (r0);
+    r0 = (s.i___96606 + 1);
+    s.i___96606 = (r0);
     { step = 3; continue; }
   case 6:
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.fn___121266);
-    r0 = s.fn___121266;
+    r0 = pxsim_Array__push(s.tmp_0, s.fn___96597);
+    r0 = s.fn___96597;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameHandler__P107001.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__P81665.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__P107001_mk(s) {
+function control_EventContext_registerFrameHandler__P81665_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerFrameHandler__P107001, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerFrameHandler__P81665, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18595,8 +18624,8 @@ function control_EventContext_registerFrameHandler__P107001_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  fn___121266: undefined,
-  i___121275: undefined,
+  fn___96597: undefined,
+  i___96606: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -18606,7 +18635,7 @@ function control_EventContext_registerFrameHandler__P107001_mk(s) {
 
 
 
-function control_EventContext_registerFrameCallbacks__P110595(s) {
+function control_EventContext_registerFrameCallbacks__P85379(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18616,13 +18645,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.worker___121309 = undefined;
+    s.worker___96640 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C81657_VT)) failedCast(r0);
     r0 = s.arg0.fields["frameCallbacks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -18635,28 +18664,28 @@ switch (step) {
   case 1:
   case 2:
     r0 = s.arg0.fields["frameWorker"];
-    s.worker___121309 = (r0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P121315);
+    s.worker___96640 = (r0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P96646);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.worker___121309);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.worker___96640);
     r0 = pxsim.control.runInParallel(s.tmp_0);
   case 3:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameCallbacks__P110595.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__P85379.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__P110595_mk(s) {
+function control_EventContext_registerFrameCallbacks__P85379_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerFrameCallbacks__P110595, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerFrameCallbacks__P85379, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  worker___121309: undefined,
+  worker___96640: undefined,
   arg0: undefined,
 } }
 
@@ -18664,7 +18693,7 @@ function control_EventContext_registerFrameCallbacks__P110595_mk(s) {
 
 
 
-function inline__P121315(s) {
+function inline__P96646(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18674,15 +18703,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.delay___121345 = undefined;
+    s.delay___96676 = 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__P121321);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96652);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.caps[0]);
-    s.tmp_2 = pauseUntil__P106965_mk(s);
+    s.tmp_2 = pauseUntil__P81629_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     s.tmp_2.arg1 = undefined;
     s.callLocIdx = 91; s.pc = 5; return s.tmp_2;
@@ -18705,14 +18734,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__P110594_mk(s);
+    s.tmp_2 = control_EventContext_runCallbacks__P85378_mk(s);
     s.tmp_2.arg0 = s.caps[0];
     s.callLocIdx = 92; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
-    s.delay___121345 = (r0);
-    s.tmp_0 = pause__P107011_mk(s);
-    s.tmp_0.arg0 = s.delay___121345;
+    s.delay___96676 = (r0);
+    s.tmp_0 = pause__P81675_mk(s);
+    s.tmp_0.arg0 = s.delay___96676;
     s.callLocIdx = 93; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
@@ -18723,24 +18752,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P121315.info = {"start":3642,"length":723,"line":109,"column":34,"endLine":128,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+inline__P96646.info = {"start":3642,"length":723,"line":109,"column":34,"endLine":128,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P121315_mk(s) {
+function inline__P96646_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P121315, depth: s.depth + 1,
+        parent: s, fn: inline__P96646, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  delay___121345: undefined,
+  delay___96676: undefined,
 } }
 
 
 
 
 
-function inline__P121321(s) {
+function inline__P96652(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18758,12 +18787,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P121321.info = {"start":3873,"length":28,"line":113,"column":31,"endLine":113,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+inline__P96652.info = {"start":3873,"length":28,"line":113,"column":31,"endLine":113,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P121321_mk(s) {
+function inline__P96652_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P121321, depth: s.depth + 1,
+        parent: s, fn: inline__P96652, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18773,7 +18802,7 @@ function inline__P121321_mk(s) {
 
 
 
-function control_EventContext_runCallbacks__P110594(s) {
+function control_EventContext_runCallbacks__P85378(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18783,42 +18812,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.loopStart___121354 = undefined;
-    s.f___121367 = undefined;
-    s.unnamed16736___U2 = undefined;
-    s.unnamed16737___U3 = undefined;
-    s.runtime___121372 = undefined;
-    s.fps___121392 = undefined;
-    s.delay___121454 = undefined;
+    s.loopStart___96685 = undefined;
+    s.f___96698 = undefined;
+    s.unnamed1788___U2 = undefined;
+    s.unnamed1789___U3 = undefined;
+    s.runtime___96703 = undefined;
+    s.fps___96723 = undefined;
+    s.delay___96785 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C81657_VT)) failedCast(r0);
     r0 = pxsim.control.millis();
-    s.loopStart___121354 = (r0);
+    s.loopStart___96685 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["prevTimeMillis"];
     s.tmp_2 = r0;
-    r0 = (s.loopStart___121354 - s.tmp_2);
+    r0 = (s.loopStart___96685 - s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["deltaTimeMillis"] = (s.tmp_1);
-    r0 = (s.arg0).fields["prevTimeMillis"] = (s.loopStart___121354);
-    s.f___121367 = (undefined);
+    r0 = (s.arg0).fields["prevTimeMillis"] = (s.loopStart___96685);
+    s.f___96698 = (undefined);
     r0 = s.arg0.fields["frameCallbacks"];
-    s.unnamed16736___U2 = (r0);
-    s.unnamed16737___U3 = (0);
+    s.unnamed1788___U2 = (r0);
+    s.unnamed1789___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16737___U3;
-    r0 = pxsim_Array__length(s.unnamed16736___U2);
+    s.tmp_0 = r0 = s.unnamed1789___U3;
+    r0 = pxsim_Array__length(s.unnamed1788___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16736___U2, s.unnamed16737___U3);
-    s.f___121367 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed1788___U2, s.unnamed1789___U3);
+    s.f___96698 = (r0);
     s.tmp_2 = if_handler_1_mk(s);
-    s.tmp_2.arg0 = s.f___121367;
+    s.tmp_2.arg0 = s.f___96698;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "handler"), 1);
       s.callLocIdx = 88; s.pc = 13; return s.tmp_2;
@@ -18830,19 +18859,19 @@ switch (step) {
     }
   case 13:
     r0 = s.retval;
-    r0 = (s.unnamed16737___U3 + 1);
-    s.unnamed16737___U3 = (r0);
+    r0 = (s.unnamed1789___U3 + 1);
+    s.unnamed1789___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16736___U2 = (undefined);
+    s.unnamed1788___U2 = (undefined);
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.loopStart___121354);
-    s.runtime___121372 = (r0);
+    r0 = (s.tmp_0 - s.loopStart___96685);
+    s.runtime___96703 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["timeInSample"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.runtime___121372);
+    r0 = (s.tmp_2 + s.runtime___96703);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["timeInSample"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
@@ -18875,8 +18904,8 @@ switch (step) {
     r0 = (s.tmp_6 / 1000);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 / s.tmp_5);
-    s.fps___121392 = (r0);
-    r0 = pxsim.Math_.round(s.fps___121392);
+    s.fps___96723 = (r0);
+    r0 = pxsim.Math_.round(s.fps___96723);
     s.tmp_1 = r0;
     if ((s.tmp_1) && (s.tmp_1).vtable) {
     setupResume(s, 14);
@@ -18888,21 +18917,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat("fps:", s.tmp_0);
-    globals.control_EventContext_lastStats___106995 = (r0);
-    r0 = (s.fps___121392 < 99);
+    globals.control_EventContext_lastStats___81659 = (r0);
+    r0 = (s.fps___96723 < 99);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    if ((globals.control_EventContext_lastStats___106995) && (globals.control_EventContext_lastStats___106995).vtable) {
+    if ((globals.control_EventContext_lastStats___81659) && (globals.control_EventContext_lastStats___81659).vtable) {
     setupResume(s, 15);
-    pxsim_String__stringConv(globals.control_EventContext_lastStats___106995);
+    pxsim_String__stringConv(globals.control_EventContext_lastStats___81659);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.control_EventContext_lastStats___106995) + ""; }
+    } else { s.retval = (globals.control_EventContext_lastStats___81659) + ""; }
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.fps___121392 * 10);
+    r0 = (s.fps___96723 * 10);
     s.tmp_7 = r0;
     r0 = pxsim.Math_.round(s.tmp_7);
     s.tmp_6 = r0;
@@ -18929,10 +18958,10 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_2);
-    globals.control_EventContext_lastStats___106995 = (r0);
+    globals.control_EventContext_lastStats___81659 = (r0);
   case 5:
   case 6:
-    s.tmp_2 = control_ramSize__P106944_mk(s);
+    s.tmp_2 = control_ramSize__P81608_mk(s);
     s.callLocIdx = 89; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
@@ -18952,7 +18981,7 @@ switch (step) {
     if (!r0) { step = 9; continue; }
     r0 = pxsim_String_.mkEmpty();
     s.tmp_8 = r0;
-    r0 = (s.fps___121392 * 100);
+    r0 = (s.fps___96723 * 100);
     s.tmp_11 = r0;
     r0 = (s.tmp_11 | 0);
     s.tmp_10 = r0;
@@ -18993,24 +19022,24 @@ switch (step) {
     r0 = (s.arg0).fields["framesInSample"] = (0);
   case 11:
   case 12:
-    s.tmp_0 = Math_max__P106734_mk(s);
+    s.tmp_0 = Math_max__P81398_mk(s);
     s.tmp_0.arg0 = 1;
-    r0 = (20 - s.runtime___121372);
+    r0 = (20 - s.runtime___96703);
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 90; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.delay___121454 = (r0);
-    r0 = s.delay___121454;
+    s.delay___96785 = (r0);
+    r0 = s.delay___96785;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_runCallbacks__P110594.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__P85378.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__P110594_mk(s) {
+function control_EventContext_runCallbacks__P85378_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_runCallbacks__P110594, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_runCallbacks__P85378, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19026,13 +19055,13 @@ function control_EventContext_runCallbacks__P110594_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  loopStart___121354: undefined,
-  f___121367: undefined,
-  unnamed16736___U2: undefined,
-  unnamed16737___U3: undefined,
-  runtime___121372: undefined,
-  fps___121392: undefined,
-  delay___121454: undefined,
+  loopStart___96685: undefined,
+  f___96698: undefined,
+  unnamed1788___U2: undefined,
+  unnamed1789___U3: undefined,
+  runtime___96703: undefined,
+  fps___96723: undefined,
+  delay___96785: undefined,
   arg0: undefined,
 } }
 
@@ -19040,7 +19069,7 @@ function control_EventContext_runCallbacks__P110594_mk(s) {
 
 
 
-function pauseUntil__P106965(s) {
+function pauseUntil__P81629(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19087,7 +19116,7 @@ switch (step) {
     s.arg1 = (0);
   case 5:
   case 6:
-    s.tmp_0 = control___queuePollEvent__P106964_mk(s);
+    s.tmp_0 = control___queuePollEvent__P81628_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = undefined;
@@ -19099,12 +19128,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pauseUntil__P106965.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__P81629.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__P106965_mk(s) {
+function pauseUntil__P81629_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pauseUntil__P106965, depth: s.depth + 1,
+        parent: s, fn: pauseUntil__P81629, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19120,7 +19149,7 @@ function pauseUntil__P106965_mk(s) {
 
 
 
-function control___queuePollEvent__P106964(s) {
+function control___queuePollEvent__P81628(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19130,16 +19159,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ev___121476 = undefined;
+    s.ev___96807 = 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__C110568_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_PollEvent__C85352_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_PollEvent_constructor__P110569_mk(s);
+    s.tmp_1 = control_PollEvent_constructor__P85353_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = pxsim.control.allocateNotifyEvent();
     s.tmp_1.arg1 = r0;
@@ -19155,8 +19184,8 @@ switch (step) {
     s.callLocIdx = 35; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.ev___121476 = (s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(globals._pollEventQueue___110571);
+    s.ev___96807 = (s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(globals._pollEventQueue___85355);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -19164,19 +19193,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___121476);
-    globals._pollEventQueue___110571 = (s.tmp_2);
-    r0 = pxsim.control.runInParallel(control_pollEvents__P110572);
+    r0 = pxsim_Array__push(s.tmp_2, s.ev___96807);
+    globals._pollEventQueue___85355 = (s.tmp_2);
+    r0 = pxsim.control.runInParallel(control_pollEvents__P85356);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__push(globals._pollEventQueue___110571, s.ev___121476);
+    r0 = pxsim_Array__push(globals._pollEventQueue___85355, s.ev___96807);
   case 2:
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = control_onEvent__P106989_mk(s);
-    r0 = s.ev___121476.fields["eid"];
+    s.tmp_0 = control_onEvent__P81653_mk(s);
+    r0 = s.ev___96807.fields["eid"];
     s.tmp_0.arg0 = r0;
-    r0 = s.ev___121476.fields["vid"];
+    r0 = s.ev___96807.fields["vid"];
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = 16;
@@ -19185,9 +19214,9 @@ switch (step) {
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    r0 = s.ev___121476.fields["eid"];
+    r0 = s.ev___96807.fields["eid"];
     s.tmp_0 = r0;
-    r0 = s.ev___121476.fields["vid"];
+    r0 = s.ev___96807.fields["vid"];
     s.tmp_1 = r0;
     setupResume(s, 7);
     pxsim.control.waitForEvent(s.tmp_0, s.tmp_1);
@@ -19200,17 +19229,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control___queuePollEvent__P106964.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__P81628.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__P106964_mk(s) {
+function control___queuePollEvent__P81628_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control___queuePollEvent__P106964, depth: s.depth + 1,
+        parent: s, fn: control___queuePollEvent__P81628, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  ev___121476: undefined,
+  ev___96807: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -19220,7 +19249,7 @@ function control___queuePollEvent__P106964_mk(s) {
 
 
 
-function control_pollEvents__P110572(s) {
+function control_pollEvents__P85356(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19230,31 +19259,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.now___121602 = undefined;
-    s.i___121605 = undefined;
-    s.ev___121611 = undefined;
+    s.now___96933 = undefined;
+    s.i___96936 = undefined;
+    s.ev___96942 = undefined;
   case 1:
-    r0 = pxsim_Array__length(globals._pollEventQueue___110571);
+    r0 = pxsim_Array__length(globals._pollEventQueue___85355);
     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___121602 = (r0);
-    s.i___121605 = (0);
+    s.now___96933 = (r0);
+    s.i___96936 = (0);
   case 2:
-    s.tmp_1 = r0 = s.i___121605;
-    r0 = pxsim_Array__length(globals._pollEventQueue___110571);
+    s.tmp_1 = r0 = s.i___96936;
+    r0 = pxsim_Array__length(globals._pollEventQueue___85355);
     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___110571, s.i___121605);
-    s.ev___121611 = (r0);
+    r0 = pxsim_Array__getAt(globals._pollEventQueue___85355, s.i___96936);
+    s.ev___96942 = (r0);
     s.tmp_1 = if_condition_1_mk(s);
-    s.tmp_1.arg0 = s.ev___121611;
+    s.tmp_1.arg0 = s.ev___96942;
     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;
@@ -19272,7 +19301,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 3:
-    r0 = s.ev___121611.fields["timeOut"];
+    r0 = s.ev___96942.fields["timeOut"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 > 0);
     s.tmp_2 = r0;
@@ -19281,11 +19310,11 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 5; continue; }
   case 4:
-    r0 = s.ev___121611.fields["start"];
+    r0 = s.ev___96942.fields["start"];
     s.tmp_5 = r0;
-    r0 = (s.now___121602 - s.tmp_5);
+    r0 = (s.now___96933 - s.tmp_5);
     s.tmp_4 = r0;
-    r0 = s.ev___121611.fields["timeOut"];
+    r0 = s.ev___96942.fields["timeOut"];
     s.tmp_6 = r0;
     r0 = (s.tmp_4 > s.tmp_6);
   case 5:
@@ -19297,50 +19326,50 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 9; continue; }
-    r0 = s.ev___121611.fields["eid"];
+    r0 = s.ev___96942.fields["eid"];
     s.tmp_9 = r0;
-    r0 = s.ev___121611.fields["vid"];
+    r0 = s.ev___96942.fields["vid"];
     s.tmp_10 = r0;
     r0 = pxsim.control.raiseEvent(s.tmp_9, s.tmp_10);
-    r0 = s.ev___121611.fields["once"];
+    r0 = s.ev___96942.fields["once"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = helpers_arraySplice__P106707_mk(s);
-    s.tmp_1.arg0 = globals._pollEventQueue___110571;
-    s.tmp_1.arg1 = s.i___121605;
+    s.tmp_1 = helpers_arraySplice__P81369_mk(s);
+    s.tmp_1.arg0 = globals._pollEventQueue___85355;
+    s.tmp_1.arg1 = s.i___96936;
     s.tmp_1.arg2 = 1;
     s.callLocIdx = 33; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
-    r0 = (s.i___121605 - 1);
-    s.i___121605 = (r0);
+    r0 = (s.i___96936 - 1);
+    s.i___96936 = (r0);
   case 7:
   case 8:
   case 9:
   case 10:
-    r0 = (s.i___121605 + 1);
-    s.i___121605 = (r0);
+    r0 = (s.i___96936 + 1);
+    s.i___96936 = (r0);
     { step = 2; continue; }
   case 11:
-    s.tmp_0 = pause__P107011_mk(s);
+    s.tmp_0 = pause__P81675_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___110571 = (undefined);
+    globals._pollEventQueue___85355 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_pollEvents__P110572.info = {"start":618,"length":638,"line":20,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"pollEvents","argumentNames":[]}
+control_pollEvents__P85356.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__P110572_mk(s) {
+function control_pollEvents__P85356_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_pollEvents__P110572, depth: s.depth + 1,
+        parent: s, fn: control_pollEvents__P85356, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19353,16 +19382,16 @@ function control_pollEvents__P110572_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  now___121602: undefined,
-  i___121605: undefined,
-  ev___121611: undefined,
+  now___96933: undefined,
+  i___96936: undefined,
+  ev___96942: undefined,
 } }
 
 
 
 
 
-function helpers_arraySplice__P106707(s) {
+function helpers_arraySplice__P81369(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19372,7 +19401,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___125140 = undefined;
+    s.i___100524 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -19386,15 +19415,15 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.i___125140 = (0);
+    s.i___100524 = (0);
   case 3:
-    r0 = (s.i___125140 < s.arg2);
+    r0 = (s.i___100524 < 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___125140 + 1);
-    s.i___125140 = (r0);
+    r0 = (s.i___100524 + 1);
+    s.i___100524 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -19402,15 +19431,15 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySplice__P106707.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__P81369.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__P106707_mk(s) {
+function helpers_arraySplice__P81369_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySplice__P106707, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySplice__P81369, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  i___125140: undefined,
+  i___100524: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -19420,7 +19449,7 @@ function helpers_arraySplice__P106707_mk(s) {
 
 
 
-function control_PollEvent_constructor__P110569(s) {
+function control_PollEvent_constructor__P85353(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19441,7 +19470,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_PollEvent__C110568_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_PollEvent__C85352_VT)) failedCast(r0);
     r0 = (s.arg0).fields["eid"] = (s.arg1);
     r0 = (s.arg0).fields["vid"] = (s.arg2);
     r0 = (s.arg0).fields["start"] = (s.arg3);
@@ -19452,12 +19481,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_PollEvent_constructor__P110569.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__P85353.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__P110569_mk(s) {
+function control_PollEvent_constructor__P85353_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_PollEvent_constructor__P110569, depth: s.depth + 1,
+        parent: s, fn: control_PollEvent_constructor__P85353, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -19472,7 +19501,7 @@ function control_PollEvent_constructor__P110569_mk(s) {
 
 
 
-function game_onUpdate__P109040(s) {
+function game_onUpdate__P83819(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19486,9 +19515,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P110879_mk(s);
+    s.tmp_0 = game_init__P85718_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 897; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 901; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -19500,15 +19529,15 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = control_EventContext_registerFrameHandler__P107001_mk(s);
-    s.tmp_3 = game_eventContext__P109032_mk(s);
-    s.callLocIdx = 898; s.pc = 6; return s.tmp_3;
+    s.tmp_2 = control_EventContext_registerFrameHandler__P81665_mk(s);
+    s.tmp_3 = game_eventContext__P83811_mk(s);
+    s.callLocIdx = 902; 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 = 899; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 903; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -19516,12 +19545,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onUpdate__P109040.info = {"start":7427,"length":169,"line":242,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"onUpdate","argumentNames":["a"]}
+game_onUpdate__P83819.info = {"start":7427,"length":169,"line":242,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onUpdate","argumentNames":["a"]}
 
-function game_onUpdate__P109040_mk(s) {
+function game_onUpdate__P83819_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onUpdate__P109040, depth: s.depth + 1,
+        parent: s, fn: game_onUpdate__P83819, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19534,7 +19563,7 @@ function game_onUpdate__P109040_mk(s) {
 
 
 
-function particles_SprayFactory_constructor__P109216(s) {
+function particles_SprayFactory_constructor__P83995(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19552,35 +19581,35 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C109215_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C83994_VT)) failedCast(r0);
     r0 = undefined;
-    s.tmp_0 = particles_initTrig__P111250_mk(s);
-    s.callLocIdx = 1161; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = particles_initTrig__P86089_mk(s);
+    s.callLocIdx = 1165; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = particles_SprayFactory_setSpeed__P109219_mk(s);
+    s.tmp_0 = particles_SprayFactory_setSpeed__P83998_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1162; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1166; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = particles_SprayFactory_setDirection__P109220_mk(s);
+    s.tmp_0 = particles_SprayFactory_setDirection__P83999_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
     s.tmp_0.arg2 = s.arg3;
-    s.callLocIdx = 1163; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1167; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_constructor__P109216.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"]}
+particles_SprayFactory_constructor__P83995.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"]}
 
-function particles_SprayFactory_constructor__P109216_mk(s) {
+function particles_SprayFactory_constructor__P83995_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_constructor__P109216, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_constructor__P83995, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -19593,7 +19622,7 @@ function particles_SprayFactory_constructor__P109216_mk(s) {
 
 
 
-function particles_initTrig__P111250(s) {
+function particles_initTrig__P86089(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19603,36 +19632,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.cachedSin___111236);
+    r0 = pxsim_numops_toBoolDecr(globals.cachedSin___86075);
     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__P109209_mk(s);
+    s.tmp_2 = particles_cacheSin__P83988_mk(s);
     s.tmp_2.arg0 = 100;
-    s.callLocIdx = 1149; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1153; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    globals.cachedSin___111236 = (r0);
-    s.tmp_0 = particles_cacheCos__P109210_mk(s);
+    globals.cachedSin___86075 = (r0);
+    s.tmp_0 = particles_cacheCos__P83989_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 1150; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1154; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    globals.cachedCos___111237 = (r0);
+    globals.cachedCos___86076 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_initTrig__P111250.info = {"start":291,"length":155,"line":11,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"initTrig","argumentNames":[]}
+particles_initTrig__P86089.info = {"start":291,"length":155,"line":11,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"initTrig","argumentNames":[]}
 
-function particles_initTrig__P111250_mk(s) {
+function particles_initTrig__P86089_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_initTrig__P111250, depth: s.depth + 1,
+        parent: s, fn: particles_initTrig__P86089, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19643,7 +19672,7 @@ function particles_initTrig__P111250_mk(s) {
 
 
 
-function particles_cacheCos__P109210(s) {
+function particles_cacheCos__P83989(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19653,25 +19682,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cos___121979 = undefined;
-    s.anglePerSlice___121981 = undefined;
-    s.i___121987 = undefined;
+    s.cos___97310 = undefined;
+    s.anglePerSlice___97312 = undefined;
+    s.i___97318 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.cos___121979 = (r0);
+    s.cos___97310 = (r0);
     r0 = (6.283185307179586 / s.arg0);
-    s.anglePerSlice___121981 = (r0);
-    s.i___121987 = (0);
+    s.anglePerSlice___97312 = (r0);
+    s.i___97318 = (0);
   case 1:
-    r0 = (s.i___121987 < s.arg0);
+    r0 = (s.i___97318 < s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.cos___121979;
-    r0 = (s.i___121987 * s.anglePerSlice___121981);
+    s.tmp_1 = r0 = s.cos___97310;
+    r0 = (s.i___97318 * s.anglePerSlice___97312);
     s.tmp_4 = r0;
     r0 = pxsim.Math_.cos(s.tmp_4);
     s.tmp_3 = r0;
@@ -19680,20 +19709,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___121987 + 1);
-    s.i___121987 = (r0);
+    r0 = (s.i___97318 + 1);
+    s.i___97318 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.cos___121979;
+    r0 = s.cos___97310;
     return leave(s, r0)
   default: oops()
 } } }
-particles_cacheCos__P109210.info = {"start":1005,"length":263,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"cacheCos","argumentNames":["slices"]}
+particles_cacheCos__P83989.info = {"start":1005,"length":263,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"cacheCos","argumentNames":["slices"]}
 
-function particles_cacheCos__P109210_mk(s) {
+function particles_cacheCos__P83989_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_cacheCos__P109210, depth: s.depth + 1,
+        parent: s, fn: particles_cacheCos__P83989, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19701,9 +19730,9 @@ function particles_cacheCos__P109210_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  cos___121979: undefined,
-  anglePerSlice___121981: undefined,
-  i___121987: undefined,
+  cos___97310: undefined,
+  anglePerSlice___97312: undefined,
+  i___97318: undefined,
   arg0: undefined,
 } }
 
@@ -19711,7 +19740,7 @@ function particles_cacheCos__P109210_mk(s) {
 
 
 
-function particles_cacheSin__P109209(s) {
+function particles_cacheSin__P83988(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19721,25 +19750,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sin___122005 = undefined;
-    s.anglePerSlice___122007 = undefined;
-    s.i___122013 = undefined;
+    s.sin___97336 = undefined;
+    s.anglePerSlice___97338 = undefined;
+    s.i___97344 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.sin___122005 = (r0);
+    s.sin___97336 = (r0);
     r0 = (6.283185307179586 / s.arg0);
-    s.anglePerSlice___122007 = (r0);
-    s.i___122013 = (0);
+    s.anglePerSlice___97338 = (r0);
+    s.i___97344 = (0);
   case 1:
-    r0 = (s.i___122013 < s.arg0);
+    r0 = (s.i___97344 < s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.sin___122005;
-    r0 = (s.i___122013 * s.anglePerSlice___122007);
+    s.tmp_1 = r0 = s.sin___97336;
+    r0 = (s.i___97344 * s.anglePerSlice___97338);
     s.tmp_4 = r0;
     r0 = pxsim.Math_.sin(s.tmp_4);
     s.tmp_3 = r0;
@@ -19748,20 +19777,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___122013 + 1);
-    s.i___122013 = (r0);
+    r0 = (s.i___97344 + 1);
+    s.i___97344 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.sin___122005;
+    r0 = s.sin___97336;
     return leave(s, r0)
   default: oops()
 } } }
-particles_cacheSin__P109209.info = {"start":594,"length":263,"line":22,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"cacheSin","argumentNames":["slices"]}
+particles_cacheSin__P83988.info = {"start":594,"length":263,"line":22,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"cacheSin","argumentNames":["slices"]}
 
-function particles_cacheSin__P109209_mk(s) {
+function particles_cacheSin__P83988_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_cacheSin__P109209, depth: s.depth + 1,
+        parent: s, fn: particles_cacheSin__P83988, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19769,9 +19798,9 @@ function particles_cacheSin__P109209_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  sin___122005: undefined,
-  anglePerSlice___122007: undefined,
-  i___122013: undefined,
+  sin___97336: undefined,
+  anglePerSlice___97338: undefined,
+  i___97344: undefined,
   arg0: undefined,
 } }
 
@@ -19779,7 +19808,7 @@ function particles_cacheSin__P109209_mk(s) {
 
 
 
-function particles_SprayFactory_setDirection__P109220(s) {
+function particles_SprayFactory_setDirection__P83999(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19796,31 +19825,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C109215_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C83994_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_4 = particles_toRadians__P111255_mk(s);
+    s.tmp_4 = particles_toRadians__P86094_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 = 1171; s.pc = 1; return s.tmp_4;
+    s.callLocIdx = 1175; s.pc = 1; return s.tmp_4;
   case 1:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / globals.angleSlice___111249);
+    r0 = (s.tmp_3 / globals.angleSlice___86088);
     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__P111255_mk(s);
+    s.tmp_4 = particles_toRadians__P86094_mk(s);
     s.tmp_4.arg0 = s.arg2;
-    s.callLocIdx = 1172; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 1176; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / globals.angleSlice___111249);
+    r0 = (s.tmp_3 / globals.angleSlice___86088);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_1 = r0;
@@ -19829,12 +19858,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_setDirection__P109220.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"]}
+particles_SprayFactory_setDirection__P83999.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"]}
 
-function particles_SprayFactory_setDirection__P109220_mk(s) {
+function particles_SprayFactory_setDirection__P83999_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_setDirection__P109220, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_setDirection__P83999, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19852,7 +19881,7 @@ function particles_SprayFactory_setDirection__P109220_mk(s) {
 
 
 
-function particles_toRadians__P111255(s) {
+function particles_toRadians__P86094(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19870,9 +19899,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = Math_abs__P106732_mk(s);
+    s.tmp_3 = Math_abs__P81396_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1153; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1157; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -19889,12 +19918,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_toRadians__P111255.info = {"start":1307,"length":206,"line":45,"column":4,"endLine":52,"endColumn":5,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"toRadians","argumentNames":["degrees"]}
+particles_toRadians__P86094.info = {"start":1307,"length":206,"line":45,"column":4,"endLine":52,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"toRadians","argumentNames":["degrees"]}
 
-function particles_toRadians__P111255_mk(s) {
+function particles_toRadians__P86094_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_toRadians__P111255, depth: s.depth + 1,
+        parent: s, fn: particles_toRadians__P86094, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19907,7 +19936,7 @@ function particles_toRadians__P111255_mk(s) {
 
 
 
-function particles_ParticleFactory_constructor__P109212(s) {
+function particles_ParticleFactory_constructor__P83991(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19922,17 +19951,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleFactory__C109211_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleFactory__C83990_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_constructor__P109212.info = {"start":1617,"length":78,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game---hw/particlefactories.ts","functionName":"inline","argumentNames":["this"]}
+particles_ParticleFactory_constructor__P83991.info = {"start":1617,"length":78,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this"]}
 
-function particles_ParticleFactory_constructor__P109212_mk(s) {
+function particles_ParticleFactory_constructor__P83991_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_constructor__P109212, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_constructor__P83991, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -19941,7 +19970,7 @@ function particles_ParticleFactory_constructor__P109212_mk(s) {
 
 
 
-function particles_ParticleSource_setFactory__P109194(s) {
+function particles_ParticleSource_setFactory__P83973(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19957,7 +19986,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["_factory"] = (s.arg1);
@@ -19967,12 +19996,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setFactory__P109194.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"]}
+particles_ParticleSource_setFactory__P83973.info = {"start":8107,"length":114,"line":271,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setFactory","argumentNames":["this","factory"]}
 
-function particles_ParticleSource_setFactory__P109194_mk(s) {
+function particles_ParticleSource_setFactory__P83973_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setFactory__P109194, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setFactory__P83973, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -19982,7 +20011,7 @@ function particles_ParticleSource_setFactory__P109194_mk(s) {
 
 
 
-function particles_ParticleSource_setRate__P109192(s) {
+function particles_ParticleSource_setRate__P83971(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19998,7 +20027,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (1000 / s.arg1);
     s.tmp_2 = r0;
@@ -20010,12 +20039,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setRate__P109192.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"]}
+particles_ParticleSource_setRate__P83971.info = {"start":7785,"length":139,"line":258,"column":8,"endLine":261,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRate","argumentNames":["this","particlesPerSecond"]}
 
-function particles_ParticleSource_setRate__P109192_mk(s) {
+function particles_ParticleSource_setRate__P83971_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setRate__P109192, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setRate__P83971, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20028,7 +20057,7 @@ function particles_ParticleSource_setRate__P109192_mk(s) {
 
 
 
-function particles_ParticleSource_setAnchor__P109191(s) {
+function particles_ParticleSource_setAnchor__P83970(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20044,18 +20073,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     r0 = (s.arg0).fields["anchor"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setAnchor__P109191.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"]}
+particles_ParticleSource_setAnchor__P83970.info = {"start":7577,"length":79,"line":250,"column":8,"endLine":252,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setAnchor","argumentNames":["this","anchor"]}
 
-function particles_ParticleSource_setAnchor__P109191_mk(s) {
+function particles_ParticleSource_setAnchor__P83970_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setAnchor__P109191, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setAnchor__P83970, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -20065,7 +20094,7 @@ function particles_ParticleSource_setAnchor__P109191_mk(s) {
 
 
 
-function particles_ParticleSource_clear__P109190(s) {
+function particles_ParticleSource_clear__P83969(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20080,18 +20109,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     r0 = (s.arg0).fields["head"] = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_clear__P109190.info = {"start":7407,"length":54,"line":242,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"clear","argumentNames":["this"]}
+particles_ParticleSource_clear__P83969.info = {"start":7407,"length":54,"line":242,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"clear","argumentNames":["this"]}
 
-function particles_ParticleSource_clear__P109190_mk(s) {
+function particles_ParticleSource_clear__P83969_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_clear__P109190, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_clear__P83969, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -20100,7 +20129,7 @@ function particles_ParticleSource_clear__P109190_mk(s) {
 
 
 
-function particles_ParticleSource_destroy__P109189(s) {
+function particles_ParticleSource_destroy__P83968(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20115,11 +20144,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleSource_enabled__P109188_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleSource_enabled__P83967_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1110; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1114; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -20128,21 +20157,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__P109183_mk(s);
+    s.tmp_0 = particles_ParticleSource__prune__P83962_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1111; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1115; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_destroy__P109189.info = {"start":7077,"length":240,"line":232,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"destroy","argumentNames":["this"]}
+particles_ParticleSource_destroy__P83968.info = {"start":7077,"length":240,"line":232,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"destroy","argumentNames":["this"]}
 
-function particles_ParticleSource_destroy__P109189_mk(s) {
+function particles_ParticleSource_destroy__P83968_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_destroy__P109189, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_destroy__P83968, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20154,7 +20183,7 @@ function particles_ParticleSource_destroy__P109189_mk(s) {
 
 
 
-function particles_ParticleSource_enabled__P109188(s) {
+function particles_ParticleSource_enabled__P83967(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20170,11 +20199,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = particles_ParticleSource_enabled__P109187_mk(s);
+    s.tmp_3 = particles_ParticleSource_enabled__P83966_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1109; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1113; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -20203,12 +20232,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_enabled__P109188.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"]}
+particles_ParticleSource_enabled__P83967.info = {"start":6799,"length":214,"line":222,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"enabled","argumentNames":["this","v"]}
 
-function particles_ParticleSource_enabled__P109188_mk(s) {
+function particles_ParticleSource_enabled__P83967_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_enabled__P109188, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_enabled__P83967, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20225,7 +20254,7 @@ function particles_ParticleSource_enabled__P109188_mk(s) {
 
 
 
-function particles_ParticleSource_enabled__P109187(s) {
+function particles_ParticleSource_enabled__P83966(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20240,7 +20269,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 & 1);
@@ -20255,13 +20284,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_enabled__P109187.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__P109187.isGetter = true;
+particles_ParticleSource_enabled__P83966.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__P83966.isGetter = true;
 
-function particles_ParticleSource_enabled__P109187_mk(s) {
+function particles_ParticleSource_enabled__P83966_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_enabled__P109187, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_enabled__P83966, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20275,7 +20304,7 @@ function particles_ParticleSource_enabled__P109187_mk(s) {
 
 
 
-function particles_ParticleSource_setAcceleration__P109184(s) {
+function particles_ParticleSource_setAcceleration__P83963(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20292,7 +20321,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -20309,12 +20338,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setAcceleration__P109184.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"]}
+particles_ParticleSource_setAcceleration__P83963.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"]}
 
-function particles_ParticleSource_setAcceleration__P109184_mk(s) {
+function particles_ParticleSource_setAcceleration__P83963_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setAcceleration__P109184, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setAcceleration__P83963, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20328,7 +20357,7 @@ function particles_ParticleSource_setAcceleration__P109184_mk(s) {
 
 
 
-function particles_SprayFactory_setSpeed__P109219(s) {
+function particles_SprayFactory_setSpeed__P83998(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20344,7 +20373,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C109215_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C83994_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -20355,12 +20384,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_setSpeed__P109219.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"]}
+particles_SprayFactory_setSpeed__P83998.info = {"start":3322,"length":92,"line":119,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"setSpeed","argumentNames":["this","pixelsPerSecond"]}
 
-function particles_SprayFactory_setSpeed__P109219_mk(s) {
+function particles_SprayFactory_setSpeed__P83998_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_setSpeed__P109219, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_setSpeed__P83998, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20373,7 +20402,7 @@ function particles_SprayFactory_setSpeed__P109219_mk(s) {
 
 
 
-function particles_ConfettiFactory_constructor__P109243(s) {
+function particles_ConfettiFactory_constructor__P84022(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20383,8 +20412,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.confetti___122432 = undefined;
-    s.i___122448 = undefined;
+    s.confetti___97763 = undefined;
+    s.i___97779 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -20392,52 +20421,52 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ConfettiFactory__C109242_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ConfettiFactory__C84021_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex122435);
+    r0 = pxsim.image.ofBuffer(_hex97766);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    r0 = pxsim.image.ofBuffer(_hex122437);
+    r0 = pxsim.image.ofBuffer(_hex97768);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_2);
-    r0 = pxsim.image.ofBuffer(_hex122439);
+    r0 = pxsim.image.ofBuffer(_hex97770);
     s.tmp_3 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_3);
-    r0 = pxsim.image.ofBuffer(_hex122441);
+    r0 = pxsim.image.ofBuffer(_hex97772);
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_4);
-    r0 = pxsim.image.ofBuffer(_hex122443);
+    r0 = pxsim.image.ofBuffer(_hex97774);
     s.tmp_5 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_5);
-    s.confetti___122432 = (s.tmp_0);
-    s.tmp_0 = particles_ShapeFactory_constructor__P109238_mk(s);
+    s.confetti___97763 = (s.tmp_0);
+    s.tmp_0 = particles_ShapeFactory_constructor__P84017_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___122432, 0);
+    r0 = pxsim_Array__getAt(s.confetti___97763, 0);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1195; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1199; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.i___122448 = (1);
+    s.i___97779 = (1);
   case 1:
-    s.tmp_1 = r0 = s.i___122448;
-    r0 = pxsim_Array__length(s.confetti___122432);
+    s.tmp_1 = r0 = s.i___97779;
+    r0 = pxsim_Array__length(s.confetti___97763);
     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__P109239_mk(s);
+    s.tmp_3 = particles_ShapeFactory_addShape__P84018_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.confetti___122432, s.i___122448);
+    r0 = pxsim_Array__getAt(s.confetti___97763, s.i___97779);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 1196; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1200; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
-    r0 = (s.i___122448 + 1);
-    s.i___122448 = (r0);
+    r0 = (s.i___97779 + 1);
+    s.i___97779 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = (s.arg0).fields["minLifespan"] = (1000);
@@ -20446,12 +20475,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ConfettiFactory_constructor__P109243.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"]}
+particles_ConfettiFactory_constructor__P84022.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"]}
 
-function particles_ConfettiFactory_constructor__P109243_mk(s) {
+function particles_ConfettiFactory_constructor__P84022_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ConfettiFactory_constructor__P109243, depth: s.depth + 1,
+        parent: s, fn: particles_ConfettiFactory_constructor__P84022, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20459,23 +20488,23 @@ function particles_ConfettiFactory_constructor__P109243_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  confetti___122432: undefined,
-  i___122448: undefined,
+  confetti___97763: undefined,
+  i___97779: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
 } }
 
-const _hex122435 = pxsim.BufferMethods.createBufferFromHex("87040100010000000f000000")
-const _hex122437 = pxsim.BufferMethods.createBufferFromHex("8704010002000000ff000000")
-const _hex122439 = pxsim.BufferMethods.createBufferFromHex("87040200010000000f0000000f000000")
-const _hex122441 = pxsim.BufferMethods.createBufferFromHex("8704020002000000ff0000000f000000")
-const _hex122443 = pxsim.BufferMethods.createBufferFromHex("87040200020000000f000000ff000000")
+const _hex97766 = pxsim.BufferMethods.createBufferFromHex("87040100010000000f000000")
+const _hex97768 = pxsim.BufferMethods.createBufferFromHex("8704010002000000ff000000")
+const _hex97770 = pxsim.BufferMethods.createBufferFromHex("87040200010000000f0000000f000000")
+const _hex97772 = pxsim.BufferMethods.createBufferFromHex("8704020002000000ff0000000f000000")
+const _hex97774 = pxsim.BufferMethods.createBufferFromHex("87040200020000000f000000ff000000")
 
 
 
 
-function particles_ShapeFactory_addShape__P109239(s) {
+function particles_ShapeFactory_addShape__P84018(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20491,7 +20520,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C109237_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ShapeFactory__C84016_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["sources"];
@@ -20503,12 +20532,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_addShape__P109239.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"]}
+particles_ShapeFactory_addShape__P84018.info = {"start":7079,"length":83,"line":225,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"addShape","argumentNames":["this","shape"]}
 
-function particles_ShapeFactory_addShape__P109239_mk(s) {
+function particles_ShapeFactory_addShape__P84018_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_addShape__P109239, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_addShape__P84018, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -20519,7 +20548,7 @@ function particles_ShapeFactory_addShape__P109239_mk(s) {
 
 
 
-function particles_ShapeFactory_constructor__P109238(s) {
+function particles_ShapeFactory_constructor__P84017(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20537,14 +20566,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C109237_VT)) failedCast(r0);
-    s.tmp_0 = particles_AreaFactory_constructor__P109226_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C84016_VT)) failedCast(r0);
+    s.tmp_0 = particles_AreaFactory_constructor__P84005_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 = 1185; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1189; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
@@ -20575,12 +20604,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_constructor__P109238.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"]}
+particles_ShapeFactory_constructor__P84017.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"]}
 
-function particles_ShapeFactory_constructor__P109238_mk(s) {
+function particles_ShapeFactory_constructor__P84017_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_constructor__P109238, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_constructor__P84017, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20597,7 +20626,7 @@ function particles_ShapeFactory_constructor__P109238_mk(s) {
 
 
 
-function particles_AreaFactory_constructor__P109226(s) {
+function particles_AreaFactory_constructor__P84005(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20616,13 +20645,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_AreaFactory__C109221_VT)) failedCast(r0);
-    s.tmp_0 = particles_SprayFactory_constructor__P109216_mk(s);
+    if (!checkSubtype(r0, particles_AreaFactory__C84000_VT)) failedCast(r0);
+    s.tmp_0 = particles_SprayFactory_constructor__P83995_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 = 1173; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1177; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = (s.arg0).fields["xRange"] = (s.arg1);
@@ -20647,12 +20676,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__C109083_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C83862_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P109085_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P83864_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1174; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1178; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["galois"] = (s.tmp_0);
@@ -20660,12 +20689,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_constructor__P109226.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"]}
+particles_AreaFactory_constructor__P84005.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"]}
 
-function particles_AreaFactory_constructor__P109226_mk(s) {
+function particles_AreaFactory_constructor__P84005_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_constructor__P109226, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_constructor__P84005, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20680,7 +20709,7 @@ function particles_AreaFactory_constructor__P109226_mk(s) {
 
 
 
-function effects_ScreenEffect_constructor__P109291(s) {
+function effects_ScreenEffect_constructor__P84070(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20699,13 +20728,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ScreenEffect__C109290_VT)) failedCast(r0);
-    s.tmp_0 = effects_ParticleEffect_constructor__P109287_mk(s);
+    if (!checkSubtype(r0, effects_ScreenEffect__C84069_VT)) failedCast(r0);
+    s.tmp_0 = effects_ParticleEffect_constructor__P84066_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 = 1202; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1206; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["sceneDefaultRate"] = (s.arg2);
@@ -20713,12 +20742,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ScreenEffect_constructor__P109291.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"]}
+effects_ScreenEffect_constructor__P84070.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"]}
 
-function effects_ScreenEffect_constructor__P109291_mk(s) {
+function effects_ScreenEffect_constructor__P84070_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ScreenEffect_constructor__P109291, depth: s.depth + 1,
+        parent: s, fn: effects_ScreenEffect_constructor__P84070, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -20732,7 +20761,7 @@ function effects_ScreenEffect_constructor__P109291_mk(s) {
 
 
 
-function effects_ParticleEffect_constructor__P109287(s) {
+function effects_ParticleEffect_constructor__P84066(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20750,7 +20779,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C109286_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ParticleEffect__C84065_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sourceFactory"] = (s.arg3);
     r0 = (s.arg0).fields["defaultRate"] = (s.arg1);
     r0 = (s.arg0).fields["defaultLifespan"] = (s.arg2);
@@ -20758,12 +20787,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_constructor__P109287.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"]}
+effects_ParticleEffect_constructor__P84066.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"]}
 
-function effects_ParticleEffect_constructor__P109287_mk(s) {
+function effects_ParticleEffect_constructor__P84066_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_constructor__P109287, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_constructor__P84066, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -20775,7 +20804,7 @@ function effects_ParticleEffect_constructor__P109287_mk(s) {
 
 
 
-function scene_Scene_init__P108938(s) {
+function scene_Scene_init__P83717(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20790,7 +20819,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C108916_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C83695_VT)) failedCast(r0);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -20798,8 +20827,8 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_1 = power_poke__P108201_mk(s);
-    s.callLocIdx = 819; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = power_poke__P82978_mk(s);
+    s.callLocIdx = 823; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -20807,84 +20836,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__P122567);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P97898);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P107001_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P81665_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 = 822; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 826; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = control_EventContext_registerFrameHandler__P107001_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameHandler__P81665_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 13;
-    s.tmp_0.arg2 = controller__moveSprites__P108419;
-    s.callLocIdx = 823; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg2 = controller__moveSprites__P83195;
+    s.callLocIdx = 827; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P122590);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P97921);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P107001_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P81665_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 = 825; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 829; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P122603);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P97934);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P107001_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P81665_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 = 829; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 833; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P122624);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P97955);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P107001_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P81665_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 = 831; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 835; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P122632);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P97963);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P107001_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P81665_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 = 835; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 839; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = control_EventContext_registerFrameHandler__P107001_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameHandler__P81665_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 200;
-    s.tmp_0.arg2 = control___screen_update__P108259;
-    s.callLocIdx = 836; s.pc = 11; return s.tmp_0;
+    s.tmp_0.arg2 = control___screen_update__P83036;
+    s.callLocIdx = 840; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P122661);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P97992);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1.arg0 = globals.scene_Scene_initializers___108936;
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1.arg0 = globals.scene_Scene_initializers___83715;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 838; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 842; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
   case 3:
@@ -20892,12 +20921,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_init__P108938.info = {"start":4168,"length":2477,"line":122,"column":8,"endLine":180,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"init","argumentNames":["this"]}
+scene_Scene_init__P83717.info = {"start":4168,"length":2477,"line":122,"column":8,"endLine":180,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"init","argumentNames":["this"]}
 
-function scene_Scene_init__P108938_mk(s) {
+function scene_Scene_init__P83717_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_init__P108938, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_init__P83717, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20908,7 +20937,7 @@ function scene_Scene_init__P108938_mk(s) {
 
 
 
-function inline__P122567(s) {
+function inline__P97898(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20927,26 +20956,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__P108447_mk(s);
+    s.tmp_0 = controller___update__P83223_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 = 821; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 825; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122567.info = {"start":4458,"length":217,"line":129,"column":72,"endLine":133,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P97898.info = {"start":4458,"length":217,"line":129,"column":72,"endLine":133,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P122567_mk(s) {
+function inline__P97898_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122567, depth: s.depth + 1,
+        parent: s, fn: inline__P97898, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20958,7 +20987,7 @@ function inline__P122567_mk(s) {
 
 
 
-function inline__P122590(s) {
+function inline__P97921(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20968,7 +20997,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = PhysicsEngine__C108656_v4_2_mk(s);
+    s.tmp_0 = PhysicsEngine__C83440_v4_2_mk(s);
     r0 = s.caps[0].fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
     r0 = s.caps[0].fields["eventContext"];
@@ -20977,7 +21006,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 1000);
     s.tmp_0.arg1 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C108656_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C83440_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:
@@ -20986,12 +21015,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122590.info = {"start":4970,"length":159,"line":138,"column":69,"endLine":141,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P97921.info = {"start":4970,"length":159,"line":138,"column":69,"endLine":141,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P122590_mk(s) {
+function inline__P97921_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122590, depth: s.depth + 1,
+        parent: s, fn: inline__P97921, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21002,7 +21031,7 @@ function inline__P122590_mk(s) {
 
 
 
-function inline__P122603(s) {
+function inline__P97934(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21012,80 +21041,80 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dt___122604 = undefined;
-    s.s___122612 = undefined;
-    s.unnamed16762___U2 = undefined;
-    s.unnamed16763___U3 = undefined;
+    s.dt___97935 = undefined;
+    s.s___97943 = undefined;
+    s.unnamed1814___U2 = undefined;
+    s.unnamed1815___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___122604 = (r0);
-    s.tmp_0 = scene_Camera_update__P108873_mk(s);
+    s.dt___97935 = (r0);
+    s.tmp_0 = scene_Camera_update__P83652_mk(s);
     r0 = s.caps[0].fields["camera"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 827; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 831; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.s___122612 = (undefined);
+    s.s___97943 = (undefined);
     r0 = s.caps[0].fields["allSprites"];
-    s.unnamed16762___U2 = (r0);
-    s.unnamed16763___U3 = (0);
+    s.unnamed1814___U2 = (r0);
+    s.unnamed1815___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16763___U3;
-    r0 = pxsim_Array__length(s.unnamed16762___U2);
+    s.tmp_0 = r0 = s.unnamed1815___U3;
+    r0 = pxsim_Array__length(s.unnamed1814___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16762___U2, s.unnamed16763___U3);
-    s.s___122612 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed1814___U2, s.unnamed1815___U3);
+    s.s___97943 = (r0);
     s.tmp_2 = if___update_3_mk(s);
-    s.tmp_2.arg0 = s.s___122612;
+    s.tmp_2.arg0 = s.s___97943;
     r0 = s.caps[0].fields["camera"];
     s.tmp_2.arg1 = r0;
-    s.tmp_2.arg2 = s.dt___122604;
+    s.tmp_2.arg2 = s.dt___97935;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "__update"), 3);
-      s.callLocIdx = 828; s.pc = 4; return s.tmp_2;
+      s.callLocIdx = 832; 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 = 828; s.pc = 4; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 828; s.pc = 4; return s.tmp_2;; }
-     else { s.callLocIdx = 828; 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 = 832; s.pc = 4; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 832; s.pc = 4; return s.tmp_2;; }
+     else { s.callLocIdx = 832; s.pc = 4; return s.tmp_2; }
     }
   case 4:
     r0 = s.retval;
-    r0 = (s.unnamed16763___U3 + 1);
-    s.unnamed16763___U3 = (r0);
+    r0 = (s.unnamed1815___U3 + 1);
+    s.unnamed1815___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16762___U2 = (undefined);
+    s.unnamed1814___U2 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122603.info = {"start":5318,"length":214,"line":147,"column":79,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P97934.info = {"start":5318,"length":214,"line":147,"column":79,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P122603_mk(s) {
+function inline__P97934_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122603, depth: s.depth + 1,
+        parent: s, fn: inline__P97934, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  dt___122604: undefined,
-  s___122612: undefined,
-  unnamed16762___U2: undefined,
-  unnamed16763___U3: undefined,
+  dt___97935: undefined,
+  s___97943: undefined,
+  unnamed1814___U2: undefined,
+  unnamed1815___U3: undefined,
 } }
 
 
 
 
 
-function inline__P122624(s) {
+function inline__P97955(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21095,21 +21124,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_Scene_render__P108943_mk(s);
+    s.tmp_0 = scene_Scene_render__P83722_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 830; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 834; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122624.info = {"start":5673,"length":109,"line":158,"column":76,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P97955.info = {"start":5673,"length":109,"line":158,"column":76,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P122624_mk(s) {
+function inline__P97955_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122624, depth: s.depth + 1,
+        parent: s, fn: inline__P97955, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -21118,7 +21147,7 @@ function inline__P122624_mk(s) {
 
 
 
-function inline__P122632(s) {
+function inline__P97963(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21128,26 +21157,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = r0 = globals.stats___109026;
+    s.tmp_0 = r0 = globals.stats___83805;
     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___106996;
+    r0 = globals.control_EventContext_onStats___81660;
   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___106996;
-    if ((globals.control_EventContext_lastStats___106995) && (globals.control_EventContext_lastStats___106995).vtable) {
+    s.tmp_2.argL = globals.control_EventContext_onStats___81660;
+    if ((globals.control_EventContext_lastStats___81659) && (globals.control_EventContext_lastStats___81659).vtable) {
     setupResume(s, 8);
-    pxsim_String__stringConv(globals.control_EventContext_lastStats___106995);
+    pxsim_String__stringConv(globals.control_EventContext_lastStats___81659);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.control_EventContext_lastStats___106995) + ""; }
+    } else { s.retval = (globals.control_EventContext_lastStats___81659) + ""; }
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -21178,41 +21207,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 = 832; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 836; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___109025);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___83804);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = PhysicsEngine__C108656_v3_1_mk(s);
+    s.tmp_0 = PhysicsEngine__C83440_v3_1_mk(s);
     r0 = s.caps[0].fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C108656_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C83440_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__P109151_mk(s);
-    s.callLocIdx = 833; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = game_consoleOverlay_draw__P83930_mk(s);
+    s.callLocIdx = 837; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = power_checkDeepSleep__P108202_mk(s);
-    s.callLocIdx = 834; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = power_checkDeepSleep__P82979_mk(s);
+    s.callLocIdx = 838; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122632.info = {"start":5899,"length":504,"line":163,"column":80,"endLine":175,"endColumn":13,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P97963.info = {"start":5899,"length":504,"line":163,"column":80,"endLine":175,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P122632_mk(s) {
+function inline__P97963_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122632, depth: s.depth + 1,
+        parent: s, fn: inline__P97963, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21229,7 +21258,7 @@ function inline__P122632_mk(s) {
 
 
 
-function inline__P122661(s) {
+function inline__P97992(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21247,19 +21276,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 = 837; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 841; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P122661.info = {"start":6621,"length":12,"line":179,"column":39,"endLine":179,"endColumn":51,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"inline","argumentNames":["f"]}
+inline__P97992.info = {"start":6621,"length":12,"line":179,"column":39,"endLine":179,"endColumn":51,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["f"]}
 
-function inline__P122661_mk(s) {
+function inline__P97992_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P122661, depth: s.depth + 1,
+        parent: s, fn: inline__P97992, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -21269,7 +21298,7 @@ function inline__P122661_mk(s) {
 
 
 
-function game_consoleOverlay_draw__P109151(s) {
+function game_consoleOverlay_draw__P83930(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21279,16 +21308,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.height___122710 = undefined;
-    s.top___122715 = undefined;
-    s.i___122721 = undefined;
-    s.t___122734 = undefined;
-    s.tOff___122741 = undefined;
-    s.tab___122743 = undefined;
-    s.unnamed16766___U6 = undefined;
-    s.unnamed16767___U7 = undefined;
-    s.padding___122745 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___111169);
+    s.height___98041 = undefined;
+    s.top___98046 = undefined;
+    s.i___98052 = undefined;
+    s.t___98065 = undefined;
+    s.tOff___98072 = undefined;
+    s.tab___98074 = undefined;
+    s.unnamed1818___U6 = undefined;
+    s.unnamed1819___U7 = undefined;
+    s.padding___98076 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___86008);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -21297,7 +21326,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(globals.instance___111123);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___85962);
     s.tmp_4 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
@@ -21313,23 +21342,23 @@ switch (step) {
   case 3:
   case 4:
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = globals.consoleFont___111177;
+    s.tmp_7.arg0 = globals.consoleFont___86016;
     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 = 1078; s.pc = 14; return s.tmp_7; }
+     else { s.callLocIdx = 1082; s.pc = 14; return s.tmp_7; }
     }
   case 14:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = (s.tmp_6 + 2);
-    s.height___122710 = (r0);
-    r0 = pxsim_numops_toBoolDecr(globals.stats___109026);
+    s.height___98041 = (r0);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___83805);
     if (!r0) { step = 5; continue; }
-    r0 = s.height___122710;
+    r0 = s.height___98041;
     { step = 6; continue; }
   case 5:
     r0 = 0;
@@ -21337,17 +21366,17 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_0 = r0;
     r0 = (2 + s.tmp_0);
-    s.top___122715 = (r0);
-    s.i___122721 = (0);
+    s.top___98046 = (r0);
+    s.i___98052 = (0);
   case 7:
-    s.tmp_1 = r0 = s.i___122721;
-    r0 = pxsim_Array__length(globals.consoleStrings___111169);
+    s.tmp_1 = r0 = s.i___98052;
+    r0 = pxsim_Array__length(globals.consoleStrings___86008);
     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___111169, s.i___122721);
+    r0 = pxsim_Array__getAt(globals.consoleStrings___86008, s.i___98052);
     s.tmp_5 = r0;
     r0 = pxsim_String_.indexOf(s.tmp_5, "\t", undefined);
     s.tmp_4 = r0;
@@ -21355,50 +21384,50 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 10; continue; }
-    s.tmp_6 = helpers_stringSplit__P106726_mk(s);
-    r0 = pxsim_Array__getAt(globals.consoleStrings___111169, s.i___122721);
+    s.tmp_6 = helpers_stringSplit__P81390_mk(s);
+    r0 = pxsim_Array__getAt(globals.consoleStrings___86008, s.i___98052);
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = "\t";
     s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1079; s.pc = 15; return s.tmp_6;
+    s.callLocIdx = 1083; s.pc = 15; return s.tmp_6;
   case 15:
     r0 = s.retval;
-    s.t___122734 = (r0);
-    s.tOff___122741 = (0);
-    s.tab___122743 = (undefined);
-    s.unnamed16766___U6 = (s.t___122734);
-    s.unnamed16767___U7 = (0);
+    s.t___98065 = (r0);
+    s.tOff___98072 = (0);
+    s.tab___98074 = (undefined);
+    s.unnamed1818___U6 = (s.t___98065);
+    s.unnamed1819___U7 = (0);
   case 8:
-    s.tmp_0 = r0 = s.unnamed16767___U7;
-    r0 = pxsim_Array__length(s.unnamed16766___U6);
+    s.tmp_0 = r0 = s.unnamed1819___U7;
+    r0 = pxsim_Array__length(s.unnamed1818___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16766___U6, s.unnamed16767___U7);
-    s.tab___122743 = (r0);
-    s.tmp_2 = r0 = globals.tabSize___111171;
-    s.tmp_5 = r0 = s.tOff___122741;
-    r0 = pxsim_String_.length(s.tab___122743);
+    r0 = pxsim_Array__getAt(s.unnamed1818___U6, s.unnamed1819___U7);
+    s.tab___98074 = (r0);
+    s.tmp_2 = r0 = globals.tabSize___86010;
+    s.tmp_5 = r0 = s.tOff___98072;
+    r0 = pxsim_String_.length(s.tab___98074);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 % globals.tabSize___111171);
+    r0 = (s.tmp_4 % globals.tabSize___86010);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
-    s.padding___122745 = (r0);
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
-    s.tmp_0.arg1 = s.tab___122743;
-    s.tmp_2 = r0 = s.tOff___122741;
+    s.padding___98076 = (r0);
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
+    s.tmp_0.arg1 = s.tab___98074;
+    s.tmp_2 = r0 = s.tOff___98072;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.consoleFont___111177;
+    s.tmp_4.arg0 = globals.consoleFont___86016;
     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 = 1080; s.pc = 17; return s.tmp_4; }
+     else { s.callLocIdx = 1084; s.pc = 17; return s.tmp_4; }
     }
   case 17:
     r0 = s.retval;
@@ -21407,50 +21436,50 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (4 + s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.tmp_5 = r0 = s.top___122715;
-    r0 = (s.i___122721 * s.height___122710);
+    s.tmp_5 = r0 = s.top___98046;
+    r0 = (s.i___98052 * s.height___98041);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = globals.consoleColor___111168;
-    s.tmp_0.arg5 = globals.consoleFont___111177;
+    s.tmp_0.arg4 = globals.consoleColor___86007;
+    s.tmp_0.arg5 = globals.consoleFont___86016;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1081; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1085; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tOff___122741;
-    r0 = pxsim_String_.length(s.tab___122743);
+    s.tmp_0 = r0 = s.tOff___98072;
+    r0 = pxsim_String_.length(s.tab___98074);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.padding___122745);
+    r0 = (s.tmp_2 + s.padding___98076);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.tOff___122741 = (r0);
-    r0 = (s.unnamed16767___U7 + 1);
-    s.unnamed16767___U7 = (r0);
+    s.tOff___98072 = (r0);
+    r0 = (s.unnamed1819___U7 + 1);
+    s.unnamed1819___U7 = (r0);
     { step = 8; continue; }
   case 9:
-    s.unnamed16766___U6 = (undefined);
+    s.unnamed1818___U6 = (undefined);
     { step = 11; continue; }
   case 10:
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
-    r0 = pxsim_Array__getAt(globals.consoleStrings___111169, s.i___122721);
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
+    r0 = pxsim_Array__getAt(globals.consoleStrings___86008, s.i___98052);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 4;
-    s.tmp_1 = r0 = s.top___122715;
-    r0 = (s.i___122721 * s.height___122710);
+    s.tmp_1 = r0 = s.top___98046;
+    r0 = (s.i___98052 * s.height___98041);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = globals.consoleColor___111168;
-    s.tmp_0.arg5 = globals.consoleFont___111177;
+    s.tmp_0.arg4 = globals.consoleColor___86007;
+    s.tmp_0.arg5 = globals.consoleFont___86016;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1082; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1086; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
   case 11:
-    r0 = (s.i___122721 + 1);
-    s.i___122721 = (r0);
+    r0 = (s.i___98052 + 1);
+    s.i___98052 = (r0);
     { step = 7; continue; }
   case 12:
   case 13:
@@ -21458,12 +21487,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_draw__P109151.info = {"start":1364,"length":859,"line":44,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/game---hw/console.ts","functionName":"draw","argumentNames":[]}
+game_consoleOverlay_draw__P83930.info = {"start":1364,"length":859,"line":44,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"draw","argumentNames":[]}
 
-function game_consoleOverlay_draw__P109151_mk(s) {
+function game_consoleOverlay_draw__P83930_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_draw__P109151, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_draw__P83930, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21473,22 +21502,22 @@ function game_consoleOverlay_draw__P109151_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  height___122710: undefined,
-  top___122715: undefined,
-  i___122721: undefined,
-  t___122734: undefined,
-  tOff___122741: undefined,
-  tab___122743: undefined,
-  unnamed16766___U6: undefined,
-  unnamed16767___U7: undefined,
-  padding___122745: undefined,
+  height___98041: undefined,
+  top___98046: undefined,
+  i___98052: undefined,
+  t___98065: undefined,
+  tOff___98072: undefined,
+  tab___98074: undefined,
+  unnamed1818___U6: undefined,
+  unnamed1819___U7: undefined,
+  padding___98076: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_isVisible__P109132(s) {
+function scene_systemMenu_isVisible__P83911(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21498,7 +21527,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___111123);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___85962);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1 = r0;
@@ -21508,12 +21537,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_isVisible__P109132.info = {"start":13170,"length":62,"line":395,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"isVisible","argumentNames":[]}
+scene_systemMenu_isVisible__P83911.info = {"start":13170,"length":62,"line":395,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"isVisible","argumentNames":[]}
 
-function scene_systemMenu_isVisible__P109132_mk(s) {
+function scene_systemMenu_isVisible__P83911_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_isVisible__P109132, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_isVisible__P83911, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21524,7 +21553,7 @@ function scene_systemMenu_isVisible__P109132_mk(s) {
 
 
 
-function helpers_imagePrint__P108256(s) {
+function helpers_imagePrint__P83033(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21534,31 +21563,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x0___122817 = undefined;
-    s.cp___122819 = undefined;
-    s.mult___122820 = undefined;
-    s.dataW___122825 = undefined;
-    s.dataH___122831 = undefined;
-    s.byteHeight___122837 = undefined;
-    s.charSize___122843 = undefined;
-    s.dataSize___122847 = undefined;
-    s.fontdata___122851 = undefined;
-    s.lastchar___122854 = undefined;
-    s.imgBuf___122861 = undefined;
-    s.xOffset___122885 = undefined;
-    s.yOffset___122886 = undefined;
-    s.ch___122901 = undefined;
-    s.l___122920 = undefined;
-    s.r___122921 = undefined;
-    s.off___122923 = undefined;
-    s.guess___122924 = undefined;
-    s.m___122943 = undefined;
-    s.v___122952 = undefined;
-    s.i___123008 = undefined;
-    s.j___123013 = undefined;
-    s.mask___123014 = undefined;
-    s.c___123015 = undefined;
-    s.n___123032 = undefined;
+    s.x0___98148 = undefined;
+    s.cp___98150 = undefined;
+    s.mult___98151 = undefined;
+    s.dataW___98156 = undefined;
+    s.dataH___98162 = undefined;
+    s.byteHeight___98168 = undefined;
+    s.charSize___98174 = undefined;
+    s.dataSize___98178 = undefined;
+    s.fontdata___98182 = undefined;
+    s.lastchar___98185 = undefined;
+    s.imgBuf___98192 = undefined;
+    s.xOffset___98216 = undefined;
+    s.yOffset___98217 = undefined;
+    s.ch___98232 = undefined;
+    s.l___98251 = undefined;
+    s.r___98252 = undefined;
+    s.off___98254 = undefined;
+    s.guess___98255 = undefined;
+    s.m___98274 = undefined;
+    s.v___98283 = undefined;
+    s.i___98339 = undefined;
+    s.j___98344 = undefined;
+    s.mask___98345 = undefined;
+    s.c___98346 = undefined;
+    s.n___98363 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -21579,9 +21608,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = image_getFontForText__P108243_mk(s);
+    s.tmp_2 = image_getFontForText__P83020_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 130; s.pc = 39; return s.tmp_2;
+    s.callLocIdx = 144; s.pc = 39; return s.tmp_2;
   case 39:
     r0 = s.retval;
     s.arg5 = (r0);
@@ -21596,8 +21625,8 @@ switch (step) {
     s.arg4 = (1);
   case 3:
   case 4:
-    s.x0___122817 = (s.arg2);
-    s.cp___122819 = (0);
+    s.x0___98148 = (s.arg2);
+    s.cp___98150 = (0);
     s.tmp_1 = if_multiplier_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -21606,7 +21635,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 = 131; s.pc = 40; return s.tmp_1; }
+     else { s.callLocIdx = 145; s.pc = 40; return s.tmp_1; }
     }
   case 40:
     r0 = s.retval;
@@ -21621,7 +21650,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 = 132; s.pc = 41; return s.tmp_2; }
+     else { s.callLocIdx = 146; s.pc = 41; return s.tmp_2; }
     }
   case 41:
     r0 = s.retval;
@@ -21631,7 +21660,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.mult___122820 = (s.tmp_3);
+    s.mult___98151 = (s.tmp_3);
     s.tmp_1 = if_charWidth_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -21640,13 +21669,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 = 133; s.pc = 42; return s.tmp_1; }
+     else { s.callLocIdx = 147; 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___122820);
-    s.dataW___122825 = (r0);
+    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___98151);
+    s.dataW___98156 = (r0);
     s.tmp_1 = if_charHeight_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -21655,21 +21684,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 = 134; s.pc = 43; return s.tmp_1; }
+     else { s.callLocIdx = 148; 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___122820);
-    s.dataH___122831 = (r0);
-    r0 = (s.dataH___122831 + 7);
+    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___98151);
+    s.dataH___98162 = (r0);
+    r0 = (s.dataH___98162 + 7);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 3);
-    s.byteHeight___122837 = (r0);
-    r0 = (s.byteHeight___122837 * s.dataW___122825);
-    s.charSize___122843 = (r0);
-    r0 = (2 + s.charSize___122843);
-    s.dataSize___122847 = (r0);
+    s.byteHeight___98168 = (r0);
+    r0 = (s.byteHeight___98168 * s.dataW___98156);
+    s.charSize___98174 = (r0);
+    r0 = (2 + s.charSize___98174);
+    s.dataSize___98178 = (r0);
     s.tmp_0 = if_data_1_mk(s);
     s.tmp_0.arg0 = s.arg5;
     if (!s.tmp_0.arg0.vtable.iface) {
@@ -21678,48 +21707,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 = 135; s.pc = 44; return s.tmp_0; }
+     else { s.callLocIdx = 149; s.pc = 44; return s.tmp_0; }
     }
   case 44:
     r0 = s.retval;
-    s.fontdata___122851 = (r0);
-    r0 = pxsim.BufferMethods.length(s.fontdata___122851);
+    s.fontdata___98182 = (r0);
+    r0 = pxsim.BufferMethods.length(s.fontdata___98182);
     s.tmp_1 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_1, s.dataSize___122847);
+    r0 = pxsim.Math_.idiv(s.tmp_1, s.dataSize___98178);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.lastchar___122854 = (r0);
-    r0 = (s.mult___122820 == 1);
+    s.lastchar___98185 = (r0);
+    r0 = (s.mult___98151 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = (8 + s.charSize___122843);
+    r0 = (8 + s.charSize___98174);
     s.tmp_1 = r0;
     r0 = pxsim.control.createBuffer(s.tmp_1);
-    s.imgBuf___122861 = (r0);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___122861, 0, 135);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___122861, 1, 1);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___122861, 2, s.dataW___122825);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___122861, 4, s.dataH___122831);
+    s.imgBuf___98192 = (r0);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___98192, 0, 135);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___98192, 1, 1);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___98192, 2, s.dataW___98156);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___98192, 4, s.dataH___98162);
   case 7:
   case 8:
   case 9:
-    s.tmp_1 = r0 = s.cp___122819;
+    s.tmp_1 = r0 = s.cp___98150;
     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___122885 = (0);
-    s.yOffset___122886 = (0);
+    s.xOffset___98216 = (0);
+    s.yOffset___98217 = (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___122819;
+    s.tmp_1 = r0 = s.cp___98150;
     r0 = pxsim_Array__length(s.arg6);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
@@ -21729,7 +21758,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___122819);
+    r0 = pxsim_Array__getAt(s.arg6, s.cp___98150);
     s.tmp_4.arg0 = r0;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "xOffset");
@@ -21737,13 +21766,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 = 136; s.pc = 45; return s.tmp_4; }
+     else { s.callLocIdx = 150; s.pc = 45; return s.tmp_4; }
     }
   case 45:
     r0 = s.retval;
-    s.xOffset___122885 = (r0);
+    s.xOffset___98216 = (r0);
     s.tmp_0 = if_yOffset_1_mk(s);
-    r0 = pxsim_Array__getAt(s.arg6, s.cp___122819);
+    r0 = pxsim_Array__getAt(s.arg6, s.cp___98150);
     s.tmp_0.arg0 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "yOffset");
@@ -21751,19 +21780,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 = 137; s.pc = 46; return s.tmp_0; }
+     else { s.callLocIdx = 151; s.pc = 46; return s.tmp_0; }
     }
   case 46:
     r0 = s.retval;
-    s.yOffset___122886 = (r0);
+    s.yOffset___98217 = (r0);
   case 12:
   case 13:
-    s.tmp_0 = r0 = s.cp___122819;
+    s.tmp_0 = r0 = s.cp___98150;
     r0 = (s.tmp_0 + 1);
-    s.cp___122819 = (r0);
+    s.cp___98150 = (r0);
     r0 = pxsim_String_.charCodeAt(s.arg1, s.tmp_0);
-    s.ch___122901 = (r0);
-    r0 = (s.ch___122901 == 10);
+    s.ch___98232 = (r0);
+    r0 = (s.ch___98232 == 10);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
@@ -21776,7 +21805,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 = 138; s.pc = 47; return s.tmp_4; }
+     else { s.callLocIdx = 152; s.pc = 47; return s.tmp_4; }
     }
   case 47:
     r0 = s.retval;
@@ -21785,92 +21814,92 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.arg3 = (r0);
-    s.arg2 = (s.x0___122817);
+    s.arg2 = (s.x0___98148);
   case 14:
   case 15:
-    r0 = (s.ch___122901 < 32);
+    r0 = (s.ch___98232 < 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___122920 = (0);
-    s.r___122921 = (s.lastchar___122854);
-    s.off___122923 = (0);
-    r0 = (s.ch___122901 - 32);
+    s.l___98251 = (0);
+    s.r___98252 = (s.lastchar___98185);
+    s.off___98254 = (0);
+    r0 = (s.ch___98232 - 32);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.dataSize___122847);
-    s.guess___122924 = (r0);
-    r0 = pxsim.BufferMethods.getNumber(s.fontdata___122851, 4, s.guess___122924);
+    r0 = (s.tmp_0 * s.dataSize___98178);
+    s.guess___98255 = (r0);
+    r0 = pxsim.BufferMethods.getNumber(s.fontdata___98182, 4, s.guess___98255);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.ch___122901);
+    r0 = (s.tmp_1 == s.ch___98232);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.off___122923 = (s.guess___122924);
+    s.off___98254 = (s.guess___98255);
     { step = 25; continue; }
   case 18:
   case 19:
-    r0 = (s.l___122920 <= s.r___122921);
+    r0 = (s.l___98251 <= s.r___98252);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 24; continue; }
-    s.tmp_1 = r0 = s.l___122920;
-    r0 = (s.r___122921 - s.l___122920);
+    s.tmp_1 = r0 = s.l___98251;
+    r0 = (s.r___98252 - s.l___98251);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
-    s.m___122943 = (r0);
-    s.tmp_0 = r0 = s.fontdata___122851;
-    r0 = (s.m___122943 * s.dataSize___122847);
+    s.m___98274 = (r0);
+    s.tmp_0 = r0 = s.fontdata___98182;
+    r0 = (s.m___98274 * s.dataSize___98178);
     s.tmp_1 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_0, 4, s.tmp_1);
-    s.v___122952 = (r0);
-    r0 = (s.v___122952 == s.ch___122901);
+    s.v___98283 = (r0);
+    r0 = (s.v___98283 == s.ch___98232);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = (s.m___122943 * s.dataSize___122847);
-    s.off___122923 = (r0);
+    r0 = (s.m___98274 * s.dataSize___98178);
+    s.off___98254 = (r0);
     { step = 24; continue; }
   case 20:
   case 21:
-    r0 = (s.v___122952 < s.ch___122901);
+    r0 = (s.v___98283 < s.ch___98232);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = (s.m___122943 + 1);
-    s.l___122920 = (r0);
+    r0 = (s.m___98274 + 1);
+    s.l___98251 = (r0);
     { step = 23; continue; }
   case 22:
-    r0 = (s.m___122943 - 1);
-    s.r___122921 = (r0);
+    r0 = (s.m___98274 - 1);
+    s.r___98252 = (r0);
   case 23:
     { step = 19; continue; }
   case 24:
   case 25:
-    r0 = (s.mult___122820 == 1);
+    r0 = (s.mult___98151 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    s.tmp_1 = r0 = s.imgBuf___122861;
-    s.tmp_3 = r0 = s.fontdata___122851;
-    r0 = (s.off___122923 + 2);
+    s.tmp_1 = r0 = s.imgBuf___98192;
+    s.tmp_3 = r0 = s.fontdata___98182;
+    r0 = (s.off___98254 + 2);
     s.tmp_4 = r0;
-    r0 = pxsim.BufferMethods.slice(s.tmp_3, s.tmp_4, s.charSize___122843);
+    r0 = pxsim.BufferMethods.slice(s.tmp_3, s.tmp_4, s.charSize___98174);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.write(s.tmp_1, 8, s.tmp_2);
-    s.tmp_0 = helpers_imageDrawIcon__P108223_mk(s);
+    s.tmp_0 = helpers_imageDrawIcon__P83000_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.imgBuf___122861;
-    r0 = (s.arg2 + s.xOffset___122885);
+    s.tmp_0.arg1 = s.imgBuf___98192;
+    r0 = (s.arg2 + s.xOffset___98216);
     s.tmp_0.arg2 = r0;
-    r0 = (s.arg3 + s.yOffset___122886);
+    r0 = (s.arg3 + s.yOffset___98217);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg4;
-    s.callLocIdx = 139; s.pc = 48; return s.tmp_0;
+    s.callLocIdx = 153; s.pc = 48; return s.tmp_0;
   case 48:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg2;
@@ -21882,7 +21911,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 = 140; s.pc = 49; return s.tmp_2; }
+     else { s.callLocIdx = 154; s.pc = 49; return s.tmp_2; }
     }
   case 49:
     r0 = s.retval;
@@ -21891,88 +21920,88 @@ switch (step) {
     s.arg2 = (r0);
     { step = 37; continue; }
   case 26:
-    r0 = (s.off___122923 + 2);
-    s.off___122923 = (r0);
-    s.i___123008 = (0);
+    r0 = (s.off___98254 + 2);
+    s.off___98254 = (r0);
+    s.i___98339 = (0);
   case 27:
-    r0 = (s.i___123008 < s.dataW___122825);
+    r0 = (s.i___98339 < s.dataW___98156);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 36; continue; }
-    s.j___123013 = (0);
-    s.mask___123014 = (1);
-    s.tmp_0 = r0 = s.off___122923;
+    s.j___98344 = (0);
+    s.mask___98345 = (1);
+    s.tmp_0 = r0 = s.off___98254;
     r0 = (s.tmp_0 + 1);
-    s.off___122923 = (r0);
-    r0 = pxsim.BufferMethods.getByte(s.fontdata___122851, s.tmp_0);
-    s.c___123015 = (r0);
+    s.off___98254 = (r0);
+    r0 = pxsim.BufferMethods.getByte(s.fontdata___98182, s.tmp_0);
+    s.c___98346 = (r0);
   case 28:
-    r0 = (s.j___123013 < s.dataH___122831);
+    r0 = (s.j___98344 < s.dataH___98162);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 35; continue; }
-    r0 = (s.mask___123014 == 256);
+    r0 = (s.mask___98345 == 256);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 29; continue; }
-    s.tmp_2 = r0 = s.off___122923;
+    s.tmp_2 = r0 = s.off___98254;
     r0 = (s.tmp_2 + 1);
-    s.off___122923 = (r0);
-    r0 = pxsim.BufferMethods.getByte(s.fontdata___122851, s.tmp_2);
-    s.c___123015 = (r0);
-    s.mask___123014 = (1);
+    s.off___98254 = (r0);
+    r0 = pxsim.BufferMethods.getByte(s.fontdata___98182, s.tmp_2);
+    s.c___98346 = (r0);
+    s.mask___98345 = (1);
   case 29:
   case 30:
-    s.n___123032 = (0);
+    s.n___98363 = (0);
   case 31:
-    r0 = (s.c___123015 & s.mask___123014);
+    r0 = (s.c___98346 & s.mask___98345);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
-    r0 = (s.n___123032 + 1);
-    s.n___123032 = (r0);
-    r0 = (s.mask___123014 << 1);
-    s.mask___123014 = (r0);
+    r0 = (s.n___98363 + 1);
+    s.n___98363 = (r0);
+    r0 = (s.mask___98345 << 1);
+    s.mask___98345 = (r0);
     { step = 31; continue; }
   case 32:
-    r0 = pxsim_numops_toBoolDecr(s.n___123032);
+    r0 = pxsim_numops_toBoolDecr(s.n___98363);
     if (!r0) { step = 33; continue; }
-    s.tmp_0 = helpers_imageFillRect__P108224_mk(s);
+    s.tmp_0 = helpers_imageFillRect__P83001_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg2;
-    r0 = (s.xOffset___122885 * s.mult___122820);
+    r0 = (s.xOffset___98216 * s.mult___98151);
     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___123013 + s.yOffset___122886);
+    r0 = (s.j___98344 + s.yOffset___98217);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 * s.mult___122820);
+    r0 = (s.tmp_5 * s.mult___98151);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.mult___122820;
-    r0 = (s.mult___122820 * s.n___123032);
+    s.tmp_0.arg3 = s.mult___98151;
+    r0 = (s.mult___98151 * s.n___98363);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = s.arg4;
-    s.callLocIdx = 141; s.pc = 50; return s.tmp_0;
+    s.callLocIdx = 155; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    r0 = (s.j___123013 + s.n___123032);
-    s.j___123013 = (r0);
+    r0 = (s.j___98344 + s.n___98363);
+    s.j___98344 = (r0);
     { step = 34; continue; }
   case 33:
-    r0 = (s.mask___123014 << 1);
-    s.mask___123014 = (r0);
-    r0 = (s.j___123013 + 1);
-    s.j___123013 = (r0);
+    r0 = (s.mask___98345 << 1);
+    s.mask___98345 = (r0);
+    r0 = (s.j___98344 + 1);
+    s.j___98344 = (r0);
   case 34:
     { step = 28; continue; }
   case 35:
-    r0 = (s.arg2 + s.mult___122820);
+    r0 = (s.arg2 + s.mult___98151);
     s.arg2 = (r0);
-    r0 = (s.i___123008 + 1);
-    s.i___123008 = (r0);
+    r0 = (s.i___98339 + 1);
+    s.i___98339 = (r0);
     { step = 27; continue; }
   case 36:
   case 37:
@@ -21982,12 +22011,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imagePrint__P108256.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"]}
+helpers_imagePrint__P83033.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"]}
 
-function helpers_imagePrint__P108256_mk(s) {
+function helpers_imagePrint__P83033_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imagePrint__P108256, depth: s.depth + 1,
+        parent: s, fn: helpers_imagePrint__P83033, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21995,31 +22024,31 @@ function helpers_imagePrint__P108256_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  x0___122817: undefined,
-  cp___122819: undefined,
-  mult___122820: undefined,
-  dataW___122825: undefined,
-  dataH___122831: undefined,
-  byteHeight___122837: undefined,
-  charSize___122843: undefined,
-  dataSize___122847: undefined,
-  fontdata___122851: undefined,
-  lastchar___122854: undefined,
-  imgBuf___122861: undefined,
-  xOffset___122885: undefined,
-  yOffset___122886: undefined,
-  ch___122901: undefined,
-  l___122920: undefined,
-  r___122921: undefined,
-  off___122923: undefined,
-  guess___122924: undefined,
-  m___122943: undefined,
-  v___122952: undefined,
-  i___123008: undefined,
-  j___123013: undefined,
-  mask___123014: undefined,
-  c___123015: undefined,
-  n___123032: undefined,
+  x0___98148: undefined,
+  cp___98150: undefined,
+  mult___98151: undefined,
+  dataW___98156: undefined,
+  dataH___98162: undefined,
+  byteHeight___98168: undefined,
+  charSize___98174: undefined,
+  dataSize___98178: undefined,
+  fontdata___98182: undefined,
+  lastchar___98185: undefined,
+  imgBuf___98192: undefined,
+  xOffset___98216: undefined,
+  yOffset___98217: undefined,
+  ch___98232: undefined,
+  l___98251: undefined,
+  r___98252: undefined,
+  off___98254: undefined,
+  guess___98255: undefined,
+  m___98274: undefined,
+  v___98283: undefined,
+  i___98339: undefined,
+  j___98344: undefined,
+  mask___98345: undefined,
+  c___98346: undefined,
+  n___98363: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22033,7 +22062,7 @@ function helpers_imagePrint__P108256_mk(s) {
 
 
 
-function image_getFontForText__P108243(s) {
+function image_getFontForText__P83020(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22043,52 +22072,52 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___123135 = undefined;
+    s.i___98466 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.i___123135 = (0);
+    s.i___98466 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___123135;
+    s.tmp_1 = r0 = s.i___98466;
     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___123135);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___98466);
     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___108242;
+    r0 = globals.font12___83019;
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___123135 + 1);
-    s.i___123135 = (r0);
+    r0 = (s.i___98466 + 1);
+    s.i___98466 = (r0);
     { step = 1; continue; }
   case 4:
-    r0 = globals.font8___108241;
+    r0 = globals.font8___83018;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-image_getFontForText__P108243.info = {"start":11713,"length":259,"line":136,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/screen---st7735/text.ts","functionName":"getFontForText","argumentNames":["text"]}
+image_getFontForText__P83020.info = {"start":11713,"length":259,"line":136,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"getFontForText","argumentNames":["text"]}
 
-function image_getFontForText__P108243_mk(s) {
+function image_getFontForText__P83020_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_getFontForText__P108243, depth: s.depth + 1,
+        parent: s, fn: image_getFontForText__P83020, 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___123135: undefined,
+  i___98466: undefined,
   arg0: undefined,
 } }
 
@@ -22096,7 +22125,7 @@ function image_getFontForText__P108243_mk(s) {
 
 
 
-function helpers_imageFillRect__P108224(s) {
+function helpers_imageFillRect__P83001(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22116,17 +22145,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_pack__P110634_mk(s);
+    s.tmp_2 = helpers_pack__P85449_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = s.arg2;
-    s.callLocIdx = 112; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 126; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = helpers_pack__P110634_mk(s);
+    s.tmp_4 = helpers_pack__P85449_mk(s);
     s.tmp_4.arg0 = s.arg3;
     s.tmp_4.arg1 = s.arg4;
-    s.callLocIdx = 113; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 127; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -22135,12 +22164,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageFillRect__P108224.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"]}
+helpers_imageFillRect__P83001.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"]}
 
-function helpers_imageFillRect__P108224_mk(s) {
+function helpers_imageFillRect__P83001_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageFillRect__P108224, depth: s.depth + 1,
+        parent: s, fn: helpers_imageFillRect__P83001, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22159,7 +22188,7 @@ function helpers_imageFillRect__P108224_mk(s) {
 
 
 
-function helpers_pack__P110634(s) {
+function helpers_pack__P85449(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22174,23 +22203,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = Math_clamp__P106731_mk(s);
+    s.tmp_2 = Math_clamp__P81395_mk(s);
     s.tmp_2.arg0 = -30000;
     s.tmp_2.arg1 = 30000;
     r0 = (s.arg0 | 0);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 109; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 123; 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__P106731_mk(s);
+    s.tmp_5 = Math_clamp__P81395_mk(s);
     s.tmp_5.arg0 = -30000;
     s.tmp_5.arg1 = 30000;
     r0 = (s.arg1 | 0);
     s.tmp_5.arg2 = r0;
-    s.callLocIdx = 110; s.pc = 2; return s.tmp_5;
+    s.callLocIdx = 124; s.pc = 2; return s.tmp_5;
   case 2:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -22200,12 +22229,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_pack__P110634.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"]}
+helpers_pack__P85449.info = {"start":3152,"length":145,"line":120,"column":4,"endLine":122,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"pack","argumentNames":["x","y"]}
 
-function helpers_pack__P110634_mk(s) {
+function helpers_pack__P85449_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_pack__P110634, depth: s.depth + 1,
+        parent: s, fn: helpers_pack__P85449, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22221,7 +22250,7 @@ function helpers_pack__P110634_mk(s) {
 
 
 
-function Math_clamp__P106731(s) {
+function Math_clamp__P81395(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22237,9 +22266,9 @@ switch (step) {
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_min__P106735_mk(s);
+    s.tmp_0 = Math_min__P81399_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_1 = Math_max__P106734_mk(s);
+    s.tmp_1 = Math_max__P81398_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg2;
     s.callLocIdx = 15; s.pc = 2; return s.tmp_1;
@@ -22252,12 +22281,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_clamp__P106731.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__P81395.info = {"start":15178,"length":130,"line":514,"column":4,"endLine":516,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"clamp","argumentNames":["min","max","value"]}
 
-function Math_clamp__P106731_mk(s) {
+function Math_clamp__P81395_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_clamp__P106731, depth: s.depth + 1,
+        parent: s, fn: Math_clamp__P81395, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22270,7 +22299,7 @@ function Math_clamp__P106731_mk(s) {
 
 
 
-function helpers_imageDrawIcon__P108223(s) {
+function helpers_imageDrawIcon__P83000(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22290,10 +22319,10 @@ switch (step) {
     }
     s.tmp_0 = r0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = helpers_pack__P110634_mk(s);
+    s.tmp_3 = helpers_pack__P85449_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg3;
-    s.callLocIdx = 111; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 125; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -22302,12 +22331,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawIcon__P108223.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"]}
+helpers_imageDrawIcon__P83000.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"]}
 
-function helpers_imageDrawIcon__P108223_mk(s) {
+function helpers_imageDrawIcon__P83000_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawIcon__P108223, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawIcon__P83000, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22324,7 +22353,7 @@ function helpers_imageDrawIcon__P108223_mk(s) {
 
 
 
-function helpers_stringSplit__P106726(s) {
+function helpers_stringSplit__P81390(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22334,15 +22363,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.A___123158 = undefined;
-    s.lim___123160 = undefined;
-    s.s___123176 = undefined;
-    s.p___123179 = undefined;
-    s.R___123180 = undefined;
-    s.z___123194 = undefined;
-    s.T___123207 = undefined;
-    s.q___123208 = undefined;
-    s.e___123214 = undefined;
+    s.A___98489 = undefined;
+    s.lim___98491 = undefined;
+    s.s___98507 = undefined;
+    s.p___98510 = undefined;
+    s.R___98511 = undefined;
+    s.z___98525 = undefined;
+    s.T___98538 = undefined;
+    s.q___98539 = undefined;
+    s.e___98545 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22350,36 +22379,36 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.A___123158 = (r0);
-    s.lim___123160 = (0);
+    s.A___98489 = (r0);
+    s.lim___98491 = (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___123160 = (r0);
+    s.lim___98491 = (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___123160 = (0);
+    s.lim___98491 = (0);
     { step = 3; continue; }
   case 2:
     r0 = (s.arg2 | 0);
-    s.lim___123160 = (r0);
+    s.lim___98491 = (r0);
   case 3:
   case 4:
     r0 = pxsim_String_.length(s.arg0);
-    s.s___123176 = (r0);
-    s.p___123179 = (0);
-    s.R___123180 = (s.arg1);
-    r0 = (s.lim___123160 == 0);
+    s.s___98507 = (r0);
+    s.p___98510 = (0);
+    s.R___98511 = (s.arg1);
+    r0 = (s.lim___98491 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = s.A___123158;
+    r0 = s.A___98489;
     { step = 21; continue; }
   case 5:
   case 6:
@@ -22387,123 +22416,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___123158, 0, s.arg0);
-    r0 = s.A___123158;
+    r0 = pxsim_Array_.setAt(s.A___98489, 0, s.arg0);
+    r0 = s.A___98489;
     { step = 21; continue; }
   case 7:
   case 8:
-    r0 = (s.s___123176 == 0);
+    r0 = (s.s___98507 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = helpers_splitMatch__P110524_mk(s);
+    s.tmp_1 = helpers_splitMatch__P85308_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = 0;
-    s.tmp_1.arg2 = s.R___123180;
+    s.tmp_1.arg2 = s.R___98511;
     s.callLocIdx = 11; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    s.z___123194 = (r0);
-    r0 = (s.z___123194 > -1);
+    s.z___98525 = (r0);
+    r0 = (s.z___98525 > -1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = s.A___123158;
+    r0 = s.A___98489;
     { step = 21; continue; }
   case 9:
   case 10:
-    r0 = pxsim_Array_.setAt(s.A___123158, 0, s.arg0);
-    r0 = s.A___123158;
+    r0 = pxsim_Array_.setAt(s.A___98489, 0, s.arg0);
+    r0 = s.A___98489;
     { step = 21; continue; }
   case 11:
   case 12:
-    s.q___123208 = (s.p___123179);
+    s.q___98539 = (s.p___98510);
   case 13:
-    r0 = (s.q___123208 != s.s___123176);
+    r0 = (s.q___98539 != s.s___98507);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    s.tmp_1 = helpers_splitMatch__P110524_mk(s);
+    s.tmp_1 = helpers_splitMatch__P85308_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.q___123208;
-    s.tmp_1.arg2 = s.R___123180;
+    s.tmp_1.arg1 = s.q___98539;
+    s.tmp_1.arg2 = s.R___98511;
     s.callLocIdx = 12; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
-    s.e___123214 = (r0);
-    r0 = (s.e___123214 < 0);
+    s.e___98545 = (r0);
+    r0 = (s.e___98545 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.q___123208 + 1);
-    s.q___123208 = (r0);
+    r0 = (s.q___98539 + 1);
+    s.q___98539 = (r0);
     { step = 19; continue; }
   case 14:
-    r0 = (s.e___123214 == s.p___123179);
+    r0 = (s.e___98545 == s.p___98510);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = (s.q___123208 + 1);
-    s.q___123208 = (r0);
+    r0 = (s.q___98539 + 1);
+    s.q___98539 = (r0);
     { step = 18; continue; }
   case 15:
-    s.tmp_0 = helpers_stringSlice__P106724_mk(s);
+    s.tmp_0 = helpers_stringSlice__P81388_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.p___123179;
-    s.tmp_0.arg2 = s.q___123208;
+    s.tmp_0.arg1 = s.p___98510;
+    s.tmp_0.arg2 = s.q___98539;
     s.callLocIdx = 13; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.T___123207 = (r0);
-    r0 = pxsim_Array__push(s.A___123158, s.T___123207);
-    r0 = pxsim_Array__length(s.A___123158);
+    s.T___98538 = (r0);
+    r0 = pxsim_Array__push(s.A___98489, s.T___98538);
+    r0 = pxsim_Array__length(s.A___98489);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.lim___123160);
+    r0 = (s.tmp_1 == s.lim___98491);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    r0 = s.A___123158;
+    r0 = s.A___98489;
     { step = 21; continue; }
   case 16:
   case 17:
-    s.p___123179 = (s.e___123214);
-    s.q___123208 = (s.p___123179);
+    s.p___98510 = (s.e___98545);
+    s.q___98539 = (s.p___98510);
   case 18:
   case 19:
     { step = 13; continue; }
   case 20:
-    s.tmp_0 = helpers_stringSlice__P106724_mk(s);
+    s.tmp_0 = helpers_stringSlice__P81388_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.p___123179;
-    s.tmp_0.arg2 = s.q___123208;
+    s.tmp_0.arg1 = s.p___98510;
+    s.tmp_0.arg2 = s.q___98539;
     s.callLocIdx = 14; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.T___123207 = (r0);
-    r0 = pxsim_Array__push(s.A___123158, s.T___123207);
-    r0 = s.A___123158;
+    s.T___98538 = (r0);
+    r0 = pxsim_Array__push(s.A___98489, s.T___98538);
+    r0 = s.A___98489;
   case 21:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_stringSplit__P106726.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__P81390.info = {"start":12454,"length":1319,"line":420,"column":4,"endLine":464,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSplit","argumentNames":["S","separator","limit"]}
 
-function helpers_stringSplit__P106726_mk(s) {
+function helpers_stringSplit__P81390_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_stringSplit__P106726, depth: s.depth + 1,
+        parent: s, fn: helpers_stringSplit__P81390, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  A___123158: undefined,
-  lim___123160: undefined,
-  s___123176: undefined,
-  p___123179: undefined,
-  R___123180: undefined,
-  z___123194: undefined,
-  T___123207: undefined,
-  q___123208: undefined,
-  e___123214: undefined,
+  A___98489: undefined,
+  lim___98491: undefined,
+  s___98507: undefined,
+  p___98510: undefined,
+  R___98511: undefined,
+  z___98525: undefined,
+  T___98538: undefined,
+  q___98539: undefined,
+  e___98545: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22513,7 +22542,7 @@ function helpers_stringSplit__P106726_mk(s) {
 
 
 
-function helpers_splitMatch__P110524(s) {
+function helpers_splitMatch__P85308(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22523,9 +22552,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___123290 = undefined;
-    s.s___123293 = undefined;
-    s.i___123303 = undefined;
+    s.r___98625 = undefined;
+    s.s___98628 = undefined;
+    s.i___98638 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22533,12 +22562,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_String_.length(s.arg2);
-    s.r___123290 = (r0);
+    s.r___98625 = (r0);
     r0 = pxsim_String_.length(s.arg0);
-    s.s___123293 = (r0);
-    r0 = (s.arg1 + s.r___123290);
+    s.s___98628 = (r0);
+    r0 = (s.arg1 + s.r___98625);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.s___123293);
+    r0 = (s.tmp_1 > s.s___98628);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -22546,18 +22575,18 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    s.i___123303 = (0);
+    s.i___98638 = (0);
   case 3:
-    r0 = (s.i___123303 < s.r___123290);
+    r0 = (s.i___98638 < s.r___98625);
     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___123303);
+    r0 = (s.arg1 + s.i___98638);
     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___123303);
+    r0 = pxsim_String_.charAt(s.arg2, s.i___98638);
     s.tmp_5 = r0;
     r0 = (s.tmp_2 != s.tmp_5);
     s.tmp_1 = r0;
@@ -22567,21 +22596,21 @@ switch (step) {
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.i___123303 + 1);
-    s.i___123303 = (r0);
+    r0 = (s.i___98638 + 1);
+    s.i___98638 = (r0);
     { step = 3; continue; }
   case 6:
-    r0 = (s.arg1 + s.r___123290);
+    r0 = (s.arg1 + s.r___98625);
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_splitMatch__P110524.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__P85308.info = {"start":13779,"length":289,"line":466,"column":4,"endLine":475,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"splitMatch","argumentNames":["S","q","R"]}
 
-function helpers_splitMatch__P110524_mk(s) {
+function helpers_splitMatch__P85308_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_splitMatch__P110524, depth: s.depth + 1,
+        parent: s, fn: helpers_splitMatch__P85308, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22589,9 +22618,9 @@ function helpers_splitMatch__P110524_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  r___123290: undefined,
-  s___123293: undefined,
-  i___123303: undefined,
+  r___98625: undefined,
+  s___98628: undefined,
+  i___98638: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22601,7 +22630,7 @@ function helpers_splitMatch__P110524_mk(s) {
 
 
 
-function helpers_stringSlice__P106724(s) {
+function helpers_stringSlice__P81388(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22611,7 +22640,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___123259 = undefined;
+    s.len___98590 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22619,36 +22648,44 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_String_.length(s.arg0);
-    s.len___123259 = (r0);
+    s.len___98590 = (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__P106734_mk(s);
-    r0 = (s.len___123259 + s.arg1);
+    s.tmp_1 = Math_max__P81398_mk(s);
+    r0 = (s.len___98590 + s.arg1);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 10; s.pc = 7; return s.tmp_1;
-  case 7:
+    s.callLocIdx = 10; s.pc = 9; return s.tmp_1;
+  case 9:
     r0 = s.retval;
     s.arg1 = (r0);
   case 1:
   case 2:
-    r0 = (s.arg2 == null);
+    r0 = (s.arg2 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.arg2 = (s.len___123259);
+    s.arg2 = (s.len___98590);
+    { step = 6; continue; }
   case 3:
+    r0 = (s.arg2 === null);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 4; continue; }
+    s.arg2 = (0);
   case 4:
+  case 5:
+  case 6:
     r0 = (s.arg2 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    r0 = (s.len___123259 + s.arg2);
+    if (!r0) { step = 7; continue; }
+    r0 = (s.len___98590 + s.arg2);
     s.arg2 = (r0);
-  case 5:
-  case 6:
+  case 7:
+  case 8:
     s.tmp_0 = r0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = (s.arg2 - s.arg1);
@@ -22657,17 +22694,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_stringSlice__P106724.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__P81388.info = {"start":11496,"length":440,"line":384,"column":4,"endLine":402,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSlice","argumentNames":["s","start","end"]}
 
-function helpers_stringSlice__P106724_mk(s) {
+function helpers_stringSlice__P81388_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_stringSlice__P106724, depth: s.depth + 1,
+        parent: s, fn: helpers_stringSlice__P81388, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___123259: undefined,
+  len___98590: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22677,7 +22714,7 @@ function helpers_stringSlice__P106724_mk(s) {
 
 
 
-function scene_Scene_render__P108943(s) {
+function scene_Scene_render__P83722(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22687,15 +22724,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___123387 = undefined;
-    s.unnamed16764___U1 = undefined;
-    s.unnamed16765___U2 = undefined;
+    s.s___98722 = undefined;
+    s.unnamed1816___U1 = undefined;
+    s.unnamed1817___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C108916_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C83695_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -22726,18 +22763,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__P108943_mk(s);
+    s.tmp_3 = scene_Scene_render__P83722_mk(s);
     r0 = s.arg0.fields["previousScene"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 840; s.pc = 12; return s.tmp_3;
+    s.callLocIdx = 844; s.pc = 12; return s.tmp_3;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = scene_Background_draw__P108771_mk(s);
+    s.tmp_0 = scene_Background_draw__P83557_mk(s);
     r0 = s.arg0.fields["background"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 841; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 845; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
   case 6:
@@ -22747,11 +22784,11 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_2 = helpers_arraySort__P106712_mk(s);
+    s.tmp_2 = helpers_arraySort__P81374_mk(s);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P123364;
-    s.callLocIdx = 846; s.pc = 14; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P98699;
+    s.callLocIdx = 850; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -22762,38 +22799,38 @@ switch (step) {
     r0 = (s.tmp_0).fields["flags"] = (s.tmp_1);
   case 7:
   case 8:
-    s.s___123387 = (undefined);
+    s.s___98722 = (undefined);
     r0 = s.arg0.fields["allSprites"];
-    s.unnamed16764___U1 = (r0);
-    s.unnamed16765___U2 = (0);
+    s.unnamed1816___U1 = (r0);
+    s.unnamed1817___U2 = (0);
   case 9:
-    s.tmp_0 = r0 = s.unnamed16765___U2;
-    r0 = pxsim_Array__length(s.unnamed16764___U1);
+    s.tmp_0 = r0 = s.unnamed1817___U2;
+    r0 = pxsim_Array__length(s.unnamed1816___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16764___U1, s.unnamed16765___U2);
-    s.s___123387 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed1816___U1, s.unnamed1817___U2);
+    s.s___98722 = (r0);
     s.tmp_2 = if___draw_2_mk(s);
-    s.tmp_2.arg0 = s.s___123387;
+    s.tmp_2.arg0 = s.s___98722;
     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 = 847; s.pc = 15; return s.tmp_2;
+      s.callLocIdx = 851; 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 = 847; s.pc = 15; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 847; s.pc = 15; return s.tmp_2;; }
-     else { s.callLocIdx = 847; 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 = 851; s.pc = 15; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 851; s.pc = 15; return s.tmp_2;; }
+     else { s.callLocIdx = 851; s.pc = 15; return s.tmp_2; }
     }
   case 15:
     r0 = s.retval;
-    r0 = (s.unnamed16765___U2 + 1);
-    s.unnamed16765___U2 = (r0);
+    r0 = (s.unnamed1817___U2 + 1);
+    s.unnamed1817___U2 = (r0);
     { step = 9; continue; }
   case 10:
-    s.unnamed16764___U1 = (undefined);
+    s.unnamed1816___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["flags"];
     s.tmp_2 = r0;
@@ -22805,21 +22842,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_render__P108943.info = {"start":7844,"length":917,"line":221,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game---hw/scene.ts","functionName":"render","argumentNames":["this"]}
+scene_Scene_render__P83722.info = {"start":7844,"length":917,"line":221,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"render","argumentNames":["this"]}
 
-function scene_Scene_render__P108943_mk(s) {
+function scene_Scene_render__P83722_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_render__P108943, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_render__P83722, 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___123387: undefined,
-  unnamed16764___U1: undefined,
-  unnamed16765___U2: undefined,
+  s___98722: undefined,
+  unnamed1816___U1: undefined,
+  unnamed1817___U2: undefined,
   arg0: undefined,
 } }
 
@@ -22827,7 +22864,7 @@ function scene_Scene_render__P108943_mk(s) {
 
 
 
-function inline__P123364(s) {
+function inline__P98699(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22850,7 +22887,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 = 842; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 846; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
@@ -22863,7 +22900,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 = 843; s.pc = 4; return s.tmp_4; }
+     else { s.callLocIdx = 847; s.pc = 4; return s.tmp_4; }
     }
   case 4:
     r0 = s.retval;
@@ -22883,7 +22920,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 = 844; s.pc = 5; return s.tmp_6; }
+     else { s.callLocIdx = 848; s.pc = 5; return s.tmp_6; }
     }
   case 5:
     r0 = s.retval;
@@ -22896,7 +22933,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 = 845; s.pc = 6; return s.tmp_8; }
+     else { s.callLocIdx = 849; s.pc = 6; return s.tmp_8; }
     }
   case 6:
     r0 = s.retval;
@@ -22909,12 +22946,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P123364.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"]}
+inline__P98699.info = {"start":8422,"length":52,"line":235,"column":37,"endLine":235,"endColumn":89,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P123364_mk(s) {
+function inline__P98699_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P123364, depth: s.depth + 1,
+        parent: s, fn: inline__P98699, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22934,7 +22971,7 @@ function inline__P123364_mk(s) {
 
 
 
-function scene_Background_draw__P108771(s) {
+function scene_Background_draw__P83557(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22949,31 +22986,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C108762_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C83548_VT)) failedCast(r0);
     r0 = s.arg0.fields["color"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.fill(globals.screen___108298, s.tmp_0);
+    r0 = pxsim_ImageMethods.fill(globals.screen___83075, 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___108298, s.tmp_1, 0, 0);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___83075, 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__P123419);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P98754);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_2 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["_layers"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 717; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 721; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -22982,12 +23019,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_draw__P108771.info = {"start":1166,"length":545,"line":48,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game---hw/background.ts","functionName":"draw","argumentNames":["this"]}
+scene_Background_draw__P83557.info = {"start":1166,"length":545,"line":48,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"draw","argumentNames":["this"]}
 
-function scene_Background_draw__P108771_mk(s) {
+function scene_Background_draw__P83557_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_draw__P108771, depth: s.depth + 1,
+        parent: s, fn: scene_Background_draw__P83557, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22999,7 +23036,7 @@ function scene_Background_draw__P108771_mk(s) {
 
 
 
-function inline__P123419(s) {
+function inline__P98754(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23009,8 +23046,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___123421 = undefined;
-    s.oy___123432 = undefined;
+    s.ox___98756 = undefined;
+    s.oy___98767 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -23025,7 +23062,7 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.round(s.tmp_0);
-    s.ox___123421 = (r0);
+    s.ox___98756 = (r0);
     r0 = s.caps[0].fields["camera"];
     r0 = r0.fields["drawOffsetY"];
     s.tmp_1 = r0;
@@ -23036,31 +23073,31 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.round(s.tmp_0);
-    s.oy___123432 = (r0);
-    s.tmp_0 = scene_BackgroundLayer_draw__P108780_mk(s);
+    s.oy___98767 = (r0);
+    s.tmp_0 = scene_BackgroundLayer_draw__P83566_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.ox___123421;
-    s.tmp_0.arg2 = s.oy___123432;
-    s.callLocIdx = 716; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = s.ox___98756;
+    s.tmp_0.arg2 = s.oy___98767;
+    s.callLocIdx = 720; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P123419.info = {"start":1373,"length":312,"line":53,"column":37,"endLine":58,"endColumn":17,"fileName":"pxt_modules/game---hw/background.ts","functionName":"inline","argumentNames":["layer"]}
+inline__P98754.info = {"start":1373,"length":312,"line":53,"column":37,"endLine":58,"endColumn":17,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["layer"]}
 
-function inline__P123419_mk(s) {
+function inline__P98754_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P123419, depth: s.depth + 1,
+        parent: s, fn: inline__P98754, 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___123421: undefined,
-  oy___123432: undefined,
+  ox___98756: undefined,
+  oy___98767: undefined,
   arg0: undefined,
 } }
 
@@ -23068,7 +23105,7 @@ function inline__P123419_mk(s) {
 
 
 
-function scene_BackgroundLayer_draw__P108780(s) {
+function scene_BackgroundLayer_draw__P83566(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23078,19 +23115,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.w___123450 = undefined;
-    s.h___123453 = undefined;
-    s.pw___123456 = undefined;
-    s.ph___123460 = undefined;
-    s.rx___123469 = undefined;
-    s.ry___123472 = undefined;
-    s.y___123541 = undefined;
-    s.py___123542 = undefined;
-    s.dh___123551 = undefined;
-    s.x___123559 = undefined;
-    s.rxl___123560 = undefined;
-    s.px___123566 = undefined;
-    s.dw___123570 = undefined;
+    s.w___98785 = undefined;
+    s.h___98788 = undefined;
+    s.pw___98791 = undefined;
+    s.ph___98795 = undefined;
+    s.rx___98804 = undefined;
+    s.ry___98807 = undefined;
+    s.y___98876 = undefined;
+    s.py___98877 = undefined;
+    s.dh___98886 = undefined;
+    s.x___98894 = undefined;
+    s.rxl___98895 = undefined;
+    s.px___98901 = undefined;
+    s.dw___98905 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -23098,20 +23135,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_BackgroundLayer__C108772_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
-    s.w___123450 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
-    s.h___123453 = (r0);
+    if (!checkSubtype(r0, scene_BackgroundLayer__C83558_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
+    s.w___98785 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
+    s.h___98788 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_0);
-    s.pw___123456 = (r0);
+    s.pw___98791 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_0);
-    s.ph___123460 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.pw___123456);
+    s.ph___98795 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.pw___98791);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -23120,7 +23157,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(s.ph___123460);
+    r0 = pxsim_numops_toBoolDecr(s.ph___98795);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
   case 2:
@@ -23132,9 +23169,9 @@ switch (step) {
   case 3:
   case 4:
     r0 = (0 - s.arg1);
-    s.rx___123469 = (r0);
+    s.rx___98804 = (r0);
     r0 = (0 - s.arg2);
-    s.ry___123472 = (r0);
+    s.ry___98807 = (r0);
     r0 = s.arg0.fields["alignX"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(2, s.tmp_0);
@@ -23144,20 +23181,20 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 5:
-    s.tmp_1 = r0 = s.rx___123469;
-    r0 = (s.w___123450 + s.pw___123456);
+    s.tmp_1 = r0 = s.rx___98804;
+    r0 = (s.w___98785 + s.pw___98791);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
-    s.rx___123469 = (r0);
+    s.rx___98804 = (r0);
     { step = 7; continue; }
   case 6:
-    s.tmp_0 = r0 = s.rx___123469;
-    r0 = (s.w___123450 + s.pw___123456);
+    s.tmp_0 = r0 = s.rx___98804;
+    r0 = (s.w___98785 + s.pw___98791);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.rx___123469 = (r0);
+    s.rx___98804 = (r0);
   case 7:
     r0 = s.arg0.fields["alignY"];
     s.tmp_0 = r0;
@@ -23168,120 +23205,120 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 8:
-    s.tmp_1 = r0 = s.ry___123472;
-    r0 = (s.h___123453 + s.ph___123460);
+    s.tmp_1 = r0 = s.ry___98807;
+    r0 = (s.h___98788 + s.ph___98795);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
-    s.ry___123472 = (r0);
+    s.ry___98807 = (r0);
     { step = 10; continue; }
   case 9:
-    s.tmp_0 = r0 = s.ry___123472;
-    r0 = (s.h___123453 + s.ph___123460);
+    s.tmp_0 = r0 = s.ry___98807;
+    r0 = (s.h___98788 + s.ph___98795);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.ry___123472 = (r0);
+    s.ry___98807 = (r0);
   case 10:
-    r0 = (s.rx___123469 % s.w___123450);
-    s.rx___123469 = (r0);
-    r0 = (s.rx___123469 < 0);
+    r0 = (s.rx___98804 % s.w___98785);
+    s.rx___98804 = (r0);
+    r0 = (s.rx___98804 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = (s.rx___123469 + s.w___123450);
-    s.rx___123469 = (r0);
+    r0 = (s.rx___98804 + s.w___98785);
+    s.rx___98804 = (r0);
   case 11:
   case 12:
-    r0 = (s.ry___123472 % s.h___123453);
-    s.ry___123472 = (r0);
-    r0 = (s.ry___123472 < 0);
+    r0 = (s.ry___98807 % s.h___98788);
+    s.ry___98807 = (r0);
+    r0 = (s.ry___98807 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (s.ry___123472 + s.h___123453);
-    s.ry___123472 = (r0);
+    r0 = (s.ry___98807 + s.h___98788);
+    s.ry___98807 = (r0);
   case 13:
   case 14:
-    r0 = pxsim.Math_.floor(s.rx___123469);
-    s.rx___123469 = (r0);
-    r0 = pxsim.Math_.floor(s.ry___123472);
-    s.ry___123472 = (r0);
-    s.y___123541 = (0);
-    s.py___123542 = (0);
+    r0 = pxsim.Math_.floor(s.rx___98804);
+    s.rx___98804 = (r0);
+    r0 = pxsim.Math_.floor(s.ry___98807);
+    s.ry___98807 = (r0);
+    s.y___98876 = (0);
+    s.py___98877 = (0);
   case 15:
-    r0 = (s.y___123541 < s.h___123453);
+    r0 = (s.y___98876 < s.h___98788);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = (s.y___123541 % s.ph___123460);
-    s.py___123542 = (r0);
-    s.tmp_0 = Math_min__P106735_mk(s);
-    r0 = (s.ph___123460 - s.py___123542);
+    r0 = (s.y___98876 % s.ph___98795);
+    s.py___98877 = (r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
+    r0 = (s.ph___98795 - s.py___98877);
     s.tmp_0.arg0 = r0;
-    r0 = (s.h___123453 - s.ry___123472);
+    r0 = (s.h___98788 - s.ry___98807);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 719; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 723; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.dh___123551 = (r0);
-    s.x___123559 = (0);
-    s.rxl___123560 = (s.rx___123469);
+    s.dh___98886 = (r0);
+    s.x___98894 = (0);
+    s.rxl___98895 = (s.rx___98804);
   case 16:
-    r0 = (s.x___123559 < s.w___123450);
+    r0 = (s.x___98894 < s.w___98785);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    r0 = (s.x___123559 % s.pw___123456);
-    s.px___123566 = (r0);
-    s.tmp_0 = Math_min__P106735_mk(s);
-    r0 = (s.pw___123456 - s.px___123566);
+    r0 = (s.x___98894 % s.pw___98791);
+    s.px___98901 = (r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
+    r0 = (s.pw___98791 - s.px___98901);
     s.tmp_0.arg0 = r0;
-    r0 = (s.w___123450 - s.rxl___123560);
+    r0 = (s.w___98785 - s.rxl___98895);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 720; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 724; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.dw___123570 = (r0);
+    s.dw___98905 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawImage(globals.screen___108298, s.tmp_0, s.rxl___123560, s.ry___123472);
-    r0 = (s.rxl___123560 + s.dw___123570);
+    r0 = pxsim_ImageMethods.drawImage(globals.screen___83075, s.tmp_0, s.rxl___98895, s.ry___98807);
+    r0 = (s.rxl___98895 + s.dw___98905);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.w___123450);
-    s.rxl___123560 = (r0);
+    r0 = (s.tmp_0 % s.w___98785);
+    s.rxl___98895 = (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___123570;
+    r0 = s.dw___98905;
     { step = 18; continue; }
   case 17:
-    r0 = s.w___123450;
+    r0 = s.w___98785;
   case 18:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.x___123559 + s.tmp_1);
-    s.x___123559 = (r0);
+    r0 = (s.x___98894 + s.tmp_1);
+    s.x___98894 = (r0);
     { step = 16; continue; }
   case 19:
-    r0 = (s.ry___123472 + s.dh___123551);
+    r0 = (s.ry___98807 + s.dh___98886);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.h___123453);
-    s.ry___123472 = (r0);
+    r0 = (s.tmp_0 % s.h___98788);
+    s.ry___98807 = (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___123551;
+    r0 = s.dh___98886;
     { step = 21; continue; }
   case 20:
-    r0 = s.h___123453;
+    r0 = s.h___98788;
   case 21:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.y___123541 + s.tmp_1);
-    s.y___123541 = (r0);
+    r0 = (s.y___98876 + s.tmp_1);
+    s.y___98876 = (r0);
     { step = 15; continue; }
   case 22:
   case 23:
@@ -23289,30 +23326,30 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_BackgroundLayer_draw__P108780.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"]}
+scene_BackgroundLayer_draw__P83566.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"]}
 
-function scene_BackgroundLayer_draw__P108780_mk(s) {
+function scene_BackgroundLayer_draw__P83566_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_BackgroundLayer_draw__P108780, depth: s.depth + 1,
+        parent: s, fn: scene_BackgroundLayer_draw__P83566, 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___123450: undefined,
-  h___123453: undefined,
-  pw___123456: undefined,
-  ph___123460: undefined,
-  rx___123469: undefined,
-  ry___123472: undefined,
-  y___123541: undefined,
-  py___123542: undefined,
-  dh___123551: undefined,
-  x___123559: undefined,
-  rxl___123560: undefined,
-  px___123566: undefined,
-  dw___123570: undefined,
+  w___98785: undefined,
+  h___98788: undefined,
+  pw___98791: undefined,
+  ph___98795: undefined,
+  rx___98804: undefined,
+  ry___98807: undefined,
+  y___98876: undefined,
+  py___98877: undefined,
+  dh___98886: undefined,
+  x___98894: undefined,
+  rxl___98895: undefined,
+  px___98901: undefined,
+  dw___98905: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -23322,7 +23359,7 @@ function scene_BackgroundLayer_draw__P108780_mk(s) {
 
 
 
-function scene_Camera_update__P108873(s) {
+function scene_Camera_update__P83652(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23332,78 +23369,78 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.elapsed___123651 = undefined;
-    s.percentComplete___123665 = undefined;
-    s.damp___123672 = undefined;
-    s.f___123681 = undefined;
-    s.x___123687 = undefined;
-    s.y___123694 = undefined;
+    s.elapsed___98986 = undefined;
+    s.percentComplete___99000 = undefined;
+    s.damp___99007 = undefined;
+    s.f___99016 = undefined;
+    s.x___99022 = undefined;
+    s.y___99029 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_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__P108863_mk(s);
+    s.tmp_1 = scene_Camera_offsetX__P83642_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_3 = Sprite_x__P108522_mk(s);
+    s.tmp_3 = Sprite_x__P83304_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 801; s.pc = 10; return s.tmp_3;
+    s.callLocIdx = 805; s.pc = 10; return s.tmp_3;
   case 10:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     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 = 802; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 806; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = scene_Camera_offsetY__P108865_mk(s);
+    s.tmp_0 = scene_Camera_offsetY__P83644_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_y__P108524_mk(s);
+    s.tmp_2 = Sprite_y__P83306_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 803; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 807; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     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 = 804; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 808; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
   case 1:
   case 2:
-    s.tmp_0 = scene_Camera_offsetX__P108863_mk(s);
+    s.tmp_0 = scene_Camera_offsetX__P83642_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 = 806; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 810; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = scene_Camera_offsetY__P108865_mk(s);
+    s.tmp_0 = scene_Camera_offsetY__P83644_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 = 808; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 812; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -23425,10 +23462,10 @@ switch (step) {
     r0 = s.arg0.fields["shakeStartTime"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
-    s.elapsed___123651 = (r0);
+    s.elapsed___98986 = (r0);
     r0 = s.arg0.fields["shakeDuration"];
     s.tmp_1 = r0;
-    r0 = (s.elapsed___123651 >= s.tmp_1);
+    r0 = (s.elapsed___98986 >= s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -23437,49 +23474,49 @@ switch (step) {
   case 3:
     r0 = s.arg0.fields["shakeDuration"];
     s.tmp_0 = r0;
-    r0 = (s.elapsed___123651 / s.tmp_0);
-    s.percentComplete___123665 = (r0);
-    s.damp___123672 = (1);
-    r0 = (s.percentComplete___123665 >= 0.75);
+    r0 = (s.elapsed___98986 / s.tmp_0);
+    s.percentComplete___99000 = (r0);
+    s.damp___99007 = (1);
+    r0 = (s.percentComplete___99000 >= 0.75);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = Math_max__P106734_mk(s);
+    s.tmp_1 = Math_max__P81398_mk(s);
     s.tmp_1.arg0 = 0;
-    r0 = (1 - s.percentComplete___123665);
+    r0 = (1 - s.percentComplete___99000);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 811; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 815; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
-    s.damp___123672 = (r0);
+    s.damp___99007 = (r0);
   case 4:
   case 5:
     r0 = s.arg0.fields["shakeAmplitude"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.damp___123672);
-    s.f___123681 = (r0);
+    r0 = (s.tmp_0 * s.damp___99007);
+    s.f___99016 = (r0);
     r0 = pxsim.Math_.random();
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.f___123681);
+    r0 = (s.tmp_1 * s.f___99016);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 0);
-    s.x___123687 = (r0);
+    s.x___99022 = (r0);
     r0 = pxsim.Math_.random();
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.f___123681);
+    r0 = (s.tmp_1 * s.f___99016);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 0);
-    s.y___123694 = (r0);
+    s.y___99029 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["drawOffsetX"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.x___123687);
+    r0 = (s.tmp_2 + s.x___99022);
     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___123694);
+    r0 = (s.tmp_2 + s.y___99029);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["drawOffsetY"] = (s.tmp_1);
   case 6:
@@ -23489,12 +23526,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_update__P108873.info = {"start":2297,"length":1397,"line":77,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"update","argumentNames":["this"]}
+scene_Camera_update__P83652.info = {"start":2297,"length":1397,"line":77,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"update","argumentNames":["this"]}
 
-function scene_Camera_update__P108873_mk(s) {
+function scene_Camera_update__P83652_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_update__P108873, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_update__P83652, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23502,12 +23539,12 @@ function scene_Camera_update__P108873_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  elapsed___123651: undefined,
-  percentComplete___123665: undefined,
-  damp___123672: undefined,
-  f___123681: undefined,
-  x___123687: undefined,
-  y___123694: undefined,
+  elapsed___98986: undefined,
+  percentComplete___99000: undefined,
+  damp___99007: undefined,
+  f___99016: undefined,
+  x___99022: undefined,
+  y___99029: undefined,
   arg0: undefined,
 } }
 
@@ -23515,7 +23552,7 @@ function scene_Camera_update__P108873_mk(s) {
 
 
 
-function scene_Camera_offsetY__P108865(s) {
+function scene_Camera_offsetY__P83644(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23525,27 +23562,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___123713 = undefined;
+    s.scene___99048 = 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__C108857_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 798; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 802; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.scene___123713 = (r0);
-    r0 = s.scene___123713.fields["tileMap"];
+    s.scene___99048 = (r0);
+    r0 = s.scene___99048.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___123713.fields["tileMap"];
+    r0 = s.scene___99048.fields["tileMap"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_map"];
     s.tmp_5 = r0;
@@ -23562,11 +23599,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__P108819_mk(s);
-    r0 = s.scene___123713.fields["tileMap"];
+    s.tmp_9 = tiles_TileMap_offsetY__P83605_mk(s);
+    r0 = s.scene___99048.fields["tileMap"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = s.arg1;
-    s.callLocIdx = 800; s.pc = 6; return s.tmp_9;
+    s.callLocIdx = 804; s.pc = 6; return s.tmp_9;
   case 6:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -23579,12 +23616,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetY__P108865.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"]}
+scene_Camera_offsetY__P83644.info = {"start":1034,"length":267,"line":37,"column":8,"endLine":44,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetY","argumentNames":["this","v"]}
 
-function scene_Camera_offsetY__P108865_mk(s) {
+function scene_Camera_offsetY__P83644_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetY__P108865, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetY__P83644, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23596,7 +23633,7 @@ function scene_Camera_offsetY__P108865_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  scene___123713: undefined,
+  scene___99048: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -23605,7 +23642,7 @@ function scene_Camera_offsetY__P108865_mk(s) {
 
 
 
-function tiles_TileMap_enabled__P108824(s) {
+function tiles_TileMap_enabled__P83610(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23620,7 +23657,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
@@ -23633,13 +23670,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_enabled__P108824.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__P108824.isGetter = true;
+tiles_TileMap_enabled__P83610.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__P83610.isGetter = true;
 
-function tiles_TileMap_enabled__P108824_mk(s) {
+function tiles_TileMap_enabled__P83610_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_enabled__P108824, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_enabled__P83610, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23652,7 +23689,7 @@ function tiles_TileMap_enabled__P108824_mk(s) {
 
 
 
-function tiles_TileMap_offsetY__P108819(s) {
+function tiles_TileMap_offsetY__P83605(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23668,38 +23705,38 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P106731_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P81395_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_max__P106734_mk(s);
-    s.tmp_3 = tiles_TileMap_areaHeight__P108821_mk(s);
+    s.tmp_1 = Math_max__P81398_mk(s);
+    s.tmp_3 = tiles_TileMap_areaHeight__P83607_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 737; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 741; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 738; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 742; 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 = 739; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 743; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_offsetY__P108819.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"]}
+tiles_TileMap_offsetY__P83605.info = {"start":6560,"length":123,"line":239,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetY","argumentNames":["this","value"]}
 
-function tiles_TileMap_offsetY__P108819_mk(s) {
+function tiles_TileMap_offsetY__P83605_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_offsetY__P108819, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_offsetY__P83605, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23714,7 +23751,7 @@ function tiles_TileMap_offsetY__P108819_mk(s) {
 
 
 
-function tiles_TileMap_areaHeight__P108821(s) {
+function tiles_TileMap_areaHeight__P83607(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23729,7 +23766,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -23751,12 +23788,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_areaHeight__P108821.info = {"start":6794,"length":93,"line":247,"column":8,"endLine":249,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"areaHeight","argumentNames":["this"]}
+tiles_TileMap_areaHeight__P83607.info = {"start":6794,"length":93,"line":247,"column":8,"endLine":249,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"areaHeight","argumentNames":["this"]}
 
-function tiles_TileMap_areaHeight__P108821_mk(s) {
+function tiles_TileMap_areaHeight__P83607_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_areaHeight__P108821, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_areaHeight__P83607, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23770,7 +23807,7 @@ function tiles_TileMap_areaHeight__P108821_mk(s) {
 
 
 
-function tiles_TileMap_scale__P108816(s) {
+function tiles_TileMap_scale__P83602(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23785,18 +23822,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_scale"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_scale__P108816.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__P108816.isGetter = true;
+tiles_TileMap_scale__P83602.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__P83602.isGetter = true;
 
-function tiles_TileMap_scale__P108816_mk(s) {
+function tiles_TileMap_scale__P83602_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_scale__P108816, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_scale__P83602, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -23805,7 +23842,7 @@ function tiles_TileMap_scale__P108816_mk(s) {
 
 
 
-function tiles_TileMapData_height__P108804(s) {
+function tiles_TileMapData_height__P83590(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23820,18 +23857,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
     r0 = s.arg0.fields["_height"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_height__P108804.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__P108804.isGetter = true;
+tiles_TileMapData_height__P83590.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__P83590.isGetter = true;
 
-function tiles_TileMapData_height__P108804_mk(s) {
+function tiles_TileMapData_height__P83590_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_height__P108804, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_height__P83590, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -23840,7 +23877,7 @@ function tiles_TileMapData_height__P108804_mk(s) {
 
 
 
-function scene_Camera_offsetY__P108864(s) {
+function scene_Camera_offsetY__P83643(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23855,18 +23892,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["_offsetY"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetY__P108864.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__P108864.isGetter = true;
+scene_Camera_offsetY__P83643.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__P83643.isGetter = true;
 
-function scene_Camera_offsetY__P108864_mk(s) {
+function scene_Camera_offsetY__P83643_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetY__P108864, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetY__P83643, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -23875,7 +23912,7 @@ function scene_Camera_offsetY__P108864_mk(s) {
 
 
 
-function scene_Camera_offsetX__P108863(s) {
+function scene_Camera_offsetX__P83642(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23885,27 +23922,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___123769 = undefined;
+    s.scene___99104 = 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__C108857_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 795; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 799; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.scene___123769 = (r0);
-    r0 = s.scene___123769.fields["tileMap"];
+    s.scene___99104 = (r0);
+    r0 = s.scene___99104.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___123769.fields["tileMap"];
+    r0 = s.scene___99104.fields["tileMap"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_map"];
     s.tmp_5 = r0;
@@ -23922,11 +23959,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__P108818_mk(s);
-    r0 = s.scene___123769.fields["tileMap"];
+    s.tmp_9 = tiles_TileMap_offsetX__P83604_mk(s);
+    r0 = s.scene___99104.fields["tileMap"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = s.arg1;
-    s.callLocIdx = 797; s.pc = 6; return s.tmp_9;
+    s.callLocIdx = 801; s.pc = 6; return s.tmp_9;
   case 6:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -23939,12 +23976,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetX__P108863.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"]}
+scene_Camera_offsetX__P83642.info = {"start":690,"length":267,"line":26,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetX","argumentNames":["this","v"]}
 
-function scene_Camera_offsetX__P108863_mk(s) {
+function scene_Camera_offsetX__P83642_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetX__P108863, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetX__P83642, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23956,7 +23993,7 @@ function scene_Camera_offsetX__P108863_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  scene___123769: undefined,
+  scene___99104: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -23965,7 +24002,7 @@ function scene_Camera_offsetX__P108863_mk(s) {
 
 
 
-function tiles_TileMap_offsetX__P108818(s) {
+function tiles_TileMap_offsetX__P83604(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23981,38 +24018,38 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P106731_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P81395_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_max__P106734_mk(s);
-    s.tmp_3 = tiles_TileMap_areaWidth__P108820_mk(s);
+    s.tmp_1 = Math_max__P81398_mk(s);
+    s.tmp_3 = tiles_TileMap_areaWidth__P83606_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 734; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 738; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 735; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 739; 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 = 736; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 740; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_offsetX__P108818.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"]}
+tiles_TileMap_offsetX__P83604.info = {"start":6429,"length":121,"line":235,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetX","argumentNames":["this","value"]}
 
-function tiles_TileMap_offsetX__P108818_mk(s) {
+function tiles_TileMap_offsetX__P83604_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_offsetX__P108818, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_offsetX__P83604, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24027,7 +24064,7 @@ function tiles_TileMap_offsetX__P108818_mk(s) {
 
 
 
-function tiles_TileMap_areaWidth__P108820(s) {
+function tiles_TileMap_areaWidth__P83606(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24042,7 +24079,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -24064,12 +24101,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_areaWidth__P108820.info = {"start":6693,"length":91,"line":243,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"areaWidth","argumentNames":["this"]}
+tiles_TileMap_areaWidth__P83606.info = {"start":6693,"length":91,"line":243,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"areaWidth","argumentNames":["this"]}
 
-function tiles_TileMap_areaWidth__P108820_mk(s) {
+function tiles_TileMap_areaWidth__P83606_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_areaWidth__P108820, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_areaWidth__P83606, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24083,7 +24120,7 @@ function tiles_TileMap_areaWidth__P108820_mk(s) {
 
 
 
-function tiles_TileMapData_width__P108803(s) {
+function tiles_TileMapData_width__P83589(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24098,18 +24135,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
     r0 = s.arg0.fields["_width"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_width__P108803.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__P108803.isGetter = true;
+tiles_TileMapData_width__P83589.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__P83589.isGetter = true;
 
-function tiles_TileMapData_width__P108803_mk(s) {
+function tiles_TileMapData_width__P83589_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_width__P108803, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_width__P83589, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -24118,7 +24155,7 @@ function tiles_TileMapData_width__P108803_mk(s) {
 
 
 
-function scene_Camera_offsetX__P108862(s) {
+function scene_Camera_offsetX__P83641(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24133,18 +24170,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = s.arg0.fields["_offsetX"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetX__P108862.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__P108862.isGetter = true;
+scene_Camera_offsetX__P83641.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__P83641.isGetter = true;
 
-function scene_Camera_offsetX__P108862_mk(s) {
+function scene_Camera_offsetX__P83641_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetX__P108862, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetX__P83641, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -24153,7 +24190,7 @@ function scene_Camera_offsetX__P108862_mk(s) {
 
 
 
-function Sprite_y__P108524(s) {
+function Sprite_y__P83306(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24168,7 +24205,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["_y"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 256);
@@ -24183,13 +24220,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_y__P108524.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__P108524.isGetter = true;
+Sprite_y__P83306.info = {"start":2132,"length":85,"line":87,"column":4,"endLine":89,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this"]}
+Sprite_y__P83306.isGetter = true;
 
-function Sprite_y__P108524_mk(s) {
+function Sprite_y__P83306_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_y__P108524, depth: s.depth + 1,
+        parent: s, fn: Sprite_y__P83306, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24203,7 +24240,7 @@ function Sprite_y__P108524_mk(s) {
 
 
 
-function Sprite_x__P108522(s) {
+function Sprite_x__P83304(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24218,7 +24255,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["_x"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 256);
@@ -24233,13 +24270,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_x__P108522.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__P108522.isGetter = true;
+Sprite_x__P83304.info = {"start":1784,"length":84,"line":76,"column":4,"endLine":78,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this"]}
+Sprite_x__P83304.isGetter = true;
 
-function Sprite_x__P108522_mk(s) {
+function Sprite_x__P83304_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_x__P108522, depth: s.depth + 1,
+        parent: s, fn: Sprite_x__P83304, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24253,7 +24290,7 @@ function Sprite_x__P108522_mk(s) {
 
 
 
-function PhysicsEngine_move__P108662(s) {
+function PhysicsEngine_move__P83446(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24269,17 +24306,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C108656_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C83440_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_move__P108662.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"]}
+PhysicsEngine_move__P83446.info = {"start":351,"length":20,"line":18,"column":4,"endLine":18,"endColumn":24,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
 
-function PhysicsEngine_move__P108662_mk(s) {
+function PhysicsEngine_move__P83446_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_move__P108662, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_move__P83446, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -24289,7 +24326,7 @@ function PhysicsEngine_move__P108662_mk(s) {
 
 
 
-function PhysicsEngine_draw__P108661(s) {
+function PhysicsEngine_draw__P83445(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24304,17 +24341,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C108656_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C83440_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_draw__P108661.info = {"start":279,"length":10,"line":15,"column":4,"endLine":15,"endColumn":14,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"draw","argumentNames":["this"]}
+PhysicsEngine_draw__P83445.info = {"start":279,"length":10,"line":15,"column":4,"endLine":15,"endColumn":14,"fileName":"pxt_modules/game/physics.ts","functionName":"draw","argumentNames":["this"]}
 
-function PhysicsEngine_draw__P108661_mk(s) {
+function PhysicsEngine_draw__P83445_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_draw__P108661, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_draw__P83445, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -24323,7 +24360,7 @@ function PhysicsEngine_draw__P108661_mk(s) {
 
 
 
-function controller___update__P108447(s) {
+function controller___update__P83223(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24333,7 +24370,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dtms___124123 = undefined;
+    s.dtms___99458 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -24341,35 +24378,35 @@ switch (step) {
     r0 = (s.arg0 * 1000);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    s.dtms___124123 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P124130);
+    s.dtms___99458 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P99465);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dtms___124123);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_2 = controller_players__P108415_mk(s);
-    s.callLocIdx = 229; s.pc = 2; return s.tmp_2;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dtms___99458);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_2 = controller_players__P83191_mk(s);
+    s.callLocIdx = 238; 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 = 231; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 240; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller___update__P108447.info = {"start":17961,"length":137,"line":550,"column":4,"endLine":553,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"__update","argumentNames":["dt"]}
+controller___update__P83223.info = {"start":17961,"length":137,"line":550,"column":4,"endLine":553,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["dt"]}
 
-function controller___update__P108447_mk(s) {
+function controller___update__P83223_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller___update__P108447, depth: s.depth + 1,
+        parent: s, fn: controller___update__P83223, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  dtms___124123: undefined,
+  dtms___99458: undefined,
   arg0: undefined,
 } }
 
@@ -24377,7 +24414,7 @@ function controller___update__P108447_mk(s) {
 
 
 
-function inline__P124130(s) {
+function inline__P99465(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24391,22 +24428,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller___update__P108445_mk(s);
+    s.tmp_0 = controller_Controller___update__P83221_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.caps[0];
-    s.callLocIdx = 230; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 239; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P124130.info = {"start":18063,"length":27,"line":552,"column":26,"endLine":552,"endColumn":53,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P99465.info = {"start":18063,"length":27,"line":552,"column":26,"endLine":552,"endColumn":53,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
 
-function inline__P124130_mk(s) {
+function inline__P99465_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P124130, depth: s.depth + 1,
+        parent: s, fn: inline__P99465, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -24416,7 +24453,7 @@ function inline__P124130_mk(s) {
 
 
 
-function controller_Controller___update__P108445(s) {
+function controller_Controller___update__P83221(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24432,7 +24469,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
@@ -24443,26 +24480,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__P124143);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P99478);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["buttons"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 228; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 237; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller___update__P108445.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"]}
+controller_Controller___update__P83221.info = {"start":17439,"length":124,"line":532,"column":8,"endLine":535,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
 
-function controller_Controller___update__P108445_mk(s) {
+function controller_Controller___update__P83221_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller___update__P108445, depth: s.depth + 1,
+        parent: s, fn: controller_Controller___update__P83221, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24476,7 +24513,7 @@ function controller_Controller___update__P108445_mk(s) {
 
 
 
-function inline__P124143(s) {
+function inline__P99478(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24490,23 +24527,23 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Button___update__P108412_mk(s);
+    s.tmp_0 = controller_Button___update__P83188_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 227; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 236; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P124143.info = {"start":17526,"length":25,"line":534,"column":33,"endLine":534,"endColumn":58,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["btn"]}
+inline__P99478.info = {"start":17526,"length":25,"line":534,"column":33,"endLine":534,"endColumn":58,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["btn"]}
 
-function inline__P124143_mk(s) {
+function inline__P99478_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P124143, depth: s.depth + 1,
+        parent: s, fn: inline__P99478, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -24516,7 +24553,7 @@ function inline__P124143_mk(s) {
 
 
 
-function controller_Button___update__P108412(s) {
+function controller_Button___update__P83188(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24526,16 +24563,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.delay___124160 = undefined;
-    s.interval___124169 = undefined;
-    s.count___124182 = undefined;
+    s.delay___99495 = undefined;
+    s.interval___99504 = undefined;
+    s.count___99517 = 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__C108400_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -24559,31 +24596,31 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = globals.defaultRepeatDelay___110702;
+    r0 = globals.defaultRepeatDelay___85528;
     { step = 4; continue; }
   case 3:
     r0 = s.arg0.fields["repeatDelay"];
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.delay___124160 = (s.tmp_2);
+    s.delay___99495 = (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___110704;
+    r0 = globals.defaultRepeatInterval___85530;
     { step = 6; continue; }
   case 5:
     r0 = s.arg0.fields["repeatInterval"];
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.interval___124169 = (s.tmp_2);
+    s.interval___99504 = (s.tmp_2);
     r0 = s.arg0.fields["_pressedElasped"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 < s.delay___124160);
+    r0 = (s.tmp_1 < s.delay___99495);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
@@ -24592,26 +24629,26 @@ switch (step) {
   case 8:
     r0 = s.arg0.fields["_pressedElasped"];
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.delay___124160);
+    r0 = (s.tmp_5 - s.delay___99495);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.interval___124169);
+    r0 = (s.tmp_4 - s.interval___99504);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / s.interval___124169);
+    r0 = (s.tmp_3 / s.interval___99504);
     s.tmp_2 = r0;
     r0 = pxsim.Math_.floor(s.tmp_2);
-    s.count___124182 = (r0);
+    s.count___99517 = (r0);
     r0 = s.arg0.fields["_repeatCount"];
     s.tmp_1 = r0;
-    r0 = (s.count___124182 != s.tmp_1);
+    r0 = (s.count___99517 != 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__P110709_mk(s);
+    s.tmp_2 = controller_Button_raiseButtonRepeat__P85535_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 184; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 193; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
-    r0 = (s.arg0).fields["_repeatCount"] = (s.count___124182);
+    r0 = (s.arg0).fields["_repeatCount"] = (s.count___99517);
   case 9:
   case 10:
   case 11:
@@ -24619,12 +24656,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button___update__P108412.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"]}
+controller_Button___update__P83188.info = {"start":5117,"length":704,"line":164,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
 
-function controller_Button___update__P108412_mk(s) {
+function controller_Button___update__P83188_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button___update__P108412, depth: s.depth + 1,
+        parent: s, fn: controller_Button___update__P83188, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24632,9 +24669,9 @@ function controller_Button___update__P108412_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  delay___124160: undefined,
-  interval___124169: undefined,
-  count___124182: undefined,
+  delay___99495: undefined,
+  interval___99504: undefined,
+  count___99517: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -24643,7 +24680,7 @@ function controller_Button___update__P108412_mk(s) {
 
 
 
-function controller_Button_raiseButtonRepeat__P110709(s) {
+function controller_Button_raiseButtonRepeat__P85535(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24658,8 +24695,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___110700);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___85526);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -24674,12 +24711,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonRepeat__P110709.info = {"start":2887,"length":211,"line":99,"column":8,"endLine":104,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"raiseButtonRepeat","argumentNames":["this"]}
+controller_Button_raiseButtonRepeat__P85535.info = {"start":2887,"length":211,"line":99,"column":8,"endLine":104,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonRepeat","argumentNames":["this"]}
 
-function controller_Button_raiseButtonRepeat__P110709_mk(s) {
+function controller_Button_raiseButtonRepeat__P85535_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonRepeat__P110709, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonRepeat__P85535, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -24689,7 +24726,7 @@ function controller_Button_raiseButtonRepeat__P110709_mk(s) {
 
 
 
-function controller_players__P108415(s) {
+function controller_players__P83191(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24699,25 +24736,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller__player1__P108414_mk(s);
-    s.callLocIdx = 187; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = controller__player1__P83190_mk(s);
+    s.callLocIdx = 196; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_0.arg0 = globals._players___110713;
-    s.tmp_0.arg1 = inline__P124020;
-    s.callLocIdx = 188; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_0.arg0 = globals._players___85539;
+    s.tmp_0.arg1 = inline__P99355;
+    s.callLocIdx = 197; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-controller_players__P108415.info = {"start":7040,"length":144,"line":220,"column":4,"endLine":223,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"players","argumentNames":[]}
+controller_players__P83191.info = {"start":7040,"length":144,"line":220,"column":4,"endLine":223,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"players","argumentNames":[]}
 
-function controller_players__P108415_mk(s) {
+function controller_players__P83191_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_players__P108415, depth: s.depth + 1,
+        parent: s, fn: controller_players__P83191, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -24726,7 +24763,7 @@ function controller_players__P108415_mk(s) {
 
 
 
-function inline__P124020(s) {
+function inline__P99355(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24750,12 +24787,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P124020.info = {"start":7162,"length":14,"line":222,"column":31,"endLine":222,"endColumn":45,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P99355.info = {"start":7162,"length":14,"line":222,"column":31,"endLine":222,"endColumn":45,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
 
-function inline__P124020_mk(s) {
+function inline__P99355_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P124020, depth: s.depth + 1,
+        parent: s, fn: inline__P99355, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24767,7 +24804,7 @@ function inline__P124020_mk(s) {
 
 
 
-function controller__player1__P108414(s) {
+function controller__player1__P83190(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24777,7 +24814,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals._players___110713);
+    r0 = pxsim_numops_toBoolDecr(globals._players___85539);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -24786,7 +24823,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__getAt(globals._players___110713, 0);
+    r0 = pxsim_Array__getAt(globals._players___85539, 0);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -24796,36 +24833,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__C108420_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Controller__C83196_VT);
     s.tmp_5 = r0;
     r0 = pxsim_Array__mk();
     s.tmp_6 = r0;
-    r0 = pxsim_Array__push(s.tmp_6, globals.left___108376);
-    r0 = pxsim_Array__push(s.tmp_6, globals.up___108377);
-    r0 = pxsim_Array__push(s.tmp_6, globals.right___108378);
-    r0 = pxsim_Array__push(s.tmp_6, globals.down___108379);
-    r0 = pxsim_Array__push(s.tmp_6, globals.A___108374);
-    r0 = pxsim_Array__push(s.tmp_6, globals.B___108375);
-    r0 = pxsim_Array__push(s.tmp_6, globals.menu___108380);
-    s.tmp_7 = controller_Controller_constructor__P108424_mk(s);
+    r0 = pxsim_Array__push(s.tmp_6, globals.left___83152);
+    r0 = pxsim_Array__push(s.tmp_6, globals.up___83153);
+    r0 = pxsim_Array__push(s.tmp_6, globals.right___83154);
+    r0 = pxsim_Array__push(s.tmp_6, globals.down___83155);
+    r0 = pxsim_Array__push(s.tmp_6, globals.A___83150);
+    r0 = pxsim_Array__push(s.tmp_6, globals.B___83151);
+    r0 = pxsim_Array__push(s.tmp_6, globals.menu___83156);
+    s.tmp_7 = controller_Controller_constructor__P83200_mk(s);
     s.tmp_7.arg0 = s.tmp_5;
     s.tmp_7.arg1 = 1;
     s.tmp_7.arg2 = s.tmp_6;
-    s.callLocIdx = 186; s.pc = 5; return s.tmp_7;
+    s.callLocIdx = 195; s.pc = 5; return s.tmp_7;
   case 5:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_Array__getAt(globals._players___110713, 0);
+    r0 = pxsim_Array__getAt(globals._players___85539, 0);
     return leave(s, r0)
   default: oops()
 } } }
-controller__player1__P108414.info = {"start":6776,"length":258,"line":214,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_player1","argumentNames":[]}
+controller__player1__P83190.info = {"start":6776,"length":258,"line":214,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_player1","argumentNames":[]}
 
-function controller__player1__P108414_mk(s) {
+function controller__player1__P83190_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__player1__P108414, depth: s.depth + 1,
+        parent: s, fn: controller__player1__P83190, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24841,7 +24878,7 @@ function controller__player1__P108414_mk(s) {
 
 
 
-function controller_Controller_constructor__P108424(s) {
+function controller_Controller_constructor__P83200(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24851,9 +24888,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.leftId___124065 = undefined;
-    s.i___124073 = undefined;
-    s.i___124091 = undefined;
+    s.leftId___99400 = undefined;
+    s.i___99408 = undefined;
+    s.i___99426 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -24861,7 +24898,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim.control.allocateNotifyEvent();
     s.tmp_1 = r0;
@@ -24885,34 +24922,34 @@ switch (step) {
     r0 = (s.tmp_1 * 7);
     s.tmp_0 = r0;
     r0 = (1 + s.tmp_0);
-    s.leftId___124065 = (r0);
-    s.i___124073 = (0);
+    s.leftId___99400 = (r0);
+    s.i___99408 = (0);
   case 2:
-    r0 = (s.i___124073 < 7);
+    r0 = (s.i___99408 < 7);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C108400_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C83176_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = controller_Button_constructor__P108406_mk(s);
+    s.tmp_2 = controller_Button_constructor__P83182_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    r0 = (s.leftId___124065 + s.i___124073);
+    r0 = (s.leftId___99400 + s.i___99408);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = -1;
-    s.callLocIdx = 192; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 201; 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___124073 + 1);
-    s.i___124073 = (r0);
+    r0 = (s.i___99408 + 1);
+    s.i___99408 = (r0);
     { step = 2; continue; }
   case 3:
   case 4:
-    s.i___124091 = (0);
+    s.i___99426 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___124091;
+    s.tmp_1 = r0 = s.i___99426;
     r0 = s.arg0.fields["buttons"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -24923,28 +24960,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___124091);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___99426);
     s.tmp_4 = r0;
     r0 = (s.tmp_4).fields["_owner"] = (s.arg0);
-    r0 = (s.i___124091 + 1);
-    s.i___124091 = (r0);
+    r0 = (s.i___99426 + 1);
+    s.i___99426 = (r0);
     { step = 5; continue; }
   case 6:
-    s.tmp_0 = controller_addController__P110714_mk(s);
+    s.tmp_0 = controller_addController__P85540_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 193; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 202; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_constructor__P108424.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"]}
+controller_Controller_constructor__P83200.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"]}
 
-function controller_Controller_constructor__P108424_mk(s) {
+function controller_Controller_constructor__P83200_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_constructor__P108424, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_constructor__P83200, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24952,9 +24989,9 @@ function controller_Controller_constructor__P108424_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  leftId___124065: undefined,
-  i___124073: undefined,
-  i___124091: undefined,
+  leftId___99400: undefined,
+  i___99408: undefined,
+  i___99426: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -24964,7 +25001,7 @@ function controller_Controller_constructor__P108424_mk(s) {
 
 
 
-function controller_addController__P110714(s) {
+function controller_addController__P85540(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24978,17 +25015,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._players___110713);
+    r0 = pxsim_numops_toBoolDecr(globals._players___85539);
     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___110713 = (r0);
+    globals._players___85539 = (r0);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals._players___110713;
+    s.tmp_0 = r0 = globals._players___85539;
     r0 = s.arg0.fields["playerIndex"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
@@ -24998,12 +25035,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_addController__P110714.info = {"start":6613,"length":157,"line":207,"column":4,"endLine":212,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"addController","argumentNames":["ctrl"]}
+controller_addController__P85540.info = {"start":6613,"length":157,"line":207,"column":4,"endLine":212,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"addController","argumentNames":["ctrl"]}
 
-function controller_addController__P110714_mk(s) {
+function controller_addController__P85540_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_addController__P110714, depth: s.depth + 1,
+        parent: s, fn: controller_addController__P85540, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25015,7 +25052,7 @@ function controller_addController__P110714_mk(s) {
 
 
 
-function controller__moveSprites__P108419(s) {
+function controller__moveSprites__P83195(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25025,26 +25062,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1 = controller_players__P108415_mk(s);
-    s.callLocIdx = 189; s.pc = 2; return s.tmp_1;
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1 = controller_players__P83191_mk(s);
+    s.callLocIdx = 198; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P123819;
-    s.callLocIdx = 191; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P99154;
+    s.callLocIdx = 200; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller__moveSprites__P108419.info = {"start":7400,"length":182,"line":234,"column":4,"endLine":238,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_moveSprites","argumentNames":[]}
+controller__moveSprites__P83195.info = {"start":7400,"length":182,"line":234,"column":4,"endLine":238,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_moveSprites","argumentNames":[]}
 
-function controller__moveSprites__P108419_mk(s) {
+function controller__moveSprites__P83195_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__moveSprites__P108419, depth: s.depth + 1,
+        parent: s, fn: controller__moveSprites__P83195, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25054,7 +25091,7 @@ function controller__moveSprites__P108419_mk(s) {
 
 
 
-function inline__P123819(s) {
+function inline__P99154(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25068,21 +25105,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller___preUpdate__P108444_mk(s);
+    s.tmp_0 = controller_Controller___preUpdate__P83220_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 190; 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__P123819.info = {"start":7548,"length":26,"line":237,"column":26,"endLine":237,"endColumn":52,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P99154.info = {"start":7548,"length":26,"line":237,"column":26,"endLine":237,"endColumn":52,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
 
-function inline__P123819_mk(s) {
+function inline__P99154_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P123819, depth: s.depth + 1,
+        parent: s, fn: inline__P99154, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -25092,7 +25129,7 @@ function inline__P123819_mk(s) {
 
 
 
-function controller_Controller___preUpdate__P108444(s) {
+function controller_Controller___preUpdate__P83220(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25102,22 +25139,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.deadSprites___123826 = undefined;
-    s.svx___123827 = undefined;
-    s.svy___123828 = undefined;
-    s.svxInCricle___123863 = undefined;
-    s.svyInCircle___123865 = undefined;
-    s.sq___123867 = undefined;
-    s.scale___123882 = undefined;
+    s.deadSprites___99161 = undefined;
+    s.svx___99162 = undefined;
+    s.svy___99163 = undefined;
+    s.svxInCricle___99198 = undefined;
+    s.svyInCircle___99200 = undefined;
+    s.sq___99202 = undefined;
+    s.scale___99217 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
-    s.tmp_3 = controller_Controller__controlledSprites__P108425_mk(s);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
+    s.tmp_3 = controller_Controller__controlledSprites__P83201_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 202; s.pc = 18; return s.tmp_3;
+    s.callLocIdx = 211; s.pc = 18; return s.tmp_3;
   case 18:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -25131,38 +25168,38 @@ switch (step) {
   case 1:
   case 2:
     r0 = pxsim_pxtrt.mklocRef();
-    s.deadSprites___123826 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.deadSprites___123826, false);
+    s.deadSprites___99161 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.deadSprites___99161, false);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svx___123827 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.svx___123827, 0);
+    s.svx___99162 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.svx___99162, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svy___123828 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.svy___123828, 0);
+    s.svy___99163 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.svy___99163, 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___123827;
-    s.tmp_5 = controller_Button_pressureLevel__P108410_mk(s);
-    s.tmp_6 = controller_Controller_right__P108430_mk(s);
+    s.tmp_1 = r0 = s.svx___99162;
+    s.tmp_5 = controller_Button_pressureLevel__P83186_mk(s);
+    s.tmp_6 = controller_Controller_right__P83206_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 203; s.pc = 20; return s.tmp_6;
+    s.callLocIdx = 212; s.pc = 20; return s.tmp_6;
   case 20:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    s.callLocIdx = 204; s.pc = 19; return s.tmp_5;
+    s.callLocIdx = 213; s.pc = 19; return s.tmp_5;
   case 19:
     r0 = s.retval;
     s.tmp_4 = r0;
-    s.tmp_8 = controller_Button_pressureLevel__P108410_mk(s);
-    s.tmp_9 = controller_Controller_left__P108429_mk(s);
+    s.tmp_8 = controller_Button_pressureLevel__P83186_mk(s);
+    s.tmp_9 = controller_Controller_left__P83205_mk(s);
     s.tmp_9.arg0 = s.arg0;
-    s.callLocIdx = 205; s.pc = 22; return s.tmp_9;
+    s.callLocIdx = 214; s.pc = 22; return s.tmp_9;
   case 22:
     r0 = s.retval;
     s.tmp_8.arg0 = r0;
-    s.callLocIdx = 206; s.pc = 21; return s.tmp_8;
+    s.callLocIdx = 215; s.pc = 21; return s.tmp_8;
   case 21:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -25171,26 +25208,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___123828;
-    s.tmp_4 = controller_Button_pressureLevel__P108410_mk(s);
-    s.tmp_5 = controller_Controller_down__P108432_mk(s);
+    s.tmp_0 = r0 = s.svy___99163;
+    s.tmp_4 = controller_Button_pressureLevel__P83186_mk(s);
+    s.tmp_5 = controller_Controller_down__P83208_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 207; s.pc = 24; return s.tmp_5;
+    s.callLocIdx = 216; s.pc = 24; return s.tmp_5;
   case 24:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 208; s.pc = 23; return s.tmp_4;
+    s.callLocIdx = 217; s.pc = 23; return s.tmp_4;
   case 23:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_7 = controller_Button_pressureLevel__P108410_mk(s);
-    s.tmp_8 = controller_Controller_up__P108431_mk(s);
+    s.tmp_7 = controller_Button_pressureLevel__P83186_mk(s);
+    s.tmp_8 = controller_Controller_up__P83207_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 209; s.pc = 26; return s.tmp_8;
+    s.callLocIdx = 218; s.pc = 26; return s.tmp_8;
   case 26:
     r0 = s.retval;
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 210; s.pc = 25; return s.tmp_7;
+    s.callLocIdx = 219; s.pc = 25; return s.tmp_7;
   case 25:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -25201,14 +25238,14 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 12; continue; }
   case 3:
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_2 = controller_Controller_right__P108430_mk(s);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_2 = controller_Controller_right__P83206_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 211; s.pc = 28; return s.tmp_2;
+    s.callLocIdx = 220; 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__C108400_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_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:
@@ -25223,14 +25260,14 @@ switch (step) {
   case 5:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_5 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_6 = controller_Controller_left__P108429_mk(s);
+    s.tmp_5 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_6 = controller_Controller_left__P83205_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 212; s.pc = 30; return s.tmp_6;
+    s.callLocIdx = 221; 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__C108400_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C83176_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:
@@ -25245,18 +25282,18 @@ switch (step) {
   case 7:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.svx___123827;
+    s.tmp_8 = r0 = s.svx___99162;
     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__C108400_v0_1_mk(s);
-    s.tmp_2 = controller_Controller_down__P108432_mk(s);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_2 = controller_Controller_down__P83208_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 213; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 222; 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__C108400_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_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:
@@ -25271,14 +25308,14 @@ switch (step) {
   case 9:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_5 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_6 = controller_Controller_up__P108431_mk(s);
+    s.tmp_5 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_6 = controller_Controller_up__P83207_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 214; s.pc = 34; return s.tmp_6;
+    s.callLocIdx = 223; 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__C108400_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C83176_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:
@@ -25293,57 +25330,57 @@ switch (step) {
   case 11:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.svy___123828;
+    s.tmp_8 = r0 = s.svy___99163;
     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___123863 = (r0);
-    s.tmp_0 = r0 = s.svxInCricle___123863;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___123827);
+    s.svxInCricle___99198 = (r0);
+    s.tmp_0 = r0 = s.svxInCricle___99198;
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___99162);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svyInCircle___123865 = (r0);
-    s.tmp_0 = r0 = s.svyInCircle___123865;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___123828);
+    s.svyInCircle___99200 = (r0);
+    s.tmp_0 = r0 = s.svyInCircle___99200;
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___99163);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___123827);
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___99162);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___123827);
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___99162);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___123828);
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___99163);
     s.tmp_4 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___123828);
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___99163);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 * s.tmp_5);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 + s.tmp_3);
-    s.sq___123867 = (r0);
-    r0 = (s.sq___123867 > 65536);
+    s.sq___99202 = (r0);
+    r0 = (s.sq___99202 > 65536);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (65536 / s.sq___123867);
+    r0 = (65536 / s.sq___99202);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.sqrt(s.tmp_1);
-    s.scale___123882 = (r0);
-    s.tmp_0 = r0 = s.svxInCricle___123863;
-    s.tmp_3 = r0 = s.scale___123882;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___123827);
+    s.scale___99217 = (r0);
+    s.tmp_0 = r0 = s.svxInCricle___99198;
+    s.tmp_3 = r0 = s.scale___99217;
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___99162);
     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___123865;
-    s.tmp_3 = r0 = s.scale___123882;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___123828);
+    s.tmp_0 = r0 = s.svyInCircle___99200;
+    s.tmp_3 = r0 = s.scale___99217;
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___99163);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 * s.tmp_4);
     s.tmp_2 = r0;
@@ -25352,43 +25389,43 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
   case 13:
   case 14:
-    r0 = pxsim_pxtcore_mkAction(5, inline__P123900);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.deadSprites___123826);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.svx___123827);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.svy___123828);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.svxInCricle___123863);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.svyInCircle___123865);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_2 = controller_Controller__controlledSprites__P108425_mk(s);
+    r0 = pxsim_pxtcore_mkAction(5, inline__P99235);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.deadSprites___99161);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.svx___99162);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.svy___99163);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.svxInCricle___99198);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.svyInCircle___99200);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_2 = controller_Controller__controlledSprites__P83201_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 215; s.pc = 36; return s.tmp_2;
+    s.callLocIdx = 224; 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 = 223; s.pc = 35; return s.tmp_1;
+    s.callLocIdx = 232; s.pc = 35; return s.tmp_1;
   case 35:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.deadSprites___123826);
+    r0 = pxsim_pxtrt_ldlocRef(s.deadSprites___99161);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_1 = controller_Controller__controlledSprites__P108426_mk(s);
+    s.tmp_1 = controller_Controller__controlledSprites__P83202_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3 = controller_Controller__controlledSprites__P108425_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3 = controller_Controller__controlledSprites__P83201_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 224; s.pc = 39; return s.tmp_3;
+    s.callLocIdx = 233; s.pc = 39; return s.tmp_3;
   case 39:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P123957;
-    s.callLocIdx = 225; s.pc = 38; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P99292;
+    s.callLocIdx = 234; s.pc = 38; return s.tmp_2;
   case 38:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 226; s.pc = 37; return s.tmp_1;
+    s.callLocIdx = 235; s.pc = 37; return s.tmp_1;
   case 37:
     r0 = s.retval;
   case 15:
@@ -25398,12 +25435,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller___preUpdate__P108444.info = {"start":14894,"length":2535,"line":466,"column":8,"endLine":530,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"__preUpdate","argumentNames":["this"]}
+controller_Controller___preUpdate__P83220.info = {"start":14894,"length":2535,"line":466,"column":8,"endLine":530,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__preUpdate","argumentNames":["this"]}
 
-function controller_Controller___preUpdate__P108444_mk(s) {
+function controller_Controller___preUpdate__P83220_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller___preUpdate__P108444, depth: s.depth + 1,
+        parent: s, fn: controller_Controller___preUpdate__P83220, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25415,13 +25452,13 @@ function controller_Controller___preUpdate__P108444_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  deadSprites___123826: undefined,
-  svx___123827: undefined,
-  svy___123828: undefined,
-  svxInCricle___123863: undefined,
-  svyInCircle___123865: undefined,
-  sq___123867: undefined,
-  scale___123882: undefined,
+  deadSprites___99161: undefined,
+  svx___99162: undefined,
+  svy___99163: undefined,
+  svxInCricle___99198: undefined,
+  svyInCircle___99200: undefined,
+  sq___99202: undefined,
+  scale___99217: undefined,
   arg0: undefined,
 } }
 
@@ -25429,7 +25466,7 @@ function controller_Controller___preUpdate__P108444_mk(s) {
 
 
 
-function inline__P123900(s) {
+function inline__P99235(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25439,9 +25476,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___123903 = undefined;
-    s.vx___123904 = undefined;
-    s.vy___123905 = undefined;
+    s.s___99238 = undefined;
+    s.vx___99239 = undefined;
+    s.vy___99240 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -25455,11 +25492,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 = 216; s.pc = 22; return s.tmp_0; }
+     else { s.callLocIdx = 225; s.pc = 22; return s.tmp_0; }
     }
   case 22:
     r0 = s.retval;
-    s.s___123903 = (r0);
+    s.s___99238 = (r0);
     s.tmp_2 = if_vx_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -25468,11 +25505,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 = 217; s.pc = 23; return s.tmp_2; }
+     else { s.callLocIdx = 226; s.pc = 23; return s.tmp_2; }
     }
   case 23:
     r0 = s.retval;
-    s.vx___123904 = (r0);
+    s.vx___99239 = (r0);
     s.tmp_3 = if_vy_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -25481,12 +25518,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 = 218; s.pc = 24; return s.tmp_3; }
+     else { s.callLocIdx = 227; s.pc = 24; return s.tmp_3; }
     }
   case 24:
     r0 = s.retval;
-    s.vy___123905 = (r0);
-    r0 = s.s___123903.fields["flags"];
+    s.vy___99240 = (r0);
+    r0 = s.s___99238.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 2);
     s.tmp_0 = r0;
@@ -25500,14 +25537,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___123904);
+    r0 = pxsim_numops_toBoolDecr(s.vx___99239);
     if (!r0) { step = 3; continue; }
-    r0 = (s.s___123903).fields["_vx"] = (0);
+    r0 = (s.s___99238).fields["_vx"] = (0);
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.vy___123905);
+    r0 = pxsim_numops_toBoolDecr(s.vy___99240);
     if (!r0) { step = 5; continue; }
-    r0 = (s.s___123903).fields["_vy"] = (0);
+    r0 = (s.s___99238).fields["_vy"] = (0);
   case 5:
   case 6:
   case 7:
@@ -25525,48 +25562,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___123904;
+    s.tmp_2 = r0 = s.vx___99239;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_2;
     { step = 12; continue; }
   case 11:
-    r0 = s.vy___123905;
+    r0 = s.vy___99240;
   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___123903;
+    s.tmp_4 = r0 = s.s___99238;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[3]);
     s.tmp_6 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_6, s.vx___123904);
+    r0 = pxsim.Math_.imul(s.tmp_6, s.vx___99239);
     s.tmp_5 = r0;
     r0 = (s.tmp_4).fields["_vx"] = (s.tmp_5);
-    s.tmp_0 = r0 = s.s___123903;
+    s.tmp_0 = r0 = s.s___99238;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[4]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___123905);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___99240);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
     { step = 18; continue; }
   case 13:
-    r0 = pxsim_numops_toBoolDecr(s.vx___123904);
+    r0 = pxsim_numops_toBoolDecr(s.vx___99239);
     if (!r0) { step = 14; continue; }
-    s.tmp_0 = r0 = s.s___123903;
+    s.tmp_0 = r0 = s.s___99238;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vx___123904);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vx___99239);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vx"] = (s.tmp_1);
     { step = 17; continue; }
   case 14:
-    r0 = pxsim_numops_toBoolDecr(s.vy___123905);
+    r0 = pxsim_numops_toBoolDecr(s.vy___99240);
     if (!r0) { step = 15; continue; }
-    s.tmp_0 = r0 = s.s___123903;
+    s.tmp_0 = r0 = s.s___99238;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___123905);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___99240);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
   case 15:
@@ -25583,12 +25620,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P123900.info = {"start":16077,"length":1171,"line":497,"column":44,"endLine":525,"endColumn":13,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["controlledSprite"]}
+inline__P99235.info = {"start":16077,"length":1171,"line":497,"column":44,"endLine":525,"endColumn":13,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["controlledSprite"]}
 
-function inline__P123900_mk(s) {
+function inline__P99235_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P123900, depth: s.depth + 1,
+        parent: s, fn: inline__P99235, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25597,9 +25634,9 @@ function inline__P123900_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  s___123903: undefined,
-  vx___123904: undefined,
-  vy___123905: undefined,
+  s___99238: undefined,
+  vx___99239: undefined,
+  vy___99240: undefined,
   arg0: undefined,
 } }
 
@@ -25607,7 +25644,7 @@ function inline__P123900_mk(s) {
 
 
 
-function inline__P123957(s) {
+function inline__P99292(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25632,12 +25669,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P123957.info = {"start":17375,"length":42,"line":529,"column":28,"endLine":529,"endColumn":70,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":["s"]}
+inline__P99292.info = {"start":17375,"length":42,"line":529,"column":28,"endLine":529,"endColumn":70,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P123957_mk(s) {
+function inline__P99292_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P123957, depth: s.depth + 1,
+        parent: s, fn: inline__P99292, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25649,7 +25686,7 @@ function inline__P123957_mk(s) {
 
 
 
-function controller_Controller_down__P108432(s) {
+function controller_Controller_down__P83208(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25664,7 +25701,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (4 - 1);
@@ -25673,13 +25710,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_down__P108432.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__P108432.isGetter = true;
+controller_Controller_down__P83208.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__P83208.isGetter = true;
 
-function controller_Controller_down__P108432_mk(s) {
+function controller_Controller_down__P83208_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_down__P108432, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_down__P83208, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25690,7 +25727,7 @@ function controller_Controller_down__P108432_mk(s) {
 
 
 
-function controller_Controller_button__P110715(s) {
+function controller_Controller_button__P85541(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25706,7 +25743,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (s.arg1 - 1);
@@ -25715,12 +25752,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_button__P110715.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"]}
+controller_Controller_button__P85541.info = {"start":11484,"length":105,"line":373,"column":8,"endLine":375,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"button","argumentNames":["this","button"]}
 
-function controller_Controller_button__P110715_mk(s) {
+function controller_Controller_button__P85541_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_button__P110715, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_button__P85541, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25732,7 +25769,7 @@ function controller_Controller_button__P110715_mk(s) {
 
 
 
-function controller_Controller_up__P108431(s) {
+function controller_Controller_up__P83207(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25747,7 +25784,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (2 - 1);
@@ -25756,13 +25793,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_up__P108431.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__P108431.isGetter = true;
+controller_Controller_up__P83207.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__P83207.isGetter = true;
 
-function controller_Controller_up__P108431_mk(s) {
+function controller_Controller_up__P83207_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_up__P108431, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_up__P83207, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25773,7 +25810,7 @@ function controller_Controller_up__P108431_mk(s) {
 
 
 
-function controller_Controller_right__P108430(s) {
+function controller_Controller_right__P83206(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25788,7 +25825,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (3 - 1);
@@ -25797,13 +25834,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_right__P108430.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__P108430.isGetter = true;
+controller_Controller_right__P83206.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__P83206.isGetter = true;
 
-function controller_Controller_right__P108430_mk(s) {
+function controller_Controller_right__P83206_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_right__P108430, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_right__P83206, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25814,7 +25851,7 @@ function controller_Controller_right__P108430_mk(s) {
 
 
 
-function controller_Controller_left__P108429(s) {
+function controller_Controller_left__P83205(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25829,7 +25866,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (1 - 1);
@@ -25838,13 +25875,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_left__P108429.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__P108429.isGetter = true;
+controller_Controller_left__P83205.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__P83205.isGetter = true;
 
-function controller_Controller_left__P108429_mk(s) {
+function controller_Controller_left__P83205_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_left__P108429, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_left__P83205, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25855,7 +25892,7 @@ function controller_Controller_left__P108429_mk(s) {
 
 
 
-function controller_Controller__controlledSprites__P108426(s) {
+function controller_Controller__controlledSprites__P83202(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25871,9 +25908,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 195; s.pc = 1; return s.tmp_1;
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 204; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["controlledSprites"];
@@ -25885,12 +25922,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller__controlledSprites__P108426.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"]}
+controller_Controller__controlledSprites__P83202.info = {"start":8697,"length":134,"line":272,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"_controlledSprites","argumentNames":["this","cps"]}
 
-function controller_Controller__controlledSprites__P108426_mk(s) {
+function controller_Controller__controlledSprites__P83202_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller__controlledSprites__P108426, depth: s.depth + 1,
+        parent: s, fn: controller_Controller__controlledSprites__P83202, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25903,7 +25940,7 @@ function controller_Controller__controlledSprites__P108426_mk(s) {
 
 
 
-function controller_Controller__controlledSprites__P108425(s) {
+function controller_Controller__controlledSprites__P83201(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25918,9 +25955,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 194; s.pc = 1; return s.tmp_1;
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 203; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["controlledSprites"];
@@ -25931,13 +25968,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller__controlledSprites__P108425.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__P108425.isGetter = true;
+controller_Controller__controlledSprites__P83201.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__P83201.isGetter = true;
 
-function controller_Controller__controlledSprites__P108425_mk(s) {
+function controller_Controller__controlledSprites__P83201_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller__controlledSprites__P108425, depth: s.depth + 1,
+        parent: s, fn: controller_Controller__controlledSprites__P83201, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25949,7 +25986,7 @@ function controller_Controller__controlledSprites__P108425_mk(s) {
 
 
 
-function controller_Button_pressureLevel__P108410(s) {
+function controller_Button_pressureLevel__P83186(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25964,16 +26001,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C83176_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__C108400_v0_1_mk(s);
+    s.tmp_3 = controller_Button__C83176_v0_1_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_3.arg0);
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C83176_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:
@@ -26002,12 +26039,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_pressureLevel__P108410.info = {"start":4279,"length":311,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"pressureLevel","argumentNames":["this"]}
+controller_Button_pressureLevel__P83186.info = {"start":4279,"length":311,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"pressureLevel","argumentNames":["this"]}
 
-function controller_Button_pressureLevel__P108410_mk(s) {
+function controller_Button_pressureLevel__P83186_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_pressureLevel__P108410, depth: s.depth + 1,
+        parent: s, fn: controller_Button_pressureLevel__P83186, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26022,7 +26059,7 @@ function controller_Button_pressureLevel__P108410_mk(s) {
 
 
 
-function Fx_imul__P106765(s) {
+function Fx_imul__P81429(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26041,12 +26078,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_imul__P106765.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__P81429.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__P106765_mk(s) {
+function Fx_imul__P81429_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_imul__P106765, depth: s.depth + 1,
+        parent: s, fn: Fx_imul__P81429, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -26056,7 +26093,7 @@ function Fx_imul__P106765_mk(s) {
 
 
 
-function power_checkDeepSleep__P108202(s) {
+function power_checkDeepSleep__P82979(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26066,13 +26103,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___122665 = undefined;
-    s.to___122668 = undefined;
-    s.tmp_0 = power_init__P110625_mk(s);
-    s.callLocIdx = 108; s.pc = 11; return s.tmp_0;
+    s.p___97996 = undefined;
+    s.to___97999 = undefined;
+    s.tmp_0 = power_init__P85440_mk(s);
+    s.callLocIdx = 122; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals._poked___110623;
+    s.tmp_0 = r0 = globals._poked___85438;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
@@ -26082,8 +26119,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.p___122665 = (s.tmp_1);
-    s.tmp_0 = r0 = globals._timeout___110624;
+    s.p___97996 = (s.tmp_1);
+    s.tmp_0 = r0 = globals._timeout___85439;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = s.tmp_0;
@@ -26093,8 +26130,8 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.to___122668 = (s.tmp_1);
-    r0 = (s.to___122668 > 0);
+    s.to___97999 = (s.tmp_1);
+    r0 = (s.to___97999 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 5; continue; }
@@ -26103,9 +26140,9 @@ switch (step) {
   case 5:
     r0 = pxsim.control.millis();
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.p___122665);
+    r0 = (s.tmp_2 - s.p___97996);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.to___122668);
+    r0 = (s.tmp_1 > s.to___97999);
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -26131,12 +26168,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-power_checkDeepSleep__P108202.info = {"start":1087,"length":298,"line":36,"column":4,"endLine":46,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"checkDeepSleep","argumentNames":[]}
+power_checkDeepSleep__P82979.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__P108202_mk(s) {
+function power_checkDeepSleep__P82979_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_checkDeepSleep__P108202, depth: s.depth + 1,
+        parent: s, fn: power_checkDeepSleep__P82979, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26145,15 +26182,15 @@ function power_checkDeepSleep__P108202_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  p___122665: undefined,
-  to___122668: undefined,
+  p___97996: undefined,
+  to___97999: undefined,
 } }
 
 
 
 
 
-function power_init__P110625(s) {
+function power_init__P85440(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26163,7 +26200,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals._timeout___110624 !== undefined);
+    r0 = (globals._timeout___85439 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -26173,21 +26210,21 @@ switch (step) {
     r0 = pxsim_pxtcore.getConfig(212, -1);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 1000);
-    globals._timeout___110624 = (r0);
-    r0 = (globals._timeout___110624 > 0);
+    globals._timeout___85439 = (r0);
+    r0 = (globals._timeout___85439 > 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___110624 < 300000);
+    r0 = (globals._timeout___85439 < 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___110624 = (300000);
+    globals._timeout___85439 = (300000);
   case 5:
   case 6:
   case 7:
@@ -26195,12 +26232,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-power_init__P110625.info = {"start":1610,"length":376,"line":57,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"init","argumentNames":[]}
+power_init__P85440.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__P110625_mk(s) {
+function power_init__P85440_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_init__P110625, depth: s.depth + 1,
+        parent: s, fn: power_init__P85440, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26210,7 +26247,7 @@ function power_init__P110625_mk(s) {
 
 
 
-function power_poke__P108201(s) {
+function power_poke__P82978(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26220,22 +26257,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = power_init__P110625_mk(s);
-    s.callLocIdx = 107; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = power_init__P85440_mk(s);
+    s.callLocIdx = 121; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = pxsim.control.millis();
-    globals._poked___110623 = (r0);
+    globals._poked___85438 = (r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-power_poke__P108201.info = {"start":795,"length":81,"line":26,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"poke","argumentNames":[]}
+power_poke__P82978.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__P108201_mk(s) {
+function power_poke__P82978_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_poke__P108201, depth: s.depth + 1,
+        parent: s, fn: power_poke__P82978, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -26244,7 +26281,7 @@ function power_poke__P108201_mk(s) {
 
 
 
-function control_EventContext_deltaTime__P106998(s) {
+function control_EventContext_deltaTime__P81662(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26259,20 +26296,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C81657_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__P106998.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__P106998.isGetter = true;
+control_EventContext_deltaTime__P81662.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__P81662.isGetter = true;
 
-function control_EventContext_deltaTime__P106998_mk(s) {
+function control_EventContext_deltaTime__P81662_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_deltaTime__P106998, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_deltaTime__P81662, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -26282,7 +26319,7 @@ function control_EventContext_deltaTime__P106998_mk(s) {
 
 
 
-function scene_Scene_constructor__P108937(s) {
+function scene_Scene_constructor__P83716(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26299,36 +26336,36 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C108916_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C83695_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__C108670_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(ArcadePhysicsEngine__C83456_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = ArcadePhysicsEngine_constructor__P108671_mk(s);
+    s.tmp_1 = ArcadePhysicsEngine_constructor__P83457_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 = 816; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 820; 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__C108857_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Camera__C83636_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_Camera_constructor__P108861_mk(s);
+    s.tmp_1 = scene_Camera_constructor__P83640_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 817; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 821; 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__C108762_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Background__C83548_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_Background_constructor__P108766_mk(s);
+    s.tmp_1 = scene_Background_constructor__P83552_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["camera"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 818; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 822; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["background"] = (s.tmp_0);
@@ -26381,12 +26418,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_constructor__P108937.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"]}
+scene_Scene_constructor__P83716.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"]}
 
-function scene_Scene_constructor__P108937_mk(s) {
+function scene_Scene_constructor__P83716_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_constructor__P108937, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_constructor__P83716, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26399,7 +26436,7 @@ function scene_Scene_constructor__P108937_mk(s) {
 
 
 
-function scene_Camera_constructor__P108861(s) {
+function scene_Camera_constructor__P83640(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26414,7 +26451,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C108857_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C83636_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_offsetX"] = (0);
     r0 = (s.arg0).fields["_offsetY"] = (0);
     r0 = (s.arg0).fields["drawOffsetX"] = (0);
@@ -26423,12 +26460,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_constructor__P108861.info = {"start":456,"length":156,"line":15,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game---hw/camera.ts","functionName":"inline","argumentNames":["this"]}
+scene_Camera_constructor__P83640.info = {"start":456,"length":156,"line":15,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"inline","argumentNames":["this"]}
 
-function scene_Camera_constructor__P108861_mk(s) {
+function scene_Camera_constructor__P83640_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_constructor__P108861, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_constructor__P83640, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26437,7 +26474,7 @@ function scene_Camera_constructor__P108861_mk(s) {
 
 
 
-function scene_Background_constructor__P108766(s) {
+function scene_Background_constructor__P83552(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26453,7 +26490,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C108762_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C83548_VT)) failedCast(r0);
     r0 = (s.arg0).fields["color"] = (0);
     r0 = (s.arg0).fields["camera"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
@@ -26464,12 +26501,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_constructor__P108766.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"]}
+scene_Background_constructor__P83552.info = {"start":367,"length":132,"line":20,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["this","camera"]}
 
-function scene_Background_constructor__P108766_mk(s) {
+function scene_Background_constructor__P83552_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_constructor__P108766, depth: s.depth + 1,
+        parent: s, fn: scene_Background_constructor__P83552, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26481,7 +26518,7 @@ function scene_Background_constructor__P108766_mk(s) {
 
 
 
-function ArcadePhysicsEngine_constructor__P108671(s) {
+function ArcadePhysicsEngine_constructor__P83457(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26499,48 +26536,48 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_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__C108591_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteMap__C83375_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = sprites_SpriteMap_constructor__P108592_mk(s);
+    s.tmp_1 = sprites_SpriteMap_constructor__P83376_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 475; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 483; 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__P108673_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_maxSpeed__P83459_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 476; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 484; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = ArcadePhysicsEngine_maxStep__P108677_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_maxStep__P83463_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg3;
-    s.callLocIdx = 477; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 485; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = ArcadePhysicsEngine_minStep__P108675_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_minStep__P83461_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 478; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 486; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_constructor__P108671.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"]}
+ArcadePhysicsEngine_constructor__P83457.info = {"start":1601,"length":277,"line":58,"column":4,"endLine":65,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","maxVelocity","minSingleStep","maxSingleStep"]}
 
-function ArcadePhysicsEngine_constructor__P108671_mk(s) {
+function ArcadePhysicsEngine_constructor__P83457_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_constructor__P108671, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_constructor__P83457, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26554,7 +26591,7 @@ function ArcadePhysicsEngine_constructor__P108671_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxStep__P108677(s) {
+function ArcadePhysicsEngine_maxStep__P83463(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26570,7 +26607,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -26581,12 +26618,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxStep__P108677.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"]}
+ArcadePhysicsEngine_maxStep__P83463.info = {"start":2329,"length":67,"line":88,"column":4,"endLine":90,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_maxStep__P108677_mk(s) {
+function ArcadePhysicsEngine_maxStep__P83463_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxStep__P108677, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxStep__P83463, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26599,7 +26636,7 @@ function ArcadePhysicsEngine_maxStep__P108677_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxStep__P108676(s) {
+function ArcadePhysicsEngine_maxStep__P83462(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26614,7 +26651,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = s.arg0.fields["maxSingleStep"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -26623,13 +26660,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxStep__P108676.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__P108676.isGetter = true;
+ArcadePhysicsEngine_maxStep__P83462.info = {"start":2249,"length":74,"line":84,"column":4,"endLine":86,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this"]}
+ArcadePhysicsEngine_maxStep__P83462.isGetter = true;
 
-function ArcadePhysicsEngine_maxStep__P108676_mk(s) {
+function ArcadePhysicsEngine_maxStep__P83462_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxStep__P108676, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxStep__P83462, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26640,7 +26677,7 @@ function ArcadePhysicsEngine_maxStep__P108676_mk(s) {
 
 
 
-function Fx_toInt__P106774(s) {
+function Fx_toInt__P81438(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26660,12 +26697,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toInt__P106774.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__P81438.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__P106774_mk(s) {
+function Fx_toInt__P81438_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toInt__P106774, depth: s.depth + 1,
+        parent: s, fn: Fx_toInt__P81438, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -26675,7 +26712,7 @@ function Fx_toInt__P106774_mk(s) {
 
 
 
-function ArcadePhysicsEngine_minStep__P108675(s) {
+function ArcadePhysicsEngine_minStep__P83461(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26691,7 +26728,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -26702,12 +26739,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_minStep__P108675.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"]}
+ArcadePhysicsEngine_minStep__P83461.info = {"start":2176,"length":67,"line":80,"column":4,"endLine":82,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_minStep__P108675_mk(s) {
+function ArcadePhysicsEngine_minStep__P83461_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_minStep__P108675, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_minStep__P83461, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26720,7 +26757,7 @@ function ArcadePhysicsEngine_minStep__P108675_mk(s) {
 
 
 
-function ArcadePhysicsEngine_minStep__P108674(s) {
+function ArcadePhysicsEngine_minStep__P83460(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26735,7 +26772,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = s.arg0.fields["minSingleStep"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -26744,13 +26781,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_minStep__P108674.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__P108674.isGetter = true;
+ArcadePhysicsEngine_minStep__P83460.info = {"start":2096,"length":74,"line":76,"column":4,"endLine":78,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this"]}
+ArcadePhysicsEngine_minStep__P83460.isGetter = true;
 
-function ArcadePhysicsEngine_minStep__P108674_mk(s) {
+function ArcadePhysicsEngine_minStep__P83460_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_minStep__P108674, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_minStep__P83460, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26761,7 +26798,7 @@ function ArcadePhysicsEngine_minStep__P108674_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxSpeed__P108673(s) {
+function ArcadePhysicsEngine_maxSpeed__P83459(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26777,7 +26814,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -26794,12 +26831,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxSpeed__P108673.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"]}
+ArcadePhysicsEngine_maxSpeed__P83459.info = {"start":1963,"length":127,"line":71,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_maxSpeed__P108673_mk(s) {
+function ArcadePhysicsEngine_maxSpeed__P83459_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P108673, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P83459, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26812,7 +26849,7 @@ function ArcadePhysicsEngine_maxSpeed__P108673_mk(s) {
 
 
 
-function Fx_neg__P106759(s) {
+function Fx_neg__P81423(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26830,12 +26867,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_neg__P106759.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__P81423.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__P106759_mk(s) {
+function Fx_neg__P81423_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_neg__P106759, depth: s.depth + 1,
+        parent: s, fn: Fx_neg__P81423, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26844,7 +26881,7 @@ function Fx_neg__P106759_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxSpeed__P108672(s) {
+function ArcadePhysicsEngine_maxSpeed__P83458(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26859,7 +26896,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = s.arg0.fields["maxVelocity"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -26868,13 +26905,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxSpeed__P108672.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__P108672.isGetter = true;
+ArcadePhysicsEngine_maxSpeed__P83458.info = {"start":1884,"length":73,"line":67,"column":4,"endLine":69,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this"]}
+ArcadePhysicsEngine_maxSpeed__P83458.isGetter = true;
 
-function ArcadePhysicsEngine_maxSpeed__P108672_mk(s) {
+function ArcadePhysicsEngine_maxSpeed__P83458_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P108672, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P83458, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26885,7 +26922,7 @@ function ArcadePhysicsEngine_maxSpeed__P108672_mk(s) {
 
 
 
-function PhysicsEngine_constructor__P108657(s) {
+function PhysicsEngine_constructor__P83441(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26900,17 +26937,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C108656_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C83440_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_constructor__P108657.info = {"start":26,"length":21,"line":1,"column":4,"endLine":2,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["this"]}
+PhysicsEngine_constructor__P83441.info = {"start":26,"length":21,"line":1,"column":4,"endLine":2,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this"]}
 
-function PhysicsEngine_constructor__P108657_mk(s) {
+function PhysicsEngine_constructor__P83441_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_constructor__P108657, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_constructor__P83441, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26919,7 +26956,7 @@ function PhysicsEngine_constructor__P108657_mk(s) {
 
 
 
-function sprites_SpriteMap_constructor__P108592(s) {
+function sprites_SpriteMap_constructor__P83376(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26934,7 +26971,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C108591_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -26943,12 +26980,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_constructor__P108592.info = {"start":237,"length":56,"line":8,"column":8,"endLine":10,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"inline","argumentNames":["this"]}
+sprites_SpriteMap_constructor__P83376.info = {"start":237,"length":56,"line":8,"column":8,"endLine":10,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["this"]}
 
-function sprites_SpriteMap_constructor__P108592_mk(s) {
+function sprites_SpriteMap_constructor__P83376_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_constructor__P108592, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_constructor__P83376, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26959,7 +26996,44 @@ function sprites_SpriteMap_constructor__P108592_mk(s) {
 
 
 
-function control_pushEventContext__P107007(s) {
+function music_Melody_constructor__P82874(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__C82871_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["_text"] = (s.arg1);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+music_Melody_constructor__P82874.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__P82874_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_Melody_constructor__P82874, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function control_pushEventContext__P81671(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26969,63 +27043,63 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___124223 = undefined;
-    s.n___124229 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___110597);
+    s.ctx___99558 = undefined;
+    s.n___99564 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___85381);
     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___110597 = (r0);
+    globals.eventContexts___85381 = (r0);
   case 1:
   case 2:
-    s.tmp_0 = control_eventContext__P107006_mk(s);
+    s.tmp_0 = control_eventContext__P81670_mk(s);
     s.callLocIdx = 100; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.ctx___124223 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___124223);
+    s.ctx___99558 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___99558);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = control_EventContext_unregister__P107000_mk(s);
-    s.tmp_0.arg0 = s.ctx___124223;
+    s.tmp_0 = control_EventContext_unregister__P81664_mk(s);
+    s.tmp_0.arg0 = s.ctx___99558;
     s.callLocIdx = 101; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(control_EventContext__C106993_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_EventContext__C81657_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_EventContext_constructor__P106997_mk(s);
+    s.tmp_1 = control_EventContext_constructor__P81661_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 102; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.n___124229 = (s.tmp_0);
-    r0 = pxsim_Array__push(globals.eventContexts___110597, s.n___124229);
-    r0 = s.n___124229;
+    s.n___99564 = (s.tmp_0);
+    r0 = pxsim_Array__push(globals.eventContexts___85381, s.n___99564);
+    r0 = s.n___99564;
     return leave(s, r0)
   default: oops()
 } } }
-control_pushEventContext__P107007.info = {"start":7123,"length":340,"line":216,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
+control_pushEventContext__P81671.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__P107007_mk(s) {
+function control_pushEventContext__P81671_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_pushEventContext__P107007, depth: s.depth + 1,
+        parent: s, fn: control_pushEventContext__P81671, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  ctx___124223: undefined,
-  n___124229: undefined,
+  ctx___99558: undefined,
+  n___99564: undefined,
 } }
 
 
 
 
 
-function control_EventContext_unregister__P107000(s) {
+function control_EventContext_unregister__P81664(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27035,37 +27109,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___124258 = undefined;
-    s.unnamed16740___U1 = undefined;
-    s.unnamed16741___U2 = undefined;
+    s.h___99593 = undefined;
+    s.unnamed1792___U1 = undefined;
+    s.unnamed1793___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
-    s.h___124258 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C81657_VT)) failedCast(r0);
+    s.h___99593 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed16740___U1 = (r0);
-    s.unnamed16741___U2 = (0);
+    s.unnamed1792___U1 = (r0);
+    s.unnamed1793___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16741___U2;
-    r0 = pxsim_Array__length(s.unnamed16740___U1);
+    s.tmp_0 = r0 = s.unnamed1793___U2;
+    r0 = pxsim_Array__length(s.unnamed1792___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16740___U1, s.unnamed16741___U2);
-    s.h___124258 = (r0);
-    s.tmp_2 = control_EventHandler_unregister__P110591_mk(s);
-    s.tmp_2.arg0 = s.h___124258;
+    r0 = pxsim_Array__getAt(s.unnamed1792___U1, s.unnamed1793___U2);
+    s.h___99593 = (r0);
+    s.tmp_2 = control_EventHandler_unregister__P85375_mk(s);
+    s.tmp_2.arg0 = s.h___99593;
     s.callLocIdx = 96; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed16741___U2 + 1);
-    s.unnamed16741___U2 = (r0);
+    r0 = (s.unnamed1793___U2 + 1);
+    s.unnamed1793___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16740___U1 = (undefined);
+    s.unnamed1792___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["frameWorker"];
     s.tmp_2 = r0;
@@ -27076,19 +27150,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_unregister__P107000.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__P81664.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__P107000_mk(s) {
+function control_EventContext_unregister__P81664_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_unregister__P107000, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_unregister__P81664, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  h___124258: undefined,
-  unnamed16740___U1: undefined,
-  unnamed16741___U2: undefined,
+  h___99593: undefined,
+  unnamed1792___U1: undefined,
+  unnamed1793___U2: undefined,
   arg0: undefined,
 } }
 
@@ -27096,7 +27170,7 @@ function control_EventContext_unregister__P107000_mk(s) {
 
 
 
-function control_EventHandler_unregister__P110591(s) {
+function control_EventHandler_unregister__P85375(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27111,24 +27185,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C110589_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventHandler__C85373_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__P110593, s.tmp_2);
+    r0 = pxsim.control.internalOnEvent(s.tmp_0, s.tmp_1, control_doNothing__P85377, s.tmp_2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_unregister__P110591.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__P85375.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__P110591_mk(s) {
+function control_EventHandler_unregister__P85375_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_unregister__P110591, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_unregister__P85375, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27140,7 +27214,7 @@ function control_EventHandler_unregister__P110591_mk(s) {
 
 
 
-function control_doNothing__P110593(s) {
+function control_doNothing__P85377(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27154,12 +27228,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_doNothing__P110593.info = {"start":1254,"length":24,"line":41,"column":4,"endLine":41,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
+control_doNothing__P85377.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__P110593_mk(s) {
+function control_doNothing__P85377_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_doNothing__P110593, depth: s.depth + 1,
+        parent: s, fn: control_doNothing__P85377, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -27167,7 +27241,7 @@ function control_doNothing__P110593_mk(s) {
 
 
 
-function control_EventContext_constructor__P106997(s) {
+function control_EventContext_constructor__P81661(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27182,7 +27256,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C81657_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -27192,26 +27266,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___106995);
+    r0 = pxsim_numops_toBoolDecr(globals.control_EventContext_lastStats___81659);
     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___106995 = (r0);
+    globals.control_EventContext_lastStats___81659 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_constructor__P106997.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__P81661.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__P106997_mk(s) {
+function control_EventContext_constructor__P81661_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_constructor__P106997, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_constructor__P81661, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27222,7 +27296,7 @@ function control_EventContext_constructor__P106997_mk(s) {
 
 
 
-function particles_disableAll__P109206(s) {
+function particles_disableAll__P83985(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27232,22 +27306,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___125721 = undefined;
-    s.tmp_0 = particles_particleSources__P111235_mk(s);
-    s.callLocIdx = 1139; s.pc = 3; return s.tmp_0;
+    s.sources___101105 = undefined;
+    s.tmp_0 = particles_particleSources__P86074_mk(s);
+    s.callLocIdx = 1143; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___125721 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___125721);
+    s.sources___101105 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___101105);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_0.arg0 = s.sources___125721;
-    s.tmp_0.arg1 = inline__P125727;
-    s.callLocIdx = 1141; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_0.arg0 = s.sources___101105;
+    s.tmp_0.arg1 = inline__P101111;
+    s.callLocIdx = 1145; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P111231_mk(s);
-    s.callLocIdx = 1142; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P86070_mk(s);
+    s.callLocIdx = 1146; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -27256,22 +27330,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_disableAll__P109206.info = {"start":12353,"length":195,"line":401,"column":4,"endLine":407,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"disableAll","argumentNames":[]}
+particles_disableAll__P83985.info = {"start":12353,"length":195,"line":401,"column":4,"endLine":407,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"disableAll","argumentNames":[]}
 
-function particles_disableAll__P109206_mk(s) {
+function particles_disableAll__P83985_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_disableAll__P109206, depth: s.depth + 1,
+        parent: s, fn: particles_disableAll__P83985, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___125721: undefined,
+  sources___101105: undefined,
 } }
 
 
 
 
 
-function inline__P125727(s) {
+function inline__P101111(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27285,22 +27359,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_enabled__P109188_mk(s);
+    s.tmp_0 = particles_ParticleSource_enabled__P83967_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1140; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1144; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = false;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P125727.info = {"start":12478,"length":22,"line":404,"column":28,"endLine":404,"endColumn":50,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P101111.info = {"start":12478,"length":22,"line":404,"column":28,"endLine":404,"endColumn":50,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P125727_mk(s) {
+function inline__P101111_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P125727, depth: s.depth + 1,
+        parent: s, fn: inline__P101111, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27310,7 +27384,7 @@ function inline__P125727_mk(s) {
 
 
 
-function particles_clearAll__P109205(s) {
+function particles_clearAll__P83984(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27320,22 +27394,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___125732 = undefined;
-    s.tmp_0 = particles_particleSources__P111235_mk(s);
-    s.callLocIdx = 1135; s.pc = 3; return s.tmp_0;
+    s.sources___101116 = undefined;
+    s.tmp_0 = particles_particleSources__P86074_mk(s);
+    s.callLocIdx = 1139; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___125732 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___125732);
+    s.sources___101116 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___101116);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_0.arg0 = s.sources___125732;
-    s.tmp_0.arg1 = inline__P125738;
-    s.callLocIdx = 1137; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_0.arg0 = s.sources___101116;
+    s.tmp_0.arg1 = inline__P101122;
+    s.callLocIdx = 1141; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P111231_mk(s);
-    s.callLocIdx = 1138; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P86070_mk(s);
+    s.callLocIdx = 1142; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -27344,22 +27418,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_clearAll__P109205.info = {"start":12081,"length":185,"line":390,"column":4,"endLine":396,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"clearAll","argumentNames":[]}
+particles_clearAll__P83984.info = {"start":12081,"length":185,"line":390,"column":4,"endLine":396,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"clearAll","argumentNames":[]}
 
-function particles_clearAll__P109205_mk(s) {
+function particles_clearAll__P83984_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_clearAll__P109205, depth: s.depth + 1,
+        parent: s, fn: particles_clearAll__P83984, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___125732: undefined,
+  sources___101116: undefined,
 } }
 
 
 
 
 
-function inline__P125738(s) {
+function inline__P101122(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27373,21 +27447,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_clear__P109190_mk(s);
+    s.tmp_0 = particles_ParticleSource_clear__P83969_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1136; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1140; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P125738.info = {"start":12204,"length":14,"line":393,"column":28,"endLine":393,"endColumn":42,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P101122.info = {"start":12204,"length":14,"line":393,"column":28,"endLine":393,"endColumn":42,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P125738_mk(s) {
+function inline__P101122_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P125738, depth: s.depth + 1,
+        parent: s, fn: inline__P101122, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27397,7 +27471,7 @@ function inline__P125738_mk(s) {
 
 
 
-function helpers_arrayForEach__P106716(s) {
+function helpers_arrayForEach__P81378(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27407,49 +27481,49 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___125761 = undefined;
-    s.i___125764 = undefined;
+    s.len___101154 = undefined;
+    s.i___101157 = 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___125761 = (r0);
-    s.i___125764 = (0);
+    s.len___101154 = (r0);
+    s.i___101157 = (0);
   case 1:
-    r0 = (s.i___125764 < s.len___125761);
+    r0 = (s.i___101157 < s.len___101154);
     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___125764);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___101157);
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.i___125764;
+    s.tmp_1.arg1 = s.i___101157;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 5; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    r0 = (s.i___125764 + 1);
-    s.i___125764 = (r0);
+    r0 = (s.i___101157 + 1);
+    s.i___101157 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayForEach__P106716.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__P81378.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__P106716_mk(s) {
+function helpers_arrayForEach__P81378_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayForEach__P106716, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayForEach__P81378, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___125761: undefined,
-  i___125764: undefined,
+  len___101154: undefined,
+  i___101157: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -27458,7 +27532,7 @@ function helpers_arrayForEach__P106716_mk(s) {
 
 
 
-function kodu_WorldStage_constructor__P565295(s) {
+function kodu_WorldStage_constructor__P85227(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27474,24 +27548,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Stage_constructor__P468829_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Stage_constructor__P85050_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.tmp_0.arg2 = globals.STAGE_ID___565304;
-    s.callLocIdx = 1169; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg2 = globals.STAGE_ID___94049;
+    s.callLocIdx = 1168; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_constructor__P565295.info = {"start":827,"length":67,"line":38,"column":8,"endLine":40,"endColumn":9,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["this","app"]}
+kodu_WorldStage_constructor__P85227.info = {"start":827,"length":67,"line":38,"column":8,"endLine":40,"endColumn":9,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["this","app"]}
 
-function kodu_WorldStage_constructor__P565295_mk(s) {
+function kodu_WorldStage_constructor__P85227_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_constructor__P565295, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_constructor__P85227, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27502,7 +27576,7 @@ function kodu_WorldStage_constructor__P565295_mk(s) {
 
 
 
-function kodu_Stage_constructor__P468829(s) {
+function kodu_Stage_constructor__P85050(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27519,19 +27593,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = (s.arg0).fields["app"] = (s.arg1);
     r0 = (s.arg0).fields["name"] = (s.arg2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_constructor__P468829.info = {"start":156,"length":61,"line":7,"column":8,"endLine":8,"endColumn":9,"fileName":"stage.ts","functionName":"inline","argumentNames":["this","app","name"]}
+kodu_Stage_constructor__P85050.info = {"start":156,"length":61,"line":7,"column":8,"endLine":8,"endColumn":9,"fileName":"stage.ts","functionName":"inline","argumentNames":["this","app","name"]}
 
-function kodu_Stage_constructor__P468829_mk(s) {
+function kodu_Stage_constructor__P85050_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_constructor__P468829, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_constructor__P85050, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -27542,7 +27616,7 @@ function kodu_Stage_constructor__P468829_mk(s) {
 
 
 
-function kodu_StageManager_constructor__P468992(s) {
+function kodu_StageManager_constructor__P85068(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27557,7 +27631,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_StageManager__C468989_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_StageManager__C85066_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -27566,12 +27640,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_StageManager_constructor__P468992.info = {"start":3159,"length":54,"line":106,"column":8,"endLine":108,"endColumn":9,"fileName":"stage.ts","functionName":"inline","argumentNames":["this"]}
+kodu_StageManager_constructor__P85068.info = {"start":3159,"length":54,"line":106,"column":8,"endLine":108,"endColumn":9,"fileName":"stage.ts","functionName":"inline","argumentNames":["this"]}
 
-function kodu_StageManager_constructor__P468992_mk(s) {
+function kodu_StageManager_constructor__P85068_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_StageManager_constructor__P468992, depth: s.depth + 1,
+        parent: s, fn: kodu_StageManager_constructor__P85068, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27582,7 +27656,7 @@ function kodu_StageManager_constructor__P468992_mk(s) {
 
 
 
-function kodu_icons_init__P110156(s) {
+function kodu_icons_init__P84908(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27592,18 +27666,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "cursor", globals.ui_cursor___110159);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "cursor", globals.ui_cursor___84911);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_kodu_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 218; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 217; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -27614,24 +27688,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["kodu"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["kodu"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 219; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 218; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.char_kodu___110182;
+    s.tmp_4 = r0 = globals.char_kodu___84934;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_kodu_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 216; s.pc = 4; return s.tmp_8; }
+     else { s.callLocIdx = 215; s.pc = 4; return s.tmp_8; }
     }
   case 4:
     r0 = s.retval;
@@ -27642,24 +27716,24 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["kodu"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["kodu"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 217; s.pc = 3; return s.tmp_7; }
+     else { s.callLocIdx = 216; s.pc = 3; return s.tmp_7; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "kodu", s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "kodu", s.tmp_4);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_apple_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 222; s.pc = 6; return s.tmp_3; }
+     else { s.callLocIdx = 221; s.pc = 6; return s.tmp_3; }
     }
   case 6:
     r0 = s.retval;
@@ -27670,24 +27744,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["apple"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["apple"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 223; s.pc = 5; return s.tmp_2; }
+     else { s.callLocIdx = 222; s.pc = 5; return s.tmp_2; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.char_apple___110183;
+    s.tmp_4 = r0 = globals.char_apple___84935;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_apple_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 220; s.pc = 8; return s.tmp_8; }
+     else { s.callLocIdx = 219; s.pc = 8; return s.tmp_8; }
     }
   case 8:
     r0 = s.retval;
@@ -27698,24 +27772,24 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["apple"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["apple"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 221; s.pc = 7; return s.tmp_7; }
+     else { s.callLocIdx = 220; s.pc = 7; return s.tmp_7; }
     }
   case 7:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "apple", s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "apple", s.tmp_4);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_tree_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 226; s.pc = 10; return s.tmp_3; }
+     else { s.callLocIdx = 225; s.pc = 10; return s.tmp_3; }
     }
   case 10:
     r0 = s.retval;
@@ -27726,24 +27800,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["tree"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["tree"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 227; s.pc = 9; return s.tmp_2; }
+     else { s.callLocIdx = 226; s.pc = 9; return s.tmp_2; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.char_tree___110184;
+    s.tmp_4 = r0 = globals.char_tree___84936;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_tree_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 224; s.pc = 12; return s.tmp_8; }
+     else { s.callLocIdx = 223; s.pc = 12; return s.tmp_8; }
     }
   case 12:
     r0 = s.retval;
@@ -27754,47 +27828,47 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["tree"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["tree"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 225; s.pc = 11; return s.tmp_7; }
+     else { s.callLocIdx = 224; s.pc = 11; return s.tmp_7; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "tree", s.tmp_4);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "play", globals.btn_play___110162);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "stop", globals.btn_stop___110163);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "object_mode", globals.btn_object_mode___110164);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "terrain_mode", globals.btn_terrain_mode___110165);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "focus", globals.btn_focus___110166);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "underline", globals.btn_underline___110167);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "button_white", globals.btn_bknd_white___110178);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "button_beige", globals.btn_bknd_beige___110179);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "button_clear", globals.btn_bknd_clear___110180);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "button_danger", globals.btn_bknd_danger___110181);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "edit", globals.btn_edit___110168);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "move", globals.btn_move___110169);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "duplicate", globals.btn_duplicate___110170);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "delete", globals.btn_delete___110171);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "carry", globals.btn_carry___110172);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "cancel", globals.btn_cancel___110173);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "ok", globals.btn_ok___110174);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "plus", globals.btn_plus___110175);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "new_file", globals.btn_new_file___110176);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "when", globals.ui_when___110160);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "do", globals.ui_do___110161);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "insertion-point", globals.btn_insertion_point___110177);
-    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___110154, "MISSING", globals.MISSING___110158);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "tree", s.tmp_4);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "play", globals.btn_play___84914);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "stop", globals.btn_stop___84915);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "object_mode", globals.btn_object_mode___84916);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "terrain_mode", globals.btn_terrain_mode___84917);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "focus", globals.btn_focus___84918);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "underline", globals.btn_underline___84919);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "button_white", globals.btn_bknd_white___84930);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "button_beige", globals.btn_bknd_beige___84931);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "button_clear", globals.btn_bknd_clear___84932);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "button_danger", globals.btn_bknd_danger___84933);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "edit", globals.btn_edit___84920);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "move", globals.btn_move___84921);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "duplicate", globals.btn_duplicate___84922);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "delete", globals.btn_delete___84923);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "carry", globals.btn_carry___84924);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "cancel", globals.btn_cancel___84925);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "ok", globals.btn_ok___84926);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "plus", globals.btn_plus___84927);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "new_file", globals.btn_new_file___84928);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "when", globals.ui_when___84912);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "do", globals.ui_do___84913);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "insertion-point", globals.btn_insertion_point___84929);
+    r0 = pxsim_pxtrt.mapSetGeneric(globals.kodu_icons_reg___84906, "MISSING", globals.MISSING___84910);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_see_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 228; s.pc = 14; return s.tmp_3; }
+     else { s.callLocIdx = 227; s.pc = 14; return s.tmp_3; }
     }
   case 14:
     r0 = s.retval;
@@ -27805,23 +27879,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["see"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["see"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 229; s.pc = 13; return s.tmp_2; }
+     else { s.callLocIdx = 228; s.pc = 13; return s.tmp_2; }
     }
   case 13:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_see___110185);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_see___84937);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_dpad_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 230; s.pc = 16; return s.tmp_3; }
+     else { s.callLocIdx = 229; s.pc = 16; return s.tmp_3; }
     }
   case 16:
     r0 = s.retval;
@@ -27832,23 +27906,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["dpad"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["dpad"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 231; s.pc = 15; return s.tmp_2; }
+     else { s.callLocIdx = 230; s.pc = 15; return s.tmp_2; }
     }
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_dpad___110186);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_dpad___84938);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_button_a_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 232; s.pc = 18; return s.tmp_3; }
+     else { s.callLocIdx = 231; s.pc = 18; return s.tmp_3; }
     }
   case 18:
     r0 = s.retval;
@@ -27859,23 +27933,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["button_a"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["button_a"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 233; s.pc = 17; return s.tmp_2; }
+     else { s.callLocIdx = 232; s.pc = 17; return s.tmp_2; }
     }
   case 17:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_button_a___110187);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_button_a___84939);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_button_b_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 234; s.pc = 20; return s.tmp_3; }
+     else { s.callLocIdx = 233; s.pc = 20; return s.tmp_3; }
     }
   case 20:
     r0 = s.retval;
@@ -27886,23 +27960,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["button_b"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["button_b"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 235; s.pc = 19; return s.tmp_2; }
+     else { s.callLocIdx = 234; s.pc = 19; return s.tmp_2; }
     }
   case 19:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_button_b___110188);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_button_b___84940);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_bump_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 236; s.pc = 22; return s.tmp_3; }
+     else { s.callLocIdx = 235; s.pc = 22; return s.tmp_3; }
     }
   case 22:
     r0 = s.retval;
@@ -27913,23 +27987,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["bump"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["bump"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 237; s.pc = 21; return s.tmp_2; }
+     else { s.callLocIdx = 236; s.pc = 21; return s.tmp_2; }
     }
   case 21:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_bump___110189);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_bump___84941);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_timer_1_mk(s);
     s.tmp_3 = if_sensor_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensor");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["sensor"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["sensor"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 238; s.pc = 24; return s.tmp_3; }
+     else { s.callLocIdx = 237; s.pc = 24; return s.tmp_3; }
     }
   case 24:
     r0 = s.retval;
@@ -27940,23 +28014,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["timer"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["timer"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 239; s.pc = 23; return s.tmp_2; }
+     else { s.callLocIdx = 238; s.pc = 23; return s.tmp_2; }
     }
   case 23:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_timer___110190);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_timer___84942);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_page_1_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 240; s.pc = 26; return s.tmp_3; }
+     else { s.callLocIdx = 239; s.pc = 26; return s.tmp_3; }
     }
   case 26:
     r0 = s.retval;
@@ -27967,23 +28041,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["page_1"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["page_1"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 241; s.pc = 25; return s.tmp_2; }
+     else { s.callLocIdx = 240; s.pc = 25; return s.tmp_2; }
     }
   case 25:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_1___110191);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_1___84943);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_page_2_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 242; s.pc = 28; return s.tmp_3; }
+     else { s.callLocIdx = 241; s.pc = 28; return s.tmp_3; }
     }
   case 28:
     r0 = s.retval;
@@ -27994,23 +28068,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["page_2"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["page_2"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 243; s.pc = 27; return s.tmp_2; }
+     else { s.callLocIdx = 242; s.pc = 27; return s.tmp_2; }
     }
   case 27:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_2___110192);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_2___84944);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_page_3_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 244; s.pc = 30; return s.tmp_3; }
+     else { s.callLocIdx = 243; s.pc = 30; return s.tmp_3; }
     }
   case 30:
     r0 = s.retval;
@@ -28021,23 +28095,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["page_3"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["page_3"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 245; s.pc = 29; return s.tmp_2; }
+     else { s.callLocIdx = 244; s.pc = 29; return s.tmp_2; }
     }
   case 29:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_3___110193);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_3___84945);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_page_4_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 246; s.pc = 32; return s.tmp_3; }
+     else { s.callLocIdx = 245; s.pc = 32; return s.tmp_3; }
     }
   case 32:
     r0 = s.retval;
@@ -28048,23 +28122,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["page_4"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["page_4"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 247; s.pc = 31; return s.tmp_2; }
+     else { s.callLocIdx = 246; s.pc = 31; return s.tmp_2; }
     }
   case 31:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_4___110194);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_4___84946);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_page_5_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 248; s.pc = 34; return s.tmp_3; }
+     else { s.callLocIdx = 247; s.pc = 34; return s.tmp_3; }
     }
   case 34:
     r0 = s.retval;
@@ -28075,23 +28149,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["page_5"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["page_5"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 249; s.pc = 33; return s.tmp_2; }
+     else { s.callLocIdx = 248; s.pc = 33; return s.tmp_2; }
     }
   case 33:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_5___110195);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_page_5___84947);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_express_none_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 252; s.pc = 36; return s.tmp_3; }
+     else { s.callLocIdx = 251; s.pc = 36; return s.tmp_3; }
     }
   case 36:
     r0 = s.retval;
@@ -28102,24 +28176,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["express_none"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["express_none"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 253; s.pc = 35; return s.tmp_2; }
+     else { s.callLocIdx = 252; s.pc = 35; return s.tmp_2; }
     }
   case 35:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.tile_express_none___110196;
+    s.tmp_4 = r0 = globals.tile_express_none___84948;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_express_none_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 250; s.pc = 38; return s.tmp_8; }
+     else { s.callLocIdx = 249; s.pc = 38; return s.tmp_8; }
     }
   case 38:
     r0 = s.retval;
@@ -28130,23 +28204,23 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["express_none"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["express_none"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 251; s.pc = 37; return s.tmp_7; }
+     else { s.callLocIdx = 250; s.pc = 37; return s.tmp_7; }
     }
   case 37:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_express_happy_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 256; s.pc = 40; return s.tmp_3; }
+     else { s.callLocIdx = 255; s.pc = 40; return s.tmp_3; }
     }
   case 40:
     r0 = s.retval;
@@ -28157,24 +28231,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["express_happy"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["express_happy"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 257; s.pc = 39; return s.tmp_2; }
+     else { s.callLocIdx = 256; s.pc = 39; return s.tmp_2; }
     }
   case 39:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.tile_express_happy___110197;
+    s.tmp_4 = r0 = globals.tile_express_happy___84949;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_express_happy_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 254; s.pc = 42; return s.tmp_8; }
+     else { s.callLocIdx = 253; s.pc = 42; return s.tmp_8; }
     }
   case 42:
     r0 = s.retval;
@@ -28185,23 +28259,23 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["express_happy"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["express_happy"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 255; s.pc = 41; return s.tmp_7; }
+     else { s.callLocIdx = 254; s.pc = 41; return s.tmp_7; }
     }
   case 41:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_express_angry_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 260; s.pc = 44; return s.tmp_3; }
+     else { s.callLocIdx = 259; s.pc = 44; return s.tmp_3; }
     }
   case 44:
     r0 = s.retval;
@@ -28212,24 +28286,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["express_angry"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["express_angry"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 261; s.pc = 43; return s.tmp_2; }
+     else { s.callLocIdx = 260; s.pc = 43; return s.tmp_2; }
     }
   case 43:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.tile_express_angry___110198;
+    s.tmp_4 = r0 = globals.tile_express_angry___84950;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_express_angry_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 258; s.pc = 46; return s.tmp_8; }
+     else { s.callLocIdx = 257; s.pc = 46; return s.tmp_8; }
     }
   case 46:
     r0 = s.retval;
@@ -28240,23 +28314,23 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["express_angry"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["express_angry"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 259; s.pc = 45; return s.tmp_7; }
+     else { s.callLocIdx = 258; s.pc = 45; return s.tmp_7; }
     }
   case 45:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_express_sad_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 264; s.pc = 48; return s.tmp_3; }
+     else { s.callLocIdx = 263; s.pc = 48; return s.tmp_3; }
     }
   case 48:
     r0 = s.retval;
@@ -28267,24 +28341,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["express_sad"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["express_sad"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 265; s.pc = 47; return s.tmp_2; }
+     else { s.callLocIdx = 264; s.pc = 47; return s.tmp_2; }
     }
   case 47:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.tile_express_sad___110199;
+    s.tmp_4 = r0 = globals.tile_express_sad___84951;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_express_sad_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 262; s.pc = 50; return s.tmp_8; }
+     else { s.callLocIdx = 261; s.pc = 50; return s.tmp_8; }
     }
   case 50:
     r0 = s.retval;
@@ -28295,23 +28369,23 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["express_sad"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["express_sad"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 263; s.pc = 49; return s.tmp_7; }
+     else { s.callLocIdx = 262; s.pc = 49; return s.tmp_7; }
     }
   case 49:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_express_heart_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 268; s.pc = 52; return s.tmp_3; }
+     else { s.callLocIdx = 267; s.pc = 52; return s.tmp_3; }
     }
   case 52:
     r0 = s.retval;
@@ -28322,24 +28396,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["express_heart"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["express_heart"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 269; s.pc = 51; return s.tmp_2; }
+     else { s.callLocIdx = 268; s.pc = 51; return s.tmp_2; }
     }
   case 51:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.tile_express_heart___110200;
+    s.tmp_4 = r0 = globals.tile_express_heart___84952;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_express_heart_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 266; s.pc = 54; return s.tmp_8; }
+     else { s.callLocIdx = 265; s.pc = 54; return s.tmp_8; }
     }
   case 54:
     r0 = s.retval;
@@ -28350,23 +28424,23 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["express_heart"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["express_heart"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 267; s.pc = 53; return s.tmp_7; }
+     else { s.callLocIdx = 266; s.pc = 53; return s.tmp_7; }
     }
   case 53:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_me_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 272; s.pc = 56; return s.tmp_3; }
+     else { s.callLocIdx = 271; s.pc = 56; return s.tmp_3; }
     }
   case 56:
     r0 = s.retval;
@@ -28377,24 +28451,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["me"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["me"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 273; s.pc = 55; return s.tmp_2; }
+     else { s.callLocIdx = 272; s.pc = 55; return s.tmp_2; }
     }
   case 55:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.tile_me___110201;
+    s.tmp_4 = r0 = globals.tile_me___84953;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_me_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 270; s.pc = 58; return s.tmp_8; }
+     else { s.callLocIdx = 269; s.pc = 58; return s.tmp_8; }
     }
   case 58:
     r0 = s.retval;
@@ -28405,23 +28479,23 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["me"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["me"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 271; s.pc = 57; return s.tmp_7; }
+     else { s.callLocIdx = 270; s.pc = 57; return s.tmp_7; }
     }
   case 57:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_it_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 276; s.pc = 60; return s.tmp_3; }
+     else { s.callLocIdx = 275; s.pc = 60; return s.tmp_3; }
     }
   case 60:
     r0 = s.retval;
@@ -28432,24 +28506,24 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["it"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["it"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 277; s.pc = 59; return s.tmp_2; }
+     else { s.callLocIdx = 276; s.pc = 59; return s.tmp_2; }
     }
   case 59:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = r0 = globals.tile_it___110202;
+    s.tmp_4 = r0 = globals.tile_it___84954;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_4);
-    s.tmp_5 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_5 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_7 = if_it_1_mk(s);
     s.tmp_8 = if_filter_1_mk(s);
-    s.tmp_8.arg0 = globals.tid___110372;
+    s.tmp_8.arg0 = globals.tid___85125;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "filter");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["filter"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["filter"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 274; s.pc = 62; return s.tmp_8; }
+     else { s.callLocIdx = 273; s.pc = 62; return s.tmp_8; }
     }
   case 62:
     r0 = s.retval;
@@ -28460,23 +28534,23 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["it"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["it"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 275; s.pc = 61; return s.tmp_7; }
+     else { s.callLocIdx = 274; s.pc = 61; return s.tmp_7; }
     }
   case 61:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_5, s.tmp_6, s.tmp_4);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_faraway_1_mk(s);
     s.tmp_3 = if_filter_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "filter");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["filter"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["filter"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 278; s.pc = 64; return s.tmp_3; }
+     else { s.callLocIdx = 277; s.pc = 64; return s.tmp_3; }
     }
   case 64:
     r0 = s.retval;
@@ -28487,23 +28561,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["faraway"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["faraway"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 279; s.pc = 63; return s.tmp_2; }
+     else { s.callLocIdx = 278; s.pc = 63; return s.tmp_2; }
     }
   case 63:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_faraway___110203);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_faraway___84955);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_nearby_1_mk(s);
     s.tmp_3 = if_filter_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "filter");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["filter"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["filter"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 280; s.pc = 66; return s.tmp_3; }
+     else { s.callLocIdx = 279; s.pc = 66; return s.tmp_3; }
     }
   case 66:
     r0 = s.retval;
@@ -28514,23 +28588,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["nearby"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["nearby"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 281; s.pc = 65; return s.tmp_2; }
+     else { s.callLocIdx = 280; s.pc = 65; return s.tmp_2; }
     }
   case 65:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_nearby___110204);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_nearby___84956);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_timespan_short_1_mk(s);
     s.tmp_3 = if_filter_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "filter");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["filter"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["filter"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 282; s.pc = 68; return s.tmp_3; }
+     else { s.callLocIdx = 281; s.pc = 68; return s.tmp_3; }
     }
   case 68:
     r0 = s.retval;
@@ -28541,23 +28615,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["timespan_short"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["timespan_short"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 283; s.pc = 67; return s.tmp_2; }
+     else { s.callLocIdx = 282; s.pc = 67; return s.tmp_2; }
     }
   case 67:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_timespan_short___110205);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_timespan_short___84957);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_timespan_long_1_mk(s);
     s.tmp_3 = if_filter_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "filter");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["filter"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["filter"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 284; s.pc = 70; return s.tmp_3; }
+     else { s.callLocIdx = 283; s.pc = 70; return s.tmp_3; }
     }
   case 70:
     r0 = s.retval;
@@ -28568,23 +28642,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["timespan_long"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["timespan_long"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 285; s.pc = 69; return s.tmp_2; }
+     else { s.callLocIdx = 284; s.pc = 69; return s.tmp_2; }
     }
   case 69:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_timespan_long___110206);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_timespan_long___84958);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_move_1_mk(s);
     s.tmp_3 = if_actuator_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "actuator");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["actuator"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["actuator"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 286; s.pc = 72; return s.tmp_3; }
+     else { s.callLocIdx = 285; s.pc = 72; return s.tmp_3; }
     }
   case 72:
     r0 = s.retval;
@@ -28595,23 +28669,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["move"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["move"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 287; s.pc = 71; return s.tmp_2; }
+     else { s.callLocIdx = 286; s.pc = 71; return s.tmp_2; }
     }
   case 71:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_move___110207);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_move___84959);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_switch_page_1_mk(s);
     s.tmp_3 = if_actuator_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "actuator");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["actuator"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["actuator"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 288; s.pc = 74; return s.tmp_3; }
+     else { s.callLocIdx = 287; s.pc = 74; return s.tmp_3; }
     }
   case 74:
     r0 = s.retval;
@@ -28622,23 +28696,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["switch_page"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["switch_page"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 289; s.pc = 73; return s.tmp_2; }
+     else { s.callLocIdx = 288; s.pc = 73; return s.tmp_2; }
     }
   case 73:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_switch_page___110208);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_switch_page___84960);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_camera_follow_1_mk(s);
     s.tmp_3 = if_actuator_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "actuator");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["actuator"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["actuator"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 290; s.pc = 76; return s.tmp_3; }
+     else { s.callLocIdx = 289; s.pc = 76; return s.tmp_3; }
     }
   case 76:
     r0 = s.retval;
@@ -28649,23 +28723,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["camera_follow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["camera_follow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 291; s.pc = 75; return s.tmp_2; }
+     else { s.callLocIdx = 290; s.pc = 75; return s.tmp_2; }
     }
   case 75:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_camera_follow___110209);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_camera_follow___84961);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_vanish_1_mk(s);
     s.tmp_3 = if_actuator_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "actuator");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["actuator"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["actuator"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 292; s.pc = 78; return s.tmp_3; }
+     else { s.callLocIdx = 291; s.pc = 78; return s.tmp_3; }
     }
   case 78:
     r0 = s.retval;
@@ -28676,23 +28750,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["vanish"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["vanish"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 293; s.pc = 77; return s.tmp_2; }
+     else { s.callLocIdx = 292; s.pc = 77; return s.tmp_2; }
     }
   case 77:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_vanish___110210);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_vanish___84962);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_express_1_mk(s);
     s.tmp_3 = if_actuator_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "actuator");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["actuator"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["actuator"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 294; s.pc = 80; return s.tmp_3; }
+     else { s.callLocIdx = 293; s.pc = 80; return s.tmp_3; }
     }
   case 80:
     r0 = s.retval;
@@ -28703,23 +28777,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["express"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["express"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 295; s.pc = 79; return s.tmp_2; }
+     else { s.callLocIdx = 294; s.pc = 79; return s.tmp_2; }
     }
   case 79:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_express___110211);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_express___84963);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_toward_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 296; s.pc = 82; return s.tmp_3; }
+     else { s.callLocIdx = 295; s.pc = 82; return s.tmp_3; }
     }
   case 82:
     r0 = s.retval;
@@ -28730,23 +28804,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["toward"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["toward"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 297; s.pc = 81; return s.tmp_2; }
+     else { s.callLocIdx = 296; s.pc = 81; return s.tmp_2; }
     }
   case 81:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_toward___110212);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_toward___84964);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_away_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 298; s.pc = 84; return s.tmp_3; }
+     else { s.callLocIdx = 297; s.pc = 84; return s.tmp_3; }
     }
   case 84:
     r0 = s.retval;
@@ -28757,23 +28831,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["away"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["away"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 299; s.pc = 83; return s.tmp_2; }
+     else { s.callLocIdx = 298; s.pc = 83; return s.tmp_2; }
     }
   case 83:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_away___110213);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_away___84965);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_avoid_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 300; s.pc = 86; return s.tmp_3; }
+     else { s.callLocIdx = 299; s.pc = 86; return s.tmp_3; }
     }
   case 86:
     r0 = s.retval;
@@ -28784,23 +28858,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["avoid"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["avoid"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 301; s.pc = 85; return s.tmp_2; }
+     else { s.callLocIdx = 300; s.pc = 85; return s.tmp_2; }
     }
   case 85:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_avoid___110214);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_avoid___84966);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_quickly_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 302; s.pc = 88; return s.tmp_3; }
+     else { s.callLocIdx = 301; s.pc = 88; return s.tmp_3; }
     }
   case 88:
     r0 = s.retval;
@@ -28811,23 +28885,23 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["quickly"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["quickly"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 303; s.pc = 87; return s.tmp_2; }
+     else { s.callLocIdx = 302; s.pc = 87; return s.tmp_2; }
     }
   case 87:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_quickly___110215);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_quickly___84967);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_slowly_1_mk(s);
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["modifier"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["modifier"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 304; s.pc = 90; return s.tmp_3; }
+     else { s.callLocIdx = 303; s.pc = 90; return s.tmp_3; }
     }
   case 90:
     r0 = s.retval;
@@ -28838,157 +28912,157 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["slowly"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["slowly"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 305; s.pc = 89; return s.tmp_2; }
+     else { s.callLocIdx = 304; s.pc = 89; return s.tmp_2; }
     }
   case 89:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_slowly___110216);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.tile_slowly___84968);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_DEFAULT_1_mk(s);
-    s.tmp_2.arg0 = globals.RuleCondition___110338;
+    s.tmp_2.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "DEFAULT");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["DEFAULT"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["DEFAULT"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 306; s.pc = 91; return s.tmp_2; }
+     else { s.callLocIdx = 305; s.pc = 91; return s.tmp_2; }
     }
   case 91:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_default___110217);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_default___84969);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_HIGH_1_mk(s);
-    s.tmp_2.arg0 = globals.RuleCondition___110338;
+    s.tmp_2.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "HIGH");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["HIGH"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["HIGH"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 307; s.pc = 92; return s.tmp_2; }
+     else { s.callLocIdx = 306; s.pc = 92; return s.tmp_2; }
     }
   case 92:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_high___110218);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_high___84970);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_LOW_1_mk(s);
-    s.tmp_2.arg0 = globals.RuleCondition___110338;
+    s.tmp_2.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "LOW");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["LOW"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["LOW"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 308; s.pc = 93; return s.tmp_2; }
+     else { s.callLocIdx = 307; s.pc = 93; return s.tmp_2; }
     }
   case 93:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_low___110219);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_low___84971);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_LOW_TO_HIGH_1_mk(s);
-    s.tmp_2.arg0 = globals.RuleCondition___110338;
+    s.tmp_2.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "LOW_TO_HIGH");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["LOW_TO_HIGH"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["LOW_TO_HIGH"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 309; s.pc = 94; return s.tmp_2; }
+     else { s.callLocIdx = 308; s.pc = 94; return s.tmp_2; }
     }
   case 94:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_low_to_high___110220);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_low_to_high___84972);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_HIGH_TO_LOW_1_mk(s);
-    s.tmp_2.arg0 = globals.RuleCondition___110338;
+    s.tmp_2.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "HIGH_TO_LOW");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["HIGH_TO_LOW"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["HIGH_TO_LOW"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 310; s.pc = 95; return s.tmp_2; }
+     else { s.callLocIdx = 309; s.pc = 95; return s.tmp_2; }
     }
   case 95:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_high_to_low___110221);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.rc_high_to_low___84973);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_Happy_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Happy");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Happy"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Happy"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 311; s.pc = 96; return s.tmp_2; }
+     else { s.callLocIdx = 310; s.pc = 96; return s.tmp_2; }
     }
   case 96:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_happy___110222);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_happy___84974);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_Angry_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Angry");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Angry"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Angry"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 312; s.pc = 97; return s.tmp_2; }
+     else { s.callLocIdx = 311; s.pc = 97; return s.tmp_2; }
     }
   case 97:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_angry___110223);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_angry___84975);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_Heart_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Heart");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Heart"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Heart"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 313; s.pc = 98; return s.tmp_2; }
+     else { s.callLocIdx = 312; s.pc = 98; return s.tmp_2; }
     }
   case 98:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_heart___110224);
-    s.tmp_0 = r0 = globals.kodu_icons_reg___110154;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_heart___84976);
+    s.tmp_0 = r0 = globals.kodu_icons_reg___84906;
     s.tmp_2 = if_Sad_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "Sad");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["Sad"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["Sad"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 314; s.pc = 99; return s.tmp_2; }
+     else { s.callLocIdx = 313; s.pc = 99; return s.tmp_2; }
     }
   case 99:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_sad___110225);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, globals.emo_sad___84977);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_icons_init__P110156.info = {"start":421,"length":4553,"line":14,"column":8,"endLine":83,"endColumn":9,"fileName":"assets.ts","functionName":"init","argumentNames":[]}
+kodu_icons_init__P84908.info = {"start":421,"length":4553,"line":14,"column":8,"endLine":83,"endColumn":9,"fileName":"assets.ts","functionName":"init","argumentNames":[]}
 
-function kodu_icons_init__P110156_mk(s) {
+function kodu_icons_init__P84908_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_icons_init__P110156, depth: s.depth + 1,
+        parent: s, fn: kodu_icons_init__P84908, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29005,7 +29079,7 @@ function kodu_icons_init__P110156_mk(s) {
 
 
 
-function setTimeout__P107021(s) {
+function setTimeout__P81685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29020,7 +29094,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = control_setInterval__P106952_mk(s);
+    s.tmp_0 = control_setInterval__P81616_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = 1;
@@ -29030,12 +29104,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-setTimeout__P107021.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__P81685.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__P107021_mk(s) {
+function setTimeout__P81685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: setTimeout__P107021, depth: s.depth + 1,
+        parent: s, fn: setTimeout__P81685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -29046,7 +29120,7 @@ function setTimeout__P107021_mk(s) {
 
 
 
-function control_setInterval__P106952(s) {
+function control_setInterval__P81616(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29056,7 +29130,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.interval___125038 = undefined;
+    s.interval___100385 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -29082,19 +29156,19 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals._intervals___110562);
+    r0 = pxsim_numops_toBoolDecr(globals._intervals___85346);
     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___110562 = (r0);
+    globals._intervals___85346 = (r0);
   case 5:
   case 6:
-    r0 = pxsim_pxtcore_mkClassInstance(control_Interval__C110563_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_Interval__C85347_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_Interval_constructor__P110566_mk(s);
+    s.tmp_1 = control_Interval_constructor__P85350_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -29102,25 +29176,25 @@ switch (step) {
     s.callLocIdx = 30; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.interval___125038 = (s.tmp_0);
-    r0 = s.interval___125038.fields["id"];
+    s.interval___100385 = (s.tmp_0);
+    r0 = s.interval___100385.fields["id"];
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-control_setInterval__P106952.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__P81616.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__P106952_mk(s) {
+function control_setInterval__P81616_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_setInterval__P106952, depth: s.depth + 1,
+        parent: s, fn: control_setInterval__P81616, 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___125038: undefined,
+  interval___100385: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -29130,7 +29204,7 @@ function control_setInterval__P106952_mk(s) {
 
 
 
-function control_Interval_constructor__P110566(s) {
+function control_Interval_constructor__P85350(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29148,8 +29222,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_Interval__C110563_VT)) failedCast(r0);
-    r0 = pxsim_Array__length(globals._intervals___110562);
+    if (!checkSubtype(r0, control_Interval__C85347_VT)) failedCast(r0);
+    r0 = pxsim_Array__length(globals._intervals___85346);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
@@ -29158,8 +29232,8 @@ switch (step) {
     r0 = 1;
     { step = 2; continue; }
   case 1:
-    s.tmp_3 = r0 = globals._intervals___110562;
-    r0 = pxsim_Array__length(globals._intervals___110562);
+    s.tmp_3 = r0 = globals._intervals___85346;
+    r0 = pxsim_Array__length(globals._intervals___85346);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 - 1);
     s.tmp_4 = r0;
@@ -29174,8 +29248,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___110562, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P125081);
+    r0 = pxsim_Array__push(globals._intervals___85346, s.arg0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P100428);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim.control.runInParallel(s.tmp_0);
@@ -29183,12 +29257,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_Interval_constructor__P110566.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__P85350.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__P110566_mk(s) {
+function control_Interval_constructor__P85350_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_Interval_constructor__P110566, depth: s.depth + 1,
+        parent: s, fn: control_Interval_constructor__P85350, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29207,7 +29281,7 @@ function control_Interval_constructor__P110566_mk(s) {
 
 
 
-function inline__P125081(s) {
+function inline__P100428(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29217,7 +29291,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = control_Interval_work__P110564_mk(s);
+    s.tmp_0 = control_Interval_work__P85348_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 25; s.pc = 1; return s.tmp_0;
   case 1:
@@ -29226,12 +29300,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P125081.info = {"start":621,"length":17,"line":23,"column":34,"endLine":23,"endColumn":51,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":[]}
+inline__P100428.info = {"start":621,"length":17,"line":23,"column":34,"endLine":23,"endColumn":51,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P125081_mk(s) {
+function inline__P100428_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P125081, depth: s.depth + 1,
+        parent: s, fn: inline__P100428, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -29240,7 +29314,7 @@ function inline__P125081_mk(s) {
 
 
 
-function control_Interval_work__P110564(s) {
+function control_Interval_work__P85348(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29255,7 +29329,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_Interval__C110563_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_Interval__C85347_VT)) failedCast(r0);
     r0 = s.arg0.fields["mode"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(2, s.tmp_0);
@@ -29274,7 +29348,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = pause__P107011_mk(s);
+    s.tmp_3 = pause__P81675_mk(s);
     r0 = s.arg0.fields["delay"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 26; s.pc = 13; return s.tmp_3;
@@ -29312,7 +29386,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_2 = pause__P107011_mk(s);
+    s.tmp_2 = pause__P81675_mk(s);
     r0 = s.arg0.fields["delay"];
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 28; s.pc = 15; return s.tmp_2;
@@ -29342,17 +29416,17 @@ switch (step) {
     { step = 8; continue; }
   case 11:
   case 12:
-    r0 = pxsim_Array_.removeElement(globals._intervals___110562, s.arg0);
+    r0 = pxsim_Array_.removeElement(globals._intervals___85346, s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_Interval_work__P110564.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__P85348.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__P110564_mk(s) {
+function control_Interval_work__P85348_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_Interval_work__P110564, depth: s.depth + 1,
+        parent: s, fn: control_Interval_work__P85348, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29365,7 +29439,7 @@ function control_Interval_work__P110564_mk(s) {
 
 
 
-function kodu_Vec2_Mul__P110418(s) {
+function kodu_Vec2_Mul__P85201(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29380,9 +29454,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C110414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C85197_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Vec2_constructor__P110415_mk(s);
+    s.tmp_1 = kodu_Vec2_constructor__P85198_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
@@ -29396,19 +29470,19 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_4 * s.tmp_5);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1164; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1163; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_Mul__P110418.info = {"start":430,"length":150,"line":18,"column":8,"endLine":23,"endColumn":9,"fileName":"vec2.ts","functionName":"Mul","argumentNames":["a","b"]}
+kodu_Vec2_Mul__P85201.info = {"start":430,"length":150,"line":18,"column":8,"endLine":23,"endColumn":9,"fileName":"vec2.ts","functionName":"Mul","argumentNames":["a","b"]}
 
-function kodu_Vec2_Mul__P110418_mk(s) {
+function kodu_Vec2_Mul__P85201_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_Mul__P110418, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_Mul__P85201, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29424,7 +29498,7 @@ function kodu_Vec2_Mul__P110418_mk(s) {
 
 
 
-function kodu_Vec2_constructor__P110415(s) {
+function kodu_Vec2_constructor__P85198(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29441,19 +29515,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Vec2__C110414_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Vec2__C85197_VT)) failedCast(r0);
     r0 = (s.arg0).fields["x"] = (s.arg1);
     r0 = (s.arg0).fields["y"] = (s.arg2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_constructor__P110415.info = {"start":49,"length":51,"line":2,"column":8,"endLine":2,"endColumn":59,"fileName":"vec2.ts","functionName":"inline","argumentNames":["this","x","y"]}
+kodu_Vec2_constructor__P85198.info = {"start":49,"length":51,"line":2,"column":8,"endLine":2,"endColumn":59,"fileName":"vec2.ts","functionName":"inline","argumentNames":["this","x","y"]}
 
-function kodu_Vec2_constructor__P110415_mk(s) {
+function kodu_Vec2_constructor__P85198_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_constructor__P110415, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_constructor__P85198, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -29464,7 +29538,7 @@ function kodu_Vec2_constructor__P110415_mk(s) {
 
 
 
-function kodu_Vec2_Transpose__P110421(s) {
+function kodu_Vec2_Transpose__P85204(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29478,27 +29552,27 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C110414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C85197_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Vec2_constructor__P110415_mk(s);
+    s.tmp_1 = kodu_Vec2_constructor__P85198_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["y"];
     s.tmp_1.arg1 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1165; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1164; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_Transpose__P110421.info = {"start":915,"length":89,"line":39,"column":8,"endLine":41,"endColumn":9,"fileName":"vec2.ts","functionName":"Transpose","argumentNames":["v"]}
+kodu_Vec2_Transpose__P85204.info = {"start":915,"length":89,"line":39,"column":8,"endLine":41,"endColumn":9,"fileName":"vec2.ts","functionName":"Transpose","argumentNames":["v"]}
 
-function kodu_Vec2_Transpose__P110421_mk(s) {
+function kodu_Vec2_Transpose__P85204_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_Transpose__P110421, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_Transpose__P85204, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29509,7 +29583,7 @@ function kodu_Vec2_Transpose__P110421_mk(s) {
 
 
 
-function kodu_Vec2_Dot__P110427(s) {
+function kodu_Vec2_Dot__P85210(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29540,12 +29614,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_Dot__P110427.info = {"start":1890,"length":97,"line":75,"column":8,"endLine":77,"endColumn":9,"fileName":"vec2.ts","functionName":"Dot","argumentNames":["a","b"]}
+kodu_Vec2_Dot__P85210.info = {"start":1890,"length":97,"line":75,"column":8,"endLine":77,"endColumn":9,"fileName":"vec2.ts","functionName":"Dot","argumentNames":["a","b"]}
 
-function kodu_Vec2_Dot__P110427_mk(s) {
+function kodu_Vec2_Dot__P85210_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_Dot__P110427, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_Dot__P85210, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29561,7 +29635,7 @@ function kodu_Vec2_Dot__P110427_mk(s) {
 
 
 
-function kodu_Character_nextDirection__P538179(s) {
+function kodu_Character_nextDirection__P85026(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29571,20 +29645,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.v___538424 = undefined;
+    s.v___89576 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Character_computeImpulses__P538184_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Character_computeImpulses__P85031_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 425; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 424; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.v___538424 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.v___538424);
+    s.v___89576 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.v___89576);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -29594,27 +29668,27 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = kodu_Vec2_Normal__P110423_mk(s);
-    s.tmp_2.arg0 = s.v___538424;
+    s.tmp_2 = kodu_Vec2_Normal__P85206_mk(s);
+    s.tmp_2.arg0 = s.v___89576;
     s.tmp_2.arg1 = undefined;
-    s.callLocIdx = 426; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 425; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_nextDirection__P538179.info = {"start":3607,"length":165,"line":112,"column":8,"endLine":116,"endColumn":9,"fileName":"character.ts","functionName":"nextDirection","argumentNames":["this"]}
+kodu_Character_nextDirection__P85026.info = {"start":3607,"length":165,"line":112,"column":8,"endLine":116,"endColumn":9,"fileName":"character.ts","functionName":"nextDirection","argumentNames":["this"]}
 
-function kodu_Character_nextDirection__P538179_mk(s) {
+function kodu_Character_nextDirection__P85026_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_nextDirection__P538179, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_nextDirection__P85026, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  v___538424: undefined,
+  v___89576: undefined,
   arg0: undefined,
 } }
 
@@ -29622,7 +29696,7 @@ function kodu_Character_nextDirection__P538179_mk(s) {
 
 
 
-function kodu_Character_computeImpulses__P538184(s) {
+function kodu_Character_computeImpulses__P85031(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29632,21 +29706,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.finalDir___538466 = undefined;
-    s.exclusiveOnly___538468 = undefined;
-    s.allowDefault___538481 = undefined;
-    s.impulseCount___538486 = undefined;
-    s.impulse___538488 = undefined;
-    s.unnamed16848___U5 = undefined;
-    s.unnamed16849___U6 = undefined;
-    s.direction___538505 = undefined;
-    s.magnitude___538509 = undefined;
+    s.finalDir___89618 = undefined;
+    s.exclusiveOnly___89620 = undefined;
+    s.allowDefault___89632 = undefined;
+    s.impulseCount___89637 = undefined;
+    s.impulse___89639 = undefined;
+    s.unnamed1900___U5 = undefined;
+    s.unnamed1901___U6 = undefined;
+    s.direction___89655 = undefined;
+    s.magnitude___89659 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = s.arg0.fields["impulseQueue"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -29661,55 +29735,55 @@ switch (step) {
     { step = 18; continue; }
   case 1:
   case 2:
-    s.tmp_4 = kodu_mkVec2__P110429_mk(s);
+    s.tmp_4 = kodu_mkVec2__P85212_mk(s);
     s.tmp_4.arg0 = 0;
     s.tmp_4.arg1 = 0;
-    s.callLocIdx = 429; s.pc = 19; return s.tmp_4;
+    s.callLocIdx = 428; s.pc = 19; return s.tmp_4;
   case 19:
     r0 = s.retval;
-    s.finalDir___538466 = (r0);
-    s.tmp_0 = helpers_arraySome__P106714_mk(s);
+    s.finalDir___89618 = (r0);
+    s.tmp_0 = helpers_arraySome__P81376_mk(s);
     r0 = s.arg0.fields["impulseQueue"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P538470;
-    s.callLocIdx = 431; s.pc = 20; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P89622;
+    s.callLocIdx = 430; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
-    s.exclusiveOnly___538468 = (r0);
+    s.exclusiveOnly___89620 = (r0);
     r0 = s.arg0.fields["impulseQueue"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.tmp_1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 === 1);
-    s.allowDefault___538481 = (r0);
-    s.impulseCount___538486 = (0);
-    s.impulse___538488 = (undefined);
+    s.allowDefault___89632 = (r0);
+    s.impulseCount___89637 = (0);
+    s.impulse___89639 = (undefined);
     r0 = s.arg0.fields["impulseQueue"];
-    s.unnamed16848___U5 = (r0);
-    s.unnamed16849___U6 = (0);
+    s.unnamed1900___U5 = (r0);
+    s.unnamed1901___U6 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed16849___U6;
-    r0 = pxsim_Array__length(s.unnamed16848___U5);
+    s.tmp_0 = r0 = s.unnamed1901___U6;
+    r0 = pxsim_Array__length(s.unnamed1900___U5);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 15; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16848___U5, s.unnamed16849___U6);
-    s.impulse___538488 = (r0);
-    s.tmp_2 = r0 = s.exclusiveOnly___538468;
+    r0 = pxsim_Array__getAt(s.unnamed1900___U5, s.unnamed1901___U6);
+    s.impulse___89639 = (r0);
+    s.tmp_2 = r0 = s.exclusiveOnly___89620;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 4; continue; }
     r0 = s.tmp_2;
     { step = 5; continue; }
   case 4:
     s.tmp_4 = if_type_1_mk(s);
-    s.tmp_4.arg0 = s.impulse___538488;
+    s.tmp_4.arg0 = s.impulse___89639;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "type");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["type"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["type"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 432; s.pc = 21; return s.tmp_4; }
+     else { s.callLocIdx = 431; s.pc = 21; return s.tmp_4; }
     }
   case 21:
     r0 = s.retval;
@@ -29723,7 +29797,7 @@ switch (step) {
     { step = 14; continue; }
   case 6:
   case 7:
-    r0 = pxsim_numops_toBoolDecr(s.allowDefault___538481);
+    r0 = pxsim_numops_toBoolDecr(s.allowDefault___89632);
     s.tmp_7 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_7);
     s.tmp_6 = r0;
@@ -29733,14 +29807,14 @@ switch (step) {
     { step = 9; continue; }
   case 8:
     s.tmp_9 = if_type_1_mk(s);
-    s.tmp_9.arg0 = s.impulse___538488;
+    s.tmp_9.arg0 = s.impulse___89639;
     if (!s.tmp_9.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_9.arg0, "type");
     } else {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["type"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["type"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 433; s.pc = 22; return s.tmp_9; }
+     else { s.callLocIdx = 432; s.pc = 22; return s.tmp_9; }
     }
   case 22:
     r0 = s.retval;
@@ -29755,64 +29829,64 @@ switch (step) {
   case 10:
   case 11:
     s.tmp_11 = if_direction_1_mk(s);
-    s.tmp_11.arg0 = s.impulse___538488;
+    s.tmp_11.arg0 = s.impulse___89639;
     if (!s.tmp_11.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_11.arg0, "direction");
     } else {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["direction"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["direction"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 434; s.pc = 23; return s.tmp_11; }
+     else { s.callLocIdx = 433; s.pc = 23; return s.tmp_11; }
     }
   case 23:
     r0 = s.retval;
-    s.direction___538505 = (r0);
+    s.direction___89655 = (r0);
     s.tmp_0 = if_magnitude_1_mk(s);
-    s.tmp_0.arg0 = s.impulse___538488;
+    s.tmp_0.arg0 = s.impulse___89639;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "magnitude");
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["magnitude"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["magnitude"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 435; s.pc = 24; return s.tmp_0; }
+     else { s.callLocIdx = 434; s.pc = 24; return s.tmp_0; }
     }
   case 24:
     r0 = s.retval;
-    s.magnitude___538509 = (r0);
-    s.tmp_0 = kodu_Vec2_Add__P110416_mk(s);
-    s.tmp_0.arg0 = s.finalDir___538466;
-    s.tmp_1 = kodu_Vec2_Scale__P110424_mk(s);
-    s.tmp_1.arg0 = s.direction___538505;
-    s.tmp_1.arg1 = s.magnitude___538509;
-    s.callLocIdx = 436; s.pc = 26; return s.tmp_1;
+    s.magnitude___89659 = (r0);
+    s.tmp_0 = kodu_Vec2_Add__P85199_mk(s);
+    s.tmp_0.arg0 = s.finalDir___89618;
+    s.tmp_1 = kodu_Vec2_Scale__P85207_mk(s);
+    s.tmp_1.arg0 = s.direction___89655;
+    s.tmp_1.arg1 = s.magnitude___89659;
+    s.callLocIdx = 435; s.pc = 26; return s.tmp_1;
   case 26:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 437; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 436; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.finalDir___538466 = (r0);
-    r0 = (s.impulseCount___538486 + 1);
-    s.impulseCount___538486 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.exclusiveOnly___538468);
+    s.finalDir___89618 = (r0);
+    r0 = (s.impulseCount___89637 + 1);
+    s.impulseCount___89637 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.exclusiveOnly___89620);
     if (!r0) { step = 12; continue; }
     { step = 15; continue; }
   case 12:
   case 13:
   case 14:
-    r0 = (s.unnamed16849___U6 + 1);
-    s.unnamed16849___U6 = (r0);
+    r0 = (s.unnamed1901___U6 + 1);
+    s.unnamed1901___U6 = (r0);
     { step = 3; continue; }
   case 15:
-    s.unnamed16848___U5 = (undefined);
-    r0 = pxsim_numops_toBoolDecr(s.impulseCount___538486);
+    s.unnamed1900___U5 = (undefined);
+    r0 = pxsim_numops_toBoolDecr(s.impulseCount___89637);
     if (!r0) { step = 16; continue; }
-    s.tmp_0 = kodu_Vec2_Scale__P110424_mk(s);
-    s.tmp_0.arg0 = s.finalDir___538466;
-    r0 = (1 / s.impulseCount___538486);
+    s.tmp_0 = kodu_Vec2_Scale__P85207_mk(s);
+    s.tmp_0.arg0 = s.finalDir___89618;
+    r0 = (1 / s.impulseCount___89637);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 438; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 437; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
     { step = 18; continue; }
@@ -29823,12 +29897,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_computeImpulses__P538184.info = {"start":4229,"length":985,"line":134,"column":8,"endLine":153,"endColumn":9,"fileName":"character.ts","functionName":"computeImpulses","argumentNames":["this"]}
+kodu_Character_computeImpulses__P85031.info = {"start":4229,"length":985,"line":134,"column":8,"endLine":153,"endColumn":9,"fileName":"character.ts","functionName":"computeImpulses","argumentNames":["this"]}
 
-function kodu_Character_computeImpulses__P538184_mk(s) {
+function kodu_Character_computeImpulses__P85031_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_computeImpulses__P538184, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_computeImpulses__P85031, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29842,15 +29916,15 @@ function kodu_Character_computeImpulses__P538184_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  finalDir___538466: undefined,
-  exclusiveOnly___538468: undefined,
-  allowDefault___538481: undefined,
-  impulseCount___538486: undefined,
-  impulse___538488: undefined,
-  unnamed16848___U5: undefined,
-  unnamed16849___U6: undefined,
-  direction___538505: undefined,
-  magnitude___538509: undefined,
+  finalDir___89618: undefined,
+  exclusiveOnly___89620: undefined,
+  allowDefault___89632: undefined,
+  impulseCount___89637: undefined,
+  impulse___89639: undefined,
+  unnamed1900___U5: undefined,
+  unnamed1901___U6: undefined,
+  direction___89655: undefined,
+  magnitude___89659: undefined,
   arg0: undefined,
 } }
 
@@ -29858,7 +29932,7 @@ function kodu_Character_computeImpulses__P538184_mk(s) {
 
 
 
-function inline__P538470(s) {
+function inline__P89622(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29880,7 +29954,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["type"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["type"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 430; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 429; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -29889,12 +29963,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P538470.info = {"start":4409,"length":43,"line":137,"column":57,"endLine":137,"endColumn":100,"fileName":"character.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P89622.info = {"start":4409,"length":43,"line":137,"column":57,"endLine":137,"endColumn":100,"fileName":"character.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P538470_mk(s) {
+function inline__P89622_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P538470, depth: s.depth + 1,
+        parent: s, fn: inline__P89622, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29905,7 +29979,7 @@ function inline__P538470_mk(s) {
 
 
 
-function kodu_Vec2_Scale__P110424(s) {
+function kodu_Vec2_Scale__P85207(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29920,9 +29994,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C110414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C85197_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Vec2_constructor__P110415_mk(s);
+    s.tmp_1 = kodu_Vec2_constructor__P85198_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
@@ -29932,19 +30006,19 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_3 * s.arg1);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1167; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1166; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_Scale__P110424.info = {"start":1457,"length":165,"line":59,"column":8,"endLine":64,"endColumn":9,"fileName":"vec2.ts","functionName":"Scale","argumentNames":["v","scalar"]}
+kodu_Vec2_Scale__P85207.info = {"start":1457,"length":165,"line":59,"column":8,"endLine":64,"endColumn":9,"fileName":"vec2.ts","functionName":"Scale","argumentNames":["v","scalar"]}
 
-function kodu_Vec2_Scale__P110424_mk(s) {
+function kodu_Vec2_Scale__P85207_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_Scale__P110424, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_Scale__P85207, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29958,7 +30032,7 @@ function kodu_Vec2_Scale__P110424_mk(s) {
 
 
 
-function kodu_Vec2_Add__P110416(s) {
+function kodu_Vec2_Add__P85199(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29973,9 +30047,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C110414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C85197_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Vec2_constructor__P110415_mk(s);
+    s.tmp_1 = kodu_Vec2_constructor__P85198_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
@@ -29989,19 +30063,19 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1162; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1161; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_Add__P110416.info = {"start":110,"length":150,"line":4,"column":8,"endLine":9,"endColumn":9,"fileName":"vec2.ts","functionName":"Add","argumentNames":["a","b"]}
+kodu_Vec2_Add__P85199.info = {"start":110,"length":150,"line":4,"column":8,"endLine":9,"endColumn":9,"fileName":"vec2.ts","functionName":"Add","argumentNames":["a","b"]}
 
-function kodu_Vec2_Add__P110416_mk(s) {
+function kodu_Vec2_Add__P85199_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_Add__P110416, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_Add__P85199, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30017,7 +30091,7 @@ function kodu_Vec2_Add__P110416_mk(s) {
 
 
 
-function kodu_Vec2_Normal__P110423(s) {
+function kodu_Vec2_Normal__P85206(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30027,7 +30101,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.magSq___118613 = undefined;
+    s.magSq___93942 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30052,8 +30126,8 @@ switch (step) {
     r0 = (s.tmp_6 * s.tmp_7);
     s.tmp_5 = r0;
     r0 = (s.tmp_2 + s.tmp_5);
-    s.magSq___118613 = (r0);
-    r0 = (s.magSq___118613 === 1);
+    s.magSq___93942 = (r0);
+    r0 = (s.magSq___93942 === 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -30061,13 +30135,13 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    r0 = pxsim.Math_.sqrt(s.magSq___118613);
+    r0 = pxsim.Math_.sqrt(s.magSq___93942);
     s.arg1 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C110414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C85197_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Vec2_constructor__P110415_mk(s);
+    s.tmp_1 = kodu_Vec2_constructor__P85198_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
@@ -30077,7 +30151,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_3 / s.arg1);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1166; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1165; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = s.tmp_0;
@@ -30085,12 +30159,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_Normal__P110423.info = {"start":1109,"length":338,"line":47,"column":8,"endLine":57,"endColumn":9,"fileName":"vec2.ts","functionName":"Normal","argumentNames":["v","mag"]}
+kodu_Vec2_Normal__P85206.info = {"start":1109,"length":338,"line":47,"column":8,"endLine":57,"endColumn":9,"fileName":"vec2.ts","functionName":"Normal","argumentNames":["v","mag"]}
 
-function kodu_Vec2_Normal__P110423_mk(s) {
+function kodu_Vec2_Normal__P85206_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_Normal__P110423, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_Normal__P85206, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30100,7 +30174,7 @@ function kodu_Vec2_Normal__P110423_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  magSq___118613: undefined,
+  magSq___93942: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -30109,7 +30183,7 @@ function kodu_Vec2_Normal__P110423_mk(s) {
 
 
 
-function kodu_Character_pos__P538172(s) {
+function kodu_Character_pos__P85018(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30124,33 +30198,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_mkVec2__P110429_mk(s);
-    s.tmp_1 = kodu_Character_x__P538093_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_mkVec2__P85212_mk(s);
+    s.tmp_1 = kodu_Character_x__P85014_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 391; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 390; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_2 = kodu_Character_y__P538094_mk(s);
+    s.tmp_2 = kodu_Character_y__P85016_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 392; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 391; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 393; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 392; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Character_pos__P538172.info = {"start":967,"length":57,"line":34,"column":8,"endLine":34,"endColumn":65,"fileName":"character.ts","functionName":"pos","argumentNames":["this"]}
-kodu_Character_pos__P538172.isGetter = true;
+kodu_Character_pos__P85018.info = {"start":967,"length":57,"line":34,"column":8,"endLine":34,"endColumn":65,"fileName":"character.ts","functionName":"pos","argumentNames":["this"]}
+kodu_Character_pos__P85018.isGetter = true;
 
-function kodu_Character_pos__P538172_mk(s) {
+function kodu_Character_pos__P85018_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_pos__P538172, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_pos__P85018, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30162,7 +30236,7 @@ function kodu_Character_pos__P538172_mk(s) {
 
 
 
-function kodu_Vec2_Sub__P110417(s) {
+function kodu_Vec2_Sub__P85200(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30177,9 +30251,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C110414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C85197_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Vec2_constructor__P110415_mk(s);
+    s.tmp_1 = kodu_Vec2_constructor__P85198_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
@@ -30193,19 +30267,19 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_4 - s.tmp_5);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1163; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1162; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Vec2_Sub__P110417.info = {"start":270,"length":150,"line":11,"column":8,"endLine":16,"endColumn":9,"fileName":"vec2.ts","functionName":"Sub","argumentNames":["a","b"]}
+kodu_Vec2_Sub__P85200.info = {"start":270,"length":150,"line":11,"column":8,"endLine":16,"endColumn":9,"fileName":"vec2.ts","functionName":"Sub","argumentNames":["a","b"]}
 
-function kodu_Vec2_Sub__P110417_mk(s) {
+function kodu_Vec2_Sub__P85200_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Vec2_Sub__P110417, depth: s.depth + 1,
+        parent: s, fn: kodu_Vec2_Sub__P85200, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30221,7 +30295,7 @@ function kodu_Vec2_Sub__P110417_mk(s) {
 
 
 
-function util_distBetweenSprites__P110101(s) {
+function util_distBetweenSprites__P84853(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30236,10 +30310,10 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = util_distSqBetweenSprites__P110100_mk(s);
+    s.tmp_1 = util_distSqBetweenSprites__P84852_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 124; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 123; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -30247,12 +30321,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-util_distBetweenSprites__P110101.info = {"start":4485,"length":136,"line":115,"column":4,"endLine":117,"endColumn":5,"fileName":"extras.ts","functionName":"distBetweenSprites","argumentNames":["a","b"]}
+util_distBetweenSprites__P84853.info = {"start":4485,"length":136,"line":115,"column":4,"endLine":117,"endColumn":5,"fileName":"extras.ts","functionName":"distBetweenSprites","argumentNames":["a","b"]}
 
-function util_distBetweenSprites__P110101_mk(s) {
+function util_distBetweenSprites__P84853_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_distBetweenSprites__P110101, depth: s.depth + 1,
+        parent: s, fn: util_distBetweenSprites__P84853, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30264,7 +30338,7 @@ function util_distBetweenSprites__P110101_mk(s) {
 
 
 
-function kodu_Character_y__P538094(s) {
+function kodu_Character_y__P85016(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30279,23 +30353,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_y__P110491_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_y__P85274_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 389; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 388; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Character_y__P538094.info = {"start":863,"length":40,"line":32,"column":8,"endLine":32,"endColumn":48,"fileName":"character.ts","functionName":"y","argumentNames":["this"]}
-kodu_Character_y__P538094.isGetter = true;
+kodu_Character_y__P85016.info = {"start":863,"length":40,"line":32,"column":8,"endLine":32,"endColumn":48,"fileName":"character.ts","functionName":"y","argumentNames":["this"]}
+kodu_Character_y__P85016.isGetter = true;
 
-function kodu_Character_y__P538094_mk(s) {
+function kodu_Character_y__P85016_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_y__P538094, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_y__P85016, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -30305,7 +30379,7 @@ function kodu_Character_y__P538094_mk(s) {
 
 
 
-function kodu_Character_x__P538093(s) {
+function kodu_Character_x__P85014(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30320,23 +30394,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110489_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85272_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 387; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 386; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Character_x__P538093.info = {"start":759,"length":40,"line":30,"column":8,"endLine":30,"endColumn":48,"fileName":"character.ts","functionName":"x","argumentNames":["this"]}
-kodu_Character_x__P538093.isGetter = true;
+kodu_Character_x__P85014.info = {"start":759,"length":40,"line":30,"column":8,"endLine":30,"endColumn":48,"fileName":"character.ts","functionName":"x","argumentNames":["this"]}
+kodu_Character_x__P85014.isGetter = true;
 
-function kodu_Character_x__P538093_mk(s) {
+function kodu_Character_x__P85014_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_x__P538093, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_x__P85014, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -30346,7 +30420,7 @@ function kodu_Character_x__P538093_mk(s) {
 
 
 
-function kodu_Program_feel__P136372(s) {
+function kodu_Program_feel__P85173(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30362,18 +30436,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Program__C136367_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Program__C85160_VT)) failedCast(r0);
     r0 = (s.arg0).fields["feeling"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Program_feel__P136372.info = {"start":1837,"length":76,"line":65,"column":8,"endLine":67,"endColumn":9,"fileName":"program.ts","functionName":"feel","argumentNames":["this","feeling"]}
+kodu_Program_feel__P85173.info = {"start":1837,"length":76,"line":65,"column":8,"endLine":67,"endColumn":9,"fileName":"program.ts","functionName":"feel","argumentNames":["this","feeling"]}
 
-function kodu_Program_feel__P136372_mk(s) {
+function kodu_Program_feel__P85173_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Program_feel__P136372, depth: s.depth + 1,
+        parent: s, fn: kodu_Program_feel__P85173, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -30383,7 +30457,7 @@ function kodu_Program_feel__P136372_mk(s) {
 
 
 
-function kodu_Program_cameraFollow__P136371(s) {
+function kodu_Program_cameraFollow__P85172(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30399,14 +30473,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Program__C136367_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Stage__C468688_v10_3_mk(s);
+    if (!checkSubtype(r0, kodu_Program__C85160_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["char"];
     r0 = r0.fields["stage"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = "camera:follow";
     s.tmp_0.arg2 = s.arg1;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.notify;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -30415,12 +30489,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Program_cameraFollow__P136371.info = {"start":1720,"length":107,"line":61,"column":8,"endLine":63,"endColumn":9,"fileName":"program.ts","functionName":"cameraFollow","argumentNames":["this","char"]}
+kodu_Program_cameraFollow__P85172.info = {"start":1720,"length":107,"line":61,"column":8,"endLine":63,"endColumn":9,"fileName":"program.ts","functionName":"cameraFollow","argumentNames":["this","char"]}
 
-function kodu_Program_cameraFollow__P136371_mk(s) {
+function kodu_Program_cameraFollow__P85172_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Program_cameraFollow__P136371, depth: s.depth + 1,
+        parent: s, fn: kodu_Program_cameraFollow__P85172, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -30431,7 +30505,7 @@ function kodu_Program_cameraFollow__P136371_mk(s) {
 
 
 
-function kodu_Character_destroy__P538174(s) {
+function kodu_Character_destroy__P85021(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30441,13 +30515,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___538339 = undefined;
+    s.physics___89492 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = (s.arg0).fields["destroyed"] = (true);
     r0 = s.arg0.fields["prog"];
     s.tmp_0 = r0;
@@ -30458,38 +30532,38 @@ switch (step) {
     r0 = (s.tmp_1).fields["done"] = (true);
   case 1:
   case 2:
-    s.tmp_0 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_0 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = "character:destroying";
     s.tmp_0.arg2 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.notify;
     s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = kodu_Character_getPhysics__P538181_mk(s);
+    s.tmp_0 = kodu_Character_getPhysics__P85028_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 415; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 414; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.physics___538339 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.physics___538339);
+    s.physics___89492 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.physics___89492);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = kodu_Physics_removeBody__P110396_mk(s);
-    s.tmp_0.arg0 = s.physics___538339;
+    s.tmp_0 = kodu_Physics_removeBody__P85149_mk(s);
+    s.tmp_0.arg0 = s.physics___89492;
     r0 = s.arg0.fields["body"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 416; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 415; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = (s.arg0).fields["body"] = (null);
   case 3:
   case 4:
-    s.tmp_0 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_0 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 417; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 416; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = (s.arg0).fields["kelpie"] = (null);
@@ -30497,36 +30571,36 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_1 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["feeling"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 418; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 417; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     r0 = (s.arg0).fields["feeling"] = (null);
   case 5:
   case 6:
-    s.tmp_0 = kodu_Stage_remove__P468692_mk(s);
+    s.tmp_0 = kodu_Stage_remove__P85054_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 419; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 418; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_destroy__P538174.info = {"start":2210,"length":602,"line":63,"column":8,"endLine":81,"endColumn":9,"fileName":"character.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Character_destroy__P85021.info = {"start":2210,"length":602,"line":63,"column":8,"endLine":81,"endColumn":9,"fileName":"character.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Character_destroy__P538174_mk(s) {
+function kodu_Character_destroy__P85021_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_destroy__P538174, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_destroy__P85021, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  physics___538339: undefined,
+  physics___89492: undefined,
   arg0: undefined,
 } }
 
@@ -30534,7 +30608,7 @@ function kodu_Character_destroy__P538174_mk(s) {
 
 
 
-function kodu_Kelpie_destroy__P110510(s) {
+function kodu_Kelpie_destroy__P85293(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30544,19 +30618,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___121116 = undefined;
+    s.scene___96447 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
     s.callLocIdx = 1614; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___121116 = (r0);
-    r0 = s.scene___121116.fields["allSprites"];
+    s.scene___96447 = (r0);
+    r0 = s.scene___96447.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg0);
     r0 = (s.arg0).fields["_image"] = (undefined);
@@ -30564,15 +30638,15 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_destroy__P110510.info = {"start":2951,"length":162,"line":102,"column":8,"endLine":106,"endColumn":9,"fileName":"kelpie.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Kelpie_destroy__P85293.info = {"start":2951,"length":162,"line":102,"column":8,"endLine":106,"endColumn":9,"fileName":"kelpie.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Kelpie_destroy__P110510_mk(s) {
+function kodu_Kelpie_destroy__P85293_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_destroy__P110510, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_destroy__P85293, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___121116: undefined,
+  scene___96447: undefined,
   arg0: undefined,
 } }
 
@@ -30580,7 +30654,7 @@ function kodu_Kelpie_destroy__P110510_mk(s) {
 
 
 
-function kodu_Physics_removeBody__P110396(s) {
+function kodu_Physics_removeBody__P85149(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30596,7 +30670,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Physics__C110391_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Physics__C85144_VT)) failedCast(r0);
     r0 = (s.arg1).fields["enabled"] = (false);
     r0 = (s.arg1).fields["kelpie"] = (null);
     r0 = s.arg0.fields["deadBodies"];
@@ -30606,12 +30680,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Physics_removeBody__P110396.info = {"start":1713,"length":147,"line":61,"column":8,"endLine":65,"endColumn":9,"fileName":"physics.ts","functionName":"removeBody","argumentNames":["this","body"]}
+kodu_Physics_removeBody__P85149.info = {"start":1713,"length":147,"line":61,"column":8,"endLine":65,"endColumn":9,"fileName":"physics.ts","functionName":"removeBody","argumentNames":["this","body"]}
 
-function kodu_Physics_removeBody__P110396_mk(s) {
+function kodu_Physics_removeBody__P85149_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Physics_removeBody__P110396, depth: s.depth + 1,
+        parent: s, fn: kodu_Physics_removeBody__P85149, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -30622,7 +30696,7 @@ function kodu_Physics_removeBody__P110396_mk(s) {
 
 
 
-function kodu_Character_getPhysics__P538181(s) {
+function kodu_Character_getPhysics__P85028(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30637,12 +30711,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Stage__C468688_v0_2_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Stage__C85045_v0_2_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = "physics";
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.get;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -30650,12 +30724,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_getPhysics__P538181.info = {"start":3863,"length":68,"line":119,"column":8,"endLine":119,"endColumn":76,"fileName":"character.ts","functionName":"getPhysics","argumentNames":["this"]}
+kodu_Character_getPhysics__P85028.info = {"start":3863,"length":68,"line":119,"column":8,"endLine":119,"endColumn":76,"fileName":"character.ts","functionName":"getPhysics","argumentNames":["this"]}
 
-function kodu_Character_getPhysics__P538181_mk(s) {
+function kodu_Character_getPhysics__P85028_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_getPhysics__P538181, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_getPhysics__P85028, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -30665,7 +30739,7 @@ function kodu_Character_getPhysics__P538181_mk(s) {
 
 
 
-function kodu_Stage_get__P468689(s) {
+function kodu_Stage_get__P85051(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30681,17 +30755,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_get__P468689.info = {"start":227,"length":53,"line":10,"column":8,"endLine":10,"endColumn":61,"fileName":"stage.ts","functionName":"get","argumentNames":["this","field"]}
+kodu_Stage_get__P85051.info = {"start":227,"length":53,"line":10,"column":8,"endLine":10,"endColumn":61,"fileName":"stage.ts","functionName":"get","argumentNames":["this","field"]}
 
-function kodu_Stage_get__P468689_mk(s) {
+function kodu_Stage_get__P85051_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_get__P468689, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_get__P85051, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -30701,7 +30775,7 @@ function kodu_Stage_get__P468689_mk(s) {
 
 
 
-function kodu_Program_switchPage__P136370(s) {
+function kodu_Program_switchPage__P85171(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30711,26 +30785,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.page___136829 = undefined;
+    s.page___93297 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Program__C136367_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Program__C85160_VT)) failedCast(r0);
     r0 = (s.arg0).fields["currPage"] = (s.arg1);
     r0 = s.arg0.fields["pages"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["currPage"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    s.page___136829 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.page___136829);
+    s.page___93297 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.page___93297);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = kodu_Page_reset__P136774_mk(s);
-    s.tmp_0.arg0 = s.page___136829;
-    s.callLocIdx = 1087; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = kodu_Page_reset__P93243_mk(s);
+    s.tmp_0.arg0 = s.page___93297;
+    s.callLocIdx = 1086; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
@@ -30740,16 +30814,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Program_switchPage__P136370.info = {"start":1489,"length":221,"line":52,"column":8,"endLine":59,"endColumn":9,"fileName":"program.ts","functionName":"switchPage","argumentNames":["this","n"]}
+kodu_Program_switchPage__P85171.info = {"start":1489,"length":221,"line":52,"column":8,"endLine":59,"endColumn":9,"fileName":"program.ts","functionName":"switchPage","argumentNames":["this","n"]}
 
-function kodu_Program_switchPage__P136370_mk(s) {
+function kodu_Program_switchPage__P85171_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Program_switchPage__P136370, depth: s.depth + 1,
+        parent: s, fn: kodu_Program_switchPage__P85171, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  page___136829: undefined,
+  page___93297: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -30758,7 +30832,7 @@ function kodu_Program_switchPage__P136370_mk(s) {
 
 
 
-function kodu_Page_reset__P136774(s) {
+function kodu_Page_reset__P93243(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30768,54 +30842,54 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___136908 = undefined;
-    s.unnamed16862___U1 = undefined;
-    s.unnamed16863___U2 = undefined;
+    s.rule___93375 = undefined;
+    s.unnamed1914___U1 = undefined;
+    s.unnamed1915___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Page__C136770_VT)) failedCast(r0);
-    s.rule___136908 = (undefined);
+    if (!checkSubtype(r0, kodu_Page__C93239_VT)) failedCast(r0);
+    s.rule___93375 = (undefined);
     r0 = s.arg0.fields["rules"];
-    s.unnamed16862___U1 = (r0);
-    s.unnamed16863___U2 = (0);
+    s.unnamed1914___U1 = (r0);
+    s.unnamed1915___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16863___U2;
-    r0 = pxsim_Array__length(s.unnamed16862___U1);
+    s.tmp_0 = r0 = s.unnamed1915___U2;
+    r0 = pxsim_Array__length(s.unnamed1914___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16862___U1, s.unnamed16863___U2);
-    s.rule___136908 = (r0);
-    s.tmp_2 = kodu_Rule_reset__P136627_mk(s);
-    s.tmp_2.arg0 = s.rule___136908;
-    s.callLocIdx = 1093; s.pc = 3; return s.tmp_2;
+    r0 = pxsim_Array__getAt(s.unnamed1914___U1, s.unnamed1915___U2);
+    s.rule___93375 = (r0);
+    s.tmp_2 = kodu_Rule_reset__P85187_mk(s);
+    s.tmp_2.arg0 = s.rule___93375;
+    s.callLocIdx = 1092; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed16863___U2 + 1);
-    s.unnamed16863___U2 = (r0);
+    r0 = (s.unnamed1915___U2 + 1);
+    s.unnamed1915___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16862___U1 = (undefined);
+    s.unnamed1914___U1 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Page_reset__P136774.info = {"start":2725,"length":115,"line":99,"column":8,"endLine":103,"endColumn":9,"fileName":"program.ts","functionName":"reset","argumentNames":["this"]}
+kodu_Page_reset__P93243.info = {"start":2725,"length":115,"line":99,"column":8,"endLine":103,"endColumn":9,"fileName":"program.ts","functionName":"reset","argumentNames":["this"]}
 
-function kodu_Page_reset__P136774_mk(s) {
+function kodu_Page_reset__P93243_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Page_reset__P136774, depth: s.depth + 1,
+        parent: s, fn: kodu_Page_reset__P93243, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  rule___136908: undefined,
-  unnamed16862___U1: undefined,
-  unnamed16863___U2: undefined,
+  rule___93375: undefined,
+  unnamed1914___U1: undefined,
+  unnamed1915___U2: undefined,
   arg0: undefined,
 } }
 
@@ -30823,7 +30897,7 @@ function kodu_Page_reset__P136774_mk(s) {
 
 
 
-function kodu_Rule_reset__P136627(s) {
+function kodu_Rule_reset__P85187(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30838,7 +30912,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Rule__C136623_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Rule__C85174_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_1 = r0;
@@ -30851,12 +30925,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Rule_reset__P136627.info = {"start":5408,"length":88,"line":173,"column":8,"endLine":176,"endColumn":9,"fileName":"program.ts","functionName":"reset","argumentNames":["this"]}
+kodu_Rule_reset__P85187.info = {"start":5408,"length":88,"line":173,"column":8,"endLine":176,"endColumn":9,"fileName":"program.ts","functionName":"reset","argumentNames":["this"]}
 
-function kodu_Rule_reset__P136627_mk(s) {
+function kodu_Rule_reset__P85187_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Rule_reset__P136627, depth: s.depth + 1,
+        parent: s, fn: kodu_Rule_reset__P85187, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30867,7 +30941,7 @@ function kodu_Rule_reset__P136627_mk(s) {
 
 
 
-function kodu_Character_queueImpulse__P538177(s) {
+function kodu_Character_queueImpulse__P85024(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30885,7 +30959,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "direction", s.arg1);
@@ -30898,12 +30972,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_queueImpulse__P538177.info = {"start":3295,"length":214,"line":100,"column":8,"endLine":106,"endColumn":9,"fileName":"character.ts","functionName":"queueImpulse","argumentNames":["this","direction","magnitude","type"]}
+kodu_Character_queueImpulse__P85024.info = {"start":3295,"length":214,"line":100,"column":8,"endLine":106,"endColumn":9,"fileName":"character.ts","functionName":"queueImpulse","argumentNames":["this","direction","magnitude","type"]}
 
-function kodu_Character_queueImpulse__P538177_mk(s) {
+function kodu_Character_queueImpulse__P85024_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_queueImpulse__P538177, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_queueImpulse__P85024, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30917,7 +30991,7 @@ function kodu_Character_queueImpulse__P538177_mk(s) {
 
 
 
-function helpers_arraySlice__P106721(s) {
+function helpers_arraySlice__P81384(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30927,9 +31001,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___125613 = undefined;
-    s.len___125615 = undefined;
-    s.i___125649 = undefined;
+    s.res___100997 = undefined;
+    s.len___100999 = undefined;
+    s.i___101033 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30937,9 +31011,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___125613 = (r0);
+    s.res___100997 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___125615 = (r0);
+    s.len___100999 = (r0);
     r0 = (s.arg1 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -30951,8 +31025,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_max__P106734_mk(s);
-    r0 = (s.len___125615 + s.arg1);
+    s.tmp_1 = Math_max__P81398_mk(s);
+    r0 = (s.len___100999 + s.arg1);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
     s.callLocIdx = 9; s.pc = 16; return s.tmp_1;
@@ -30962,11 +31036,11 @@ switch (step) {
   case 2:
   case 3:
   case 4:
-    r0 = (s.arg1 > s.len___125615);
+    r0 = (s.arg1 > s.len___100999);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = s.res___125613;
+    r0 = s.res___100997;
     { step = 15; continue; }
   case 5:
   case 6:
@@ -30974,57 +31048,57 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
-    s.arg2 = (s.len___125615);
+    s.arg2 = (s.len___100999);
     { 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___125615 + s.arg2);
+    r0 = (s.len___100999 + s.arg2);
     s.arg2 = (r0);
   case 8:
   case 9:
   case 10:
-    r0 = (s.arg2 > s.len___125615);
+    r0 = (s.arg2 > s.len___100999);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.arg2 = (s.len___125615);
+    s.arg2 = (s.len___100999);
   case 11:
   case 12:
-    s.i___125649 = (s.arg1);
+    s.i___101033 = (s.arg1);
   case 13:
-    r0 = (s.i___125649 < s.arg2);
+    r0 = (s.i___101033 < s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_1 = r0 = s.res___125613;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___125649);
+    s.tmp_1 = r0 = s.res___100997;
+    r0 = pxsim_Array__getAt(s.arg0, s.i___101033);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___125649 + 1);
-    s.i___125649 = (r0);
+    r0 = (s.i___101033 + 1);
+    s.i___101033 = (r0);
     { step = 13; continue; }
   case 14:
-    r0 = s.res___125613;
+    r0 = s.res___100997;
   case 15:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySlice__P106721.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__P81384.info = {"start":9027,"length":690,"line":303,"column":4,"endLine":328,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySlice","argumentNames":["arr","start","end"]}
 
-function helpers_arraySlice__P106721_mk(s) {
+function helpers_arraySlice__P81384_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySlice__P106721, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySlice__P81384, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  res___125613: undefined,
-  len___125615: undefined,
-  i___125649: undefined,
+  res___100997: undefined,
+  len___100999: undefined,
+  i___101033: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -31034,7 +31108,7 @@ function helpers_arraySlice__P106721_mk(s) {
 
 
 
-function controller_Button_isPressed__P108409(s) {
+function controller_Button_isPressed__P83185(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31049,17 +31123,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_isPressed__P108409.info = {"start":4129,"length":57,"line":132,"column":8,"endLine":134,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"isPressed","argumentNames":["this"]}
+controller_Button_isPressed__P83185.info = {"start":4129,"length":57,"line":132,"column":8,"endLine":134,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"isPressed","argumentNames":["this"]}
 
-function controller_Button_isPressed__P108409_mk(s) {
+function controller_Button_isPressed__P83185_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_isPressed__P108409, depth: s.depth + 1,
+        parent: s, fn: controller_Button_isPressed__P83185, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -31068,7 +31142,7 @@ function controller_Button_isPressed__P108409_mk(s) {
 
 
 
-function kodu_mkVec2__P110429(s) {
+function kodu_mkVec2__P85212(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31083,25 +31157,25 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C110414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Vec2__C85197_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Vec2_constructor__P110415_mk(s);
+    s.tmp_1 = kodu_Vec2_constructor__P85198_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
-    s.callLocIdx = 1168; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1167; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_mkVec2__P110429.info = {"start":2114,"length":81,"line":84,"column":4,"endLine":86,"endColumn":5,"fileName":"vec2.ts","functionName":"mkVec2","argumentNames":["x","y"]}
+kodu_mkVec2__P85212.info = {"start":2114,"length":81,"line":84,"column":4,"endLine":86,"endColumn":5,"fileName":"vec2.ts","functionName":"mkVec2","argumentNames":["x","y"]}
 
-function kodu_mkVec2__P110429_mk(s) {
+function kodu_mkVec2__P85212_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_mkVec2__P110429, depth: s.depth + 1,
+        parent: s, fn: kodu_mkVec2__P85212, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31113,7 +31187,7 @@ function kodu_mkVec2__P110429_mk(s) {
 
 
 
-function util_distSqBetweenSprites__P110100(s) {
+function util_distSqBetweenSprites__P84852(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31123,62 +31197,62 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dx___112914 = undefined;
-    s.dy___112920 = undefined;
+    s.dx___87751 = undefined;
+    s.dy___87757 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = kodu_Kelpie_x__P110489_mk(s);
+    s.tmp_1 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 120; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 119; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = kodu_Kelpie_x__P110489_mk(s);
+    s.tmp_3 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 121; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 120; s.pc = 2; return s.tmp_3;
   case 2:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dx___112914 = (r0);
-    s.tmp_1 = kodu_Kelpie_y__P110491_mk(s);
+    s.dx___87751 = (r0);
+    s.tmp_1 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 122; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 121; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = kodu_Kelpie_y__P110491_mk(s);
+    s.tmp_3 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 123; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 122; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dy___112920 = (r0);
-    r0 = (s.dx___112914 * s.dx___112914);
+    s.dy___87757 = (r0);
+    r0 = (s.dx___87751 * s.dx___87751);
     s.tmp_0 = r0;
-    r0 = (s.dy___112920 * s.dy___112920);
+    r0 = (s.dy___87757 * s.dy___87757);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
     return leave(s, r0)
   default: oops()
 } } }
-util_distSqBetweenSprites__P110100.info = {"start":4297,"length":182,"line":109,"column":4,"endLine":113,"endColumn":5,"fileName":"extras.ts","functionName":"distSqBetweenSprites","argumentNames":["a","b"]}
+util_distSqBetweenSprites__P84852.info = {"start":4297,"length":182,"line":109,"column":4,"endLine":113,"endColumn":5,"fileName":"extras.ts","functionName":"distSqBetweenSprites","argumentNames":["a","b"]}
 
-function util_distSqBetweenSprites__P110100_mk(s) {
+function util_distSqBetweenSprites__P84852_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: util_distSqBetweenSprites__P110100, depth: s.depth + 1,
+        parent: s, fn: util_distSqBetweenSprites__P84852, 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,
-  dx___112914: undefined,
-  dy___112920: undefined,
+  dx___87751: undefined,
+  dy___87757: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -31187,7 +31261,7 @@ function util_distSqBetweenSprites__P110100_mk(s) {
 
 
 
-function helpers_arrayMap__P106713(s) {
+function helpers_arrayMap__P81375(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31197,58 +31271,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___125814 = undefined;
-    s.len___125816 = undefined;
-    s.i___125819 = undefined;
+    s.res___101207 = undefined;
+    s.len___101209 = undefined;
+    s.i___101212 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___125814 = (r0);
+    s.res___101207 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___125816 = (r0);
-    s.i___125819 = (0);
+    s.len___101209 = (r0);
+    s.i___101212 = (0);
   case 1:
-    r0 = (s.i___125819 < s.len___125816);
+    r0 = (s.i___101212 < s.len___101209);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.res___125814;
+    s.tmp_1 = r0 = s.res___101207;
     s.tmp_3 = lambda_3_mk(s);
     s.tmp_3.argL = s.arg1;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___125819);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___101212);
     s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = s.i___125819;
+    s.tmp_3.arg1 = s.i___101212;
     setupLambda(s.tmp_3, s.tmp_3.argL);
     s.callLocIdx = 3; 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___125819 + 1);
-    s.i___125819 = (r0);
+    r0 = (s.i___101212 + 1);
+    s.i___101212 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.res___125814;
+    r0 = s.res___101207;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayMap__P106713.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__P81375.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__P106713_mk(s) {
+function helpers_arrayMap__P81375_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayMap__P106713, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayMap__P81375, 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___125814: undefined,
-  len___125816: undefined,
-  i___125819: undefined,
+  res___101207: undefined,
+  len___101209: undefined,
+  i___101212: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -31257,7 +31331,7 @@ function helpers_arrayMap__P106713_mk(s) {
 
 
 
-function helpers_arraySort__P106712(s) {
+function helpers_arraySort__P81374(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31289,10 +31363,10 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.arg1 = (inline__P127261);
+    s.arg1 = (inline__P102655);
   case 3:
   case 4:
-    s.tmp_0 = helpers_sortHelper__P110523_mk(s);
+    s.tmp_0 = helpers_sortHelper__P85306_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 2; s.pc = 5; return s.tmp_0;
@@ -31301,12 +31375,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySort__P106712.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__P81374.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__P106712_mk(s) {
+function helpers_arraySort__P81374_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySort__P106712, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySort__P81374, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31320,7 +31394,7 @@ function helpers_arraySort__P106712_mk(s) {
 
 
 
-function inline__P127261(s) {
+function inline__P102655(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31330,26 +31404,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.aIsUndef___127264 = undefined;
-    s.bIsUndef___127268 = undefined;
-    s.aIsNull___127279 = undefined;
-    s.bIsNull___127283 = undefined;
+    s.aIsUndef___102658 = undefined;
+    s.bIsUndef___102662 = undefined;
+    s.aIsNull___102673 = undefined;
+    s.bIsNull___102677 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = (s.arg0 === undefined);
-    s.aIsUndef___127264 = (r0);
+    s.aIsUndef___102658 = (r0);
     r0 = (s.arg1 === undefined);
-    s.bIsUndef___127268 = (r0);
-    s.tmp_0 = r0 = s.aIsUndef___127264;
+    s.bIsUndef___102662 = (r0);
+    s.tmp_0 = r0 = s.aIsUndef___102658;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.bIsUndef___127268;
+    r0 = s.bIsUndef___102662;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -31359,13 +31433,13 @@ switch (step) {
     { step = 17; continue; }
     { step = 8; continue; }
   case 3:
-    r0 = pxsim_numops_toBoolDecr(s.aIsUndef___127264);
+    r0 = pxsim_numops_toBoolDecr(s.aIsUndef___102658);
     if (!r0) { step = 4; continue; }
     r0 = 1;
     { step = 17; continue; }
     { step = 7; continue; }
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.bIsUndef___127268);
+    r0 = pxsim_numops_toBoolDecr(s.bIsUndef___102662);
     if (!r0) { step = 5; continue; }
     r0 = -1;
     { step = 17; continue; }
@@ -31374,16 +31448,16 @@ switch (step) {
   case 7:
   case 8:
     r0 = (s.arg0 === null);
-    s.aIsNull___127279 = (r0);
+    s.aIsNull___102673 = (r0);
     r0 = (s.arg1 === null);
-    s.bIsNull___127283 = (r0);
-    s.tmp_0 = r0 = s.aIsNull___127279;
+    s.bIsNull___102677 = (r0);
+    s.tmp_0 = r0 = s.aIsNull___102673;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 9; continue; }
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 9:
-    r0 = s.bIsNull___127283;
+    r0 = s.bIsNull___102677;
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -31393,13 +31467,13 @@ switch (step) {
     { step = 17; continue; }
     { step = 16; continue; }
   case 11:
-    r0 = pxsim_numops_toBoolDecr(s.aIsNull___127279);
+    r0 = pxsim_numops_toBoolDecr(s.aIsNull___102673);
     if (!r0) { step = 12; continue; }
     r0 = 1;
     { step = 17; continue; }
     { step = 15; continue; }
   case 12:
-    r0 = pxsim_numops_toBoolDecr(s.bIsNull___127283);
+    r0 = pxsim_numops_toBoolDecr(s.bIsNull___102677);
     if (!r0) { step = 13; continue; }
     r0 = -1;
     { step = 17; continue; }
@@ -31438,12 +31512,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127261.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__P102655.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__P127261_mk(s) {
+function inline__P102655_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127261, depth: s.depth + 1,
+        parent: s, fn: inline__P102655, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31453,10 +31527,10 @@ function inline__P127261_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  aIsUndef___127264: undefined,
-  bIsUndef___127268: undefined,
-  aIsNull___127279: undefined,
-  bIsNull___127283: undefined,
+  aIsUndef___102658: undefined,
+  bIsUndef___102662: undefined,
+  aIsNull___102673: undefined,
+  bIsNull___102677: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -31465,7 +31539,7 @@ function inline__P127261_mk(s) {
 
 
 
-function helpers_sortHelper__P110523(s) {
+function helpers_sortHelper__P85306(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31475,9 +31549,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___127318 = undefined;
-    s.i___127321 = undefined;
-    s.j___127327 = undefined;
+    s.len___102712 = undefined;
+    s.i___102715 = undefined;
+    s.j___102721 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -31505,28 +31579,28 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_Array__length(s.arg0);
-    s.len___127318 = (r0);
-    s.i___127321 = (0);
+    s.len___102712 = (r0);
+    s.i___102715 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___127321;
-    r0 = (s.len___127318 - 1);
+    s.tmp_1 = r0 = s.i___102715;
+    r0 = (s.len___102712 - 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___127321 + 1);
-    s.j___127327 = (r0);
+    r0 = (s.i___102715 + 1);
+    s.j___102721 = (r0);
   case 6:
-    r0 = (s.j___127327 < s.len___127318);
+    r0 = (s.j___102721 < s.len___102712);
     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___127321);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___102715);
     s.tmp_3.arg0 = r0;
-    r0 = pxsim_Array__getAt(s.arg0, s.j___127327);
+    r0 = pxsim_Array__getAt(s.arg0, s.j___102721);
     s.tmp_3.arg1 = r0;
     setupLambda(s.tmp_3, s.tmp_3.argL);
     s.callLocIdx = 0; s.pc = 12; return s.tmp_3;
@@ -31537,21 +31611,21 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = helpers_swap__P110522_mk(s);
+    s.tmp_4 = helpers_swap__P85305_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.tmp_4.arg1 = s.i___127321;
-    s.tmp_4.arg2 = s.j___127327;
+    s.tmp_4.arg1 = s.i___102715;
+    s.tmp_4.arg2 = s.j___102721;
     s.callLocIdx = 1; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = (s.j___127327 + 1);
-    s.j___127327 = (r0);
+    r0 = (s.j___102721 + 1);
+    s.j___102721 = (r0);
     { step = 6; continue; }
   case 9:
-    r0 = (s.i___127321 + 1);
-    s.i___127321 = (r0);
+    r0 = (s.i___102715 + 1);
+    s.i___102715 = (r0);
     { step = 5; continue; }
   case 10:
     r0 = s.arg0;
@@ -31559,21 +31633,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_sortHelper__P110523.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__P85306.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__P110523_mk(s) {
+function helpers_sortHelper__P85306_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_sortHelper__P110523, depth: s.depth + 1,
+        parent: s, fn: helpers_sortHelper__P85306, 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___127318: undefined,
-  i___127321: undefined,
-  j___127327: undefined,
+  len___102712: undefined,
+  i___102715: undefined,
+  j___102721: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -31582,7 +31656,7 @@ function helpers_sortHelper__P110523_mk(s) {
 
 
 
-function helpers_swap__P110522(s) {
+function helpers_swap__P85305(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31592,7 +31666,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.temp___127356 = undefined;
+    s.temp___102750 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -31600,28 +31674,28 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__getAt(s.arg0, s.arg1);
-    s.temp___127356 = (r0);
+    s.temp___102750 = (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___127356);
+    r0 = pxsim_Array_.setAt(s.arg0, s.arg2, s.temp___102750);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_swap__P110522.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__P85305.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__P110522_mk(s) {
+function helpers_swap__P85305_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_swap__P110522, depth: s.depth + 1,
+        parent: s, fn: helpers_swap__P85305, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  temp___127356: undefined,
+  temp___102750: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -31631,7 +31705,7 @@ function helpers_swap__P110522_mk(s) {
 
 
 
-function kodu_Rule_prog__P136624(s) {
+function kodu_Rule_prog__P85183(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31646,19 +31720,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Rule__C136623_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Rule__C85174_VT)) failedCast(r0);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Rule_prog__P136624.info = {"start":3108,"length":46,"line":116,"column":8,"endLine":116,"endColumn":54,"fileName":"program.ts","functionName":"prog","argumentNames":["this"]}
-kodu_Rule_prog__P136624.isGetter = true;
+kodu_Rule_prog__P85183.info = {"start":3108,"length":46,"line":116,"column":8,"endLine":116,"endColumn":54,"fileName":"program.ts","functionName":"prog","argumentNames":["this"]}
+kodu_Rule_prog__P85183.isGetter = true;
 
-function kodu_Rule_prog__P136624_mk(s) {
+function kodu_Rule_prog__P85183_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Rule_prog__P136624, depth: s.depth + 1,
+        parent: s, fn: kodu_Rule_prog__P85183, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -31667,7 +31741,7 @@ function kodu_Rule_prog__P136624_mk(s) {
 
 
 
-function helpers_arrayFilter__P106717(s) {
+function helpers_arrayFilter__P81379(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31677,31 +31751,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___127370 = undefined;
-    s.len___127372 = undefined;
-    s.i___127375 = undefined;
-    s.v___127380 = undefined;
+    s.res___102764 = undefined;
+    s.len___102766 = undefined;
+    s.i___102769 = undefined;
+    s.v___102774 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___127370 = (r0);
+    s.res___102764 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___127372 = (r0);
-    s.i___127375 = (0);
+    s.len___102766 = (r0);
+    s.i___102769 = (0);
   case 1:
-    r0 = (s.i___127375 < s.len___127372);
+    r0 = (s.i___102769 < s.len___102766);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.arg0, s.i___127375);
-    s.v___127380 = (r0);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___102769);
+    s.v___102774 = (r0);
     s.tmp_1 = lambda_3_mk(s);
     s.tmp_1.argL = s.arg1;
-    s.tmp_1.arg0 = s.v___127380;
-    s.tmp_1.arg1 = s.i___127375;
+    s.tmp_1.arg0 = s.v___102774;
+    s.tmp_1.arg1 = s.i___102769;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 6; s.pc = 5; return s.tmp_1;
   case 5:
@@ -31709,30 +31783,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___127370, s.v___127380);
+    r0 = pxsim_Array__push(s.res___102764, s.v___102774);
   case 2:
   case 3:
-    r0 = (s.i___127375 + 1);
-    s.i___127375 = (r0);
+    r0 = (s.i___102769 + 1);
+    s.i___102769 = (r0);
     { step = 1; continue; }
   case 4:
-    r0 = s.res___127370;
+    r0 = s.res___102764;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayFilter__P106717.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__P81379.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__P106717_mk(s) {
+function helpers_arrayFilter__P81379_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayFilter__P106717, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayFilter__P81379, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  res___127370: undefined,
-  len___127372: undefined,
-  i___127375: undefined,
-  v___127380: undefined,
+  res___102764: undefined,
+  len___102766: undefined,
+  i___102769: undefined,
+  v___102774: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -31741,7 +31815,7 @@ function helpers_arrayFilter__P106717_mk(s) {
 
 
 
-function game_eventContext__P109032(s) {
+function game_eventContext__P83811(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31751,21 +31825,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_init__P110879_mk(s);
+    s.tmp_0 = game_init__P85718_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 860; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 864; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals._scene___110871.fields["eventContext"];
+    r0 = globals._scene___85710.fields["eventContext"];
     return leave(s, r0)
   default: oops()
 } } }
-game_eventContext__P109032.info = {"start":1084,"length":112,"line":40,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"eventContext","argumentNames":[]}
+game_eventContext__P83811.info = {"start":1084,"length":112,"line":40,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"eventContext","argumentNames":[]}
 
-function game_eventContext__P109032_mk(s) {
+function game_eventContext__P83811_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_eventContext__P109032, depth: s.depth + 1,
+        parent: s, fn: game_eventContext__P83811, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -31774,7 +31848,7 @@ function game_eventContext__P109032_mk(s) {
 
 
 
-function controller_pauseUntilAnyButtonIsPressed__P108450(s) {
+function controller_pauseUntilAnyButtonIsPressed__P83226(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31794,12 +31868,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_pauseUntilAnyButtonIsPressed__P108450.info = {"start":19144,"length":96,"line":583,"column":4,"endLine":585,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"pauseUntilAnyButtonIsPressed","argumentNames":[]}
+controller_pauseUntilAnyButtonIsPressed__P83226.info = {"start":19144,"length":96,"line":583,"column":4,"endLine":585,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"pauseUntilAnyButtonIsPressed","argumentNames":[]}
 
-function controller_pauseUntilAnyButtonIsPressed__P108450_mk(s) {
+function controller_pauseUntilAnyButtonIsPressed__P83226_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_pauseUntilAnyButtonIsPressed__P108450, depth: s.depth + 1,
+        parent: s, fn: controller_pauseUntilAnyButtonIsPressed__P83226, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -31807,7 +31881,7 @@ function controller_pauseUntilAnyButtonIsPressed__P108450_mk(s) {
 
 
 
-function game_setWaitAnyButton__P109030(s) {
+function game_setWaitAnyButton__P83809(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31821,17 +31895,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    globals.__waitAnyButton___110875 = (s.arg0);
+    globals.__waitAnyButton___85714 = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_setWaitAnyButton__P109030.info = {"start":878,"length":83,"line":31,"column":4,"endLine":33,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"setWaitAnyButton","argumentNames":["f"]}
+game_setWaitAnyButton__P83809.info = {"start":878,"length":83,"line":31,"column":4,"endLine":33,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"setWaitAnyButton","argumentNames":["f"]}
 
-function game_setWaitAnyButton__P109030_mk(s) {
+function game_setWaitAnyButton__P83809_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_setWaitAnyButton__P109030, depth: s.depth + 1,
+        parent: s, fn: game_setWaitAnyButton__P83809, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -31840,7 +31914,7 @@ function game_setWaitAnyButton__P109030_mk(s) {
 
 
 
-function Math_abs__P106732(s) {
+function Math_abs__P81396(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31869,12 +31943,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_abs__P106732.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__P81396.info = {"start":15630,"length":77,"line":524,"column":4,"endLine":526,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"abs","argumentNames":["x"]}
 
-function Math_abs__P106732_mk(s) {
+function Math_abs__P81396_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_abs__P106732, depth: s.depth + 1,
+        parent: s, fn: Math_abs__P81396, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31885,7 +31959,7 @@ function Math_abs__P106732_mk(s) {
 
 
 
-function Math_sign__P106733(s) {
+function Math_sign__P81397(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31920,12 +31994,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_sign__P106733.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__P81397.info = {"start":15865,"length":125,"line":532,"column":4,"endLine":536,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"sign","argumentNames":["x"]}
 
-function Math_sign__P106733_mk(s) {
+function Math_sign__P81397_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_sign__P106733, depth: s.depth + 1,
+        parent: s, fn: Math_sign__P81397, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31936,7 +32010,7 @@ function Math_sign__P106733_mk(s) {
 
 
 
-function texteffects_TextEffect_constructor__P109330(s) {
+function texteffects_TextEffect_constructor__P84109(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31952,18 +32026,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, texteffects_TextEffect__C109328_VT)) failedCast(r0);
+    if (!checkSubtype(r0, texteffects_TextEffect__C84107_VT)) failedCast(r0);
     r0 = (s.arg0).fields["getState"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-texteffects_TextEffect_constructor__P109330.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"]}
+texteffects_TextEffect_constructor__P84109.info = {"start":657,"length":133,"line":25,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["this","getState"]}
 
-function texteffects_TextEffect_constructor__P109330_mk(s) {
+function texteffects_TextEffect_constructor__P84109_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: texteffects_TextEffect_constructor__P109330, depth: s.depth + 1,
+        parent: s, fn: texteffects_TextEffect_constructor__P84109, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -31973,7 +32047,7 @@ function texteffects_TextEffect_constructor__P109330_mk(s) {
 
 
 
-function Math_FastRandom_constructor__P109085(s) {
+function Math_FastRandom_constructor__P83864(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31989,7 +32063,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C109083_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C83862_VT)) failedCast(r0);
     r0 = (s.arg1 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -32004,12 +32078,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_constructor__P109085.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"]}
+Math_FastRandom_constructor__P83864.info = {"start":1425,"length":175,"line":44,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"inline","argumentNames":["this","seed"]}
 
-function Math_FastRandom_constructor__P109085_mk(s) {
+function Math_FastRandom_constructor__P83864_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_constructor__P109085, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_constructor__P83864, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -32020,7 +32094,7 @@ function Math_FastRandom_constructor__P109085_mk(s) {
 
 
 
-function control_ramSize__P106944(s) {
+function control_ramSize__P81608(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32045,12 +32119,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_ramSize__P106944.info = {"start":5058,"length":100,"line":172,"column":4,"endLine":174,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
+control_ramSize__P81608.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__P106944_mk(s) {
+function control_ramSize__P81608_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_ramSize__P106944, depth: s.depth + 1,
+        parent: s, fn: control_ramSize__P81608, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32060,7 +32134,7 @@ function control_ramSize__P106944_mk(s) {
 
 
 
-function control__ramSize__P110560(s) {
+function control__ramSize__P85344(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32074,12 +32148,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control__ramSize__P110560.info = {"start":4938,"length":60,"line":167,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
+control__ramSize__P85344.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__P110560_mk(s) {
+function control__ramSize__P85344_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control__ramSize__P110560, depth: s.depth + 1,
+        parent: s, fn: control__ramSize__P85344, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -32087,7 +32161,7 @@ function control__ramSize__P110560_mk(s) {
 
 
 
-function game_consoleOverlay_listener__P111204(s) {
+function game_consoleOverlay_listener__P86043(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32102,7 +32176,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___111169);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___86008);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -32122,39 +32196,39 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_4 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_5 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_6 = helpers_stringSplit__P106726_mk(s);
+    s.tmp_4 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_5 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_6 = helpers_stringSplit__P81390_mk(s);
     s.tmp_6.arg0 = s.arg1;
     s.tmp_6.arg1 = "\n";
     s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1072; s.pc = 10; return s.tmp_6;
+    s.callLocIdx = 1076; s.pc = 10; return s.tmp_6;
   case 10:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = inline__P127465;
-    s.callLocIdx = 1073; s.pc = 9; return s.tmp_5;
+    s.tmp_5.arg1 = inline__P102859;
+    s.callLocIdx = 1077; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = inline__P127470;
-    s.callLocIdx = 1075; s.pc = 8; return s.tmp_4;
+    s.tmp_4.arg1 = inline__P102864;
+    s.callLocIdx = 1079; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array__length(globals.consoleStrings___111169);
+    r0 = pxsim_Array__length(globals.consoleStrings___86008);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > globals.consoleLines___111182);
+    r0 = (s.tmp_1 > globals.consoleLines___86021);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = helpers_arraySplice__P106707_mk(s);
-    s.tmp_2.arg0 = globals.consoleStrings___111169;
+    s.tmp_2 = helpers_arraySplice__P81369_mk(s);
+    s.tmp_2.arg0 = globals.consoleStrings___86008;
     s.tmp_2.arg1 = 0;
-    r0 = pxsim_Array__length(globals.consoleStrings___111169);
+    r0 = pxsim_Array__length(globals.consoleStrings___86008);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 - globals.consoleLines___111182);
+    r0 = (s.tmp_3 - globals.consoleLines___86021);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 1076; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 1080; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
   case 5:
@@ -32164,12 +32238,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_listener__P111204.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"]}
+game_consoleOverlay_listener__P86043.info = {"start":787,"length":571,"line":26,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"listener","argumentNames":["priority","text"]}
 
-function game_consoleOverlay_listener__P111204_mk(s) {
+function game_consoleOverlay_listener__P86043_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_listener__P111204, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_listener__P86043, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32186,7 +32260,7 @@ function game_consoleOverlay_listener__P111204_mk(s) {
 
 
 
-function inline__P127465(s) {
+function inline__P102859(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32210,12 +32284,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127465.info = {"start":985,"length":14,"line":32,"column":20,"endLine":32,"endColumn":34,"fileName":"pxt_modules/game---hw/console.ts","functionName":"inline","argumentNames":["line"]}
+inline__P102859.info = {"start":985,"length":14,"line":32,"column":20,"endLine":32,"endColumn":34,"fileName":"pxt_modules/game/console.ts","functionName":"inline","argumentNames":["line"]}
 
-function inline__P127465_mk(s) {
+function inline__P102859_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127465, depth: s.depth + 1,
+        parent: s, fn: inline__P102859, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32227,7 +32301,7 @@ function inline__P127465_mk(s) {
 
 
 
-function inline__P127470(s) {
+function inline__P102864(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32237,45 +32311,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.j___127472 = undefined;
+    s.j___102866 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.j___127472 = (0);
+    s.j___102866 = (0);
   case 1:
-    s.tmp_1 = r0 = s.j___127472;
+    s.tmp_1 = r0 = s.j___102866;
     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___111169;
-    s.tmp_5 = helpers_stringSlice__P106724_mk(s);
+    s.tmp_3 = r0 = globals.consoleStrings___86008;
+    s.tmp_5 = helpers_stringSlice__P81388_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.tmp_5.arg1 = s.j___127472;
-    r0 = (s.j___127472 + globals.consoleColumns___111192);
+    s.tmp_5.arg1 = s.j___102866;
+    r0 = (s.j___102866 + globals.consoleColumns___86031);
     s.tmp_5.arg2 = r0;
-    s.callLocIdx = 1074; s.pc = 3; return s.tmp_5;
+    s.callLocIdx = 1078; 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___127472 + globals.consoleColumns___111192);
-    s.j___127472 = (r0);
+    r0 = (s.j___102866 + globals.consoleColumns___86031);
+    s.j___102866 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127470.info = {"start":1022,"length":189,"line":33,"column":21,"endLine":37,"endColumn":13,"fileName":"pxt_modules/game---hw/console.ts","functionName":"inline","argumentNames":["line"]}
+inline__P102864.info = {"start":1022,"length":189,"line":33,"column":21,"endLine":37,"endColumn":13,"fileName":"pxt_modules/game/console.ts","functionName":"inline","argumentNames":["line"]}
 
-function inline__P127470_mk(s) {
+function inline__P102864_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127470, depth: s.depth + 1,
+        parent: s, fn: inline__P102864, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32283,7 +32357,7 @@ function inline__P127470_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  j___127472: undefined,
+  j___102866: undefined,
   arg0: undefined,
 } }
 
@@ -32291,7 +32365,7 @@ function inline__P127470_mk(s) {
 
 
 
-function console_addListener__P106981(s) {
+function console_addListener__P81645(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32314,7 +32388,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array_.indexOf(globals.listeners___110575, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals.listeners___85359, s.arg0, undefined);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > -1);
   case 2:
@@ -32325,18 +32399,18 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    r0 = pxsim_Array__push(globals.listeners___110575, s.arg0);
+    r0 = pxsim_Array__push(globals.listeners___85359, s.arg0);
   case 5:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-console_addListener__P106981.info = {"start":3558,"length":197,"line":121,"column":4,"endLine":124,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"addListener","argumentNames":["listener"]}
+console_addListener__P81645.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__P106981_mk(s) {
+function console_addListener__P81645_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_addListener__P106981, depth: s.depth + 1,
+        parent: s, fn: console_addListener__P81645, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32349,7 +32423,7 @@ function console_addListener__P106981_mk(s) {
 
 
 
-function inline__P110574(s) {
+function inline__P85358(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32369,12 +32443,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P110574.info = {"start":534,"length":85,"line":25,"column":8,"endLine":25,"endColumn":93,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["priority","text"]}
+inline__P85358.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__P110574_mk(s) {
+function inline__P85358_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P110574, depth: s.depth + 1,
+        parent: s, fn: inline__P85358, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -32384,197 +32458,7 @@ function inline__P110574_mk(s) {
 
 
 
-function _screen_internal_createScreen__P108302(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___127525 = undefined;
-    s.status___127529 = undefined;
-    r0 = pxsim.image.create(160, 120);
-    s.img___127525 = (r0);
-    r0 = undefined;
-    r0 = pxsim.image.create(160, 8);
-    s.status___127529 = (r0);
-    r0 = undefined;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127535);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.img___127525);
-    s.tmp_1 = control___screen_setupUpdate__P108260_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 149; s.pc = 1; return s.tmp_1;
-  case 1:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127540);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.status___127529);
-    globals.control_EventContext_onStats___106996 = (s.tmp_0);
-    r0 = s.img___127525;
-    return leave(s, r0)
-  default: oops()
-} } }
-_screen_internal_createScreen__P108302.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__P108302_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: _screen_internal_createScreen__P108302, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  img___127525: undefined,
-  status___127529: undefined,
-} }
-
-
-
-
-
-function inline__P127535(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__P127535.info = {"start":1204,"length":23,"line":35,"column":37,"endLine":35,"endColumn":60,"fileName":"pxt_modules/screen---st7735/targetoverrides.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P127535_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P127535, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-} }
-
-
-
-
-
-function inline__P127540(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_ImageMethods.fill(s.caps[0], 0);
-    s.tmp_0 = helpers_imagePrint__P108256_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___108246;
-    s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 150; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    r0 = pxsim_pxtcore.updateStats(s.arg0);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P127540.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 inline__P127540_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P127540, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function _screen_internal_setupScreenStatusBar__P110660(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 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-_screen_internal_setupScreenStatusBar__P110660.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 _screen_internal_setupScreenStatusBar__P110660_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: _screen_internal_setupScreenStatusBar__P110660, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function _screen_internal_updateScreenStatusBar__P110659(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 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-_screen_internal_updateScreenStatusBar__P110659.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 _screen_internal_updateScreenStatusBar__P110659_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: _screen_internal_updateScreenStatusBar__P110659, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function control___screen_setupUpdate__P108260(s) {
+function scene_systemMenu_register__P83909(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32584,57 +32468,16 @@ 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___110641 = (true);
-    globals.__update___110639 = (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 = 143; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-control___screen_setupUpdate__P108260.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 control___screen_setupUpdate__P108260_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: control___screen_setupUpdate__P108260, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function scene_systemMenu_register__P109130(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.instance___111123);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___85962);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_0 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_0.arg0 = globals.menu___108380;
+    s.tmp_0 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_0.arg0 = globals.menu___83156;
     s.tmp_0.arg1 = 2049;
-    s.tmp_0.arg2 = scene_systemMenu_showSystemMenu__P109131;
-    s.callLocIdx = 1059; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg2 = scene_systemMenu_showSystemMenu__P83910;
+    s.callLocIdx = 1063; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 3:
@@ -32642,12 +32485,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_register__P109130.info = {"start":12793,"length":193,"line":382,"column":4,"endLine":386,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"register","argumentNames":[]}
+scene_systemMenu_register__P83909.info = {"start":12793,"length":193,"line":382,"column":4,"endLine":386,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"register","argumentNames":[]}
 
-function scene_systemMenu_register__P109130_mk(s) {
+function scene_systemMenu_register__P83909_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_register__P109130, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_register__P83909, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -32656,7 +32499,7 @@ function scene_systemMenu_register__P109130_mk(s) {
 
 
 
-function scene_systemMenu_showSystemMenu__P109131(s) {
+function scene_systemMenu_showSystemMenu__P83910(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32666,28 +32509,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___111123);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___85962);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_0 = game_pushScene__P109033_mk(s);
-    s.callLocIdx = 1060; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P83812_mk(s);
+    s.callLocIdx = 1064; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_PauseMenu__C109119_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_PauseMenu__C83898_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_PauseMenu_constructor__P109120_mk(s);
+    s.tmp_1 = scene_systemMenu_PauseMenu_constructor__P83899_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = scene_systemMenu_buildOptionList__P109127;
+    s.tmp_1.arg1 = scene_systemMenu_buildOptionList__P83906;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1061; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1065; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    globals.instance___111123 = (s.tmp_0);
-    s.tmp_0 = scene_systemMenu_PauseMenu_show__P109121_mk(s);
-    s.tmp_0.arg0 = globals.instance___111123;
-    s.callLocIdx = 1062; s.pc = 6; return s.tmp_0;
+    globals.instance___85962 = (s.tmp_0);
+    s.tmp_0 = scene_systemMenu_PauseMenu_show__P83900_mk(s);
+    s.tmp_0.arg0 = globals.instance___85962;
+    s.callLocIdx = 1066; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -32695,12 +32538,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_showSystemMenu__P109131.info = {"start":12992,"length":172,"line":388,"column":4,"endLine":393,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"showSystemMenu","argumentNames":[]}
+scene_systemMenu_showSystemMenu__P83910.info = {"start":12992,"length":172,"line":388,"column":4,"endLine":393,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"showSystemMenu","argumentNames":[]}
 
-function scene_systemMenu_showSystemMenu__P109131_mk(s) {
+function scene_systemMenu_showSystemMenu__P83910_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_showSystemMenu__P109131, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_showSystemMenu__P83910, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32710,7 +32553,7 @@ function scene_systemMenu_showSystemMenu__P109131_mk(s) {
 
 
 
-function scene_systemMenu_buildOptionList__P109127(s) {
+function scene_systemMenu_buildOptionList__P83906(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32720,136 +32563,136 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.options___128253 = undefined;
+    s.options___103605 = undefined;
     r0 = pxsim_Array__mk();
-    s.options___128253 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C109111_VT);
+    s.options___103605 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.VOLUME_DOWN_ICON___109141;
-    s.tmp_1.arg2 = inline__P128261;
-    s.tmp_1.arg3 = scene_systemMenu_volumeDown__P111129;
-    s.callLocIdx = 1042; s.pc = 5; return s.tmp_1;
+    s.tmp_1.arg1 = globals.VOLUME_DOWN_ICON___83920;
+    s.tmp_1.arg2 = inline__P103613;
+    s.tmp_1.arg3 = scene_systemMenu_volumeDown__P85968;
+    s.callLocIdx = 1046; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C109111_VT);
+    r0 = pxsim_Array__push(s.options___103605, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.VOLUME_UP_ICON___109138;
-    s.tmp_1.arg2 = inline__P128275;
-    s.tmp_1.arg3 = scene_systemMenu_volumeUp__P111128;
-    s.callLocIdx = 1044; s.pc = 6; return s.tmp_1;
+    s.tmp_1.arg1 = globals.VOLUME_UP_ICON___83917;
+    s.tmp_1.arg2 = inline__P103627;
+    s.tmp_1.arg3 = scene_systemMenu_volumeUp__P85967;
+    s.callLocIdx = 1048; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_0);
+    r0 = pxsim_Array__push(s.options___103605, 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__C109111_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_2 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = globals.BRIGHTNESS_DOWN_ICON___109139;
-    s.tmp_2.arg2 = inline__P128290;
-    s.tmp_2.arg3 = scene_systemMenu_brightnessDown__P111131;
-    s.callLocIdx = 1047; s.pc = 7; return s.tmp_2;
+    s.tmp_2.arg1 = globals.BRIGHTNESS_DOWN_ICON___83918;
+    s.tmp_2.arg2 = inline__P103642;
+    s.tmp_2.arg3 = scene_systemMenu_brightnessDown__P85970;
+    s.callLocIdx = 1051; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_1);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C109111_VT);
+    r0 = pxsim_Array__push(s.options___103605, s.tmp_1);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.BRIGHTNESS_UP_ICON___109144;
-    s.tmp_1.arg2 = inline__P128305;
-    s.tmp_1.arg3 = scene_systemMenu_brightnessUp__P111130;
-    s.callLocIdx = 1049; s.pc = 8; return s.tmp_1;
+    s.tmp_1.arg1 = globals.BRIGHTNESS_UP_ICON___83923;
+    s.tmp_1.arg2 = inline__P103657;
+    s.tmp_1.arg3 = scene_systemMenu_brightnessUp__P85969;
+    s.callLocIdx = 1053; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_0);
+    r0 = pxsim_Array__push(s.options___103605, s.tmp_0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C109111_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.STATS_ICON___109145;
-    s.tmp_1.arg2 = inline__P128320;
-    s.tmp_1.arg3 = scene_systemMenu_toggleStats__P111133;
-    s.callLocIdx = 1050; s.pc = 9; return s.tmp_1;
+    s.tmp_1.arg1 = globals.STATS_ICON___83924;
+    s.tmp_1.arg2 = inline__P103672;
+    s.tmp_1.arg3 = scene_systemMenu_toggleStats__P85972;
+    s.callLocIdx = 1054; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C109111_VT);
+    r0 = pxsim_Array__push(s.options___103605, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.CONSOLE_ICON___109143;
-    s.tmp_1.arg2 = inline__P128329;
-    s.tmp_1.arg3 = scene_systemMenu_toggleConsole__P111134;
-    s.callLocIdx = 1052; s.pc = 10; return s.tmp_1;
+    s.tmp_1.arg1 = globals.CONSOLE_ICON___83922;
+    s.tmp_1.arg2 = inline__P103681;
+    s.tmp_1.arg3 = scene_systemMenu_toggleConsole__P85973;
+    s.callLocIdx = 1056; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C109111_VT);
+    r0 = pxsim_Array__push(s.options___103605, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.SLEEP_ICON___109142;
-    s.tmp_1.arg2 = inline__P128338;
-    s.tmp_1.arg3 = scene_systemMenu_sleep__P111135;
-    s.callLocIdx = 1053; s.pc = 11; return s.tmp_1;
+    s.tmp_1.arg1 = globals.SLEEP_ICON___83921;
+    s.tmp_1.arg2 = inline__P103690;
+    s.tmp_1.arg3 = scene_systemMenu_sleep__P85974;
+    s.callLocIdx = 1057; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(globals.customMenuOptions___111124);
+    r0 = pxsim_Array__push(s.options___103605, s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(globals.customMenuOptions___85963);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = helpers_arrayConcat__P106720_mk(s);
-    s.tmp_0.arg0 = s.options___128253;
-    s.tmp_0.arg1 = globals.customMenuOptions___111124;
-    s.callLocIdx = 1054; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = helpers_arrayConcat__P81382_mk(s);
+    s.tmp_0.arg0 = s.options___103605;
+    s.tmp_0.arg1 = globals.customMenuOptions___85963;
+    s.callLocIdx = 1058; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.options___128253 = (r0);
+    s.options___103605 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C109111_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C83890_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P109112_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P83891_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.CLOSE_MENU_ICON___109140;
-    s.tmp_1.arg2 = inline__P128351;
-    s.tmp_1.arg3 = scene_systemMenu_closeMenu__P109126;
-    s.callLocIdx = 1055; s.pc = 13; return s.tmp_1;
+    s.tmp_1.arg1 = globals.CLOSE_MENU_ICON___83919;
+    s.tmp_1.arg2 = inline__P103703;
+    s.tmp_1.arg3 = scene_systemMenu_closeMenu__P83905;
+    s.callLocIdx = 1059; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___128253, s.tmp_0);
-    r0 = s.options___128253;
+    r0 = pxsim_Array__push(s.options___103605, s.tmp_0);
+    r0 = s.options___103605;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_buildOptionList__P109127.info = {"start":10499,"length":1149,"line":334,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"buildOptionList","argumentNames":[]}
+scene_systemMenu_buildOptionList__P83906.info = {"start":10499,"length":1149,"line":334,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"buildOptionList","argumentNames":[]}
 
-function scene_systemMenu_buildOptionList__P109127_mk(s) {
+function scene_systemMenu_buildOptionList__P83906_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_buildOptionList__P109127, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_buildOptionList__P83906, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  options___128253: undefined,
+  options___103605: undefined,
 } }
 
 
 
 
 
-function inline__P128261(s) {
+function inline__P103613(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32859,8 +32702,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = music_volume__P109351_mk(s);
-    s.callLocIdx = 1041; s.pc = 1; return s.tmp_3;
+    s.tmp_3 = music_volume__P82866_mk(s);
+    s.callLocIdx = 1045; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32879,12 +32722,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128261.info = {"start":10644,"length":39,"line":337,"column":54,"endLine":337,"endColumn":93,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103613.info = {"start":10644,"length":39,"line":337,"column":54,"endLine":337,"endColumn":93,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128261_mk(s) {
+function inline__P103613_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128261, depth: s.depth + 1,
+        parent: s, fn: inline__P103613, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32896,7 +32739,7 @@ function inline__P128261_mk(s) {
 
 
 
-function inline__P128275(s) {
+function inline__P103627(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32906,8 +32749,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = music_volume__P109351_mk(s);
-    s.callLocIdx = 1043; s.pc = 1; return s.tmp_3;
+    s.tmp_3 = music_volume__P82866_mk(s);
+    s.callLocIdx = 1047; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32926,12 +32769,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128275.info = {"start":10751,"length":37,"line":338,"column":52,"endLine":338,"endColumn":89,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103627.info = {"start":10751,"length":37,"line":338,"column":52,"endLine":338,"endColumn":89,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128275_mk(s) {
+function inline__P103627_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128275, depth: s.depth + 1,
+        parent: s, fn: inline__P103627, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32943,7 +32786,7 @@ function inline__P128275_mk(s) {
 
 
 
-function inline__P128290(s) {
+function inline__P103642(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32953,7 +32796,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.brightness___108220;
+    r0 = globals.brightness___82997;
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 1);
@@ -32970,12 +32813,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128290.info = {"start":10910,"length":48,"line":340,"column":62,"endLine":340,"endColumn":110,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103642.info = {"start":10910,"length":48,"line":340,"column":62,"endLine":340,"endColumn":110,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128290_mk(s) {
+function inline__P103642_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128290, depth: s.depth + 1,
+        parent: s, fn: inline__P103642, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32986,7 +32829,7 @@ function inline__P128290_mk(s) {
 
 
 
-function inline__P128305(s) {
+function inline__P103657(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32996,7 +32839,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.brightness___108220;
+    r0 = globals.brightness___82997;
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 1);
@@ -33013,12 +32856,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128305.info = {"start":11038,"length":46,"line":341,"column":60,"endLine":341,"endColumn":106,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103657.info = {"start":11038,"length":46,"line":341,"column":60,"endLine":341,"endColumn":106,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128305_mk(s) {
+function inline__P103657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128305, depth: s.depth + 1,
+        parent: s, fn: inline__P103657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33029,7 +32872,7 @@ function inline__P128305_mk(s) {
 
 
 
-function inline__P128320(s) {
+function inline__P103672(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33039,7 +32882,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.stats___109026);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___83805);
     if (!r0) { step = 1; continue; }
     r0 = "HIDE STATS";
     { step = 2; continue; }
@@ -33052,12 +32895,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128320.info = {"start":11160,"length":46,"line":343,"column":48,"endLine":343,"endColumn":94,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103672.info = {"start":11160,"length":46,"line":343,"column":48,"endLine":343,"endColumn":94,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128320_mk(s) {
+function inline__P103672_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128320, depth: s.depth + 1,
+        parent: s, fn: inline__P103672, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33066,7 +32909,7 @@ function inline__P128320_mk(s) {
 
 
 
-function inline__P128329(s) {
+function inline__P103681(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33076,7 +32919,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___111169);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___86008);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
     s.tmp_2 = r0;
@@ -33097,12 +32940,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128329.info = {"start":11273,"length":71,"line":344,"column":50,"endLine":344,"endColumn":121,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103681.info = {"start":11273,"length":71,"line":344,"column":50,"endLine":344,"endColumn":121,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128329_mk(s) {
+function inline__P103681_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128329, depth: s.depth + 1,
+        parent: s, fn: inline__P103681, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33115,7 +32958,7 @@ function inline__P128329_mk(s) {
 
 
 
-function inline__P128338(s) {
+function inline__P103690(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33129,12 +32972,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128338.info = {"start":11411,"length":13,"line":345,"column":48,"endLine":345,"endColumn":61,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103690.info = {"start":11411,"length":13,"line":345,"column":48,"endLine":345,"endColumn":61,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128338_mk(s) {
+function inline__P103690_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128338, depth: s.depth + 1,
+        parent: s, fn: inline__P103690, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -33142,7 +32985,7 @@ function inline__P128338_mk(s) {
 
 
 
-function inline__P128351(s) {
+function inline__P103703(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33156,12 +32999,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128351.info = {"start":11590,"length":13,"line":351,"column":53,"endLine":351,"endColumn":66,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103703.info = {"start":11590,"length":13,"line":351,"column":53,"endLine":351,"endColumn":66,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128351_mk(s) {
+function inline__P103703_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128351, depth: s.depth + 1,
+        parent: s, fn: inline__P103703, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -33169,7 +33012,7 @@ function inline__P128351_mk(s) {
 
 
 
-function scene_systemMenu_setScreenBrightnessSupported__P111136(s) {
+function scene_systemMenu_setScreenBrightnessSupported__P85975(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33183,12 +33026,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setScreenBrightnessSupported__P111136.info = {"start":10398,"length":95,"line":330,"column":4,"endLine":332,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setScreenBrightnessSupported","argumentNames":[]}
+scene_systemMenu_setScreenBrightnessSupported__P85975.info = {"start":10398,"length":95,"line":330,"column":4,"endLine":332,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setScreenBrightnessSupported","argumentNames":[]}
 
-function scene_systemMenu_setScreenBrightnessSupported__P111136_mk(s) {
+function scene_systemMenu_setScreenBrightnessSupported__P85975_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setScreenBrightnessSupported__P111136, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setScreenBrightnessSupported__P85975, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -33196,7 +33039,7 @@ function scene_systemMenu_setScreenBrightnessSupported__P111136_mk(s) {
 
 
 
-function scene_systemMenu_sleep__P111135(s) {
+function scene_systemMenu_sleep__P85974(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33211,12 +33054,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_sleep__P111135.info = {"start":10072,"length":51,"line":316,"column":4,"endLine":318,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"sleep","argumentNames":[]}
+scene_systemMenu_sleep__P85974.info = {"start":10072,"length":51,"line":316,"column":4,"endLine":318,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"sleep","argumentNames":[]}
 
-function scene_systemMenu_sleep__P111135_mk(s) {
+function scene_systemMenu_sleep__P85974_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_sleep__P111135, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_sleep__P85974, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -33224,7 +33067,7 @@ function scene_systemMenu_sleep__P111135_mk(s) {
 
 
 
-function scene_systemMenu_toggleConsole__P111134(s) {
+function scene_systemMenu_toggleConsole__P85973(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33234,7 +33077,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___111169);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___86008);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
     s.tmp_2 = r0;
@@ -33244,23 +33087,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__P109150_mk(s);
+    s.tmp_4 = game_consoleOverlay_setVisible__P83929_mk(s);
     s.tmp_4.arg0 = false;
     s.tmp_4.arg1 = undefined;
-    s.callLocIdx = 1035; s.pc = 3; return s.tmp_4;
+    s.callLocIdx = 1039; s.pc = 3; return s.tmp_4;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = game_consoleOverlay_setVisible__P109150_mk(s);
+    s.tmp_0 = game_consoleOverlay_setVisible__P83929_mk(s);
     s.tmp_0.arg0 = true;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 1036; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1040; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = console_log__P106978_mk(s);
+    s.tmp_0 = console_log__P81642_mk(s);
     s.tmp_0.arg0 = "console";
-    s.callLocIdx = 1037; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1041; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 2:
@@ -33268,12 +33111,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_toggleConsole__P111134.info = {"start":9827,"length":239,"line":307,"column":4,"endLine":314,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"toggleConsole","argumentNames":[]}
+scene_systemMenu_toggleConsole__P85973.info = {"start":9827,"length":239,"line":307,"column":4,"endLine":314,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"toggleConsole","argumentNames":[]}
 
-function scene_systemMenu_toggleConsole__P111134_mk(s) {
+function scene_systemMenu_toggleConsole__P85973_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_toggleConsole__P111134, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_toggleConsole__P85973, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33286,7 +33129,7 @@ function scene_systemMenu_toggleConsole__P111134_mk(s) {
 
 
 
-function game_consoleOverlay_setVisible__P109150(s) {
+function game_consoleOverlay_setVisible__P83929(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33302,7 +33145,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = r0 = s.arg0;
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___111169);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___86008);
     s.tmp_5 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_5);
     s.tmp_4 = r0;
@@ -33323,26 +33166,26 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    globals.consoleStrings___111169 = (s.tmp_6);
+    globals.consoleStrings___86008 = (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___111168 = (s.arg1);
+    globals.consoleColor___86007 = (s.arg1);
   case 5:
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_setVisible__P109150.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"]}
+game_consoleOverlay_setVisible__P83929.info = {"start":562,"length":219,"line":19,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"setVisible","argumentNames":["value","col"]}
 
-function game_consoleOverlay_setVisible__P109150_mk(s) {
+function game_consoleOverlay_setVisible__P83929_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_setVisible__P109150, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_setVisible__P83929, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33359,7 +33202,7 @@ function game_consoleOverlay_setVisible__P109150_mk(s) {
 
 
 
-function console_log__P106978(s) {
+function console_log__P81642(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33373,7 +33216,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = console_add__P106974_mk(s);
+    s.tmp_0 = console_add__P81638_mk(s);
     s.tmp_0.arg0 = 1;
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 41; s.pc = 1; return s.tmp_0;
@@ -33383,12 +33226,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_log__P106978.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__P81642.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__P106978_mk(s) {
+function console_log__P81642_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_log__P106978, depth: s.depth + 1,
+        parent: s, fn: console_log__P81642, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -33398,7 +33241,7 @@ function console_log__P106978_mk(s) {
 
 
 
-function console_add__P106974(s) {
+function console_add__P81638(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33408,58 +33251,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.text___128390 = undefined;
-    s.i___128399 = undefined;
+    s.text___103742 = undefined;
+    s.i___103751 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg0 < globals.minPriority___106973);
+    r0 = (s.arg0 < globals.minPriority___81637);
     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__P106980_mk(s);
+    s.tmp_1 = console_inspect__P81644_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___128390 = (r0);
-    if ((s.text___128390) && (s.text___128390).vtable) {
+    s.text___103742 = (r0);
+    if ((s.text___103742) && (s.text___103742).vtable) {
     setupResume(s, 7);
-    pxsim_String__stringConv(s.text___128390);
+    pxsim_String__stringConv(s.text___103742);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.text___128390) + ""; }
+    } else { s.retval = (s.text___103742) + ""; }
   case 7:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, "\n");
-    s.text___128390 = (r0);
-    s.i___128399 = (0);
+    s.text___103742 = (r0);
+    s.i___103751 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___128399;
-    r0 = pxsim_Array__length(globals.listeners___110575);
+    s.tmp_1 = r0 = s.i___103751;
+    r0 = pxsim_Array__length(globals.listeners___85359);
     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___110575, s.i___128399);
+    r0 = pxsim_Array__getAt(globals.listeners___85359, s.i___103751);
     s.tmp_3.argL = r0;
     s.tmp_3.arg0 = s.arg0;
-    s.tmp_3.arg1 = s.text___128390;
+    s.tmp_3.arg1 = s.text___103742;
     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___128399 + 1);
-    s.i___128399 = (r0);
+    r0 = (s.i___103751 + 1);
+    s.i___103751 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -33467,19 +33310,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_add__P106974.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__P81638.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__P106974_mk(s) {
+function console_add__P81638_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_add__P106974, depth: s.depth + 1,
+        parent: s, fn: console_add__P81638, 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___128390: undefined,
-  i___128399: undefined,
+  text___103742: undefined,
+  i___103751: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -33488,7 +33331,7 @@ function console_add__P106974_mk(s) {
 
 
 
-function console_inspect__P106980(s) {
+function console_inspect__P81644(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33498,10 +33341,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.asArr___128430 = undefined;
-    s.asString___128448 = undefined;
-    s.keys___128460 = undefined;
-    s.snipped___128464 = undefined;
+    s.asArr___103782 = undefined;
+    s.asString___103800 = undefined;
+    s.keys___103812 = undefined;
+    s.snipped___103816 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -33542,15 +33385,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 5; continue; }
-    s.asArr___128430 = (s.arg0);
-    r0 = pxsim_Array__length(s.asArr___128430);
+    s.asArr___103782 = (s.arg0);
+    r0 = pxsim_Array__length(s.asArr___103782);
     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__P106710_mk(s);
-    s.tmp_2.arg0 = s.asArr___128430;
+    s.tmp_2 = helpers_arrayJoin__P81372_mk(s);
+    s.tmp_2.arg0 = s.asArr___103782;
     s.tmp_2.arg1 = ",";
     s.callLocIdx = 42; s.pc = 19; return s.tmp_2;
   case 19:
@@ -33560,9 +33403,9 @@ switch (step) {
   case 3:
     r0 = pxsim_String_.mkEmpty();
     s.tmp_4 = r0;
-    s.tmp_7 = helpers_arrayJoin__P106710_mk(s);
-    s.tmp_8 = helpers_arraySlice__P106721_mk(s);
-    s.tmp_8.arg0 = s.asArr___128430;
+    s.tmp_7 = helpers_arrayJoin__P81372_mk(s);
+    s.tmp_8 = helpers_arraySlice__P81384_mk(s);
+    s.tmp_8.arg0 = s.asArr___103782;
     s.tmp_8.arg1 = 0;
     s.tmp_8.arg2 = s.arg1;
     s.callLocIdx = 43; s.pc = 21; return s.tmp_8;
@@ -33602,46 +33445,46 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     s.tmp_10 = r0;
     r0 = pxsim_String__concat(s.tmp_9, s.tmp_10);
-    s.asString___128448 = (r0);
-    r0 = (s.asString___128448 != "[object Object]");
+    s.asString___103800 = (r0);
+    r0 = (s.asString___103800 != "[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___128448 != "[Object]");
+    r0 = (s.asString___103800 != "[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___128448;
+    r0 = s.asString___103800;
     { step = 17; continue; }
   case 8:
   case 9:
     r0 = pxsim_pxtrt.keysOf(s.arg0);
-    s.keys___128460 = (r0);
-    r0 = pxsim_Array__length(s.keys___128460);
+    s.keys___103812 = (r0);
+    r0 = pxsim_Array__length(s.keys___103812);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 > s.arg1);
-    s.snipped___128464 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.snipped___128464);
+    s.snipped___103816 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.snipped___103816);
     if (!r0) { step = 10; continue; }
-    s.tmp_0 = helpers_arraySlice__P106721_mk(s);
-    s.tmp_0.arg0 = s.keys___128460;
+    s.tmp_0 = helpers_arraySlice__P81384_mk(s);
+    s.tmp_0.arg0 = s.keys___103812;
     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___128460 = (r0);
+    s.keys___103812 = (r0);
   case 10:
   case 11:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P128481);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103833);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_numops_toBoolDecr(s.snipped___128464);
+    r0 = pxsim_numops_toBoolDecr(s.snipped___103816);
     if (!r0) { step = 12; continue; }
     r0 = "\n    ...";
     { step = 13; continue; }
@@ -33650,8 +33493,8 @@ switch (step) {
   case 13:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_7 = helpers_arrayReduce__P106719_mk(s);
-    s.tmp_7.arg0 = s.keys___128460;
+    s.tmp_7 = helpers_arrayReduce__P81381_mk(s);
+    s.tmp_7.arg0 = s.keys___103812;
     s.tmp_7.arg1 = s.tmp_0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_7.arg2 = r0;
@@ -33700,12 +33543,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_inspect__P106980.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__P81644.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__P106980_mk(s) {
+function console_inspect__P81644_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_inspect__P106980, depth: s.depth + 1,
+        parent: s, fn: console_inspect__P81644, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33718,10 +33561,10 @@ function console_inspect__P106980_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  asArr___128430: undefined,
-  asString___128448: undefined,
-  keys___128460: undefined,
-  snipped___128464: undefined,
+  asArr___103782: undefined,
+  asString___103800: undefined,
+  keys___103812: undefined,
+  snipped___103816: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -33730,7 +33573,7 @@ function console_inspect__P106980_mk(s) {
 
 
 
-function inline__P128481(s) {
+function inline__P103833(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33793,12 +33636,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128481.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__P103833.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__P128481_mk(s) {
+function inline__P103833_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128481, depth: s.depth + 1,
+        parent: s, fn: inline__P103833, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33816,7 +33659,7 @@ function inline__P128481_mk(s) {
 
 
 
-function helpers_arrayReduce__P106719(s) {
+function helpers_arrayReduce__P81381(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33826,8 +33669,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___126653 = undefined;
-    s.i___126656 = undefined;
+    s.len___102046 = undefined;
+    s.i___102049 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -33835,43 +33678,43 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__length(s.arg0);
-    s.len___126653 = (r0);
-    s.i___126656 = (0);
+    s.len___102046 = (r0);
+    s.i___102049 = (0);
   case 1:
-    r0 = (s.i___126656 < s.len___126653);
+    r0 = (s.i___102049 < s.len___102046);
     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___126656);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___102049);
     s.tmp_1.arg1 = r0;
-    s.tmp_1.arg2 = s.i___126656;
+    s.tmp_1.arg2 = s.i___102049;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 8; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.arg2 = (r0);
-    r0 = (s.i___126656 + 1);
-    s.i___126656 = (r0);
+    r0 = (s.i___102049 + 1);
+    s.i___102049 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = s.arg2;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayReduce__P106719.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__P81381.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__P106719_mk(s) {
+function helpers_arrayReduce__P81381_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayReduce__P106719, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayReduce__P81381, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___126653: undefined,
-  i___126656: undefined,
+  len___102046: undefined,
+  i___102049: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -33881,7 +33724,7 @@ function helpers_arrayReduce__P106719_mk(s) {
 
 
 
-function helpers_arrayJoin__P106710(s) {
+function helpers_arrayJoin__P81372(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33891,9 +33734,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___128515 = undefined;
-    s.len___128516 = undefined;
-    s.i___128519 = undefined;
+    s.r___103867 = undefined;
+    s.len___103868 = undefined;
+    s.i___103871 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -33916,16 +33759,16 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_String_.mkEmpty();
-    s.r___128515 = (r0);
+    s.r___103867 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___128516 = (r0);
-    s.i___128519 = (0);
+    s.len___103868 = (r0);
+    s.i___103871 = (0);
   case 5:
-    r0 = (s.i___128519 < s.len___128516);
+    r0 = (s.i___103871 < s.len___103868);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.i___128519 > 0);
+    r0 = (s.i___103871 > 0);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBool(s.tmp_1);
     if (r0) { step = 6; continue; }
@@ -33938,12 +33781,12 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 8; continue; }
-    if ((s.r___128515) && (s.r___128515).vtable) {
+    if ((s.r___103867) && (s.r___103867).vtable) {
     setupResume(s, 15);
-    pxsim_String__stringConv(s.r___128515);
+    pxsim_String__stringConv(s.r___103867);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___128515) + ""; }
+    } else { s.retval = (s.r___103867) + ""; }
   case 15:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -33957,10 +33800,10 @@ switch (step) {
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_4);
-    s.r___128515 = (r0);
+    s.r___103867 = (r0);
   case 8:
   case 9:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___128519);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___103871);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === undefined);
     s.tmp_0 = r0;
@@ -33969,7 +33812,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 10:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___128519);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___103871);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 === null);
   case 11:
@@ -33980,16 +33823,16 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     { step = 13; continue; }
   case 12:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___128519);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___103871);
   case 13:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    if ((s.r___128515) && (s.r___128515).vtable) {
+    if ((s.r___103867) && (s.r___103867).vtable) {
     setupResume(s, 17);
-    pxsim_String__stringConv(s.r___128515);
+    pxsim_String__stringConv(s.r___103867);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___128515) + ""; }
+    } else { s.retval = (s.r___103867) + ""; }
   case 17:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -34003,21 +33846,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_5, s.tmp_6);
-    s.r___128515 = (r0);
-    r0 = (s.i___128519 + 1);
-    s.i___128519 = (r0);
+    s.r___103867 = (r0);
+    r0 = (s.i___103871 + 1);
+    s.i___103871 = (r0);
     { step = 5; continue; }
   case 14:
-    r0 = s.r___128515;
+    r0 = s.r___103867;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayJoin__P106710.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__P81372.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__P106710_mk(s) {
+function helpers_arrayJoin__P81372_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayJoin__P106710, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayJoin__P81372, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34026,9 +33869,9 @@ function helpers_arrayJoin__P106710_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  r___128515: undefined,
-  len___128516: undefined,
-  i___128519: undefined,
+  r___103867: undefined,
+  len___103868: undefined,
+  i___103871: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -34037,7 +33880,7 @@ function helpers_arrayJoin__P106710_mk(s) {
 
 
 
-function scene_systemMenu_toggleStats__P111133(s) {
+function scene_systemMenu_toggleStats__P85972(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34047,11 +33890,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.stats___109026);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___83805);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    globals.stats___109026 = (r0);
-    r0 = pxsim_numops_toBoolDecr(globals.stats___109026);
+    globals.stats___83805 = (r0);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___83805);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -34060,18 +33903,18 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.control_EventContext_onStats___106996;
+    r0 = globals.control_EventContext_onStats___81660;
   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___106996;
+    s.tmp_3.argL = globals.control_EventContext_onStats___81660;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3.arg0 = r0;
     setupLambda(s.tmp_3, s.tmp_3.argL);
-    s.callLocIdx = 1033; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1037; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
   case 3:
@@ -34080,12 +33923,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_toggleStats__P111133.info = {"start":9642,"length":179,"line":300,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"toggleStats","argumentNames":[]}
+scene_systemMenu_toggleStats__P85972.info = {"start":9642,"length":179,"line":300,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"toggleStats","argumentNames":[]}
 
-function scene_systemMenu_toggleStats__P111133_mk(s) {
+function scene_systemMenu_toggleStats__P85972_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_toggleStats__P111133, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_toggleStats__P85972, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34097,7 +33940,7 @@ function scene_systemMenu_toggleStats__P111133_mk(s) {
 
 
 
-function scene_systemMenu_brightnessDown__P111131(s) {
+function scene_systemMenu_brightnessDown__P85970(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34107,24 +33950,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_setScreenBrightness__P111132_mk(s);
-    r0 = globals.brightness___108220;
+    s.tmp_0 = scene_systemMenu_setScreenBrightness__P85971_mk(s);
+    r0 = globals.brightness___82997;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 5);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1029; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1033; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_brightnessDown__P111131.info = {"start":9198,"length":87,"line":289,"column":4,"endLine":291,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"brightnessDown","argumentNames":[]}
+scene_systemMenu_brightnessDown__P85970.info = {"start":9198,"length":87,"line":289,"column":4,"endLine":291,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"brightnessDown","argumentNames":[]}
 
-function scene_systemMenu_brightnessDown__P111131_mk(s) {
+function scene_systemMenu_brightnessDown__P85970_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_brightnessDown__P111131, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_brightnessDown__P85970, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34134,7 +33977,7 @@ function scene_systemMenu_brightnessDown__P111131_mk(s) {
 
 
 
-function scene_systemMenu_setScreenBrightness__P111132(s) {
+function scene_systemMenu_setScreenBrightness__P85971(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34148,29 +33991,29 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_setScreenBrightness__P108231_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_setScreenBrightness__P83008_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1030; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1034; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = settings_writeNumber__P108326_mk(s);
+    s.tmp_0 = settings_writeNumber__P83102_mk(s);
     s.tmp_0.arg0 = "#brightness";
-    r0 = globals.brightness___108220;
+    r0 = globals.brightness___82997;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1032; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1036; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setScreenBrightness__P111132.info = {"start":9291,"length":345,"line":293,"column":4,"endLine":298,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setScreenBrightness","argumentNames":["b"]}
+scene_systemMenu_setScreenBrightness__P85971.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__P111132_mk(s) {
+function scene_systemMenu_setScreenBrightness__P85971_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setScreenBrightness__P111132, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setScreenBrightness__P85971, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -34180,7 +34023,7 @@ function scene_systemMenu_setScreenBrightness__P111132_mk(s) {
 
 
 
-function settings_writeNumber__P108326(s) {
+function settings_writeNumber__P83102(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34198,27 +34041,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__P108324_mk(s);
+    s.tmp_1 = settings_writeBuffer__P83100_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = msgpack_packNumberArray__P106786_mk(s);
+    s.tmp_2 = msgpack_packNumberArray__P81450_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
-    s.callLocIdx = 160; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 169; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 161; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 170; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeNumber__P108326.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__P83102.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__P108326_mk(s) {
+function settings_writeNumber__P83102_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeNumber__P108326, depth: s.depth + 1,
+        parent: s, fn: settings_writeNumber__P83102, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34231,7 +34074,7 @@ function settings_writeNumber__P108326_mk(s) {
 
 
 
-function settings_writeBuffer__P108324(s) {
+function settings_writeBuffer__P83100(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34258,12 +34101,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeBuffer__P108324.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__P83100.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__P108324_mk(s) {
+function settings_writeBuffer__P83100_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeBuffer__P108324, depth: s.depth + 1,
+        parent: s, fn: settings_writeBuffer__P83100, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -34274,7 +34117,7 @@ function settings_writeBuffer__P108324_mk(s) {
 
 
 
-function msgpack_packNumberArray__P106786(s) {
+function msgpack_packNumberArray__P81450(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34284,100 +34127,100 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.off___128605 = undefined;
-    s.n___128607 = undefined;
-    s.unnamed16732___U2 = undefined;
-    s.unnamed16733___U3 = undefined;
-    s.buf___128617 = undefined;
-    s.n___128623 = undefined;
-    s.unnamed16734___U6 = undefined;
-    s.unnamed16735___U7 = undefined;
+    s.off___103957 = undefined;
+    s.n___103959 = undefined;
+    s.unnamed1784___U2 = undefined;
+    s.unnamed1785___U3 = undefined;
+    s.buf___103969 = undefined;
+    s.n___103975 = undefined;
+    s.unnamed1786___U6 = undefined;
+    s.unnamed1787___U7 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.off___128605 = (0);
-    s.n___128607 = (undefined);
-    s.unnamed16732___U2 = (s.arg0);
-    s.unnamed16733___U3 = (0);
+    s.off___103957 = (0);
+    s.n___103959 = (undefined);
+    s.unnamed1784___U2 = (s.arg0);
+    s.unnamed1785___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16733___U3;
-    r0 = pxsim_Array__length(s.unnamed16732___U2);
+    s.tmp_0 = r0 = s.unnamed1785___U3;
+    r0 = pxsim_Array__length(s.unnamed1784___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16732___U2, s.unnamed16733___U3);
-    s.n___128607 = (r0);
-    s.tmp_2 = r0 = s.off___128605;
-    s.tmp_4 = msgpack_packNumberCore__P110538_mk(s);
+    r0 = pxsim_Array__getAt(s.unnamed1784___U2, s.unnamed1785___U3);
+    s.n___103959 = (r0);
+    s.tmp_2 = r0 = s.off___103957;
+    s.tmp_4 = msgpack_packNumberCore__P85322_mk(s);
     s.tmp_4.arg0 = null;
-    s.tmp_4.arg1 = s.off___128605;
-    s.tmp_4.arg2 = s.n___128607;
+    s.tmp_4.arg1 = s.off___103957;
+    s.tmp_4.arg2 = s.n___103959;
     s.callLocIdx = 22; 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___128605 = (r0);
-    r0 = (s.unnamed16733___U3 + 1);
-    s.unnamed16733___U3 = (r0);
+    s.off___103957 = (r0);
+    r0 = (s.unnamed1785___U3 + 1);
+    s.unnamed1785___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16732___U2 = (undefined);
-    r0 = pxsim.control.createBuffer(s.off___128605);
-    s.buf___128617 = (r0);
-    s.off___128605 = (0);
-    s.n___128623 = (undefined);
-    s.unnamed16734___U6 = (s.arg0);
-    s.unnamed16735___U7 = (0);
+    s.unnamed1784___U2 = (undefined);
+    r0 = pxsim.control.createBuffer(s.off___103957);
+    s.buf___103969 = (r0);
+    s.off___103957 = (0);
+    s.n___103975 = (undefined);
+    s.unnamed1786___U6 = (s.arg0);
+    s.unnamed1787___U7 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed16735___U7;
-    r0 = pxsim_Array__length(s.unnamed16734___U6);
+    s.tmp_0 = r0 = s.unnamed1787___U7;
+    r0 = pxsim_Array__length(s.unnamed1786___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16734___U6, s.unnamed16735___U7);
-    s.n___128623 = (r0);
-    s.tmp_2 = r0 = s.off___128605;
-    s.tmp_4 = msgpack_packNumberCore__P110538_mk(s);
-    s.tmp_4.arg0 = s.buf___128617;
-    s.tmp_4.arg1 = s.off___128605;
-    s.tmp_4.arg2 = s.n___128623;
+    r0 = pxsim_Array__getAt(s.unnamed1786___U6, s.unnamed1787___U7);
+    s.n___103975 = (r0);
+    s.tmp_2 = r0 = s.off___103957;
+    s.tmp_4 = msgpack_packNumberCore__P85322_mk(s);
+    s.tmp_4.arg0 = s.buf___103969;
+    s.tmp_4.arg1 = s.off___103957;
+    s.tmp_4.arg2 = s.n___103975;
     s.callLocIdx = 23; 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___128605 = (r0);
-    r0 = (s.unnamed16735___U7 + 1);
-    s.unnamed16735___U7 = (r0);
+    s.off___103957 = (r0);
+    r0 = (s.unnamed1787___U7 + 1);
+    s.unnamed1787___U7 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed16734___U6 = (undefined);
-    r0 = s.buf___128617;
+    s.unnamed1786___U6 = (undefined);
+    r0 = s.buf___103969;
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_packNumberArray__P106786.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__P81450.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__P106786_mk(s) {
+function msgpack_packNumberArray__P81450_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_packNumberArray__P106786, depth: s.depth + 1,
+        parent: s, fn: msgpack_packNumberArray__P81450, 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___128605: undefined,
-  n___128607: undefined,
-  unnamed16732___U2: undefined,
-  unnamed16733___U3: undefined,
-  buf___128617: undefined,
-  n___128623: undefined,
-  unnamed16734___U6: undefined,
-  unnamed16735___U7: undefined,
+  off___103957: undefined,
+  n___103959: undefined,
+  unnamed1784___U2: undefined,
+  unnamed1785___U3: undefined,
+  buf___103969: undefined,
+  n___103975: undefined,
+  unnamed1786___U6: undefined,
+  unnamed1787___U7: undefined,
   arg0: undefined,
 } }
 
@@ -34385,7 +34228,7 @@ function msgpack_packNumberArray__P106786_mk(s) {
 
 
 
-function msgpack_packNumberCore__P110538(s) {
+function msgpack_packNumberCore__P85322(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34395,15 +34238,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tag___128637 = undefined;
-    s.fmt___128680 = undefined;
+    s.tag___103989 = undefined;
+    s.fmt___104032 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tag___128637 = (203);
+    s.tag___103989 = (203);
     s.tmp_1 = r0 = s.arg2;
     r0 = (s.arg2 << 0);
     s.tmp_2 = r0;
@@ -34453,17 +34296,17 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 8; continue; }
-    s.tag___128637 = (204);
+    s.tag___103989 = (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___128637 = (205);
+    s.tag___103989 = (205);
     { step = 10; continue; }
   case 9:
-    s.tag___128637 = (206);
+    s.tag___103989 = (206);
   case 10:
   case 11:
     { step = 17; continue; }
@@ -34472,41 +34315,41 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    s.tag___128637 = (208);
+    s.tag___103989 = (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___128637 = (209);
+    s.tag___103989 = (209);
     { step = 15; continue; }
   case 14:
-    s.tag___128637 = (210);
+    s.tag___103989 = (210);
   case 15:
   case 16:
   case 17:
   case 18:
   case 19:
   case 20:
-    s.tmp_0 = msgpack_tagFormat__P110537_mk(s);
-    s.tmp_0.arg0 = s.tag___128637;
+    s.tmp_0 = msgpack_tagFormat__P85321_mk(s);
+    s.tmp_0.arg0 = s.tag___103989;
     s.callLocIdx = 18; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.fmt___128680 = (r0);
+    s.fmt___104032 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 21; continue; }
-    r0 = pxsim.BufferMethods.setByte(s.arg0, s.arg1, s.tag___128637);
+    r0 = pxsim.BufferMethods.setByte(s.arg0, s.arg1, s.tag___103989);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.fmt___128680;
+    s.tmp_1 = r0 = s.fmt___104032;
     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__P106777_mk(s);
-    s.tmp_1.arg0 = s.fmt___128680;
+    s.tmp_1 = pins_sizeOf__P81441_mk(s);
+    s.tmp_1.arg0 = s.fmt___104032;
     s.callLocIdx = 19; s.pc = 25; return s.tmp_1;
   case 25:
     r0 = s.retval;
@@ -34516,12 +34359,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_packNumberCore__P110538.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__P85322.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__P110538_mk(s) {
+function msgpack_packNumberCore__P85322_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_packNumberCore__P110538, depth: s.depth + 1,
+        parent: s, fn: msgpack_packNumberCore__P85322, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34531,8 +34374,8 @@ function msgpack_packNumberCore__P110538_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  tag___128637: undefined,
-  fmt___128680: undefined,
+  tag___103989: undefined,
+  fmt___104032: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -34542,7 +34385,7 @@ function msgpack_packNumberCore__P110538_mk(s) {
 
 
 
-function msgpack_tagFormat__P110537(s) {
+function msgpack_tagFormat__P85321(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34602,12 +34445,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_tagFormat__P110537.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__P85321.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__P110537_mk(s) {
+function msgpack_tagFormat__P85321_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_tagFormat__P110537, depth: s.depth + 1,
+        parent: s, fn: msgpack_tagFormat__P85321, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -34617,7 +34460,7 @@ function msgpack_tagFormat__P110537_mk(s) {
 
 
 
-function pins_sizeOf__P106777(s) {
+function pins_sizeOf__P81441(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34631,7 +34474,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Buffer_sizeOfNumberFormat__P106813_mk(s);
+    s.tmp_0 = Buffer_sizeOfNumberFormat__P81477_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 17; s.pc = 1; return s.tmp_0;
   case 1:
@@ -34639,12 +34482,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pins_sizeOf__P106777.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__P81441.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__P106777_mk(s) {
+function pins_sizeOf__P81441_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pins_sizeOf__P106777, depth: s.depth + 1,
+        parent: s, fn: pins_sizeOf__P81441, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -34654,7 +34497,7 @@ function pins_sizeOf__P106777_mk(s) {
 
 
 
-function Buffer_sizeOfNumberFormat__P106813(s) {
+function Buffer_sizeOfNumberFormat__P81477(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34733,12 +34576,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Buffer_sizeOfNumberFormat__P106813.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__P81477.info = {"start":12548,"length":856,"line":427,"column":4,"endLine":451,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"sizeOfNumberFormat","argumentNames":["format"]}
 
-function Buffer_sizeOfNumberFormat__P106813_mk(s) {
+function Buffer_sizeOfNumberFormat__P81477_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Buffer_sizeOfNumberFormat__P106813, depth: s.depth + 1,
+        parent: s, fn: Buffer_sizeOfNumberFormat__P81477, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -34748,7 +34591,7 @@ function Buffer_sizeOfNumberFormat__P106813_mk(s) {
 
 
 
-function helpers_setScreenBrightness__P108231(s) {
+function helpers_setScreenBrightness__P83008(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34763,27 +34606,27 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_clamp__P106731_mk(s);
+    s.tmp_0 = Math_clamp__P81395_mk(s);
     s.tmp_0.arg0 = 10;
     s.tmp_0.arg1 = 100;
     r0 = (s.arg1 | 0);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 120; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 134; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.arg1 = (r0);
-    globals.brightness___108220 = (s.arg1);
-    r0 = pxsim_pxtcore.setScreenBrightness(globals.brightness___108220);
+    globals.brightness___82997 = (s.arg1);
+    r0 = pxsim_pxtcore.setScreenBrightness(globals.brightness___82997);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_setScreenBrightness__P108231.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"]}
+helpers_setScreenBrightness__P83008.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__P108231_mk(s) {
+function helpers_setScreenBrightness__P83008_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_setScreenBrightness__P108231, depth: s.depth + 1,
+        parent: s, fn: helpers_setScreenBrightness__P83008, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -34794,7 +34637,7 @@ function helpers_setScreenBrightness__P108231_mk(s) {
 
 
 
-function scene_systemMenu_brightnessUp__P111130(s) {
+function scene_systemMenu_brightnessUp__P85969(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34804,24 +34647,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_setScreenBrightness__P111132_mk(s);
-    r0 = globals.brightness___108220;
+    s.tmp_0 = scene_systemMenu_setScreenBrightness__P85971_mk(s);
+    r0 = globals.brightness___82997;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 5);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1027; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1031; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_brightnessUp__P111130.info = {"start":9107,"length":85,"line":285,"column":4,"endLine":287,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"brightnessUp","argumentNames":[]}
+scene_systemMenu_brightnessUp__P85969.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__P111130_mk(s) {
+function scene_systemMenu_brightnessUp__P85969_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_brightnessUp__P111130, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_brightnessUp__P85969, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34831,7 +34674,7 @@ function scene_systemMenu_brightnessUp__P111130_mk(s) {
 
 
 
-function scene_systemMenu_volumeDown__P111129(s) {
+function scene_systemMenu_volumeDown__P85968(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34841,54 +34684,54 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.v___128943 = undefined;
-    s.remainder___128946 = undefined;
-    s.newVolume___128949 = undefined;
-    s.tmp_0 = music_volume__P109351_mk(s);
-    s.callLocIdx = 1024; s.pc = 3; return s.tmp_0;
+    s.v___104295 = undefined;
+    s.remainder___104298 = undefined;
+    s.newVolume___104301 = undefined;
+    s.tmp_0 = music_volume__P82866_mk(s);
+    s.callLocIdx = 1028; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.v___128943 = (r0);
-    r0 = (s.v___128943 % 32);
-    s.remainder___128946 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.remainder___128946);
+    s.v___104295 = (r0);
+    r0 = (s.v___104295 % 32);
+    s.remainder___104298 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.remainder___104298);
     if (!r0) { step = 1; continue; }
-    r0 = s.remainder___128946;
+    r0 = s.remainder___104298;
     { step = 2; continue; }
   case 1:
     r0 = 32;
   case 2:
     // jmp value (already in r0)
     s.tmp_0 = r0;
-    r0 = (s.v___128943 - s.tmp_0);
-    s.newVolume___128949 = (r0);
-    s.tmp_0 = scene_systemMenu_setVolume__P111127_mk(s);
-    s.tmp_0.arg0 = s.newVolume___128949;
-    s.callLocIdx = 1025; s.pc = 4; return s.tmp_0;
+    r0 = (s.v___104295 - s.tmp_0);
+    s.newVolume___104301 = (r0);
+    s.tmp_0 = scene_systemMenu_setVolume__P85966_mk(s);
+    s.tmp_0.arg0 = s.newVolume___104301;
+    s.callLocIdx = 1029; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_volumeDown__P111129.info = {"start":8914,"length":187,"line":278,"column":4,"endLine":283,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"volumeDown","argumentNames":[]}
+scene_systemMenu_volumeDown__P85968.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__P111129_mk(s) {
+function scene_systemMenu_volumeDown__P85968_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_volumeDown__P111129, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_volumeDown__P85968, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  v___128943: undefined,
-  remainder___128946: undefined,
-  newVolume___128949: undefined,
+  v___104295: undefined,
+  remainder___104298: undefined,
+  newVolume___104301: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_setVolume__P111127(s) {
+function scene_systemMenu_setVolume__P85966(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34902,33 +34745,33 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = music_setVolume__P109350_mk(s);
+    s.tmp_0 = music_setVolume__P82865_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1019; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1023; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = music_playTone__P109352_mk(s);
+    s.tmp_0 = music_playTone__P82867_mk(s);
     s.tmp_0.arg0 = 440;
     s.tmp_0.arg1 = 500;
-    s.callLocIdx = 1020; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1024; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = settings_writeNumber__P108326_mk(s);
+    s.tmp_0 = settings_writeNumber__P83102_mk(s);
     s.tmp_0.arg0 = "#volume";
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1021; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1025; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setVolume__P111127.info = {"start":8565,"length":166,"line":265,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"setVolume","argumentNames":["newVolume"]}
+scene_systemMenu_setVolume__P85966.info = {"start":8565,"length":166,"line":265,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setVolume","argumentNames":["newVolume"]}
 
-function scene_systemMenu_setVolume__P111127_mk(s) {
+function scene_systemMenu_setVolume__P85966_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setVolume__P111127, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setVolume__P85966, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -34938,7 +34781,7 @@ function scene_systemMenu_setVolume__P111127_mk(s) {
 
 
 
-function music_playTone__P109352(s) {
+function music_playTone__P82867(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34948,7 +34791,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.id___128784 = undefined;
+    s.id___104136 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -34973,29 +34816,29 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = music_playNoteCore__P111363_mk(s);
+    s.tmp_2 = music_playNoteCore__P85417_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 = 1241; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 113; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = pause__P107011_mk(s);
+    s.tmp_0 = pause__P81675_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1242; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 114; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    r0 = (globals.playToneID___111365 + 1);
+    r0 = (globals.playToneID___85419 + 1);
     s.tmp_0 = r0;
-    globals.playToneID___111365 = (r0);
-    s.id___128784 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P128790);
+    globals.playToneID___85419 = (r0);
+    s.id___104136 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P104142);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.id___128784);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.id___104136);
     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);
@@ -35004,17 +34847,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_playTone__P109352.info = {"start":2591,"length":831,"line":83,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"playTone","argumentNames":["frequency","ms"]}
+music_playTone__P82867.info = {"start":2591,"length":831,"line":83,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playTone","argumentNames":["frequency","ms"]}
 
-function music_playTone__P109352_mk(s) {
+function music_playTone__P82867_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_playTone__P109352, depth: s.depth + 1,
+        parent: s, fn: music_playTone__P82867, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  id___128784: undefined,
+  id___104136: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -35023,7 +34866,7 @@ function music_playTone__P109352_mk(s) {
 
 
 
-function inline__P128790(s) {
+function inline__P104142(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35033,14 +34876,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pos___128791 = undefined;
-    s.now___128801 = undefined;
-    s.d___128804 = undefined;
-    s.t___128808 = undefined;
+    s.pos___104143 = undefined;
+    s.now___104153 = undefined;
+    s.d___104156 = undefined;
+    s.t___104160 = undefined;
     r0 = pxsim.control.millis();
-    s.pos___128791 = (r0);
+    s.pos___104143 = (r0);
   case 1:
-    r0 = (s.caps[0] == globals.playToneID___111365);
+    r0 = (s.caps[0] == globals.playToneID___85419);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 2; continue; }
@@ -35056,31 +34899,31 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 6; continue; }
     r0 = pxsim.control.millis();
-    s.now___128801 = (r0);
-    r0 = (s.pos___128791 - s.now___128801);
-    s.d___128804 = (r0);
-    s.tmp_0 = Math_min__P106735_mk(s);
+    s.now___104153 = (r0);
+    r0 = (s.pos___104143 - s.now___104153);
+    s.d___104156 = (r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 500;
-    s.callLocIdx = 1243; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 115; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.t___128808 = (r0);
+    s.t___104160 = (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___128808);
+    r0 = (s.tmp_2 - s.t___104160);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = (s.pos___128791 + s.t___128808);
-    s.pos___128791 = (r0);
-    s.tmp_0 = music_playNoteCore__P111363_mk(s);
-    r0 = (s.d___128804 - 1);
+    r0 = (s.pos___104143 + s.t___104160);
+    s.pos___104143 = (r0);
+    s.tmp_0 = music_playNoteCore__P85417_mk(s);
+    r0 = (s.d___104156 - 1);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.caps[2];
-    s.tmp_0.arg2 = s.t___128808;
-    s.callLocIdx = 1244; s.pc = 8; return s.tmp_0;
+    s.tmp_0.arg2 = s.t___104160;
+    s.callLocIdx = 116; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
@@ -35089,20 +34932,20 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = pause__P107011_mk(s);
-    r0 = (s.d___128804 + s.t___128808);
+    s.tmp_2 = pause__P81675_mk(s);
+    r0 = (s.d___104156 + s.t___104160);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1245; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 117; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = pause__P107011_mk(s);
-    r0 = (s.d___128804 + s.t___128808);
+    s.tmp_0 = pause__P81675_mk(s);
+    r0 = (s.d___104156 + s.t___104160);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 100);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1246; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 118; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 5:
@@ -35112,27 +34955,27 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128790.info = {"start":2890,"length":515,"line":92,"column":34,"endLine":106,"endColumn":13,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"inline","argumentNames":[]}
+inline__P104142.info = {"start":2890,"length":515,"line":92,"column":34,"endLine":106,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P128790_mk(s) {
+function inline__P104142_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128790, depth: s.depth + 1,
+        parent: s, fn: inline__P104142, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  pos___128791: undefined,
-  now___128801: undefined,
-  d___128804: undefined,
-  t___128808: undefined,
+  pos___104143: undefined,
+  now___104153: undefined,
+  d___104156: undefined,
+  t___104160: undefined,
 } }
 
 
 
 
 
-function music_playNoteCore__P111363(s) {
+function music_playNoteCore__P85417(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35142,7 +34985,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___128838 = undefined;
+    s.buf___104190 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -35150,39 +34993,39 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim.control.createBuffer(12);
-    s.buf___128838 = (r0);
-    s.tmp_0 = music_addNote__P111370_mk(s);
-    s.tmp_0.arg0 = s.buf___128838;
+    s.buf___104190 = (r0);
+    s.tmp_0 = music_addNote__P85424_mk(s);
+    s.tmp_0.arg0 = s.buf___104190;
     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__P109351_mk(s);
-    s.callLocIdx = 1239; s.pc = 2; return s.tmp_1;
+    s.tmp_1 = music_volume__P82866_mk(s);
+    s.callLocIdx = 111; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg7 = r0;
     s.tmp_0.arg8 = s.arg1;
-    s.callLocIdx = 1240; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 112; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim.music.queuePlayInstructions(s.arg0, s.buf___128838);
+    r0 = pxsim.music.queuePlayInstructions(s.arg0, s.buf___104190);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_playNoteCore__P111363.info = {"start":1877,"length":240,"line":66,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"playNoteCore","argumentNames":["when","frequency","ms"]}
+music_playNoteCore__P85417.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"]}
 
-function music_playNoteCore__P111363_mk(s) {
+function music_playNoteCore__P85417_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_playNoteCore__P111363, depth: s.depth + 1,
+        parent: s, fn: music_playNoteCore__P85417, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  buf___128838: undefined,
+  buf___104190: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -35192,7 +35035,7 @@ function music_playNoteCore__P111363_mk(s) {
 
 
 
-function music_addNote__P111370(s) {
+function music_addNote__P85424(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35260,12 +35103,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_addNote__P111370.info = {"start":9705,"length":904,"line":308,"column":4,"endLine":321,"endColumn":5,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"addNote","argumentNames":["sndInstr","sndInstrPtr","ms","beg","end","soundWave","hz","volume","endHz"]}
+music_addNote__P85424.info = {"start":10086,"length":904,"line":315,"column":4,"endLine":328,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"addNote","argumentNames":["sndInstr","sndInstrPtr","ms","beg","end","soundWave","hz","volume","endHz"]}
 
-function music_addNote__P111370_mk(s) {
+function music_addNote__P85424_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_addNote__P111370, depth: s.depth + 1,
+        parent: s, fn: music_addNote__P85424, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35286,7 +35129,7 @@ function music_addNote__P111370_mk(s) {
 
 
 
-function music_setVolume__P109350(s) {
+function music_setVolume__P82865(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35300,16 +35143,16 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_clamp__P106731_mk(s);
+    s.tmp_0 = Math_clamp__P81395_mk(s);
     s.tmp_0.arg0 = 0;
     s.tmp_0.arg1 = 255;
     r0 = (s.arg0 | 0);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 1236; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 108; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.globalVolume___111358 = (r0);
-    r0 = (globals.globalVolume___111358 > 0);
+    globals.globalVolume___85412 = (r0);
+    r0 = (globals.globalVolume___85412 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -35325,12 +35168,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_setVolume__P109350.info = {"start":1533,"length":153,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"setVolume","argumentNames":["volume"]}
+music_setVolume__P82865.info = {"start":1533,"length":153,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"setVolume","argumentNames":["volume"]}
 
-function music_setVolume__P109350_mk(s) {
+function music_setVolume__P82865_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_setVolume__P109350, depth: s.depth + 1,
+        parent: s, fn: music_setVolume__P82865, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35341,7 +35184,7 @@ function music_setVolume__P109350_mk(s) {
 
 
 
-function music_enableAmp__P111361(s) {
+function music_enableAmp__P85415(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35359,12 +35202,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_enableAmp__P111361.info = {"start":944,"length":64,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"enableAmp","argumentNames":["en"]}
+music_enableAmp__P85415.info = {"start":944,"length":64,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"enableAmp","argumentNames":["en"]}
 
-function music_enableAmp__P111361_mk(s) {
+function music_enableAmp__P85415_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_enableAmp__P111361, depth: s.depth + 1,
+        parent: s, fn: music_enableAmp__P85415, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -35373,7 +35216,7 @@ function music_enableAmp__P111361_mk(s) {
 
 
 
-function scene_systemMenu_volumeUp__P111128(s) {
+function scene_systemMenu_volumeUp__P85967(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35383,120 +35226,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.v___128752 = undefined;
-    s.remainder___128755 = undefined;
-    s.newVolume___128758 = undefined;
-    s.tmp_0 = music_volume__P109351_mk(s);
-    s.callLocIdx = 1022; s.pc = 1; return s.tmp_0;
+    s.v___104104 = undefined;
+    s.remainder___104107 = undefined;
+    s.newVolume___104110 = undefined;
+    s.tmp_0 = music_volume__P82866_mk(s);
+    s.callLocIdx = 1026; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.v___128752 = (r0);
-    r0 = (s.v___128752 % 32);
-    s.remainder___128755 = (r0);
-    r0 = (s.v___128752 + 32);
+    s.v___104104 = (r0);
+    r0 = (s.v___104104 % 32);
+    s.remainder___104107 = (r0);
+    r0 = (s.v___104104 + 32);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.remainder___128755);
-    s.newVolume___128758 = (r0);
-    s.tmp_0 = scene_systemMenu_setVolume__P111127_mk(s);
-    s.tmp_0.arg0 = s.newVolume___128758;
-    s.callLocIdx = 1023; s.pc = 2; return s.tmp_0;
+    r0 = (s.tmp_0 - s.remainder___104107);
+    s.newVolume___104110 = (r0);
+    s.tmp_0 = scene_systemMenu_setVolume__P85966_mk(s);
+    s.tmp_0.arg0 = s.newVolume___104110;
+    s.callLocIdx = 1027; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_volumeUp__P111128.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__P111128_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: scene_systemMenu_volumeUp__P111128, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  v___128752: undefined,
-  remainder___128755: undefined,
-  newVolume___128758: undefined,
-} }
-
-
-
-
-
-function music_volume__P109351(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__P111362_mk(s);
-    s.callLocIdx = 1238; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = globals.globalVolume___111358;
-    return leave(s, r0)
-  default: oops()
-} } }
-music_volume__P109351.info = {"start":1781,"length":90,"line":61,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"volume","argumentNames":[]}
-
-function music_volume__P109351_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_volume__P109351, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-} }
-
-
-
-
-
-function music_initVolume__P111362(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___111358 === null);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    globals.globalVolume___111358 = (0);
-    s.tmp_0 = music_setVolume__P109350_mk(s);
-    r0 = pxsim_pxtcore.getConfig(59, 128);
-    s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1235; 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__P111362.info = {"start":1014,"length":180,"line":33,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"initVolume","argumentNames":[]}
+scene_systemMenu_volumeUp__P85967.info = {"start":8737,"length":171,"line":271,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"volumeUp","argumentNames":[]}
 
-function music_initVolume__P111362_mk(s) {
+function scene_systemMenu_volumeUp__P85967_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_initVolume__P111362, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_volumeUp__P85967, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  v___104104: undefined,
+  remainder___104107: undefined,
+  newVolume___104110: undefined,
 } }
 
 
 
 
 
-function game_consoleOverlay_isVisible__P109148(s) {
+function game_consoleOverlay_isVisible__P83927(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35506,7 +35276,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___111169);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___86008);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1 = r0;
@@ -35516,12 +35286,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_isVisible__P109148.info = {"start":422,"length":68,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/game---hw/console.ts","functionName":"isVisible","argumentNames":[]}
+game_consoleOverlay_isVisible__P83927.info = {"start":422,"length":68,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"isVisible","argumentNames":[]}
 
-function game_consoleOverlay_isVisible__P109148_mk(s) {
+function game_consoleOverlay_isVisible__P83927_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_isVisible__P109148, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_isVisible__P83927, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35532,7 +35302,7 @@ function game_consoleOverlay_isVisible__P109148_mk(s) {
 
 
 
-function scene_systemMenu_closeMenu__P109126(s) {
+function scene_systemMenu_closeMenu__P83905(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35542,21 +35312,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___111123);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___85962);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = scene_systemMenu_PauseMenu_dispose__P109125_mk(s);
-    s.tmp_0.arg0 = globals.instance___111123;
-    s.callLocIdx = 1038; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_PauseMenu_dispose__P83904_mk(s);
+    s.tmp_0.arg0 = globals.instance___85962;
+    s.callLocIdx = 1042; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.instance___111123 = (undefined);
-    s.tmp_0 = controller__setUserEventsEnabled__P108451_mk(s);
+    globals.instance___85962 = (undefined);
+    s.tmp_0 = controller__setUserEventsEnabled__P83227_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1039; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1043; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P109034_mk(s);
-    s.callLocIdx = 1040; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = game_popScene__P83813_mk(s);
+    s.callLocIdx = 1044; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -35565,12 +35335,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_closeMenu__P109126.info = {"start":10129,"length":216,"line":320,"column":4,"endLine":327,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"closeMenu","argumentNames":[]}
+scene_systemMenu_closeMenu__P83905.info = {"start":10129,"length":216,"line":320,"column":4,"endLine":327,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"closeMenu","argumentNames":[]}
 
-function scene_systemMenu_closeMenu__P109126_mk(s) {
+function scene_systemMenu_closeMenu__P83905_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_closeMenu__P109126, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_closeMenu__P83905, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -35579,7 +35349,7 @@ function scene_systemMenu_closeMenu__P109126_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_dispose__P109125(s) {
+function scene_systemMenu_PauseMenu_dispose__P83904(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35594,16 +35364,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C109119_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C83898_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__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P128081;
-    s.callLocIdx = 1015; s.pc = 3; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P103436;
+    s.callLocIdx = 1019; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["options"] = (undefined);
@@ -35613,12 +35383,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_dispose__P109125.info = {"start":7732,"length":165,"line":243,"column":8,"endLine":248,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_dispose__P83904.info = {"start":7732,"length":165,"line":243,"column":8,"endLine":248,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_dispose__P109125_mk(s) {
+function scene_systemMenu_PauseMenu_dispose__P83904_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_dispose__P109125, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_dispose__P83904, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35629,7 +35399,7 @@ function scene_systemMenu_PauseMenu_dispose__P109125_mk(s) {
 
 
 
-function inline__P128081(s) {
+function inline__P103436(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35643,21 +35413,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_systemMenu_MenuOption_dispose__P109118_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_dispose__P83897_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1014; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1018; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128081.info = {"start":7813,"length":16,"line":245,"column":37,"endLine":245,"endColumn":53,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":["o"]}
+inline__P103436.info = {"start":7813,"length":16,"line":245,"column":37,"endLine":245,"endColumn":53,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P128081_mk(s) {
+function inline__P103436_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128081, depth: s.depth + 1,
+        parent: s, fn: inline__P103436, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -35667,7 +35437,7 @@ function inline__P128081_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_dispose__P109118(s) {
+function scene_systemMenu_MenuOption_dispose__P83897(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35682,25 +35452,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_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__P108584_mk(s);
+    s.tmp_1 = Sprite_destroy__P83368_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 934; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 938; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_destroy__P108584_mk(s);
+    s.tmp_0 = Sprite_destroy__P83368_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 935; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 939; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["card"] = (undefined);
@@ -35711,12 +35481,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_dispose__P109118.info = {"start":1812,"length":216,"line":77,"column":8,"endLine":84,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
+scene_systemMenu_MenuOption_dispose__P83897.info = {"start":1812,"length":216,"line":77,"column":8,"endLine":84,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
 
-function scene_systemMenu_MenuOption_dispose__P109118_mk(s) {
+function scene_systemMenu_MenuOption_dispose__P83897_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_dispose__P109118, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_dispose__P83897, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35727,7 +35497,7 @@ function scene_systemMenu_MenuOption_dispose__P109118_mk(s) {
 
 
 
-function Sprite_destroy__P108584(s) {
+function Sprite_destroy__P83368(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35744,7 +35514,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 2);
@@ -35762,19 +35532,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__P109289_mk(s);
+    s.tmp_0 = effects_ParticleEffect_destroy__P84068_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 = 407; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 416; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    s.tmp_0 = Sprite__destroyCore__P108585_mk(s);
+    s.tmp_0 = Sprite__destroyCore__P83369_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 408; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 417; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 4:
@@ -35783,12 +35553,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_destroy__P108584.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"]}
+Sprite_destroy__P83368.info = {"start":29428,"length":293,"line":886,"column":4,"endLine":895,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"destroy","argumentNames":["this","effect","duration"]}
 
-function Sprite_destroy__P108584_mk(s) {
+function Sprite_destroy__P83368_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_destroy__P108584, depth: s.depth + 1,
+        parent: s, fn: Sprite_destroy__P83368, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35804,7 +35574,7 @@ function Sprite_destroy__P108584_mk(s) {
 
 
 
-function effects_ParticleEffect_destroy__P109289(s) {
+function effects_ParticleEffect_destroy__P84068(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35822,15 +35592,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C109286_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_setFlag__P108576_mk(s);
+    if (!checkSubtype(r0, effects_ParticleEffect__C84065_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_setFlag__P83360_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = 1;
+    s.tmp_0.arg1 = 7168;
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 1199; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1203; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = effects_ParticleEffect_start__P109288_mk(s);
+    s.tmp_0 = effects_ParticleEffect_start__P84067_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg3;
@@ -35847,7 +35617,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1200; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1204; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -35862,22 +35632,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__P109315_mk(s);
-    s.tmp_0.arg0 = globals.dissolve___109318;
+    s.tmp_0 = effects_ImageEffect_applyTo__P84094_mk(s);
+    s.tmp_0.arg0 = globals.dissolve___84097;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1201; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1205; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_destroy__P109289.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"]}
+effects_ParticleEffect_destroy__P84068.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"]}
 
-function effects_ParticleEffect_destroy__P109289_mk(s) {
+function effects_ParticleEffect_destroy__P84068_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_destroy__P109289, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_destroy__P84068, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35895,7 +35665,7 @@ function effects_ParticleEffect_destroy__P109289_mk(s) {
 
 
 
-function inline__P127053(s) {
+function inline__P102447(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35905,11 +35675,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___127056 = undefined;
-    s.x___127067 = undefined;
-    s.y___127073 = undefined;
-    s.w___127079 = undefined;
-    s.h___127083 = undefined;
+    s.i___102450 = undefined;
+    s.x___102461 = undefined;
+    s.y___102467 = undefined;
+    s.w___102473 = undefined;
+    s.h___102477 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -35922,79 +35692,79 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 5);
-    s.i___127056 = (r0);
+    s.i___102450 = (r0);
   case 1:
-    r0 = (s.i___127056 > 0);
+    r0 = (s.i___102450 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.tmp_1 = Math_FastRandom_randomRange__P83866_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 = 37; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 38; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.x___127067 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.x___102461 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P83866_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 = 38; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 39; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.y___127073 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.y___102467 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P83866_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 3;
-    s.callLocIdx = 39; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 40; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.w___127079 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.w___102473 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P83866_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 3;
-    s.callLocIdx = 40; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 41; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.h___127083 = (r0);
-    s.tmp_0 = helpers_imageDrawRect__P108227_mk(s);
+    s.h___102477 = (r0);
+    s.tmp_0 = helpers_imageDrawRect__P83004_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.x___127067;
-    s.tmp_0.arg2 = s.y___127073;
-    s.tmp_0.arg3 = s.w___127079;
-    s.tmp_0.arg4 = s.h___127083;
+    s.tmp_0.arg1 = s.x___102461;
+    s.tmp_0.arg2 = s.y___102467;
+    s.tmp_0.arg3 = s.w___102473;
+    s.tmp_0.arg4 = s.h___102477;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 41; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 42; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    r0 = (s.i___127056 - 1);
-    s.i___127056 = (r0);
+    r0 = (s.i___102450 - 1);
+    s.i___102450 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127053.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"]}
+inline__P102447.info = {"start":2199,"length":360,"line":60,"column":49,"endLine":69,"endColumn":5,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["input","r"]}
 
-function inline__P127053_mk(s) {
+function inline__P102447_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127053, depth: s.depth + 1,
+        parent: s, fn: inline__P102447, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  i___127056: undefined,
-  x___127067: undefined,
-  y___127073: undefined,
-  w___127079: undefined,
-  h___127083: undefined,
+  i___102450: undefined,
+  x___102461: undefined,
+  y___102467: undefined,
+  w___102473: undefined,
+  h___102477: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -36003,7 +35773,7 @@ function inline__P127053_mk(s) {
 
 
 
-function helpers_imageDrawRect__P108227(s) {
+function helpers_imageDrawRect__P83004(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36042,7 +35812,7 @@ switch (step) {
     s.arg3 = (r0);
     r0 = (s.arg4 - 1);
     s.arg4 = (r0);
-    s.tmp_0 = helpers_imageDrawLine__P108226_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P83003_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -36050,10 +35820,10 @@ switch (step) {
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg2;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 116; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 130; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P108226_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P83003_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -36061,10 +35831,10 @@ switch (step) {
     r0 = (s.arg2 + s.arg4);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 117; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 131; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P108226_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P83003_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg1 + s.arg3);
     s.tmp_0.arg1 = r0;
@@ -36074,10 +35844,10 @@ switch (step) {
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg2;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 118; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 132; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P108226_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P83003_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg1 + s.arg3);
     s.tmp_0.arg1 = r0;
@@ -36087,7 +35857,7 @@ switch (step) {
     r0 = (s.arg2 + s.arg4);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 119; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 133; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
   case 5:
@@ -36095,12 +35865,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawRect__P108227.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"]}
+helpers_imageDrawRect__P83004.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"]}
 
-function helpers_imageDrawRect__P108227_mk(s) {
+function helpers_imageDrawRect__P83004_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawRect__P108227, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawRect__P83004, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36116,7 +35886,7 @@ function helpers_imageDrawRect__P108227_mk(s) {
 
 
 
-function helpers_imageDrawLine__P108226(s) {
+function helpers_imageDrawLine__P83003(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36136,17 +35906,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_pack__P110634_mk(s);
+    s.tmp_2 = helpers_pack__P85449_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = s.arg2;
-    s.callLocIdx = 114; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 128; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = helpers_pack__P110634_mk(s);
+    s.tmp_4 = helpers_pack__P85449_mk(s);
     s.tmp_4.arg0 = s.arg3;
     s.tmp_4.arg1 = s.arg4;
-    s.callLocIdx = 115; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 129; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -36155,12 +35925,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawLine__P108226.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"]}
+helpers_imageDrawLine__P83003.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"]}
 
-function helpers_imageDrawLine__P108226_mk(s) {
+function helpers_imageDrawLine__P83003_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawLine__P108226, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawLine__P83003, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36179,7 +35949,7 @@ function helpers_imageDrawLine__P108226_mk(s) {
 
 
 
-function effects_ImageEffect_applyTo__P109315(s) {
+function effects_ImageEffect_applyTo__P84094(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36189,14 +35959,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.clonedImage___127163 = undefined;
+    s.clonedImage___102557 = 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__C109313_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C84092_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -36222,17 +35992,17 @@ switch (step) {
     r0 = s.arg1.fields["_image"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_5);
-    s.clonedImage___127163 = (r0);
-    s.tmp_0 = effects_ImageEffect_change__P109316_mk(s);
+    s.clonedImage___102557 = (r0);
+    s.tmp_0 = effects_ImageEffect_change__P84095_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.clonedImage___127163;
-    s.callLocIdx = 1212; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg1 = s.clonedImage___102557;
+    s.callLocIdx = 1216; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setImage__P108553_mk(s);
+    s.tmp_0 = Sprite_setImage__P83335_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.clonedImage___127163;
-    s.callLocIdx = 1213; s.pc = 7; return s.tmp_0;
+    s.tmp_0.arg1 = s.clonedImage___102557;
+    s.callLocIdx = 1217; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 5:
@@ -36240,12 +36010,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_applyTo__P109315.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"]}
+effects_ImageEffect_applyTo__P84094.info = {"start":823,"length":218,"line":21,"column":8,"endLine":26,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"applyTo","argumentNames":["this","sprite"]}
 
-function effects_ImageEffect_applyTo__P109315_mk(s) {
+function effects_ImageEffect_applyTo__P84094_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_applyTo__P109315, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_applyTo__P84094, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36253,7 +36023,7 @@ function effects_ImageEffect_applyTo__P109315_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  clonedImage___127163: undefined,
+  clonedImage___102557: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -36262,7 +36032,7 @@ function effects_ImageEffect_applyTo__P109315_mk(s) {
 
 
 
-function effects_ImageEffect_change__P109316(s) {
+function effects_ImageEffect_change__P84095(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36278,7 +36048,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C109313_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C84092_VT)) failedCast(r0);
     s.tmp_0 = if_effect_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
@@ -36286,12 +36056,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 = 1214; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 1218; 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 = 1214; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1214; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1214; 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 = 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; }
     }
   case 1:
     r0 = s.retval;
@@ -36299,12 +36069,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_change__P109316.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"]}
+effects_ImageEffect_change__P84095.info = {"start":1151,"length":81,"line":32,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"change","argumentNames":["this","input"]}
 
-function effects_ImageEffect_change__P109316_mk(s) {
+function effects_ImageEffect_change__P84095_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_change__P109316, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_change__P84095, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36315,7 +36085,7 @@ function effects_ImageEffect_change__P109316_mk(s) {
 
 
 
-function Sprite_setImage__P108553(s) {
+function Sprite_setImage__P83335(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36331,7 +36101,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -36342,9 +36112,9 @@ switch (step) {
   case 1:
   case 2:
     r0 = (s.arg0).fields["_image"] = (s.arg1);
-    s.tmp_0 = Sprite_setHitbox__P108554_mk(s);
+    s.tmp_0 = Sprite_setHitbox__P83336_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 286; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 295; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 3:
@@ -36352,12 +36122,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setImage__P108553.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"]}
+Sprite_setImage__P83335.info = {"start":7108,"length":133,"line":258,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setImage","argumentNames":["this","img"]}
 
-function Sprite_setImage__P108553_mk(s) {
+function Sprite_setImage__P83335_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setImage__P108553, depth: s.depth + 1,
+        parent: s, fn: Sprite_setImage__P83335, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36369,7 +36139,7 @@ function Sprite_setImage__P108553_mk(s) {
 
 
 
-function Sprite_setHitbox__P108554(s) {
+function Sprite_setHitbox__P83336(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36379,29 +36149,29 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.newHitBox___126184 = undefined;
-    s.oMinX___126192 = undefined;
-    s.oMinY___126196 = undefined;
-    s.oMaxX___126200 = undefined;
-    s.oMaxY___126207 = undefined;
-    s.nMinX___126214 = undefined;
-    s.nMinY___126217 = undefined;
-    s.nMaxX___126220 = undefined;
-    s.nMaxY___126226 = undefined;
-    s.xDiff___126232 = undefined;
-    s.yDiff___126243 = undefined;
+    s.newHitBox___101577 = undefined;
+    s.oMinX___101585 = undefined;
+    s.oMinY___101589 = undefined;
+    s.oMaxX___101593 = undefined;
+    s.oMaxY___101600 = undefined;
+    s.nMinX___101607 = undefined;
+    s.nMinY___101610 = undefined;
+    s.nMaxX___101613 = undefined;
+    s.nMaxY___101619 = undefined;
+    s.xDiff___101625 = undefined;
+    s.yDiff___101636 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = game_calculateHitBox__P108467_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = game_calculateHitBox__P83243_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 287; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 296; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.newHitBox___126184 = (r0);
+    s.newHitBox___101577 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -36410,95 +36180,95 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___126184);
+    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___101577);
     { step = 7; continue; }
   case 1:
   case 2:
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["ox"];
-    s.oMinX___126192 = (r0);
+    s.oMinX___101585 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["oy"];
-    s.oMinY___126196 = (r0);
+    s.oMinY___101589 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["width"];
     s.tmp_0 = r0;
-    r0 = (s.oMinX___126192 + s.tmp_0);
-    s.oMaxX___126200 = (r0);
+    r0 = (s.oMinX___101585 + s.tmp_0);
+    s.oMaxX___101593 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["height"];
     s.tmp_0 = r0;
-    r0 = (s.oMinY___126196 + s.tmp_0);
-    s.oMaxY___126207 = (r0);
-    r0 = s.newHitBox___126184.fields["ox"];
-    s.nMinX___126214 = (r0);
-    r0 = s.newHitBox___126184.fields["oy"];
-    s.nMinY___126217 = (r0);
-    r0 = s.newHitBox___126184.fields["width"];
-    s.tmp_0 = r0;
-    r0 = (s.nMinX___126214 + s.tmp_0);
-    s.nMaxX___126220 = (r0);
-    r0 = s.newHitBox___126184.fields["height"];
-    s.tmp_0 = r0;
-    r0 = (s.nMinY___126217 + s.tmp_0);
-    s.nMaxY___126226 = (r0);
-    s.tmp_1 = Fx_abs__P106769_mk(s);
-    r0 = (s.oMinX___126192 - s.nMinX___126214);
+    r0 = (s.oMinY___101589 + s.tmp_0);
+    s.oMaxY___101600 = (r0);
+    r0 = s.newHitBox___101577.fields["ox"];
+    s.nMinX___101607 = (r0);
+    r0 = s.newHitBox___101577.fields["oy"];
+    s.nMinY___101610 = (r0);
+    r0 = s.newHitBox___101577.fields["width"];
+    s.tmp_0 = r0;
+    r0 = (s.nMinX___101607 + s.tmp_0);
+    s.nMaxX___101613 = (r0);
+    r0 = s.newHitBox___101577.fields["height"];
+    s.tmp_0 = r0;
+    r0 = (s.nMinY___101610 + s.tmp_0);
+    s.nMaxY___101619 = (r0);
+    s.tmp_1 = Fx_abs__P81433_mk(s);
+    r0 = (s.oMinX___101585 - s.nMinX___101607);
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 293; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 302; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Fx_abs__P106769_mk(s);
-    r0 = (s.oMaxX___126200 - s.nMaxX___126220);
+    s.tmp_3 = Fx_abs__P81433_mk(s);
+    r0 = (s.oMaxX___101593 - s.nMaxX___101613);
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 295; s.pc = 10; return s.tmp_3;
+    s.callLocIdx = 304; 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___126232 = (r0);
-    s.tmp_1 = Fx_abs__P106769_mk(s);
-    r0 = (s.oMinY___126196 - s.nMinY___126217);
+    s.xDiff___101625 = (r0);
+    s.tmp_1 = Fx_abs__P81433_mk(s);
+    r0 = (s.oMinY___101589 - s.nMinY___101610);
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 298; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 307; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Fx_abs__P106769_mk(s);
-    r0 = (s.oMaxY___126207 - s.nMaxY___126226);
+    s.tmp_3 = Fx_abs__P81433_mk(s);
+    r0 = (s.oMaxY___101600 - s.nMaxY___101619);
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 300; s.pc = 12; return s.tmp_3;
+    s.callLocIdx = 309; 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___126243 = (r0);
-    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___126184);
-    r0 = (s.xDiff___126232 <= 512);
+    s.yDiff___101636 = (r0);
+    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___101577);
+    r0 = (s.xDiff___101625 <= 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___126192);
+    r0 = (s.tmp_1).fields["ox"] = (s.oMinX___101585);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_0 = r0;
-    r0 = (s.oMaxX___126200 - s.oMinX___126192);
+    r0 = (s.oMaxX___101593 - s.oMinX___101585);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["width"] = (s.tmp_1);
   case 3:
   case 4:
-    r0 = (s.yDiff___126243 <= 512);
+    r0 = (s.yDiff___101636 <= 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___126196);
+    r0 = (s.tmp_1).fields["oy"] = (s.oMinY___101589);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_0 = r0;
-    r0 = (s.oMaxY___126207 - s.oMinY___126196);
+    r0 = (s.oMaxY___101600 - s.oMinY___101589);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["height"] = (s.tmp_1);
   case 5:
@@ -36508,28 +36278,28 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setHitbox__P108554.info = {"start":6964,"length":1296,"line":258,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"setHitbox","argumentNames":["this"]}
+Sprite_setHitbox__P83336.info = {"start":7247,"length":1296,"line":264,"column":4,"endLine":303,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setHitbox","argumentNames":["this"]}
 
-function Sprite_setHitbox__P108554_mk(s) {
+function Sprite_setHitbox__P83336_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setHitbox__P108554, depth: s.depth + 1,
+        parent: s, fn: Sprite_setHitbox__P83336, 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___126184: undefined,
-  oMinX___126192: undefined,
-  oMinY___126196: undefined,
-  oMaxX___126200: undefined,
-  oMaxY___126207: undefined,
-  nMinX___126214: undefined,
-  nMinY___126217: undefined,
-  nMaxX___126220: undefined,
-  nMaxY___126226: undefined,
-  xDiff___126232: undefined,
-  yDiff___126243: undefined,
+  newHitBox___101577: undefined,
+  oMinX___101585: undefined,
+  oMinY___101589: undefined,
+  oMaxX___101593: undefined,
+  oMaxY___101600: undefined,
+  nMinX___101607: undefined,
+  nMinY___101610: undefined,
+  nMaxX___101613: undefined,
+  nMaxY___101619: undefined,
+  xDiff___101625: undefined,
+  yDiff___101636: undefined,
   arg0: undefined,
 } }
 
@@ -36537,7 +36307,7 @@ function Sprite_setHitbox__P108554_mk(s) {
 
 
 
-function game_calculateHitBox__P108467(s) {
+function game_calculateHitBox__P83243(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36547,132 +36317,132 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___126292 = undefined;
-    s.minX___126295 = undefined;
-    s.minY___126298 = undefined;
-    s.maxX___126301 = undefined;
-    s.maxY___126302 = undefined;
-    s.c___126303 = undefined;
-    s.r___126309 = undefined;
-    s.width___126340 = undefined;
-    s.height___126346 = undefined;
+    s.i___101685 = undefined;
+    s.minX___101688 = undefined;
+    s.minY___101691 = undefined;
+    s.maxX___101694 = undefined;
+    s.maxY___101695 = undefined;
+    s.c___101696 = undefined;
+    s.r___101702 = undefined;
+    s.width___101733 = undefined;
+    s.height___101739 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0.fields["_image"];
-    s.i___126292 = (r0);
-    r0 = pxsim_ImageMethods.width(s.i___126292);
-    s.minX___126295 = (r0);
-    r0 = pxsim_ImageMethods.height(s.i___126292);
-    s.minY___126298 = (r0);
-    s.maxX___126301 = (0);
-    s.maxY___126302 = (0);
-    s.c___126303 = (0);
-  case 1:
-    s.tmp_1 = r0 = s.c___126303;
-    r0 = pxsim_ImageMethods.width(s.i___126292);
+    s.i___101685 = (r0);
+    r0 = pxsim_ImageMethods.width(s.i___101685);
+    s.minX___101688 = (r0);
+    r0 = pxsim_ImageMethods.height(s.i___101685);
+    s.minY___101691 = (r0);
+    s.maxX___101694 = (0);
+    s.maxY___101695 = (0);
+    s.c___101696 = (0);
+  case 1:
+    s.tmp_1 = r0 = s.c___101696;
+    r0 = pxsim_ImageMethods.width(s.i___101685);
     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___126309 = (0);
+    s.r___101702 = (0);
   case 2:
-    s.tmp_1 = r0 = s.r___126309;
-    r0 = pxsim_ImageMethods.height(s.i___126292);
+    s.tmp_1 = r0 = s.r___101702;
+    r0 = pxsim_ImageMethods.height(s.i___101685);
     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___126292, s.c___126303, s.r___126309);
+    r0 = pxsim_ImageMethods.getPixel(s.i___101685, s.c___101696, s.r___101702);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = Math_min__P106735_mk(s);
-    s.tmp_4.arg0 = s.minX___126295;
-    s.tmp_4.arg1 = s.c___126303;
-    s.callLocIdx = 246; s.pc = 7; return s.tmp_4;
+    s.tmp_4 = Math_min__P81399_mk(s);
+    s.tmp_4.arg0 = s.minX___101688;
+    s.tmp_4.arg1 = s.c___101696;
+    s.callLocIdx = 255; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
-    s.minX___126295 = (r0);
-    s.tmp_0 = Math_min__P106735_mk(s);
-    s.tmp_0.arg0 = s.minY___126298;
-    s.tmp_0.arg1 = s.r___126309;
-    s.callLocIdx = 247; s.pc = 8; return s.tmp_0;
+    s.minX___101688 = (r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
+    s.tmp_0.arg0 = s.minY___101691;
+    s.tmp_0.arg1 = s.r___101702;
+    s.callLocIdx = 256; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.minY___126298 = (r0);
-    s.tmp_0 = Math_max__P106734_mk(s);
-    s.tmp_0.arg0 = s.maxX___126301;
-    s.tmp_0.arg1 = s.c___126303;
-    s.callLocIdx = 248; s.pc = 9; return s.tmp_0;
+    s.minY___101691 = (r0);
+    s.tmp_0 = Math_max__P81398_mk(s);
+    s.tmp_0.arg0 = s.maxX___101694;
+    s.tmp_0.arg1 = s.c___101696;
+    s.callLocIdx = 257; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.maxX___126301 = (r0);
-    s.tmp_0 = Math_max__P106734_mk(s);
-    s.tmp_0.arg0 = s.maxY___126302;
-    s.tmp_0.arg1 = s.r___126309;
-    s.callLocIdx = 249; s.pc = 10; return s.tmp_0;
+    s.maxX___101694 = (r0);
+    s.tmp_0 = Math_max__P81398_mk(s);
+    s.tmp_0.arg0 = s.maxY___101695;
+    s.tmp_0.arg1 = s.r___101702;
+    s.callLocIdx = 258; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.maxY___126302 = (r0);
+    s.maxY___101695 = (r0);
   case 3:
   case 4:
-    r0 = (s.r___126309 + 1);
-    s.r___126309 = (r0);
+    r0 = (s.r___101702 + 1);
+    s.r___101702 = (r0);
     { step = 2; continue; }
   case 5:
-    r0 = (s.c___126303 + 1);
-    s.c___126303 = (r0);
+    r0 = (s.c___101696 + 1);
+    s.c___101696 = (r0);
     { step = 1; continue; }
   case 6:
-    r0 = (s.maxX___126301 - s.minX___126295);
+    r0 = (s.maxX___101694 - s.minX___101688);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.width___126340 = (r0);
-    r0 = (s.maxY___126302 - s.minY___126298);
+    s.width___101733 = (r0);
+    r0 = (s.maxY___101695 - s.minY___101691);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.height___126346 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(game_Hitbox__C108456_VT);
+    s.height___101739 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(game_Hitbox__C83232_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_Hitbox_constructor__P108462_mk(s);
+    s.tmp_1 = game_Hitbox_constructor__P83238_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.tmp_1.arg2 = s.width___126340;
-    s.tmp_1.arg3 = s.height___126346;
-    s.tmp_1.arg4 = s.minX___126295;
-    s.tmp_1.arg5 = s.minY___126298;
-    s.callLocIdx = 250; s.pc = 11; return s.tmp_1;
+    s.tmp_1.arg2 = s.width___101733;
+    s.tmp_1.arg3 = s.height___101739;
+    s.tmp_1.arg4 = s.minX___101688;
+    s.tmp_1.arg5 = s.minY___101691;
+    s.callLocIdx = 259; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-game_calculateHitBox__P108467.info = {"start":894,"length":684,"line":40,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game---hw/hitbox.ts","functionName":"calculateHitBox","argumentNames":["s"]}
+game_calculateHitBox__P83243.info = {"start":894,"length":684,"line":40,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game/hitbox.ts","functionName":"calculateHitBox","argumentNames":["s"]}
 
-function game_calculateHitBox__P108467_mk(s) {
+function game_calculateHitBox__P83243_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_calculateHitBox__P108467, depth: s.depth + 1,
+        parent: s, fn: game_calculateHitBox__P83243, 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___126292: undefined,
-  minX___126295: undefined,
-  minY___126298: undefined,
-  maxX___126301: undefined,
-  maxY___126302: undefined,
-  c___126303: undefined,
-  r___126309: undefined,
-  width___126340: undefined,
-  height___126346: undefined,
+  i___101685: undefined,
+  minX___101688: undefined,
+  minY___101691: undefined,
+  maxX___101694: undefined,
+  maxY___101695: undefined,
+  c___101696: undefined,
+  r___101702: undefined,
+  width___101733: undefined,
+  height___101739: undefined,
   arg0: undefined,
 } }
 
@@ -36680,7 +36450,7 @@ function game_calculateHitBox__P108467_mk(s) {
 
 
 
-function game_Hitbox_constructor__P108462(s) {
+function game_Hitbox_constructor__P83238(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36700,7 +36470,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C108456_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C83232_VT)) failedCast(r0);
     r0 = (s.arg0).fields["parent"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg2 * 256);
@@ -36730,12 +36500,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Hitbox_constructor__P108462.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"]}
+game_Hitbox_constructor__P83238.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"]}
 
-function game_Hitbox_constructor__P108462_mk(s) {
+function game_Hitbox_constructor__P83238_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_constructor__P108462, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_constructor__P83238, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36752,7 +36522,7 @@ function game_Hitbox_constructor__P108462_mk(s) {
 
 
 
-function Fx_abs__P106769(s) {
+function Fx_abs__P81433(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36782,12 +36552,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_abs__P106769.info = {"start":1506,"length":164,"line":44,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"abs","argumentNames":["a"]}
+Fx_abs__P81433.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__P106769_mk(s) {
+function Fx_abs__P81433_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_abs__P106769, depth: s.depth + 1,
+        parent: s, fn: Fx_abs__P81433, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36797,7 +36567,7 @@ function Fx_abs__P106769_mk(s) {
 
 
 
-function Fx_sub__P106763(s) {
+function Fx_sub__P81427(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36816,12 +36586,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_sub__P106763.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__P81427.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__P106763_mk(s) {
+function Fx_sub__P81427_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_sub__P106763, depth: s.depth + 1,
+        parent: s, fn: Fx_sub__P81427, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -36831,7 +36601,7 @@ function Fx_sub__P106763_mk(s) {
 
 
 
-function Sprite_image__P108552(s) {
+function Sprite_image__P83334(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36846,18 +36616,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_image__P108552.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__P108552.isGetter = true;
+Sprite_image__P83334.info = {"start":6832,"length":54,"line":248,"column":4,"endLine":250,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"image","argumentNames":["this"]}
+Sprite_image__P83334.isGetter = true;
 
-function Sprite_image__P108552_mk(s) {
+function Sprite_image__P83334_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_image__P108552, depth: s.depth + 1,
+        parent: s, fn: Sprite_image__P83334, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -36866,7 +36636,7 @@ function Sprite_image__P108552_mk(s) {
 
 
 
-function effects_ParticleEffect_start__P109288(s) {
+function effects_ParticleEffect_start__P84067(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36876,7 +36646,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.src___127187 = undefined;
+    s.src___102581 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -36886,7 +36656,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C109286_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ParticleEffect__C84065_VT)) failedCast(r0);
     r0 = s.arg0.fields["sourceFactory"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -36913,18 +36683,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 = 1197; s.pc = 10; return s.tmp_4;
+      s.callLocIdx = 1201; 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 = 1197; s.pc = 10; return s.tmp_4; }
-      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1197; s.pc = 10; return s.tmp_4;; }
-     else { s.callLocIdx = 1197; 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 = 1201; s.pc = 10; return s.tmp_4; }
+      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1201; s.pc = 10; return s.tmp_4;; }
+     else { s.callLocIdx = 1201; s.pc = 10; return s.tmp_4; }
     }
   case 10:
     r0 = s.retval;
-    s.src___127187 = (r0);
-    s.tmp_0 = particles_ParticleSource_setRelativeToCamera__P109186_mk(s);
-    s.tmp_0.arg0 = s.src___127187;
+    s.src___102581 = (r0);
+    s.tmp_0 = particles_ParticleSource_setRelativeToCamera__P83965_mk(s);
+    s.tmp_0.arg0 = s.src___102581;
     r0 = pxsim_numops_toBoolDecr(s.arg4);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
@@ -36933,7 +36703,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1198; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1202; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -36949,7 +36719,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.src___127187).fields["lifespan"] = (s.tmp_1);
+    r0 = (s.src___102581).fields["lifespan"] = (s.tmp_1);
   case 7:
   case 8:
   case 9:
@@ -36957,19 +36727,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_start__P109288.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"]}
+effects_ParticleEffect_start__P84067.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"]}
 
-function effects_ParticleEffect_start__P109288_mk(s) {
+function effects_ParticleEffect_start__P84067_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_start__P109288, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_start__P84067, 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___127187: undefined,
+  src___102581: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -36981,7 +36751,7 @@ function effects_ParticleEffect_start__P109288_mk(s) {
 
 
 
-function particles_ParticleSource_setRelativeToCamera__P109186(s) {
+function particles_ParticleSource_setRelativeToCamera__P83965(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36997,7 +36767,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -37023,12 +36793,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setRelativeToCamera__P109186.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"]}
+particles_ParticleSource_setRelativeToCamera__P83965.info = {"start":6422,"length":173,"line":210,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRelativeToCamera","argumentNames":["this","on"]}
 
-function particles_ParticleSource_setRelativeToCamera__P109186_mk(s) {
+function particles_ParticleSource_setRelativeToCamera__P83965_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setRelativeToCamera__P109186, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setRelativeToCamera__P83965, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37043,7 +36813,7 @@ function particles_ParticleSource_setRelativeToCamera__P109186_mk(s) {
 
 
 
-function Sprite_setFlag__P108576(s) {
+function Sprite_setFlag__P83360(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37060,7 +36830,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -37095,12 +36865,12 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = Sprite_setFlag__P108576_mk(s);
+    s.tmp_2 = Sprite_setFlag__P83360_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 = 385; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 394; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
   case 5:
@@ -37109,12 +36879,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setFlag__P108576.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"]}
+Sprite_setFlag__P83360.info = {"start":24892,"length":292,"line":759,"column":4,"endLine":766,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setFlag","argumentNames":["this","flag","on"]}
 
-function Sprite_setFlag__P108576_mk(s) {
+function Sprite_setFlag__P83360_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setFlag__P108576, depth: s.depth + 1,
+        parent: s, fn: Sprite_setFlag__P83360, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37130,7 +36900,7 @@ function Sprite_setFlag__P108576_mk(s) {
 
 
 
-function Sprite__destroyCore__P108585(s) {
+function Sprite__destroyCore__P83369(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37140,39 +36910,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___126971 = undefined;
+    s.scene___102365 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P109029_mk(s);
-    s.callLocIdx = 409; s.pc = 9; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 418; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.scene___126971 = (r0);
+    s.scene___102365 = (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__P108584_mk(s);
+    s.tmp_1 = Sprite_destroy__P83368_mk(s);
     r0 = s.arg0.fields["sayBubbleSprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 410; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 419; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = s.scene___126971.fields["allSprites"];
+    r0 = s.scene___102365.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg0);
     r0 = s.arg0.fields["_kind"];
@@ -37184,7 +36954,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = s.scene___126971.fields["spritesByKind"];
+    r0 = s.scene___102365.fields["spritesByKind"];
     s.tmp_2 = r0;
     r0 = s.arg0.fields["_kind"];
     s.tmp_3 = r0;
@@ -37194,24 +36964,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__P108615_mk(s);
-    r0 = s.scene___126971.fields["spritesByKind"];
+    s.tmp_5 = sprites_SpriteSet_remove__P83399_mk(s);
+    r0 = s.scene___102365.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 = 414; s.pc = 11; return s.tmp_5;
+    s.callLocIdx = 423; s.pc = 11; return s.tmp_5;
   case 11:
     r0 = s.retval;
   case 5:
   case 6:
-    s.tmp_0 = PhysicsEngine__C108656_v1_2_mk(s);
-    r0 = s.scene___126971.fields["physicsEngine"];
+    s.tmp_0 = PhysicsEngine__C83440_v1_2_mk(s);
+    r0 = s.scene___102365.fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C108656_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C83440_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:
@@ -37224,46 +36994,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 = 415; s.pc = 13; return s.tmp_1;
+      s.callLocIdx = 424; 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 = 415; s.pc = 13; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 415; s.pc = 13; return s.tmp_1;; }
-     else { s.callLocIdx = 415; 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 = 424; s.pc = 13; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 424; s.pc = 13; return s.tmp_1;; }
+     else { s.callLocIdx = 424; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127007);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P102401);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127014);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P102408);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P106717_mk(s);
-    r0 = s.scene___126971.fields["destroyedHandlers"];
+    s.tmp_2 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P81379_mk(s);
+    r0 = s.scene___102365.fields["destroyedHandlers"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 417; s.pc = 15; return s.tmp_3;
+    s.callLocIdx = 426; 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 = 419; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 428; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite__destroyCore__P108585.info = {"start":28711,"length":693,"line":869,"column":4,"endLine":885,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"_destroyCore","argumentNames":["this"]}
+Sprite__destroyCore__P83369.info = {"start":29727,"length":693,"line":897,"column":4,"endLine":913,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"_destroyCore","argumentNames":["this"]}
 
-function Sprite__destroyCore__P108585_mk(s) {
+function Sprite__destroyCore__P83369_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite__destroyCore__P108585, depth: s.depth + 1,
+        parent: s, fn: Sprite__destroyCore__P83369, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37273,7 +37043,7 @@ function Sprite__destroyCore__P108585_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  scene___126971: undefined,
+  scene___102365: undefined,
   arg0: undefined,
 } }
 
@@ -37281,7 +37051,7 @@ function Sprite__destroyCore__P108585_mk(s) {
 
 
 
-function inline__P127007(s) {
+function inline__P102401(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37303,12 +37073,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127007.info = {"start":29327,"length":26,"line":883,"column":20,"endLine":883,"endColumn":46,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P102401.info = {"start":30343,"length":26,"line":911,"column":20,"endLine":911,"endColumn":46,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P127007_mk(s) {
+function inline__P102401_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127007, depth: s.depth + 1,
+        parent: s, fn: inline__P102401, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37319,7 +37089,7 @@ function inline__P127007_mk(s) {
 
 
 
-function inline__P127014(s) {
+function inline__P102408(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37338,12 +37108,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 = 427; 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 = 427; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 427; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 427; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -37351,12 +37121,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127014.info = {"start":29376,"length":20,"line":884,"column":21,"endLine":884,"endColumn":41,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P102408.info = {"start":30392,"length":20,"line":912,"column":21,"endLine":912,"endColumn":41,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P127014_mk(s) {
+function inline__P102408_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127014, depth: s.depth + 1,
+        parent: s, fn: inline__P102408, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -37366,7 +37136,7 @@ function inline__P127014_mk(s) {
 
 
 
-function PhysicsEngine_removeSprite__P108659(s) {
+function PhysicsEngine_removeSprite__P83443(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37382,17 +37152,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C108656_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C83440_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_removeSprite__P108659.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"]}
+PhysicsEngine_removeSprite__P83443.info = {"start":159,"length":32,"line":10,"column":4,"endLine":10,"endColumn":36,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
 
-function PhysicsEngine_removeSprite__P108659_mk(s) {
+function PhysicsEngine_removeSprite__P83443_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_removeSprite__P108659, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_removeSprite__P83443, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -37402,7 +37172,7 @@ function PhysicsEngine_removeSprite__P108659_mk(s) {
 
 
 
-function sprites_SpriteSet_remove__P108615(s) {
+function sprites_SpriteSet_remove__P83399(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37412,28 +37182,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___126785 = undefined;
+    s.i___102179 = 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__C108608_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C83392_VT)) failedCast(r0);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_0, s.arg1, undefined);
-    s.i___126785 = (r0);
-    r0 = (s.i___126785 > -1);
+    s.i___102179 = (r0);
+    r0 = (s.i___102179 > -1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_arraySplice__P106707_mk(s);
+    s.tmp_1 = helpers_arraySplice__P81369_mk(s);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.i___126785;
+    s.tmp_1.arg1 = s.i___102179;
     s.tmp_1.arg2 = 1;
-    s.callLocIdx = 465; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 474; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     r0 = true;
@@ -37445,16 +37215,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_remove__P108615.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"]}
+sprites_SpriteSet_remove__P83399.info = {"start":1816,"length":235,"line":66,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"remove","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_remove__P108615_mk(s) {
+function sprites_SpriteSet_remove__P83399_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_remove__P108615, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_remove__P83399, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  i___126785: undefined,
+  i___102179: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -37463,7 +37233,7 @@ function sprites_SpriteSet_remove__P108615_mk(s) {
 
 
 
-function Sprite_kind__P108567(s) {
+function Sprite_kind__P83349(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37478,17 +37248,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["_kind"];
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_kind__P108567.info = {"start":10604,"length":41,"line":387,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"kind","argumentNames":["this"]}
+Sprite_kind__P83349.info = {"start":10887,"length":41,"line":393,"column":4,"endLine":395,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"kind","argumentNames":["this"]}
 
-function Sprite_kind__P108567_mk(s) {
+function Sprite_kind__P83349_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_kind__P108567, depth: s.depth + 1,
+        parent: s, fn: Sprite_kind__P83349, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -37497,7 +37267,7 @@ function Sprite_kind__P108567_mk(s) {
 
 
 
-function game_popScene__P109034(s) {
+function game_popScene__P83813(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37507,59 +37277,59 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.oldScene___125664 = undefined;
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 870; s.pc = 11; return s.tmp_0;
+    s.oldScene___101048 = undefined;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 874; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.oldScene___125664 = (r0);
-    s.tmp_0 = r0 = globals._sceneStack___110872;
+    s.oldScene___101048 = (r0);
+    s.tmp_0 = r0 = globals._sceneStack___85711;
     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___110872);
+    r0 = pxsim_Array__length(globals._sceneStack___85711);
   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___110872);
-    globals._scene___110871 = (r0);
-    s.tmp_0 = control_popEventContext__P107008_mk(s);
-    s.callLocIdx = 871; s.pc = 12; return s.tmp_0;
+    r0 = pxsim_Array_.pop(globals._sceneStack___85711);
+    globals._scene___85710 = (r0);
+    s.tmp_0 = control_popEventContext__P81672_mk(s);
+    s.callLocIdx = 875; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 3:
-    r0 = pxsim_numops_toBoolDecr(globals._scene___110871);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___85710);
     if (!r0) { step = 4; continue; }
-    s.tmp_0 = control_popEventContext__P107008_mk(s);
-    s.callLocIdx = 872; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = control_popEventContext__P81672_mk(s);
+    s.callLocIdx = 876; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    globals._scene___110871 = (undefined);
+    globals._scene___85710 = (undefined);
   case 4:
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(globals._scene___110871);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___85710);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = particles_enableAll__P109207_mk(s);
-    s.callLocIdx = 873; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = particles_enableAll__P83986_mk(s);
+    s.callLocIdx = 877; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___110874);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___85713);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P125685);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P101069);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___125664);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1.arg0 = globals._scenePopHandlers___110874;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___101048);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1.arg0 = globals._scenePopHandlers___85713;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 875; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 879; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
   case 9:
@@ -37568,23 +37338,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_popScene__P109034.info = {"start":2033,"length":548,"line":75,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"popScene","argumentNames":[]}
+game_popScene__P83813.info = {"start":2033,"length":548,"line":75,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"popScene","argumentNames":[]}
 
-function game_popScene__P109034_mk(s) {
+function game_popScene__P83813_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_popScene__P109034, depth: s.depth + 1,
+        parent: s, fn: game_popScene__P83813, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  oldScene___125664: undefined,
+  oldScene___101048: undefined,
 } }
 
 
 
 
 
-function inline__P125685(s) {
+function inline__P101069(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37602,19 +37372,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 = 874; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 878; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P125685.info = {"start":2545,"length":18,"line":91,"column":38,"endLine":91,"endColumn":56,"fileName":"pxt_modules/game---hw/game.ts","functionName":"inline","argumentNames":["cb"]}
+inline__P101069.info = {"start":2545,"length":18,"line":91,"column":38,"endLine":91,"endColumn":56,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["cb"]}
 
-function inline__P125685_mk(s) {
+function inline__P101069_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P125685, depth: s.depth + 1,
+        parent: s, fn: inline__P101069, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -37624,7 +37394,7 @@ function inline__P125685_mk(s) {
 
 
 
-function particles_enableAll__P109207(s) {
+function particles_enableAll__P83986(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37634,22 +37404,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___125689 = undefined;
-    s.tmp_0 = particles_particleSources__P111235_mk(s);
-    s.callLocIdx = 1143; s.pc = 3; return s.tmp_0;
+    s.sources___101073 = undefined;
+    s.tmp_0 = particles_particleSources__P86074_mk(s);
+    s.callLocIdx = 1147; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___125689 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___125689);
+    s.sources___101073 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___101073);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_0.arg0 = s.sources___125689;
-    s.tmp_0.arg1 = inline__P125695;
-    s.callLocIdx = 1145; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_0.arg0 = s.sources___101073;
+    s.tmp_0.arg1 = inline__P101079;
+    s.callLocIdx = 1149; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P111231_mk(s);
-    s.callLocIdx = 1146; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P86070_mk(s);
+    s.callLocIdx = 1150; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -37658,22 +37428,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_enableAll__P109207.info = {"start":12632,"length":193,"line":412,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"enableAll","argumentNames":[]}
+particles_enableAll__P83986.info = {"start":12632,"length":193,"line":412,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"enableAll","argumentNames":[]}
 
-function particles_enableAll__P109207_mk(s) {
+function particles_enableAll__P83986_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_enableAll__P109207, depth: s.depth + 1,
+        parent: s, fn: particles_enableAll__P83986, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___125689: undefined,
+  sources___101073: undefined,
 } }
 
 
 
 
 
-function inline__P125695(s) {
+function inline__P101079(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37687,22 +37457,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_enabled__P109188_mk(s);
+    s.tmp_0 = particles_ParticleSource_enabled__P83967_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1144; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1148; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = true;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P125695.info = {"start":12756,"length":21,"line":415,"column":28,"endLine":415,"endColumn":49,"fileName":"pxt_modules/game---hw/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P101079.info = {"start":12756,"length":21,"line":415,"column":28,"endLine":415,"endColumn":49,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P125695_mk(s) {
+function inline__P101079_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P125695, depth: s.depth + 1,
+        parent: s, fn: inline__P101079, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -37712,7 +37482,7 @@ function inline__P125695_mk(s) {
 
 
 
-function control_popEventContext__P107008(s) {
+function control_popEventContext__P81672(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37722,9 +37492,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___124804 = undefined;
-    s.context___124812 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___110597);
+    s.ctx___100157 = undefined;
+    s.context___100165 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___85381);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -37733,9 +37503,9 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    r0 = pxsim_Array_.pop(globals.eventContexts___110597);
-    s.ctx___124804 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___124804);
+    r0 = pxsim_Array_.pop(globals.eventContexts___85381);
+    s.ctx___100157 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___100157);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -37744,53 +37514,53 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_2 = control_EventContext_unregister__P107000_mk(s);
-    s.tmp_2.arg0 = s.ctx___124804;
+    s.tmp_2 = control_EventContext_unregister__P81664_mk(s);
+    s.tmp_2.arg0 = s.ctx___100157;
     s.callLocIdx = 103; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.eventContexts___110597;
-    r0 = pxsim_Array__length(globals.eventContexts___110597);
+    s.tmp_0 = r0 = globals.eventContexts___85381;
+    r0 = pxsim_Array__length(globals.eventContexts___85381);
     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___124812 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.context___124812);
+    s.context___100165 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.context___100165);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = control_EventContext_register__P106999_mk(s);
-    s.tmp_0.arg0 = s.context___124812;
+    s.tmp_0 = control_EventContext_register__P81663_mk(s);
+    s.tmp_0.arg0 = s.context___100165;
     s.callLocIdx = 104; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    globals.eventContexts___110597 = (undefined);
+    globals.eventContexts___85381 = (undefined);
   case 6:
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_popEventContext__P107008.info = {"start":7568,"length":413,"line":232,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
+control_popEventContext__P81672.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__P107008_mk(s) {
+function control_popEventContext__P81672_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_popEventContext__P107008, depth: s.depth + 1,
+        parent: s, fn: control_popEventContext__P81672, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  ctx___124804: undefined,
-  context___124812: undefined,
+  ctx___100157: undefined,
+  context___100165: undefined,
 } }
 
 
 
 
 
-function control_EventContext_register__P106999(s) {
+function control_EventContext_register__P81663(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37800,38 +37570,38 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___124825 = undefined;
-    s.unnamed16738___U1 = undefined;
-    s.unnamed16739___U2 = undefined;
+    s.h___100178 = undefined;
+    s.unnamed1790___U1 = undefined;
+    s.unnamed1791___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C106993_VT)) failedCast(r0);
-    s.h___124825 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C81657_VT)) failedCast(r0);
+    s.h___100178 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed16738___U1 = (r0);
-    s.unnamed16739___U2 = (0);
+    s.unnamed1790___U1 = (r0);
+    s.unnamed1791___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16739___U2;
-    r0 = pxsim_Array__length(s.unnamed16738___U1);
+    s.tmp_0 = r0 = s.unnamed1791___U2;
+    r0 = pxsim_Array__length(s.unnamed1790___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16738___U1, s.unnamed16739___U2);
-    s.h___124825 = (r0);
-    s.tmp_2 = control_EventHandler_register__P110590_mk(s);
-    s.tmp_2.arg0 = s.h___124825;
+    r0 = pxsim_Array__getAt(s.unnamed1790___U1, s.unnamed1791___U2);
+    s.h___100178 = (r0);
+    s.tmp_2 = control_EventHandler_register__P85374_mk(s);
+    s.tmp_2.arg0 = s.h___100178;
     s.callLocIdx = 94; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed16739___U2 + 1);
-    s.unnamed16739___U2 = (r0);
+    r0 = (s.unnamed1791___U2 + 1);
+    s.unnamed1791___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16738___U1 = (undefined);
-    s.tmp_0 = control_EventContext_registerFrameCallbacks__P110595_mk(s);
+    s.unnamed1790___U1 = (undefined);
+    s.tmp_0 = control_EventContext_registerFrameCallbacks__P85379_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 95; s.pc = 4; return s.tmp_0;
   case 4:
@@ -37840,19 +37610,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_register__P106999.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__P81663.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__P106999_mk(s) {
+function control_EventContext_register__P81663_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_register__P106999, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_register__P81663, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  h___124825: undefined,
-  unnamed16738___U1: undefined,
-  unnamed16739___U2: undefined,
+  h___100178: undefined,
+  unnamed1790___U1: undefined,
+  unnamed1791___U2: undefined,
   arg0: undefined,
 } }
 
@@ -37860,7 +37630,7 @@ function control_EventContext_register__P106999_mk(s) {
 
 
 
-function controller__setUserEventsEnabled__P108451(s) {
+function controller__setUserEventsEnabled__P83227(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37874,17 +37644,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    globals._userEventsEnabled___110700 = (s.arg0);
+    globals._userEventsEnabled___85526 = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller__setUserEventsEnabled__P108451.info = {"start":19246,"length":101,"line":587,"column":4,"endLine":589,"endColumn":5,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"_setUserEventsEnabled","argumentNames":["enabled"]}
+controller__setUserEventsEnabled__P83227.info = {"start":19246,"length":101,"line":587,"column":4,"endLine":589,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_setUserEventsEnabled","argumentNames":["enabled"]}
 
-function controller__setUserEventsEnabled__P108451_mk(s) {
+function controller__setUserEventsEnabled__P83227_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__setUserEventsEnabled__P108451, depth: s.depth + 1,
+        parent: s, fn: controller__setUserEventsEnabled__P83227, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -37893,7 +37663,7 @@ function controller__setUserEventsEnabled__P108451_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_constructor__P109112(s) {
+function scene_systemMenu_MenuOption_constructor__P83891(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37911,7 +37681,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_VT)) failedCast(r0);
     r0 = (s.arg0).fields["iconImage"] = (s.arg1);
     r0 = (s.arg0).fields["getText"] = (s.arg2);
     r0 = (s.arg0).fields["action"] = (s.arg3);
@@ -37919,12 +37689,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_constructor__P109112.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"]}
+scene_systemMenu_MenuOption_constructor__P83891.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"]}
 
-function scene_systemMenu_MenuOption_constructor__P109112_mk(s) {
+function scene_systemMenu_MenuOption_constructor__P83891_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_constructor__P109112, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_constructor__P83891, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -37936,7 +37706,7 @@ function scene_systemMenu_MenuOption_constructor__P109112_mk(s) {
 
 
 
-function helpers_screenBrightness__P108232(s) {
+function helpers_screenBrightness__P83009(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37950,16 +37720,16 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = globals.brightness___108220;
+    r0 = globals.brightness___82997;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_screenBrightness__P108232.info = {"start":6459,"length":98,"line":217,"column":4,"endLine":219,"endColumn":5,"fileName":"pxt_modules/screen---st7735/image.ts","functionName":"screenBrightness","argumentNames":["img"]}
+helpers_screenBrightness__P83009.info = {"start":6459,"length":98,"line":217,"column":4,"endLine":219,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"screenBrightness","argumentNames":["img"]}
 
-function helpers_screenBrightness__P108232_mk(s) {
+function helpers_screenBrightness__P83009_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_screenBrightness__P108232, depth: s.depth + 1,
+        parent: s, fn: helpers_screenBrightness__P83009, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -37968,7 +37738,80 @@ function helpers_screenBrightness__P108232_mk(s) {
 
 
 
-function helpers_arrayConcat__P106720(s) {
+function music_volume__P82866(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__P85416_mk(s);
+    s.callLocIdx = 110; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    r0 = globals.globalVolume___85412;
+    return leave(s, r0)
+  default: oops()
+} } }
+music_volume__P82866.info = {"start":1781,"length":90,"line":61,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"volume","argumentNames":[]}
+
+function music_volume__P82866_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_volume__P82866, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function music_initVolume__P85416(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___85412 === null);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    globals.globalVolume___85412 = (0);
+    s.tmp_0 = music_setVolume__P82865_mk(s);
+    r0 = pxsim_pxtcore.getConfig(59, 128);
+    s.tmp_0.arg0 = r0;
+    s.callLocIdx = 107; 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__P85416.info = {"start":1014,"length":180,"line":33,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"initVolume","argumentNames":[]}
+
+function music_initVolume__P85416_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_initVolume__P85416, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+} }
+
+
+
+
+
+function helpers_arrayConcat__P81382(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37978,74 +37821,74 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.out___128356 = undefined;
-    s.value___128359 = undefined;
-    s.unnamed16728___U2 = undefined;
-    s.unnamed16729___U3 = undefined;
-    s.value___128366 = undefined;
-    s.unnamed16730___U5 = undefined;
-    s.unnamed16731___U6 = undefined;
+    s.out___103708 = undefined;
+    s.value___103711 = undefined;
+    s.unnamed1780___U2 = undefined;
+    s.unnamed1781___U3 = undefined;
+    s.value___103718 = undefined;
+    s.unnamed1782___U5 = undefined;
+    s.unnamed1783___U6 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.out___128356 = (r0);
-    s.value___128359 = (undefined);
-    s.unnamed16728___U2 = (s.arg0);
-    s.unnamed16729___U3 = (0);
+    s.out___103708 = (r0);
+    s.value___103711 = (undefined);
+    s.unnamed1780___U2 = (s.arg0);
+    s.unnamed1781___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16729___U3;
-    r0 = pxsim_Array__length(s.unnamed16728___U2);
+    s.tmp_0 = r0 = s.unnamed1781___U3;
+    r0 = pxsim_Array__length(s.unnamed1780___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16728___U2, s.unnamed16729___U3);
-    s.value___128359 = (r0);
-    r0 = pxsim_Array__push(s.out___128356, s.value___128359);
-    r0 = (s.unnamed16729___U3 + 1);
-    s.unnamed16729___U3 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed1780___U2, s.unnamed1781___U3);
+    s.value___103711 = (r0);
+    r0 = pxsim_Array__push(s.out___103708, s.value___103711);
+    r0 = (s.unnamed1781___U3 + 1);
+    s.unnamed1781___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16728___U2 = (undefined);
-    s.value___128366 = (undefined);
-    s.unnamed16730___U5 = (s.arg1);
-    s.unnamed16731___U6 = (0);
+    s.unnamed1780___U2 = (undefined);
+    s.value___103718 = (undefined);
+    s.unnamed1782___U5 = (s.arg1);
+    s.unnamed1783___U6 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed16731___U6;
-    r0 = pxsim_Array__length(s.unnamed16730___U5);
+    s.tmp_0 = r0 = s.unnamed1783___U6;
+    r0 = pxsim_Array__length(s.unnamed1782___U5);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16730___U5, s.unnamed16731___U6);
-    s.value___128366 = (r0);
-    r0 = pxsim_Array__push(s.out___128356, s.value___128366);
-    r0 = (s.unnamed16731___U6 + 1);
-    s.unnamed16731___U6 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed1782___U5, s.unnamed1783___U6);
+    s.value___103718 = (r0);
+    r0 = pxsim_Array__push(s.out___103708, s.value___103718);
+    r0 = (s.unnamed1783___U6 + 1);
+    s.unnamed1783___U6 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed16730___U5 = (undefined);
-    r0 = s.out___128356;
+    s.unnamed1782___U5 = (undefined);
+    r0 = s.out___103708;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayConcat__P106720.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__P81382.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__P106720_mk(s) {
+function helpers_arrayConcat__P81382_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayConcat__P106720, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayConcat__P81382, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  out___128356: undefined,
-  value___128359: undefined,
-  unnamed16728___U2: undefined,
-  unnamed16729___U3: undefined,
-  value___128366: undefined,
-  unnamed16730___U5: undefined,
-  unnamed16731___U6: undefined,
+  out___103708: undefined,
+  value___103711: undefined,
+  unnamed1780___U2: undefined,
+  unnamed1781___U3: undefined,
+  value___103718: undefined,
+  unnamed1782___U5: undefined,
+  unnamed1783___U6: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -38054,7 +37897,7 @@ function helpers_arrayConcat__P106720_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_show__P109121(s) {
+function scene_systemMenu_PauseMenu_show__P83900(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38064,34 +37907,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___127588 = undefined;
-    s.i___127589 = undefined;
+    s.current___102943 = undefined;
+    s.i___102944 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C109119_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C83898_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 = 947; s.pc = 3; return s.tmp_2;
+      s.callLocIdx = 951; 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 = 947; s.pc = 3; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 947; s.pc = 3; return s.tmp_2;; }
-     else { s.callLocIdx = 947; 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 = 951; s.pc = 3; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 951; s.pc = 3; return s.tmp_2;; }
+     else { s.callLocIdx = 951; 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___127589 = (0);
+    s.i___102944 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___127589;
+    s.tmp_1 = r0 = s.i___102944;
     r0 = s.arg0.fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -38102,22 +37945,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___127589);
-    s.current___127588 = (r0);
-    s.tmp_0 = scene_systemMenu_MenuOption_show__P109113_mk(s);
-    s.tmp_0.arg0 = s.current___127588;
-    s.callLocIdx = 948; s.pc = 4; return s.tmp_0;
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___102944);
+    s.current___102943 = (r0);
+    s.tmp_0 = scene_systemMenu_MenuOption_show__P83892_mk(s);
+    s.tmp_0.arg0 = s.current___102943;
+    s.callLocIdx = 952; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_MenuOption_setTheme__P109116_mk(s);
-    s.tmp_0.arg0 = s.current___127588;
+    s.tmp_0 = scene_systemMenu_MenuOption_setTheme__P83895_mk(s);
+    s.tmp_0.arg0 = s.current___102943;
     r0 = s.arg0.fields["theme"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 949; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 953; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_MenuOption_position__P109114_mk(s);
-    s.tmp_0.arg0 = s.current___127588;
+    s.tmp_0 = scene_systemMenu_MenuOption_position__P83893_mk(s);
+    s.tmp_0.arg0 = s.current___102943;
     s.tmp_2 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -38127,12 +37970,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 = 950; s.pc = 7; return s.tmp_2; }
+     else { s.callLocIdx = 954; s.pc = 7; return s.tmp_2; }
     }
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_5 = r0 = s.i___127589;
+    s.tmp_5 = r0 = s.i___102944;
     s.tmp_7 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_7.arg0 = r0;
@@ -38142,7 +37985,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 = 951; s.pc = 8; return s.tmp_7; }
+     else { s.callLocIdx = 955; s.pc = 8; return s.tmp_7; }
     }
   case 8:
     r0 = s.retval;
@@ -38158,7 +38001,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 = 952; s.pc = 9; return s.tmp_10; }
+     else { s.callLocIdx = 956; s.pc = 9; return s.tmp_10; }
     }
   case 9:
     r0 = s.retval;
@@ -38172,7 +38015,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 = 953; s.pc = 10; return s.tmp_12; }
+     else { s.callLocIdx = 957; s.pc = 10; return s.tmp_12; }
     }
   case 10:
     r0 = s.retval;
@@ -38192,12 +38035,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 = 954; s.pc = 11; return s.tmp_14; }
+     else { s.callLocIdx = 958; s.pc = 11; return s.tmp_14; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_17 = r0 = s.i___127589;
+    s.tmp_17 = r0 = s.i___102944;
     s.tmp_19 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_19.arg0 = r0;
@@ -38207,7 +38050,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 = 955; s.pc = 12; return s.tmp_19; }
+     else { s.callLocIdx = 959; s.pc = 12; return s.tmp_19; }
     }
   case 12:
     r0 = s.retval;
@@ -38223,7 +38066,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 = 956; s.pc = 13; return s.tmp_22; }
+     else { s.callLocIdx = 960; s.pc = 13; return s.tmp_22; }
     }
   case 13:
     r0 = s.retval;
@@ -38237,7 +38080,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 = 957; s.pc = 14; return s.tmp_24; }
+     else { s.callLocIdx = 961; s.pc = 14; return s.tmp_24; }
     }
   case 14:
     r0 = s.retval;
@@ -38248,116 +38091,116 @@ switch (step) {
     s.tmp_15 = r0;
     r0 = (s.tmp_13 + s.tmp_15);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 958; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 962; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = (s.i___127589 + 1);
-    s.i___127589 = (r0);
+    r0 = (s.i___102944 + 1);
+    s.i___102944 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_0 = controller__setUserEventsEnabled__P108451_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P83227_mk(s);
     s.tmp_0.arg0 = false;
-    s.callLocIdx = 959; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 963; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127652);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103007);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.A___108374;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.A___83150;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 961; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 965; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127672);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103027);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.A___108374;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.A___83150;
     s.tmp_1.arg1 = 2052;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 963; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 967; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_0.arg0 = globals.B___108375;
+    s.tmp_0 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_0.arg0 = globals.B___83151;
     s.tmp_0.arg1 = 2053;
-    s.tmp_0.arg2 = inline__P127701;
-    s.callLocIdx = 965; s.pc = 18; return s.tmp_0;
+    s.tmp_0.arg2 = inline__P103056;
+    s.callLocIdx = 969; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_0.arg0 = globals.menu___108380;
+    s.tmp_0 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_0.arg0 = globals.menu___83156;
     s.tmp_0.arg1 = 2053;
-    s.tmp_0.arg2 = inline__P127706;
-    s.callLocIdx = 967; s.pc = 19; return s.tmp_0;
+    s.tmp_0.arg2 = inline__P103061;
+    s.callLocIdx = 971; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127711);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103066);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.up___108377;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.up___83153;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 971; s.pc = 20; return s.tmp_1;
+    s.callLocIdx = 975; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127723);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103078);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.left___108376;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.left___83152;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 974; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 978; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127732);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103087);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.down___108379;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.down___83155;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 978; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 982; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127748);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103103);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.right___108378;
+    s.tmp_1 = controller_Button_onEvent__P83183_mk(s);
+    s.tmp_1.arg0 = globals.right___83154;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 981; s.pc = 23; return s.tmp_1;
+    s.callLocIdx = 985; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P127760);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103115);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = game_onShade__P109044_mk(s);
+    s.tmp_1 = game_onShade__P83823_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 984; s.pc = 24; return s.tmp_1;
+    s.callLocIdx = 988; s.pc = 24; return s.tmp_1;
   case 24:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P109123_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P83902_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 985; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 989; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_show__P109121.info = {"start":3296,"length":2241,"line":123,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"show","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_show__P83900.info = {"start":3296,"length":2241,"line":123,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"show","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_show__P109121_mk(s) {
+function scene_systemMenu_PauseMenu_show__P83900_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_show__P109121, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_show__P83900, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38384,8 +38227,8 @@ function scene_systemMenu_PauseMenu_show__P109121_mk(s) {
   tmp_22: undefined,
   tmp_23: undefined,
   tmp_24: undefined,
-  current___127588: undefined,
-  i___127589: undefined,
+  current___102943: undefined,
+  i___102944: undefined,
   arg0: undefined,
 } }
 
@@ -38393,7 +38236,7 @@ function scene_systemMenu_PauseMenu_show__P109121_mk(s) {
 
 
 
-function inline__P127652(s) {
+function inline__P103007(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38431,7 +38274,7 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = scene_systemMenu_MenuOption_setState__P109117_mk(s);
+    s.tmp_8 = scene_systemMenu_MenuOption_setState__P83896_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_9 = r0;
     r0 = s.caps[0].fields["selection"];
@@ -38439,7 +38282,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 = 960; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 964; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
   case 5:
@@ -38447,12 +38290,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127652.info = {"start":4025,"length":170,"line":140,"column":50,"endLine":143,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103007.info = {"start":4025,"length":170,"line":140,"column":50,"endLine":143,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127652_mk(s) {
+function inline__P103007_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127652, depth: s.depth + 1,
+        parent: s, fn: inline__P103007, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38471,7 +38314,7 @@ function inline__P127652_mk(s) {
 
 
 
-function inline__P127672(s) {
+function inline__P103027(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38509,7 +38352,7 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = scene_systemMenu_MenuOption_setState__P109117_mk(s);
+    s.tmp_8 = scene_systemMenu_MenuOption_setState__P83896_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_9 = r0;
     r0 = s.caps[0].fields["selection"];
@@ -38517,7 +38360,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 = 962; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 966; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     r0 = s.caps[0].fields["options"];
@@ -38533,12 +38376,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127672.info = {"start":4247,"length":247,"line":145,"column":48,"endLine":149,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103027.info = {"start":4247,"length":247,"line":145,"column":48,"endLine":149,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127672_mk(s) {
+function inline__P103027_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127672, depth: s.depth + 1,
+        parent: s, fn: inline__P103027, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38557,7 +38400,7 @@ function inline__P127672_mk(s) {
 
 
 
-function inline__P127701(s) {
+function inline__P103056(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38567,20 +38410,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_closeMenu__P109126_mk(s);
-    s.callLocIdx = 964; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_closeMenu__P83905_mk(s);
+    s.callLocIdx = 968; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127701.info = {"start":4548,"length":50,"line":151,"column":50,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103056.info = {"start":4548,"length":50,"line":151,"column":50,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127701_mk(s) {
+function inline__P103056_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127701, depth: s.depth + 1,
+        parent: s, fn: inline__P103056, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -38589,7 +38432,7 @@ function inline__P127701_mk(s) {
 
 
 
-function inline__P127706(s) {
+function inline__P103061(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38599,20 +38442,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_closeMenu__P109126_mk(s);
-    s.callLocIdx = 966; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_closeMenu__P83905_mk(s);
+    s.callLocIdx = 970; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127706.info = {"start":4655,"length":50,"line":155,"column":53,"endLine":157,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103061.info = {"start":4655,"length":50,"line":155,"column":53,"endLine":157,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127706_mk(s) {
+function inline__P103061_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127706, depth: s.depth + 1,
+        parent: s, fn: inline__P103061, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -38621,7 +38464,7 @@ function inline__P127706_mk(s) {
 
 
 
-function inline__P127711(s) {
+function inline__P103066(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38631,9 +38474,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P109123_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P83902_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_max__P106734_mk(s);
+    s.tmp_1 = Math_max__P81398_mk(s);
     s.tmp_1.arg0 = 0;
     r0 = s.caps[0].fields["selection"];
     s.tmp_2 = r0;
@@ -38646,30 +38489,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 = 968; s.pc = 3; return s.tmp_4; }
+     else { s.callLocIdx = 972; 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 = 969; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 973; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 970; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 974; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127711.info = {"start":4760,"length":110,"line":159,"column":51,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103066.info = {"start":4760,"length":110,"line":159,"column":51,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127711_mk(s) {
+function inline__P103066_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127711, depth: s.depth + 1,
+        parent: s, fn: inline__P103066, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38682,7 +38525,7 @@ function inline__P127711_mk(s) {
 
 
 
-function inline__P127723(s) {
+function inline__P103078(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38692,31 +38535,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P109123_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P83902_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_max__P106734_mk(s);
+    s.tmp_1 = Math_max__P81398_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 = 972; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 976; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 973; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 977; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127723.info = {"start":4927,"length":89,"line":163,"column":53,"endLine":165,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103078.info = {"start":4927,"length":89,"line":163,"column":53,"endLine":165,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127723_mk(s) {
+function inline__P103078_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127723, depth: s.depth + 1,
+        parent: s, fn: inline__P103078, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38727,7 +38570,7 @@ function inline__P127723_mk(s) {
 
 
 
-function inline__P127732(s) {
+function inline__P103087(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38737,9 +38580,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P109123_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P83902_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_min__P106735_mk(s);
+    s.tmp_1 = Math_min__P81399_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -38757,30 +38600,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 = 975; s.pc = 3; return s.tmp_6; }
+     else { s.callLocIdx = 979; 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 = 976; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 980; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 977; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 981; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127732.info = {"start":5073,"length":132,"line":167,"column":53,"endLine":169,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103087.info = {"start":5073,"length":132,"line":167,"column":53,"endLine":169,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127732_mk(s) {
+function inline__P103087_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127732, depth: s.depth + 1,
+        parent: s, fn: inline__P103087, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38795,7 +38638,7 @@ function inline__P127732_mk(s) {
 
 
 
-function inline__P127748(s) {
+function inline__P103103(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38805,9 +38648,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P109123_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P83902_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_min__P106735_mk(s);
+    s.tmp_1 = Math_min__P81399_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -38818,23 +38661,23 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 1);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 979; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 983; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 980; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 984; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127748.info = {"start":5263,"length":111,"line":171,"column":54,"endLine":173,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103103.info = {"start":5263,"length":111,"line":171,"column":54,"endLine":173,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127748_mk(s) {
+function inline__P103103_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127748, depth: s.depth + 1,
+        parent: s, fn: inline__P103103, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38847,7 +38690,7 @@ function inline__P127748_mk(s) {
 
 
 
-function inline__P127760(s) {
+function inline__P103115(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38857,26 +38700,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_onUpdate__P109122_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_onUpdate__P83901_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 982; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 986; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_PauseMenu_drawText__P109124_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_drawText__P83903_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 983; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 987; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127760.info = {"start":5403,"length":87,"line":175,"column":25,"endLine":178,"endColumn":13,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P103115.info = {"start":5403,"length":87,"line":175,"column":25,"endLine":178,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127760_mk(s) {
+function inline__P103115_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127760, depth: s.depth + 1,
+        parent: s, fn: inline__P103115, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -38885,7 +38728,7 @@ function inline__P127760_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_drawText__P109124(s) {
+function scene_systemMenu_PauseMenu_drawText__P83903(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38900,7 +38743,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C109119_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C83898_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -38912,11 +38755,11 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_3 = helpers_imageFillRect__P108224_mk(s);
-    s.tmp_3.arg0 = globals.screen___108298;
+    s.tmp_3 = helpers_imageFillRect__P83001_mk(s);
+    s.tmp_3.arg0 = globals.screen___83075;
     s.tmp_3.arg1 = 0;
     s.tmp_3.arg2 = 0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_3.arg3 = r0;
     s.tmp_5 = if_cardsTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -38927,7 +38770,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 = 996; s.pc = 5; return s.tmp_5; }
+     else { s.callLocIdx = 1000; s.pc = 5; return s.tmp_5; }
     }
   case 5:
     r0 = s.retval;
@@ -38935,11 +38778,11 @@ switch (step) {
     r0 = (s.tmp_4 - 2);
     s.tmp_3.arg4 = r0;
     s.tmp_3.arg5 = 15;
-    s.callLocIdx = 997; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1001; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrintCenter__P108255_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imagePrintCenter__P83032_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_1 = if_headerText_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -38949,7 +38792,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 = 998; s.pc = 7; return s.tmp_1; }
+     else { s.callLocIdx = 1002; s.pc = 7; return s.tmp_1; }
     }
   case 7:
     r0 = s.retval;
@@ -38965,16 +38808,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 = 999; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 1003; s.pc = 8; return s.tmp_2; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1000; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1004; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P108224_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imageFillRect__P83001_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = 0;
     s.tmp_2 = if_infoTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -38985,16 +38828,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 = 1001; s.pc = 10; return s.tmp_2; }
+     else { s.callLocIdx = 1005; 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___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_0.arg3 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_4 = r0;
     s.tmp_6 = if_infoTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -39005,7 +38848,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 = 1002; s.pc = 11; return s.tmp_6; }
+     else { s.callLocIdx = 1006; s.pc = 11; return s.tmp_6; }
     }
   case 11:
     r0 = s.retval;
@@ -39015,11 +38858,11 @@ switch (step) {
     r0 = (s.tmp_3 + 6);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 15;
-    s.callLocIdx = 1003; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1007; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P108224_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imageFillRect__P83001_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_1 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -39029,7 +38872,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 = 1004; s.pc = 13; return s.tmp_1; }
+     else { s.callLocIdx = 1008; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
@@ -39043,12 +38886,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 = 1005; s.pc = 14; return s.tmp_2; }
+     else { s.callLocIdx = 1009; s.pc = 14; return s.tmp_2; }
     }
   case 14:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_3 = r0;
     s.tmp_6 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -39059,7 +38902,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 = 1006; s.pc = 15; return s.tmp_6; }
+     else { s.callLocIdx = 1010; s.pc = 15; return s.tmp_6; }
     }
   case 15:
     r0 = s.retval;
@@ -39078,7 +38921,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 = 1007; s.pc = 17; return s.tmp_9; }
+     else { s.callLocIdx = 1011; s.pc = 17; return s.tmp_9; }
     }
   case 17:
     r0 = s.retval;
@@ -39089,7 +38932,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 = 1008; s.pc = 16; return s.tmp_8; }
+     else { s.callLocIdx = 1012; s.pc = 16; return s.tmp_8; }
     }
   case 16:
     r0 = s.retval;
@@ -39097,11 +38940,11 @@ switch (step) {
     r0 = (s.tmp_7 + 1);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1009; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1013; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrintCenter__P108255_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imagePrintCenter__P83032_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_1 = if_getText_1_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
@@ -39111,12 +38954,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 = 1010; s.pc = 19; return s.tmp_1;
+      s.callLocIdx = 1014; 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 = 1010; s.pc = 19; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1010; s.pc = 19; return s.tmp_1;; }
-     else { s.callLocIdx = 1010; 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 = 1014; s.pc = 19; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1014; s.pc = 19; return s.tmp_1;; }
+     else { s.callLocIdx = 1014; s.pc = 19; return s.tmp_1; }
     }
   case 19:
     r0 = s.retval;
@@ -39130,7 +38973,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 = 1011; s.pc = 20; return s.tmp_5; }
+     else { s.callLocIdx = 1015; s.pc = 20; return s.tmp_5; }
     }
   case 20:
     r0 = s.retval;
@@ -39147,12 +38990,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 = 1012; s.pc = 21; return s.tmp_6; }
+     else { s.callLocIdx = 1016; s.pc = 21; return s.tmp_6; }
     }
   case 21:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1013; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1017; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
   case 3:
@@ -39160,12 +39003,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_drawText__P109124.info = {"start":6927,"length":795,"line":224,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"drawText","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_drawText__P83903.info = {"start":6927,"length":795,"line":224,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"drawText","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_drawText__P109124_mk(s) {
+function scene_systemMenu_PauseMenu_drawText__P83903_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_drawText__P109124, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_drawText__P83903, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39184,7 +39027,7 @@ function scene_systemMenu_PauseMenu_drawText__P109124_mk(s) {
 
 
 
-function helpers_imagePrintCenter__P108255(s) {
+function helpers_imagePrintCenter__P83032(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39194,8 +39037,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.w___127847 = undefined;
-    s.x___127853 = undefined;
+    s.w___103202 = undefined;
+    s.x___103208 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -39210,9 +39053,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = image_getFontForText__P108243_mk(s);
+    s.tmp_2 = image_getFontForText__P83020_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 127; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 141; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.arg4 = (r0);
@@ -39228,46 +39071,46 @@ 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 = 128; s.pc = 4; return s.tmp_2; }
+     else { s.callLocIdx = 142; 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___127847 = (r0);
+    s.w___103202 = (r0);
     r0 = pxsim_ImageMethods.width(s.arg0);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.w___127847);
+    r0 = (s.tmp_1 - s.w___103202);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    s.x___127853 = (r0);
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
+    s.x___103208 = (r0);
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.tmp_0.arg2 = s.x___127853;
+    s.tmp_0.arg2 = s.x___103208;
     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 = 129; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 143; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imagePrintCenter__P108255.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"]}
+helpers_imagePrintCenter__P83032.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"]}
 
-function helpers_imagePrintCenter__P108255_mk(s) {
+function helpers_imagePrintCenter__P83032_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imagePrintCenter__P108255, depth: s.depth + 1,
+        parent: s, fn: helpers_imagePrintCenter__P83032, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  w___127847: undefined,
-  x___127853: undefined,
+  w___103202: undefined,
+  x___103208: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -39279,7 +39122,7 @@ function helpers_imagePrintCenter__P108255_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_setSelection__P109123(s) {
+function scene_systemMenu_PauseMenu_setSelection__P83902(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39295,7 +39138,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C109119_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C83898_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -39315,7 +39158,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__P109117_mk(s);
+    s.tmp_6 = scene_systemMenu_MenuOption_setState__P83896_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["selection"];
@@ -39323,7 +39166,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 = 993; s.pc = 10; return s.tmp_6;
+    s.callLocIdx = 997; s.pc = 10; return s.tmp_6;
   case 10:
     r0 = s.retval;
   case 3:
@@ -39337,9 +39180,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_4.arg0 = globals.A___108374;
-    if (!checkSubtype(s.tmp_4.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_4.arg0);
+    s.tmp_4 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_4.arg0 = globals.A___83150;
+    if (!checkSubtype(s.tmp_4.arg0, controller_Button__C83176_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:
@@ -39354,7 +39197,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.tmp_6 = scene_systemMenu_MenuOption_setState__P109117_mk(s);
+    s.tmp_6 = scene_systemMenu_MenuOption_setState__P83896_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["selection"];
@@ -39362,14 +39205,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 = 994; s.pc = 12; return s.tmp_6;
+    s.callLocIdx = 998; s.pc = 12; return s.tmp_6;
   case 12:
     r0 = s.retval;
   case 7:
   case 8:
-    s.tmp_0 = scene_systemMenu_PauseMenu_updateScrollTarget__P111126_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_updateScrollTarget__P85965_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 995; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 999; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
   case 9:
@@ -39377,12 +39220,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_setSelection__P109123.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"]}
+scene_systemMenu_PauseMenu_setSelection__P83902.info = {"start":6436,"length":481,"line":208,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setSelection","argumentNames":["this","selection"]}
 
-function scene_systemMenu_PauseMenu_setSelection__P109123_mk(s) {
+function scene_systemMenu_PauseMenu_setSelection__P83902_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_setSelection__P109123, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_setSelection__P83902, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39401,7 +39244,7 @@ function scene_systemMenu_PauseMenu_setSelection__P109123_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_updateScrollTarget__P111126(s) {
+function scene_systemMenu_PauseMenu_updateScrollTarget__P85965(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39411,13 +39254,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.row___128027 = undefined;
+    s.row___103382 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C109119_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C83898_VT)) failedCast(r0);
     r0 = s.arg0.fields["selection"];
     s.tmp_0 = r0;
     s.tmp_2 = if_cardsPerRow_1_mk(s);
@@ -39429,23 +39272,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 = 1016; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 1020; 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___128027 = (r0);
+    s.row___103382 = (r0);
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_1 = r0;
-    r0 = (s.row___128027 === s.tmp_1);
+    r0 = (s.row___103382 === 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___128027 - 1);
+    r0 = (s.row___103382 - 1);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_3 = r0;
@@ -39460,7 +39303,7 @@ switch (step) {
   case 4:
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_6 = r0;
-    r0 = (s.row___128027 > s.tmp_6);
+    r0 = (s.row___103382 > s.tmp_6);
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
@@ -39491,7 +39334,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 = 1017; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 1021; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
@@ -39505,7 +39348,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 = 1018; s.pc = 10; return s.tmp_7; }
+     else { s.callLocIdx = 1022; s.pc = 10; return s.tmp_7; }
     }
   case 10:
     r0 = s.retval;
@@ -39520,12 +39363,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_updateScrollTarget__P111126.info = {"start":7907,"length":458,"line":250,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"updateScrollTarget","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_updateScrollTarget__P85965.info = {"start":7907,"length":458,"line":250,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"updateScrollTarget","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_updateScrollTarget__P111126_mk(s) {
+function scene_systemMenu_PauseMenu_updateScrollTarget__P85965_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_updateScrollTarget__P111126, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_updateScrollTarget__P85965, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39537,7 +39380,7 @@ function scene_systemMenu_PauseMenu_updateScrollTarget__P111126_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  row___128027: undefined,
+  row___103382: undefined,
   arg0: undefined,
 } }
 
@@ -39545,7 +39388,7 @@ function scene_systemMenu_PauseMenu_updateScrollTarget__P111126_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_onUpdate__P109122(s) {
+function scene_systemMenu_PauseMenu_onUpdate__P83901(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39555,22 +39398,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.t___127869 = undefined;
-    s.i___127873 = undefined;
-    s.dt___127902 = undefined;
+    s.t___103224 = undefined;
+    s.i___103228 = undefined;
+    s.dt___103257 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C109119_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C83898_VT)) failedCast(r0);
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 250);
-    s.t___127869 = (r0);
-    s.i___127873 = (0);
+    s.t___103224 = (r0);
+    s.i___103228 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___127873;
+    s.tmp_1 = r0 = s.i___103228;
     r0 = s.arg0.fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -39579,13 +39422,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__P109115_mk(s);
+    s.tmp_4 = scene_systemMenu_MenuOption_setOffset__P83894_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_5 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_5, s.i___127873);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___103228);
     s.tmp_4.arg0 = r0;
-    s.tmp_8 = r0 = s.t___127869;
-    s.tmp_11 = r0 = s.i___127873;
+    s.tmp_8 = r0 = s.t___103224;
+    s.tmp_11 = r0 = s.i___103228;
     s.tmp_13 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_13.arg0 = r0;
@@ -39595,7 +39438,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 = 986; s.pc = 11; return s.tmp_13; }
+     else { s.callLocIdx = 990; s.pc = 11; return s.tmp_13; }
     }
   case 11:
     r0 = s.retval;
@@ -39610,15 +39453,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = (2 * s.tmp_6);
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 987; s.pc = 10; return s.tmp_4;
+    s.callLocIdx = 991; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
-    r0 = (s.i___127873 + 1);
-    s.i___127873 = (r0);
+    r0 = (s.i___103228 + 1);
+    s.i___103228 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 988; s.pc = 12; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 992; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     r0 = r0.fields["eventContext"];
@@ -39626,7 +39469,7 @@ switch (step) {
     r0 = s.tmp_0.fields["deltaTimeMillis"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 1000);
-    s.dt___127902 = (r0);
+    s.dt___103257 = (r0);
     r0 = s.arg0.fields["scrollOffset"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["scrollTarget"];
@@ -39638,7 +39481,7 @@ switch (step) {
     s.tmp_3 = r0 = s.arg0;
     r0 = s.tmp_3.fields["scrollOffset"];
     s.tmp_5 = r0;
-    r0 = (s.dt___127902 * 100);
+    r0 = (s.dt___103257 * 100);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
@@ -39656,7 +39499,7 @@ switch (step) {
     s.tmp_3 = r0 = s.arg0;
     r0 = s.tmp_3.fields["scrollOffset"];
     s.tmp_5 = r0;
-    r0 = (s.dt___127902 * 100);
+    r0 = (s.dt___103257 * 100);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 - s.tmp_6);
     s.tmp_4 = r0;
@@ -39666,14 +39509,14 @@ switch (step) {
     { step = 9; continue; }
   case 5:
   case 6:
-    s.tmp_2 = Math_abs__P106732_mk(s);
+    s.tmp_2 = Math_abs__P81396_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 = 990; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 994; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -39686,16 +39529,16 @@ switch (step) {
     r0 = (s.arg0).fields["scrollOffset"] = (s.tmp_5);
   case 7:
   case 8:
-    s.tmp_0 = scene_Camera_offsetY__P108865_mk(s);
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 991; s.pc = 15; return s.tmp_1;
+    s.tmp_0 = scene_Camera_offsetY__P83644_mk(s);
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 995; 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 = 992; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 996; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 9:
@@ -39703,12 +39546,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_onUpdate__P109122.info = {"start":5547,"length":879,"line":183,"column":8,"endLine":206,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"onUpdate","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_onUpdate__P83901.info = {"start":5547,"length":879,"line":183,"column":8,"endLine":206,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"onUpdate","argumentNames":["this"]}
 
-function scene_systemMenu_PauseMenu_onUpdate__P109122_mk(s) {
+function scene_systemMenu_PauseMenu_onUpdate__P83901_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_onUpdate__P109122, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_onUpdate__P83901, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39724,9 +39567,9 @@ function scene_systemMenu_PauseMenu_onUpdate__P109122_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  t___127869: undefined,
-  i___127873: undefined,
-  dt___127902: undefined,
+  t___103224: undefined,
+  i___103228: undefined,
+  dt___103257: undefined,
   arg0: undefined,
 } }
 
@@ -39734,7 +39577,7 @@ function scene_systemMenu_PauseMenu_onUpdate__P109122_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setOffset__P109115(s) {
+function scene_systemMenu_MenuOption_setOffset__P83894(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39750,40 +39593,40 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P108564_mk(s);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P83346_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 = 929; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 933; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P108525_mk(s);
+    s.tmp_0 = Sprite_y__P83307_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P108524_mk(s);
+    s.tmp_1 = Sprite_y__P83306_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 930; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 934; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 931; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 935; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setOffset__P109115.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"]}
+scene_systemMenu_MenuOption_setOffset__P83894.info = {"start":1411,"length":123,"line":61,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setOffset","argumentNames":["this","offset"]}
 
-function scene_systemMenu_MenuOption_setOffset__P109115_mk(s) {
+function scene_systemMenu_MenuOption_setOffset__P83894_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setOffset__P109115, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setOffset__P83894, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39795,7 +39638,7 @@ function scene_systemMenu_MenuOption_setOffset__P109115_mk(s) {
 
 
 
-function Sprite_top__P108564(s) {
+function Sprite_top__P83346(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39805,22 +39648,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___125940 = undefined;
+    s.physics___101333 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 313; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 322; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___125940 = (r0);
-    s.tmp_0 = PhysicsEngine__C108656_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___125940;
+    s.physics___101333 = (r0);
+    s.tmp_0 = PhysicsEngine__C83440_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___101333;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = 0;
     r0 = (s.arg1 * 256);
@@ -39831,7 +39674,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__C108656_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C83440_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:
@@ -39840,18 +39683,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_top__P108564.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"]}
+Sprite_top__P83346.info = {"start":10016,"length":256,"line":361,"column":4,"endLine":371,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this","value"]}
 
-function Sprite_top__P108564_mk(s) {
+function Sprite_top__P83346_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_top__P108564, depth: s.depth + 1,
+        parent: s, fn: Sprite_top__P83346, 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___125940: undefined,
+  physics___101333: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -39860,7 +39703,7 @@ function Sprite_top__P108564_mk(s) {
 
 
 
-function PhysicsEngine_moveSprite__P108660(s) {
+function PhysicsEngine_moveSprite__P83444(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39878,17 +39721,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C108656_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C83440_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_moveSprite__P108660.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"]}
+PhysicsEngine_moveSprite__P83444.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"]}
 
-function PhysicsEngine_moveSprite__P108660_mk(s) {
+function PhysicsEngine_moveSprite__P83444_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_moveSprite__P108660, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_moveSprite__P83444, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -39900,7 +39743,7 @@ function PhysicsEngine_moveSprite__P108660_mk(s) {
 
 
 
-function Sprite_top__P108563(s) {
+function Sprite_top__P83345(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39915,20 +39758,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108563.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__P108563.isGetter = true;
+Sprite_top__P83345.info = {"start":9873,"length":53,"line":356,"column":4,"endLine":358,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this"]}
+Sprite_top__P83345.isGetter = true;
 
-function Sprite_top__P108563_mk(s) {
+function Sprite_top__P83345_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_top__P108563, depth: s.depth + 1,
+        parent: s, fn: Sprite_top__P83345, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -39938,7 +39781,7 @@ function Sprite_top__P108563_mk(s) {
 
 
 
-function Sprite_y__P108525(s) {
+function Sprite_y__P83307(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39954,8 +39797,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P108564_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P83346_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -39966,19 +39809,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 260; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 269; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_y__P108525.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"]}
+Sprite_y__P83307.info = {"start":2305,"length":72,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this","v"]}
 
-function Sprite_y__P108525_mk(s) {
+function Sprite_y__P83307_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_y__P108525, depth: s.depth + 1,
+        parent: s, fn: Sprite_y__P83307, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39993,7 +39836,7 @@ function Sprite_y__P108525_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setState__P109117(s) {
+function scene_systemMenu_MenuOption_setState__P83896(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40009,7 +39852,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_VT)) failedCast(r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === s.arg1);
@@ -40020,9 +39863,9 @@ switch (step) {
   case 1:
   case 2:
     r0 = (s.arg0).fields["state"] = (s.arg1);
-    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P111125_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P85964_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 933; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 937; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 3:
@@ -40030,12 +39873,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setState__P109117.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"]}
+scene_systemMenu_MenuOption_setState__P83896.info = {"start":1655,"length":147,"line":71,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setState","argumentNames":["this","state"]}
 
-function scene_systemMenu_MenuOption_setState__P109117_mk(s) {
+function scene_systemMenu_MenuOption_setState__P83896_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setState__P109117, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setState__P83896, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40047,7 +39890,7 @@ function scene_systemMenu_MenuOption_setState__P109117_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_updateCard__P111125(s) {
+function scene_systemMenu_MenuOption_updateCard__P85964(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40062,7 +39905,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_VT)) failedCast(r0);
     r0 = s.arg0.fields["theme"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -40085,7 +39928,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 6; continue; }
   case 3:
-    s.tmp_4 = Sprite_setImage__P108553_mk(s);
+    s.tmp_4 = Sprite_setImage__P83335_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_4.arg0 = r0;
     s.tmp_5 = if_basicCard_1_mk(s);
@@ -40097,17 +39940,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 = 936; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 940; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 937; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 941; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     { step = 6; continue; }
   case 4:
-    s.tmp_0 = Sprite_setImage__P108553_mk(s);
+    s.tmp_0 = Sprite_setImage__P83335_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_selectedCard_1_mk(s);
@@ -40119,17 +39962,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 = 938; s.pc = 11; return s.tmp_1; }
+     else { s.callLocIdx = 942; s.pc = 11; return s.tmp_1; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 939; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 943; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = Sprite_setImage__P108553_mk(s);
+    s.tmp_0 = Sprite_setImage__P83335_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_activeCard_1_mk(s);
@@ -40141,39 +39984,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 = 940; s.pc = 13; return s.tmp_1; }
+     else { s.callLocIdx = 944; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 941; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 945; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
   case 6:
-    s.tmp_0 = Sprite_x__P108523_mk(s);
+    s.tmp_0 = Sprite_x__P83305_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_x__P108522_mk(s);
+    s.tmp_1 = Sprite_x__P83304_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 942; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 946; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 943; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 947; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P108525_mk(s);
+    s.tmp_0 = Sprite_y__P83307_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P108524_mk(s);
+    s.tmp_1 = Sprite_y__P83306_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 944; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 948; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 945; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 949; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
   case 7:
@@ -40181,12 +40024,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_updateCard__P111125.info = {"start":2038,"length":497,"line":86,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"updateCard","argumentNames":["this"]}
+scene_systemMenu_MenuOption_updateCard__P85964.info = {"start":2038,"length":497,"line":86,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"updateCard","argumentNames":["this"]}
 
-function scene_systemMenu_MenuOption_updateCard__P111125_mk(s) {
+function scene_systemMenu_MenuOption_updateCard__P85964_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_updateCard__P111125, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_updateCard__P85964, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40201,7 +40044,7 @@ function scene_systemMenu_MenuOption_updateCard__P111125_mk(s) {
 
 
 
-function Sprite_x__P108523(s) {
+function Sprite_x__P83305(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40217,8 +40060,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P108560_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P83342_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -40229,19 +40072,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 258; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 267; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_x__P108523.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"]}
+Sprite_x__P83305.info = {"start":1956,"length":72,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this","v"]}
 
-function Sprite_x__P108523_mk(s) {
+function Sprite_x__P83305_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_x__P108523, depth: s.depth + 1,
+        parent: s, fn: Sprite_x__P83305, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40256,7 +40099,7 @@ function Sprite_x__P108523_mk(s) {
 
 
 
-function Sprite_left__P108560(s) {
+function Sprite_left__P83342(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40266,22 +40109,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___125988 = undefined;
+    s.physics___101381 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 305; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 314; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___125988 = (r0);
-    s.tmp_0 = PhysicsEngine__C108656_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___125988;
+    s.physics___101381 = (r0);
+    s.tmp_0 = PhysicsEngine__C83440_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___101381;
     s.tmp_0.arg1 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -40292,7 +40135,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__C108656_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C83440_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:
@@ -40301,18 +40144,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_left__P108560.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"]}
+Sprite_left__P83342.info = {"start":9212,"length":257,"line":331,"column":4,"endLine":341,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this","value"]}
 
-function Sprite_left__P108560_mk(s) {
+function Sprite_left__P83342_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_left__P108560, depth: s.depth + 1,
+        parent: s, fn: Sprite_left__P83342, 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___125988: undefined,
+  physics___101381: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -40321,7 +40164,7 @@ function Sprite_left__P108560_mk(s) {
 
 
 
-function Sprite_left__P108559(s) {
+function Sprite_left__P83341(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40336,20 +40179,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108559.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__P108559.isGetter = true;
+Sprite_left__P83341.info = {"start":9068,"length":53,"line":326,"column":4,"endLine":328,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this"]}
+Sprite_left__P83341.isGetter = true;
 
-function Sprite_left__P108559_mk(s) {
+function Sprite_left__P83341_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_left__P108559, depth: s.depth + 1,
+        parent: s, fn: Sprite_left__P83341, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -40359,7 +40202,7 @@ function Sprite_left__P108559_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setTheme__P109116(s) {
+function scene_systemMenu_MenuOption_setTheme__P83895(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40375,23 +40218,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_VT)) failedCast(r0);
     r0 = (s.arg0).fields["theme"] = (s.arg1);
-    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P111125_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P85964_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 932; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 936; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setTheme__P109116.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"]}
+scene_systemMenu_MenuOption_setTheme__P83895.info = {"start":1544,"length":101,"line":66,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setTheme","argumentNames":["this","theme"]}
 
-function scene_systemMenu_MenuOption_setTheme__P109116_mk(s) {
+function scene_systemMenu_MenuOption_setTheme__P83895_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setTheme__P109116, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setTheme__P83895, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -40402,7 +40245,7 @@ function scene_systemMenu_MenuOption_setTheme__P109116_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_position__P109114(s) {
+function scene_systemMenu_MenuOption_position__P83893(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40419,58 +40262,58 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_VT)) failedCast(r0);
     r0 = (s.arg0).fields["top"] = (s.arg2);
-    s.tmp_0 = Sprite_left__P108560_mk(s);
+    s.tmp_0 = Sprite_left__P83342_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 923; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 927; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_top__P108564_mk(s);
+    s.tmp_0 = Sprite_top__P83346_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 924; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 928; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = Sprite_x__P108523_mk(s);
+    s.tmp_0 = Sprite_x__P83305_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_x__P108522_mk(s);
+    s.tmp_1 = Sprite_x__P83304_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 925; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 929; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 926; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 930; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P108525_mk(s);
+    s.tmp_0 = Sprite_y__P83307_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P108524_mk(s);
+    s.tmp_1 = Sprite_y__P83306_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 927; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 931; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 928; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 932; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_position__P109114.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"]}
+scene_systemMenu_MenuOption_position__P83893.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"]}
 
-function scene_systemMenu_MenuOption_position__P109114_mk(s) {
+function scene_systemMenu_MenuOption_position__P83893_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_position__P109114, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_position__P83893, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40483,7 +40326,7 @@ function scene_systemMenu_MenuOption_position__P109114_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_show__P109113(s) {
+function scene_systemMenu_MenuOption_show__P83892(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40498,7 +40341,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C109111_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C83890_VT)) failedCast(r0);
     r0 = s.arg0.fields["theme"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -40512,21 +40355,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 = 918; s.pc = 3; return s.tmp_1; }
+     else { s.callLocIdx = 922; s.pc = 3; return s.tmp_1; }
     }
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    r0 = globals.CARD_NORMAL___109135;
+    r0 = globals.CARD_NORMAL___83914;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_5 = sprites_create__P108471_mk(s);
+    s.tmp_5 = sprites_create__P83247_mk(s);
     s.tmp_5.arg0 = s.tmp_2;
     s.tmp_5.arg1 = undefined;
-    s.callLocIdx = 919; s.pc = 4; return s.tmp_5;
+    s.callLocIdx = 923; s.pc = 4; return s.tmp_5;
   case 4:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -40541,16 +40384,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 = 920; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 924; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = sprites_create__P108471_mk(s);
+    s.tmp_2 = sprites_create__P83247_mk(s);
     r0 = s.arg0.fields["iconImage"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = undefined;
-    s.callLocIdx = 921; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 925; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -40565,7 +40408,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 = 922; s.pc = 7; return s.tmp_0; }
+     else { s.callLocIdx = 926; s.pc = 7; return s.tmp_0; }
     }
   case 7:
     r0 = s.retval;
@@ -40574,12 +40417,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_show__P109113.info = {"start":904,"length":264,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"show","argumentNames":["this"]}
+scene_systemMenu_MenuOption_show__P83892.info = {"start":904,"length":264,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"show","argumentNames":["this"]}
 
-function scene_systemMenu_MenuOption_show__P109113_mk(s) {
+function scene_systemMenu_MenuOption_show__P83892_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_show__P109113, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_show__P83892, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40594,7 +40437,7 @@ function scene_systemMenu_MenuOption_show__P109113_mk(s) {
 
 
 
-function sprites_create__P108471(s) {
+function sprites_create__P83247(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40604,78 +40447,78 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___128223 = undefined;
-    s.sprite___128226 = undefined;
+    s.scene___103575 = undefined;
+    s.sprite___103578 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 251; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 260; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___128223 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(Sprite__C108513_VT);
+    s.scene___103575 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(Sprite__C83295_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Sprite_constructor__P108550_mk(s);
+    s.tmp_1 = Sprite_constructor__P83332_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 252; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 261; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    s.sprite___128226 = (s.tmp_0);
-    s.tmp_0 = Sprite_setKind__P108568_mk(s);
-    s.tmp_0.arg0 = s.sprite___128226;
+    s.sprite___103578 = (s.tmp_0);
+    s.tmp_0 = Sprite_setKind__P83350_mk(s);
+    s.tmp_0.arg0 = s.sprite___103578;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 253; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 262; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = PhysicsEngine__C108656_v0_2_mk(s);
-    r0 = s.scene___128223.fields["physicsEngine"];
+    s.tmp_0 = PhysicsEngine__C83440_v0_2_mk(s);
+    r0 = s.scene___103575.fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.sprite___128226;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C108656_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.sprite___103578;
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C83440_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__P128241);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103593);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P128247);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P103599);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.sprite___128226);
-    s.tmp_2 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P106717_mk(s);
-    r0 = s.scene___128223.fields["createdHandlers"];
+    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.sprite___103578);
+    s.tmp_2 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P81379_mk(s);
+    r0 = s.scene___103575.fields["createdHandlers"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 254; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 263; 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 = 256; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 265; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    r0 = s.sprite___128226;
+    r0 = s.sprite___103578;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_create__P108471.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"]}
+sprites_create__P83247.info = {"start":890,"length":400,"line":35,"column":4,"endLine":47,"endColumn":5,"fileName":"pxt_modules/game/sprites.ts","functionName":"create","argumentNames":["img","kind"]}
 
-function sprites_create__P108471_mk(s) {
+function sprites_create__P83247_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_create__P108471, depth: s.depth + 1,
+        parent: s, fn: sprites_create__P83247, 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___128223: undefined,
-  sprite___128226: undefined,
+  scene___103575: undefined,
+  sprite___103578: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -40684,7 +40527,7 @@ function sprites_create__P108471_mk(s) {
 
 
 
-function inline__P128241(s) {
+function inline__P103593(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40704,12 +40547,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128241.info = {"start":1195,"length":19,"line":43,"column":20,"endLine":43,"endColumn":39,"fileName":"pxt_modules/game---hw/sprites.ts","functionName":"inline","argumentNames":["h"]}
+inline__P103593.info = {"start":1195,"length":19,"line":43,"column":20,"endLine":43,"endColumn":39,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P128241_mk(s) {
+function inline__P103593_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128241, depth: s.depth + 1,
+        parent: s, fn: inline__P103593, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -40719,7 +40562,7 @@ function inline__P128241_mk(s) {
 
 
 
-function inline__P128247(s) {
+function inline__P103599(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40738,12 +40581,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 = 255; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 264; 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 = 255; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 255; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 255; 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 = 264; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 264; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 264; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -40751,12 +40594,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P128247.info = {"start":1237,"length":22,"line":44,"column":21,"endLine":44,"endColumn":43,"fileName":"pxt_modules/game---hw/sprites.ts","functionName":"inline","argumentNames":["h"]}
+inline__P103599.info = {"start":1237,"length":22,"line":44,"column":21,"endLine":44,"endColumn":43,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P128247_mk(s) {
+function inline__P103599_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P128247, depth: s.depth + 1,
+        parent: s, fn: inline__P103599, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -40766,7 +40609,7 @@ function inline__P128247_mk(s) {
 
 
 
-function PhysicsEngine_addSprite__P108658(s) {
+function PhysicsEngine_addSprite__P83442(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40782,17 +40625,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C108656_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C83440_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_addSprite__P108658.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"]}
+PhysicsEngine_addSprite__P83442.info = {"start":124,"length":29,"line":8,"column":4,"endLine":8,"endColumn":33,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function PhysicsEngine_addSprite__P108658_mk(s) {
+function PhysicsEngine_addSprite__P83442_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_addSprite__P108658, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_addSprite__P83442, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -40802,7 +40645,7 @@ function PhysicsEngine_addSprite__P108658_mk(s) {
 
 
 
-function Sprite_setKind__P108568(s) {
+function Sprite_setKind__P83350(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40812,15 +40655,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.spritesByKind___126708 = undefined;
-    s.overlapMap___126737 = undefined;
+    s.spritesByKind___102102 = undefined;
+    s.overlapMap___102131 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = (s.arg1 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -40839,12 +40682,12 @@ switch (step) {
     { step = 15; continue; }
   case 3:
   case 4:
-    s.tmp_3 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 320; s.pc = 16; return s.tmp_3;
+    s.tmp_3 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 329; s.pc = 16; return s.tmp_3;
   case 16:
     r0 = s.retval;
     r0 = r0.fields["spritesByKind"];
-    s.spritesByKind___126708 = (r0);
+    s.spritesByKind___102102 = (r0);
     r0 = s.arg0.fields["_kind"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >= 0);
@@ -40856,19 +40699,19 @@ switch (step) {
   case 5:
     r0 = s.arg0.fields["_kind"];
     s.tmp_2 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___126708, s.tmp_2);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___102102, 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__P108615_mk(s);
+    s.tmp_4 = sprites_SpriteSet_remove__P83399_mk(s);
     r0 = s.arg0.fields["_kind"];
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___126708, s.tmp_5);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___102102, s.tmp_5);
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.arg0;
-    s.callLocIdx = 321; s.pc = 17; return s.tmp_4;
+    s.callLocIdx = 330; s.pc = 17; return s.tmp_4;
   case 17:
     r0 = s.retval;
   case 7:
@@ -40877,7 +40720,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___126708, s.arg1);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___102102, s.arg1);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -40885,32 +40728,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__C108608_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteSet__C83392_VT);
     s.tmp_4 = r0;
-    s.tmp_5 = sprites_SpriteSet_constructor__P108610_mk(s);
+    s.tmp_5 = sprites_SpriteSet_constructor__P83394_mk(s);
     s.tmp_5.arg0 = s.tmp_4;
-    s.callLocIdx = 322; s.pc = 18; return s.tmp_5;
+    s.callLocIdx = 331; s.pc = 18; return s.tmp_5;
   case 18:
     r0 = s.retval;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.spritesByKind___126708, s.arg1, s.tmp_4);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.spritesByKind___102102, s.arg1, s.tmp_4);
   case 9:
   case 10:
-    s.tmp_0 = sprites_SpriteSet_add__P108613_mk(s);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___126708, s.arg1);
+    s.tmp_0 = sprites_SpriteSet_add__P83397_mk(s);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___102102, s.arg1);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 323; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 332; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
   case 11:
   case 12:
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 324; s.pc = 20; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 333; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     r0 = r0.fields["overlapMap"];
-    s.overlapMap___126737 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___126737, s.arg1);
+    s.overlapMap___102131 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___102131, s.arg1);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -40918,7 +40761,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___126737;
+    s.tmp_3 = r0 = s.overlapMap___102131;
     s.tmp_4 = r0 = s.arg1;
     r0 = pxsim_Array__mk();
     s.tmp_5 = r0;
@@ -40926,7 +40769,7 @@ switch (step) {
   case 13:
   case 14:
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___126737, s.arg1);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___102131, s.arg1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_kindsOverlappedWith"] = (s.tmp_1);
     r0 = (s.arg0).fields["_kind"] = (s.arg1);
@@ -40935,12 +40778,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setKind__P108568.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"]}
+Sprite_setKind__P83350.info = {"start":11155,"length":663,"line":404,"column":4,"endLine":424,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setKind","argumentNames":["this","value"]}
 
-function Sprite_setKind__P108568_mk(s) {
+function Sprite_setKind__P83350_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setKind__P108568, depth: s.depth + 1,
+        parent: s, fn: Sprite_setKind__P83350, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40948,8 +40791,8 @@ function Sprite_setKind__P108568_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  spritesByKind___126708: undefined,
-  overlapMap___126737: undefined,
+  spritesByKind___102102: undefined,
+  overlapMap___102131: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -40958,7 +40801,7 @@ function Sprite_setKind__P108568_mk(s) {
 
 
 
-function sprites_SpriteSet_add__P108613(s) {
+function sprites_SpriteSet_add__P83397(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40974,7 +40817,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C108608_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C83392_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -41005,12 +40848,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_add__P108613.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"]}
+sprites_SpriteSet_add__P83397.info = {"start":1027,"length":263,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"add","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_add__P108613_mk(s) {
+function sprites_SpriteSet_add__P83397_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_add__P108613, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_add__P83397, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41026,7 +40869,7 @@ function sprites_SpriteSet_add__P108613_mk(s) {
 
 
 
-function sprites_SpriteSet_contains__P108616(s) {
+function sprites_SpriteSet_contains__P83400(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41042,7 +40885,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C108608_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C83392_VT)) failedCast(r0);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_1 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_1, s.arg1, undefined);
@@ -41051,12 +40894,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_contains__P108616.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"]}
+sprites_SpriteSet_contains__P83400.info = {"start":2162,"length":100,"line":79,"column":8,"endLine":81,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"contains","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_contains__P108616_mk(s) {
+function sprites_SpriteSet_contains__P83400_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_contains__P108616, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_contains__P83400, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41068,7 +40911,7 @@ function sprites_SpriteSet_contains__P108616_mk(s) {
 
 
 
-function sprites_SpriteSet_constructor__P108610(s) {
+function sprites_SpriteSet_constructor__P83394(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41083,7 +40926,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C108608_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C83392_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -41092,12 +40935,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_constructor__P108610.info = {"start":488,"length":57,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"inline","argumentNames":["this"]}
+sprites_SpriteSet_constructor__P83394.info = {"start":488,"length":57,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"inline","argumentNames":["this"]}
 
-function sprites_SpriteSet_constructor__P108610_mk(s) {
+function sprites_SpriteSet_constructor__P83394_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_constructor__P108610, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_constructor__P83394, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41108,7 +40951,7 @@ function sprites_SpriteSet_constructor__P108610_mk(s) {
 
 
 
-function Sprite_constructor__P108550(s) {
+function Sprite_constructor__P83332(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41124,15 +40967,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P108357_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P83133_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 275; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 284; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.arg1);
     s.tmp_5 = r0;
@@ -41146,7 +40989,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___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.height(s.arg1);
     s.tmp_5 = r0;
@@ -41165,53 +41008,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__P108527_mk(s);
+    s.tmp_0 = Sprite_vx__P83309_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 278; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 287; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P108529_mk(s);
+    s.tmp_0 = Sprite_vy__P83311_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 279; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 288; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_ax__P108531_mk(s);
+    s.tmp_0 = Sprite_ax__P83313_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 280; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 289; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = Sprite_ay__P108533_mk(s);
+    s.tmp_0 = Sprite_ay__P83315_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 281; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 290; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = Sprite_fx__P108535_mk(s);
+    s.tmp_0 = Sprite_fx__P83317_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 282; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 291; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_fy__P108537_mk(s);
+    s.tmp_0 = Sprite_fy__P83319_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 283; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 292; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = (s.arg0).fields["flags"] = (0);
-    s.tmp_0 = Sprite_setImage__P108553_mk(s);
+    s.tmp_0 = Sprite_setImage__P83335_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 284; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 293; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setKind__P108568_mk(s);
+    s.tmp_0 = Sprite_setKind__P83350_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 285; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 294; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = (s.arg0).fields["layer"] = (1);
@@ -41228,12 +41071,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_constructor__P108550.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"]}
+Sprite_constructor__P83332.info = {"start":5461,"length":618,"line":208,"column":4,"endLine":228,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["this","img"]}
 
-function Sprite_constructor__P108550_mk(s) {
+function Sprite_constructor__P83332_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_constructor__P108550, depth: s.depth + 1,
+        parent: s, fn: Sprite_constructor__P83332, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41250,7 +41093,7 @@ function Sprite_constructor__P108550_mk(s) {
 
 
 
-function Sprite_fy__P108537(s) {
+function Sprite_fy__P83319(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41266,12 +41109,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = Math_max__P106734_mk(s);
+    s.tmp_3 = Math_max__P81398_mk(s);
     s.tmp_3.arg0 = 0;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 273; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 282; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -41284,12 +41127,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_fy__P108537.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"]}
+Sprite_fy__P83319.info = {"start":4340,"length":64,"line":157,"column":4,"endLine":159,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this","v"]}
 
-function Sprite_fy__P108537_mk(s) {
+function Sprite_fy__P83319_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fy__P108537, depth: s.depth + 1,
+        parent: s, fn: Sprite_fy__P83319, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41304,7 +41147,7 @@ function Sprite_fy__P108537_mk(s) {
 
 
 
-function Sprite_fy__P108536(s) {
+function Sprite_fy__P83318(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41319,20 +41162,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108536.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__P108536.isGetter = true;
+Sprite_fy__P83318.info = {"start":4178,"length":60,"line":152,"column":4,"endLine":154,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this"]}
+Sprite_fy__P83318.isGetter = true;
 
-function Sprite_fy__P108536_mk(s) {
+function Sprite_fy__P83318_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fy__P108536, depth: s.depth + 1,
+        parent: s, fn: Sprite_fy__P83318, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41342,7 +41185,7 @@ function Sprite_fy__P108536_mk(s) {
 
 
 
-function Sprite_fx__P108535(s) {
+function Sprite_fx__P83317(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41358,12 +41201,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = Math_max__P106734_mk(s);
+    s.tmp_3 = Math_max__P81398_mk(s);
     s.tmp_3.arg0 = 0;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 270; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 279; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -41376,12 +41219,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_fx__P108535.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"]}
+Sprite_fx__P83317.info = {"start":3997,"length":64,"line":147,"column":4,"endLine":149,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this","v"]}
 
-function Sprite_fx__P108535_mk(s) {
+function Sprite_fx__P83317_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fx__P108535, depth: s.depth + 1,
+        parent: s, fn: Sprite_fx__P83317, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41396,7 +41239,7 @@ function Sprite_fx__P108535_mk(s) {
 
 
 
-function Sprite_fx__P108534(s) {
+function Sprite_fx__P83316(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41411,20 +41254,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108534.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__P108534.isGetter = true;
+Sprite_fx__P83316.info = {"start":3835,"length":60,"line":142,"column":4,"endLine":144,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this"]}
+Sprite_fx__P83316.isGetter = true;
 
-function Sprite_fx__P108534_mk(s) {
+function Sprite_fx__P83316_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fx__P108534, depth: s.depth + 1,
+        parent: s, fn: Sprite_fx__P83316, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41434,7 +41277,7 @@ function Sprite_fx__P108534_mk(s) {
 
 
 
-function Sprite_ay__P108533(s) {
+function Sprite_ay__P83315(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41450,7 +41293,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -41461,12 +41304,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_ay__P108533.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"]}
+Sprite_ay__P83315.info = {"start":3666,"length":51,"line":136,"column":4,"endLine":138,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this","v"]}
 
-function Sprite_ay__P108533_mk(s) {
+function Sprite_ay__P83315_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ay__P108533, depth: s.depth + 1,
+        parent: s, fn: Sprite_ay__P83315, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41479,7 +41322,7 @@ function Sprite_ay__P108533_mk(s) {
 
 
 
-function Sprite_ay__P108532(s) {
+function Sprite_ay__P83314(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41494,20 +41337,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108532.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__P108532.isGetter = true;
+Sprite_ay__P83314.info = {"start":3500,"length":60,"line":131,"column":4,"endLine":133,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this"]}
+Sprite_ay__P83314.isGetter = true;
 
-function Sprite_ay__P108532_mk(s) {
+function Sprite_ay__P83314_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ay__P108532, depth: s.depth + 1,
+        parent: s, fn: Sprite_ay__P83314, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41517,7 +41360,7 @@ function Sprite_ay__P108532_mk(s) {
 
 
 
-function Sprite_ax__P108531(s) {
+function Sprite_ax__P83313(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41533,7 +41376,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -41544,12 +41387,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_ax__P108531.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"]}
+Sprite_ax__P83313.info = {"start":3327,"length":51,"line":125,"column":4,"endLine":127,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this","v"]}
 
-function Sprite_ax__P108531_mk(s) {
+function Sprite_ax__P83313_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ax__P108531, depth: s.depth + 1,
+        parent: s, fn: Sprite_ax__P83313, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41562,7 +41405,7 @@ function Sprite_ax__P108531_mk(s) {
 
 
 
-function Sprite_ax__P108530(s) {
+function Sprite_ax__P83312(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41577,20 +41420,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108530.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__P108530.isGetter = true;
+Sprite_ax__P83312.info = {"start":3161,"length":60,"line":120,"column":4,"endLine":122,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this"]}
+Sprite_ax__P83312.isGetter = true;
 
-function Sprite_ax__P108530_mk(s) {
+function Sprite_ax__P83312_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ax__P108530, depth: s.depth + 1,
+        parent: s, fn: Sprite_ax__P83312, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41600,7 +41443,7 @@ function Sprite_ax__P108530_mk(s) {
 
 
 
-function Sprite_vy__P108529(s) {
+function Sprite_vy__P83311(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41616,7 +41459,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -41627,12 +41470,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_vy__P108529.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"]}
+Sprite_vy__P83311.info = {"start":2988,"length":51,"line":114,"column":4,"endLine":116,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this","v"]}
 
-function Sprite_vy__P108529_mk(s) {
+function Sprite_vy__P83311_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vy__P108529, depth: s.depth + 1,
+        parent: s, fn: Sprite_vy__P83311, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41645,7 +41488,7 @@ function Sprite_vy__P108529_mk(s) {
 
 
 
-function Sprite_vy__P108528(s) {
+function Sprite_vy__P83310(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41660,20 +41503,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108528.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__P108528.isGetter = true;
+Sprite_vy__P83310.info = {"start":2826,"length":60,"line":109,"column":4,"endLine":111,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this"]}
+Sprite_vy__P83310.isGetter = true;
 
-function Sprite_vy__P108528_mk(s) {
+function Sprite_vy__P83310_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vy__P108528, depth: s.depth + 1,
+        parent: s, fn: Sprite_vy__P83310, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41683,7 +41526,7 @@ function Sprite_vy__P108528_mk(s) {
 
 
 
-function Sprite_vx__P108527(s) {
+function Sprite_vx__P83309(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41699,7 +41542,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -41710,12 +41553,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_vx__P108527.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"]}
+Sprite_vx__P83309.info = {"start":2657,"length":51,"line":103,"column":4,"endLine":105,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this","v"]}
 
-function Sprite_vx__P108527_mk(s) {
+function Sprite_vx__P83309_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vx__P108527, depth: s.depth + 1,
+        parent: s, fn: Sprite_vx__P83309, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41728,7 +41571,7 @@ function Sprite_vx__P108527_mk(s) {
 
 
 
-function Sprite_vx__P108526(s) {
+function Sprite_vx__P83308(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41743,20 +41586,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108526.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__P108526.isGetter = true;
+Sprite_vx__P83308.info = {"start":2495,"length":60,"line":98,"column":4,"endLine":100,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this"]}
+Sprite_vx__P83308.isGetter = true;
 
-function Sprite_vx__P108526_mk(s) {
+function Sprite_vx__P83308_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vx__P108526, depth: s.depth + 1,
+        parent: s, fn: Sprite_vx__P83308, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41766,7 +41609,7 @@ function Sprite_vx__P108526_mk(s) {
 
 
 
-function game_onShade__P109044(s) {
+function game_onShade__P83823(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41780,9 +41623,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P110879_mk(s);
+    s.tmp_0 = game_init__P85718_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 906; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 910; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -41794,11 +41637,11 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = scene_createRenderable__P108880_mk(s);
+    s.tmp_2 = scene_createRenderable__P83659_mk(s);
     s.tmp_2.arg0 = 80;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 907; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 911; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -41806,12 +41649,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onShade__P109044.info = {"start":9934,"length":145,"line":320,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"onShade","argumentNames":["a"]}
+game_onShade__P83823.info = {"start":9934,"length":145,"line":320,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onShade","argumentNames":["a"]}
 
-function game_onShade__P109044_mk(s) {
+function game_onShade__P83823_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onShade__P109044, depth: s.depth + 1,
+        parent: s, fn: game_onShade__P83823, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41823,7 +41666,7 @@ function game_onShade__P109044_mk(s) {
 
 
 
-function scene_createRenderable__P108880(s) {
+function scene_createRenderable__P83659(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41833,14 +41676,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.renderable___127979 = undefined;
+    s.renderable___103334 = 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__C108875_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Renderable__C83654_VT);
     s.tmp_0 = r0;
     s.tmp_1 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_1);
@@ -41848,35 +41691,35 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 2; continue; }
   case 1:
-    r0 = inline__P127985;
+    r0 = inline__P103340;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.tmp_3 = scene_Renderable_constructor__P108876_mk(s);
+    s.tmp_3 = scene_Renderable_constructor__P83655_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 = 815; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 819; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
-    s.renderable___127979 = (s.tmp_0);
-    r0 = s.renderable___127979;
+    s.renderable___103334 = (s.tmp_0);
+    r0 = s.renderable___103334;
     return leave(s, r0)
   default: oops()
 } } }
-scene_createRenderable__P108880.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"]}
+scene_createRenderable__P83659.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"]}
 
-function scene_createRenderable__P108880_mk(s) {
+function scene_createRenderable__P83659_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_createRenderable__P108880, depth: s.depth + 1,
+        parent: s, fn: scene_createRenderable__P83659, 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___127979: undefined,
+  renderable___103334: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -41886,7 +41729,7 @@ function scene_createRenderable__P108880_mk(s) {
 
 
 
-function inline__P127985(s) {
+function inline__P103340(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41900,12 +41743,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P127985.info = {"start":875,"length":10,"line":31,"column":32,"endLine":31,"endColumn":42,"fileName":"pxt_modules/game---hw/renderable.ts","functionName":"inline","argumentNames":[]}
+inline__P103340.info = {"start":875,"length":10,"line":31,"column":32,"endLine":31,"endColumn":42,"fileName":"pxt_modules/game/renderable.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P127985_mk(s) {
+function inline__P103340_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P127985, depth: s.depth + 1,
+        parent: s, fn: inline__P103340, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -41913,7 +41756,7 @@ function inline__P127985_mk(s) {
 
 
 
-function scene_Renderable_constructor__P108876(s) {
+function scene_Renderable_constructor__P83655(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41931,25 +41774,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C108875_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C83654_VT)) failedCast(r0);
     r0 = (s.arg0).fields["handler"] = (s.arg1);
     r0 = (s.arg0).fields["shouldBeVisible"] = (s.arg2);
-    s.tmp_0 = sprites_BaseSprite_constructor__P108357_mk(s);
+    s.tmp_0 = sprites_BaseSprite_constructor__P83133_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg3;
-    s.callLocIdx = 812; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 816; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable_constructor__P108876.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"]}
+scene_Renderable_constructor__P83655.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"]}
 
-function scene_Renderable_constructor__P108876_mk(s) {
+function scene_Renderable_constructor__P83655_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable_constructor__P108876, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable_constructor__P83655, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41962,7 +41805,7 @@ function scene_Renderable_constructor__P108876_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_constructor__P109120(s) {
+function scene_systemMenu_PauseMenu_constructor__P83899(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41979,7 +41822,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C109119_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C83898_VT)) failedCast(r0);
     r0 = (s.arg0).fields["generator"] = (s.arg1);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -41987,13 +41830,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_1 = scene_systemMenu_buildMenuTheme__P109128_mk(s);
-    r0 = pxsim_ImageMethods.width(globals.CARD_NORMAL___109135);
+    s.tmp_1 = scene_systemMenu_buildMenuTheme__P83907_mk(s);
+    r0 = pxsim_ImageMethods.width(globals.CARD_NORMAL___83914);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 3;
     s.tmp_1.arg2 = undefined;
     s.tmp_1.arg3 = undefined;
-    s.callLocIdx = 946; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 950; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
   case 2:
@@ -42007,12 +41850,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_constructor__P109120.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"]}
+scene_systemMenu_PauseMenu_constructor__P83899.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"]}
 
-function scene_systemMenu_PauseMenu_constructor__P109120_mk(s) {
+function scene_systemMenu_PauseMenu_constructor__P83899_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_constructor__P109120, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_constructor__P83899, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42026,7 +41869,7 @@ function scene_systemMenu_PauseMenu_constructor__P109120_mk(s) {
 
 
 
-function scene_systemMenu_buildMenuTheme__P109128(s) {
+function scene_systemMenu_buildMenuTheme__P83907(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42036,7 +41879,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cardsPerRow___128988 = undefined;
+    s.cardsPerRow___104340 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -42044,19 +41887,19 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     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___128988 = (r0);
+    s.cardsPerRow___104340 = (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___108241;
+    r0 = globals.font8___83018;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -42067,9 +41910,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    s.tmp_1 = image_doubledFont__P108244_mk(s);
+    s.tmp_1 = image_doubledFont__P83021_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.callLocIdx = 1056; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1060; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
   case 4:
@@ -42080,12 +41923,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___128988);
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "cardsPerRow", s.cardsPerRow___104340);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_3 = r0;
-    r0 = (s.cardsPerRow___128988 * s.arg0);
+    r0 = (s.cardsPerRow___104340 * s.arg0);
     s.tmp_5 = r0;
-    r0 = (s.cardsPerRow___128988 - 1);
+    r0 = (s.cardsPerRow___104340 - 1);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 * s.arg1);
     s.tmp_6 = r0;
@@ -42106,7 +41949,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 = 1057; s.pc = 6; return s.tmp_11; }
+     else { s.callLocIdx = 1061; s.pc = 6; return s.tmp_11; }
     }
   case 6:
     r0 = s.retval;
@@ -42116,7 +41959,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___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_14 = r0;
     s.tmp_16 = if_charHeight_1_mk(s);
     s.tmp_16.arg0 = s.arg2;
@@ -42126,7 +41969,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 = 1058; s.pc = 7; return s.tmp_16; }
+     else { s.callLocIdx = 1062; s.pc = 7; return s.tmp_16; }
     }
   case 7:
     r0 = s.retval;
@@ -42137,19 +41980,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___109136);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "activeCard", globals.CARD_ACTIVE___109137);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "basicCard", globals.CARD_NORMAL___109135);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "selectedCard", globals.CARD_SELECTED___83915);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "activeCard", globals.CARD_ACTIVE___83916);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "basicCard", globals.CARD_NORMAL___83914);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_buildMenuTheme__P109128.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"]}
+scene_systemMenu_buildMenuTheme__P83907.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"]}
 
-function scene_systemMenu_buildMenuTheme__P109128_mk(s) {
+function scene_systemMenu_buildMenuTheme__P83907_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_buildMenuTheme__P109128, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_buildMenuTheme__P83907, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42168,7 +42011,7 @@ function scene_systemMenu_buildMenuTheme__P109128_mk(s) {
   tmp_14: undefined,
   tmp_15: undefined,
   tmp_16: undefined,
-  cardsPerRow___128988: undefined,
+  cardsPerRow___104340: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -42179,7 +42022,7 @@ function scene_systemMenu_buildMenuTheme__P109128_mk(s) {
 
 
 
-function image_doubledFont__P108244(s) {
+function image_doubledFont__P83021(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42193,21 +42036,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = image_scaledFont__P108245_mk(s);
+    s.tmp_0 = image_scaledFont__P83022_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 2;
-    s.callLocIdx = 121; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 135; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-image_doubledFont__P108244.info = {"start":12008,"length":82,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen---st7735/text.ts","functionName":"doubledFont","argumentNames":["f"]}
+image_doubledFont__P83021.info = {"start":12008,"length":82,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"doubledFont","argumentNames":["f"]}
 
-function image_doubledFont__P108244_mk(s) {
+function image_doubledFont__P83021_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_doubledFont__P108244, depth: s.depth + 1,
+        parent: s, fn: image_doubledFont__P83021, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -42217,7 +42060,7 @@ function image_doubledFont__P108244_mk(s) {
 
 
 
-function image_scaledFont__P108245(s) {
+function image_scaledFont__P83022(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42252,7 +42095,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 = 122; s.pc = 6; return s.tmp_4; }
+     else { s.callLocIdx = 136; s.pc = 6; return s.tmp_4; }
     }
   case 6:
     r0 = s.retval;
@@ -42268,7 +42111,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 = 123; s.pc = 7; return s.tmp_7; }
+     else { s.callLocIdx = 137; s.pc = 7; return s.tmp_7; }
     }
   case 7:
     r0 = s.retval;
@@ -42284,7 +42127,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 = 124; s.pc = 8; return s.tmp_9; }
+     else { s.callLocIdx = 138; s.pc = 8; return s.tmp_9; }
     }
   case 8:
     r0 = s.retval;
@@ -42298,7 +42141,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 = 125; s.pc = 9; return s.tmp_11; }
+     else { s.callLocIdx = 139; s.pc = 9; return s.tmp_11; }
     }
   case 9:
     r0 = s.retval;
@@ -42314,7 +42157,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 = 126; s.pc = 10; return s.tmp_14; }
+     else { s.callLocIdx = 140; s.pc = 10; return s.tmp_14; }
     }
   case 10:
     r0 = s.retval;
@@ -42332,12 +42175,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-image_scaledFont__P108245.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"]}
+image_scaledFont__P83022.info = {"start":12096,"length":331,"line":150,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"scaledFont","argumentNames":["f","size"]}
 
-function image_scaledFont__P108245_mk(s) {
+function image_scaledFont__P83022_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_scaledFont__P108245, depth: s.depth + 1,
+        parent: s, fn: image_scaledFont__P83022, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42363,7 +42206,7 @@ function image_scaledFont__P108245_mk(s) {
 
 
 
-function scene_systemMenu_initScreen__P111138(s) {
+function scene_systemMenu_initScreen__P85977(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42373,21 +42216,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.brightness___129043 = undefined;
-    s.tmp_0 = settings_readNumber__P108330_mk(s);
+    s.brightness___104395 = undefined;
+    s.tmp_0 = settings_readNumber__P83106_mk(s);
     s.tmp_0.arg0 = "#brightness";
-    s.callLocIdx = 1065; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1069; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.brightness___129043 = (r0);
-    r0 = (s.brightness___129043 !== undefined);
+    s.brightness___104395 = (r0);
+    r0 = (s.brightness___104395 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_setScreenBrightness__P108231_mk(s);
-    s.tmp_1.arg0 = globals.screen___108298;
-    s.tmp_1.arg1 = s.brightness___129043;
-    s.callLocIdx = 1066; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = helpers_setScreenBrightness__P83008_mk(s);
+    s.tmp_1.arg0 = globals.screen___83075;
+    s.tmp_1.arg1 = s.brightness___104395;
+    s.callLocIdx = 1070; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
   case 1:
@@ -42396,23 +42239,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_initScreen__P111138.info = {"start":13388,"length":175,"line":405,"column":4,"endLine":409,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"initScreen","argumentNames":[]}
+scene_systemMenu_initScreen__P85977.info = {"start":13388,"length":175,"line":405,"column":4,"endLine":409,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"initScreen","argumentNames":[]}
 
-function scene_systemMenu_initScreen__P111138_mk(s) {
+function scene_systemMenu_initScreen__P85977_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_initScreen__P111138, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_initScreen__P85977, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  brightness___129043: undefined,
+  brightness___104395: undefined,
 } }
 
 
 
 
 
-function settings_readNumber__P108330(s) {
+function settings_readNumber__P83106(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42422,15 +42265,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___129054 = undefined;
-    s.nums___129061 = undefined;
+    s.buf___104406 = undefined;
+    s.nums___104413 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim.settings._get(s.arg0);
-    s.buf___129054 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.buf___129054);
+    s.buf___104406 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.buf___104406);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -42440,20 +42283,20 @@ switch (step) {
     { step = 7; continue; }
     { step = 6; continue; }
   case 1:
-    s.tmp_2 = msgpack_unpackNumberArray__P106785_mk(s);
-    s.tmp_2.arg0 = s.buf___129054;
+    s.tmp_2 = msgpack_unpackNumberArray__P81449_mk(s);
+    s.tmp_2.arg0 = s.buf___104406;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 164; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 173; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    s.nums___129061 = (r0);
-    s.tmp_0 = r0 = s.nums___129061;
+    s.nums___104413 = (r0);
+    s.tmp_0 = r0 = s.nums___104413;
     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___129061);
+    r0 = pxsim_Array__length(s.nums___104413);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >= 1);
   case 3:
@@ -42461,7 +42304,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___129061, 0);
+    r0 = pxsim_Array__getAt(s.nums___104413, 0);
     { step = 7; continue; }
   case 4:
   case 5:
@@ -42473,18 +42316,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readNumber__P108330.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__P83106.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__P108330_mk(s) {
+function settings_readNumber__P83106_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readNumber__P108330, depth: s.depth + 1,
+        parent: s, fn: settings_readNumber__P83106, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  buf___129054: undefined,
-  nums___129061: undefined,
+  buf___104406: undefined,
+  nums___104413: undefined,
   arg0: undefined,
 } }
 
@@ -42492,7 +42335,7 @@ function settings_readNumber__P108330_mk(s) {
 
 
 
-function settings_readBuffer__P108328(s) {
+function settings_readBuffer__P83104(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42510,12 +42353,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readBuffer__P108328.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__P83104.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__P108328_mk(s) {
+function settings_readBuffer__P83104_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readBuffer__P108328, depth: s.depth + 1,
+        parent: s, fn: settings_readBuffer__P83104, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -42524,7 +42367,7 @@ function settings_readBuffer__P108328_mk(s) {
 
 
 
-function msgpack_unpackNumberArray__P106785(s) {
+function msgpack_unpackNumberArray__P81449(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42534,16 +42377,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___129074 = undefined;
-    s.fmt___129081 = undefined;
-    s.v___129090 = undefined;
+    s.res___104426 = undefined;
+    s.fmt___104433 = undefined;
+    s.v___104442 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___129074 = (r0);
+    s.res___104426 = (r0);
   case 1:
     s.tmp_1 = r0 = s.arg1;
     r0 = pxsim.BufferMethods.length(s.arg0);
@@ -42555,14 +42398,14 @@ switch (step) {
     s.tmp_3 = r0 = s.arg1;
     r0 = (s.tmp_3 + 1);
     s.arg1 = (r0);
-    s.tmp_4 = msgpack_tagFormat__P110537_mk(s);
+    s.tmp_4 = msgpack_tagFormat__P85321_mk(s);
     r0 = pxsim.BufferMethods.getByte(s.arg0, s.tmp_3);
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 20; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
-    s.fmt___129081 = (r0);
-    r0 = (s.fmt___129081 === null);
+    s.fmt___104433 = (r0);
+    r0 = (s.fmt___104433 === null);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
@@ -42570,21 +42413,21 @@ switch (step) {
     r0 = (s.arg1 - 1);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_1, 6, s.tmp_2);
-    s.v___129090 = (r0);
-    r0 = (-31 <= s.v___129090);
+    s.v___104442 = (r0);
+    r0 = (-31 <= s.v___104442);
     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___129090 <= 127);
+    r0 = (s.v___104442 <= 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___129074, s.v___129090);
+    r0 = pxsim_Array__push(s.res___104426, s.v___104442);
     { step = 5; continue; }
   case 4:
     r0 = null;
@@ -42592,13 +42435,13 @@ switch (step) {
   case 5:
     { step = 7; continue; }
   case 6:
-    s.tmp_0 = r0 = s.res___129074;
-    r0 = pxsim.BufferMethods.getNumber(s.arg0, s.fmt___129081, s.arg1);
+    s.tmp_0 = r0 = s.res___104426;
+    r0 = pxsim.BufferMethods.getNumber(s.arg0, s.fmt___104433, 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__P106777_mk(s);
-    s.tmp_2.arg0 = s.fmt___129081;
+    s.tmp_2 = pins_sizeOf__P81441_mk(s);
+    s.tmp_2.arg0 = s.fmt___104433;
     s.callLocIdx = 21; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
@@ -42619,26 +42462,26 @@ switch (step) {
   case 9:
     { step = 1; continue; }
   case 10:
-    r0 = s.res___129074;
+    r0 = s.res___104426;
   case 11:
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_unpackNumberArray__P106785.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__P81449.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__P106785_mk(s) {
+function msgpack_unpackNumberArray__P81449_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_unpackNumberArray__P106785, depth: s.depth + 1,
+        parent: s, fn: msgpack_unpackNumberArray__P81449, 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___129074: undefined,
-  fmt___129081: undefined,
-  v___129090: undefined,
+  res___104426: undefined,
+  fmt___104433: undefined,
+  v___104442: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -42647,7 +42490,7 @@ function msgpack_unpackNumberArray__P106785_mk(s) {
 
 
 
-function scene_systemMenu_initVolume__P111137(s) {
+function scene_systemMenu_initVolume__P85976(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42657,20 +42500,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.vol___129131 = undefined;
-    s.tmp_0 = settings_readNumber__P108330_mk(s);
+    s.vol___104483 = undefined;
+    s.tmp_0 = settings_readNumber__P83106_mk(s);
     s.tmp_0.arg0 = "#volume";
-    s.callLocIdx = 1063; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1067; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.vol___129131 = (r0);
-    r0 = (s.vol___129131 !== undefined);
+    s.vol___104483 = (r0);
+    r0 = (s.vol___104483 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = music_setVolume__P109350_mk(s);
-    s.tmp_1.arg0 = s.vol___129131;
-    s.callLocIdx = 1064; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = music_setVolume__P82865_mk(s);
+    s.tmp_1.arg0 = s.vol___104483;
+    s.callLocIdx = 1068; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
   case 1:
@@ -42679,23 +42522,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_initVolume__P111137.info = {"start":13238,"length":144,"line":399,"column":4,"endLine":403,"endColumn":5,"fileName":"pxt_modules/game---hw/systemmenu.ts","functionName":"initVolume","argumentNames":[]}
+scene_systemMenu_initVolume__P85976.info = {"start":13238,"length":144,"line":399,"column":4,"endLine":403,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"initVolume","argumentNames":[]}
 
-function scene_systemMenu_initVolume__P111137_mk(s) {
+function scene_systemMenu_initVolume__P85976_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_initVolume__P111137, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_initVolume__P85976, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  vol___129131: undefined,
+  vol___104483: undefined,
 } }
 
 
 
 
 
-function game_currentScene__P109029(s) {
+function game_currentScene__P83808(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42705,21 +42548,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_init__P110879_mk(s);
+    s.tmp_0 = game_init__P85718_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 859; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 863; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals._scene___110871;
+    r0 = globals._scene___85710;
     return leave(s, r0)
   default: oops()
 } } }
-game_currentScene__P109029.info = {"start":667,"length":90,"line":22,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"currentScene","argumentNames":[]}
+game_currentScene__P83808.info = {"start":667,"length":90,"line":22,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"currentScene","argumentNames":[]}
 
-function game_currentScene__P109029_mk(s) {
+function game_currentScene__P83808_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_currentScene__P109029, depth: s.depth + 1,
+        parent: s, fn: game_currentScene__P83808, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -42728,7 +42571,7 @@ function game_currentScene__P109029_mk(s) {
 
 
 
-function game_addScenePopHandler__P109048(s) {
+function game_addScenePopHandler__P83827(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42742,35 +42585,35 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___110874);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___85713);
     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___110874 = (r0);
+    globals._scenePopHandlers___85713 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(globals._scenePopHandlers___110874, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals._scenePopHandlers___85713, 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___110874, s.arg0);
+    r0 = pxsim_Array__push(globals._scenePopHandlers___85713, s.arg0);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_addScenePopHandler__P109048.info = {"start":11754,"length":237,"line":368,"column":4,"endLine":372,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"addScenePopHandler","argumentNames":["handler"]}
+game_addScenePopHandler__P83827.info = {"start":11754,"length":237,"line":368,"column":4,"endLine":372,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"addScenePopHandler","argumentNames":["handler"]}
 
-function game_addScenePopHandler__P109048_mk(s) {
+function game_addScenePopHandler__P83827_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_addScenePopHandler__P109048, depth: s.depth + 1,
+        parent: s, fn: game_addScenePopHandler__P83827, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42781,7 +42624,7 @@ function game_addScenePopHandler__P109048_mk(s) {
 
 
 
-function game_addScenePushHandler__P109046(s) {
+function game_addScenePushHandler__P83825(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42795,35 +42638,35 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___110873);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___85712);
     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___110873 = (r0);
+    globals._scenePushHandlers___85712 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(globals._scenePushHandlers___110873, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals._scenePushHandlers___85712, 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___110873, s.arg0);
+    r0 = pxsim_Array__push(globals._scenePushHandlers___85712, s.arg0);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_addScenePushHandler__P109046.info = {"start":10753,"length":242,"line":344,"column":4,"endLine":348,"endColumn":5,"fileName":"pxt_modules/game---hw/game.ts","functionName":"addScenePushHandler","argumentNames":["handler"]}
+game_addScenePushHandler__P83825.info = {"start":10753,"length":242,"line":344,"column":4,"endLine":348,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"addScenePushHandler","argumentNames":["handler"]}
 
-function game_addScenePushHandler__P109046_mk(s) {
+function game_addScenePushHandler__P83825_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_addScenePushHandler__P109046, depth: s.depth + 1,
+        parent: s, fn: game_addScenePushHandler__P83825, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42834,7 +42677,7 @@ function game_addScenePushHandler__P109046_mk(s) {
 
 
 
-function Fx8__P106753(s) {
+function Fx8__P81417(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42854,12 +42697,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx8__P106753.info = {"start":42,"length":68,"line":4,"column":0,"endLine":6,"endColumn":1,"fileName":"pxt_modules/base/fixed.ts","functionName":"Fx8","argumentNames":["v"]}
+Fx8__P81417.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__P106753_mk(s) {
+function Fx8__P81417_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx8__P106753, depth: s.depth + 1,
+        parent: s, fn: Fx8__P81417, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -42869,7 +42712,7 @@ function Fx8__P106753_mk(s) {
 
 
 
-function SpriteKind_create__P108624(s) {
+function SpriteKind_create__P83408(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42879,26 +42722,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals.nextKind___110724 === undefined);
+    r0 = (globals.nextKind___85550 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.nextKind___110724 = (1000);
+    globals.nextKind___85550 = (1000);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals.nextKind___110724;
+    s.tmp_0 = r0 = globals.nextKind___85550;
     r0 = (s.tmp_0 + 1);
-    globals.nextKind___110724 = (r0);
+    globals.nextKind___85550 = (r0);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-SpriteKind_create__P108624.info = {"start":750,"length":112,"line":25,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/game---hw/spritekind.ts","functionName":"create","argumentNames":[]}
+SpriteKind_create__P83408.info = {"start":750,"length":112,"line":25,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/game/spritekind.ts","functionName":"create","argumentNames":[]}
 
-function SpriteKind_create__P108624_mk(s) {
+function SpriteKind_create__P83408_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: SpriteKind_create__P108624, depth: s.depth + 1,
+        parent: s, fn: SpriteKind_create__P83408, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -42907,7 +42750,7 @@ function SpriteKind_create__P108624_mk(s) {
 
 
 
-function controller_Button_constructor__P108406(s) {
+function controller_Button_constructor__P83182(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42924,7 +42767,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
     r0 = (s.arg0).fields["id"] = (s.arg1);
     r0 = (s.arg0).fields["_pressed"] = (false);
     r0 = (s.arg0).fields["repeatDelay"] = (undefined);
@@ -42934,13 +42777,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__P129207);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P104559);
     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__P129214);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P104566);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = s.arg0.fields["id"];
@@ -42959,12 +42802,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_constructor__P108406.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"]}
+controller_Button_constructor__P83182.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"]}
 
-function controller_Button_constructor__P108406_mk(s) {
+function controller_Button_constructor__P83182_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_constructor__P108406, depth: s.depth + 1,
+        parent: s, fn: controller_Button_constructor__P83182, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42978,7 +42821,7 @@ function controller_Button_constructor__P108406_mk(s) {
 
 
 
-function inline__P129207(s) {
+function inline__P104559(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42988,22 +42831,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller_Button_setPressed__P108411_mk(s);
+    s.tmp_0 = controller_Button_setPressed__P83187_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 176; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 185; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129207.info = {"start":2211,"length":28,"line":77,"column":66,"endLine":77,"endColumn":94,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":[]}
+inline__P104559.info = {"start":2211,"length":28,"line":77,"column":66,"endLine":77,"endColumn":94,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P129207_mk(s) {
+function inline__P104559_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129207, depth: s.depth + 1,
+        parent: s, fn: inline__P104559, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -43012,7 +42855,7 @@ function inline__P129207_mk(s) {
 
 
 
-function inline__P129214(s) {
+function inline__P104566(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43022,22 +42865,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller_Button_setPressed__P108411_mk(s);
+    s.tmp_0 = controller_Button_setPressed__P83187_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 177; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 186; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129214.info = {"start":2313,"length":27,"line":78,"column":68,"endLine":78,"endColumn":95,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"inline","argumentNames":[]}
+inline__P104566.info = {"start":2313,"length":27,"line":78,"column":68,"endLine":78,"endColumn":95,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P129214_mk(s) {
+function inline__P104566_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129214, depth: s.depth + 1,
+        parent: s, fn: inline__P104566, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -43046,7 +42889,7 @@ function inline__P129214_mk(s) {
 
 
 
-function controller_setupButton__P110706(s) {
+function controller_setupButton__P85532(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43065,12 +42908,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_setupButton__P110706.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"]}
+controller_setupButton__P85532.info = {"start":983,"length":93,"line":47,"column":4,"endLine":49,"endColumn":6,"fileName":"pxt_modules/game/controller.ts","functionName":"setupButton","argumentNames":["buttonId","key"]}
 
-function controller_setupButton__P110706_mk(s) {
+function controller_setupButton__P85532_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_setupButton__P110706, depth: s.depth + 1,
+        parent: s, fn: controller_setupButton__P85532, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -43080,7 +42923,7 @@ function controller_setupButton__P110706_mk(s) {
 
 
 
-function controller_Button_setPressed__P108411(s) {
+function controller_Button_setPressed__P83187(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43096,26 +42939,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C83176_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__P108201_mk(s);
-    s.callLocIdx = 180; s.pc = 7; return s.tmp_2;
+    s.tmp_2 = power_poke__P82978_mk(s);
+    s.callLocIdx = 189; 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__P108440_mk(s);
+    s.tmp_1 = controller_Controller_connected__P83216_mk(s);
     r0 = s.arg0.fields["_owner"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = true;
-    s.callLocIdx = 181; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 190; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
   case 1:
@@ -43126,17 +42969,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__P110708_mk(s);
+    s.tmp_0 = controller_Button_raiseButtonDown__P85534_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 182; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 191; 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__P110707_mk(s);
+    s.tmp_0 = controller_Button_raiseButtonUp__P85533_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 183; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 192; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 4:
@@ -43146,12 +42989,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_setPressed__P108411.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"]}
+controller_Button_setPressed__P83187.info = {"start":4600,"length":507,"line":148,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"setPressed","argumentNames":["this","pressed"]}
 
-function controller_Button_setPressed__P108411_mk(s) {
+function controller_Button_setPressed__P83187_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_setPressed__P108411, depth: s.depth + 1,
+        parent: s, fn: controller_Button_setPressed__P83187, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43164,7 +43007,7 @@ function controller_Button_setPressed__P108411_mk(s) {
 
 
 
-function controller_Button_raiseButtonDown__P110708(s) {
+function controller_Button_raiseButtonDown__P85534(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43179,8 +43022,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___110700);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___85526);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -43195,12 +43038,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonDown__P110708.info = {"start":2672,"length":205,"line":92,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"raiseButtonDown","argumentNames":["this"]}
+controller_Button_raiseButtonDown__P85534.info = {"start":2672,"length":205,"line":92,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonDown","argumentNames":["this"]}
 
-function controller_Button_raiseButtonDown__P110708_mk(s) {
+function controller_Button_raiseButtonDown__P85534_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonDown__P110708, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonDown__P85534, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43210,7 +43053,7 @@ function controller_Button_raiseButtonDown__P110708_mk(s) {
 
 
 
-function controller_Button_raiseButtonUp__P110707(s) {
+function controller_Button_raiseButtonUp__P85533(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43225,8 +43068,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___110700);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___85526);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -43241,12 +43084,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonUp__P110707.info = {"start":2462,"length":200,"line":85,"column":8,"endLine":90,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"raiseButtonUp","argumentNames":["this"]}
+controller_Button_raiseButtonUp__P85533.info = {"start":2462,"length":200,"line":85,"column":8,"endLine":90,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonUp","argumentNames":["this"]}
 
-function controller_Button_raiseButtonUp__P110707_mk(s) {
+function controller_Button_raiseButtonUp__P85533_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonUp__P110707, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonUp__P85533, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43256,7 +43099,7 @@ function controller_Button_raiseButtonUp__P110707_mk(s) {
 
 
 
-function controller_Controller_connected__P108440(s) {
+function controller_Controller_connected__P83216(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43272,7 +43115,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["_connected"];
     s.tmp_1 = r0;
     r0 = (s.arg1 != s.tmp_1);
@@ -43300,12 +43143,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_connected__P108440.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"]}
+controller_Controller_connected__P83216.info = {"start":12550,"length":261,"line":405,"column":8,"endLine":410,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"connected","argumentNames":["this","value"]}
 
-function controller_Controller_connected__P108440_mk(s) {
+function controller_Controller_connected__P83216_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_connected__P108440, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_connected__P83216, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43318,7 +43161,7 @@ function controller_Controller_connected__P108440_mk(s) {
 
 
 
-function controller_Controller_id__P108427(s) {
+function controller_Controller_id__P83203(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43333,18 +43176,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["_id"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_id__P108427.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__P108427.isGetter = true;
+controller_Controller_id__P83203.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__P83203.isGetter = true;
 
-function controller_Controller_id__P108427_mk(s) {
+function controller_Controller_id__P83203_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_id__P108427, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_id__P83203, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -43353,7 +43196,7 @@ function controller_Controller_id__P108427_mk(s) {
 
 
 
-function controller_Controller_connected__P108439(s) {
+function controller_Controller_connected__P83215(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43368,18 +43211,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["_connected"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_connected__P108439.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__P108439.isGetter = true;
+controller_Controller_connected__P83215.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__P83215.isGetter = true;
 
-function controller_Controller_connected__P108439_mk(s) {
+function controller_Controller_connected__P83215_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_connected__P108439, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_connected__P83215, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -43388,7 +43231,7 @@ function controller_Controller_connected__P108439_mk(s) {
 
 
 
-function settings_initScopes__P110673(s) {
+function settings_initScopes__P85499(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43398,18 +43241,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rn___129292 = undefined;
-    s.tmp_1 = settings_runNumber__P108322_mk(s);
-    s.callLocIdx = 155; s.pc = 1; return s.tmp_1;
+    s.rn___104644 = undefined;
+    s.tmp_1 = settings_runNumber__P83098_mk(s);
+    s.callLocIdx = 164; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.rn___129292 = (r0);
-    s.tmp_0 = settings_writeNumber__P108326_mk(s);
-    s.tmp_0.arg0 = globals.RUN_KEY___110661;
-    s.tmp_0.arg1 = s.rn___129292;
-    s.callLocIdx = 156; s.pc = 2; return s.tmp_0;
+    s.rn___104644 = (r0);
+    s.tmp_0 = settings_writeNumber__P83102_mk(s);
+    s.tmp_0.arg0 = globals.RUN_KEY___85487;
+    s.tmp_0.arg1 = s.rn___104644;
+    s.callLocIdx = 165; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = pxsim.control.deviceSerialNumber();
@@ -43417,34 +43260,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___129292);
-    s.tmp_0 = settings_setScope__P110672_mk(s);
+    r0 = pxsim_pxtcore.seedAddRandom(s.rn___104644);
+    s.tmp_0 = settings_setScope__P85498_mk(s);
     r0 = pxsim_pxtcore.programName();
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 157; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 166; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-settings_initScopes__P110673.info = {"start":1104,"length":230,"line":41,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"initScopes","argumentNames":[]}
+settings_initScopes__P85499.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__P110673_mk(s) {
+function settings_initScopes__P85499_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_initScopes__P110673, depth: s.depth + 1,
+        parent: s, fn: settings_initScopes__P85499, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  rn___129292: undefined,
+  rn___104644: undefined,
 } }
 
 
 
 
 
-function settings_setScope__P110672(s) {
+function settings_setScope__P85498(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43454,7 +43297,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currScope___129321 = undefined;
+    s.currScope___104673 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -43479,21 +43322,21 @@ switch (step) {
     r0 = pxsim_pxtrt.panic(922);
   case 3:
   case 4:
-    s.tmp_0 = settings_readString__P108329_mk(s);
-    s.tmp_0.arg0 = globals.SCOPE_KEY___110662;
-    s.callLocIdx = 153; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = settings_readString__P83105_mk(s);
+    s.tmp_0.arg0 = globals.SCOPE_KEY___85488;
+    s.callLocIdx = 162; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.currScope___129321 = (r0);
-    r0 = (s.currScope___129321 != s.arg0);
+    s.currScope___104673 = (r0);
+    r0 = (s.currScope___104673 != 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__P108325_mk(s);
-    s.tmp_0.arg0 = globals.SCOPE_KEY___110662;
+    s.tmp_0 = settings_writeString__P83101_mk(s);
+    s.tmp_0.arg0 = globals.SCOPE_KEY___85488;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 154; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 163; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 5:
@@ -43502,18 +43345,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_setScope__P110672.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__P85498.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__P110672_mk(s) {
+function settings_setScope__P85498_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_setScope__P110672, depth: s.depth + 1,
+        parent: s, fn: settings_setScope__P85498, 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___129321: undefined,
+  currScope___104673: undefined,
   arg0: undefined,
 } }
 
@@ -43521,7 +43364,7 @@ function settings_setScope__P110672_mk(s) {
 
 
 
-function settings_readString__P108329(s) {
+function settings_readString__P83105(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43531,14 +43374,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___124426 = undefined;
+    s.buf___99761 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim.settings._get(s.arg0);
-    s.buf___124426 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.buf___124426);
+    s.buf___99761 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.buf___99761);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -43548,7 +43391,7 @@ switch (step) {
     { step = 3; continue; }
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.BufferMethods.toString(s.buf___124426);
+    r0 = pxsim.BufferMethods.toString(s.buf___99761);
     { step = 3; continue; }
   case 2:
     r0 = undefined;
@@ -43556,16 +43399,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readString__P108329.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__P83105.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__P108329_mk(s) {
+function settings_readString__P83105_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readString__P108329, depth: s.depth + 1,
+        parent: s, fn: settings_readString__P83105, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  buf___124426: undefined,
+  buf___99761: undefined,
   arg0: undefined,
 } }
 
@@ -43573,7 +43416,7 @@ function settings_readString__P108329_mk(s) {
 
 
 
-function settings_writeString__P108325(s) {
+function settings_writeString__P83101(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43588,23 +43431,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = settings_writeBuffer__P108324_mk(s);
+    s.tmp_0 = settings_writeBuffer__P83100_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim.control.createBufferFromUTF8(s.arg1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 159; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 168; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeString__P108325.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__P83101.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__P108325_mk(s) {
+function settings_writeString__P83101_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeString__P108325, depth: s.depth + 1,
+        parent: s, fn: settings_writeString__P83101, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43615,7 +43458,7 @@ function settings_writeString__P108325_mk(s) {
 
 
 
-function settings_runNumber__P108322(s) {
+function settings_runNumber__P83098(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43625,9 +43468,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_1 = settings_readNumber__P108330_mk(s);
-    s.tmp_1.arg0 = globals.RUN_KEY___110661;
-    s.callLocIdx = 152; s.pc = 3; return s.tmp_1;
+    s.tmp_1 = settings_readNumber__P83106_mk(s);
+    s.tmp_1.arg0 = globals.RUN_KEY___85487;
+    s.callLocIdx = 161; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -43644,12 +43487,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_runNumber__P108322.info = {"start":745,"length":75,"line":27,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"runNumber","argumentNames":[]}
+settings_runNumber__P83098.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__P108322_mk(s) {
+function settings_runNumber__P83098_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_runNumber__P108322, depth: s.depth + 1,
+        parent: s, fn: settings_runNumber__P83098, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43660,7 +43503,48 @@ function settings_runNumber__P108322_mk(s) {
 
 
 
-function control___screen_update__P108259(s) {
+function control___screen_setupUpdate__P83037(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;
+    }
+    globals.__updated___85456 = (true);
+    globals.__update___85454 = (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 = 157; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+control___screen_setupUpdate__P83037.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__P83037_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: control___screen_setupUpdate__P83037, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function control___screen_update__P83036(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43670,27 +43554,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.__update___110639);
+    r0 = pxsim_numops_toBoolDecr(globals.__update___85454);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = globals.__update___110639;
+    s.tmp_0.argL = globals.__update___85454;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 142; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 156; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
   case 2:
-    globals.__updated___110641 = (true);
+    globals.__updated___85456 = (true);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control___screen_update__P108259.info = {"start":90,"length":102,"line":4,"column":4,"endLine":8,"endColumn":5,"fileName":"pxt_modules/screen---st7735/frame.ts","functionName":"update","argumentNames":[]}
+control___screen_update__P83036.info = {"start":90,"length":102,"line":4,"column":4,"endLine":8,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"update","argumentNames":[]}
 
-function control___screen_update__P108259_mk(s) {
+function control___screen_update__P83036_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control___screen_update__P108259, depth: s.depth + 1,
+        parent: s, fn: control___screen_update__P83036, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -43699,7 +43583,7 @@ function control___screen_update__P108259_mk(s) {
 
 
 
-function pause__P107011(s) {
+function pause__P81675(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43723,12 +43607,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pause__P107011.info = {"start":246,"length":57,"line":7,"column":0,"endLine":9,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
+pause__P81675.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__P107011_mk(s) {
+function pause__P81675_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pause__P107011, depth: s.depth + 1,
+        parent: s, fn: pause__P81675, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -43737,7 +43621,7 @@ function pause__P107011_mk(s) {
 
 
 
-function sprites_SpriteSet_toString__P108619(s) {
+function sprites_SpriteSet_toString__P83403(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43752,7 +43636,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C108608_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C83392_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = s.arg0.fields["_sprites"];
@@ -43774,12 +43658,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_toString__P108619.info = {"start":2577,"length":66,"line":97,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game---hw/spriteset.ts","functionName":"toString","argumentNames":["this"]}
+sprites_SpriteSet_toString__P83403.info = {"start":2577,"length":66,"line":97,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"toString","argumentNames":["this"]}
 
-function sprites_SpriteSet_toString__P108619_mk(s) {
+function sprites_SpriteSet_toString__P83403_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_toString__P108619, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_toString__P83403, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43793,7 +43677,7 @@ function sprites_SpriteSet_toString__P108619_mk(s) {
 
 
 
-function sprites_SpriteSet_length__P108611(s) {
+function sprites_SpriteSet_length__P83395(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43808,20 +43692,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C108608_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C83392_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__P108611.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__P108611.isGetter = true;
+sprites_SpriteSet_length__P83395.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__P83395.isGetter = true;
 
-function sprites_SpriteSet_length__P108611_mk(s) {
+function sprites_SpriteSet_length__P83395_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_length__P108611, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_length__P83395, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43831,7 +43715,7 @@ function sprites_SpriteSet_length__P108611_mk(s) {
 
 
 
-function kodu_Page_constructor__P136775(s) {
+function kodu_Page_constructor__P93244(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43849,20 +43733,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Page__C136770_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Page__C93239_VT)) failedCast(r0);
     r0 = (s.arg0).fields["prog"] = (s.arg1);
     r0 = (s.arg0).fields["defn"] = (s.arg2);
     r0 = (s.arg0).fields["index"] = (s.arg3);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P136874);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P93342);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_3 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["defn"];
     r0 = r0.fields["rules"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 1090; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 1089; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -43871,12 +43755,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Page_constructor__P136775.info = {"start":2138,"length":166,"line":79,"column":8,"endLine":81,"endColumn":9,"fileName":"program.ts","functionName":"inline","argumentNames":["this","prog","defn","index"]}
+kodu_Page_constructor__P93244.info = {"start":2138,"length":166,"line":79,"column":8,"endLine":81,"endColumn":9,"fileName":"program.ts","functionName":"inline","argumentNames":["this","prog","defn","index"]}
 
-function kodu_Page_constructor__P136775_mk(s) {
+function kodu_Page_constructor__P93244_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Page_constructor__P136775, depth: s.depth + 1,
+        parent: s, fn: kodu_Page_constructor__P93244, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43892,7 +43776,7 @@ function kodu_Page_constructor__P136775_mk(s) {
 
 
 
-function inline__P136874(s) {
+function inline__P93342(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43906,25 +43790,25 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Rule__C136623_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Rule__C85174_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Rule_constructor__P136878_mk(s);
+    s.tmp_1 = kodu_Rule_constructor__P85184_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.caps[0];
     s.tmp_1.arg2 = s.arg0;
-    s.callLocIdx = 1089; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1088; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P136874.info = {"start":2264,"length":28,"line":80,"column":45,"endLine":80,"endColumn":73,"fileName":"program.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P93342.info = {"start":2264,"length":28,"line":80,"column":45,"endLine":80,"endColumn":73,"fileName":"program.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P136874_mk(s) {
+function inline__P93342_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P136874, depth: s.depth + 1,
+        parent: s, fn: inline__P93342, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43935,7 +43819,7 @@ function inline__P136874_mk(s) {
 
 
 
-function kodu_Physics_constructor__P110394(s) {
+function kodu_Physics_constructor__P85147(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43951,12 +43835,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Physics__C110391_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    if (!checkSubtype(r0, kodu_Physics__C85144_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "physics";
-    s.callLocIdx = 861; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 860; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -43971,12 +43855,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Physics_constructor__P110394.info = {"start":1440,"length":138,"line":50,"column":8,"endLine":54,"endColumn":9,"fileName":"physics.ts","functionName":"inline","argumentNames":["this","stage"]}
+kodu_Physics_constructor__P85147.info = {"start":1440,"length":138,"line":50,"column":8,"endLine":54,"endColumn":9,"fileName":"physics.ts","functionName":"inline","argumentNames":["this","stage"]}
 
-function kodu_Physics_constructor__P110394_mk(s) {
+function kodu_Physics_constructor__P85147_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Physics_constructor__P110394, depth: s.depth + 1,
+        parent: s, fn: kodu_Physics_constructor__P85147, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43988,7 +43872,7 @@ function kodu_Physics_constructor__P110394_mk(s) {
 
 
 
-function sprites_SpriteMap_toString__P108599(s) {
+function music_Melody_toString__P82880(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44003,7 +43887,41 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C108591_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_Melody__C82871_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_text"];
+    return leave(s, r0)
+  default: oops()
+} } }
+music_Melody_toString__P82880.info = {"start":10021,"length":53,"line":310,"column":8,"endLine":312,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"toString","argumentNames":["this"]}
+
+function music_Melody_toString__P82880_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: music_Melody_toString__P82880, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function sprites_SpriteMap_toString__P83383(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__C83375_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
     r0 = s.arg0.fields["buckets"];
@@ -44023,11 +43941,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, " buckets, ");
     s.tmp_1 = r0;
-    s.tmp_10 = helpers_arrayFilter__P106717_mk(s);
+    s.tmp_10 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["buckets"];
     s.tmp_10.arg0 = r0;
-    s.tmp_10.arg1 = inline__P129378;
-    s.callLocIdx = 463; s.pc = 2; return s.tmp_10;
+    s.tmp_10.arg1 = inline__P104727;
+    s.callLocIdx = 472; s.pc = 2; return s.tmp_10;
   case 2:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -44048,12 +43966,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_toString__P108599.info = {"start":4109,"length":123,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"toString","argumentNames":["this"]}
+sprites_SpriteMap_toString__P83383.info = {"start":4109,"length":123,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"toString","argumentNames":["this"]}
 
-function sprites_SpriteMap_toString__P108599_mk(s) {
+function sprites_SpriteMap_toString__P83383_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_toString__P108599, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_toString__P83383, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44073,7 +43991,7 @@ function sprites_SpriteMap_toString__P108599_mk(s) {
 
 
 
-function inline__P129378(s) {
+function inline__P104727(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44097,12 +44015,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129378.info = {"start":4196,"length":8,"line":113,"column":74,"endLine":113,"endColumn":82,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"inline","argumentNames":["b"]}
+inline__P104727.info = {"start":4196,"length":8,"line":113,"column":74,"endLine":113,"endColumn":82,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["b"]}
 
-function inline__P129378_mk(s) {
+function inline__P104727_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129378, depth: s.depth + 1,
+        parent: s, fn: inline__P104727, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44114,7 +44032,7 @@ function inline__P129378_mk(s) {
 
 
 
-function ArcadePhysicsEngine_moveSprite__P108684(s) {
+function ArcadePhysicsEngine_moveSprite__P83470(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44124,9 +44042,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___134569 = undefined;
-    s.maxDist___134579 = undefined;
-    s.ms___134599 = undefined;
+    s.tm___104759 = undefined;
+    s.maxDist___104767 = undefined;
+    s.ms___104787 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -44135,7 +44053,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = s.arg1.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.arg1).fields["_lastX"] = (s.tmp_0);
@@ -44154,29 +44072,19 @@ switch (step) {
     r0 = (s.tmp_2 + s.arg3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    r0 = s.arg1.fields["flags"];
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 & 515);
-    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 = 13; continue; }
-    s.tmp_4 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 674; s.pc = 16; return s.tmp_4;
-  case 16:
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 678; s.pc = 13; return s.tmp_0;
+  case 13:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___134569 = (r0);
-    s.tmp_0 = r0 = s.tm___134569;
+    s.tm___104759 = (r0);
+    s.tmp_0 = r0 = s.tm___104759;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.tm___134569.fields["_map"];
+    r0 = s.tm___104759.fields["_map"];
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -44189,54 +44097,47 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
-    s.tmp_7 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_7);
-    s.tmp_6 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_6);
-    if (!r0) { step = 3; continue; }
-    { step = 15; continue; }
-  case 3:
-  case 4:
+    if (!r0) { step = 11; continue; }
     r0 = s.arg0.fields["maxSingleStep"];
-    s.tmp_8 = r0;
-    r0 = (s.tmp_8 + 128);
-    s.tmp_9 = r0;
-    r0 = (s.tmp_9 >> 8);
-    s.maxDist___134579 = (r0);
-    s.tmp_2 = Math_abs__P106732_mk(s);
+    s.tmp_6 = r0;
+    r0 = (s.tmp_6 + 128);
+    s.tmp_7 = r0;
+    r0 = (s.tmp_7 >> 8);
+    s.maxDist___104767 = (r0);
+    s.tmp_2 = Math_abs__P81396_mk(s);
     r0 = (s.arg2 + 128);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 8);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 678; s.pc = 17; return s.tmp_2;
-  case 17:
+    s.callLocIdx = 682; s.pc = 14; return s.tmp_2;
+  case 14:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.maxDist___134579);
+    r0 = (s.tmp_1 <= s.maxDist___104767);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 5; continue; }
+    if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
-    { step = 6; continue; }
-  case 5:
-    s.tmp_5 = Math_abs__P106732_mk(s);
+    { step = 4; continue; }
+  case 3:
+    s.tmp_5 = Math_abs__P81396_mk(s);
     r0 = (s.arg3 + 128);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 >> 8);
     s.tmp_5.arg0 = r0;
-    s.callLocIdx = 680; s.pc = 18; return s.tmp_5;
-  case 18:
+    s.callLocIdx = 684; s.pc = 15; return s.tmp_5;
+  case 15:
     r0 = s.retval;
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 <= s.maxDist___134579);
-  case 6:
+    r0 = (s.tmp_4 <= s.maxDist___104767);
+  case 4:
     // 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__C108668_VT);
+    if (!r0) { step = 5; continue; }
+    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C83454_VT);
     s.tmp_8 = r0;
-    s.tmp_9 = MovingSprite_constructor__P108669_mk(s);
+    s.tmp_9 = MovingSprite_constructor__P83455_mk(s);
     s.tmp_9.arg0 = s.tmp_8;
     s.tmp_9.arg1 = s.arg1;
     r0 = s.arg1.fields["_vx"];
@@ -44247,76 +44148,75 @@ switch (step) {
     s.tmp_9.arg5 = s.arg3;
     s.tmp_9.arg6 = s.arg2;
     s.tmp_9.arg7 = s.arg3;
-    s.callLocIdx = 681; s.pc = 19; return s.tmp_9;
-  case 19:
+    s.callLocIdx = 685; s.pc = 16; return s.tmp_9;
+  case 16:
     r0 = s.retval;
-    s.ms___134599 = (s.tmp_8);
-    s.tmp_0 = ArcadePhysicsEngine_tilemapCollisions__P110746_mk(s);
+    s.ms___104787 = (s.tmp_8);
+    s.tmp_0 = ArcadePhysicsEngine_tilemapCollisions__P85586_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.ms___134599;
-    s.tmp_0.arg2 = s.tm___134569;
-    s.callLocIdx = 682; s.pc = 20; return s.tmp_0;
-  case 20:
+    s.tmp_0.arg1 = s.ms___104787;
+    s.tmp_0.arg2 = s.tm___104759;
+    s.callLocIdx = 686; s.pc = 17; return s.tmp_0;
+  case 17:
     r0 = s.retval;
-    { step = 12; continue; }
-  case 7:
-    s.tmp_1 = tiles_TileMap_isOnWall__P108835_mk(s);
-    s.tmp_1.arg0 = s.tm___134569;
+    { step = 10; continue; }
+  case 5:
+    s.tmp_1 = tiles_TileMap_isOnWall__P83621_mk(s);
+    s.tmp_1.arg0 = s.tm___104759;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 683; s.pc = 21; return s.tmp_1;
-  case 21:
+    s.callLocIdx = 687; s.pc = 18; return s.tmp_1;
+  case 18:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 8; continue; }
+    if (r0) { step = 6; continue; }
     r0 = s.tmp_0;
-    { step = 9; continue; }
-  case 8:
-    s.tmp_4 = ArcadePhysicsEngine_canResolveClipping__P110748_mk(s);
+    { step = 7; continue; }
+  case 6:
+    s.tmp_4 = ArcadePhysicsEngine_canResolveClipping__P85588_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = s.arg1;
-    s.tmp_4.arg2 = s.tm___134569;
-    s.callLocIdx = 684; s.pc = 22; return s.tmp_4;
-  case 22:
+    s.tmp_4.arg2 = s.tm___104759;
+    s.callLocIdx = 688; s.pc = 19; return s.tmp_4;
+  case 19:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
-  case 9:
+  case 7:
     // jmp value (already in r0)
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
-    if (!r0) { step = 10; continue; }
+    if (!r0) { step = 8; continue; }
     s.tmp_6 = r0 = s.arg1;
     r0 = s.tmp_6.fields["flags"];
     s.tmp_8 = r0;
     r0 = (s.tmp_8 | 256);
     s.tmp_7 = r0;
     r0 = (s.tmp_6).fields["flags"] = (s.tmp_7);
-    { step = 11; continue; }
-  case 10:
+    { step = 9; continue; }
+  case 8:
     s.tmp_0 = r0 = s.arg1;
     r0 = s.tmp_0.fields["flags"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & -257);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["flags"] = (s.tmp_1);
+  case 9:
+  case 10:
   case 11:
   case 12:
-  case 13:
-  case 14:
-  case 15:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_moveSprite__P108684.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"]}
+ArcadePhysicsEngine_moveSprite__P83470.info = {"start":22398,"length":1208,"line":619,"column":4,"endLine":650,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
 
-function ArcadePhysicsEngine_moveSprite__P108684_mk(s) {
+function ArcadePhysicsEngine_moveSprite__P83470_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_moveSprite__P108684, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_moveSprite__P83470, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44328,9 +44228,9 @@ function ArcadePhysicsEngine_moveSprite__P108684_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  tm___134569: undefined,
-  maxDist___134579: undefined,
-  ms___134599: undefined,
+  tm___104759: undefined,
+  maxDist___104767: undefined,
+  ms___104787: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -44341,7 +44241,7 @@ function ArcadePhysicsEngine_moveSprite__P108684_mk(s) {
 
 
 
-function ArcadePhysicsEngine_canResolveClipping__P110748(s) {
+function ArcadePhysicsEngine_canResolveClipping__P85588(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44351,19 +44251,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hbox___134644 = undefined;
-    s.sz___134647 = undefined;
-    s.maxMove___134652 = undefined;
-    s.origY___134654 = undefined;
-    s.origX___134657 = undefined;
-    s.l___134660 = undefined;
-    s.r___134665 = undefined;
-    s.t___134670 = undefined;
-    s.b___134675 = undefined;
-    s.offset___134680 = undefined;
-    s.offset___134705 = undefined;
-    s.offset___134736 = undefined;
-    s.offset___134761 = undefined;
+    s.hbox___104832 = undefined;
+    s.sz___104835 = undefined;
+    s.maxMove___104840 = undefined;
+    s.origY___104842 = undefined;
+    s.origX___104845 = undefined;
+    s.l___104848 = undefined;
+    s.r___104853 = undefined;
+    s.t___104858 = undefined;
+    s.b___104863 = undefined;
+    s.offset___104868 = undefined;
+    s.offset___104893 = undefined;
+    s.offset___104924 = undefined;
+    s.offset___104949 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -44371,7 +44271,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.isStatic(s.tmp_3);
@@ -44382,91 +44282,91 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_4 = Sprite_setHitbox__P108554_mk(s);
+    s.tmp_4 = Sprite_setHitbox__P83336_mk(s);
     s.tmp_4.arg0 = s.arg1;
-    s.callLocIdx = 686; s.pc = 20; return s.tmp_4;
+    s.callLocIdx = 690; s.pc = 20; return s.tmp_4;
   case 20:
     r0 = s.retval;
   case 1:
   case 2:
     r0 = s.arg1.fields["_hitbox"];
-    s.hbox___134644 = (r0);
+    s.hbox___104832 = (r0);
     r0 = s.arg2.fields["_scale"];
     s.tmp_0 = r0;
     r0 = (1 << s.tmp_0);
-    s.sz___134647 = (r0);
-    s.tmp_0 = ArcadePhysicsEngine_maxStep__P108676_mk(s);
+    s.sz___104835 = (r0);
+    s.tmp_0 = ArcadePhysicsEngine_maxStep__P83462_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 688; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 692; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.maxMove___134652 = (r0);
+    s.maxMove___104840 = (r0);
     r0 = s.arg1.fields["_y"];
-    s.origY___134654 = (r0);
+    s.origY___104842 = (r0);
     r0 = s.arg1.fields["_x"];
-    s.origX___134657 = (r0);
-    s.tmp_1 = game_Hitbox_left__P108463_mk(s);
-    s.tmp_1.arg0 = s.hbox___134644;
-    s.callLocIdx = 689; s.pc = 22; return s.tmp_1;
+    s.origX___104845 = (r0);
+    s.tmp_1 = game_Hitbox_left__P83239_mk(s);
+    s.tmp_1.arg0 = s.hbox___104832;
+    s.callLocIdx = 693; 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___134660 = (r0);
-    s.tmp_1 = game_Hitbox_right__P108465_mk(s);
-    s.tmp_1.arg0 = s.hbox___134644;
-    s.callLocIdx = 691; s.pc = 23; return s.tmp_1;
+    s.l___104848 = (r0);
+    s.tmp_1 = game_Hitbox_right__P83241_mk(s);
+    s.tmp_1.arg0 = s.hbox___104832;
+    s.callLocIdx = 695; 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___134665 = (r0);
-    s.tmp_1 = game_Hitbox_top__P108464_mk(s);
-    s.tmp_1.arg0 = s.hbox___134644;
-    s.callLocIdx = 693; s.pc = 24; return s.tmp_1;
+    s.r___104853 = (r0);
+    s.tmp_1 = game_Hitbox_top__P83240_mk(s);
+    s.tmp_1.arg0 = s.hbox___104832;
+    s.callLocIdx = 697; 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___134670 = (r0);
-    s.tmp_1 = game_Hitbox_bottom__P108466_mk(s);
-    s.tmp_1.arg0 = s.hbox___134644;
-    s.callLocIdx = 695; s.pc = 25; return s.tmp_1;
+    s.t___104858 = (r0);
+    s.tmp_1 = game_Hitbox_bottom__P83242_mk(s);
+    s.tmp_1.arg0 = s.hbox___104832;
+    s.callLocIdx = 699; 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___134675 = (r0);
-    r0 = (s.b___134675 + 1);
+    s.b___104863 = (r0);
+    r0 = (s.b___104863 + 1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.sz___134647);
-    s.offset___134680 = (r0);
-    r0 = (s.offset___134680 <= s.maxMove___134652);
+    r0 = (s.tmp_0 % s.sz___104835);
+    s.offset___104868 = (r0);
+    r0 = (s.offset___104868 <= s.maxMove___104840);
     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___134680 * 256);
+    r0 = (s.offset___104868 * 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__P108835_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P83621_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 699; s.pc = 26; return s.tmp_3;
+    s.callLocIdx = 703; s.pc = 26; return s.tmp_3;
   case 26:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -44480,38 +44380,38 @@ switch (step) {
     { step = 19; continue; }
     { step = 4; continue; }
   case 3:
-    r0 = (s.arg1).fields["_y"] = (s.origY___134654);
+    r0 = (s.arg1).fields["_y"] = (s.origY___104842);
   case 4:
   case 5:
   case 6:
-    r0 = (s.t___134670 / s.sz___134647);
+    r0 = (s.t___104858 / s.sz___104835);
     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___134647);
+    r0 = (s.tmp_1 * s.sz___104835);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.t___134670);
-    s.offset___134705 = (r0);
-    r0 = (s.offset___134705 <= s.maxMove___134652);
+    r0 = (s.tmp_0 - s.t___104858);
+    s.offset___104893 = (r0);
+    r0 = (s.offset___104893 <= s.maxMove___104840);
     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___134705 * 256);
+    r0 = (s.offset___104893 * 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__P108835_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P83621_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 702; s.pc = 27; return s.tmp_3;
+    s.callLocIdx = 706; s.pc = 27; return s.tmp_3;
   case 27:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -44525,32 +44425,32 @@ switch (step) {
     { step = 19; continue; }
     { step = 8; continue; }
   case 7:
-    r0 = (s.arg1).fields["_y"] = (s.origY___134654);
+    r0 = (s.arg1).fields["_y"] = (s.origY___104842);
   case 8:
   case 9:
   case 10:
-    r0 = (s.r___134665 + 1);
+    r0 = (s.r___104853 + 1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.sz___134647);
-    s.offset___134736 = (r0);
-    r0 = (s.offset___134736 <= s.maxMove___134652);
+    r0 = (s.tmp_0 % s.sz___104835);
+    s.offset___104924 = (r0);
+    r0 = (s.offset___104924 <= s.maxMove___104840);
     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___134736 * 256);
+    r0 = (s.offset___104924 * 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__P108835_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P83621_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 705; s.pc = 28; return s.tmp_3;
+    s.callLocIdx = 709; s.pc = 28; return s.tmp_3;
   case 28:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -44564,38 +44464,38 @@ switch (step) {
     { step = 19; continue; }
     { step = 12; continue; }
   case 11:
-    r0 = (s.arg1).fields["_x"] = (s.origX___134657);
+    r0 = (s.arg1).fields["_x"] = (s.origX___104845);
   case 12:
   case 13:
   case 14:
-    r0 = (s.l___134660 / s.sz___134647);
+    r0 = (s.l___104848 / s.sz___104835);
     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___134647);
+    r0 = (s.tmp_1 * s.sz___104835);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.l___134660);
-    s.offset___134761 = (r0);
-    r0 = (s.offset___134761 <= s.maxMove___134652);
+    r0 = (s.tmp_0 - s.l___104848);
+    s.offset___104949 = (r0);
+    r0 = (s.offset___104949 <= s.maxMove___104840);
     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___134761 * 256);
+    r0 = (s.offset___104949 * 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__P108835_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P83621_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
-    s.callLocIdx = 708; s.pc = 29; return s.tmp_3;
+    s.callLocIdx = 712; s.pc = 29; return s.tmp_3;
   case 29:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -44609,7 +44509,7 @@ switch (step) {
     { step = 19; continue; }
     { step = 16; continue; }
   case 15:
-    r0 = (s.arg1).fields["_x"] = (s.origX___134657);
+    r0 = (s.arg1).fields["_x"] = (s.origX___104845);
   case 16:
   case 17:
   case 18:
@@ -44618,12 +44518,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_canResolveClipping__P110748.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"]}
+ArcadePhysicsEngine_canResolveClipping__P85588.info = {"start":23702,"length":2135,"line":653,"column":4,"endLine":724,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"canResolveClipping","argumentNames":["this","s","tm"]}
 
-function ArcadePhysicsEngine_canResolveClipping__P110748_mk(s) {
+function ArcadePhysicsEngine_canResolveClipping__P85588_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_canResolveClipping__P110748, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_canResolveClipping__P85588, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44631,19 +44531,19 @@ function ArcadePhysicsEngine_canResolveClipping__P110748_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  hbox___134644: undefined,
-  sz___134647: undefined,
-  maxMove___134652: undefined,
-  origY___134654: undefined,
-  origX___134657: undefined,
-  l___134660: undefined,
-  r___134665: undefined,
-  t___134670: undefined,
-  b___134675: undefined,
-  offset___134680: undefined,
-  offset___134705: undefined,
-  offset___134736: undefined,
-  offset___134761: undefined,
+  hbox___104832: undefined,
+  sz___104835: undefined,
+  maxMove___104840: undefined,
+  origY___104842: undefined,
+  origX___104845: undefined,
+  l___104848: undefined,
+  r___104853: undefined,
+  t___104858: undefined,
+  b___104863: undefined,
+  offset___104868: undefined,
+  offset___104893: undefined,
+  offset___104924: undefined,
+  offset___104949: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -44653,7 +44553,7 @@ function ArcadePhysicsEngine_canResolveClipping__P110748_mk(s) {
 
 
 
-function Sprite_isStatic__P108555(s) {
+function Sprite_isStatic__P83337(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44668,19 +44568,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108555.info = {"start":8266,"length":57,"line":299,"column":4,"endLine":301,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"isStatic","argumentNames":["this"]}
+Sprite_isStatic__P83337.info = {"start":8549,"length":57,"line":305,"column":4,"endLine":307,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isStatic","argumentNames":["this"]}
 
-function Sprite_isStatic__P108555_mk(s) {
+function Sprite_isStatic__P83337_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isStatic__P108555, depth: s.depth + 1,
+        parent: s, fn: Sprite_isStatic__P83337, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -44690,7 +44590,7 @@ function Sprite_isStatic__P108555_mk(s) {
 
 
 
-function game_Hitbox_bottom__P108466(s) {
+function game_Hitbox_bottom__P83242(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44705,12 +44605,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C108456_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C83232_VT)) failedCast(r0);
     r0 = s.arg0.fields["height"];
     s.tmp_1 = r0;
-    s.tmp_3 = game_Hitbox_top__P108464_mk(s);
+    s.tmp_3 = game_Hitbox_top__P83240_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 242; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 251; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -44720,13 +44620,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_bottom__P108466.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__P108466.isGetter = true;
+game_Hitbox_bottom__P83242.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__P83242.isGetter = true;
 
-function game_Hitbox_bottom__P108466_mk(s) {
+function game_Hitbox_bottom__P83242_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_bottom__P108466, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_bottom__P83242, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44739,7 +44639,7 @@ function game_Hitbox_bottom__P108466_mk(s) {
 
 
 
-function game_Hitbox_right__P108465(s) {
+function game_Hitbox_right__P83241(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44754,12 +44654,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C108456_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C83232_VT)) failedCast(r0);
     r0 = s.arg0.fields["width"];
     s.tmp_1 = r0;
-    s.tmp_3 = game_Hitbox_left__P108463_mk(s);
+    s.tmp_3 = game_Hitbox_left__P83239_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 239; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 248; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -44769,13 +44669,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_right__P108465.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__P108465.isGetter = true;
+game_Hitbox_right__P83241.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__P83241.isGetter = true;
 
-function game_Hitbox_right__P108465_mk(s) {
+function game_Hitbox_right__P83241_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_right__P108465, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_right__P83241, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44788,7 +44688,7 @@ function game_Hitbox_right__P108465_mk(s) {
 
 
 
-function game_Hitbox_top__P108464(s) {
+function game_Hitbox_top__P83240(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44803,7 +44703,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C108456_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C83232_VT)) failedCast(r0);
     r0 = s.arg0.fields["oy"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["parent"];
@@ -44813,13 +44713,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_top__P108464.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__P108464.isGetter = true;
+game_Hitbox_top__P83240.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__P83240.isGetter = true;
 
-function game_Hitbox_top__P108464_mk(s) {
+function game_Hitbox_top__P83240_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_top__P108464, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_top__P83240, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44830,7 +44730,7 @@ function game_Hitbox_top__P108464_mk(s) {
 
 
 
-function game_Hitbox_left__P108463(s) {
+function game_Hitbox_left__P83239(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44845,7 +44745,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C108456_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C83232_VT)) failedCast(r0);
     r0 = s.arg0.fields["ox"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["parent"];
@@ -44855,13 +44755,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_left__P108463.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__P108463.isGetter = true;
+game_Hitbox_left__P83239.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__P83239.isGetter = true;
 
-function game_Hitbox_left__P108463_mk(s) {
+function game_Hitbox_left__P83239_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_left__P108463, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_left__P83239, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44872,7 +44772,7 @@ function game_Hitbox_left__P108463_mk(s) {
 
 
 
-function ArcadePhysicsEngine_tilemapCollisions__P110746(s) {
+function ArcadePhysicsEngine_tilemapCollisions__P85586(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44882,38 +44782,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___130001 = undefined;
-    s.hbox___130023 = undefined;
-    s.tileScale___130026 = undefined;
-    s.tileSize___130029 = undefined;
-    s.xDiff___130033 = undefined;
-    s.yDiff___130040 = undefined;
-    s.overlappedTiles___130047 = undefined;
-    s.right___130052 = undefined;
-    s.x0___130056 = undefined;
-    s.collidedTiles___130071 = undefined;
-    s.y___130073 = undefined;
-    s.y0___130087 = undefined;
-    s.obstacle___130103 = undefined;
-    s.collisionDirection___130137 = undefined;
-    s.tile___130163 = undefined;
-    s.unnamed16756___U15 = undefined;
-    s.unnamed16757___U16 = undefined;
-    s.down___130238 = undefined;
-    s.y0___130242 = undefined;
-    s.collidedTiles___130257 = undefined;
-    s.overlappedTiles___130259 = undefined;
-    s.x___130261 = undefined;
-    s.x0___130271 = undefined;
-    s.obstacle___130285 = undefined;
-    s.collisionDirection___130319 = undefined;
-    s.tile___130345 = undefined;
-    s.unnamed16758___U26 = undefined;
-    s.unnamed16759___U27 = undefined;
-    s.x___130417 = undefined;
-    s.x0___130427 = undefined;
-    s.y___130437 = undefined;
-    s.y0___130447 = undefined;
+    s.s___105117 = undefined;
+    s.hbox___105142 = undefined;
+    s.tileScale___105145 = undefined;
+    s.tileSize___105148 = undefined;
+    s.xDiff___105152 = undefined;
+    s.yDiff___105159 = undefined;
+    s.right___105175 = undefined;
+    s.x0___105179 = undefined;
+    s.collidedTiles___105194 = undefined;
+    s.y___105196 = undefined;
+    s.y0___105210 = undefined;
+    s.obstacle___105226 = undefined;
+    s.collisionDirection___105253 = undefined;
+    s.tile___105279 = undefined;
+    s.unnamed1808___U14 = undefined;
+    s.unnamed1809___U15 = undefined;
+    s.down___105357 = undefined;
+    s.y0___105361 = undefined;
+    s.collidedTiles___105376 = undefined;
+    s.x___105378 = undefined;
+    s.x0___105388 = undefined;
+    s.obstacle___105402 = undefined;
+    s.collisionDirection___105429 = undefined;
+    s.tile___105455 = undefined;
+    s.unnamed1810___U24 = undefined;
+    s.unnamed1811___U25 = undefined;
+    s.overlappedTiles___105536 = undefined;
+    s.x___105538 = undefined;
+    s.x0___105548 = undefined;
+    s.y___105558 = undefined;
+    s.y0___105568 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -44921,37 +44820,39 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = s.arg1.fields["sprite"];
-    s.s___130001 = (r0);
-    r0 = s.s___130001.fields["flags"];
+    s.s___105117 = (r0);
+    r0 = s.s___105117.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__P108835_mk(s);
-    s.tmp_3.arg0 = s.arg2;
-    s.tmp_3.arg1 = s.s___130001;
-    s.callLocIdx = 567; s.pc = 84; return s.tmp_3;
-  case 84:
+    s.tmp_5 = tiles_TileMap_isOnWall__P83621_mk(s);
+    s.tmp_5.arg0 = s.arg2;
+    s.tmp_5.arg1 = s.s___105117;
+    s.callLocIdx = 573; s.pc = 89; return s.tmp_5;
+  case 89:
     r0 = s.retval;
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
+    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 = 1; continue; }
-    { step = 83; continue; }
-    { step = 2; continue; }
+    s.tmp_6 = r0 = s.s___105117;
+    r0 = s.tmp_6.fields["flags"];
+    s.tmp_8 = r0;
+    r0 = (s.tmp_8 & -257);
+    s.tmp_7 = r0;
+    r0 = (s.tmp_6).fields["flags"] = (s.tmp_7);
   case 1:
-    s.tmp_4 = r0 = s.s___130001;
-    r0 = s.tmp_4.fields["flags"];
-    s.tmp_6 = r0;
-    r0 = (s.tmp_6 & -257);
-    s.tmp_5 = r0;
-    r0 = (s.tmp_4).fields["flags"] = (s.tmp_5);
   case 2:
   case 3:
   case 4:
-    r0 = s.s___130001.fields["_image"];
+    r0 = s.s___105117.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.isStatic(s.tmp_3);
     s.tmp_2 = r0;
@@ -44961,54 +44862,62 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_4 = Sprite_setHitbox__P108554_mk(s);
-    s.tmp_4.arg0 = s.s___130001;
-    s.callLocIdx = 569; s.pc = 85; return s.tmp_4;
-  case 85:
+    s.tmp_4 = Sprite_setHitbox__P83336_mk(s);
+    s.tmp_4.arg0 = s.s___105117;
+    s.callLocIdx = 575; s.pc = 90; return s.tmp_4;
+  case 90:
     r0 = s.retval;
   case 5:
   case 6:
-    r0 = s.s___130001.fields["_hitbox"];
-    s.hbox___130023 = (r0);
+    r0 = s.s___105117.fields["_hitbox"];
+    s.hbox___105142 = (r0);
     r0 = s.arg2.fields["_scale"];
-    s.tileScale___130026 = (r0);
-    r0 = (1 << s.tileScale___130026);
-    s.tileSize___130029 = (r0);
-    r0 = s.s___130001.fields["_x"];
+    s.tileScale___105145 = (r0);
+    r0 = (1 << s.tileScale___105145);
+    s.tileSize___105148 = (r0);
+    r0 = s.s___105117.fields["_x"];
     s.tmp_0 = r0;
-    r0 = s.s___130001.fields["_lastX"];
+    r0 = s.s___105117.fields["_lastX"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.xDiff___130033 = (r0);
-    r0 = s.s___130001.fields["_y"];
+    s.xDiff___105152 = (r0);
+    r0 = s.s___105117.fields["_y"];
     s.tmp_0 = r0;
-    r0 = s.s___130001.fields["_lastY"];
+    r0 = s.s___105117.fields["_lastY"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.yDiff___130040 = (r0);
-    r0 = pxsim_Array__mk();
-    s.overlappedTiles___130047 = (r0);
-    r0 = (s.xDiff___130033 !== 0);
+    s.yDiff___105159 = (r0);
+    r0 = s.s___105117.fields["flags"];
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 & 2818);
+    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 = 75; continue; }
+    r0 = (s.xDiff___105152 !== 0);
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 39; continue; }
-    r0 = (s.xDiff___130033 > 0);
-    s.right___130052 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.right___130052);
+    r0 = (s.xDiff___105152 > 0);
+    s.right___105175 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.right___105175);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = game_Hitbox_right__P108465_mk(s);
-    s.tmp_1.arg0 = s.hbox___130023;
-    s.callLocIdx = 573; s.pc = 86; return s.tmp_1;
-  case 86:
+    s.tmp_1 = game_Hitbox_right__P83241_mk(s);
+    s.tmp_1.arg0 = s.hbox___105142;
+    s.callLocIdx = 579; s.pc = 91; return s.tmp_1;
+  case 91:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 256);
     { step = 8; continue; }
   case 7:
-    s.tmp_3 = game_Hitbox_left__P108463_mk(s);
-    s.tmp_3.arg0 = s.hbox___130023;
-    s.callLocIdx = 575; s.pc = 87; return s.tmp_3;
-  case 87:
+    s.tmp_3 = game_Hitbox_left__P83239_mk(s);
+    s.tmp_3.arg0 = s.hbox___105142;
+    s.callLocIdx = 581; s.pc = 92; return s.tmp_3;
+  case 92:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 256);
@@ -45017,30 +44926,30 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 128);
     s.tmp_5 = r0;
-    r0 = (s.tileScale___130026 + 8);
+    r0 = (s.tileScale___105145 + 8);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 >> s.tmp_6);
-    s.x0___130056 = (r0);
+    s.x0___105179 = (r0);
     r0 = pxsim_Array__mk();
-    s.collidedTiles___130071 = (r0);
-    s.tmp_1 = game_Hitbox_top__P108464_mk(s);
-    s.tmp_1.arg0 = s.hbox___130023;
-    s.callLocIdx = 579; s.pc = 88; return s.tmp_1;
-  case 88:
+    s.collidedTiles___105194 = (r0);
+    s.tmp_1 = game_Hitbox_top__P83240_mk(s);
+    s.tmp_1.arg0 = s.hbox___105142;
+    s.callLocIdx = 585; s.pc = 93; return s.tmp_1;
+  case 93:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.yDiff___130040);
-    s.y___130073 = (r0);
+    r0 = (s.tmp_0 - s.yDiff___105159);
+    s.y___105196 = (r0);
   case 9:
-    s.tmp_1 = r0 = s.y___130073;
-    s.tmp_3 = r0 = s.tileSize___130029;
-    s.tmp_6 = game_Hitbox_bottom__P108466_mk(s);
-    s.tmp_6.arg0 = s.hbox___130023;
-    s.callLocIdx = 581; s.pc = 89; return s.tmp_6;
-  case 89:
+    s.tmp_1 = r0 = s.y___105196;
+    s.tmp_3 = r0 = s.tileSize___105148;
+    s.tmp_6 = game_Hitbox_bottom__P83242_mk(s);
+    s.tmp_6.arg0 = s.hbox___105142;
+    s.callLocIdx = 587; s.pc = 94; return s.tmp_6;
+  case 94:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.yDiff___130040);
+    r0 = (s.tmp_5 - s.yDiff___105159);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 << 8);
     s.tmp_7 = r0;
@@ -45050,52 +44959,52 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_10 = Fx_min__P106770_mk(s);
-    s.tmp_10.arg0 = s.y___130073;
-    s.tmp_12 = game_Hitbox_bottom__P108466_mk(s);
-    s.tmp_12.arg0 = s.hbox___130023;
-    s.callLocIdx = 584; s.pc = 91; return s.tmp_12;
-  case 91:
+    s.tmp_10 = Fx_min__P81434_mk(s);
+    s.tmp_10.arg0 = s.y___105196;
+    s.tmp_12 = game_Hitbox_bottom__P83242_mk(s);
+    s.tmp_12.arg0 = s.hbox___105142;
+    s.callLocIdx = 590; s.pc = 96; return s.tmp_12;
+  case 96:
     r0 = s.retval;
     s.tmp_11 = r0;
-    r0 = (s.tmp_11 - s.yDiff___130040);
+    r0 = (s.tmp_11 - s.yDiff___105159);
     s.tmp_10.arg1 = r0;
-    s.callLocIdx = 586; s.pc = 90; return s.tmp_10;
-  case 90:
+    s.callLocIdx = 592; s.pc = 95; return s.tmp_10;
+  case 95:
     r0 = s.retval;
     s.tmp_9 = r0;
     r0 = (s.tmp_9 + 128);
     s.tmp_8 = r0;
-    r0 = (s.tileScale___130026 + 8);
+    r0 = (s.tileScale___105145 + 8);
     s.tmp_13 = r0;
     r0 = (s.tmp_8 >> s.tmp_13);
-    s.y0___130087 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P108833_mk(s);
+    s.y0___105210 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P83619_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.tmp_1.arg1 = s.x0___130056;
-    s.tmp_1.arg2 = s.y0___130087;
-    s.callLocIdx = 589; s.pc = 92; return s.tmp_1;
-  case 92:
+    s.tmp_1.arg1 = s.x0___105179;
+    s.tmp_1.arg2 = s.y0___105210;
+    s.callLocIdx = 595; s.pc = 97; return s.tmp_1;
+  case 97:
     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__P108834_mk(s);
+    s.tmp_2 = tiles_TileMap_getObstacle__P83620_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___130056;
-    s.tmp_2.arg2 = s.y0___130087;
-    s.callLocIdx = 590; s.pc = 93; return s.tmp_2;
-  case 93:
+    s.tmp_2.arg1 = s.x0___105179;
+    s.tmp_2.arg2 = s.y0___105210;
+    s.callLocIdx = 596; s.pc = 98; return s.tmp_2;
+  case 98:
     r0 = s.retval;
-    s.obstacle___130103 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P130111);
+    s.obstacle___105226 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P105234);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___130103);
-    s.tmp_4 = helpers_arraySome__P106714_mk(s);
-    s.tmp_4.arg0 = s.collidedTiles___130071;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___105226);
+    s.tmp_4 = helpers_arraySome__P81376_mk(s);
+    s.tmp_4.arg0 = s.collidedTiles___105194;
     s.tmp_4.arg1 = s.tmp_0;
-    s.callLocIdx = 591; s.pc = 94; return s.tmp_4;
-  case 94:
+    s.callLocIdx = 597; s.pc = 99; return s.tmp_4;
+  case 99:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
@@ -45104,33 +45013,22 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__push(s.collidedTiles___130071, s.obstacle___130103);
+    r0 = pxsim_Array__push(s.collidedTiles___105194, s.obstacle___105226);
   case 10:
   case 11:
-    { step = 13; continue; }
   case 12:
-    s.tmp_0 = r0 = s.overlappedTiles___130047;
-    s.tmp_2 = tiles_TileMap_getTile__P108826_mk(s);
-    s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___130056;
-    s.tmp_2.arg2 = s.y0___130087;
-    s.callLocIdx = 592; 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___130029 << 8);
+    r0 = (s.tileSize___105148 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.y___130073);
-    s.y___130073 = (r0);
+    r0 = (s.tmp_0 + s.y___105196);
+    s.y___105196 = (r0);
     { step = 9; continue; }
   case 14:
-    r0 = pxsim_Array__length(s.collidedTiles___130071);
+    r0 = pxsim_Array__length(s.collidedTiles___105194);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 37; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.right___130052);
+    r0 = pxsim_numops_toBoolDecr(s.right___105175);
     if (!r0) { step = 15; continue; }
     r0 = 2;
     { step = 16; continue; }
@@ -45139,23 +45037,23 @@ switch (step) {
   case 16:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.collisionDirection___130137 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.right___130052);
+    s.collisionDirection___105253 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.right___105175);
     if (!r0) { step = 17; continue; }
-    r0 = (s.x0___130056 << s.tileScale___130026);
+    r0 = (s.x0___105179 << s.tileScale___105145);
     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___130023.fields["width"];
+    r0 = s.hbox___105142.fields["width"];
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
     { step = 18; continue; }
   case 17:
-    r0 = (s.x0___130056 + 1);
+    r0 = (s.x0___105179 + 1);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 << s.tileScale___130026);
+    r0 = (s.tmp_5 << s.tileScale___105145);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 * 256);
     s.tmp_6 = r0;
@@ -45163,52 +45061,52 @@ switch (step) {
   case 18:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.s___130001;
-    r0 = s.hbox___130023.fields["ox"];
+    s.tmp_8 = r0 = s.s___105117;
+    r0 = s.hbox___105142.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___130163 = (undefined);
-    s.unnamed16756___U15 = (s.collidedTiles___130071);
-    s.unnamed16757___U16 = (0);
+    s.tile___105279 = (undefined);
+    s.unnamed1808___U14 = (s.collidedTiles___105194);
+    s.unnamed1809___U15 = (0);
   case 19:
-    s.tmp_0 = r0 = s.unnamed16757___U16;
-    r0 = pxsim_Array__length(s.unnamed16756___U15);
+    s.tmp_0 = r0 = s.unnamed1809___U15;
+    r0 = pxsim_Array__length(s.unnamed1808___U14);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16756___U15, s.unnamed16757___U16);
-    s.tile___130163 = (r0);
-    s.tmp_2 = Sprite_registerObstacle__P108582_mk(s);
-    s.tmp_2.arg0 = s.s___130001;
-    s.tmp_2.arg1 = s.collisionDirection___130137;
-    s.tmp_2.arg2 = s.tile___130163;
+    r0 = pxsim_Array__getAt(s.unnamed1808___U14, s.unnamed1809___U15);
+    s.tile___105279 = (r0);
+    s.tmp_2 = Sprite_registerObstacle__P83366_mk(s);
+    s.tmp_2.arg0 = s.s___105117;
+    s.tmp_2.arg1 = s.collisionDirection___105253;
+    s.tmp_2.arg2 = s.tile___105279;
     s.tmp_2.arg3 = s.arg2;
-    s.callLocIdx = 598; s.pc = 96; return s.tmp_2;
-  case 96:
+    s.callLocIdx = 603; s.pc = 100; return s.tmp_2;
+  case 100:
     r0 = s.retval;
-    r0 = (s.unnamed16757___U16 + 1);
-    s.unnamed16757___U16 = (r0);
+    r0 = (s.unnamed1809___U15 + 1);
+    s.unnamed1809___U15 = (r0);
     { step = 19; continue; }
   case 20:
-    s.unnamed16756___U15 = (undefined);
-    r0 = s.s___130001.fields["flags"];
+    s.unnamed1808___U14 = (undefined);
+    r0 = s.s___105117.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__P108584_mk(s);
-    s.tmp_2.arg0 = s.s___130001;
+    s.tmp_2 = Sprite_destroy__P83368_mk(s);
+    s.tmp_2.arg0 = s.s___105117;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 599; s.pc = 97; return s.tmp_2;
-  case 97:
+    s.callLocIdx = 604; s.pc = 101; return s.tmp_2;
+  case 101:
     r0 = s.retval;
     { step = 36; continue; }
   case 21:
-    r0 = s.s___130001.fields["_vx"];
+    r0 = s.s___105117.fields["_vx"];
     s.tmp_1 = r0;
     r0 = s.arg1.fields["cachedVx"];
     s.tmp_2 = r0;
@@ -45216,13 +45114,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
-    r0 = s.s___130001.fields["flags"];
+    r0 = s.s___105117.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___130052);
+    r0 = pxsim_numops_toBoolDecr(s.right___105175);
     s.tmp_6 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_6);
     s.tmp_5 = r0;
@@ -45231,10 +45129,10 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 23; continue; }
   case 22:
-    s.tmp_8 = Sprite_vx__P108526_mk(s);
-    s.tmp_8.arg0 = s.s___130001;
-    s.callLocIdx = 600; s.pc = 98; return s.tmp_8;
-  case 98:
+    s.tmp_8 = Sprite_vx__P83308_mk(s);
+    s.tmp_8.arg0 = s.s___105117;
+    s.callLocIdx = 605; s.pc = 102; return s.tmp_8;
+  case 102:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = (s.tmp_7 < 0);
@@ -45246,16 +45144,16 @@ switch (step) {
     r0 = s.tmp_9;
     { step = 27; continue; }
   case 24:
-    s.tmp_10 = r0 = s.right___130052;
+    s.tmp_10 = r0 = s.right___105175;
     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__P108526_mk(s);
-    s.tmp_12.arg0 = s.s___130001;
-    s.callLocIdx = 601; s.pc = 99; return s.tmp_12;
-  case 99:
+    s.tmp_12 = Sprite_vx__P83308_mk(s);
+    s.tmp_12.arg0 = s.s___105117;
+    s.callLocIdx = 606; s.pc = 103; return s.tmp_12;
+  case 103:
     r0 = s.retval;
     s.tmp_11 = r0;
     r0 = (s.tmp_11 > 0);
@@ -45268,8 +45166,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___130001;
-    r0 = s.s___130001.fields["_vx"];
+    s.tmp_15 = r0 = s.s___105117;
+    r0 = s.s___105117.fields["_vx"];
     s.tmp_17 = r0;
     r0 = (0 - s.tmp_17);
     s.tmp_16 = r0;
@@ -45291,30 +45189,30 @@ switch (step) {
     { step = 31; continue; }
   case 30:
     r0 = (s.arg1).fields["dx"] = (0);
-    r0 = (s.s___130001).fields["_vx"] = (0);
+    r0 = (s.s___105117).fields["_vx"] = (0);
   case 31:
     { step = 35; continue; }
   case 32:
-    s.tmp_2 = Math_sign__P106733_mk(s);
-    r0 = s.s___130001.fields["_vx"];
+    s.tmp_2 = Math_sign__P81397_mk(s);
+    r0 = s.s___105117.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 = 606; s.pc = 100; return s.tmp_2;
-  case 100:
+    s.callLocIdx = 611; s.pc = 104; return s.tmp_2;
+  case 104:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_6 = Math_sign__P106733_mk(s);
+    s.tmp_6 = Math_sign__P81397_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 = 608; s.pc = 101; return s.tmp_6;
-  case 101:
+    s.callLocIdx = 613; s.pc = 105; return s.tmp_6;
+  case 105:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = (s.tmp_1 === s.tmp_5);
@@ -45330,27 +45228,27 @@ switch (step) {
   case 38:
   case 39:
   case 40:
-    r0 = (s.yDiff___130040 !== 0);
+    r0 = (s.yDiff___105159 !== 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 73; continue; }
-    r0 = (s.yDiff___130040 > 0);
-    s.down___130238 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.down___130238);
+    r0 = (s.yDiff___105159 > 0);
+    s.down___105357 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.down___105357);
     if (!r0) { step = 41; continue; }
-    s.tmp_1 = game_Hitbox_bottom__P108466_mk(s);
-    s.tmp_1.arg0 = s.hbox___130023;
-    s.callLocIdx = 609; s.pc = 102; return s.tmp_1;
-  case 102:
+    s.tmp_1 = game_Hitbox_bottom__P83242_mk(s);
+    s.tmp_1.arg0 = s.hbox___105142;
+    s.callLocIdx = 614; s.pc = 106; return s.tmp_1;
+  case 106:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 256);
     { step = 42; continue; }
   case 41:
-    s.tmp_3 = game_Hitbox_top__P108464_mk(s);
-    s.tmp_3.arg0 = s.hbox___130023;
-    s.callLocIdx = 611; s.pc = 103; return s.tmp_3;
-  case 103:
+    s.tmp_3 = game_Hitbox_top__P83240_mk(s);
+    s.tmp_3.arg0 = s.hbox___105142;
+    s.callLocIdx = 616; s.pc = 107; return s.tmp_3;
+  case 107:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 256);
@@ -45359,27 +45257,25 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 128);
     s.tmp_5 = r0;
-    r0 = (s.tileScale___130026 + 8);
+    r0 = (s.tileScale___105145 + 8);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 >> s.tmp_6);
-    s.y0___130242 = (r0);
+    s.y0___105361 = (r0);
     r0 = pxsim_Array__mk();
-    s.collidedTiles___130257 = (r0);
-    r0 = pxsim_Array__mk();
-    s.overlappedTiles___130259 = (r0);
-    s.tmp_0 = game_Hitbox_left__P108463_mk(s);
-    s.tmp_0.arg0 = s.hbox___130023;
-    s.callLocIdx = 615; s.pc = 104; return s.tmp_0;
-  case 104:
+    s.collidedTiles___105376 = (r0);
+    s.tmp_0 = game_Hitbox_left__P83239_mk(s);
+    s.tmp_0.arg0 = s.hbox___105142;
+    s.callLocIdx = 620; s.pc = 108; return s.tmp_0;
+  case 108:
     r0 = s.retval;
-    s.x___130261 = (r0);
+    s.x___105378 = (r0);
   case 43:
-    s.tmp_1 = r0 = s.x___130261;
-    s.tmp_3 = r0 = s.tileSize___130029;
-    s.tmp_5 = game_Hitbox_right__P108465_mk(s);
-    s.tmp_5.arg0 = s.hbox___130023;
-    s.callLocIdx = 616; s.pc = 105; return s.tmp_5;
-  case 105:
+    s.tmp_1 = r0 = s.x___105378;
+    s.tmp_3 = r0 = s.tileSize___105148;
+    s.tmp_5 = game_Hitbox_right__P83241_mk(s);
+    s.tmp_5.arg0 = s.hbox___105142;
+    s.callLocIdx = 621; s.pc = 109; return s.tmp_5;
+  case 109:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_3 << 8);
@@ -45390,50 +45286,50 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 48; continue; }
-    s.tmp_9 = Fx_min__P106770_mk(s);
-    s.tmp_9.arg0 = s.x___130261;
-    s.tmp_10 = game_Hitbox_right__P108465_mk(s);
-    s.tmp_10.arg0 = s.hbox___130023;
-    s.callLocIdx = 618; s.pc = 107; return s.tmp_10;
-  case 107:
+    s.tmp_9 = Fx_min__P81434_mk(s);
+    s.tmp_9.arg0 = s.x___105378;
+    s.tmp_10 = game_Hitbox_right__P83241_mk(s);
+    s.tmp_10.arg0 = s.hbox___105142;
+    s.callLocIdx = 623; s.pc = 111; return s.tmp_10;
+  case 111:
     r0 = s.retval;
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 619; s.pc = 106; return s.tmp_9;
-  case 106:
+    s.callLocIdx = 624; s.pc = 110; return s.tmp_9;
+  case 110:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___130026 + 8);
+    r0 = (s.tileScale___105145 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.x0___130271 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P108833_mk(s);
+    s.x0___105388 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P83619_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.tmp_1.arg1 = s.x0___130271;
-    s.tmp_1.arg2 = s.y0___130242;
-    s.callLocIdx = 622; s.pc = 108; return s.tmp_1;
-  case 108:
+    s.tmp_1.arg1 = s.x0___105388;
+    s.tmp_1.arg2 = s.y0___105361;
+    s.callLocIdx = 627; s.pc = 112; return s.tmp_1;
+  case 112:
     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__P108834_mk(s);
+    s.tmp_2 = tiles_TileMap_getObstacle__P83620_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___130271;
-    s.tmp_2.arg2 = s.y0___130242;
-    s.callLocIdx = 623; s.pc = 109; return s.tmp_2;
-  case 109:
+    s.tmp_2.arg1 = s.x0___105388;
+    s.tmp_2.arg2 = s.y0___105361;
+    s.callLocIdx = 628; s.pc = 113; return s.tmp_2;
+  case 113:
     r0 = s.retval;
-    s.obstacle___130285 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P130293);
+    s.obstacle___105402 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P105410);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___130285);
-    s.tmp_4 = helpers_arraySome__P106714_mk(s);
-    s.tmp_4.arg0 = s.collidedTiles___130257;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___105402);
+    s.tmp_4 = helpers_arraySome__P81376_mk(s);
+    s.tmp_4.arg0 = s.collidedTiles___105376;
     s.tmp_4.arg1 = s.tmp_0;
-    s.callLocIdx = 624; s.pc = 110; return s.tmp_4;
-  case 110:
+    s.callLocIdx = 629; s.pc = 114; return s.tmp_4;
+  case 114:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
@@ -45442,33 +45338,22 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 44; continue; }
-    r0 = pxsim_Array__push(s.collidedTiles___130257, s.obstacle___130285);
+    r0 = pxsim_Array__push(s.collidedTiles___105376, s.obstacle___105402);
   case 44:
   case 45:
-    { step = 47; continue; }
   case 46:
-    s.tmp_0 = r0 = s.overlappedTiles___130259;
-    s.tmp_2 = tiles_TileMap_getTile__P108826_mk(s);
-    s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___130271;
-    s.tmp_2.arg2 = s.y0___130242;
-    s.callLocIdx = 625; 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___130029 << 8);
+    r0 = (s.tileSize___105148 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.x___130261);
-    s.x___130261 = (r0);
+    r0 = (s.tmp_0 + s.x___105378);
+    s.x___105378 = (r0);
     { step = 43; continue; }
   case 48:
-    r0 = pxsim_Array__length(s.collidedTiles___130257);
+    r0 = pxsim_Array__length(s.collidedTiles___105376);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 71; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.down___130238);
+    r0 = pxsim_numops_toBoolDecr(s.down___105357);
     if (!r0) { step = 49; continue; }
     r0 = 3;
     { step = 50; continue; }
@@ -45477,23 +45362,23 @@ switch (step) {
   case 50:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.collisionDirection___130319 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.down___130238);
+    s.collisionDirection___105429 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.down___105357);
     if (!r0) { step = 51; continue; }
-    r0 = (s.y0___130242 << s.tileScale___130026);
+    r0 = (s.y0___105361 << s.tileScale___105145);
     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___130023.fields["height"];
+    r0 = s.hbox___105142.fields["height"];
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
     { step = 52; continue; }
   case 51:
-    r0 = (s.y0___130242 + 1);
+    r0 = (s.y0___105361 + 1);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 << s.tileScale___130026);
+    r0 = (s.tmp_5 << s.tileScale___105145);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 * 256);
     s.tmp_6 = r0;
@@ -45501,52 +45386,52 @@ switch (step) {
   case 52:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.s___130001;
-    r0 = s.hbox___130023.fields["oy"];
+    s.tmp_8 = r0 = s.s___105117;
+    r0 = s.hbox___105142.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___130345 = (undefined);
-    s.unnamed16758___U26 = (s.collidedTiles___130257);
-    s.unnamed16759___U27 = (0);
+    s.tile___105455 = (undefined);
+    s.unnamed1810___U24 = (s.collidedTiles___105376);
+    s.unnamed1811___U25 = (0);
   case 53:
-    s.tmp_0 = r0 = s.unnamed16759___U27;
-    r0 = pxsim_Array__length(s.unnamed16758___U26);
+    s.tmp_0 = r0 = s.unnamed1811___U25;
+    r0 = pxsim_Array__length(s.unnamed1810___U24);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 54; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16758___U26, s.unnamed16759___U27);
-    s.tile___130345 = (r0);
-    s.tmp_2 = Sprite_registerObstacle__P108582_mk(s);
-    s.tmp_2.arg0 = s.s___130001;
-    s.tmp_2.arg1 = s.collisionDirection___130319;
-    s.tmp_2.arg2 = s.tile___130345;
+    r0 = pxsim_Array__getAt(s.unnamed1810___U24, s.unnamed1811___U25);
+    s.tile___105455 = (r0);
+    s.tmp_2 = Sprite_registerObstacle__P83366_mk(s);
+    s.tmp_2.arg0 = s.s___105117;
+    s.tmp_2.arg1 = s.collisionDirection___105429;
+    s.tmp_2.arg2 = s.tile___105455;
     s.tmp_2.arg3 = s.arg2;
-    s.callLocIdx = 631; s.pc = 112; return s.tmp_2;
-  case 112:
+    s.callLocIdx = 635; s.pc = 115; return s.tmp_2;
+  case 115:
     r0 = s.retval;
-    r0 = (s.unnamed16759___U27 + 1);
-    s.unnamed16759___U27 = (r0);
+    r0 = (s.unnamed1811___U25 + 1);
+    s.unnamed1811___U25 = (r0);
     { step = 53; continue; }
   case 54:
-    s.unnamed16758___U26 = (undefined);
-    r0 = s.s___130001.fields["flags"];
+    s.unnamed1810___U24 = (undefined);
+    r0 = s.s___105117.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__P108584_mk(s);
-    s.tmp_2.arg0 = s.s___130001;
+    s.tmp_2 = Sprite_destroy__P83368_mk(s);
+    s.tmp_2.arg0 = s.s___105117;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 632; s.pc = 113; return s.tmp_2;
-  case 113:
+    s.callLocIdx = 636; s.pc = 116; return s.tmp_2;
+  case 116:
     r0 = s.retval;
     { step = 70; continue; }
   case 55:
-    r0 = s.s___130001.fields["_vy"];
+    r0 = s.s___105117.fields["_vy"];
     s.tmp_1 = r0;
     r0 = s.arg1.fields["cachedVy"];
     s.tmp_2 = r0;
@@ -45554,13 +45439,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 66; continue; }
-    r0 = s.s___130001.fields["flags"];
+    r0 = s.s___105117.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___130238);
+    r0 = pxsim_numops_toBoolDecr(s.down___105357);
     s.tmp_6 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_6);
     s.tmp_5 = r0;
@@ -45569,10 +45454,10 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 57; continue; }
   case 56:
-    s.tmp_8 = Sprite_vy__P108528_mk(s);
-    s.tmp_8.arg0 = s.s___130001;
-    s.callLocIdx = 633; s.pc = 114; return s.tmp_8;
-  case 114:
+    s.tmp_8 = Sprite_vy__P83310_mk(s);
+    s.tmp_8.arg0 = s.s___105117;
+    s.callLocIdx = 637; s.pc = 117; return s.tmp_8;
+  case 117:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = (s.tmp_7 < 0);
@@ -45584,16 +45469,16 @@ switch (step) {
     r0 = s.tmp_9;
     { step = 61; continue; }
   case 58:
-    s.tmp_10 = r0 = s.down___130238;
+    s.tmp_10 = r0 = s.down___105357;
     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__P108528_mk(s);
-    s.tmp_12.arg0 = s.s___130001;
-    s.callLocIdx = 634; s.pc = 115; return s.tmp_12;
-  case 115:
+    s.tmp_12 = Sprite_vy__P83310_mk(s);
+    s.tmp_12.arg0 = s.s___105117;
+    s.callLocIdx = 638; s.pc = 118; return s.tmp_12;
+  case 118:
     r0 = s.retval;
     s.tmp_11 = r0;
     r0 = (s.tmp_11 > 0);
@@ -45606,8 +45491,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___130001;
-    r0 = s.s___130001.fields["_vy"];
+    s.tmp_15 = r0 = s.s___105117;
+    r0 = s.s___105117.fields["_vy"];
     s.tmp_17 = r0;
     r0 = (0 - s.tmp_17);
     s.tmp_16 = r0;
@@ -45629,30 +45514,30 @@ switch (step) {
     { step = 65; continue; }
   case 64:
     r0 = (s.arg1).fields["dy"] = (0);
-    r0 = (s.s___130001).fields["_vy"] = (0);
+    r0 = (s.s___105117).fields["_vy"] = (0);
   case 65:
     { step = 69; continue; }
   case 66:
-    s.tmp_2 = Math_sign__P106733_mk(s);
-    r0 = s.s___130001.fields["_vy"];
+    s.tmp_2 = Math_sign__P81397_mk(s);
+    r0 = s.s___105117.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 = 639; s.pc = 116; return s.tmp_2;
-  case 116:
+    s.callLocIdx = 643; s.pc = 119; return s.tmp_2;
+  case 119:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_6 = Math_sign__P106733_mk(s);
+    s.tmp_6 = Math_sign__P81397_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 = 641; s.pc = 117; return s.tmp_6;
-  case 117:
+    s.callLocIdx = 645; s.pc = 120; return s.tmp_6;
+  case 120:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = (s.tmp_1 === s.tmp_5);
@@ -45668,19 +45553,33 @@ switch (step) {
   case 72:
   case 73:
   case 74:
-    s.tmp_0 = game_Hitbox_left__P108463_mk(s);
-    s.tmp_0.arg0 = s.hbox___130023;
-    s.callLocIdx = 642; s.pc = 118; return s.tmp_0;
-  case 118:
-    r0 = s.retval;
-    s.x___130417 = (r0);
   case 75:
-    s.tmp_1 = r0 = s.x___130417;
-    s.tmp_3 = r0 = s.tileSize___130029;
-    s.tmp_5 = game_Hitbox_right__P108465_mk(s);
-    s.tmp_5.arg0 = s.hbox___130023;
-    s.callLocIdx = 643; s.pc = 119; return s.tmp_5;
-  case 119:
+  case 76:
+    r0 = s.s___105117.fields["flags"];
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 & 1538);
+    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 = 87; continue; }
+    r0 = pxsim_Array__mk();
+    s.overlappedTiles___105536 = (r0);
+    s.tmp_0 = game_Hitbox_left__P83239_mk(s);
+    s.tmp_0.arg0 = s.hbox___105142;
+    s.callLocIdx = 646; s.pc = 121; return s.tmp_0;
+  case 121:
+    r0 = s.retval;
+    s.x___105538 = (r0);
+  case 77:
+    s.tmp_1 = r0 = s.x___105538;
+    s.tmp_3 = r0 = s.tileSize___105148;
+    s.tmp_5 = game_Hitbox_right__P83241_mk(s);
+    s.tmp_5.arg0 = s.hbox___105142;
+    s.callLocIdx = 647; s.pc = 122; return s.tmp_5;
+  case 122:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_3 << 8);
@@ -45690,38 +45589,38 @@ switch (step) {
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 80; continue; }
-    s.tmp_9 = Fx_min__P106770_mk(s);
-    s.tmp_9.arg0 = s.x___130417;
-    s.tmp_10 = game_Hitbox_right__P108465_mk(s);
-    s.tmp_10.arg0 = s.hbox___130023;
-    s.callLocIdx = 645; s.pc = 121; return s.tmp_10;
-  case 121:
+    if (!r0) { step = 84; continue; }
+    s.tmp_9 = Fx_min__P81434_mk(s);
+    s.tmp_9.arg0 = s.x___105538;
+    s.tmp_10 = game_Hitbox_right__P83241_mk(s);
+    s.tmp_10.arg0 = s.hbox___105142;
+    s.callLocIdx = 649; s.pc = 124; return s.tmp_10;
+  case 124:
     r0 = s.retval;
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 646; s.pc = 120; return s.tmp_9;
-  case 120:
+    s.callLocIdx = 650; s.pc = 123; return s.tmp_9;
+  case 123:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___130026 + 8);
+    r0 = (s.tileScale___105145 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.x0___130427 = (r0);
-    s.tmp_0 = game_Hitbox_top__P108464_mk(s);
-    s.tmp_0.arg0 = s.hbox___130023;
-    s.callLocIdx = 649; s.pc = 122; return s.tmp_0;
-  case 122:
+    s.x0___105548 = (r0);
+    s.tmp_0 = game_Hitbox_top__P83240_mk(s);
+    s.tmp_0.arg0 = s.hbox___105142;
+    s.callLocIdx = 653; s.pc = 125; return s.tmp_0;
+  case 125:
     r0 = s.retval;
-    s.y___130437 = (r0);
-  case 76:
-    s.tmp_1 = r0 = s.y___130437;
-    s.tmp_3 = r0 = s.tileSize___130029;
-    s.tmp_5 = game_Hitbox_bottom__P108466_mk(s);
-    s.tmp_5.arg0 = s.hbox___130023;
-    s.callLocIdx = 650; s.pc = 123; return s.tmp_5;
-  case 123:
+    s.y___105558 = (r0);
+  case 78:
+    s.tmp_1 = r0 = s.y___105558;
+    s.tmp_3 = r0 = s.tileSize___105148;
+    s.tmp_5 = game_Hitbox_bottom__P83242_mk(s);
+    s.tmp_5.arg0 = s.hbox___105142;
+    s.callLocIdx = 654; s.pc = 126; return s.tmp_5;
+  case 126:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_3 << 8);
@@ -45731,87 +45630,107 @@ switch (step) {
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 79; continue; }
-    s.tmp_9 = Fx_min__P106770_mk(s);
-    s.tmp_9.arg0 = s.y___130437;
-    s.tmp_10 = game_Hitbox_bottom__P108466_mk(s);
-    s.tmp_10.arg0 = s.hbox___130023;
-    s.callLocIdx = 652; s.pc = 125; return s.tmp_10;
-  case 125:
+    if (!r0) { step = 83; continue; }
+    s.tmp_9 = Fx_min__P81434_mk(s);
+    s.tmp_9.arg0 = s.y___105558;
+    s.tmp_10 = game_Hitbox_bottom__P83242_mk(s);
+    s.tmp_10.arg0 = s.hbox___105142;
+    s.callLocIdx = 656; s.pc = 128; return s.tmp_10;
+  case 128:
     r0 = s.retval;
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 653; s.pc = 124; return s.tmp_9;
-  case 124:
+    s.callLocIdx = 657; s.pc = 127; return s.tmp_9;
+  case 127:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___130026 + 8);
+    r0 = (s.tileScale___105145 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.y0___130447 = (r0);
-    s.tmp_3 = tiles_TileMap_isObstacle__P108833_mk(s);
+    s.y0___105568 = (r0);
+    s.tmp_3 = tiles_TileMap_isObstacle__P83619_mk(s);
     s.tmp_3.arg0 = s.arg2;
-    s.tmp_3.arg1 = s.x0___130427;
-    s.tmp_3.arg2 = s.y0___130447;
-    s.callLocIdx = 656; s.pc = 126; return s.tmp_3;
-  case 126:
+    s.tmp_3.arg1 = s.x0___105548;
+    s.tmp_3.arg2 = s.y0___105568;
+    s.callLocIdx = 660; s.pc = 129; return s.tmp_3;
+  case 129:
     r0 = s.retval;
     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 = 77; continue; }
-    s.tmp_4 = r0 = s.overlappedTiles___130047;
-    s.tmp_6 = tiles_TileMap_getTile__P108826_mk(s);
-    s.tmp_6.arg0 = s.arg2;
-    s.tmp_6.arg1 = s.x0___130427;
-    s.tmp_6.arg2 = s.y0___130447;
-    s.callLocIdx = 657; 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___130029 << 8);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.y___130437);
-    s.y___130437 = (r0);
-    { step = 76; continue; }
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 79; continue; }
+    r0 = s.tmp_0;
+    { step = 80; continue; }
   case 79:
-    r0 = (s.tileSize___130029 << 8);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.x___130417);
-    s.x___130417 = (r0);
-    { step = 75; continue; }
+    r0 = s.s___105117.fields["flags"];
+    s.tmp_8 = r0;
+    r0 = (s.tmp_8 & 2048);
+    s.tmp_7 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_7);
+    s.tmp_6 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_6);
+    s.tmp_5 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_5);
+    s.tmp_4 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_4);
   case 80:
-    r0 = pxsim_Array__length(s.overlappedTiles___130047);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    // jmp value (already in r0)
+    s.tmp_9 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_9);
     if (!r0) { step = 81; continue; }
-    s.tmp_1 = ArcadePhysicsEngine_tilemapOverlaps__P110747_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.s___130001;
-    s.tmp_1.arg2 = s.overlappedTiles___130047;
-    s.callLocIdx = 660; s.pc = 128; return s.tmp_1;
-  case 128:
+    s.tmp_10 = r0 = s.overlappedTiles___105536;
+    s.tmp_12 = tiles_TileMap_getTile__P83612_mk(s);
+    s.tmp_12.arg0 = s.arg2;
+    s.tmp_12.arg1 = s.x0___105548;
+    s.tmp_12.arg2 = s.y0___105568;
+    s.callLocIdx = 661; s.pc = 130; return s.tmp_12;
+  case 130:
     r0 = s.retval;
+    s.tmp_11 = r0;
+    r0 = pxsim_Array__push(s.tmp_10, s.tmp_11);
   case 81:
   case 82:
+    r0 = (s.tileSize___105148 << 8);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + s.y___105558);
+    s.y___105558 = (r0);
+    { step = 78; continue; }
   case 83:
+    r0 = (s.tileSize___105148 << 8);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + s.x___105538);
+    s.x___105538 = (r0);
+    { step = 77; continue; }
+  case 84:
+    r0 = pxsim_Array__length(s.overlappedTiles___105536);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 85; continue; }
+    s.tmp_1 = ArcadePhysicsEngine_tilemapOverlaps__P85587_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.tmp_1.arg1 = s.s___105117;
+    s.tmp_1.arg2 = s.overlappedTiles___105536;
+    s.callLocIdx = 664; s.pc = 131; return s.tmp_1;
+  case 131:
+    r0 = s.retval;
+  case 85:
+  case 86:
+  case 87:
+  case 88:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_tilemapCollisions__P110746.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"]}
+ArcadePhysicsEngine_tilemapCollisions__P85586.info = {"start":11717,"length":9374,"line":348,"column":4,"endLine":583,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapCollisions","argumentNames":["this","movingSprite","tm"]}
 
-function ArcadePhysicsEngine_tilemapCollisions__P110746_mk(s) {
+function ArcadePhysicsEngine_tilemapCollisions__P85586_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_tilemapCollisions__P110746, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_tilemapCollisions__P85586, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45831,38 +45750,37 @@ function ArcadePhysicsEngine_tilemapCollisions__P110746_mk(s) {
   tmp_15: undefined,
   tmp_16: undefined,
   tmp_17: undefined,
-  s___130001: undefined,
-  hbox___130023: undefined,
-  tileScale___130026: undefined,
-  tileSize___130029: undefined,
-  xDiff___130033: undefined,
-  yDiff___130040: undefined,
-  overlappedTiles___130047: undefined,
-  right___130052: undefined,
-  x0___130056: undefined,
-  collidedTiles___130071: undefined,
-  y___130073: undefined,
-  y0___130087: undefined,
-  obstacle___130103: undefined,
-  collisionDirection___130137: undefined,
-  tile___130163: undefined,
-  unnamed16756___U15: undefined,
-  unnamed16757___U16: undefined,
-  down___130238: undefined,
-  y0___130242: undefined,
-  collidedTiles___130257: undefined,
-  overlappedTiles___130259: undefined,
-  x___130261: undefined,
-  x0___130271: undefined,
-  obstacle___130285: undefined,
-  collisionDirection___130319: undefined,
-  tile___130345: undefined,
-  unnamed16758___U26: undefined,
-  unnamed16759___U27: undefined,
-  x___130417: undefined,
-  x0___130427: undefined,
-  y___130437: undefined,
-  y0___130447: undefined,
+  s___105117: undefined,
+  hbox___105142: undefined,
+  tileScale___105145: undefined,
+  tileSize___105148: undefined,
+  xDiff___105152: undefined,
+  yDiff___105159: undefined,
+  right___105175: undefined,
+  x0___105179: undefined,
+  collidedTiles___105194: undefined,
+  y___105196: undefined,
+  y0___105210: undefined,
+  obstacle___105226: undefined,
+  collisionDirection___105253: undefined,
+  tile___105279: undefined,
+  unnamed1808___U14: undefined,
+  unnamed1809___U15: undefined,
+  down___105357: undefined,
+  y0___105361: undefined,
+  collidedTiles___105376: undefined,
+  x___105378: undefined,
+  x0___105388: undefined,
+  obstacle___105402: undefined,
+  collisionDirection___105429: undefined,
+  tile___105455: undefined,
+  unnamed1810___U24: undefined,
+  unnamed1811___U25: undefined,
+  overlappedTiles___105536: undefined,
+  x___105538: undefined,
+  x0___105548: undefined,
+  y___105558: undefined,
+  y0___105568: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -45872,7 +45790,7 @@ function ArcadePhysicsEngine_tilemapCollisions__P110746_mk(s) {
 
 
 
-function inline__P130111(s) {
+function inline__P105234(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45894,12 +45812,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130111.info = {"start":13980,"length":39,"line":434,"column":44,"endLine":434,"endColumn":83,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["o"]}
+inline__P105234.info = {"start":13933,"length":39,"line":410,"column":48,"endLine":410,"endColumn":87,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P130111_mk(s) {
+function inline__P105234_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130111, depth: s.depth + 1,
+        parent: s, fn: inline__P105234, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45910,7 +45828,7 @@ function inline__P130111_mk(s) {
 
 
 
-function inline__P130293(s) {
+function inline__P105410(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45932,12 +45850,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130293.info = {"start":17215,"length":39,"line":516,"column":44,"endLine":516,"endColumn":83,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["o"]}
+inline__P105410.info = {"start":17315,"length":39,"line":489,"column":48,"endLine":489,"endColumn":87,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P130293_mk(s) {
+function inline__P105410_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130293, depth: s.depth + 1,
+        parent: s, fn: inline__P105410, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45948,7 +45866,7 @@ function inline__P130293_mk(s) {
 
 
 
-function ArcadePhysicsEngine_tilemapOverlaps__P110747(s) {
+function ArcadePhysicsEngine_tilemapOverlaps__P85587(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45958,11 +45876,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.alreadyHandled___130486 = undefined;
-    s.tile___130489 = undefined;
-    s.unnamed16760___U2 = undefined;
-    s.unnamed16761___U3 = undefined;
-    s.tileOverlapHandlers___130510 = undefined;
+    s.alreadyHandled___105615 = undefined;
+    s.tile___105618 = undefined;
+    s.unnamed1812___U2 = undefined;
+    s.unnamed1813___U3 = undefined;
+    s.tileOverlapHandlers___105639 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -45970,27 +45888,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
-    s.alreadyHandled___130486 = (r0);
-    s.tile___130489 = (undefined);
-    s.unnamed16760___U2 = (s.arg2);
-    s.unnamed16761___U3 = (0);
+    s.alreadyHandled___105615 = (r0);
+    s.tile___105618 = (undefined);
+    s.unnamed1812___U2 = (s.arg2);
+    s.unnamed1813___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16761___U3;
-    r0 = pxsim_Array__length(s.unnamed16760___U2);
+    s.tmp_0 = r0 = s.unnamed1813___U3;
+    r0 = pxsim_Array__length(s.unnamed1812___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16760___U2, s.unnamed16761___U3);
-    s.tile___130489 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P130493);
+    r0 = pxsim_Array__getAt(s.unnamed1812___U2, s.unnamed1813___U3);
+    s.tile___105618 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P105622);
     s.tmp_2 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.tile___130489);
-    s.tmp_4 = helpers_arraySome__P106714_mk(s);
-    s.tmp_4.arg0 = s.alreadyHandled___130486;
+    r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.tile___105618);
+    s.tmp_4 = helpers_arraySome__P81376_mk(s);
+    s.tmp_4.arg0 = s.alreadyHandled___105615;
     s.tmp_4.arg1 = s.tmp_2;
-    s.callLocIdx = 665; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 669; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -45999,64 +45917,64 @@ switch (step) {
     { step = 6; continue; }
   case 2:
   case 3:
-    r0 = pxsim_Array__push(s.alreadyHandled___130486, s.tile___130489);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 666; s.pc = 9; return s.tmp_0;
+    r0 = pxsim_Array__push(s.alreadyHandled___105615, s.tile___105618);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 670; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = r0.fields["tileOverlapHandlers"];
-    s.tileOverlapHandlers___130510 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tileOverlapHandlers___130510);
+    s.tileOverlapHandlers___105639 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tileOverlapHandlers___105639);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_pxtcore_mkAction(2, inline__P130518);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P105647);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tile___130489);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P130534);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tile___105618);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P105663);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_1, 1, s.tile___130489);
-    s.tmp_2 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3.arg0 = s.tileOverlapHandlers___130510;
+    r0 = pxsim_pxtrt_stclo(s.tmp_1, 1, s.tile___105618);
+    s.tmp_2 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3.arg0 = s.tileOverlapHandlers___105639;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 669; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 673; 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 = 671; s.pc = 10; return s.tmp_2;
+    s.callLocIdx = 675; s.pc = 10; return s.tmp_2;
   case 10:
     r0 = s.retval;
   case 4:
   case 5:
   case 6:
-    r0 = (s.unnamed16761___U3 + 1);
-    s.unnamed16761___U3 = (r0);
+    r0 = (s.unnamed1813___U3 + 1);
+    s.unnamed1813___U3 = (r0);
     { step = 1; continue; }
   case 7:
-    s.unnamed16760___U2 = (undefined);
+    s.unnamed1812___U2 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_tilemapOverlaps__P110747.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"]}
+ArcadePhysicsEngine_tilemapOverlaps__P85587.info = {"start":21368,"length":699,"line":591,"column":4,"endLine":607,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapOverlaps","argumentNames":["this","sprite","overlappedTiles"]}
 
-function ArcadePhysicsEngine_tilemapOverlaps__P110747_mk(s) {
+function ArcadePhysicsEngine_tilemapOverlaps__P85587_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_tilemapOverlaps__P110747, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_tilemapOverlaps__P85587, 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___130486: undefined,
-  tile___130489: undefined,
-  unnamed16760___U2: undefined,
-  unnamed16761___U3: undefined,
-  tileOverlapHandlers___130510: undefined,
+  alreadyHandled___105615: undefined,
+  tile___105618: undefined,
+  unnamed1812___U2: undefined,
+  unnamed1813___U3: undefined,
+  tileOverlapHandlers___105639: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -46066,7 +45984,7 @@ function ArcadePhysicsEngine_tilemapOverlaps__P110747_mk(s) {
 
 
 
-function inline__P130493(s) {
+function inline__P105622(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46103,12 +46021,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130493.info = {"start":20968,"length":45,"line":618,"column":36,"endLine":618,"endColumn":81,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["l"]}
+inline__P105622.info = {"start":21581,"length":45,"line":595,"column":36,"endLine":595,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["l"]}
 
-function inline__P130493_mk(s) {
+function inline__P105622_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130493, depth: s.depth + 1,
+        parent: s, fn: inline__P105622, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46123,7 +46041,7 @@ function inline__P130493_mk(s) {
 
 
 
-function inline__P130518(s) {
+function inline__P105647(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46150,9 +46068,9 @@ switch (step) {
   case 1:
     r0 = s.arg0.fields["tileKind"];
     s.tmp_3 = r0;
-    s.tmp_5 = tiles_getTileImage__P108842_mk(s);
+    s.tmp_5 = tiles_getTileImage__P83628_mk(s);
     s.tmp_5.arg0 = s.caps[1];
-    s.callLocIdx = 668; s.pc = 3; return s.tmp_5;
+    s.callLocIdx = 672; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -46164,12 +46082,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130518.info = {"start":21282,"length":81,"line":626,"column":28,"endLine":626,"endColumn":109,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P105647.info = {"start":21895,"length":81,"line":603,"column":28,"endLine":603,"endColumn":109,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P130518_mk(s) {
+function inline__P105647_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130518, depth: s.depth + 1,
+        parent: s, fn: inline__P105647, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46185,7 +46103,7 @@ function inline__P130518_mk(s) {
 
 
 
-function inline__P130534(s) {
+function inline__P105663(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46205,12 +46123,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 = 670; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 674; 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 = 670; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 670; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 670; 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 = 674; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 674; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 674; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -46218,12 +46136,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130534.info = {"start":21394,"length":28,"line":627,"column":29,"endLine":627,"endColumn":57,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P105663.info = {"start":22007,"length":28,"line":604,"column":29,"endLine":604,"endColumn":57,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P130534_mk(s) {
+function inline__P105663_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130534, depth: s.depth + 1,
+        parent: s, fn: inline__P105663, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46233,7 +46151,7 @@ function inline__P130534_mk(s) {
 
 
 
-function tiles_getTileImage__P108842(s) {
+function tiles_getTileImage__P83628(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46243,16 +46161,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___130542 = undefined;
+    s.scene___105671 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 792; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 796; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___130542 = (r0);
+    s.scene___105671 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -46262,7 +46180,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___130542.fields["tileMap"];
+    r0 = s.scene___105671.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -46272,32 +46190,32 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim.image.ofBuffer(_hex130552);
+    r0 = pxsim.image.ofBuffer(_hex105681);
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = tiles_TileMap_getTileImage__P108836_mk(s);
-    r0 = s.scene___130542.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getTileImage__P83622_mk(s);
+    r0 = s.scene___105671.fields["tileMap"];
     s.tmp_5.arg0 = r0;
-    s.tmp_6 = tiles_Location_tileSet__P108792_mk(s);
+    s.tmp_6 = tiles_Location_tileSet__P83578_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 793; s.pc = 8; return s.tmp_6;
+    s.callLocIdx = 797; s.pc = 8; return s.tmp_6;
   case 8:
     r0 = s.retval;
     s.tmp_5.arg1 = r0;
-    s.callLocIdx = 794; s.pc = 7; return s.tmp_5;
+    s.callLocIdx = 798; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getTileImage__P108842.info = {"start":16636,"length":207,"line":525,"column":4,"endLine":529,"endColumn":5,"fileName":"pxt_modules/game---hw/tilemap.ts","functionName":"getTileImage","argumentNames":["loc"]}
+tiles_getTileImage__P83628.info = {"start":16636,"length":207,"line":525,"column":4,"endLine":529,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["loc"]}
 
-function tiles_getTileImage__P108842_mk(s) {
+function tiles_getTileImage__P83628_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getTileImage__P108842, depth: s.depth + 1,
+        parent: s, fn: tiles_getTileImage__P83628, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46306,16 +46224,16 @@ function tiles_getTileImage__P108842_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  scene___130542: undefined,
+  scene___105671: undefined,
   arg0: undefined,
 } }
 
-const _hex130552 = pxsim.BufferMethods.createBufferFromHex("8704000000000000")
+const _hex105681 = pxsim.BufferMethods.createBufferFromHex("8704000000000000")
 
 
 
 
-function tiles_TileMap_getTileImage__P108836(s) {
+function tiles_TileMap_getTileImage__P83622(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46331,23 +46249,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P108810_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P83596_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 791; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 795; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTileImage__P108836.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"]}
+tiles_TileMap_getTileImage__P83622.info = {"start":13699,"length":96,"line":442,"column":8,"endLine":444,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
 
-function tiles_TileMap_getTileImage__P108836_mk(s) {
+function tiles_TileMap_getTileImage__P83622_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTileImage__P108836, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTileImage__P83622, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46358,7 +46276,7 @@ function tiles_TileMap_getTileImage__P108836_mk(s) {
 
 
 
-function tiles_TileMapData_getTileImage__P108810(s) {
+function tiles_TileMapData_getTileImage__P83596(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46368,25 +46286,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.size___130621 = undefined;
-    s.cachedImage___130625 = undefined;
-    s.originalImage___130632 = undefined;
+    s.size___105734 = undefined;
+    s.cachedImage___105738 = undefined;
+    s.originalImage___105745 = 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__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
     r0 = s.arg0.fields["_scale"];
     s.tmp_0 = r0;
     r0 = (1 << s.tmp_0);
-    s.size___130621 = (r0);
+    s.size___105734 = (r0);
     r0 = s.arg0.fields["cachedTileView"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.arg1);
-    s.cachedImage___130625 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.cachedImage___130625);
+    s.cachedImage___105738 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.cachedImage___105738);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -46395,58 +46313,58 @@ switch (step) {
     r0 = s.arg0.fields["tileset"];
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.arg1);
-    s.originalImage___130632 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.originalImage___130632);
+    s.originalImage___105745 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.originalImage___105745);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_ImageMethods.width(s.originalImage___130632);
+    r0 = pxsim_ImageMethods.width(s.originalImage___105745);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.size___130621);
+    r0 = (s.tmp_1 <= s.size___105734);
     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___130632);
+    r0 = pxsim_ImageMethods.height(s.originalImage___105745);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 <= s.size___130621);
+    r0 = (s.tmp_2 <= s.size___105734);
   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___130625 = (s.originalImage___130632);
+    s.cachedImage___105738 = (s.originalImage___105745);
     { step = 4; continue; }
   case 3:
-    r0 = pxsim.image.create(s.size___130621, s.size___130621);
-    s.cachedImage___130625 = (r0);
-    r0 = pxsim_ImageMethods.drawImage(s.cachedImage___130625, s.originalImage___130632, 0, 0);
+    r0 = pxsim.image.create(s.size___105734, s.size___105734);
+    s.cachedImage___105738 = (r0);
+    r0 = pxsim_ImageMethods.drawImage(s.cachedImage___105738, s.originalImage___105745, 0, 0);
   case 4:
     r0 = s.arg0.fields["cachedTileView"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_0, s.arg1, s.cachedImage___130625);
+    r0 = pxsim_Array_.setAt(s.tmp_0, s.arg1, s.cachedImage___105738);
   case 5:
   case 6:
   case 7:
   case 8:
-    r0 = s.cachedImage___130625;
+    r0 = s.cachedImage___105738;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTileImage__P108810.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"]}
+tiles_TileMapData_getTileImage__P83596.info = {"start":4599,"length":717,"line":172,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
 
-function tiles_TileMapData_getTileImage__P108810_mk(s) {
+function tiles_TileMapData_getTileImage__P83596_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTileImage__P108810, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_getTileImage__P83596, 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___130621: undefined,
-  cachedImage___130625: undefined,
-  originalImage___130632: undefined,
+  size___105734: undefined,
+  cachedImage___105738: undefined,
+  originalImage___105745: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -46455,7 +46373,7 @@ function tiles_TileMapData_getTileImage__P108810_mk(s) {
 
 
 
-function tiles_TileMapData_scale__P108805(s) {
+function tiles_TileMapData_scale__P83591(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46470,18 +46388,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
     r0 = s.arg0.fields["_scale"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_scale__P108805.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__P108805.isGetter = true;
+tiles_TileMapData_scale__P83591.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__P83591.isGetter = true;
 
-function tiles_TileMapData_scale__P108805_mk(s) {
+function tiles_TileMapData_scale__P83591_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_scale__P108805, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_scale__P83591, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -46490,7 +46408,7 @@ function tiles_TileMapData_scale__P108805_mk(s) {
 
 
 
-function tiles_Location_tileSet__P108792(s) {
+function tiles_Location_tileSet__P83578(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46505,27 +46423,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C108786_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMap_getTileIndex__P108827_mk(s);
+    if (!checkSubtype(r0, tiles_Location__C83572_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMap_getTileIndex__P83613_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 = 723; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 727; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_tileSet__P108792.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__P108792.isGetter = true;
+tiles_Location_tileSet__P83578.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__P83578.isGetter = true;
 
-function tiles_Location_tileSet__P108792_mk(s) {
+function tiles_Location_tileSet__P83578_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_tileSet__P108792, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_tileSet__P83578, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46535,7 +46453,7 @@ function tiles_Location_tileSet__P108792_mk(s) {
 
 
 
-function tiles_TileMap_getTileIndex__P108827(s) {
+function tiles_TileMap_getTileIndex__P83613(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46552,24 +46470,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMapData_getTile__P108807_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMapData_getTile__P83593_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 = 746; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 750; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTileIndex__P108827.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"]}
+tiles_TileMap_getTileIndex__P83613.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"]}
 
-function tiles_TileMap_getTileIndex__P108827_mk(s) {
+function tiles_TileMap_getTileIndex__P83613_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTileIndex__P108827, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTileIndex__P83613, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46581,7 +46499,7 @@ function tiles_TileMap_getTileIndex__P108827_mk(s) {
 
 
 
-function tiles_TileMapData_getTile__P108807(s) {
+function tiles_TileMapData_getTile__P83593(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46598,12 +46516,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P108813_mk(s);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P83599_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 725; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 729; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -46632,12 +46550,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTile__P108807.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"]}
+tiles_TileMapData_getTile__P83593.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"]}
 
-function tiles_TileMapData_getTile__P108807_mk(s) {
+function tiles_TileMapData_getTile__P83593_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTile__P108807, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_getTile__P83593, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46657,7 +46575,7 @@ function tiles_TileMapData_getTile__P108807_mk(s) {
 
 
 
-function tiles_TileMapData_isOutsideMap__P108813(s) {
+function tiles_TileMapData_isOutsideMap__P83599(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46674,7 +46592,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
     r0 = (s.arg1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -46714,12 +46632,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_isOutsideMap__P108813.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"]}
+tiles_TileMapData_isOutsideMap__P83599.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"]}
 
-function tiles_TileMapData_isOutsideMap__P108813_mk(s) {
+function tiles_TileMapData_isOutsideMap__P83599_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_isOutsideMap__P108813, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_isOutsideMap__P83599, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46738,7 +46656,7 @@ function tiles_TileMapData_isOutsideMap__P108813_mk(s) {
 
 
 
-function tiles_Location_row__P108788(s) {
+function tiles_Location_row__P83574(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46753,18 +46671,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C108786_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C83572_VT)) failedCast(r0);
     r0 = s.arg0.fields["_row"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_row__P108788.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__P108788.isGetter = true;
+tiles_Location_row__P83574.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__P83574.isGetter = true;
 
-function tiles_Location_row__P108788_mk(s) {
+function tiles_Location_row__P83574_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_row__P108788, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_row__P83574, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -46773,7 +46691,7 @@ function tiles_Location_row__P108788_mk(s) {
 
 
 
-function tiles_Location_col__P108787(s) {
+function tiles_Location_col__P83573(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46788,18 +46706,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C108786_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C83572_VT)) failedCast(r0);
     r0 = s.arg0.fields["_col"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_col__P108787.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__P108787.isGetter = true;
+tiles_Location_col__P83573.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__P83573.isGetter = true;
 
-function tiles_Location_col__P108787_mk(s) {
+function tiles_Location_col__P83573_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_col__P108787, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_col__P83573, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -46808,7 +46726,7 @@ function tiles_Location_col__P108787_mk(s) {
 
 
 
-function tiles_TileMap_getObstacle__P108834(s) {
+function tiles_TileMap_getObstacle__P83620(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46818,8 +46736,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___130774 = undefined;
-    s.tile___130786 = undefined;
+    s.index___105887 = undefined;
+    s.tile___105899 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -46827,13 +46745,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P108813_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P83599_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 = 770; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 774; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -46842,31 +46760,31 @@ switch (step) {
     r0 = 0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = tiles_TileMapData_getTile__P108807_mk(s);
+    s.tmp_2 = tiles_TileMapData_getTile__P83593_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 = 771; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 775; 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___130774 = (s.tmp_3);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P108810_mk(s);
+    s.index___105887 = (s.tmp_3);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P83596_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___130774;
-    s.callLocIdx = 772; s.pc = 5; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___105887;
+    s.callLocIdx = 776; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tile___130786 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_StaticObstacle__C108643_VT);
+    s.tile___105899 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_StaticObstacle__C83427_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = sprites_StaticObstacle_constructor__P108649_mk(s);
+    s.tmp_1 = sprites_StaticObstacle_constructor__P83433_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.tile___130786;
+    s.tmp_1.arg1 = s.tile___105899;
     s.tmp_2 = r0 = s.arg2;
     r0 = s.arg0.fields["_scale"];
     s.tmp_3 = r0;
@@ -46879,20 +46797,20 @@ switch (step) {
     s.tmp_1.arg3 = r0;
     r0 = s.arg0.fields["_layer"];
     s.tmp_1.arg4 = r0;
-    s.tmp_1.arg5 = s.index___130774;
-    s.callLocIdx = 776; s.pc = 6; return s.tmp_1;
+    s.tmp_1.arg5 = s.index___105887;
+    s.callLocIdx = 780; 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__P108834.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"]}
+tiles_TileMap_getObstacle__P83620.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"]}
 
-function tiles_TileMap_getObstacle__P108834_mk(s) {
+function tiles_TileMap_getObstacle__P83620_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getObstacle__P108834, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getObstacle__P83620, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46900,8 +46818,8 @@ function tiles_TileMap_getObstacle__P108834_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  index___130774: undefined,
-  tile___130786: undefined,
+  index___105887: undefined,
+  tile___105899: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -46911,7 +46829,7 @@ function tiles_TileMap_getObstacle__P108834_mk(s) {
 
 
 
-function tiles_TileMap_layer__P108822(s) {
+function tiles_TileMap_layer__P83608(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46926,18 +46844,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_layer"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_layer__P108822.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__P108822.isGetter = true;
+tiles_TileMap_layer__P83608.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__P83608.isGetter = true;
 
-function tiles_TileMap_layer__P108822_mk(s) {
+function tiles_TileMap_layer__P83608_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_layer__P108822, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_layer__P83608, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -46946,7 +46864,7 @@ function tiles_TileMap_layer__P108822_mk(s) {
 
 
 
-function sprites_StaticObstacle_constructor__P108649(s) {
+function sprites_StaticObstacle_constructor__P83433(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46966,7 +46884,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C108643_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C83427_VT)) failedCast(r0);
     r0 = (s.arg0).fields["image"] = (s.arg1);
     r0 = (s.arg0).fields["layer"] = (s.arg4);
     r0 = (s.arg0).fields["top"] = (s.arg2);
@@ -46976,12 +46894,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_constructor__P108649.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"]}
+sprites_StaticObstacle_constructor__P83433.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"]}
 
-function sprites_StaticObstacle_constructor__P108649_mk(s) {
+function sprites_StaticObstacle_constructor__P83433_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_constructor__P108649, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_constructor__P83433, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -46995,7 +46913,7 @@ function sprites_StaticObstacle_constructor__P108649_mk(s) {
 
 
 
-function tiles_TileMap_isObstacle__P108833(s) {
+function tiles_TileMap_isObstacle__P83619(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47012,7 +46930,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
@@ -47033,12 +46951,12 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_8 = tiles_TileMapData_isOutsideMap__P108813_mk(s);
+    s.tmp_8 = tiles_TileMapData_isOutsideMap__P83599_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 = 768; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 772; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -47059,12 +46977,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isObstacle__P108833.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"]}
+tiles_TileMap_isObstacle__P83619.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"]}
 
-function tiles_TileMap_isObstacle__P108833_mk(s) {
+function tiles_TileMap_isObstacle__P83619_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isObstacle__P108833, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isObstacle__P83619, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47087,7 +47005,7 @@ function tiles_TileMap_isObstacle__P108833_mk(s) {
 
 
 
-function tiles_TileMapData_isWall__P108812(s) {
+function tiles_TileMapData_isWall__P83598(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47104,7 +47022,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
     r0 = s.arg0.fields["layers"];
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_1, s.arg1, s.arg2);
@@ -47113,12 +47031,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_isWall__P108812.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"]}
+tiles_TileMapData_isWall__P83598.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"]}
 
-function tiles_TileMapData_isWall__P108812_mk(s) {
+function tiles_TileMapData_isWall__P83598_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_isWall__P108812, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_isWall__P83598, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47131,7 +47049,7 @@ function tiles_TileMapData_isWall__P108812_mk(s) {
 
 
 
-function tiles_TileMap_getTile__P108826(s) {
+function tiles_TileMap_getTile__P83612(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47148,27 +47066,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C108786_VT);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C83572_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = tiles_Location_constructor__P108789_mk(s);
+    s.tmp_1 = tiles_Location_constructor__P83575_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 = 744; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 748; 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__P108826.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"]}
+tiles_TileMap_getTile__P83612.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"]}
 
-function tiles_TileMap_getTile__P108826_mk(s) {
+function tiles_TileMap_getTile__P83612_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTile__P108826, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTile__P83612, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47181,7 +47099,7 @@ function tiles_TileMap_getTile__P108826_mk(s) {
 
 
 
-function tiles_Location_constructor__P108789(s) {
+function tiles_Location_constructor__P83575(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47199,7 +47117,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C108786_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C83572_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_col"] = (s.arg1);
     r0 = (s.arg0).fields["_row"] = (s.arg2);
     r0 = (s.arg0).fields["tileMap"] = (s.arg3);
@@ -47207,12 +47125,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_constructor__P108789.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"]}
+tiles_Location_constructor__P83575.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"]}
 
-function tiles_Location_constructor__P108789_mk(s) {
+function tiles_Location_constructor__P83575_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_constructor__P108789, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_constructor__P83575, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -47224,7 +47142,7 @@ function tiles_Location_constructor__P108789_mk(s) {
 
 
 
-function Sprite_registerObstacle__P108582(s) {
+function Sprite_registerObstacle__P83366(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47234,10 +47152,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.collisionHandlers___130684 = undefined;
-    s.wallCollisionHandlers___130691 = undefined;
-    s.wallHandlersToRun___130716 = undefined;
-    s.asTileLocation___130729 = undefined;
+    s.collisionHandlers___105817 = undefined;
+    s.wallCollisionHandlers___105824 = undefined;
+    s.wallHandlersToRun___105849 = undefined;
+    s.asTileLocation___105862 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -47246,12 +47164,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P109029_mk(s);
-    s.callLocIdx = 390; s.pc = 9; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 399; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     r0 = r0.fields["collisionHandlers"];
@@ -47264,42 +47182,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 = 391; s.pc = 10; return s.tmp_3; }
+     else { s.callLocIdx = 400; 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___130684 = (r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 392; s.pc = 11; return s.tmp_0;
+    s.collisionHandlers___105817 = (r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 401; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = r0.fields["wallCollisionHandlers"];
-    s.wallCollisionHandlers___130691 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.collisionHandlers___130684);
+    s.wallCollisionHandlers___105824 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.collisionHandlers___105817);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P130699);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P105832);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P130705);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P105838);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3.arg0 = s.collisionHandlers___130684;
+    s.tmp_2 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3.arg0 = s.collisionHandlers___105817;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 394; s.pc = 13; return s.tmp_3;
+    s.callLocIdx = 403; 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 = 396; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 405; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_numops_toBoolDecr(s.wallCollisionHandlers___130691);
+    r0 = pxsim_numops_toBoolDecr(s.wallCollisionHandlers___105824);
     if (!r0) { step = 7; continue; }
     s.tmp_0 = r0 = s.arg3;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -47307,8 +47225,8 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 397; s.pc = 14; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 406; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
@@ -47316,21 +47234,21 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.arg3 = (s.tmp_2);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P130718);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P105851);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_1.arg0 = s.wallCollisionHandlers___130691;
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_1.arg0 = s.wallCollisionHandlers___105824;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 399; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 408; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
-    s.wallHandlersToRun___130716 = (r0);
-    r0 = pxsim_Array__length(s.wallHandlersToRun___130716);
+    s.wallHandlersToRun___105849 = (r0);
+    r0 = pxsim_Array__length(s.wallHandlersToRun___105849);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = tiles_TileMap_getTile__P108826_mk(s);
+    s.tmp_1 = tiles_TileMap_getTile__P83612_mk(s);
     s.tmp_1.arg0 = s.arg3;
     s.tmp_3 = if_left_1_mk(s);
     s.tmp_3.arg0 = s.arg2;
@@ -47340,7 +47258,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 = 400; s.pc = 17; return s.tmp_3; }
+     else { s.callLocIdx = 409; s.pc = 17; return s.tmp_3; }
     }
   case 17:
     r0 = s.retval;
@@ -47357,7 +47275,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 = 402; s.pc = 18; return s.tmp_6; }
+     else { s.callLocIdx = 411; s.pc = 18; return s.tmp_6; }
     }
   case 18:
     r0 = s.retval;
@@ -47366,18 +47284,18 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = (s.tmp_5 >> s.tmp_7);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 404; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 413; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    s.asTileLocation___130729 = (r0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P130745);
+    s.asTileLocation___105862 = (r0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P105878);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.asTileLocation___130729);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1.arg0 = s.wallHandlersToRun___130716;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.asTileLocation___105862);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1.arg0 = s.wallHandlersToRun___105849;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 406; s.pc = 19; return s.tmp_1;
+    s.callLocIdx = 415; s.pc = 19; return s.tmp_1;
   case 19:
     r0 = s.retval;
   case 5:
@@ -47388,12 +47306,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_registerObstacle__P108582.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"]}
+Sprite_registerObstacle__P83366.info = {"start":27948,"length":965,"line":845,"column":4,"endLine":865,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"registerObstacle","argumentNames":["this","direction","other","tm"]}
 
-function Sprite_registerObstacle__P108582_mk(s) {
+function Sprite_registerObstacle__P83366_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_registerObstacle__P108582, depth: s.depth + 1,
+        parent: s, fn: Sprite_registerObstacle__P83366, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47403,10 +47321,10 @@ function Sprite_registerObstacle__P108582_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  collisionHandlers___130684: undefined,
-  wallCollisionHandlers___130691: undefined,
-  wallHandlersToRun___130716: undefined,
-  asTileLocation___130729: undefined,
+  collisionHandlers___105817: undefined,
+  wallCollisionHandlers___105824: undefined,
+  wallHandlersToRun___105849: undefined,
+  asTileLocation___105862: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -47417,7 +47335,7 @@ function Sprite_registerObstacle__P108582_mk(s) {
 
 
 
-function inline__P130699(s) {
+function inline__P105832(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47439,12 +47357,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130699.info = {"start":27330,"length":26,"line":824,"column":24,"endLine":824,"endColumn":50,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P105832.info = {"start":28346,"length":26,"line":852,"column":24,"endLine":852,"endColumn":50,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P130699_mk(s) {
+function inline__P105832_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130699, depth: s.depth + 1,
+        parent: s, fn: inline__P105832, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47455,7 +47373,7 @@ function inline__P130699_mk(s) {
 
 
 
-function inline__P130705(s) {
+function inline__P105838(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47474,12 +47392,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 = 395; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 404; 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 = 395; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 395; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 395; 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 = 404; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 404; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 404; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -47487,12 +47405,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130705.info = {"start":27383,"length":20,"line":825,"column":25,"endLine":825,"endColumn":45,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P105838.info = {"start":28399,"length":20,"line":853,"column":25,"endLine":853,"endColumn":45,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P130705_mk(s) {
+function inline__P105838_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130705, depth: s.depth + 1,
+        parent: s, fn: inline__P105838, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -47502,7 +47420,7 @@ function inline__P130705_mk(s) {
 
 
 
-function inline__P130718(s) {
+function inline__P105851(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47524,12 +47442,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130718.info = {"start":27589,"length":32,"line":830,"column":24,"endLine":830,"endColumn":56,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P105851.info = {"start":28605,"length":32,"line":858,"column":24,"endLine":858,"endColumn":56,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P130718_mk(s) {
+function inline__P105851_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130718, depth: s.depth + 1,
+        parent: s, fn: inline__P105851, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47540,7 +47458,7 @@ function inline__P130718_mk(s) {
 
 
 
-function inline__P130745(s) {
+function inline__P105878(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47560,12 +47478,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 = 405; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 414; 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 = 405; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 405; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 405; 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 = 414; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 414; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 414; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -47573,12 +47491,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P130745.info = {"start":27829,"length":36,"line":834,"column":29,"endLine":834,"endColumn":65,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P105878.info = {"start":28845,"length":36,"line":862,"column":29,"endLine":862,"endColumn":65,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P130745_mk(s) {
+function inline__P105878_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P130745, depth: s.depth + 1,
+        parent: s, fn: inline__P105878, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -47588,7 +47506,7 @@ function inline__P130745_mk(s) {
 
 
 
-function Fx_min__P106770(s) {
+function Fx_min__P81434(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47619,12 +47537,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_min__P106770.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__P81434.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__P106770_mk(s) {
+function Fx_min__P81434_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_min__P106770, depth: s.depth + 1,
+        parent: s, fn: Fx_min__P81434, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -47635,7 +47553,7 @@ function Fx_min__P106770_mk(s) {
 
 
 
-function Fx_iadd__P106762(s) {
+function Fx_iadd__P81426(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47656,12 +47574,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_iadd__P106762.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__P81426.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__P106762_mk(s) {
+function Fx_iadd__P81426_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_iadd__P106762, depth: s.depth + 1,
+        parent: s, fn: Fx_iadd__P81426, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -47672,7 +47590,7 @@ function Fx_iadd__P106762_mk(s) {
 
 
 
-function Fx_toIntShifted__P106760(s) {
+function Fx_toIntShifted__P81424(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47694,12 +47612,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toIntShifted__P106760.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__P81424.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__P106760_mk(s) {
+function Fx_toIntShifted__P81424_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toIntShifted__P106760, depth: s.depth + 1,
+        parent: s, fn: Fx_toIntShifted__P81424, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47711,7 +47629,7 @@ function Fx_toIntShifted__P106760_mk(s) {
 
 
 
-function tiles_TileMap_isOnWall__P108835(s) {
+function tiles_TileMap_isOnWall__P83621(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47721,25 +47639,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hbox___130906 = undefined;
-    s.left___130909 = undefined;
-    s.right___130915 = undefined;
-    s.top___130921 = undefined;
-    s.bottom___130927 = undefined;
-    s.col___130933 = undefined;
-    s.row___130939 = undefined;
+    s.hbox___105015 = undefined;
+    s.left___105018 = undefined;
+    s.right___105024 = undefined;
+    s.top___105030 = undefined;
+    s.bottom___105036 = undefined;
+    s.col___105042 = undefined;
+    s.row___105048 = 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__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg1.fields["_hitbox"];
-    s.hbox___130906 = (r0);
-    s.tmp_1 = game_Hitbox_left__P108463_mk(s);
-    s.tmp_1.arg0 = s.hbox___130906;
-    s.callLocIdx = 777; s.pc = 8; return s.tmp_1;
+    s.hbox___105015 = (r0);
+    s.tmp_1 = game_Hitbox_left__P83239_mk(s);
+    s.tmp_1.arg0 = s.hbox___105015;
+    s.callLocIdx = 781; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -47748,10 +47666,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.left___130909 = (r0);
-    s.tmp_1 = game_Hitbox_right__P108465_mk(s);
-    s.tmp_1.arg0 = s.hbox___130906;
-    s.callLocIdx = 780; s.pc = 9; return s.tmp_1;
+    s.left___105018 = (r0);
+    s.tmp_1 = game_Hitbox_right__P83241_mk(s);
+    s.tmp_1.arg0 = s.hbox___105015;
+    s.callLocIdx = 784; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -47760,10 +47678,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.right___130915 = (r0);
-    s.tmp_1 = game_Hitbox_top__P108464_mk(s);
-    s.tmp_1.arg0 = s.hbox___130906;
-    s.callLocIdx = 783; s.pc = 10; return s.tmp_1;
+    s.right___105024 = (r0);
+    s.tmp_1 = game_Hitbox_top__P83240_mk(s);
+    s.tmp_1.arg0 = s.hbox___105015;
+    s.callLocIdx = 787; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -47772,10 +47690,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.top___130921 = (r0);
-    s.tmp_1 = game_Hitbox_bottom__P108466_mk(s);
-    s.tmp_1.arg0 = s.hbox___130906;
-    s.callLocIdx = 786; s.pc = 11; return s.tmp_1;
+    s.top___105030 = (r0);
+    s.tmp_1 = game_Hitbox_bottom__P83242_mk(s);
+    s.tmp_1.arg0 = s.hbox___105015;
+    s.callLocIdx = 790; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -47784,24 +47702,24 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.bottom___130927 = (r0);
-    s.col___130933 = (s.left___130909);
+    s.bottom___105036 = (r0);
+    s.col___105042 = (s.left___105018);
   case 1:
-    r0 = (s.col___130933 <= s.right___130915);
+    r0 = (s.col___105042 <= s.right___105024);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.row___130939 = (s.top___130921);
+    s.row___105048 = (s.top___105030);
   case 2:
-    r0 = (s.row___130939 <= s.bottom___130927);
+    r0 = (s.row___105048 <= s.bottom___105036);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = tiles_TileMap_isObstacle__P108833_mk(s);
+    s.tmp_2 = tiles_TileMap_isObstacle__P83619_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.col___130933;
-    s.tmp_2.arg2 = s.row___130939;
-    s.callLocIdx = 789; s.pc = 12; return s.tmp_2;
+    s.tmp_2.arg1 = s.col___105042;
+    s.tmp_2.arg2 = s.row___105048;
+    s.callLocIdx = 793; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -47811,12 +47729,12 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = (s.row___130939 + 1);
-    s.row___130939 = (r0);
+    r0 = (s.row___105048 + 1);
+    s.row___105048 = (r0);
     { step = 2; continue; }
   case 5:
-    r0 = (s.col___130933 + 1);
-    s.col___130933 = (r0);
+    r0 = (s.col___105042 + 1);
+    s.col___105042 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = false;
@@ -47824,24 +47742,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isOnWall__P108835.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"]}
+tiles_TileMap_isOnWall__P83621.info = {"start":13062,"length":627,"line":423,"column":8,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isOnWall","argumentNames":["this","s"]}
 
-function tiles_TileMap_isOnWall__P108835_mk(s) {
+function tiles_TileMap_isOnWall__P83621_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isOnWall__P108835, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isOnWall__P83621, 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___130906: undefined,
-  left___130909: undefined,
-  right___130915: undefined,
-  top___130921: undefined,
-  bottom___130927: undefined,
-  col___130933: undefined,
-  row___130939: undefined,
+  hbox___105015: undefined,
+  left___105018: undefined,
+  right___105024: undefined,
+  top___105030: undefined,
+  bottom___105036: undefined,
+  col___105042: undefined,
+  row___105048: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -47850,7 +47768,7 @@ function tiles_TileMap_isOnWall__P108835_mk(s) {
 
 
 
-function MovingSprite_constructor__P108669(s) {
+function MovingSprite_constructor__P83455(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47872,7 +47790,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, MovingSprite__C108668_VT)) failedCast(r0);
+    if (!checkSubtype(r0, MovingSprite__C83454_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sprite"] = (s.arg1);
     r0 = (s.arg0).fields["cachedVx"] = (s.arg2);
     r0 = (s.arg0).fields["cachedVy"] = (s.arg3);
@@ -47884,12 +47802,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-MovingSprite_constructor__P108669.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"]}
+MovingSprite_constructor__P83455.info = {"start":949,"length":313,"line":33,"column":4,"endLine":44,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","sprite","cachedVx","cachedVy","dx","dy","xStep","yStep"]}
 
-function MovingSprite_constructor__P108669_mk(s) {
+function MovingSprite_constructor__P83455_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: MovingSprite_constructor__P108669, depth: s.depth + 1,
+        parent: s, fn: MovingSprite_constructor__P83455, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -47905,7 +47823,7 @@ function MovingSprite_constructor__P108669_mk(s) {
 
 
 
-function ArcadePhysicsEngine_move__P108682(s) {
+function ArcadePhysicsEngine_move__P83468(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47915,84 +47833,80 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dtf___129388 = undefined;
-    s.dt2___129395 = undefined;
-    s.scene___129399 = undefined;
-    s.tileMap___129402 = undefined;
-    s.movingSprites___129405 = undefined;
-    s.MAX_STEP_COUNT___129436 = undefined;
-    s.overlapHandlers___129448 = undefined;
-    s.selected___129455 = undefined;
-    s.buffers___129456 = undefined;
-    s.count___129460 = undefined;
-    s.currMovers___129470 = undefined;
-    s.remainingMovers___129477 = undefined;
-    s.ms___129482 = undefined;
-    s.unnamed16750___U13 = undefined;
-    s.unnamed16751___U14 = undefined;
-    s.s___129484 = undefined;
-    s.stepX___129584 = undefined;
-    s.stepY___129598 = undefined;
+    s.dtMs___105959 = undefined;
+    s.dt2___105965 = undefined;
+    s.scene___105969 = undefined;
+    s.tileMap___105972 = undefined;
+    s.movingSprites___105975 = undefined;
+    s.MAX_STEP_COUNT___106006 = undefined;
+    s.overlapHandlers___106018 = undefined;
+    s.selected___106025 = undefined;
+    s.buffers___106026 = undefined;
+    s.count___106030 = undefined;
+    s.currMovers___106040 = undefined;
+    s.remainingMovers___106047 = undefined;
+    s.ms___106052 = undefined;
+    s.unnamed1802___U13 = undefined;
+    s.unnamed1803___U14 = undefined;
+    s.s___106054 = undefined;
+    s.stepX___106147 = undefined;
+    s.stepY___106161 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
-    s.tmp_0 = Fx_min__P106770_mk(s);
-    s.tmp_0.arg0 = globals.MAX_TIME_STEP___108665;
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
+    s.tmp_0.arg0 = 100;
     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 = 490; s.pc = 47; return s.tmp_0;
+    s.callLocIdx = 497; s.pc = 47; return s.tmp_0;
   case 47:
     r0 = s.retval;
-    s.dtf___129388 = (r0);
-    r0 = pxsim.Math_.idiv(s.dtf___129388, 2);
-    s.dt2___129395 = (r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 492; s.pc = 48; return s.tmp_0;
+    s.dtMs___105959 = (r0);
+    r0 = pxsim.Math_.idiv(s.dtMs___105959, 2);
+    s.dt2___105965 = (r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 498; s.pc = 48; return s.tmp_0;
   case 48:
     r0 = s.retval;
-    s.scene___129399 = (r0);
-    r0 = s.scene___129399.fields["tileMap"];
-    s.tileMap___129402 = (r0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P129407);
+    s.scene___105969 = (r0);
+    r0 = s.scene___105969.fields["tileMap"];
+    s.tileMap___105972 = (r0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P105977);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.dtf___129388);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.dt2___129395);
-    s.tmp_1 = helpers_arrayMap__P106713_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.dtMs___105959);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.dt2___105965);
+    s.tmp_1 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["sprites"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 494; s.pc = 49; return s.tmp_1;
+    s.callLocIdx = 500; s.pc = 49; return s.tmp_1;
   case 49:
     r0 = s.retval;
-    s.movingSprites___129405 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
+    s.movingSprites___105975 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["sprites"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P129419;
-    s.callLocIdx = 498; s.pc = 50; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P105989;
+    s.callLocIdx = 504; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_clear__P108597_mk(s);
+    s.tmp_0 = sprites_SpriteMap_clear__P83381_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 499; s.pc = 51; return s.tmp_0;
+    s.callLocIdx = 505; s.pc = 51; return s.tmp_0;
   case 51:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_resizeBuckets__P108596_mk(s);
+    s.tmp_0 = sprites_SpriteMap_resizeBuckets__P83380_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["sprites"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 500; s.pc = 52; return s.tmp_0;
+    s.callLocIdx = 506; s.pc = 52; return s.tmp_0;
   case 52:
     r0 = s.retval;
     r0 = s.arg0.fields["maxVelocity"];
@@ -48003,43 +47917,41 @@ 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___129388);
-    s.tmp_6 = r0;
-    r0 = (s.tmp_6 >> 8);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.dtMs___105959);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 1000);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
-    s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> 8);
-    s.MAX_STEP_COUNT___129436 = (r0);
-    s.tmp_0 = helpers_arraySlice__P106721_mk(s);
-    r0 = s.scene___129399.fields["overlapHandlers"];
+    s.tmp_6 = r0;
+    r0 = (s.tmp_6 >> 8);
+    s.MAX_STEP_COUNT___106006 = (r0);
+    s.tmp_0 = helpers_arraySlice__P81384_mk(s);
+    r0 = s.scene___105969.fields["overlapHandlers"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 505; s.pc = 53; return s.tmp_0;
+    s.callLocIdx = 511; s.pc = 53; return s.tmp_0;
   case 53:
     r0 = s.retval;
-    s.overlapHandlers___129448 = (r0);
-    s.selected___129455 = (0);
+    s.overlapHandlers___106018 = (r0);
+    s.selected___106025 = (0);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.movingSprites___129405);
+    r0 = pxsim_Array__push(s.tmp_0, s.movingSprites___105975);
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.buffers___129456 = (s.tmp_0);
-    s.count___129460 = (0);
+    s.buffers___106026 = (s.tmp_0);
+    s.count___106030 = (0);
   case 1:
-    r0 = (s.count___129460 < s.MAX_STEP_COUNT___129436);
+    r0 = (s.count___106030 < s.MAX_STEP_COUNT___106006);
     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___129456, s.selected___129455);
+    r0 = pxsim_Array__getAt(s.buffers___106026, s.selected___106025);
     s.tmp_2 = r0;
     r0 = pxsim_Array__length(s.tmp_2);
     s.tmp_1 = r0;
@@ -48049,43 +47961,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___129456, s.selected___129455);
-    s.currMovers___129470 = (r0);
-    r0 = (s.selected___129455 ^ 1);
-    s.selected___129455 = (r0);
-    r0 = pxsim_Array__getAt(s.buffers___129456, s.selected___129455);
-    s.remainingMovers___129477 = (r0);
-    s.ms___129482 = (undefined);
-    s.unnamed16750___U13 = (s.currMovers___129470);
-    s.unnamed16751___U14 = (0);
+    r0 = pxsim_Array__getAt(s.buffers___106026, s.selected___106025);
+    s.currMovers___106040 = (r0);
+    r0 = (s.selected___106025 ^ 1);
+    s.selected___106025 = (r0);
+    r0 = pxsim_Array__getAt(s.buffers___106026, s.selected___106025);
+    s.remainingMovers___106047 = (r0);
+    s.ms___106052 = (undefined);
+    s.unnamed1802___U13 = (s.currMovers___106040);
+    s.unnamed1803___U14 = (0);
   case 4:
-    s.tmp_0 = r0 = s.unnamed16751___U14;
-    r0 = pxsim_Array__length(s.unnamed16750___U13);
+    s.tmp_0 = r0 = s.unnamed1803___U14;
+    r0 = pxsim_Array__length(s.unnamed1802___U13);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 43; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16750___U13, s.unnamed16751___U14);
-    s.ms___129482 = (r0);
-    r0 = s.ms___129482.fields["sprite"];
-    s.s___129484 = (r0);
-    r0 = s.ms___129482.fields["cachedVx"];
+    r0 = pxsim_Array__getAt(s.unnamed1802___U13, s.unnamed1803___U14);
+    s.ms___106052 = (r0);
+    r0 = s.ms___106052.fields["sprite"];
+    s.s___106054 = (r0);
+    r0 = s.ms___106052.fields["cachedVx"];
     s.tmp_1 = r0;
-    r0 = s.s___129484.fields["_vx"];
+    r0 = s.s___106054.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___129484.fields["_vx"];
+    r0 = s.s___106054.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___129482).fields["dx"] = (0);
+    r0 = (s.ms___106052).fields["dx"] = (0);
     { step = 14; continue; }
   case 5:
-    r0 = s.s___129484.fields["_vx"];
+    r0 = s.s___106054.fields["_vx"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -48094,7 +48006,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 6:
-    r0 = s.ms___129482.fields["cachedVx"];
+    r0 = s.ms___106052.fields["cachedVx"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
   case 7:
@@ -48105,7 +48017,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 11; continue; }
   case 8:
-    r0 = s.s___129484.fields["_vx"];
+    r0 = s.s___106054.fields["_vx"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > 0);
     s.tmp_4 = r0;
@@ -48114,7 +48026,7 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 10; continue; }
   case 9:
-    r0 = s.ms___129482.fields["cachedVx"];
+    r0 = s.ms___106052.fields["cachedVx"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 < 0);
   case 10:
@@ -48126,14 +48038,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___129482;
-    r0 = s.ms___129482.fields["dx"];
+    s.tmp_9 = r0 = s.ms___106052;
+    r0 = s.ms___106052.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___129482;
-    r0 = s.ms___129482.fields["xStep"];
+    s.tmp_0 = r0 = s.ms___106052;
+    r0 = s.ms___106052.fields["xStep"];
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
@@ -48141,29 +48053,29 @@ switch (step) {
   case 12:
   case 13:
   case 14:
-    r0 = s.s___129484.fields["_vx"];
+    r0 = s.s___106054.fields["_vx"];
     s.tmp_0 = r0;
-    r0 = (s.ms___129482).fields["cachedVx"] = (s.tmp_0);
+    r0 = (s.ms___106052).fields["cachedVx"] = (s.tmp_0);
   case 15:
   case 16:
-    r0 = s.ms___129482.fields["cachedVy"];
+    r0 = s.ms___106052.fields["cachedVy"];
     s.tmp_1 = r0;
-    r0 = s.s___129484.fields["_vy"];
+    r0 = s.s___106054.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___129484.fields["_vy"];
+    r0 = s.s___106054.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___129482).fields["dy"] = (0);
+    r0 = (s.ms___106052).fields["dy"] = (0);
     { step = 26; continue; }
   case 17:
-    r0 = s.s___129484.fields["_vy"];
+    r0 = s.s___106054.fields["_vy"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -48172,7 +48084,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    r0 = s.ms___129482.fields["cachedVy"];
+    r0 = s.ms___106052.fields["cachedVy"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
   case 19:
@@ -48183,7 +48095,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 23; continue; }
   case 20:
-    r0 = s.s___129484.fields["_vy"];
+    r0 = s.s___106054.fields["_vy"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > 0);
     s.tmp_4 = r0;
@@ -48192,7 +48104,7 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 22; continue; }
   case 21:
-    r0 = s.ms___129482.fields["cachedVy"];
+    r0 = s.ms___106052.fields["cachedVy"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 < 0);
   case 22:
@@ -48204,14 +48116,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___129482;
-    r0 = s.ms___129482.fields["dy"];
+    s.tmp_9 = r0 = s.ms___106052;
+    r0 = s.ms___106052.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___129482;
-    r0 = s.ms___129482.fields["yStep"];
+    s.tmp_0 = r0 = s.ms___106052;
+    r0 = s.ms___106052.fields["yStep"];
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
@@ -48219,22 +48131,22 @@ switch (step) {
   case 24:
   case 25:
   case 26:
-    r0 = s.s___129484.fields["_vy"];
+    r0 = s.s___106054.fields["_vy"];
     s.tmp_0 = r0;
-    r0 = (s.ms___129482).fields["cachedVy"] = (s.tmp_0);
+    r0 = (s.ms___106052).fields["cachedVy"] = (s.tmp_0);
   case 27:
   case 28:
-    s.tmp_2 = Fx_abs__P106769_mk(s);
-    r0 = s.ms___129482.fields["xStep"];
+    s.tmp_2 = Fx_abs__P81433_mk(s);
+    r0 = s.ms___106052.fields["xStep"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 510; s.pc = 54; return s.tmp_2;
+    s.callLocIdx = 516; s.pc = 54; return s.tmp_2;
   case 54:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Fx_abs__P106769_mk(s);
-    r0 = s.ms___129482.fields["dx"];
+    s.tmp_4 = Fx_abs__P81433_mk(s);
+    r0 = s.ms___106052.fields["dx"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 511; s.pc = 55; return s.tmp_4;
+    s.callLocIdx = 517; s.pc = 55; return s.tmp_4;
   case 55:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -48242,25 +48154,25 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 29; continue; }
-    r0 = s.ms___129482.fields["dx"];
+    r0 = s.ms___106052.fields["dx"];
     { step = 30; continue; }
   case 29:
-    r0 = s.ms___129482.fields["xStep"];
+    r0 = s.ms___106052.fields["xStep"];
   case 30:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.stepX___129584 = (s.tmp_5);
-    s.tmp_2 = Fx_abs__P106769_mk(s);
-    r0 = s.ms___129482.fields["yStep"];
+    s.stepX___106147 = (s.tmp_5);
+    s.tmp_2 = Fx_abs__P81433_mk(s);
+    r0 = s.ms___106052.fields["yStep"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 512; s.pc = 56; return s.tmp_2;
+    s.callLocIdx = 518; s.pc = 56; return s.tmp_2;
   case 56:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Fx_abs__P106769_mk(s);
-    r0 = s.ms___129482.fields["dy"];
+    s.tmp_4 = Fx_abs__P81433_mk(s);
+    r0 = s.ms___106052.fields["dy"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 513; s.pc = 57; return s.tmp_4;
+    s.callLocIdx = 519; s.pc = 57; return s.tmp_4;
   case 57:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -48268,68 +48180,70 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 31; continue; }
-    r0 = s.ms___129482.fields["dy"];
+    r0 = s.ms___106052.fields["dy"];
     { step = 32; continue; }
   case 31:
-    r0 = s.ms___129482.fields["yStep"];
+    r0 = s.ms___106052.fields["yStep"];
   case 32:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.stepY___129598 = (s.tmp_5);
-    s.tmp_0 = r0 = s.ms___129482;
-    r0 = s.ms___129482.fields["dx"];
+    s.stepY___106161 = (s.tmp_5);
+    s.tmp_0 = r0 = s.ms___106052;
+    r0 = s.ms___106052.fields["dx"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.stepX___129584);
+    r0 = (s.tmp_2 - s.stepX___106147);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["dx"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.ms___129482;
-    r0 = s.ms___129482.fields["dy"];
+    s.tmp_0 = r0 = s.ms___106052;
+    r0 = s.ms___106052.fields["dy"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.stepY___129598);
+    r0 = (s.tmp_2 - s.stepY___106161);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["dy"] = (s.tmp_1);
-    r0 = s.s___129484.fields["_x"];
+    r0 = s.s___106054.fields["_x"];
     s.tmp_0 = r0;
-    r0 = (s.s___129484).fields["_lastX"] = (s.tmp_0);
-    r0 = s.s___129484.fields["_y"];
+    r0 = (s.s___106054).fields["_lastX"] = (s.tmp_0);
+    r0 = s.s___106054.fields["_y"];
     s.tmp_0 = r0;
-    r0 = (s.s___129484).fields["_lastY"] = (s.tmp_0);
-    s.tmp_0 = r0 = s.s___129484;
-    r0 = s.s___129484.fields["_x"];
+    r0 = (s.s___106054).fields["_lastY"] = (s.tmp_0);
+    s.tmp_0 = r0 = s.s___106054;
+    r0 = s.s___106054.fields["_x"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.stepX___129584);
+    r0 = (s.tmp_2 + s.stepX___106147);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_x"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.s___129484;
-    r0 = s.s___129484.fields["_y"];
+    s.tmp_0 = r0 = s.s___106054;
+    r0 = s.s___106054.fields["_y"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.stepY___129598);
+    r0 = (s.tmp_2 + s.stepY___106161);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    r0 = s.s___129484.fields["flags"];
+    r0 = s.s___106054.fields["flags"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 & 515);
+    r0 = (s.tmp_3 & 4610);
     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 = 37; continue; }
-    s.tmp_4 = sprites_SpriteMap_insertAABB__P108598_mk(s);
+    if (!r0) { step = 33; continue; }
+    s.tmp_4 = sprites_SpriteMap_insertAABB__P83382_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.s___129484;
-    s.callLocIdx = 518; s.pc = 58; return s.tmp_4;
+    s.tmp_4.arg1 = s.s___106054;
+    s.callLocIdx = 524; s.pc = 58; return s.tmp_4;
   case 58:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tileMap___129402;
+  case 33:
+  case 34:
+    s.tmp_0 = r0 = s.tileMap___105972;
     r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 33; continue; }
+    if (r0) { step = 35; continue; }
     r0 = s.tmp_0;
-    { step = 34; continue; }
-  case 33:
-    r0 = s.tileMap___129402.fields["_map"];
+    { step = 36; continue; }
+  case 35:
+    r0 = s.tileMap___105972.fields["_map"];
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -48338,86 +48252,84 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
-  case 34:
+  case 36:
     // jmp value (already in r0)
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
-    if (!r0) { step = 35; continue; }
-    s.tmp_6 = ArcadePhysicsEngine_tilemapCollisions__P110746_mk(s);
+    if (!r0) { step = 37; continue; }
+    s.tmp_6 = ArcadePhysicsEngine_tilemapCollisions__P85586_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.tmp_6.arg1 = s.ms___129482;
-    s.tmp_6.arg2 = s.tileMap___129402;
-    s.callLocIdx = 520; s.pc = 59; return s.tmp_6;
+    s.tmp_6.arg1 = s.ms___106052;
+    s.tmp_6.arg2 = s.tileMap___105972;
+    s.callLocIdx = 526; 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__P106769_mk(s);
-    r0 = s.ms___129482.fields["dx"];
+    s.tmp_2 = Fx_abs__P81433_mk(s);
+    r0 = s.ms___106052.fields["dx"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 521; s.pc = 60; return s.tmp_2;
+    s.callLocIdx = 527; s.pc = 60; return s.tmp_2;
   case 60:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > globals.MIN_MOVE_GAP___108667);
+    r0 = (s.tmp_1 > globals.MIN_MOVE_GAP___83450);
     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__P106769_mk(s);
-    r0 = s.ms___129482.fields["dy"];
+    s.tmp_4 = Fx_abs__P81433_mk(s);
+    r0 = s.ms___106052.fields["dy"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 522; s.pc = 61; return s.tmp_4;
+    s.callLocIdx = 528; s.pc = 61; return s.tmp_4;
   case 61:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 > globals.MIN_MOVE_GAP___108667);
+    r0 = (s.tmp_3 > globals.MIN_MOVE_GAP___83450);
   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___129477, s.ms___129482);
+    r0 = pxsim_Array__push(s.remainingMovers___106047, s.ms___106052);
   case 41:
   case 42:
-    r0 = (s.unnamed16751___U14 + 1);
-    s.unnamed16751___U14 = (r0);
+    r0 = (s.unnamed1803___U14 + 1);
+    s.unnamed1803___U14 = (r0);
     { step = 4; continue; }
   case 43:
-    s.unnamed16750___U13 = (undefined);
-    s.tmp_0 = ArcadePhysicsEngine_spriteCollisions__P110745_mk(s);
+    s.unnamed1802___U13 = (undefined);
+    s.tmp_0 = ArcadePhysicsEngine_spriteCollisions__P85585_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.currMovers___129470;
-    s.tmp_0.arg2 = s.overlapHandlers___129448;
-    s.callLocIdx = 523; s.pc = 62; return s.tmp_0;
+    s.tmp_0.arg1 = s.currMovers___106040;
+    s.tmp_0.arg2 = s.overlapHandlers___106018;
+    s.callLocIdx = 529; s.pc = 62; return s.tmp_0;
   case 62:
     r0 = s.retval;
   case 44:
-    r0 = pxsim_Array__length(s.currMovers___129470);
+    r0 = pxsim_Array__length(s.currMovers___106040);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 45; continue; }
-    r0 = pxsim_Array_.pop(s.currMovers___129470);
+    r0 = pxsim_Array_.pop(s.currMovers___106040);
     { step = 44; continue; }
   case 45:
-    r0 = (s.count___129460 + 1);
-    s.count___129460 = (r0);
+    r0 = (s.count___106030 + 1);
+    s.count___106030 = (r0);
     { step = 1; continue; }
   case 46:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_move__P108682.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"]}
+ArcadePhysicsEngine_move__P83468.info = {"start":2822,"length":3809,"line":112,"column":4,"endLine":208,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
 
-function ArcadePhysicsEngine_move__P108682_mk(s) {
+function ArcadePhysicsEngine_move__P83468_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_move__P108682, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_move__P83468, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48431,24 +48343,24 @@ function ArcadePhysicsEngine_move__P108682_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  dtf___129388: undefined,
-  dt2___129395: undefined,
-  scene___129399: undefined,
-  tileMap___129402: undefined,
-  movingSprites___129405: undefined,
-  MAX_STEP_COUNT___129436: undefined,
-  overlapHandlers___129448: undefined,
-  selected___129455: undefined,
-  buffers___129456: undefined,
-  count___129460: undefined,
-  currMovers___129470: undefined,
-  remainingMovers___129477: undefined,
-  ms___129482: undefined,
-  unnamed16750___U13: undefined,
-  unnamed16751___U14: undefined,
-  s___129484: undefined,
-  stepX___129584: undefined,
-  stepY___129598: undefined,
+  dtMs___105959: undefined,
+  dt2___105965: undefined,
+  scene___105969: undefined,
+  tileMap___105972: undefined,
+  movingSprites___105975: undefined,
+  MAX_STEP_COUNT___106006: undefined,
+  overlapHandlers___106018: undefined,
+  selected___106025: undefined,
+  buffers___106026: undefined,
+  count___106030: undefined,
+  currMovers___106040: undefined,
+  remainingMovers___106047: undefined,
+  ms___106052: undefined,
+  unnamed1802___U13: undefined,
+  unnamed1803___U14: undefined,
+  s___106054: undefined,
+  stepX___106147: undefined,
+  stepY___106161: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -48457,7 +48369,7 @@ function ArcadePhysicsEngine_move__P108682_mk(s) {
 
 
 
-function inline__P129407(s) {
+function inline__P105977(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48471,23 +48383,23 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = ArcadePhysicsEngine_createMovingSprite__P110744_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_createMovingSprite__P85584_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 = 493; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 499; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129407.info = {"start":2943,"length":51,"line":121,"column":17,"endLine":121,"endColumn":68,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["sprite"]}
+inline__P105977.info = {"start":3181,"length":52,"line":121,"column":17,"endLine":121,"endColumn":69,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["sprite"]}
 
-function inline__P129407_mk(s) {
+function inline__P105977_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129407, depth: s.depth + 1,
+        parent: s, fn: inline__P105977, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -48497,7 +48409,7 @@ function inline__P129407_mk(s) {
 
 
 
-function inline__P129419(s) {
+function inline__P105989(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48511,9 +48423,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = Sprite_vx__P108526_mk(s);
+    s.tmp_1 = Sprite_vx__P83308_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 495; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 501; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -48522,9 +48434,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = Sprite_vy__P108528_mk(s);
+    s.tmp_2 = Sprite_vy__P83310_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 496; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 502; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
   case 2:
@@ -48532,9 +48444,9 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = Sprite_clearObstacles__P108581_mk(s);
+    s.tmp_4 = Sprite_clearObstacles__P83365_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 497; s.pc = 7; return s.tmp_4;
+    s.callLocIdx = 503; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
   case 3:
@@ -48543,12 +48455,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129419.info = {"start":3077,"length":66,"line":124,"column":29,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["s"]}
+inline__P105989.info = {"start":3316,"length":66,"line":124,"column":29,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P129419_mk(s) {
+function inline__P105989_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129419, depth: s.depth + 1,
+        parent: s, fn: inline__P105989, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48562,7 +48474,7 @@ function inline__P129419_mk(s) {
 
 
 
-function ArcadePhysicsEngine_spriteCollisions__P110745(s) {
+function ArcadePhysicsEngine_spriteCollisions__P85585(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48572,18 +48484,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ms___129699 = undefined;
-    s.unnamed16752___U1 = undefined;
-    s.unnamed16753___U2 = undefined;
-    s.sprite___129701 = undefined;
-    s.overSprites___129708 = undefined;
-    s.overlapper___129716 = undefined;
-    s.unnamed16754___U6 = undefined;
-    s.unnamed16755___U7 = undefined;
-    s.thisKind___129722 = undefined;
-    s.otherKind___129726 = undefined;
-    s.higher___129739 = undefined;
-    s.lower___129748 = undefined;
+    s.ms___106262 = undefined;
+    s.unnamed1804___U1 = undefined;
+    s.unnamed1805___U2 = undefined;
+    s.sprite___106264 = undefined;
+    s.overSprites___106271 = undefined;
+    s.overlapper___106279 = undefined;
+    s.unnamed1806___U6 = undefined;
+    s.unnamed1807___U7 = undefined;
+    s.thisKind___106285 = undefined;
+    s.otherKind___106289 = undefined;
+    s.higher___106302 = undefined;
+    s.lower___106311 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -48591,7 +48503,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = pxsim_Array__length(s.arg2);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -48603,64 +48515,64 @@ switch (step) {
     { step = 21; continue; }
   case 1:
   case 2:
-    s.ms___129699 = (undefined);
-    s.unnamed16752___U1 = (s.arg1);
-    s.unnamed16753___U2 = (0);
+    s.ms___106262 = (undefined);
+    s.unnamed1804___U1 = (s.arg1);
+    s.unnamed1805___U2 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed16753___U2;
-    r0 = pxsim_Array__length(s.unnamed16752___U1);
+    s.tmp_0 = r0 = s.unnamed1805___U2;
+    r0 = pxsim_Array__length(s.unnamed1804___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16752___U1, s.unnamed16753___U2);
-    s.ms___129699 = (r0);
-    r0 = s.ms___129699.fields["sprite"];
-    s.sprite___129701 = (r0);
-    r0 = s.sprite___129701.fields["flags"];
+    r0 = pxsim_Array__getAt(s.unnamed1804___U1, s.unnamed1805___U2);
+    s.ms___106262 = (r0);
+    r0 = s.ms___106262.fields["sprite"];
+    s.sprite___106264 = (r0);
+    r0 = s.sprite___106264.fields["flags"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 & 515);
+    r0 = (s.tmp_1 & 4610);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
     { step = 19; continue; }
   case 4:
   case 5:
-    s.tmp_2 = sprites_SpriteMap_overlaps__P108594_mk(s);
+    s.tmp_2 = sprites_SpriteMap_overlaps__P83378_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_2.arg0 = r0;
-    r0 = s.ms___129699.fields["sprite"];
+    r0 = s.ms___106262.fields["sprite"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 561; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 567; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
-    s.overSprites___129708 = (r0);
-    s.overlapper___129716 = (undefined);
-    s.unnamed16754___U6 = (s.overSprites___129708);
-    s.unnamed16755___U7 = (0);
+    s.overSprites___106271 = (r0);
+    s.overlapper___106279 = (undefined);
+    s.unnamed1806___U6 = (s.overSprites___106271);
+    s.unnamed1807___U7 = (0);
   case 6:
-    s.tmp_0 = r0 = s.unnamed16755___U7;
-    r0 = pxsim_Array__length(s.unnamed16754___U6);
+    s.tmp_0 = r0 = s.unnamed1807___U7;
+    r0 = pxsim_Array__length(s.unnamed1806___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 18; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16754___U6, s.unnamed16755___U7);
-    s.overlapper___129716 = (r0);
-    r0 = s.overlapper___129716.fields["flags"];
+    r0 = pxsim_Array__getAt(s.unnamed1806___U6, s.unnamed1807___U7);
+    s.overlapper___106279 = (r0);
+    r0 = s.overlapper___106279.fields["flags"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 & 515);
+    r0 = (s.tmp_3 & 4610);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 7; continue; }
     { step = 17; continue; }
   case 7:
   case 8:
-    r0 = s.sprite___129701.fields["_kind"];
-    s.thisKind___129722 = (r0);
-    r0 = s.overlapper___129716.fields["_kind"];
-    s.otherKind___129726 = (r0);
-    r0 = s.sprite___129701.fields["_kindsOverlappedWith"];
+    r0 = s.sprite___106264.fields["_kind"];
+    s.thisKind___106285 = (r0);
+    r0 = s.overlapper___106279.fields["_kind"];
+    s.otherKind___106289 = (r0);
+    r0 = s.sprite___106264.fields["_kindsOverlappedWith"];
     s.tmp_2 = r0;
-    r0 = pxsim_Array_.indexOf(s.tmp_2, s.otherKind___129726, undefined);
+    r0 = pxsim_Array_.indexOf(s.tmp_2, s.otherKind___106289, undefined);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === -1);
     s.tmp_0 = r0;
@@ -48669,37 +48581,37 @@ switch (step) {
     { step = 17; continue; }
   case 9:
   case 10:
-    r0 = s.sprite___129701.fields["id"];
+    r0 = s.sprite___106264.fields["id"];
     s.tmp_4 = r0;
-    r0 = s.overlapper___129716.fields["id"];
+    r0 = s.overlapper___106279.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___129701;
+    r0 = s.sprite___106264;
     { step = 12; continue; }
   case 11:
-    r0 = s.overlapper___129716;
+    r0 = s.overlapper___106279;
   case 12:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    s.higher___129739 = (s.tmp_6);
-    r0 = (s.higher___129739 === s.sprite___129701);
+    s.higher___106302 = (s.tmp_6);
+    r0 = (s.higher___106302 === s.sprite___106264);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = s.overlapper___129716;
+    r0 = s.overlapper___106279;
     { step = 14; continue; }
   case 13:
-    r0 = s.sprite___129701;
+    r0 = s.sprite___106264;
   case 14:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.lower___129748 = (s.tmp_1);
-    r0 = s.higher___129739.fields["_overlappers"];
+    s.lower___106311 = (s.tmp_1);
+    r0 = s.higher___106302.fields["_overlappers"];
     s.tmp_2 = r0;
-    r0 = s.lower___129748.fields["id"];
+    r0 = s.lower___106311.fields["id"];
     s.tmp_3 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_2, s.tmp_3, undefined);
     s.tmp_1 = r0;
@@ -48707,54 +48619,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__P129768);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P106331);
     s.tmp_4 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.thisKind___129722);
-    r0 = pxsim_pxtrt_stclo(s.tmp_4, 1, s.otherKind___129726);
-    r0 = pxsim_pxtcore_mkAction(5, inline__P129792);
+    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.thisKind___106285);
+    r0 = pxsim_pxtrt_stclo(s.tmp_4, 1, s.otherKind___106289);
+    r0 = pxsim_pxtcore_mkAction(5, inline__P106355);
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.higher___129739);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 1, s.lower___129748);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 2, s.sprite___129701);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 3, s.overlapper___129716);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 4, s.thisKind___129722);
-    s.tmp_6 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_7 = helpers_arrayFilter__P106717_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.higher___106302);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 1, s.lower___106311);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 2, s.sprite___106264);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 3, s.overlapper___106279);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 4, s.thisKind___106285);
+    s.tmp_6 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_7 = helpers_arrayFilter__P81379_mk(s);
     s.tmp_7.arg0 = s.arg2;
     s.tmp_7.arg1 = s.tmp_4;
-    s.callLocIdx = 564; s.pc = 24; return s.tmp_7;
+    s.callLocIdx = 570; 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 = 566; s.pc = 23; return s.tmp_6;
+    s.callLocIdx = 572; s.pc = 23; return s.tmp_6;
   case 23:
     r0 = s.retval;
   case 15:
   case 16:
   case 17:
-    r0 = (s.unnamed16755___U7 + 1);
-    s.unnamed16755___U7 = (r0);
+    r0 = (s.unnamed1807___U7 + 1);
+    s.unnamed1807___U7 = (r0);
     { step = 6; continue; }
   case 18:
-    s.unnamed16754___U6 = (undefined);
+    s.unnamed1806___U6 = (undefined);
   case 19:
-    r0 = (s.unnamed16753___U2 + 1);
-    s.unnamed16753___U2 = (r0);
+    r0 = (s.unnamed1805___U2 + 1);
+    s.unnamed1805___U2 = (r0);
     { step = 3; continue; }
   case 20:
-    s.unnamed16752___U1 = (undefined);
+    s.unnamed1804___U1 = (undefined);
   case 21:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_spriteCollisions__P110745.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"]}
+ArcadePhysicsEngine_spriteCollisions__P85585.info = {"start":9445,"length":2266,"line":302,"column":4,"endLine":346,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"spriteCollisions","argumentNames":["this","movedSprites","handlers"]}
 
-function ArcadePhysicsEngine_spriteCollisions__P110745_mk(s) {
+function ArcadePhysicsEngine_spriteCollisions__P85585_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_spriteCollisions__P110745, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_spriteCollisions__P85585, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48764,18 +48676,18 @@ function ArcadePhysicsEngine_spriteCollisions__P110745_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  ms___129699: undefined,
-  unnamed16752___U1: undefined,
-  unnamed16753___U2: undefined,
-  sprite___129701: undefined,
-  overSprites___129708: undefined,
-  overlapper___129716: undefined,
-  unnamed16754___U6: undefined,
-  unnamed16755___U7: undefined,
-  thisKind___129722: undefined,
-  otherKind___129726: undefined,
-  higher___129739: undefined,
-  lower___129748: undefined,
+  ms___106262: undefined,
+  unnamed1804___U1: undefined,
+  unnamed1805___U2: undefined,
+  sprite___106264: undefined,
+  overSprites___106271: undefined,
+  overlapper___106279: undefined,
+  unnamed1806___U6: undefined,
+  unnamed1807___U7: undefined,
+  thisKind___106285: undefined,
+  otherKind___106289: undefined,
+  higher___106302: undefined,
+  lower___106311: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -48785,7 +48697,7 @@ function ArcadePhysicsEngine_spriteCollisions__P110745_mk(s) {
 
 
 
-function inline__P129768(s) {
+function inline__P106331(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48842,12 +48754,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129768.info = {"start":10958,"length":137,"line":350,"column":32,"endLine":351,"endColumn":81,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P106331.info = {"start":10812,"length":137,"line":328,"column":32,"endLine":329,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P129768_mk(s) {
+function inline__P106331_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129768, depth: s.depth + 1,
+        parent: s, fn: inline__P106331, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48865,7 +48777,7 @@ function inline__P129768_mk(s) {
 
 
 
-function inline__P129792(s) {
+function inline__P106355(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48884,7 +48796,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__P129802);
+    r0 = pxsim_pxtcore_mkAction(6, inline__P106365);
     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]);
@@ -48897,12 +48809,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129792.info = {"start":11155,"length":648,"line":353,"column":33,"endLine":364,"endColumn":25,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P106355.info = {"start":11009,"length":652,"line":331,"column":33,"endLine":342,"endColumn":25,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P129792_mk(s) {
+function inline__P106355_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129792, depth: s.depth + 1,
+        parent: s, fn: inline__P106355, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48913,7 +48825,7 @@ function inline__P129792_mk(s) {
 
 
 
-function inline__P129802(s) {
+function inline__P106365(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48929,7 +48841,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 & 515);
+    r0 = (s.tmp_3 & 4610);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -48969,12 +48881,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 = 565; s.pc = 7; return s.tmp_12;
+      s.callLocIdx = 571; 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 = 565; s.pc = 7; return s.tmp_12; }
-      else if (s.tmp_12.fn.isGetter) { s.tmp_12.stage2Call = true; s.callLocIdx = 565; s.pc = 7; return s.tmp_12;; }
-     else { s.callLocIdx = 565; 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 = 571; s.pc = 7; return s.tmp_12; }
+      else if (s.tmp_12.fn.isGetter) { s.tmp_12.stage2Call = true; s.callLocIdx = 571; s.pc = 7; return s.tmp_12;; }
+     else { s.callLocIdx = 571; s.pc = 7; return s.tmp_12; }
     }
   case 7:
     r0 = s.retval;
@@ -48989,12 +48901,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129802.info = {"start":11276,"length":499,"line":355,"column":50,"endLine":363,"endColumn":29,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"inline","argumentNames":[]}
+inline__P106365.info = {"start":11130,"length":503,"line":333,"column":50,"endLine":341,"endColumn":29,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P129802_mk(s) {
+function inline__P106365_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129802, depth: s.depth + 1,
+        parent: s, fn: inline__P106365, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49015,7 +48927,7 @@ function inline__P129802_mk(s) {
 
 
 
-function sprites_SpriteMap_overlaps__P108594(s) {
+function sprites_SpriteMap_overlaps__P83378(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49025,47 +48937,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.n___129836 = undefined;
-    s.o___129840 = undefined;
+    s.n___106399 = undefined;
+    s.o___106403 = 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__C108591_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_neighbors__P108593_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_neighbors__P83377_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 436; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 445; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.n___129836 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P129842);
+    s.n___106399 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P106405);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_1.arg0 = s.n___129836;
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_1.arg0 = s.n___106399;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 438; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 447; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    s.o___129840 = (r0);
-    r0 = s.o___129840;
+    s.o___106403 = (r0);
+    r0 = s.o___106403;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_overlaps__P108594.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"]}
+sprites_SpriteMap_overlaps__P83378.info = {"start":923,"length":189,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"overlaps","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_overlaps__P108594_mk(s) {
+function sprites_SpriteMap_overlaps__P83378_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_overlaps__P108594, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_overlaps__P83378, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  n___129836: undefined,
-  o___129840: undefined,
+  n___106399: undefined,
+  o___106403: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -49074,7 +48986,7 @@ function sprites_SpriteMap_overlaps__P108594_mk(s) {
 
 
 
-function inline__P129842(s) {
+function inline__P106405(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49088,21 +49000,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Sprite_overlapsWith__P108577_mk(s);
+    s.tmp_0 = Sprite_overlapsWith__P83361_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 437; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 446; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P129842.info = {"start":1037,"length":41,"line":32,"column":31,"endLine":32,"endColumn":72,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"inline","argumentNames":["neighbor"]}
+inline__P106405.info = {"start":1037,"length":41,"line":32,"column":31,"endLine":32,"endColumn":72,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["neighbor"]}
 
-function inline__P129842_mk(s) {
+function inline__P106405_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P129842, depth: s.depth + 1,
+        parent: s, fn: inline__P106405, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -49112,7 +49024,7 @@ function inline__P129842_mk(s) {
 
 
 
-function sprites_SpriteMap_neighbors__P108593(s) {
+function sprites_SpriteMap_neighbors__P83377(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49122,112 +49034,112 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.n___129884 = undefined;
-    s.layer___129886 = undefined;
+    s.n___106447 = undefined;
+    s.layer___106449 = 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__C108591_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
-    s.n___129884 = (r0);
+    s.n___106447 = (r0);
     r0 = s.arg1.fields["layer"];
-    s.layer___129886 = (r0);
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P110723_mk(s);
+    s.layer___106449 = (r0);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P85549_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_left__P108559_mk(s);
+    s.tmp_1 = Sprite_left__P83341_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 424; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 433; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_top__P108563_mk(s);
+    s.tmp_2 = Sprite_top__P83345_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 425; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 434; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___129886;
-    s.tmp_0.arg4 = s.n___129884;
-    s.callLocIdx = 426; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___106449;
+    s.tmp_0.arg4 = s.n___106447;
+    s.callLocIdx = 435; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P110723_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P85549_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_left__P108559_mk(s);
+    s.tmp_1 = Sprite_left__P83341_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 427; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 436; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_bottom__P108565_mk(s);
+    s.tmp_2 = Sprite_bottom__P83347_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 428; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 437; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___129886;
-    s.tmp_0.arg4 = s.n___129884;
-    s.callLocIdx = 429; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___106449;
+    s.tmp_0.arg4 = s.n___106447;
+    s.callLocIdx = 438; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P110723_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P85549_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_right__P108561_mk(s);
+    s.tmp_1 = Sprite_right__P83343_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 430; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 439; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_top__P108563_mk(s);
+    s.tmp_2 = Sprite_top__P83345_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 431; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 440; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___129886;
-    s.tmp_0.arg4 = s.n___129884;
-    s.callLocIdx = 432; s.pc = 7; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___106449;
+    s.tmp_0.arg4 = s.n___106447;
+    s.callLocIdx = 441; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P110723_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P85549_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_right__P108561_mk(s);
+    s.tmp_1 = Sprite_right__P83343_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 433; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 442; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_bottom__P108565_mk(s);
+    s.tmp_2 = Sprite_bottom__P83347_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 434; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 443; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___129886;
-    s.tmp_0.arg4 = s.n___129884;
-    s.callLocIdx = 435; s.pc = 10; return s.tmp_0;
+    s.tmp_0.arg3 = s.layer___106449;
+    s.tmp_0.arg4 = s.n___106447;
+    s.callLocIdx = 444; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeElement(s.n___129884, s.arg1);
-    r0 = s.n___129884;
+    r0 = pxsim_Array_.removeElement(s.n___106447, s.arg1);
+    r0 = s.n___106447;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_neighbors__P108593.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"]}
+sprites_SpriteMap_neighbors__P83377.info = {"start":376,"length":442,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"neighbors","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_neighbors__P108593_mk(s) {
+function sprites_SpriteMap_neighbors__P83377_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_neighbors__P108593, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_neighbors__P83377, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  n___129884: undefined,
-  layer___129886: undefined,
+  n___106447: undefined,
+  layer___106449: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -49236,7 +49148,7 @@ function sprites_SpriteMap_neighbors__P108593_mk(s) {
 
 
 
-function sprites_SpriteMap_mergeAtKey__P110723(s) {
+function sprites_SpriteMap_mergeAtKey__P85549(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49246,11 +49158,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.k___129935 = undefined;
-    s.bucket___129940 = undefined;
-    s.sprite___129947 = undefined;
-    s.unnamed16748___U3 = undefined;
-    s.unnamed16749___U4 = undefined;
+    s.k___106498 = undefined;
+    s.bucket___106503 = undefined;
+    s.sprite___106510 = undefined;
+    s.unnamed1800___U3 = undefined;
+    s.unnamed1801___U4 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -49260,33 +49172,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C108591_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_key__P110721_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_key__P85547_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
-    s.callLocIdx = 462; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 471; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.k___129935 = (r0);
+    s.k___106498 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___129935);
-    s.bucket___129940 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.bucket___129940);
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___106498);
+    s.bucket___106503 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.bucket___106503);
     if (!r0) { step = 7; continue; }
-    s.sprite___129947 = (undefined);
-    s.unnamed16748___U3 = (s.bucket___129940);
-    s.unnamed16749___U4 = (0);
+    s.sprite___106510 = (undefined);
+    s.unnamed1800___U3 = (s.bucket___106503);
+    s.unnamed1801___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16749___U4;
-    r0 = pxsim_Array__length(s.unnamed16748___U3);
+    s.tmp_0 = r0 = s.unnamed1801___U4;
+    r0 = pxsim_Array__length(s.unnamed1800___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16748___U3, s.unnamed16749___U4);
-    s.sprite___129947 = (r0);
-    r0 = s.sprite___129947.fields["layer"];
+    r0 = pxsim_Array__getAt(s.unnamed1800___U3, s.unnamed1801___U4);
+    s.sprite___106510 = (r0);
+    r0 = s.sprite___106510.fields["layer"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & s.arg3);
     s.tmp_2 = r0;
@@ -49295,7 +49207,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    r0 = pxsim_Array_.indexOf(s.arg4, s.sprite___129947, undefined);
+    r0 = pxsim_Array_.indexOf(s.arg4, s.sprite___106510, undefined);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 < 0);
   case 3:
@@ -49303,26 +49215,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___129947);
+    r0 = pxsim_Array__push(s.arg4, s.sprite___106510);
   case 4:
   case 5:
-    r0 = (s.unnamed16749___U4 + 1);
-    s.unnamed16749___U4 = (r0);
+    r0 = (s.unnamed1801___U4 + 1);
+    s.unnamed1801___U4 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed16748___U3 = (undefined);
+    s.unnamed1800___U3 = (undefined);
   case 7:
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_mergeAtKey__P110723.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"]}
+sprites_SpriteMap_mergeAtKey__P85549.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"]}
 
-function sprites_SpriteMap_mergeAtKey__P110723_mk(s) {
+function sprites_SpriteMap_mergeAtKey__P85549_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_mergeAtKey__P110723, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_mergeAtKey__P85549, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49330,11 +49242,11 @@ function sprites_SpriteMap_mergeAtKey__P110723_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  k___129935: undefined,
-  bucket___129940: undefined,
-  sprite___129947: undefined,
-  unnamed16748___U3: undefined,
-  unnamed16749___U4: undefined,
+  k___106498: undefined,
+  bucket___106503: undefined,
+  sprite___106510: undefined,
+  unnamed1800___U3: undefined,
+  unnamed1801___U4: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -49346,7 +49258,7 @@ function sprites_SpriteMap_mergeAtKey__P110723_mk(s) {
 
 
 
-function sprites_SpriteMap_key__P110721(s) {
+function sprites_SpriteMap_key__P85547(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49356,8 +49268,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.xi___129968 = undefined;
-    s.yi___129980 = undefined;
+    s.xi___106531 = undefined;
+    s.yi___106543 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -49365,8 +49277,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C108591_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P106731_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P81395_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg0.fields["columnCount"];
     s.tmp_0.arg1 = r0;
@@ -49374,11 +49286,11 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.arg1, s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 450; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 459; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.xi___129968 = (r0);
-    s.tmp_0 = Math_clamp__P106731_mk(s);
+    s.xi___106531 = (r0);
+    s.tmp_0 = Math_clamp__P81395_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg0.fields["rowCount"];
     s.tmp_0.arg1 = r0;
@@ -49386,31 +49298,31 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.arg2, s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 451; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 460; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.yi___129980 = (r0);
-    s.tmp_0 = r0 = s.xi___129968;
+    s.yi___106543 = (r0);
+    s.tmp_0 = r0 = s.xi___106531;
     r0 = s.arg0.fields["columnCount"];
     s.tmp_2 = r0;
-    r0 = (s.yi___129980 * s.tmp_2);
+    r0 = (s.yi___106543 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_key__P110721.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"]}
+sprites_SpriteMap_key__P85547.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"]}
 
-function sprites_SpriteMap_key__P110721_mk(s) {
+function sprites_SpriteMap_key__P85547_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_key__P110721, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_key__P85547, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  xi___129968: undefined,
-  yi___129980: undefined,
+  xi___106531: undefined,
+  yi___106543: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -49420,7 +49332,7 @@ function sprites_SpriteMap_key__P110721_mk(s) {
 
 
 
-function Sprite_bottom__P108565(s) {
+function Sprite_bottom__P83347(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49435,10 +49347,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_top__P108563_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_top__P83345_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 316; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 325; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -49450,13 +49362,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_bottom__P108565.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__P108565.isGetter = true;
+Sprite_bottom__P83347.info = {"start":10366,"length":59,"line":375,"column":4,"endLine":377,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this"]}
+Sprite_bottom__P83347.isGetter = true;
 
-function Sprite_bottom__P108565_mk(s) {
+function Sprite_bottom__P83347_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_bottom__P108565, depth: s.depth + 1,
+        parent: s, fn: Sprite_bottom__P83347, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49469,7 +49381,7 @@ function Sprite_bottom__P108565_mk(s) {
 
 
 
-function Sprite_right__P108561(s) {
+function Sprite_right__P83343(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49484,10 +49396,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_left__P108559_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_left__P83341_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 308; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 317; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -49499,13 +49411,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_right__P108561.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__P108561.isGetter = true;
+Sprite_right__P83343.info = {"start":9562,"length":57,"line":345,"column":4,"endLine":347,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this"]}
+Sprite_right__P83343.isGetter = true;
 
-function Sprite_right__P108561_mk(s) {
+function Sprite_right__P83343_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_right__P108561, depth: s.depth + 1,
+        parent: s, fn: Sprite_right__P83343, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49518,7 +49430,7 @@ function Sprite_right__P108561_mk(s) {
 
 
 
-function Sprite_overlapsWith__P108577(s) {
+function Sprite_overlapsWith__P83361(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49534,7 +49446,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = (s.arg1 == s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -49545,7 +49457,7 @@ switch (step) {
   case 2:
     r0 = s.arg0.fields["flags"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 & 513);
+    r0 = (s.tmp_2 & 4608);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 3; continue; }
@@ -49555,7 +49467,7 @@ switch (step) {
   case 4:
     r0 = s.arg1.fields["flags"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 & 513);
+    r0 = (s.tmp_4 & 4608);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 5; continue; }
@@ -49567,29 +49479,29 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = s.arg0.fields["_image"];
     s.tmp_6 = r0;
-    s.tmp_9 = Sprite_left__P108559_mk(s);
+    s.tmp_9 = Sprite_left__P83341_mk(s);
     s.tmp_9.arg0 = s.arg0;
-    s.callLocIdx = 386; s.pc = 8; return s.tmp_9;
+    s.callLocIdx = 395; s.pc = 8; return s.tmp_9;
   case 8:
     r0 = s.retval;
     s.tmp_8 = r0;
-    s.tmp_11 = Sprite_left__P108559_mk(s);
+    s.tmp_11 = Sprite_left__P83341_mk(s);
     s.tmp_11.arg0 = s.arg1;
-    s.callLocIdx = 387; s.pc = 9; return s.tmp_11;
+    s.callLocIdx = 396; 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__P108563_mk(s);
+    s.tmp_14 = Sprite_top__P83345_mk(s);
     s.tmp_14.arg0 = s.arg0;
-    s.callLocIdx = 388; s.pc = 10; return s.tmp_14;
+    s.callLocIdx = 397; s.pc = 10; return s.tmp_14;
   case 10:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_16 = Sprite_top__P108563_mk(s);
+    s.tmp_16 = Sprite_top__P83345_mk(s);
     s.tmp_16.arg0 = s.arg1;
-    s.callLocIdx = 389; s.pc = 11; return s.tmp_16;
+    s.callLocIdx = 398; s.pc = 11; return s.tmp_16;
   case 11:
     r0 = s.retval;
     s.tmp_15 = r0;
@@ -49600,12 +49512,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_overlapsWith__P108577.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"]}
+Sprite_overlapsWith__P83361.info = {"start":25472,"length":454,"line":776,"column":4,"endLine":784,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"overlapsWith","argumentNames":["this","other"]}
 
-function Sprite_overlapsWith__P108577_mk(s) {
+function Sprite_overlapsWith__P83361_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_overlapsWith__P108577, depth: s.depth + 1,
+        parent: s, fn: Sprite_overlapsWith__P83361, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49632,7 +49544,7 @@ function Sprite_overlapsWith__P108577_mk(s) {
 
 
 
-function ArcadePhysicsEngine_createMovingSprite__P110744(s) {
+function ArcadePhysicsEngine_createMovingSprite__P85584(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49642,16 +49554,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ovx___131138 = undefined;
-    s.ovy___131143 = undefined;
-    s.fx___131170 = undefined;
-    s.c___131177 = undefined;
-    s.fy___131220 = undefined;
-    s.c___131227 = undefined;
-    s.dx___131266 = undefined;
-    s.dy___131275 = undefined;
-    s.xStep___131284 = undefined;
-    s.yStep___131286 = undefined;
+    s.ovx___106751 = undefined;
+    s.ovy___106756 = undefined;
+    s.fx___106783 = undefined;
+    s.c___106790 = undefined;
+    s.fy___106833 = undefined;
+    s.c___106840 = undefined;
+    s.dx___106879 = undefined;
+    s.dy___106892 = undefined;
+    s.xStep___106905 = undefined;
+    s.yStep___106907 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -49660,23 +49572,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
-    s.tmp_0 = ArcadePhysicsEngine_constrain__P110749_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
+    s.tmp_0 = ArcadePhysicsEngine_constrain__P85589_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 524; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 530; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.ovx___131138 = (r0);
-    s.tmp_0 = ArcadePhysicsEngine_constrain__P110749_mk(s);
+    s.ovx___106751 = (r0);
+    s.tmp_0 = ArcadePhysicsEngine_constrain__P85589_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 525; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 531; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
-    s.ovy___131143 = (r0);
+    s.ovy___106756 = (r0);
     r0 = s.arg1.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.arg1).fields["_lastX"] = (s.tmp_0);
@@ -49693,8 +49605,6 @@ switch (step) {
     r0 = s.arg1.fields["_ax"];
     s.tmp_6 = r0;
     r0 = pxsim.Math_.imul(s.tmp_6, s.arg2);
-    s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> 8);
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_5, 1000);
     s.tmp_4 = r0;
@@ -49710,45 +49620,43 @@ switch (step) {
     r0 = s.arg1.fields["_fx"];
     s.tmp_2 = r0;
     r0 = pxsim.Math_.imul(s.tmp_2, s.arg2);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> 8);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 1000);
-    s.fx___131170 = (r0);
+    s.fx___106783 = (r0);
     r0 = s.arg1.fields["_vx"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.fx___131170);
-    s.c___131177 = (r0);
-    r0 = (s.c___131177 < 0);
+    r0 = (s.tmp_0 - s.fx___106783);
+    s.c___106790 = (r0);
+    r0 = (s.c___106790 < 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__P106770_mk(s);
+    s.tmp_3 = Fx_min__P81434_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.fx___131170);
+    r0 = (s.tmp_4 + s.fx___106783);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 533; s.pc = 27; return s.tmp_3;
+    s.callLocIdx = 539; 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___131177 > 0);
+    r0 = (s.c___106790 > 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__P106771_mk(s);
+    s.tmp_3 = Fx_max__P81435_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.fx___131170);
+    r0 = (s.tmp_4 - s.fx___106783);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 535; s.pc = 28; return s.tmp_3;
+    s.callLocIdx = 541; s.pc = 28; return s.tmp_3;
   case 28:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -49771,8 +49679,6 @@ switch (step) {
     r0 = s.arg1.fields["_ay"];
     s.tmp_6 = r0;
     r0 = pxsim.Math_.imul(s.tmp_6, s.arg2);
-    s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> 8);
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_5, 1000);
     s.tmp_4 = r0;
@@ -49788,45 +49694,43 @@ switch (step) {
     r0 = s.arg1.fields["_fy"];
     s.tmp_2 = r0;
     r0 = pxsim.Math_.imul(s.tmp_2, s.arg2);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> 8);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 1000);
-    s.fy___131220 = (r0);
+    s.fy___106833 = (r0);
     r0 = s.arg1.fields["_vy"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.fy___131220);
-    s.c___131227 = (r0);
-    r0 = (s.c___131227 < 0);
+    r0 = (s.tmp_0 - s.fy___106833);
+    s.c___106840 = (r0);
+    r0 = (s.c___106840 < 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__P106770_mk(s);
+    s.tmp_3 = Fx_min__P81434_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.fy___131220);
+    r0 = (s.tmp_4 + s.fy___106833);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 543; s.pc = 29; return s.tmp_3;
+    s.callLocIdx = 549; 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___131227 > 0);
+    r0 = (s.c___106840 > 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__P106770_mk(s);
+    s.tmp_3 = Fx_min__P81434_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.fy___131220);
+    r0 = (s.tmp_4 - s.fy___106833);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 545; s.pc = 30; return s.tmp_3;
+    s.callLocIdx = 551; s.pc = 30; return s.tmp_3;
   case 30:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -49840,51 +49744,59 @@ switch (step) {
   case 15:
   case 16:
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_2 = ArcadePhysicsEngine_constrain__P110749_mk(s);
+    s.tmp_2 = ArcadePhysicsEngine_constrain__P85589_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 546; s.pc = 31; return s.tmp_2;
+    s.callLocIdx = 552; 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__P110749_mk(s);
+    s.tmp_2 = ArcadePhysicsEngine_constrain__P85589_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 547; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 553; 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_4 = r0;
+    r0 = (s.tmp_4 + s.ovx___106751);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 / 256);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.ovx___131138);
+    r0 = (s.tmp_2 * s.arg3);
     s.tmp_1 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_1, s.arg3);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> 8);
+    r0 = (s.tmp_1 / 1000);
     s.tmp_0 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_0, 1000);
-    s.dx___131266 = (r0);
+    r0 = (s.tmp_0 * 256);
+    s.tmp_5 = r0;
+    r0 = (s.tmp_5 | 0);
+    s.dx___106879 = (r0);
     r0 = s.arg1.fields["_vy"];
+    s.tmp_4 = r0;
+    r0 = (s.tmp_4 + s.ovy___106756);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 / 256);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.ovy___131143);
+    r0 = (s.tmp_2 * s.arg3);
     s.tmp_1 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_1, s.arg3);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> 8);
+    r0 = (s.tmp_1 / 1000);
     s.tmp_0 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_0, 1000);
-    s.dy___131275 = (r0);
-    s.xStep___131284 = (s.dx___131266);
-    s.yStep___131286 = (s.dy___131275);
+    r0 = (s.tmp_0 * 256);
+    s.tmp_5 = r0;
+    r0 = (s.tmp_5 | 0);
+    s.dy___106892 = (r0);
+    s.xStep___106905 = (s.dx___106879);
+    s.yStep___106907 = (s.dy___106892);
   case 17:
-    s.tmp_2 = Fx_abs__P106769_mk(s);
-    s.tmp_2.arg0 = s.xStep___131284;
-    s.callLocIdx = 554; s.pc = 33; return s.tmp_2;
+    s.tmp_2 = Fx_abs__P81433_mk(s);
+    s.tmp_2.arg0 = s.xStep___106905;
+    s.callLocIdx = 560; s.pc = 33; return s.tmp_2;
   case 33:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -49897,9 +49809,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    s.tmp_5 = Fx_abs__P106769_mk(s);
-    s.tmp_5.arg0 = s.yStep___131286;
-    s.callLocIdx = 555; s.pc = 34; return s.tmp_5;
+    s.tmp_5 = Fx_abs__P81433_mk(s);
+    s.tmp_5.arg0 = s.yStep___106907;
+    s.callLocIdx = 561; s.pc = 34; return s.tmp_5;
   case 34:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -49911,9 +49823,9 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 24; continue; }
-    s.tmp_10 = Fx_abs__P106769_mk(s);
-    s.tmp_10.arg0 = s.xStep___131284;
-    s.callLocIdx = 556; s.pc = 35; return s.tmp_10;
+    s.tmp_10 = Fx_abs__P81433_mk(s);
+    s.tmp_10.arg0 = s.xStep___106905;
+    s.callLocIdx = 562; s.pc = 35; return s.tmp_10;
   case 35:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -49923,13 +49835,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___131284, 2);
-    s.xStep___131284 = (r0);
+    r0 = pxsim.Math_.idiv(s.xStep___106905, 2);
+    s.xStep___106905 = (r0);
   case 20:
   case 21:
-    s.tmp_2 = Fx_abs__P106769_mk(s);
-    s.tmp_2.arg0 = s.yStep___131286;
-    s.callLocIdx = 558; s.pc = 36; return s.tmp_2;
+    s.tmp_2 = Fx_abs__P81433_mk(s);
+    s.tmp_2.arg0 = s.yStep___106907;
+    s.callLocIdx = 564; s.pc = 36; return s.tmp_2;
   case 36:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -49939,38 +49851,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___131286, 2);
-    s.yStep___131286 = (r0);
+    r0 = pxsim.Math_.idiv(s.yStep___106907, 2);
+    s.yStep___106907 = (r0);
   case 22:
   case 23:
     { step = 17; continue; }
   case 24:
-    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C108668_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C83454_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = MovingSprite_constructor__P108669_mk(s);
+    s.tmp_1 = MovingSprite_constructor__P83455_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___131266;
-    s.tmp_1.arg5 = s.dy___131275;
-    s.tmp_1.arg6 = s.xStep___131284;
-    s.tmp_1.arg7 = s.yStep___131286;
-    s.callLocIdx = 560; s.pc = 37; return s.tmp_1;
+    s.tmp_1.arg4 = s.dx___106879;
+    s.tmp_1.arg5 = s.dy___106892;
+    s.tmp_1.arg6 = s.xStep___106905;
+    s.tmp_1.arg7 = s.yStep___106907;
+    s.callLocIdx = 566; s.pc = 37; return s.tmp_1;
   case 37:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_createMovingSprite__P110744.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"]}
+ArcadePhysicsEngine_createMovingSprite__P85584.info = {"start":6637,"length":2802,"line":210,"column":4,"endLine":300,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"createMovingSprite","argumentNames":["this","sprite","dtMs","dt2"]}
 
-function ArcadePhysicsEngine_createMovingSprite__P110744_mk(s) {
+function ArcadePhysicsEngine_createMovingSprite__P85584_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_createMovingSprite__P110744, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_createMovingSprite__P85584, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49984,16 +49896,16 @@ function ArcadePhysicsEngine_createMovingSprite__P110744_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  ovx___131138: undefined,
-  ovy___131143: undefined,
-  fx___131170: undefined,
-  c___131177: undefined,
-  fy___131220: undefined,
-  c___131227: undefined,
-  dx___131266: undefined,
-  dy___131275: undefined,
-  xStep___131284: undefined,
-  yStep___131286: undefined,
+  ovx___106751: undefined,
+  ovy___106756: undefined,
+  fx___106783: undefined,
+  c___106790: undefined,
+  fy___106833: undefined,
+  c___106840: undefined,
+  dx___106879: undefined,
+  dy___106892: undefined,
+  xStep___106905: undefined,
+  yStep___106907: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -50004,7 +49916,7 @@ function ArcadePhysicsEngine_createMovingSprite__P110744_mk(s) {
 
 
 
-function ArcadePhysicsEngine_constrain__P110749(s) {
+function ArcadePhysicsEngine_constrain__P85589(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50020,30 +49932,30 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
-    s.tmp_0 = Fx_max__P106771_mk(s);
-    s.tmp_1 = Fx_min__P106770_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
+    s.tmp_0 = Fx_max__P81435_mk(s);
+    s.tmp_1 = Fx_min__P81434_mk(s);
     r0 = s.arg0.fields["maxVelocity"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 709; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 713; 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 = 710; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 714; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_constrain__P110749.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"]}
+ArcadePhysicsEngine_constrain__P85589.info = {"start":25843,"length":191,"line":726,"column":4,"endLine":734,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"constrain","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_constrain__P110749_mk(s) {
+function ArcadePhysicsEngine_constrain__P85589_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_constrain__P110749, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_constrain__P85589, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50055,7 +49967,7 @@ function ArcadePhysicsEngine_constrain__P110749_mk(s) {
 
 
 
-function Fx_max__P106771(s) {
+function Fx_max__P81435(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50086,12 +49998,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_max__P106771.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__P81435.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__P106771_mk(s) {
+function Fx_max__P81435_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_max__P106771, depth: s.depth + 1,
+        parent: s, fn: Fx_max__P81435, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -50102,7 +50014,7 @@ function Fx_max__P106771_mk(s) {
 
 
 
-function Fx_compare__P106768(s) {
+function Fx_compare__P81432(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50121,12 +50033,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_compare__P106768.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__P81432.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__P106768_mk(s) {
+function Fx_compare__P81432_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_compare__P106768, depth: s.depth + 1,
+        parent: s, fn: Fx_compare__P81432, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -50136,7 +50048,7 @@ function Fx_compare__P106768_mk(s) {
 
 
 
-function sprites_SpriteMap_insertAABB__P108598(s) {
+function sprites_SpriteMap_insertAABB__P83382(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50146,31 +50058,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.left___130956 = undefined;
-    s.top___130959 = undefined;
-    s.xn___130962 = undefined;
-    s.yn___130973 = undefined;
-    s.x___130984 = undefined;
-    s.y___130989 = undefined;
+    s.left___106563 = undefined;
+    s.top___106566 = undefined;
+    s.xn___106569 = undefined;
+    s.yn___106580 = undefined;
+    s.x___106591 = undefined;
+    s.y___106596 = 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__C108591_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P108559_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P83341_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 453; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 462; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.left___130956 = (r0);
-    s.tmp_0 = Sprite_top__P108563_mk(s);
+    s.left___106563 = (r0);
+    s.tmp_0 = Sprite_top__P83345_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 454; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 463; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.top___130959 = (r0);
+    s.top___106566 = (r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_3);
@@ -50184,7 +50096,7 @@ switch (step) {
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_5);
-    s.xn___130962 = (r0);
+    s.xn___106569 = (r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
@@ -50198,75 +50110,75 @@ switch (step) {
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_5);
-    s.yn___130973 = (r0);
-    s.x___130984 = (0);
+    s.yn___106580 = (r0);
+    s.x___106591 = (0);
   case 1:
-    r0 = (s.x___130984 <= s.xn___130962);
+    r0 = (s.x___106591 <= s.xn___106569);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.y___130989 = (0);
+    s.y___106596 = (0);
   case 2:
-    r0 = (s.y___130989 <= s.yn___130973);
+    r0 = (s.y___106596 <= s.yn___106580);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = sprites_SpriteMap_insertAtKey__P110722_mk(s);
+    s.tmp_1 = sprites_SpriteMap_insertAtKey__P85548_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = r0 = s.left___130956;
-    s.tmp_4 = Math_min__P106735_mk(s);
+    s.tmp_2 = r0 = s.left___106563;
+    s.tmp_4 = Math_min__P81399_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___130984 * s.tmp_6);
+    r0 = (s.x___106591 * s.tmp_6);
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 458; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 467; 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___130959;
-    s.tmp_9 = Math_min__P106735_mk(s);
+    s.tmp_7 = r0 = s.top___106566;
+    s.tmp_9 = Math_min__P81399_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___130989 * s.tmp_11);
+    r0 = (s.y___106596 * s.tmp_11);
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 460; s.pc = 9; return s.tmp_9;
+    s.callLocIdx = 469; 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 = 461; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 470; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = (s.y___130989 + 1);
-    s.y___130989 = (r0);
+    r0 = (s.y___106596 + 1);
+    s.y___106596 = (r0);
     { step = 2; continue; }
   case 3:
-    r0 = (s.x___130984 + 1);
-    s.x___130984 = (r0);
+    r0 = (s.x___106591 + 1);
+    s.x___106591 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_insertAABB__P108598.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"]}
+sprites_SpriteMap_insertAABB__P83382.info = {"start":3184,"length":521,"line":91,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"insertAABB","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_insertAABB__P108598_mk(s) {
+function sprites_SpriteMap_insertAABB__P83382_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_insertAABB__P108598, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_insertAABB__P83382, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50280,12 +50192,12 @@ function sprites_SpriteMap_insertAABB__P108598_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  left___130956: undefined,
-  top___130959: undefined,
-  xn___130962: undefined,
-  yn___130973: undefined,
-  x___130984: undefined,
-  y___130989: undefined,
+  left___106563: undefined,
+  top___106566: undefined,
+  xn___106569: undefined,
+  yn___106580: undefined,
+  x___106591: undefined,
+  y___106596: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -50294,7 +50206,7 @@ function sprites_SpriteMap_insertAABB__P108598_mk(s) {
 
 
 
-function sprites_SpriteMap_insertAtKey__P110722(s) {
+function sprites_SpriteMap_insertAtKey__P85548(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50304,8 +50216,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.k___131024 = undefined;
-    s.bucket___131029 = undefined;
+    s.k___106631 = undefined;
+    s.bucket___106636 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -50314,20 +50226,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C108591_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_key__P110721_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_key__P85547_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
-    s.callLocIdx = 452; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 461; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.k___131024 = (r0);
+    s.k___106631 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___131024);
-    s.bucket___131029 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.bucket___131029);
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___106631);
+    s.bucket___106636 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.bucket___106636);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -50335,40 +50247,40 @@ switch (step) {
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["buckets"];
     s.tmp_2 = r0;
-    s.tmp_3 = r0 = s.k___131024;
+    s.tmp_3 = r0 = s.k___106631;
     r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_2, s.tmp_3, s.tmp_4);
-    s.bucket___131029 = (s.tmp_4);
+    s.bucket___106636 = (s.tmp_4);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(s.bucket___131029, s.arg3, undefined);
+    r0 = pxsim_Array_.indexOf(s.bucket___106636, 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___131029, s.arg3);
+    r0 = pxsim_Array__push(s.bucket___106636, s.arg3);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_insertAtKey__P110722.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"]}
+sprites_SpriteMap_insertAtKey__P85548.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"]}
 
-function sprites_SpriteMap_insertAtKey__P110722_mk(s) {
+function sprites_SpriteMap_insertAtKey__P85548_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_insertAtKey__P110722, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_insertAtKey__P85548, 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___131024: undefined,
-  bucket___131029: undefined,
+  k___106631: undefined,
+  bucket___106636: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -50379,7 +50291,7 @@ function sprites_SpriteMap_insertAtKey__P110722_mk(s) {
 
 
 
-function sprites_SpriteMap_clear__P108597(s) {
+function sprites_SpriteMap_clear__P83381(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50394,7 +50306,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C108591_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -50403,12 +50315,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_clear__P108597.info = {"start":2532,"length":50,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"clear","argumentNames":["this"]}
+sprites_SpriteMap_clear__P83381.info = {"start":2532,"length":50,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"clear","argumentNames":["this"]}
 
-function sprites_SpriteMap_clear__P108597_mk(s) {
+function sprites_SpriteMap_clear__P83381_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_clear__P108597, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_clear__P83381, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50419,7 +50331,7 @@ function sprites_SpriteMap_clear__P108597_mk(s) {
 
 
 
-function sprites_SpriteMap_resizeBuckets__P108596(s) {
+function sprites_SpriteMap_resizeBuckets__P83380(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50429,121 +50341,121 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.maxWidth___131061 = undefined;
-    s.maxHeight___131062 = undefined;
-    s.sprite___131064 = undefined;
-    s.unnamed16746___U3 = undefined;
-    s.unnamed16747___U4 = undefined;
-    s.tMap___131080 = undefined;
-    s.areaWidth___131084 = undefined;
-    s.areaHeight___131091 = undefined;
+    s.maxWidth___106674 = undefined;
+    s.maxHeight___106675 = undefined;
+    s.sprite___106677 = undefined;
+    s.unnamed1798___U3 = undefined;
+    s.unnamed1799___U4 = undefined;
+    s.tMap___106693 = undefined;
+    s.areaWidth___106697 = undefined;
+    s.areaHeight___106704 = 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__C108591_VT)) failedCast(r0);
-    s.maxWidth___131061 = (0);
-    s.maxHeight___131062 = (0);
-    s.sprite___131064 = (undefined);
-    s.unnamed16746___U3 = (s.arg1);
-    s.unnamed16747___U4 = (0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
+    s.maxWidth___106674 = (0);
+    s.maxHeight___106675 = (0);
+    s.sprite___106677 = (undefined);
+    s.unnamed1798___U3 = (s.arg1);
+    s.unnamed1799___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16747___U4;
-    r0 = pxsim_Array__length(s.unnamed16746___U3);
+    s.tmp_0 = r0 = s.unnamed1799___U4;
+    r0 = pxsim_Array__length(s.unnamed1798___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16746___U3, s.unnamed16747___U4);
-    s.sprite___131064 = (r0);
-    r0 = s.sprite___131064.fields["_image"];
+    r0 = pxsim_Array__getAt(s.unnamed1798___U3, s.unnamed1799___U4);
+    s.sprite___106677 = (r0);
+    r0 = s.sprite___106677.fields["_image"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 > s.maxWidth___131061);
+    r0 = (s.tmp_3 > s.maxWidth___106674);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 2; continue; }
-    r0 = s.sprite___131064.fields["_image"];
+    r0 = s.sprite___106677.fields["_image"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
-    s.maxWidth___131061 = (r0);
+    s.maxWidth___106674 = (r0);
   case 2:
   case 3:
-    r0 = s.sprite___131064.fields["_image"];
+    r0 = s.sprite___106677.fields["_image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.maxHeight___131062);
+    r0 = (s.tmp_1 > s.maxHeight___106675);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = s.sprite___131064.fields["_image"];
+    r0 = s.sprite___106677.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
-    s.maxHeight___131062 = (r0);
+    s.maxHeight___106675 = (r0);
   case 4:
   case 5:
-    r0 = (s.unnamed16747___U4 + 1);
-    s.unnamed16747___U4 = (r0);
+    r0 = (s.unnamed1799___U4 + 1);
+    s.unnamed1799___U4 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed16746___U3 = (undefined);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 445; s.pc = 11; return s.tmp_0;
+    s.unnamed1798___U3 = (undefined);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 454; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tMap___131080 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tMap___131080);
+    s.tMap___106693 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tMap___106693);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = tiles_TileMap_areaWidth__P108820_mk(s);
-    s.tmp_0.arg0 = s.tMap___131080;
-    s.callLocIdx = 446; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = tiles_TileMap_areaWidth__P83606_mk(s);
+    s.tmp_0.arg0 = s.tMap___106693;
+    s.callLocIdx = 455; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 8; continue; }
   case 7:
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.areaWidth___131084 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.tMap___131080);
+    s.areaWidth___106697 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.tMap___106693);
     if (!r0) { step = 9; continue; }
-    s.tmp_0 = tiles_TileMap_areaHeight__P108821_mk(s);
-    s.tmp_0.arg0 = s.tMap___131080;
-    s.callLocIdx = 447; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = tiles_TileMap_areaHeight__P83607_mk(s);
+    s.tmp_0.arg0 = s.tMap___106693;
+    s.callLocIdx = 456; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     { step = 10; continue; }
   case 9:
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.areaHeight___131091 = (s.tmp_1);
+    s.areaHeight___106704 = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_clamp__P106731_mk(s);
+    s.tmp_2 = Math_clamp__P81395_mk(s);
     s.tmp_2.arg0 = 8;
-    r0 = (s.areaWidth___131084 >> 2);
+    r0 = (s.areaWidth___106697 >> 2);
     s.tmp_2.arg1 = r0;
-    r0 = (s.maxWidth___131061 * 2);
+    r0 = (s.maxWidth___106674 * 2);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 448; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 457; 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__P106731_mk(s);
+    s.tmp_2 = Math_clamp__P81395_mk(s);
     s.tmp_2.arg0 = 8;
-    r0 = (s.areaHeight___131091 >> 2);
+    r0 = (s.areaHeight___106704 >> 2);
     s.tmp_2.arg1 = r0;
-    r0 = (s.maxHeight___131062 * 2);
+    r0 = (s.maxHeight___106675 * 2);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 449; s.pc = 15; return s.tmp_2;
+    s.callLocIdx = 458; s.pc = 15; return s.tmp_2;
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -50551,25 +50463,25 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.idiv(s.areaHeight___131091, s.tmp_2);
+    r0 = pxsim.Math_.idiv(s.areaHeight___106704, 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___131084, s.tmp_2);
+    r0 = pxsim.Math_.idiv(s.areaWidth___106697, 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__P108596.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"]}
+sprites_SpriteMap_resizeBuckets__P83380.info = {"start":1696,"length":826,"line":52,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"resizeBuckets","argumentNames":["this","sprites"]}
 
-function sprites_SpriteMap_resizeBuckets__P108596_mk(s) {
+function sprites_SpriteMap_resizeBuckets__P83380_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_resizeBuckets__P108596, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_resizeBuckets__P83380, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50577,14 +50489,14 @@ function sprites_SpriteMap_resizeBuckets__P108596_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  maxWidth___131061: undefined,
-  maxHeight___131062: undefined,
-  sprite___131064: undefined,
-  unnamed16746___U3: undefined,
-  unnamed16747___U4: undefined,
-  tMap___131080: undefined,
-  areaWidth___131084: undefined,
-  areaHeight___131091: undefined,
+  maxWidth___106674: undefined,
+  maxHeight___106675: undefined,
+  sprite___106677: undefined,
+  unnamed1798___U3: undefined,
+  unnamed1799___U4: undefined,
+  tMap___106693: undefined,
+  areaWidth___106697: undefined,
+  areaHeight___106704: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -50593,7 +50505,7 @@ function sprites_SpriteMap_resizeBuckets__P108596_mk(s) {
 
 
 
-function Sprite_clearObstacles__P108581(s) {
+function Sprite_clearObstacles__P83365(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50608,7 +50520,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -50617,12 +50529,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_clearObstacles__P108581.info = {"start":26872,"length":54,"line":813,"column":4,"endLine":815,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"clearObstacles","argumentNames":["this"]}
+Sprite_clearObstacles__P83365.info = {"start":27888,"length":54,"line":841,"column":4,"endLine":843,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"clearObstacles","argumentNames":["this"]}
 
-function Sprite_clearObstacles__P108581_mk(s) {
+function Sprite_clearObstacles__P83365_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_clearObstacles__P108581, depth: s.depth + 1,
+        parent: s, fn: Sprite_clearObstacles__P83365, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50633,7 +50545,7 @@ function Sprite_clearObstacles__P108581_mk(s) {
 
 
 
-function Fx_idiv__P106767(s) {
+function Fx_idiv__P81431(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50652,12 +50564,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_idiv__P106767.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__P81431.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__P106767_mk(s) {
+function Fx_idiv__P81431_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_idiv__P106767, depth: s.depth + 1,
+        parent: s, fn: Fx_idiv__P81431, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -50667,7 +50579,7 @@ function Fx_idiv__P106767_mk(s) {
 
 
 
-function Fx_div__P106766(s) {
+function Fx_div__P81430(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50688,12 +50600,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_div__P106766.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__P81430.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__P106766_mk(s) {
+function Fx_div__P81430_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_div__P106766, depth: s.depth + 1,
+        parent: s, fn: Fx_div__P81430, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -50704,7 +50616,7 @@ function Fx_div__P106766_mk(s) {
 
 
 
-function ArcadePhysicsEngine_draw__P108681(s) {
+function ArcadePhysicsEngine_draw__P83467(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50719,23 +50631,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_draw__P108595_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_draw__P83379_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 488; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 496; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_draw__P108681.info = {"start":2506,"length":39,"line":105,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/game---hw/physics.ts","functionName":"draw","argumentNames":["this"]}
+ArcadePhysicsEngine_draw__P83467.info = {"start":2777,"length":39,"line":108,"column":4,"endLine":110,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"draw","argumentNames":["this"]}
 
-function ArcadePhysicsEngine_draw__P108681_mk(s) {
+function ArcadePhysicsEngine_draw__P83467_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_draw__P108681, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_draw__P83467, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -50745,7 +50657,7 @@ function ArcadePhysicsEngine_draw__P108681_mk(s) {
 
 
 
-function sprites_SpriteMap_draw__P108595(s) {
+function sprites_SpriteMap_draw__P83379(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50755,108 +50667,108 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x___134856 = undefined;
-    s.y___134862 = undefined;
-    s.left___134868 = undefined;
-    s.top___134873 = undefined;
-    s.k___134878 = undefined;
-    s.b___134883 = undefined;
+    s.x___106979 = undefined;
+    s.y___106985 = undefined;
+    s.left___106991 = undefined;
+    s.top___106996 = undefined;
+    s.k___107001 = undefined;
+    s.b___107006 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C108591_VT)) failedCast(r0);
-    s.x___134856 = (0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C83375_VT)) failedCast(r0);
+    s.x___106979 = (0);
   case 1:
     r0 = s.arg0.fields["columnCount"];
     s.tmp_1 = r0;
-    r0 = (s.x___134856 < s.tmp_1);
+    r0 = (s.x___106979 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.y___134862 = (0);
+    s.y___106985 = (0);
   case 2:
     r0 = s.arg0.fields["rowCount"];
     s.tmp_1 = r0;
-    r0 = (s.y___134862 < s.tmp_1);
+    r0 = (s.y___106985 < 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___134856 * s.tmp_2);
-    s.left___134868 = (r0);
+    r0 = (s.x___106979 * s.tmp_2);
+    s.left___106991 = (r0);
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_0 = r0;
-    r0 = (s.y___134862 * s.tmp_0);
-    s.top___134873 = (r0);
-    s.tmp_0 = sprites_SpriteMap_key__P110721_mk(s);
+    r0 = (s.y___106985 * s.tmp_0);
+    s.top___106996 = (r0);
+    s.tmp_0 = sprites_SpriteMap_key__P85547_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.left___134868;
-    s.tmp_0.arg2 = s.top___134873;
-    s.callLocIdx = 439; s.pc = 9; return s.tmp_0;
+    s.tmp_0.arg1 = s.left___106991;
+    s.tmp_0.arg2 = s.top___106996;
+    s.callLocIdx = 448; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.k___134878 = (r0);
+    s.k___107001 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___134878);
-    s.b___134883 = (r0);
-    s.tmp_0 = r0 = s.b___134883;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___107001);
+    s.b___107006 = (r0);
+    s.tmp_0 = r0 = s.b___107006;
     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___134883);
+    r0 = pxsim_Array__length(s.b___107006);
   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__P108227_mk(s);
-    s.tmp_2.arg0 = globals.screen___108298;
-    s.tmp_2.arg1 = s.left___134868;
-    s.tmp_2.arg2 = s.top___134873;
+    s.tmp_2 = helpers_imageDrawRect__P83004_mk(s);
+    s.tmp_2.arg0 = globals.screen___83075;
+    s.tmp_2.arg1 = s.left___106991;
+    s.tmp_2.arg2 = s.top___106996;
     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 = 440; s.pc = 10; return s.tmp_2;
+    s.callLocIdx = 449; s.pc = 10; return s.tmp_2;
   case 10:
     r0 = s.retval;
   case 5:
   case 6:
-    r0 = (s.y___134862 + 1);
-    s.y___134862 = (r0);
+    r0 = (s.y___106985 + 1);
+    s.y___106985 = (r0);
     { step = 2; continue; }
   case 7:
-    r0 = (s.x___134856 + 1);
-    s.x___134856 = (r0);
+    r0 = (s.x___106979 + 1);
+    s.x___106979 = (r0);
     { step = 1; continue; }
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_draw__P108595.info = {"start":1122,"length":496,"line":36,"column":8,"endLine":47,"endColumn":9,"fileName":"pxt_modules/game---hw/spritemap.ts","functionName":"draw","argumentNames":["this"]}
+sprites_SpriteMap_draw__P83379.info = {"start":1122,"length":496,"line":36,"column":8,"endLine":47,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"draw","argumentNames":["this"]}
 
-function sprites_SpriteMap_draw__P108595_mk(s) {
+function sprites_SpriteMap_draw__P83379_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_draw__P108595, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_draw__P83379, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  x___134856: undefined,
-  y___134862: undefined,
-  left___134868: undefined,
-  top___134873: undefined,
-  k___134878: undefined,
-  b___134883: undefined,
+  x___106979: undefined,
+  y___106985: undefined,
+  left___106991: undefined,
+  top___106996: undefined,
+  k___107001: undefined,
+  b___107006: undefined,
   arg0: undefined,
 } }
 
@@ -50864,7 +50776,7 @@ function sprites_SpriteMap_draw__P108595_mk(s) {
 
 
 
-function ArcadePhysicsEngine_removeSprite__P108680(s) {
+function ArcadePhysicsEngine_removeSprite__P83466(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50880,7 +50792,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_VT)) failedCast(r0);
     r0 = s.arg0.fields["sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg1);
@@ -50888,12 +50800,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_removeSprite__P108680.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"]}
+ArcadePhysicsEngine_removeSprite__P83466.info = {"start":2691,"length":80,"line":104,"column":4,"endLine":106,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
 
-function ArcadePhysicsEngine_removeSprite__P108680_mk(s) {
+function ArcadePhysicsEngine_removeSprite__P83466_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_removeSprite__P108680, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_removeSprite__P83466, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -50904,7 +50816,7 @@ function ArcadePhysicsEngine_removeSprite__P108680_mk(s) {
 
 
 
-function ArcadePhysicsEngine_addSprite__P108679(s) {
+function ArcadePhysicsEngine_addSprite__P83465(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50914,33 +50826,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___134920 = undefined;
+    s.tm___107043 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C108670_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C83456_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__P109029_mk(s);
-    s.callLocIdx = 486; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 494; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___134920 = (r0);
-    s.tmp_0 = r0 = s.tm___134920;
+    s.tm___107043 = (r0);
+    s.tmp_0 = r0 = s.tm___107043;
     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__P108835_mk(s);
-    s.tmp_1.arg0 = s.tm___134920;
+    s.tmp_1 = tiles_TileMap_isOnWall__P83621_mk(s);
+    s.tmp_1.arg0 = s.tm___107043;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 487; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 495; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
   case 2:
@@ -50960,12 +50872,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_addSprite__P108679.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"]}
+ArcadePhysicsEngine_addSprite__P83465.info = {"start":2465,"length":220,"line":96,"column":4,"endLine":102,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function ArcadePhysicsEngine_addSprite__P108679_mk(s) {
+function ArcadePhysicsEngine_addSprite__P83465_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_addSprite__P108679, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_addSprite__P83465, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50973,7 +50885,7 @@ function ArcadePhysicsEngine_addSprite__P108679_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  tm___134920: undefined,
+  tm___107043: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -50982,7 +50894,7 @@ function ArcadePhysicsEngine_addSprite__P108679_mk(s) {
 
 
 
-function tiles_TileMapData_constructor__P108802(s) {
+function tiles_TileMapData_constructor__P83588(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51001,14 +50913,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_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__P108806_mk(s);
+    s.tmp_0 = tiles_TileMapData_scale__P83592_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg4;
-    s.callLocIdx = 724; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 728; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -51023,12 +50935,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_constructor__P108802.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"]}
+tiles_TileMapData_constructor__P83588.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"]}
 
-function tiles_TileMapData_constructor__P108802_mk(s) {
+function tiles_TileMapData_constructor__P83588_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_constructor__P108802, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_constructor__P83588, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51043,7 +50955,7 @@ function tiles_TileMapData_constructor__P108802_mk(s) {
 
 
 
-function tiles_TileMapData_scale__P108806(s) {
+function tiles_TileMapData_scale__P83592(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51059,7 +50971,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C108801_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C83587_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_scale"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
@@ -51069,12 +50981,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_scale__P108806.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"]}
+tiles_TileMapData_scale__P83592.info = {"start":3885,"length":102,"line":147,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
 
-function tiles_TileMapData_scale__P108806_mk(s) {
+function tiles_TileMapData_scale__P83592_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_scale__P108806, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_scale__P83592, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51086,7 +50998,7 @@ function tiles_TileMapData_scale__P108806_mk(s) {
 
 
 
-function tiles_TileMap_constructor__P108815(s) {
+function tiles_TileMap_constructor__P83601(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51102,34 +51014,34 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_layer"] = (1);
-    s.tmp_0 = tiles_TileMap_scale__P108817_mk(s);
+    s.tmp_0 = tiles_TileMap_scale__P83603_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 730; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 734; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P131415);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P107105);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = scene_createRenderable__P108880_mk(s);
+    s.tmp_1 = scene_createRenderable__P83659_mk(s);
     s.tmp_1.arg0 = -1;
     s.tmp_1.arg1 = s.tmp_0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 732; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 736; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_constructor__P108815.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"]}
+tiles_TileMap_constructor__P83601.info = {"start":5865,"length":250,"line":210,"column":8,"endLine":218,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","scale"]}
 
-function tiles_TileMap_constructor__P108815_mk(s) {
+function tiles_TileMap_constructor__P83601_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_constructor__P108815, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_constructor__P83601, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51141,7 +51053,7 @@ function tiles_TileMap_constructor__P108815_mk(s) {
 
 
 
-function inline__P131415(s) {
+function inline__P107105(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51156,23 +51068,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = tiles_TileMap_draw__P110817_mk(s);
+    s.tmp_0 = tiles_TileMap_draw__P85657_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
-    s.callLocIdx = 731; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 735; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P131415.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"]}
+inline__P107105.info = {"start":6065,"length":25,"line":216,"column":16,"endLine":216,"endColumn":41,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["t","c"]}
 
-function inline__P131415_mk(s) {
+function inline__P107105_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P131415, depth: s.depth + 1,
+        parent: s, fn: inline__P107105, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -51183,7 +51095,7 @@ function inline__P131415_mk(s) {
 
 
 
-function tiles_TileMap_draw__P110817(s) {
+function tiles_TileMap_draw__P85657(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51193,21 +51105,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bitmask___131426 = undefined;
-    s.offsetX___131432 = undefined;
-    s.offsetY___131437 = undefined;
-    s.x0___131442 = undefined;
-    s.xn___131449 = undefined;
-    s.y0___131466 = undefined;
-    s.yn___131473 = undefined;
-    s.x___131490 = undefined;
-    s.y___131496 = undefined;
-    s.index___131502 = undefined;
-    s.tile___131509 = undefined;
-    s.x___131545 = undefined;
-    s.xLine___131551 = undefined;
-    s.y___131577 = undefined;
-    s.yLine___131583 = undefined;
+    s.bitmask___107116 = undefined;
+    s.offsetX___107122 = undefined;
+    s.offsetY___107127 = undefined;
+    s.x0___107132 = undefined;
+    s.xn___107139 = undefined;
+    s.y0___107156 = undefined;
+    s.yn___107163 = undefined;
+    s.x___107180 = undefined;
+    s.y___107186 = undefined;
+    s.index___107192 = undefined;
+    s.tile___107199 = undefined;
+    s.x___107235 = undefined;
+    s.xLine___107241 = undefined;
+    s.y___107267 = undefined;
+    s.yLine___107273 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -51215,7 +51127,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
@@ -51240,16 +51152,16 @@ switch (step) {
     r0 = (1 << s.tmp_8);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 - 1);
-    s.bitmask___131426 = (r0);
+    s.bitmask___107116 = (r0);
     r0 = s.arg2.fields["drawOffsetX"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 & s.bitmask___131426);
-    s.offsetX___131432 = (r0);
+    r0 = (s.tmp_0 & s.bitmask___107116);
+    s.offsetX___107122 = (r0);
     r0 = s.arg2.fields["drawOffsetY"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 & s.bitmask___131426);
-    s.offsetY___131437 = (r0);
-    s.tmp_0 = Math_max__P106734_mk(s);
+    r0 = (s.tmp_0 & s.bitmask___107116);
+    s.offsetY___107127 = (r0);
+    s.tmp_0 = Math_max__P81398_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg2.fields["drawOffsetX"];
     s.tmp_1 = r0;
@@ -51257,11 +51169,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 >> s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 750; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 754; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.x0___131442 = (r0);
-    s.tmp_0 = Math_min__P106735_mk(s);
+    s.x0___107132 = (r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_width"];
@@ -51278,11 +51190,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 753; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 757; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.xn___131449 = (r0);
-    s.tmp_0 = Math_max__P106734_mk(s);
+    s.xn___107139 = (r0);
+    s.tmp_0 = Math_max__P81398_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg2.fields["drawOffsetY"];
     s.tmp_1 = r0;
@@ -51290,11 +51202,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 >> s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 755; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 759; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
-    s.y0___131466 = (r0);
-    s.tmp_0 = Math_min__P106735_mk(s);
+    s.y0___107156 = (r0);
+    s.tmp_0 = Math_min__P81399_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_height"];
@@ -51311,95 +51223,95 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 758; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 762; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.yn___131473 = (r0);
-    s.x___131490 = (s.x0___131442);
+    s.yn___107163 = (r0);
+    s.x___107180 = (s.x0___107132);
   case 3:
-    r0 = (s.x___131490 <= s.xn___131449);
+    r0 = (s.x___107180 <= s.xn___107139);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.y___131496 = (s.y0___131466);
+    s.y___107186 = (s.y0___107156);
   case 4:
-    r0 = (s.y___131496 <= s.yn___131473);
+    r0 = (s.y___107186 <= s.yn___107163);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = tiles_TileMapData_getTile__P108807_mk(s);
+    s.tmp_1 = tiles_TileMapData_getTile__P83593_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.x___131490;
-    s.tmp_1.arg2 = s.y___131496;
-    s.callLocIdx = 759; s.pc = 28; return s.tmp_1;
+    s.tmp_1.arg1 = s.x___107180;
+    s.tmp_1.arg2 = s.y___107186;
+    s.callLocIdx = 763; s.pc = 28; return s.tmp_1;
   case 28:
     r0 = s.retval;
-    s.index___131502 = (r0);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P108810_mk(s);
+    s.index___107192 = (r0);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P83596_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___131502;
-    s.callLocIdx = 760; s.pc = 29; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___107192;
+    s.callLocIdx = 764; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
-    s.tile___131509 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tile___131509);
+    s.tile___107199 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tile___107199);
     if (!r0) { step = 5; continue; }
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_1 = r0 = s.tile___131509;
-    r0 = (s.x___131490 - s.x0___131442);
+    s.tmp_1 = r0 = s.tile___107199;
+    r0 = (s.x___107180 - s.x0___107132);
     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___131432);
+    r0 = (s.tmp_3 - s.offsetX___107122);
     s.tmp_2 = r0;
-    r0 = (s.y___131496 - s.y0___131466);
+    r0 = (s.y___107186 - s.y0___107156);
     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___131437);
+    r0 = (s.tmp_7 - s.offsetY___107127);
     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___131496 + 1);
-    s.y___131496 = (r0);
+    r0 = (s.y___107186 + 1);
+    s.y___107186 = (r0);
     { step = 4; continue; }
   case 7:
-    r0 = (s.x___131490 + 1);
-    s.x___131490 = (r0);
+    r0 = (s.x___107180 + 1);
+    s.x___107180 = (r0);
     { step = 3; continue; }
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___109025);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___83804);
     if (!r0) { step = 21; continue; }
-    s.x___131545 = (s.x0___131442);
+    s.x___107235 = (s.x0___107132);
   case 9:
-    r0 = (s.x___131545 <= s.xn___131449);
+    r0 = (s.x___107235 <= s.xn___107139);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.x___131545 - s.x0___131442);
+    r0 = (s.x___107235 - s.x0___107132);
     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___131432);
-    s.xLine___131551 = (r0);
-    r0 = (s.xLine___131551 >= 0);
+    r0 = (s.tmp_1 - s.offsetX___107122);
+    s.xLine___107241 = (r0);
+    r0 = (s.xLine___107241 >= 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___131551;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    s.tmp_1 = r0 = s.xLine___107241;
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
   case 11:
@@ -51407,46 +51319,46 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 12; continue; }
-    s.tmp_4 = helpers_imageDrawLine__P108226_mk(s);
+    s.tmp_4 = helpers_imageDrawLine__P83003_mk(s);
     s.tmp_4.arg0 = s.arg1;
-    s.tmp_4.arg1 = s.xLine___131551;
+    s.tmp_4.arg1 = s.xLine___107241;
     s.tmp_4.arg2 = 0;
-    s.tmp_4.arg3 = s.xLine___131551;
+    s.tmp_4.arg3 = s.xLine___107241;
     r0 = pxsim_ImageMethods.height(s.arg1);
     s.tmp_4.arg4 = r0;
     s.tmp_4.arg5 = 1;
-    s.callLocIdx = 764; s.pc = 30; return s.tmp_4;
+    s.callLocIdx = 768; s.pc = 30; return s.tmp_4;
   case 30:
     r0 = s.retval;
   case 12:
   case 13:
-    r0 = (s.x___131545 + 1);
-    s.x___131545 = (r0);
+    r0 = (s.x___107235 + 1);
+    s.x___107235 = (r0);
     { step = 9; continue; }
   case 14:
-    s.y___131577 = (s.y0___131466);
+    s.y___107267 = (s.y0___107156);
   case 15:
-    r0 = (s.y___131577 <= s.yn___131473);
+    r0 = (s.y___107267 <= s.yn___107163);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = (s.y___131577 - s.y0___131466);
+    r0 = (s.y___107267 - s.y0___107156);
     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___131437);
-    s.yLine___131583 = (r0);
-    r0 = (s.yLine___131583 >= 0);
+    r0 = (s.tmp_1 - s.offsetY___107127);
+    s.yLine___107273 = (r0);
+    r0 = (s.yLine___107273 >= 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___131583;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    s.tmp_1 = r0 = s.yLine___107273;
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
   case 17:
@@ -51454,21 +51366,21 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 18; continue; }
-    s.tmp_4 = helpers_imageDrawLine__P108226_mk(s);
+    s.tmp_4 = helpers_imageDrawLine__P83003_mk(s);
     s.tmp_4.arg0 = s.arg1;
     s.tmp_4.arg1 = 0;
-    s.tmp_4.arg2 = s.yLine___131583;
+    s.tmp_4.arg2 = s.yLine___107273;
     r0 = pxsim_ImageMethods.width(s.arg1);
     s.tmp_4.arg3 = r0;
-    s.tmp_4.arg4 = s.yLine___131583;
+    s.tmp_4.arg4 = s.yLine___107273;
     s.tmp_4.arg5 = 1;
-    s.callLocIdx = 766; s.pc = 31; return s.tmp_4;
+    s.callLocIdx = 770; s.pc = 31; return s.tmp_4;
   case 31:
     r0 = s.retval;
   case 18:
   case 19:
-    r0 = (s.y___131577 + 1);
-    s.y___131577 = (r0);
+    r0 = (s.y___107267 + 1);
+    s.y___107267 = (r0);
     { step = 15; continue; }
   case 20:
   case 21:
@@ -51478,12 +51390,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_draw__P110817.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"]}
+tiles_TileMap_draw__P85657.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"]}
 
-function tiles_TileMap_draw__P110817_mk(s) {
+function tiles_TileMap_draw__P85657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_draw__P110817, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_draw__P85657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51495,21 +51407,21 @@ function tiles_TileMap_draw__P110817_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  bitmask___131426: undefined,
-  offsetX___131432: undefined,
-  offsetY___131437: undefined,
-  x0___131442: undefined,
-  xn___131449: undefined,
-  y0___131466: undefined,
-  yn___131473: undefined,
-  x___131490: undefined,
-  y___131496: undefined,
-  index___131502: undefined,
-  tile___131509: undefined,
-  x___131545: undefined,
-  xLine___131551: undefined,
-  y___131577: undefined,
-  yLine___131583: undefined,
+  bitmask___107116: undefined,
+  offsetX___107122: undefined,
+  offsetY___107127: undefined,
+  x0___107132: undefined,
+  xn___107139: undefined,
+  y0___107156: undefined,
+  yn___107163: undefined,
+  x___107180: undefined,
+  y___107186: undefined,
+  index___107192: undefined,
+  tile___107199: undefined,
+  x___107235: undefined,
+  xLine___107241: undefined,
+  y___107267: undefined,
+  yLine___107273: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -51519,7 +51431,7 @@ function tiles_TileMap_draw__P110817_mk(s) {
 
 
 
-function tiles_TileMap_scale__P108817(s) {
+function tiles_TileMap_scale__P83603(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51535,17 +51447,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_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__P108806_mk(s);
+    s.tmp_1 = tiles_TileMapData_scale__P83592_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 733; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 737; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
   case 1:
@@ -51554,12 +51466,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_scale__P108817.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"]}
+tiles_TileMap_scale__P83603.info = {"start":6190,"length":144,"line":224,"column":8,"endLine":229,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
 
-function tiles_TileMap_scale__P108817_mk(s) {
+function tiles_TileMap_scale__P83603_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_scale__P108817, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_scale__P83603, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51571,7 +51483,7 @@ function tiles_TileMap_scale__P108817_mk(s) {
 
 
 
-function tiles_TileMap_data__P110815(s) {
+function tiles_TileMap_data__P85655(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51586,18 +51498,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C108814_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C83600_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_data__P110815.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__P110815.isGetter = true;
+tiles_TileMap_data__P85655.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__P85655.isGetter = true;
 
-function tiles_TileMap_data__P110815_mk(s) {
+function tiles_TileMap_data__P85655_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_data__P110815, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_data__P85655, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -51606,7 +51518,7 @@ function tiles_TileMap_data__P110815_mk(s) {
 
 
 
-function Sprite_toString__P108587(s) {
+function Sprite_toString__P83371(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51621,7 +51533,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_9 = r0;
     r0 = s.arg0.fields["id"];
@@ -51639,9 +51551,9 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_String__concat(s.tmp_8, "(");
     s.tmp_7 = r0;
-    s.tmp_14 = Sprite_x__P108522_mk(s);
+    s.tmp_14 = Sprite_x__P83304_mk(s);
     s.tmp_14.arg0 = s.arg0;
-    s.callLocIdx = 420; s.pc = 2; return s.tmp_14;
+    s.callLocIdx = 429; s.pc = 2; return s.tmp_14;
   case 2:
     r0 = s.retval;
     s.tmp_13 = r0;
@@ -51658,9 +51570,9 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_6, ",");
     s.tmp_5 = r0;
-    s.tmp_17 = Sprite_y__P108524_mk(s);
+    s.tmp_17 = Sprite_y__P83306_mk(s);
     s.tmp_17.arg0 = s.arg0;
-    s.callLocIdx = 421; s.pc = 4; return s.tmp_17;
+    s.callLocIdx = 430; s.pc = 4; return s.tmp_17;
   case 4:
     r0 = s.retval;
     s.tmp_16 = r0;
@@ -51677,9 +51589,9 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_4, ")->(");
     s.tmp_3 = r0;
-    s.tmp_20 = Sprite_vx__P108526_mk(s);
+    s.tmp_20 = Sprite_vx__P83308_mk(s);
     s.tmp_20.arg0 = s.arg0;
-    s.callLocIdx = 422; s.pc = 6; return s.tmp_20;
+    s.callLocIdx = 431; s.pc = 6; return s.tmp_20;
   case 6:
     r0 = s.retval;
     s.tmp_19 = r0;
@@ -51696,9 +51608,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_23 = Sprite_vy__P108528_mk(s);
+    s.tmp_23 = Sprite_vy__P83310_mk(s);
     s.tmp_23.arg0 = s.arg0;
-    s.callLocIdx = 423; s.pc = 8; return s.tmp_23;
+    s.callLocIdx = 432; s.pc = 8; return s.tmp_23;
   case 8:
     r0 = s.retval;
     s.tmp_22 = r0;
@@ -51717,12 +51629,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_toString__P108587.info = {"start":33194,"length":93,"line":980,"column":4,"endLine":982,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"toString","argumentNames":["this"]}
+Sprite_toString__P83371.info = {"start":34385,"length":93,"line":1012,"column":4,"endLine":1014,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"toString","argumentNames":["this"]}
 
-function Sprite_toString__P108587_mk(s) {
+function Sprite_toString__P83371_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_toString__P108587, depth: s.depth + 1,
+        parent: s, fn: Sprite_toString__P83371, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51755,7 +51667,7 @@ function Sprite_toString__P108587_mk(s) {
 
 
 
-function Sprite___update__P108575(s) {
+function Sprite___update__P83357(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51765,8 +51677,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bounce___131933 = undefined;
-    s.tm___131938 = undefined;
+    s.bounce___107583 = undefined;
+    s.tm___107588 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -51774,7 +51686,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
@@ -51796,9 +51708,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__P108585_mk(s);
+    s.tmp_0 = Sprite__destroyCore__P83369_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 356; s.pc = 33; return s.tmp_0;
+    s.callLocIdx = 365; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
   case 1:
@@ -51814,10 +51726,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_2 = Sprite_isOutOfScreen__P108573_mk(s);
+    s.tmp_2 = Sprite_isOutOfScreen__P83355_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 357; s.pc = 34; return s.tmp_2;
+    s.callLocIdx = 366; s.pc = 34; return s.tmp_2;
   case 34:
     r0 = s.retval;
   case 6:
@@ -51825,11 +51737,11 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = Sprite_destroy__P108584_mk(s);
+    s.tmp_4 = Sprite_destroy__P83368_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = undefined;
     s.tmp_4.arg2 = undefined;
-    s.callLocIdx = 358; s.pc = 35; return s.tmp_4;
+    s.callLocIdx = 367; s.pc = 35; return s.tmp_4;
   case 35:
     r0 = s.retval;
   case 7:
@@ -51837,13 +51749,13 @@ switch (step) {
     r0 = s.arg0.fields["flags"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 & 32);
-    s.bounce___131933 = (r0);
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 359; s.pc = 36; return s.tmp_0;
+    s.bounce___107583 = (r0);
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 368; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___131938 = (r0);
+    s.tm___107588 = (r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 8);
@@ -51853,13 +51765,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 9:
-    s.tmp_2 = r0 = s.bounce___131933;
+    s.tmp_2 = r0 = s.bounce___107583;
     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___131938);
+    r0 = pxsim_numops_toBoolDecr(s.tm___107588);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
   case 11:
@@ -51871,9 +51783,9 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 29; continue; }
-    s.tmp_8 = Sprite_left__P108559_mk(s);
+    s.tmp_8 = Sprite_left__P83341_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 360; s.pc = 37; return s.tmp_8;
+    s.callLocIdx = 369; s.pc = 37; return s.tmp_8;
   case 37:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -51883,41 +51795,41 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 15; continue; }
-    s.tmp_10 = Sprite_left__P108560_mk(s);
+    s.tmp_10 = Sprite_left__P83342_mk(s);
     s.tmp_10.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_10.arg1 = r0;
-    s.callLocIdx = 363; s.pc = 38; return s.tmp_10;
+    s.callLocIdx = 372; s.pc = 38; return s.tmp_10;
   case 38:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___131933);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___107583);
     if (!r0) { step = 13; continue; }
-    s.tmp_0 = Sprite_vx__P108527_mk(s);
+    s.tmp_0 = Sprite_vx__P83309_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vx__P108526_mk(s);
+    s.tmp_2 = Sprite_vx__P83308_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 364; s.pc = 40; return s.tmp_2;
+    s.callLocIdx = 373; 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 = 365; s.pc = 39; return s.tmp_0;
+    s.callLocIdx = 374; 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__P108561_mk(s);
+    s.tmp_2 = Sprite_right__P83343_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 366; s.pc = 41; return s.tmp_2;
+    s.callLocIdx = 375; 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___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_3 = r0;
@@ -51925,30 +51837,30 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.tmp_6 = Sprite_right__P108562_mk(s);
+    s.tmp_6 = Sprite_right__P83344_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_7 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6.arg1 = r0;
-    s.callLocIdx = 369; s.pc = 42; return s.tmp_6;
+    s.callLocIdx = 378; s.pc = 42; return s.tmp_6;
   case 42:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___131933);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___107583);
     if (!r0) { step = 16; continue; }
-    s.tmp_0 = Sprite_vx__P108527_mk(s);
+    s.tmp_0 = Sprite_vx__P83309_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vx__P108526_mk(s);
+    s.tmp_2 = Sprite_vx__P83308_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 370; s.pc = 44; return s.tmp_2;
+    s.callLocIdx = 379; 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 = 371; s.pc = 43; return s.tmp_0;
+    s.callLocIdx = 380; s.pc = 43; return s.tmp_0;
   case 43:
     r0 = s.retval;
   case 16:
@@ -51956,9 +51868,9 @@ switch (step) {
   case 18:
   case 19:
   case 20:
-    s.tmp_2 = Sprite_top__P108563_mk(s);
+    s.tmp_2 = Sprite_top__P83345_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 372; s.pc = 45; return s.tmp_2;
+    s.callLocIdx = 381; s.pc = 45; return s.tmp_2;
   case 45:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -51968,41 +51880,41 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 23; continue; }
-    s.tmp_4 = Sprite_top__P108564_mk(s);
+    s.tmp_4 = Sprite_top__P83346_mk(s);
     s.tmp_4.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 375; s.pc = 46; return s.tmp_4;
+    s.callLocIdx = 384; s.pc = 46; return s.tmp_4;
   case 46:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___131933);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___107583);
     if (!r0) { step = 21; continue; }
-    s.tmp_0 = Sprite_vy__P108529_mk(s);
+    s.tmp_0 = Sprite_vy__P83311_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vy__P108528_mk(s);
+    s.tmp_2 = Sprite_vy__P83310_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 376; s.pc = 48; return s.tmp_2;
+    s.callLocIdx = 385; 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 = 377; s.pc = 47; return s.tmp_0;
+    s.callLocIdx = 386; 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__P108565_mk(s);
+    s.tmp_2 = Sprite_bottom__P83347_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 378; s.pc = 49; return s.tmp_2;
+    s.callLocIdx = 387; 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___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_3 = r0;
@@ -52010,30 +51922,30 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    s.tmp_6 = Sprite_bottom__P108566_mk(s);
+    s.tmp_6 = Sprite_bottom__P83348_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_7 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6.arg1 = r0;
-    s.callLocIdx = 381; s.pc = 50; return s.tmp_6;
+    s.callLocIdx = 390; s.pc = 50; return s.tmp_6;
   case 50:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___131933);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___107583);
     if (!r0) { step = 24; continue; }
-    s.tmp_0 = Sprite_vy__P108529_mk(s);
+    s.tmp_0 = Sprite_vy__P83311_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vy__P108528_mk(s);
+    s.tmp_2 = Sprite_vy__P83310_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 382; s.pc = 52; return s.tmp_2;
+    s.callLocIdx = 391; 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 = 383; s.pc = 51; return s.tmp_0;
+    s.callLocIdx = 392; s.pc = 51; return s.tmp_0;
   case 51:
     r0 = s.retval;
   case 24:
@@ -52053,12 +51965,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 = 384; s.pc = 53; return s.tmp_1;
+      s.callLocIdx = 393; 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 = 384; s.pc = 53; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 384; s.pc = 53; return s.tmp_1;; }
-     else { s.callLocIdx = 384; 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 = 393; s.pc = 53; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 393; s.pc = 53; return s.tmp_1;; }
+     else { s.callLocIdx = 393; s.pc = 53; return s.tmp_1; }
     }
   case 53:
     r0 = s.retval;
@@ -52068,12 +51980,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___update__P108575.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"]}
+Sprite___update__P83357.info = {"start":22536,"length":1390,"line":688,"column":4,"endLine":727,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
 
-function Sprite___update__P108575_mk(s) {
+function Sprite___update__P83357_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___update__P108575, depth: s.depth + 1,
+        parent: s, fn: Sprite___update__P83357, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52086,8 +51998,8 @@ function Sprite___update__P108575_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  bounce___131933: undefined,
-  tm___131938: undefined,
+  bounce___107583: undefined,
+  tm___107588: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -52097,7 +52009,7 @@ function Sprite___update__P108575_mk(s) {
 
 
 
-function Sprite_isOutOfScreen__P108573(s) {
+function Sprite_isOutOfScreen__P83355(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52107,15 +52019,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___132027 = undefined;
-    s.oy___132035 = undefined;
+    s.ox___107677 = undefined;
+    s.oy___107685 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -52129,7 +52041,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.ox___132027 = (s.tmp_2);
+    s.ox___107677 = (s.tmp_2);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -52143,14 +52055,14 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___132035 = (s.tmp_2);
-    s.tmp_3 = Sprite_right__P108561_mk(s);
+    s.oy___107685 = (s.tmp_2);
+    s.tmp_3 = Sprite_right__P83343_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 325; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 334; s.pc = 11; return s.tmp_3;
   case 11:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.ox___132027);
+    r0 = (s.tmp_2 - s.ox___107677);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -52159,13 +52071,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_6 = Sprite_bottom__P108565_mk(s);
+    s.tmp_6 = Sprite_bottom__P83347_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 326; s.pc = 12; return s.tmp_6;
+    s.callLocIdx = 335; s.pc = 12; return s.tmp_6;
   case 12:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.oy___132035);
+    r0 = (s.tmp_5 - s.oy___107685);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 < 0);
   case 6:
@@ -52176,15 +52088,15 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 8; continue; }
   case 7:
-    s.tmp_10 = Sprite_left__P108559_mk(s);
+    s.tmp_10 = Sprite_left__P83341_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 327; s.pc = 13; return s.tmp_10;
+    s.callLocIdx = 336; s.pc = 13; return s.tmp_10;
   case 13:
     r0 = s.retval;
     s.tmp_9 = r0;
-    r0 = (s.tmp_9 - s.ox___132027);
+    r0 = (s.tmp_9 - s.ox___107677);
     s.tmp_8 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_11 = r0;
     r0 = (s.tmp_8 > s.tmp_11);
   case 8:
@@ -52195,15 +52107,15 @@ switch (step) {
     r0 = s.tmp_12;
     { step = 10; continue; }
   case 9:
-    s.tmp_15 = Sprite_top__P108563_mk(s);
+    s.tmp_15 = Sprite_top__P83345_mk(s);
     s.tmp_15.arg0 = s.arg0;
-    s.callLocIdx = 328; s.pc = 14; return s.tmp_15;
+    s.callLocIdx = 337; s.pc = 14; return s.tmp_15;
   case 14:
     r0 = s.retval;
     s.tmp_14 = r0;
-    r0 = (s.tmp_14 - s.oy___132035);
+    r0 = (s.tmp_14 - s.oy___107685);
     s.tmp_13 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_16 = r0;
     r0 = (s.tmp_13 > s.tmp_16);
   case 10:
@@ -52213,12 +52125,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_isOutOfScreen__P108573.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"]}
+Sprite_isOutOfScreen__P83355.info = {"start":20783,"length":358,"line":642,"column":4,"endLine":646,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isOutOfScreen","argumentNames":["this","camera"]}
 
-function Sprite_isOutOfScreen__P108573_mk(s) {
+function Sprite_isOutOfScreen__P83355_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isOutOfScreen__P108573, depth: s.depth + 1,
+        parent: s, fn: Sprite_isOutOfScreen__P83355, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52238,8 +52150,8 @@ function Sprite_isOutOfScreen__P108573_mk(s) {
   tmp_15: undefined,
   tmp_16: undefined,
   tmp_17: undefined,
-  ox___132027: undefined,
-  oy___132035: undefined,
+  ox___107677: undefined,
+  oy___107685: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52248,7 +52160,7 @@ function Sprite_isOutOfScreen__P108573_mk(s) {
 
 
 
-function Sprite_bottom__P108566(s) {
+function Sprite_bottom__P83348(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52264,8 +52176,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P108564_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P83346_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -52274,19 +52186,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 319; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 328; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_bottom__P108566.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"]}
+Sprite_bottom__P83348.info = {"start":10518,"length":73,"line":380,"column":4,"endLine":382,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this","value"]}
 
-function Sprite_bottom__P108566_mk(s) {
+function Sprite_bottom__P83348_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_bottom__P108566, depth: s.depth + 1,
+        parent: s, fn: Sprite_bottom__P83348, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52300,7 +52212,7 @@ function Sprite_bottom__P108566_mk(s) {
 
 
 
-function Sprite_right__P108562(s) {
+function Sprite_right__P83344(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52316,8 +52228,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P108560_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P83342_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -52326,19 +52238,19 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 311; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 320; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_right__P108562.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"]}
+Sprite_right__P83344.info = {"start":9711,"length":71,"line":350,"column":4,"endLine":352,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this","value"]}
 
-function Sprite_right__P108562_mk(s) {
+function Sprite_right__P83344_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_right__P108562, depth: s.depth + 1,
+        parent: s, fn: Sprite_right__P83344, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52352,7 +52264,7 @@ function Sprite_right__P108562_mk(s) {
 
 
 
-function Sprite_height__P108558(s) {
+function Sprite_height__P83340(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52367,20 +52279,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108558.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__P108558.isGetter = true;
+Sprite_height__P83340.info = {"start":8922,"length":54,"line":320,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"height","argumentNames":["this"]}
+Sprite_height__P83340.isGetter = true;
 
-function Sprite_height__P108558_mk(s) {
+function Sprite_height__P83340_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_height__P108558, depth: s.depth + 1,
+        parent: s, fn: Sprite_height__P83340, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -52390,7 +52302,7 @@ function Sprite_height__P108558_mk(s) {
 
 
 
-function Sprite_width__P108557(s) {
+function Sprite_width__P83339(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52405,20 +52317,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_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__P108557.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__P108557.isGetter = true;
+Sprite_width__P83339.info = {"start":8777,"length":52,"line":315,"column":4,"endLine":317,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"width","argumentNames":["this"]}
+Sprite_width__P83339.isGetter = true;
 
-function Sprite_width__P108557_mk(s) {
+function Sprite_width__P83339_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_width__P108557, depth: s.depth + 1,
+        parent: s, fn: Sprite_width__P83339, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -52428,7 +52340,7 @@ function Sprite_width__P108557_mk(s) {
 
 
 
-function Sprite_data__P108539(s) {
+function Sprite_data__P83321(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52444,18 +52356,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_data"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_data__P108539.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"]}
+Sprite_data__P83321.info = {"start":4575,"length":56,"line":171,"column":4,"endLine":173,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this","value"]}
 
-function Sprite_data__P108539_mk(s) {
+function Sprite_data__P83321_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_data__P108539, depth: s.depth + 1,
+        parent: s, fn: Sprite_data__P83321, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -52465,7 +52377,7 @@ function Sprite_data__P108539_mk(s) {
 
 
 
-function Sprite_data__P108538(s) {
+function Sprite_data__P83320(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52480,7 +52392,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["_data"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -52499,13 +52411,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_data__P108538.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__P108538.isGetter = true;
+Sprite_data__P83320.info = {"start":4477,"length":92,"line":166,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this"]}
+Sprite_data__P83320.isGetter = true;
 
-function Sprite_data__P108538_mk(s) {
+function Sprite_data__P83320_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_data__P108538, depth: s.depth + 1,
+        parent: s, fn: Sprite_data__P83320, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52519,7 +52431,7 @@ function Sprite_data__P108538_mk(s) {
 
 
 
-function scene_BackgroundLayer_constructor__P108779(s) {
+function scene_BackgroundLayer_constructor__P83565(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52537,12 +52449,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_BackgroundLayer__C108772_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_BackgroundLayer__C83558_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P106734_mk(s);
+    s.tmp_2 = Math_max__P81398_mk(s);
     s.tmp_2.arg0 = 1;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 718; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 722; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -52585,12 +52497,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_BackgroundLayer_constructor__P108779.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"]}
+scene_BackgroundLayer_constructor__P83565.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"]}
 
-function scene_BackgroundLayer_constructor__P108779_mk(s) {
+function scene_BackgroundLayer_constructor__P83565_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_BackgroundLayer_constructor__P108779, depth: s.depth + 1,
+        parent: s, fn: scene_BackgroundLayer_constructor__P83565, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52605,7 +52517,7 @@ function scene_BackgroundLayer_constructor__P108779_mk(s) {
 
 
 
-function particles_ParticleSource___draw__P109181(s) {
+function particles_ParticleSource___draw__P83960(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52615,18 +52527,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___131673 = undefined;
-    s.left___131676 = undefined;
-    s.top___131686 = undefined;
+    s.current___107363 = undefined;
+    s.left___107366 = undefined;
+    s.top___107376 = 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__C109175_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
     r0 = s.arg0.fields["head"];
-    s.current___131673 = (r0);
+    s.current___107363 = (r0);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -52644,7 +52556,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.left___131676 = (s.tmp_4);
+    s.left___107366 = (s.tmp_4);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -52662,49 +52574,49 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.top___131686 = (s.tmp_4);
+    s.top___107376 = (s.tmp_4);
   case 5:
-    r0 = pxsim_numops_toBoolDecr(s.current___131673);
+    r0 = pxsim_numops_toBoolDecr(s.current___107363);
     if (!r0) { step = 8; continue; }
-    r0 = s.current___131673.fields["lifespan"];
+    r0 = s.current___107363.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__P111227_mk(s);
+    s.tmp_2 = particles_ParticleSource_drawParticle__P86066_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.current___131673;
-    s.tmp_2.arg2 = s.left___131676;
-    s.tmp_2.arg3 = s.top___131686;
-    s.callLocIdx = 1099; s.pc = 9; return s.tmp_2;
+    s.tmp_2.arg1 = s.current___107363;
+    s.tmp_2.arg2 = s.left___107366;
+    s.tmp_2.arg3 = s.top___107376;
+    s.callLocIdx = 1103; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
   case 6:
   case 7:
-    r0 = s.current___131673.fields["next"];
-    s.current___131673 = (r0);
+    r0 = s.current___107363.fields["next"];
+    s.current___107363 = (r0);
     { step = 5; continue; }
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource___draw__P109181.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"]}
+particles_ParticleSource___draw__P83960.info = {"start":3199,"length":468,"line":111,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"__draw","argumentNames":["this","camera"]}
 
-function particles_ParticleSource___draw__P109181_mk(s) {
+function particles_ParticleSource___draw__P83960_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource___draw__P109181, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource___draw__P83960, 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___131673: undefined,
-  left___131676: undefined,
-  top___131686: undefined,
+  current___107363: undefined,
+  left___107366: undefined,
+  top___107376: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52713,7 +52625,7 @@ function particles_ParticleSource___draw__P109181_mk(s) {
 
 
 
-function particles_ParticleSource_drawParticle__P111227(s) {
+function particles_ParticleSource_drawParticle__P86066(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52731,8 +52643,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C109175_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleFactory__C109211_v1_4_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C83954_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleFactory__C83990_v1_4_mk(s);
     r0 = s.arg0.fields["_factory"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
@@ -52744,7 +52656,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__C109211_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C83990_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:
@@ -52753,12 +52665,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_drawParticle__P111227.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"]}
+particles_ParticleSource_drawParticle__P86066.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"]}
 
-function particles_ParticleSource_drawParticle__P111227_mk(s) {
+function particles_ParticleSource_drawParticle__P86066_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_drawParticle__P111227, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_drawParticle__P86066, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52773,7 +52685,7 @@ function particles_ParticleSource_drawParticle__P111227_mk(s) {
 
 
 
-function particles_ParticleFactory_drawParticle__P109214(s) {
+function particles_ParticleFactory_drawParticle__P83993(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52791,8 +52703,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleFactory__C109211_VT)) failedCast(r0);
-    s.tmp_0 = r0 = globals.screen___108298;
+    if (!checkSubtype(r0, particles_ParticleFactory__C83990_VT)) failedCast(r0);
+    s.tmp_0 = r0 = globals.screen___83075;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -52806,12 +52718,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_drawParticle__P109214.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"]}
+particles_ParticleFactory_drawParticle__P83993.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"]}
 
-function particles_ParticleFactory_drawParticle__P109214_mk(s) {
+function particles_ParticleFactory_drawParticle__P83993_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_drawParticle__P109214, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_drawParticle__P83993, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52828,7 +52740,7 @@ function particles_ParticleFactory_drawParticle__P109214_mk(s) {
 
 
 
-function particles_ShapeFactory_createParticle__P109241(s) {
+function particles_ShapeFactory_createParticle__P84020(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52838,47 +52750,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___134952 = undefined;
+    s.p___107427 = 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__C109237_VT)) failedCast(r0);
-    s.tmp_0 = particles_AreaFactory_createParticle__P109227_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C84016_VT)) failedCast(r0);
+    s.tmp_0 = particles_AreaFactory_createParticle__P84006_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1193; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1197; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.p___134952 = (r0);
-    s.tmp_0 = r0 = s.p___134952;
-    s.tmp_2 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.p___107427 = (r0);
+    s.tmp_0 = r0 = s.p___107427;
+    s.tmp_2 = Math_FastRandom_randomRange__P83866_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 1;
     s.tmp_2.arg2 = 14;
-    s.callLocIdx = 1194; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 1198; 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___134952;
+    r0 = s.p___107427;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_createParticle__P109241.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"]}
+particles_ShapeFactory_createParticle__P84020.info = {"start":7505,"length":178,"line":239,"column":8,"endLine":243,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_ShapeFactory_createParticle__P109241_mk(s) {
+function particles_ShapeFactory_createParticle__P84020_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_createParticle__P109241, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_createParticle__P84020, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  p___134952: undefined,
+  p___107427: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52887,7 +52799,7 @@ function particles_ShapeFactory_createParticle__P109241_mk(s) {
 
 
 
-function particles_AreaFactory_createParticle__P109227(s) {
+function particles_AreaFactory_createParticle__P84006(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52897,42 +52809,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___131737 = undefined;
+    s.p___107439 = 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__C109221_VT)) failedCast(r0);
-    s.tmp_0 = particles_SprayFactory_createParticle__P109217_mk(s);
+    if (!checkSubtype(r0, particles_AreaFactory__C84000_VT)) failedCast(r0);
+    s.tmp_0 = particles_SprayFactory_createParticle__P83996_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1175; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1179; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.p___131737 = (r0);
-    s.tmp_0 = r0 = s.p___131737;
-    s.tmp_2 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.p___107439 = (r0);
+    s.tmp_0 = r0 = s.p___107439;
+    s.tmp_2 = Math_FastRandom_randomRange__P83866_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 = 1176; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1180; 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___131737;
-    s.tmp_4 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.tmp_0 = r0 = s.p___107439;
+    s.tmp_4 = Math_FastRandom_randomRange__P83866_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 = 1177; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 1181; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -52942,7 +52854,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_3 - s.tmp_5);
     s.tmp_2 = r0;
-    r0 = s.p___131737.fields["_x"];
+    r0 = s.p___107439.fields["_x"];
     s.tmp_7 = r0;
     r0 = (s.tmp_2 << 8);
     s.tmp_8 = r0;
@@ -52957,7 +52869,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 = 1180; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 1184; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -52972,7 +52884,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 = 1181; s.pc = 7; return s.tmp_3; }
+     else { s.callLocIdx = 1185; s.pc = 7; return s.tmp_3; }
     }
   case 7:
     r0 = s.retval;
@@ -52984,36 +52896,36 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.tmp_5 = r0 = s.p___131737;
-    s.tmp_9 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.tmp_5 = r0 = s.p___107439;
+    s.tmp_9 = Math_FastRandom_randomRange__P83866_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 = 1179; s.pc = 8; return s.tmp_9;
+    s.callLocIdx = 1183; 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___131737.fields["_y"];
+    r0 = s.p___107439.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___131737;
+    r0 = s.p___107439;
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_createParticle__P109227.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"]}
+particles_AreaFactory_createParticle__P84006.info = {"start":4334,"length":426,"line":148,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_AreaFactory_createParticle__P109227_mk(s) {
+function particles_AreaFactory_createParticle__P84006_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_createParticle__P109227, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_createParticle__P84006, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53027,7 +52939,7 @@ function particles_AreaFactory_createParticle__P109227_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  p___131737: undefined,
+  p___107439: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -53036,7 +52948,7 @@ function particles_AreaFactory_createParticle__P109227_mk(s) {
 
 
 
-function particles_SprayFactory_createParticle__P109217(s) {
+function particles_SprayFactory_createParticle__P83996(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53046,39 +52958,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___131785 = undefined;
-    s.angle___131789 = undefined;
+    s.p___107487 = undefined;
+    s.angle___107491 = 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__C109215_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleFactory_createParticle__P109213_mk(s);
+    if (!checkSubtype(r0, particles_SprayFactory__C83994_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleFactory_createParticle__P83992_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1164; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1168; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.p___131785 = (r0);
+    s.p___107487 = (r0);
     r0 = s.arg0.fields["minAngle"];
     s.tmp_1 = r0;
-    s.tmp_3 = Math_FastRandom_randomRange__P109087_mk(s);
-    s.tmp_3.arg0 = globals.galois___111241;
+    s.tmp_3 = Math_FastRandom_randomRange__P83866_mk(s);
+    s.tmp_3.arg0 = globals.galois___86080;
     s.tmp_3.arg1 = 0;
     r0 = s.arg0.fields["spread"];
     s.tmp_3.arg2 = r0;
-    s.callLocIdx = 1165; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 1169; 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___131789 = (r0);
-    s.tmp_0 = r0 = s.p___131785;
-    r0 = pxsim_Array__getAt(globals.cachedSin___111236, s.angle___131789);
+    s.angle___107491 = (r0);
+    s.tmp_0 = r0 = s.p___107487;
+    r0 = pxsim_Array__getAt(globals.cachedSin___86075, s.angle___107491);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["speed"];
     s.tmp_3 = r0;
@@ -53087,8 +52999,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___131785;
-    r0 = pxsim_Array__getAt(globals.cachedCos___111237, s.angle___131789);
+    s.tmp_0 = r0 = s.p___107487;
+    r0 = pxsim_Array__getAt(globals.cachedCos___86076, s.angle___107491);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["speed"];
     s.tmp_3 = r0;
@@ -53097,24 +53009,24 @@ switch (step) {
     r0 = (s.tmp_4 >> 8);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["vy"] = (s.tmp_1);
-    r0 = s.p___131785;
+    r0 = s.p___107487;
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_createParticle__P109217.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"]}
+particles_SprayFactory_createParticle__P83996.info = {"start":2851,"length":333,"line":105,"column":8,"endLine":113,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_SprayFactory_createParticle__P109217_mk(s) {
+function particles_SprayFactory_createParticle__P83996_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_createParticle__P109217, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_createParticle__P83996, 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___131785: undefined,
-  angle___131789: undefined,
+  p___107487: undefined,
+  angle___107491: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -53123,41 +53035,7 @@ function particles_SprayFactory_createParticle__P109217_mk(s) {
 
 
 
-function music_Melody_toString__P109365(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__C109356_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_text"];
-    return leave(s, r0)
-  default: oops()
-} } }
-music_Melody_toString__P109365.info = {"start":9640,"length":53,"line":303,"column":8,"endLine":305,"endColumn":9,"fileName":"pxt_modules/mixer---stm32/melody.ts","functionName":"toString","argumentNames":["this"]}
-
-function music_Melody_toString__P109365_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: music_Melody_toString__P109365, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function scene_Scene_data__P108939(s) {
+function scene_Scene_data__P83718(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53172,18 +53050,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C108916_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C83695_VT)) failedCast(r0);
     r0 = s.arg0.fields["_data"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Scene_data__P108939.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__P108939.isGetter = true;
+scene_Scene_data__P83718.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__P83718.isGetter = true;
 
-function scene_Scene_data__P108939_mk(s) {
+function scene_Scene_data__P83718_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_data__P108939, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_data__P83718, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -53192,7 +53070,7 @@ function scene_Scene_data__P108939_mk(s) {
 
 
 
-function kodu_Button_constructor__P522496(s) {
+function kodu_Button_constructor__P84866(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53215,7 +53093,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = (s.arg0).fields["style"] = (s.arg2);
     r0 = (s.arg0).fields["iconId"] = (s.arg3);
     r0 = (s.arg0).fields["label"] = (s.arg4);
@@ -53223,29 +53101,29 @@ switch (step) {
     r0 = (s.arg0).fields["y"] = (s.arg6);
     r0 = (s.arg0).fields["hud"] = (s.arg7);
     r0 = (s.arg0).fields["onClick"] = (s.arg8);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "button";
-    s.callLocIdx = 134; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 133; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button_buildSprite__P522435_mk(s);
+    s.tmp_0 = kodu_Button_buildSprite__P87793_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 900;
-    s.callLocIdx = 135; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 134; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_constructor__P522496.info = {"start":649,"length":391,"line":21,"column":8,"endLine":33,"endColumn":9,"fileName":"button.ts","functionName":"inline","argumentNames":["this","stage","style","iconId","label","x","y","hud","onClick"]}
+kodu_Button_constructor__P84866.info = {"start":649,"length":391,"line":21,"column":8,"endLine":33,"endColumn":9,"fileName":"button.ts","functionName":"inline","argumentNames":["this","stage","style","iconId","label","x","y","hud","onClick"]}
 
-function kodu_Button_constructor__P522496_mk(s) {
+function kodu_Button_constructor__P84866_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_constructor__P522496, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_constructor__P84866, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53263,7 +53141,7 @@ function kodu_Button_constructor__P522496_mk(s) {
 
 
 
-function kodu_Button_buildSprite__P522435(s) {
+function kodu_Button_buildSprite__P87793(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53279,15 +53157,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["icon"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_1 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 142; s.pc = 13; return s.tmp_1;
+    s.callLocIdx = 141; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
   case 1:
@@ -53296,10 +53174,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_1 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 143; s.pc = 14; return s.tmp_1;
+    s.callLocIdx = 142; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
   case 3:
@@ -53308,12 +53186,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = Sprite_destroy__P108584_mk(s);
+    s.tmp_1 = Sprite_destroy__P83368_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 144; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 143; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
   case 5:
@@ -53322,27 +53200,27 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_1 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 145; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 144; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C110487_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C85270_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Kelpie_constructor__P110509_mk(s);
+    s.tmp_1 = kodu_Kelpie_constructor__P85292_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = kodu_icons_get__P110155_mk(s);
+    s.tmp_2 = kodu_icons_get__P84907_mk(s);
     r0 = s.arg0.fields["iconId"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 146; s.pc = 18; return s.tmp_2;
+    s.callLocIdx = 145; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 147; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 146; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
     r0 = (s.arg0).fields["icon"] = (s.tmp_0);
@@ -53350,11 +53228,11 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C110487_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C85270_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = kodu_Kelpie_constructor__P110509_mk(s);
+    s.tmp_2 = kodu_Kelpie_constructor__P85292_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_3 = kodu_icons_get__P110155_mk(s);
+    s.tmp_3 = kodu_icons_get__P84907_mk(s);
     r0 = s.arg0.fields["style"];
     s.tmp_5 = r0;
     if ((s.tmp_5) && (s.tmp_5).vtable) {
@@ -53369,51 +53247,51 @@ switch (step) {
     r0 = pxsim_String__concat("button_", s.tmp_4);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = false;
-    s.callLocIdx = 148; s.pc = 20; return s.tmp_3;
+    s.callLocIdx = 147; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 149; s.pc = 19; return s.tmp_2;
+    s.callLocIdx = 148; s.pc = 19; return s.tmp_2;
   case 19:
     r0 = s.retval;
     r0 = (s.arg0).fields["back"] = (s.tmp_1);
   case 9:
   case 10:
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 150; s.pc = 22; return s.tmp_0;
+    s.callLocIdx = 149; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 151; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 150; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 152; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 151; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 153; s.pc = 25; return s.tmp_1;
+    s.callLocIdx = 152; s.pc = 25; return s.tmp_1;
   case 25:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "kind", "button");
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 154; s.pc = 26; return s.tmp_1;
+    s.callLocIdx = 153; s.pc = 26; return s.tmp_1;
   case 26:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -53422,48 +53300,48 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = kodu_Kelpie_x__P110490_mk(s);
+    s.tmp_1 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 155; s.pc = 27; return s.tmp_1;
+    s.callLocIdx = 154; s.pc = 27; return s.tmp_1;
   case 27:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 156; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 155; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_0.arg0 = r0;
-    s.tmp_2 = kodu_Button_z__P522430_mk(s);
+    s.tmp_2 = kodu_Button_z__P84863_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 157; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 156; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 158; s.pc = 29; return s.tmp_0;
+    s.callLocIdx = 157; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 159; s.pc = 31; return s.tmp_1;
+    s.callLocIdx = 158; s.pc = 31; return s.tmp_1;
   case 31:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "kind", "button");
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 160; s.pc = 32; return s.tmp_1;
+    s.callLocIdx = 159; s.pc = 32; return s.tmp_1;
   case 32:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -53474,12 +53352,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_buildSprite__P522435.info = {"start":1495,"length":927,"line":50,"column":8,"endLine":73,"endColumn":9,"fileName":"button.ts","functionName":"buildSprite","argumentNames":["this","z_"]}
+kodu_Button_buildSprite__P87793.info = {"start":1495,"length":927,"line":50,"column":8,"endLine":73,"endColumn":9,"fileName":"button.ts","functionName":"buildSprite","argumentNames":["this","z_"]}
 
-function kodu_Button_buildSprite__P522435_mk(s) {
+function kodu_Button_buildSprite__P87793_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_buildSprite__P522435, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_buildSprite__P87793, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53495,7 +53373,7 @@ function kodu_Button_buildSprite__P522435_mk(s) {
 
 
 
-function kodu_Button_destroy__P522433(s) {
+function kodu_Button_destroy__P84867(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53510,15 +53388,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["icon"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_1 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 136; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 135; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
   case 1:
@@ -53527,10 +53405,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_1 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 137; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 136; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
   case 3:
@@ -53539,12 +53417,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = Sprite_destroy__P108584_mk(s);
+    s.tmp_1 = Sprite_destroy__P83368_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 138; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 137; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
   case 5:
@@ -53552,21 +53430,21 @@ switch (step) {
     r0 = (s.arg0).fields["icon"] = (undefined);
     r0 = (s.arg0).fields["back"] = (undefined);
     r0 = (s.arg0).fields["text"] = (undefined);
-    s.tmp_0 = kodu_Component_destroy__P345110_mk(s);
+    s.tmp_0 = kodu_Component_destroy__P84897_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 139; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 138; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_destroy__P522433.info = {"start":1050,"length":311,"line":35,"column":8,"endLine":43,"endColumn":9,"fileName":"button.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Button_destroy__P84867.info = {"start":1050,"length":311,"line":35,"column":8,"endLine":43,"endColumn":9,"fileName":"button.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Button_destroy__P522433_mk(s) {
+function kodu_Button_destroy__P84867_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_destroy__P522433, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_destroy__P84867, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53577,7 +53455,7 @@ function kodu_Button_destroy__P522433_mk(s) {
 
 
 
-function kodu_Button_data__P522432(s) {
+function kodu_Button_data__P84865(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53592,23 +53470,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_data__P110501_mk(s);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 133; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 132; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Button_data__P522432.info = {"start":602,"length":37,"line":19,"column":8,"endLine":19,"endColumn":45,"fileName":"button.ts","functionName":"data","argumentNames":["this"]}
-kodu_Button_data__P522432.isGetter = true;
+kodu_Button_data__P84865.info = {"start":602,"length":37,"line":19,"column":8,"endLine":19,"endColumn":45,"fileName":"button.ts","functionName":"data","argumentNames":["this"]}
+kodu_Button_data__P84865.isGetter = true;
 
-function kodu_Button_data__P522432_mk(s) {
+function kodu_Button_data__P84865_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_data__P522432, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_data__P84865, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53618,7 +53496,7 @@ function kodu_Button_data__P522432_mk(s) {
 
 
 
-function kodu_Button_z__P522431(s) {
+function kodu_Button_z__P84864(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53634,24 +53512,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 130; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 129; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = s.arg0.fields["back"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = sprites_BaseSprite_z__P108360_mk(s);
+    s.tmp_1 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
     r0 = (s.arg1 - 1);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 131; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 130; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
   case 1:
@@ -53670,7 +53548,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["set/z"];
       if (s.tmp_1.fn === null) { s.tmp_1.arg0.fields["z"] = s.tmp_1.arg1; }
       else if (s.tmp_1.fn === undefined) { failedCast(s.tmp_1.arg0) } 
-     else { s.callLocIdx = 132; s.pc = 7; return s.tmp_1; }
+     else { s.callLocIdx = 131; s.pc = 7; return s.tmp_1; }
     }
   case 7:
     r0 = s.retval;
@@ -53680,12 +53558,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_z__P522431.info = {"start":380,"length":213,"line":10,"column":8,"endLine":18,"endColumn":9,"fileName":"button.ts","functionName":"z","argumentNames":["this","n"]}
+kodu_Button_z__P84864.info = {"start":380,"length":213,"line":10,"column":8,"endLine":18,"endColumn":9,"fileName":"button.ts","functionName":"z","argumentNames":["this","n"]}
 
-function kodu_Button_z__P522431_mk(s) {
+function kodu_Button_z__P84864_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_z__P522431, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_z__P84864, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53697,7 +53575,7 @@ function kodu_Button_z__P522431_mk(s) {
 
 
 
-function kodu_Button_z__P522430(s) {
+function kodu_Button_z__P84863(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53712,20 +53590,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["icon"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_z"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Button_z__P522430.info = {"start":340,"length":31,"line":9,"column":8,"endLine":9,"endColumn":39,"fileName":"button.ts","functionName":"z","argumentNames":["this"]}
-kodu_Button_z__P522430.isGetter = true;
+kodu_Button_z__P84863.info = {"start":340,"length":31,"line":9,"column":8,"endLine":9,"endColumn":39,"fileName":"button.ts","functionName":"z","argumentNames":["this"]}
+kodu_Button_z__P84863.isGetter = true;
 
-function kodu_Button_z__P522430_mk(s) {
+function kodu_Button_z__P84863_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_z__P522430, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_z__P84863, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53735,7 +53613,7 @@ function kodu_Button_z__P522430_mk(s) {
 
 
 
-function kodu_Button_height__P522429(s) {
+function kodu_Button_height__P84862(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53750,7 +53628,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["back"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -53774,13 +53652,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Button_height__P522429.info = {"start":259,"length":72,"line":8,"column":8,"endLine":8,"endColumn":80,"fileName":"button.ts","functionName":"height","argumentNames":["this"]}
-kodu_Button_height__P522429.isGetter = true;
+kodu_Button_height__P84862.info = {"start":259,"length":72,"line":8,"column":8,"endLine":8,"endColumn":80,"fileName":"button.ts","functionName":"height","argumentNames":["this"]}
+kodu_Button_height__P84862.isGetter = true;
 
-function kodu_Button_height__P522429_mk(s) {
+function kodu_Button_height__P84862_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_height__P522429, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_height__P84862, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53795,7 +53673,7 @@ function kodu_Button_height__P522429_mk(s) {
 
 
 
-function kodu_Button_width__P522428(s) {
+function kodu_Button_width__P84861(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53810,7 +53688,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["back"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -53834,13 +53712,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Button_width__P522428.info = {"start":181,"length":69,"line":7,"column":8,"endLine":7,"endColumn":77,"fileName":"button.ts","functionName":"width","argumentNames":["this"]}
-kodu_Button_width__P522428.isGetter = true;
+kodu_Button_width__P84861.info = {"start":181,"length":69,"line":7,"column":8,"endLine":7,"endColumn":77,"fileName":"button.ts","functionName":"width","argumentNames":["this"]}
+kodu_Button_width__P84861.isGetter = true;
 
-function kodu_Button_width__P522428_mk(s) {
+function kodu_Button_width__P84861_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_width__P522428, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_width__P84861, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53855,7 +53733,7 @@ function kodu_Button_width__P522428_mk(s) {
 
 
 
-function kodu_Button_id__P522427(s) {
+function kodu_Button_id__P84860(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53870,18 +53748,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["iconId"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Button_id__P522427.info = {"start":140,"length":32,"line":6,"column":8,"endLine":6,"endColumn":40,"fileName":"button.ts","functionName":"id","argumentNames":["this"]}
-kodu_Button_id__P522427.isGetter = true;
+kodu_Button_id__P84860.info = {"start":140,"length":32,"line":6,"column":8,"endLine":6,"endColumn":40,"fileName":"button.ts","functionName":"id","argumentNames":["this"]}
+kodu_Button_id__P84860.isGetter = true;
 
-function kodu_Button_id__P522427_mk(s) {
+function kodu_Button_id__P84860_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_id__P522427, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_id__P84860, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -53890,7 +53768,7 @@ function kodu_Button_id__P522427_mk(s) {
 
 
 
-function kodu_Kelpie___update__P110514(s) {
+function kodu_Kelpie___update__P85297(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53907,7 +53785,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = s.arg0.fields["onUpdate"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -53932,12 +53810,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie___update__P110514.info = {"start":3955,"length":143,"line":131,"column":8,"endLine":134,"endColumn":9,"fileName":"kelpie.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
+kodu_Kelpie___update__P85297.info = {"start":3955,"length":143,"line":131,"column":8,"endLine":134,"endColumn":9,"fileName":"kelpie.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
 
-function kodu_Kelpie___update__P110514_mk(s) {
+function kodu_Kelpie___update__P85297_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie___update__P110514, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie___update__P85297, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53950,7 +53828,7 @@ function kodu_Kelpie___update__P110514_mk(s) {
 
 
 
-function kodu_Kelpie_data__P110502(s) {
+function kodu_Kelpie_data__P85285(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53966,18 +53844,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_data"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_data__P110502.info = {"start":1864,"length":64,"line":73,"column":8,"endLine":75,"endColumn":9,"fileName":"kelpie.ts","functionName":"data","argumentNames":["this","value"]}
+kodu_Kelpie_data__P85285.info = {"start":1864,"length":64,"line":73,"column":8,"endLine":75,"endColumn":9,"fileName":"kelpie.ts","functionName":"data","argumentNames":["this","value"]}
 
-function kodu_Kelpie_data__P110502_mk(s) {
+function kodu_Kelpie_data__P85285_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_data__P110502, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_data__P85285, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -53987,7 +53865,7 @@ function kodu_Kelpie_data__P110502_mk(s) {
 
 
 
-function kodu_Kelpie_y__P110492(s) {
+function kodu_Kelpie_y__P85275(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54003,7 +53881,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -54014,12 +53892,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_y__P110492.info = {"start":723,"length":58,"line":30,"column":8,"endLine":32,"endColumn":9,"fileName":"kelpie.ts","functionName":"y","argumentNames":["this","v"]}
+kodu_Kelpie_y__P85275.info = {"start":723,"length":58,"line":30,"column":8,"endLine":32,"endColumn":9,"fileName":"kelpie.ts","functionName":"y","argumentNames":["this","v"]}
 
-function kodu_Kelpie_y__P110492_mk(s) {
+function kodu_Kelpie_y__P85275_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_y__P110492, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_y__P85275, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54032,7 +53910,7 @@ function kodu_Kelpie_y__P110492_mk(s) {
 
 
 
-function kodu_Kelpie_x__P110490(s) {
+function kodu_Kelpie_x__P85273(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54048,7 +53926,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -54059,12 +53937,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_x__P110490.info = {"start":529,"length":58,"line":22,"column":8,"endLine":24,"endColumn":9,"fileName":"kelpie.ts","functionName":"x","argumentNames":["this","v"]}
+kodu_Kelpie_x__P85273.info = {"start":529,"length":58,"line":22,"column":8,"endLine":24,"endColumn":9,"fileName":"kelpie.ts","functionName":"x","argumentNames":["this","v"]}
 
-function kodu_Kelpie_x__P110490_mk(s) {
+function kodu_Kelpie_x__P85273_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_x__P110490, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_x__P85273, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54077,7 +53955,7 @@ function kodu_Kelpie_x__P110490_mk(s) {
 
 
 
-function sprites_BaseSprite___update__P108363(s) {
+function sprites_BaseSprite___update__P83139(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54094,17 +53972,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C108355_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C83131_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___update__P108363.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"]}
+sprites_BaseSprite___update__P83139.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"]}
 
-function sprites_BaseSprite___update__P108363_mk(s) {
+function sprites_BaseSprite___update__P83139_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___update__P108363, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___update__P83139, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -54115,7 +53993,7 @@ function sprites_BaseSprite___update__P108363_mk(s) {
 
 
 
-function sprites_BaseSprite___draw__P108361(s) {
+function sprites_BaseSprite___draw__P83137(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54131,10 +54009,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C108355_VT)) failedCast(r0);
-    s.tmp_1 = sprites_BaseSprite__C108355_v0_1_mk(s);
+    if (!checkSubtype(r0, sprites_BaseSprite__C83131_VT)) failedCast(r0);
+    s.tmp_1 = sprites_BaseSprite__C83131_v0_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_1.arg0, sprites_BaseSprite__C108355_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, sprites_BaseSprite__C83131_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:
@@ -54142,10 +54020,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = sprites_BaseSprite__C108355_v2_2_mk(s);
+    s.tmp_2 = sprites_BaseSprite__C83131_v2_2_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
-    if (!checkSubtype(s.tmp_2.arg0, sprites_BaseSprite__C108355_VT)) failedCast(s.tmp_2.arg0);
+    if (!checkSubtype(s.tmp_2.arg0, sprites_BaseSprite__C83131_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:
@@ -54156,12 +54034,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___draw__P108361.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"]}
+sprites_BaseSprite___draw__P83137.info = {"start":840,"length":131,"line":37,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__draw","argumentNames":["this","camera"]}
 
-function sprites_BaseSprite___draw__P108361_mk(s) {
+function sprites_BaseSprite___draw__P83137_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___draw__P108361, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___draw__P83137, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54174,7 +54052,7 @@ function sprites_BaseSprite___draw__P108361_mk(s) {
 
 
 
-function sprites_BaseSprite___drawCore__P108362(s) {
+function sprites_BaseSprite___drawCore__P83138(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54190,17 +54068,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C108355_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C83131_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___drawCore__P108362.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"]}
+sprites_BaseSprite___drawCore__P83138.info = {"start":981,"length":36,"line":43,"column":8,"endLine":43,"endColumn":44,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function sprites_BaseSprite___drawCore__P108362_mk(s) {
+function sprites_BaseSprite___drawCore__P83138_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___drawCore__P108362, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___drawCore__P83138, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -54210,7 +54088,7 @@ function sprites_BaseSprite___drawCore__P108362_mk(s) {
 
 
 
-function sprites_BaseSprite___visible__P108358(s) {
+function sprites_BaseSprite___visible__P83134(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54225,17 +54103,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C108355_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C83131_VT)) failedCast(r0);
     r0 = true;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___visible__P108358.info = {"start":524,"length":57,"line":22,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game---hw/basesprite.ts","functionName":"__visible","argumentNames":["this"]}
+sprites_BaseSprite___visible__P83134.info = {"start":524,"length":57,"line":22,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__visible","argumentNames":["this"]}
 
-function sprites_BaseSprite___visible__P108358_mk(s) {
+function sprites_BaseSprite___visible__P83134_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___visible__P108358, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___visible__P83134, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -54244,7 +54122,7 @@ function sprites_BaseSprite___visible__P108358_mk(s) {
 
 
 
-function kodu_Cursor_y__P549531(s) {
+function kodu_Cursor_y__P84989(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54260,31 +54138,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 319; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 318; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["kel1"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 320; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 319; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_y__P549531.info = {"start":737,"length":93,"line":22,"column":8,"endLine":25,"endColumn":9,"fileName":"cursor.ts","functionName":"y","argumentNames":["this","v"]}
+kodu_Cursor_y__P84989.info = {"start":737,"length":93,"line":22,"column":8,"endLine":25,"endColumn":9,"fileName":"cursor.ts","functionName":"y","argumentNames":["this","v"]}
 
-function kodu_Cursor_y__P549531_mk(s) {
+function kodu_Cursor_y__P84989_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_y__P549531, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_y__P84989, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54295,7 +54173,7 @@ function kodu_Cursor_y__P549531_mk(s) {
 
 
 
-function kodu_Cursor_x__P549530(s) {
+function kodu_Cursor_x__P84988(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54311,31 +54189,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 317; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 316; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["kel1"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 318; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 317; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_x__P549530.info = {"start":635,"length":93,"line":18,"column":8,"endLine":21,"endColumn":9,"fileName":"cursor.ts","functionName":"x","argumentNames":["this","v"]}
+kodu_Cursor_x__P84988.info = {"start":635,"length":93,"line":18,"column":8,"endLine":21,"endColumn":9,"fileName":"cursor.ts","functionName":"x","argumentNames":["this","v"]}
 
-function kodu_Cursor_x__P549530_mk(s) {
+function kodu_Cursor_x__P84988_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_x__P549530, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_x__P84988, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54346,7 +54224,7 @@ function kodu_Cursor_x__P549530_mk(s) {
 
 
 
-function kodu_WorldStage_notify__P565294(s) {
+function kodu_WorldStage_notify__P85243(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54356,12 +54234,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.body1___565859 = undefined;
-    s.body2___565860 = undefined;
-    s.char1___565861 = undefined;
-    s.char2___565869 = undefined;
-    s.char___565883 = undefined;
-    s.char___565892 = undefined;
+    s.body1___94605 = undefined;
+    s.body2___94606 = undefined;
+    s.char1___94607 = undefined;
+    s.char2___94615 = undefined;
+    s.char___94629 = undefined;
+    s.char___94638 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -54369,7 +54247,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtcore.switch_eq("cursor:moved", s.tmp_0);
     if (r0) { step = 1; continue; }
@@ -54392,10 +54270,10 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = kodu_Character_x__P538170_mk(s);
+    s.tmp_2 = kodu_Character_x__P85015_mk(s);
     r0 = s.arg0.fields["carryTarget"];
     s.tmp_2.arg0 = r0;
-    s.tmp_3 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_3 = kodu_Cursor_x__P84986_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 1291; s.pc = 15; return s.tmp_3;
@@ -54405,10 +54283,10 @@ switch (step) {
     s.callLocIdx = 1292; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = kodu_Character_y__P538171_mk(s);
+    s.tmp_0 = kodu_Character_y__P85017_mk(s);
     r0 = s.arg0.fields["carryTarget"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_1 = kodu_Cursor_y__P84987_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_1.arg0 = r0;
     s.callLocIdx = 1293; s.pc = 17; return s.tmp_1;
@@ -54420,7 +54298,7 @@ switch (step) {
     r0 = s.retval;
     { step = 3; continue; }
   case 2:
-    s.tmp_0 = kodu_WorldStage_updateHover__P565292_mk(s);
+    s.tmp_0 = kodu_WorldStage_updateHover__P85241_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1295; s.pc = 18; return s.tmp_0;
   case 18:
@@ -54441,7 +54319,7 @@ switch (step) {
     }
   case 19:
     r0 = s.retval;
-    s.body1___565859 = (r0);
+    s.body1___94605 = (r0);
     s.tmp_2 = if_body2_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -54454,10 +54332,10 @@ switch (step) {
     }
   case 20:
     r0 = s.retval;
-    s.body2___565860 = (r0);
+    s.body2___94606 = (r0);
     s.tmp_1 = if_data_1_mk(s);
     s.tmp_2 = if_kelpie_1_mk(s);
-    s.tmp_2.arg0 = s.body1___565859;
+    s.tmp_2.arg0 = s.body1___94605;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "kelpie");
     } else {
@@ -54481,10 +54359,10 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "component");
-    s.char1___565861 = (r0);
+    s.char1___94607 = (r0);
     s.tmp_1 = if_data_1_mk(s);
     s.tmp_2 = if_kelpie_1_mk(s);
-    s.tmp_2.arg0 = s.body2___565860;
+    s.tmp_2.arg0 = s.body2___94606;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "kelpie");
     } else {
@@ -54508,32 +54386,32 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "component");
-    s.char2___565869 = (r0);
-    s.tmp_0 = kodu_Character_addBump__P538178_mk(s);
-    s.tmp_0.arg0 = s.char1___565861;
-    s.tmp_0.arg1 = s.char2___565869;
+    s.char2___94615 = (r0);
+    s.tmp_0 = kodu_Character_addBump__P85025_mk(s);
+    s.tmp_0.arg0 = s.char1___94607;
+    s.tmp_0.arg1 = s.char2___94615;
     s.callLocIdx = 1302; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.tmp_0 = kodu_Character_addBump__P538178_mk(s);
-    s.tmp_0.arg0 = s.char2___565869;
-    s.tmp_0.arg1 = s.char1___565861;
+    s.tmp_0 = kodu_Character_addBump__P85025_mk(s);
+    s.tmp_0.arg0 = s.char2___94615;
+    s.tmp_0.arg1 = s.char1___94607;
     s.callLocIdx = 1303; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
     { step = 13; continue; }
   case 5:
-    s.char___565883 = (s.arg2);
-    s.tmp_0 = kodu_Camera_follow__P530760_mk(s);
+    s.char___94629 = (s.arg2);
+    s.tmp_0 = kodu_Camera_follow__P84889_mk(s);
     r0 = s.arg0.fields["camera"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.char___565883;
+    s.tmp_0.arg1 = s.char___94629;
     s.callLocIdx = 1304; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
     { step = 13; continue; }
   case 6:
-    s.tmp_0 = kodu_Cursor_disable__P549534_mk(s);
+    s.tmp_0 = kodu_Cursor_disable__P84993_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1305; s.pc = 28; return s.tmp_0;
@@ -54541,15 +54419,15 @@ switch (step) {
     r0 = s.retval;
     { step = 13; continue; }
   case 7:
-    s.char___565892 = (s.arg2);
+    s.char___94638 = (s.arg2);
     r0 = s.arg0.fields["camera"];
     r0 = r0.fields["following"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 === s.char___565892);
+    r0 = (s.tmp_1 === s.char___94638);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_2 = kodu_Camera_follow__P530760_mk(s);
+    s.tmp_2 = kodu_Camera_follow__P84889_mk(s);
     r0 = s.arg0.fields["camera"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = null;
@@ -54560,21 +54438,21 @@ switch (step) {
   case 9:
     { step = 13; continue; }
   case 10:
-    s.tmp_0 = kodu_WorldStage_save__P565277_mk(s);
+    s.tmp_0 = kodu_WorldStage_save__P85230_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1307; s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
     { step = 13; continue; }
   case 11:
-    s.tmp_0 = kodu_WorldStage_load__P565278_mk(s);
+    s.tmp_0 = kodu_WorldStage_load__P93836_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1308; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
     { step = 13; continue; }
   case 12:
-    s.tmp_0 = kodu_Stage_notify__P468704_mk(s);
+    s.tmp_0 = kodu_Stage_notify__P85065_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -54586,23 +54464,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_notify__P565294.info = {"start":10514,"length":1721,"line":300,"column":8,"endLine":347,"endColumn":9,"fileName":"worldStage.ts","functionName":"notify","argumentNames":["this","event","parm"]}
+kodu_WorldStage_notify__P85243.info = {"start":10574,"length":1721,"line":301,"column":8,"endLine":348,"endColumn":9,"fileName":"worldStage.ts","functionName":"notify","argumentNames":["this","event","parm"]}
 
-function kodu_WorldStage_notify__P565294_mk(s) {
+function kodu_WorldStage_notify__P85243_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_notify__P565294, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_notify__P85243, 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,
-  body1___565859: undefined,
-  body2___565860: undefined,
-  char1___565861: undefined,
-  char2___565869: undefined,
-  char___565883: undefined,
-  char___565892: undefined,
+  body1___94605: undefined,
+  body2___94606: undefined,
+  char1___94607: undefined,
+  char2___94615: undefined,
+  char___94629: undefined,
+  char___94638: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -54612,7 +54490,7 @@ function kodu_WorldStage_notify__P565294_mk(s) {
 
 
 
-function kodu_WorldStage_load__P565278(s) {
+function kodu_WorldStage_load__P93836(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54622,60 +54500,60 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.chars___565476 = undefined;
-    s.s___565499 = undefined;
-    s.savedGame___565504 = undefined;
+    s.chars___94218 = undefined;
+    s.s___94241 = undefined;
+    s.savedGame___94246 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P565483;
+    s.tmp_1.arg1 = inline__P94225;
     s.callLocIdx = 1208; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P565478;
+    s.tmp_0.arg1 = inline__P94220;
     s.callLocIdx = 1209; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.chars___565476 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_0.arg0 = s.chars___565476;
-    s.tmp_0.arg1 = inline__P565492;
+    s.chars___94218 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_0.arg0 = s.chars___94218;
+    s.tmp_0.arg1 = inline__P94234;
     s.callLocIdx = 1210; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = pxsim_pxtcore.beginTry(9);
-    r0 = pxsim.settings._exists(globals.SAVEGAME___565300);
+    r0 = pxsim.settings._exists(globals.SAVEGAME___94045);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = settings_readString__P108329_mk(s);
-    s.tmp_1.arg0 = globals.SAVEGAME___565300;
+    s.tmp_1 = settings_readString__P83105_mk(s);
+    s.tmp_1.arg0 = globals.SAVEGAME___94045;
     s.callLocIdx = 1212; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
-    s.s___565499 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.s___565499);
+    s.s___94241 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.s___94241);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = JSON_parse__P106986_mk(s);
-    s.tmp_0.arg0 = s.s___565499;
+    s.tmp_0 = JSON_parse__P81650_mk(s);
+    s.tmp_0.arg0 = s.s___94241;
     s.callLocIdx = 1213; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    s.savedGame___565504 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.savedGame___565504);
+    s.savedGame___94246 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.savedGame___94246);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565512);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94254);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.savedGame___565504);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.savedGame___94246);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
@@ -54683,7 +54561,7 @@ switch (step) {
   case 16:
     r0 = s.retval;
     s.tmp_1 = if_chars_1_mk(s);
-    s.tmp_1.arg0 = s.savedGame___565504;
+    s.tmp_1.arg0 = s.savedGame___94246;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "chars");
     } else {
@@ -54697,12 +54575,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565522);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94264);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.arg0);
-    s.tmp_3 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_3 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_4 = if_chars_1_mk(s);
-    s.tmp_4.arg0 = s.savedGame___565504;
+    s.tmp_4.arg0 = s.savedGame___94246;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "chars");
     } else {
@@ -54730,14 +54608,14 @@ switch (step) {
     r0 = s.arg0.fields["camera"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["y"] = (0);
-    s.tmp_0 = kodu_Cursor_x__P549530_mk(s);
+    s.tmp_0 = kodu_Cursor_x__P84988_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 1225; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_y__P549531_mk(s);
+    s.tmp_0 = kodu_Cursor_y__P84989_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
@@ -54754,21 +54632,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_load__P565278.info = {"start":4617,"length":1326,"line":136,"column":8,"endLine":165,"endColumn":9,"fileName":"worldStage.ts","functionName":"load","argumentNames":["this"]}
+kodu_WorldStage_load__P93836.info = {"start":4677,"length":1326,"line":137,"column":8,"endLine":166,"endColumn":9,"fileName":"worldStage.ts","functionName":"load","argumentNames":["this"]}
 
-function kodu_WorldStage_load__P565278_mk(s) {
+function kodu_WorldStage_load__P93836_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_load__P565278, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_load__P93836, 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,
-  chars___565476: undefined,
-  s___565499: undefined,
-  savedGame___565504: undefined,
+  chars___94218: undefined,
+  s___94241: undefined,
+  savedGame___94246: undefined,
   arg0: undefined,
 } }
 
@@ -54776,7 +54654,7 @@ function kodu_WorldStage_load__P565278_mk(s) {
 
 
 
-function inline__P565483(s) {
+function inline__P94225(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54796,12 +54674,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565483.info = {"start":4700,"length":33,"line":138,"column":24,"endLine":138,"endColumn":57,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P94225.info = {"start":4760,"length":33,"line":139,"column":24,"endLine":139,"endColumn":57,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P565483_mk(s) {
+function inline__P94225_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565483, depth: s.depth + 1,
+        parent: s, fn: inline__P94225, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54811,7 +54689,7 @@ function inline__P565483_mk(s) {
 
 
 
-function inline__P565478(s) {
+function inline__P94220(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54829,12 +54707,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565478.info = {"start":4756,"length":25,"line":139,"column":21,"endLine":139,"endColumn":46,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P94220.info = {"start":4816,"length":25,"line":140,"column":21,"endLine":140,"endColumn":46,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P565478_mk(s) {
+function inline__P94220_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565478, depth: s.depth + 1,
+        parent: s, fn: inline__P94220, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -54843,7 +54721,7 @@ function inline__P565478_mk(s) {
 
 
 
-function inline__P565492(s) {
+function inline__P94234(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54857,9 +54735,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Character__C538168_v0_1_mk(s);
+    s.tmp_0 = kodu_Character__C85005_v0_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Character__C538168_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Character__C85005_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -54868,12 +54746,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565492.info = {"start":4810,"length":24,"line":140,"column":26,"endLine":140,"endColumn":50,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["char"]}
+inline__P94234.info = {"start":4870,"length":24,"line":141,"column":26,"endLine":141,"endColumn":50,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["char"]}
 
-function inline__P565492_mk(s) {
+function inline__P94234_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565492, depth: s.depth + 1,
+        parent: s, fn: inline__P94234, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54883,7 +54761,7 @@ function inline__P565492_mk(s) {
 
 
 
-function inline__P565512(s) {
+function inline__P94254(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54897,11 +54775,11 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Component__C345109_v2_3_mk(s);
+    s.tmp_0 = kodu_Component__C84895_v2_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = "load";
     s.tmp_0.arg2 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C345109_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C84895_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.notify;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -54910,12 +54788,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565512.info = {"start":5206,"length":38,"line":148,"column":52,"endLine":148,"endColumn":90,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P94254.info = {"start":5266,"length":38,"line":149,"column":52,"endLine":149,"endColumn":90,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P565512_mk(s) {
+function inline__P94254_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565512, depth: s.depth + 1,
+        parent: s, fn: inline__P94254, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54925,7 +54803,7 @@ function inline__P565512_mk(s) {
 
 
 
-function inline__P565522(s) {
+function inline__P94264(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54939,7 +54817,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_WorldStage_spawnCharacter__P565282_mk(s);
+    s.tmp_0 = kodu_WorldStage_spawnCharacter__P85232_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_1 = if_x_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
@@ -54968,7 +54846,7 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
     s.tmp_4 = if_characters_1_mk(s);
-    s.tmp_4.arg0 = globals.chardb___110401;
+    s.tmp_4.arg0 = globals.chardb___85154;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "characters");
     } else {
@@ -54995,7 +54873,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_3, s.tmp_5);
     s.tmp_0.arg3 = r0;
-    s.tmp_7 = kodu_BrainDefn_FromObj__P110365_mk(s);
+    s.tmp_7 = kodu_BrainDefn_FromObj__P85118_mk(s);
     s.tmp_8 = if_bdefn_1_mk(s);
     s.tmp_8.arg0 = s.arg0;
     if (!s.tmp_8.arg0.vtable.iface) {
@@ -55019,12 +54897,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565522.info = {"start":5354,"length":252,"line":150,"column":56,"endLine":154,"endColumn":67,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["state"]}
+inline__P94264.info = {"start":5414,"length":252,"line":151,"column":56,"endLine":155,"endColumn":67,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["state"]}
 
-function inline__P565522_mk(s) {
+function inline__P94264_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565522, depth: s.depth + 1,
+        parent: s, fn: inline__P94264, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55042,7 +54920,7 @@ function inline__P565522_mk(s) {
 
 
 
-function kodu_BrainDefn_FromObj__P110365(s) {
+function kodu_BrainDefn_FromObj__P85118(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55052,8 +54930,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.defn___115594 = undefined;
-    s.pages___115604 = undefined;
+    s.defn___90483 = undefined;
+    s.pages___90493 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -55064,22 +54942,22 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = JSON_parse__P106986_mk(s);
+    s.tmp_2 = JSON_parse__P81650_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 532; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 531; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.arg0 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C110359_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C85112_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_BrainDefn_constructor__P110361_mk(s);
+    s.tmp_1 = kodu_BrainDefn_constructor__P85114_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 533; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 532; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.defn___115594 = (s.tmp_0);
+    s.defn___90483 = (s.tmp_0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
@@ -55104,35 +54982,35 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
     r0 = pxsim_pxtrt.mapGetGeneric(s.arg0, "P");
-    s.pages___115604 = (r0);
-    s.tmp_0 = r0 = s.defn___115594;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_2.arg0 = s.pages___115604;
-    s.tmp_2.arg1 = inline__P115611;
-    s.callLocIdx = 535; s.pc = 11; return s.tmp_2;
+    s.pages___90493 = (r0);
+    s.tmp_0 = r0 = s.defn___90483;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_2.arg0 = s.pages___90493;
+    s.tmp_2.arg1 = inline__P90500;
+    s.callLocIdx = 534; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["pages"] = (s.tmp_1);
   case 7:
   case 8:
-    r0 = s.defn___115594;
+    r0 = s.defn___90483;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainDefn_FromObj__P110365.info = {"start":6334,"length":419,"line":213,"column":8,"endLine":223,"endColumn":9,"fileName":"language.ts","functionName":"FromObj","argumentNames":["obj"]}
+kodu_BrainDefn_FromObj__P85118.info = {"start":6334,"length":419,"line":213,"column":8,"endLine":223,"endColumn":9,"fileName":"language.ts","functionName":"FromObj","argumentNames":["obj"]}
 
-function kodu_BrainDefn_FromObj__P110365_mk(s) {
+function kodu_BrainDefn_FromObj__P85118_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainDefn_FromObj__P110365, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainDefn_FromObj__P85118, 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,
-  defn___115594: undefined,
-  pages___115604: undefined,
+  defn___90483: undefined,
+  pages___90493: undefined,
   arg0: undefined,
 } }
 
@@ -55140,7 +55018,7 @@ function kodu_BrainDefn_FromObj__P110365_mk(s) {
 
 
 
-function inline__P115611(s) {
+function inline__P90500(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55154,20 +55032,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_PageDefn_FromObj__P110358_mk(s);
+    s.tmp_0 = kodu_PageDefn_FromObj__P85111_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 534; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 533; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115611.info = {"start":6665,"length":37,"line":220,"column":39,"endLine":220,"endColumn":76,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90500.info = {"start":6665,"length":37,"line":220,"column":39,"endLine":220,"endColumn":76,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115611_mk(s) {
+function inline__P90500_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115611, depth: s.depth + 1,
+        parent: s, fn: inline__P90500, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -55177,7 +55055,7 @@ function inline__P115611_mk(s) {
 
 
 
-function kodu_PageDefn_FromObj__P110358(s) {
+function kodu_PageDefn_FromObj__P85111(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55187,8 +55065,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.defn___115530 = undefined;
-    s.rules___115536 = undefined;
+    s.defn___90419 = undefined;
+    s.rules___90425 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -55199,22 +55077,22 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = JSON_parse__P106986_mk(s);
+    s.tmp_2 = JSON_parse__P81650_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 521; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 520; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.arg0 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C110350_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C85103_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_PageDefn_constructor__P110352_mk(s);
+    s.tmp_1 = kodu_PageDefn_constructor__P85105_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 522; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 521; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    s.defn___115530 = (s.tmp_0);
+    s.defn___90419 = (s.tmp_0);
     r0 = pxsim_pxtrt.mapGetGeneric(s.arg0, "R");
     s.tmp_1 = r0;
     r0 = pxsim_Array_.isArray(s.tmp_1);
@@ -55222,34 +55100,34 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = pxsim_pxtrt.mapGetGeneric(s.arg0, "R");
-    s.rules___115536 = (r0);
-    s.tmp_0 = r0 = s.defn___115530;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_2.arg0 = s.rules___115536;
-    s.tmp_2.arg1 = inline__P115543;
-    s.callLocIdx = 524; s.pc = 7; return s.tmp_2;
+    s.rules___90425 = (r0);
+    s.tmp_0 = r0 = s.defn___90419;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_2.arg0 = s.rules___90425;
+    s.tmp_2.arg1 = inline__P90432;
+    s.callLocIdx = 523; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["rules"] = (s.tmp_1);
   case 3:
   case 4:
-    r0 = s.defn___115530;
+    r0 = s.defn___90419;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageDefn_FromObj__P110358.info = {"start":5366,"length":396,"line":177,"column":8,"endLine":187,"endColumn":9,"fileName":"language.ts","functionName":"FromObj","argumentNames":["obj"]}
+kodu_PageDefn_FromObj__P85111.info = {"start":5366,"length":396,"line":177,"column":8,"endLine":187,"endColumn":9,"fileName":"language.ts","functionName":"FromObj","argumentNames":["obj"]}
 
-function kodu_PageDefn_FromObj__P110358_mk(s) {
+function kodu_PageDefn_FromObj__P85111_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageDefn_FromObj__P110358, depth: s.depth + 1,
+        parent: s, fn: kodu_PageDefn_FromObj__P85111, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  defn___115530: undefined,
-  rules___115536: undefined,
+  defn___90419: undefined,
+  rules___90425: undefined,
   arg0: undefined,
 } }
 
@@ -55257,7 +55135,7 @@ function kodu_PageDefn_FromObj__P110358_mk(s) {
 
 
 
-function inline__P115543(s) {
+function inline__P90432(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55271,20 +55149,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleDefn_FromObj__P110349_mk(s);
+    s.tmp_0 = kodu_RuleDefn_FromObj__P85102_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 523; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 522; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115543.info = {"start":5674,"length":37,"line":184,"column":39,"endLine":184,"endColumn":76,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90432.info = {"start":5674,"length":37,"line":184,"column":39,"endLine":184,"endColumn":76,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115543_mk(s) {
+function inline__P90432_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115543, depth: s.depth + 1,
+        parent: s, fn: inline__P90432, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -55294,7 +55172,7 @@ function inline__P115543_mk(s) {
 
 
 
-function kodu_RuleDefn_FromObj__P110349(s) {
+function kodu_RuleDefn_FromObj__P85102(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55304,9 +55182,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.defn___115344 = undefined;
-    s.filters___115375 = undefined;
-    s.modifiers___115391 = undefined;
+    s.defn___90233 = undefined;
+    s.filters___90264 = undefined;
+    s.modifiers___90280 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -55317,22 +55195,22 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = JSON_parse__P106986_mk(s);
+    s.tmp_2 = JSON_parse__P81650_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 505; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 504; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
     s.arg0 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C110339_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C85092_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_RuleDefn_constructor__P110345_mk(s);
+    s.tmp_1 = kodu_RuleDefn_constructor__P85098_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 506; s.pc = 14; return s.tmp_1;
+    s.callLocIdx = 505; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
-    s.defn___115344 = (s.tmp_0);
+    s.defn___90233 = (s.tmp_0);
     r0 = pxsim_pxtrt.mapGetGeneric(s.arg0, "C");
     s.tmp_2 = r0;
     r0 = pxsim_pxtcore.typeOf(s.tmp_2);
@@ -55341,7 +55219,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = r0 = s.defn___115344;
+    s.tmp_3 = r0 = s.defn___90233;
     r0 = pxsim_pxtrt.mapGetGeneric(s.arg0, "C");
     s.tmp_4 = r0;
     r0 = (s.tmp_3).fields["condition"] = (s.tmp_4);
@@ -55355,16 +55233,16 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_3 = r0 = s.defn___115344;
+    s.tmp_3 = r0 = s.defn___90233;
     s.tmp_6 = if_sensors_1_mk(s);
-    s.tmp_6.arg0 = globals.tiles___110373;
+    s.tmp_6.arg0 = globals.tiles___85126;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "sensors");
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["sensors"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["sensors"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 507; s.pc = 15; return s.tmp_6; }
+     else { s.callLocIdx = 506; s.pc = 15; return s.tmp_6; }
     }
   case 15:
     r0 = s.retval;
@@ -55384,16 +55262,16 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_3 = r0 = s.defn___115344;
+    s.tmp_3 = r0 = s.defn___90233;
     s.tmp_6 = if_actuators_1_mk(s);
-    s.tmp_6.arg0 = globals.tiles___110373;
+    s.tmp_6.arg0 = globals.tiles___85126;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "actuators");
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["actuators"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["actuators"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 508; s.pc = 16; return s.tmp_6; }
+     else { s.callLocIdx = 507; s.pc = 16; return s.tmp_6; }
     }
   case 16:
     r0 = s.retval;
@@ -55412,12 +55290,12 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
     r0 = pxsim_pxtrt.mapGetGeneric(s.arg0, "F");
-    s.filters___115375 = (r0);
-    s.tmp_0 = r0 = s.defn___115344;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_2.arg0 = s.filters___115375;
-    s.tmp_2.arg1 = inline__P115382;
-    s.callLocIdx = 510; s.pc = 17; return s.tmp_2;
+    s.filters___90264 = (r0);
+    s.tmp_0 = r0 = s.defn___90233;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_2.arg0 = s.filters___90264;
+    s.tmp_2.arg1 = inline__P90271;
+    s.callLocIdx = 509; s.pc = 17; return s.tmp_2;
   case 17:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -55431,28 +55309,28 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
     r0 = pxsim_pxtrt.mapGetGeneric(s.arg0, "M");
-    s.modifiers___115391 = (r0);
-    s.tmp_0 = r0 = s.defn___115344;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_2.arg0 = s.modifiers___115391;
-    s.tmp_2.arg1 = inline__P115398;
-    s.callLocIdx = 512; s.pc = 18; return s.tmp_2;
+    s.modifiers___90280 = (r0);
+    s.tmp_0 = r0 = s.defn___90233;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_2.arg0 = s.modifiers___90280;
+    s.tmp_2.arg1 = inline__P90287;
+    s.callLocIdx = 511; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["modifiers"] = (s.tmp_1);
   case 11:
   case 12:
-    r0 = s.defn___115344;
+    r0 = s.defn___90233;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleDefn_FromObj__P110349.info = {"start":2899,"length":942,"line":100,"column":8,"endLine":123,"endColumn":9,"fileName":"language.ts","functionName":"FromObj","argumentNames":["obj"]}
+kodu_RuleDefn_FromObj__P85102.info = {"start":2899,"length":942,"line":100,"column":8,"endLine":123,"endColumn":9,"fileName":"language.ts","functionName":"FromObj","argumentNames":["obj"]}
 
-function kodu_RuleDefn_FromObj__P110349_mk(s) {
+function kodu_RuleDefn_FromObj__P85102_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleDefn_FromObj__P110349, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleDefn_FromObj__P85102, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55462,9 +55340,9 @@ function kodu_RuleDefn_FromObj__P110349_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  defn___115344: undefined,
-  filters___115375: undefined,
-  modifiers___115391: undefined,
+  defn___90233: undefined,
+  filters___90264: undefined,
+  modifiers___90280: undefined,
   arg0: undefined,
 } }
 
@@ -55472,7 +55350,7 @@ function kodu_RuleDefn_FromObj__P110349_mk(s) {
 
 
 
-function inline__P115382(s) {
+function inline__P90271(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55487,14 +55365,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_filters_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "filters");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["filters"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["filters"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 509; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 508; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -55503,12 +55381,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115382.info = {"start":3556,"length":37,"line":116,"column":43,"endLine":116,"endColumn":80,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90271.info = {"start":3556,"length":37,"line":116,"column":43,"endLine":116,"endColumn":80,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115382_mk(s) {
+function inline__P90271_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115382, depth: s.depth + 1,
+        parent: s, fn: inline__P90271, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55519,7 +55397,7 @@ function inline__P115382_mk(s) {
 
 
 
-function inline__P115398(s) {
+function inline__P90287(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55534,14 +55412,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_modifiers_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "modifiers");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["modifiers"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["modifiers"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 511; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 510; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -55550,12 +55428,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115398.info = {"start":3751,"length":39,"line":120,"column":47,"endLine":120,"endColumn":86,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90287.info = {"start":3751,"length":39,"line":120,"column":47,"endLine":120,"endColumn":86,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115398_mk(s) {
+function inline__P90287_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115398, depth: s.depth + 1,
+        parent: s, fn: inline__P90287, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55566,7 +55444,7 @@ function inline__P115398_mk(s) {
 
 
 
-function kodu_RuleDefn_constructor__P110345(s) {
+function kodu_RuleDefn_constructor__P85098(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55581,17 +55459,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleDefn__C110339_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleDefn__C85092_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     s.tmp_2 = if_DEFAULT_1_mk(s);
-    s.tmp_2.arg0 = globals.RuleCondition___110338;
+    s.tmp_2.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "DEFAULT");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["DEFAULT"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["DEFAULT"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 490; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 489; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -55609,12 +55487,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleDefn_constructor__P110345.info = {"start":1703,"length":141,"line":64,"column":8,"endLine":68,"endColumn":9,"fileName":"language.ts","functionName":"inline","argumentNames":["this"]}
+kodu_RuleDefn_constructor__P85098.info = {"start":1703,"length":141,"line":64,"column":8,"endLine":68,"endColumn":9,"fileName":"language.ts","functionName":"inline","argumentNames":["this"]}
 
-function kodu_RuleDefn_constructor__P110345_mk(s) {
+function kodu_RuleDefn_constructor__P85098_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleDefn_constructor__P110345, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleDefn_constructor__P85098, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55626,7 +55504,7 @@ function kodu_RuleDefn_constructor__P110345_mk(s) {
 
 
 
-function kodu_PageDefn_constructor__P110352(s) {
+function kodu_PageDefn_constructor__P85105(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55641,7 +55519,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageDefn__C110350_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageDefn__C85103_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -55650,12 +55528,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageDefn_constructor__P110352.info = {"start":3917,"length":54,"line":129,"column":8,"endLine":131,"endColumn":9,"fileName":"language.ts","functionName":"inline","argumentNames":["this"]}
+kodu_PageDefn_constructor__P85105.info = {"start":3917,"length":54,"line":129,"column":8,"endLine":131,"endColumn":9,"fileName":"language.ts","functionName":"inline","argumentNames":["this"]}
 
-function kodu_PageDefn_constructor__P110352_mk(s) {
+function kodu_PageDefn_constructor__P85105_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageDefn_constructor__P110352, depth: s.depth + 1,
+        parent: s, fn: kodu_PageDefn_constructor__P85105, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55666,7 +55544,7 @@ function kodu_PageDefn_constructor__P110352_mk(s) {
 
 
 
-function kodu_BrainDefn_constructor__P110361(s) {
+function kodu_BrainDefn_constructor__P85114(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55681,7 +55559,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_BrainDefn__C110359_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_BrainDefn__C85112_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, 0);
@@ -55690,10 +55568,10 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_0, 3);
     r0 = pxsim_Array__push(s.tmp_0, 4);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_3 = helpers_arrayMap__P81375_mk(s);
     s.tmp_3.arg0 = s.tmp_0;
-    s.tmp_3.arg1 = inline__P115553;
-    s.callLocIdx = 526; s.pc = 1; return s.tmp_3;
+    s.tmp_3.arg1 = inline__P90442;
+    s.callLocIdx = 525; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -55702,12 +55580,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainDefn_constructor__P110361.info = {"start":5835,"length":92,"line":193,"column":8,"endLine":195,"endColumn":9,"fileName":"language.ts","functionName":"inline","argumentNames":["this"]}
+kodu_BrainDefn_constructor__P85114.info = {"start":5835,"length":92,"line":193,"column":8,"endLine":195,"endColumn":9,"fileName":"language.ts","functionName":"inline","argumentNames":["this"]}
 
-function kodu_BrainDefn_constructor__P110361_mk(s) {
+function kodu_BrainDefn_constructor__P85114_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainDefn_constructor__P110361, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainDefn_constructor__P85114, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55720,7 +55598,7 @@ function kodu_BrainDefn_constructor__P110361_mk(s) {
 
 
 
-function inline__P115553(s) {
+function inline__P90442(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55734,23 +55612,23 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C110350_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C85103_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_PageDefn_constructor__P110352_mk(s);
+    s.tmp_1 = kodu_PageDefn_constructor__P85105_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 525; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 524; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115553.info = {"start":5896,"length":19,"line":194,"column":45,"endLine":194,"endColumn":64,"fileName":"language.ts","functionName":"inline","argumentNames":["n"]}
+inline__P90442.info = {"start":5896,"length":19,"line":194,"column":45,"endLine":194,"endColumn":64,"fileName":"language.ts","functionName":"inline","argumentNames":["n"]}
 
-function inline__P115553_mk(s) {
+function inline__P90442_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115553, depth: s.depth + 1,
+        parent: s, fn: inline__P90442, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55761,7 +55639,7 @@ function inline__P115553_mk(s) {
 
 
 
-function kodu_WorldStage_spawnCharacter__P565282(s) {
+function kodu_WorldStage_spawnCharacter__P85232(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55771,7 +55649,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.char___565610 = undefined;
+    s.char___94355 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -55781,16 +55659,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg4;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C110359_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C85112_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = kodu_BrainDefn_constructor__P110361_mk(s);
+    s.tmp_2 = kodu_BrainDefn_constructor__P85114_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     s.callLocIdx = 1238; s.pc = 3; return s.tmp_2;
   case 3:
@@ -55800,9 +55678,9 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_3 = r0;
     s.arg4 = (s.tmp_3);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Character__C538168_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Character__C85005_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Character_constructor__P538221_mk(s);
+    s.tmp_1 = kodu_Character_constructor__P85020_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -55812,28 +55690,28 @@ switch (step) {
     s.callLocIdx = 1239; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    s.char___565610 = (s.tmp_0);
-    s.tmp_0 = kodu_WorldStage_save__P565277_mk(s);
+    s.char___94355 = (s.tmp_0);
+    s.tmp_0 = kodu_WorldStage_save__P85230_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1240; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    r0 = s.char___565610;
+    r0 = s.char___94355;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_spawnCharacter__P565282.info = {"start":6833,"length":267,"line":192,"column":8,"endLine":197,"endColumn":9,"fileName":"worldStage.ts","functionName":"spawnCharacter","argumentNames":["this","x","y","defn","bdefn"]}
+kodu_WorldStage_spawnCharacter__P85232.info = {"start":6893,"length":267,"line":193,"column":8,"endLine":198,"endColumn":9,"fileName":"worldStage.ts","functionName":"spawnCharacter","argumentNames":["this","x","y","defn","bdefn"]}
 
-function kodu_WorldStage_spawnCharacter__P565282_mk(s) {
+function kodu_WorldStage_spawnCharacter__P85232_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_spawnCharacter__P565282, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_spawnCharacter__P85232, 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,
-  char___565610: undefined,
+  char___94355: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -55845,7 +55723,7 @@ function kodu_WorldStage_spawnCharacter__P565282_mk(s) {
 
 
 
-function kodu_Component_notify__P345112(s) {
+function kodu_Component_notify__P84899(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55862,17 +55740,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Component__C345109_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Component__C84895_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Component_notify__P345112.info = {"start":357,"length":35,"line":13,"column":8,"endLine":13,"endColumn":43,"fileName":"component.ts","functionName":"notify","argumentNames":["this","event","parm"]}
+kodu_Component_notify__P84899.info = {"start":357,"length":35,"line":13,"column":8,"endLine":13,"endColumn":43,"fileName":"component.ts","functionName":"notify","argumentNames":["this","event","parm"]}
 
-function kodu_Component_notify__P345112_mk(s) {
+function kodu_Component_notify__P84899_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Component_notify__P345112, depth: s.depth + 1,
+        parent: s, fn: kodu_Component_notify__P84899, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -55883,7 +55761,7 @@ function kodu_Component_notify__P345112_mk(s) {
 
 
 
-function JSON_parse__P106986(s) {
+function JSON_parse__P81650(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55893,43 +55771,43 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___125153 = undefined;
-    s.r___125163 = undefined;
+    s.p___100537 = undefined;
+    s.r___100547 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(JSON_Parser__C110576_VT);
-    s.p___125153 = (r0);
-    r0 = (s.p___125153).fields["ptr"] = (0);
-    r0 = (s.p___125153).fields["s"] = (s.arg0);
-    s.tmp_0 = JSON_Parser_value__P110585_mk(s);
-    s.tmp_0.arg0 = s.p___125153;
+    r0 = pxsim_pxtcore_mkClassInstance(JSON_Parser__C85360_VT);
+    s.p___100537 = (r0);
+    r0 = (s.p___100537).fields["ptr"] = (0);
+    r0 = (s.p___100537).fields["s"] = (s.arg0);
+    s.tmp_0 = JSON_Parser_value__P85369_mk(s);
+    s.tmp_0.arg0 = s.p___100537;
     s.callLocIdx = 82; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.r___125163 = (r0);
-    s.tmp_1 = JSON_Parser_skipWS__P110578_mk(s);
-    s.tmp_1.arg0 = s.p___125153;
+    s.r___100547 = (r0);
+    s.tmp_1 = JSON_Parser_skipWS__P85362_mk(s);
+    s.tmp_1.arg0 = s.p___100537;
     s.callLocIdx = 83; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = JSON_Parser_error__P110577_mk(s);
-    s.tmp_2.arg0 = s.p___125153;
+    s.tmp_2 = JSON_Parser_error__P85361_mk(s);
+    s.tmp_2.arg0 = s.p___100537;
     s.tmp_2.arg1 = "excessive input";
     s.callLocIdx = 84; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = s.p___125153.fields["errorMsg"];
+    r0 = s.p___100537.fields["errorMsg"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = s.p___125153.fields["errorMsg"];
+    r0 = s.p___100537.fields["errorMsg"];
     s.tmp_3 = r0;
     if ((s.tmp_3) && (s.tmp_3).vtable) {
     setupResume(s, 9);
@@ -55947,24 +55825,24 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    r0 = s.r___125163;
+    r0 = s.r___100547;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-JSON_parse__P106986.info = {"start":9325,"length":347,"line":307,"column":4,"endLine":320,"endColumn":5,"fileName":"pxt_modules/base/json.ts","functionName":"parse","argumentNames":["s"]}
+JSON_parse__P81650.info = {"start":9325,"length":347,"line":307,"column":4,"endLine":320,"endColumn":5,"fileName":"pxt_modules/base/json.ts","functionName":"parse","argumentNames":["s"]}
 
-function JSON_parse__P106986_mk(s) {
+function JSON_parse__P81650_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_parse__P106986, depth: s.depth + 1,
+        parent: s, fn: JSON_parse__P81650, 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,
-  p___125153: undefined,
-  r___125163: undefined,
+  p___100537: undefined,
+  r___100547: undefined,
   arg0: undefined,
 } }
 
@@ -55972,7 +55850,7 @@ function JSON_parse__P106986_mk(s) {
 
 
 
-function JSON_Parser_value__P110585(s) {
+function JSON_Parser_value__P85369(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55982,13 +55860,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.c___125244 = undefined;
+    s.c___100628 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
     r0 = s.arg0.fields["errorMsg"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -55997,17 +55875,17 @@ switch (step) {
     { step = 27; continue; }
   case 1:
   case 2:
-    s.tmp_1 = JSON_Parser_skipWS__P110578_mk(s);
+    s.tmp_1 = JSON_Parser_skipWS__P85362_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 66; s.pc = 28; return s.tmp_1;
   case 28:
     r0 = s.retval;
-    s.c___125244 = (r0);
-    r0 = (s.c___125244 == 123);
+    s.c___100628 = (r0);
+    r0 = (s.c___100628 == 123);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = JSON_Parser_doObject__P110582_mk(s);
+    s.tmp_1 = JSON_Parser_doObject__P85366_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 67; s.pc = 29; return s.tmp_1;
   case 29:
@@ -56015,11 +55893,11 @@ switch (step) {
     { step = 27; continue; }
     { step = 26; continue; }
   case 3:
-    r0 = (s.c___125244 == 91);
+    r0 = (s.c___100628 == 91);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    s.tmp_3 = JSON_Parser_doArray__P110581_mk(s);
+    s.tmp_3 = JSON_Parser_doArray__P85365_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 68; s.pc = 30; return s.tmp_3;
   case 30:
@@ -56027,14 +55905,14 @@ switch (step) {
     { step = 27; continue; }
     { step = 25; continue; }
   case 4:
-    r0 = (48 <= s.c___125244);
+    r0 = (48 <= s.c___100628);
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBool(s.tmp_4);
     if (r0) { step = 5; continue; }
     r0 = s.tmp_4;
     { step = 6; continue; }
   case 5:
-    r0 = (s.c___125244 <= 57);
+    r0 = (s.c___100628 <= 57);
   case 6:
     // jmp value (already in r0)
     s.tmp_5 = r0;
@@ -56043,13 +55921,13 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 8; continue; }
   case 7:
-    r0 = (s.c___125244 == 45);
+    r0 = (s.c___100628 == 45);
   case 8:
     // jmp value (already in r0)
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 9; continue; }
-    s.tmp_7 = JSON_Parser_doNumber__P110583_mk(s);
+    s.tmp_7 = JSON_Parser_doNumber__P85367_mk(s);
     s.tmp_7.arg0 = s.arg0;
     s.callLocIdx = 69; s.pc = 31; return s.tmp_7;
   case 31:
@@ -56057,11 +55935,11 @@ switch (step) {
     { step = 27; continue; }
     { step = 24; continue; }
   case 9:
-    r0 = (s.c___125244 == 34);
+    r0 = (s.c___100628 == 34);
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 10; continue; }
-    s.tmp_9 = JSON_Parser_doString__P110580_mk(s);
+    s.tmp_9 = JSON_Parser_doString__P85364_mk(s);
     s.tmp_9.arg0 = s.arg0;
     s.callLocIdx = 70; s.pc = 32; return s.tmp_9;
   case 32:
@@ -56069,14 +55947,14 @@ switch (step) {
     { step = 27; continue; }
     { step = 23; continue; }
   case 10:
-    r0 = (s.c___125244 == 116);
+    r0 = (s.c___100628 == 116);
     s.tmp_10 = r0;
     r0 = pxsim_numops_toBool(s.tmp_10);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_10;
     { step = 12; continue; }
   case 11:
-    s.tmp_11 = JSON_Parser_checkKw__P110584_mk(s);
+    s.tmp_11 = JSON_Parser_checkKw__P85368_mk(s);
     s.tmp_11.arg0 = s.arg0;
     s.tmp_11.arg1 = "true";
     s.callLocIdx = 71; s.pc = 33; return s.tmp_11;
@@ -56091,14 +55969,14 @@ switch (step) {
     { step = 27; continue; }
     { step = 22; continue; }
   case 13:
-    r0 = (s.c___125244 == 102);
+    r0 = (s.c___100628 == 102);
     s.tmp_13 = r0;
     r0 = pxsim_numops_toBool(s.tmp_13);
     if (r0) { step = 14; continue; }
     r0 = s.tmp_13;
     { step = 15; continue; }
   case 14:
-    s.tmp_14 = JSON_Parser_checkKw__P110584_mk(s);
+    s.tmp_14 = JSON_Parser_checkKw__P85368_mk(s);
     s.tmp_14.arg0 = s.arg0;
     s.tmp_14.arg1 = "false";
     s.callLocIdx = 72; s.pc = 34; return s.tmp_14;
@@ -56113,14 +55991,14 @@ switch (step) {
     { step = 27; continue; }
     { step = 21; continue; }
   case 16:
-    r0 = (s.c___125244 == 110);
+    r0 = (s.c___100628 == 110);
     s.tmp_16 = r0;
     r0 = pxsim_numops_toBool(s.tmp_16);
     if (r0) { step = 17; continue; }
     r0 = s.tmp_16;
     { step = 18; continue; }
   case 17:
-    s.tmp_17 = JSON_Parser_checkKw__P110584_mk(s);
+    s.tmp_17 = JSON_Parser_checkKw__P85368_mk(s);
     s.tmp_17.arg0 = s.arg0;
     s.tmp_17.arg1 = "null";
     s.callLocIdx = 73; s.pc = 35; return s.tmp_17;
@@ -56141,7 +56019,7 @@ switch (step) {
   case 24:
   case 25:
   case 26:
-    s.tmp_19 = JSON_Parser_error__P110577_mk(s);
+    s.tmp_19 = JSON_Parser_error__P85361_mk(s);
     s.tmp_19.arg0 = s.arg0;
     s.tmp_19.arg1 = "unexpected token";
     s.callLocIdx = 74; s.pc = 36; return s.tmp_19;
@@ -56152,12 +56030,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_value__P110585.info = {"start":4976,"length":743,"line":178,"column":8,"endLine":200,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"value","argumentNames":["this"]}
+JSON_Parser_value__P85369.info = {"start":4976,"length":743,"line":178,"column":8,"endLine":200,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"value","argumentNames":["this"]}
 
-function JSON_Parser_value__P110585_mk(s) {
+function JSON_Parser_value__P85369_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_value__P110585, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_value__P85369, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56179,7 +56057,7 @@ function JSON_Parser_value__P110585_mk(s) {
   tmp_17: undefined,
   tmp_18: undefined,
   tmp_19: undefined,
-  c___125244: undefined,
+  c___100628: undefined,
   arg0: undefined,
 } }
 
@@ -56187,7 +56065,7 @@ function JSON_Parser_value__P110585_mk(s) {
 
 
 
-function JSON_Parser_checkKw__P110584(s) {
+function JSON_Parser_checkKw__P85368(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56203,8 +56081,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
-    s.tmp_2 = helpers_stringSlice__P106724_mk(s);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
+    s.tmp_2 = helpers_stringSlice__P81388_mk(s);
     r0 = s.arg0.fields["s"];
     s.tmp_2.arg0 = r0;
     r0 = s.arg0.fields["ptr"];
@@ -56240,12 +56118,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_checkKw__P110584.info = {"start":4764,"length":202,"line":170,"column":8,"endLine":176,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"checkKw","argumentNames":["this","k"]}
+JSON_Parser_checkKw__P85368.info = {"start":4764,"length":202,"line":170,"column":8,"endLine":176,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"checkKw","argumentNames":["this","k"]}
 
-function JSON_Parser_checkKw__P110584_mk(s) {
+function JSON_Parser_checkKw__P85368_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_checkKw__P110584, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_checkKw__P85368, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56264,7 +56142,7 @@ function JSON_Parser_checkKw__P110584_mk(s) {
 
 
 
-function JSON_Parser_doNumber__P110583(s) {
+function JSON_Parser_doNumber__P85367(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56274,32 +56152,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.beg___125470 = undefined;
-    s.c___125474 = undefined;
-    s.ss___125502 = undefined;
+    s.beg___100854 = undefined;
+    s.c___100858 = undefined;
+    s.ss___100886 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
     r0 = s.arg0.fields["ptr"];
-    s.beg___125470 = (r0);
+    s.beg___100854 = (r0);
   case 1:
-    s.tmp_0 = JSON_Parser_nextChar__P110579_mk(s);
+    s.tmp_0 = JSON_Parser_nextChar__P85363_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 62; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
-    s.c___125474 = (r0);
-    r0 = (48 <= s.c___125474);
+    s.c___100858 = (r0);
+    r0 = (48 <= s.c___100858);
     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.c___125474 <= 57);
+    r0 = (s.c___100858 <= 57);
   case 3:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -56308,7 +56186,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 5; continue; }
   case 4:
-    r0 = (s.c___125474 == 43);
+    r0 = (s.c___100858 == 43);
   case 5:
     // jmp value (already in r0)
     s.tmp_2 = r0;
@@ -56317,7 +56195,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 7; continue; }
   case 6:
-    r0 = (s.c___125474 == 45);
+    r0 = (s.c___100858 == 45);
   case 7:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -56326,7 +56204,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 9; continue; }
   case 8:
-    r0 = (s.c___125474 == 46);
+    r0 = (s.c___100858 == 46);
   case 9:
     // jmp value (already in r0)
     s.tmp_4 = r0;
@@ -56335,7 +56213,7 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 11; continue; }
   case 10:
-    r0 = (s.c___125474 == 69);
+    r0 = (s.c___100858 == 69);
   case 11:
     // jmp value (already in r0)
     s.tmp_5 = r0;
@@ -56344,7 +56222,7 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 13; continue; }
   case 12:
-    r0 = (s.c___125474 == 101);
+    r0 = (s.c___100858 == 101);
   case 13:
     // jmp value (already in r0)
     s.tmp_6 = r0;
@@ -56362,23 +56240,23 @@ switch (step) {
   case 15:
     { step = 1; continue; }
   case 16:
-    s.tmp_0 = helpers_stringSlice__P106724_mk(s);
+    s.tmp_0 = helpers_stringSlice__P81388_mk(s);
     r0 = s.arg0.fields["s"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.beg___125470;
+    s.tmp_0.arg1 = s.beg___100854;
     r0 = s.arg0.fields["ptr"];
     s.tmp_0.arg2 = r0;
     s.callLocIdx = 63; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.ss___125502 = (r0);
-    r0 = pxsim_String_.length(s.ss___125502);
+    s.ss___100886 = (r0);
+    r0 = pxsim_String_.length(s.ss___100886);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
-    s.tmp_2 = JSON_Parser_error__P110577_mk(s);
+    s.tmp_2 = JSON_Parser_error__P85361_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = "expecting number";
     s.callLocIdx = 64; s.pc = 22; return s.tmp_2;
@@ -56388,17 +56266,17 @@ switch (step) {
     { step = 19; continue; }
   case 17:
   case 18:
-    r0 = pxsim_String_.toNumber(s.ss___125502);
+    r0 = pxsim_String_.toNumber(s.ss___100886);
   case 19:
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_doNumber__P110583.info = {"start":4169,"length":585,"line":151,"column":8,"endLine":168,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doNumber","argumentNames":["this"]}
+JSON_Parser_doNumber__P85367.info = {"start":4169,"length":585,"line":151,"column":8,"endLine":168,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doNumber","argumentNames":["this"]}
 
-function JSON_Parser_doNumber__P110583_mk(s) {
+function JSON_Parser_doNumber__P85367_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_doNumber__P110583, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_doNumber__P85367, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56410,9 +56288,9 @@ function JSON_Parser_doNumber__P110583_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  beg___125470: undefined,
-  c___125474: undefined,
-  ss___125502: undefined,
+  beg___100854: undefined,
+  c___100858: undefined,
+  ss___100886: undefined,
   arg0: undefined,
 } }
 
@@ -56420,7 +56298,7 @@ function JSON_Parser_doNumber__P110583_mk(s) {
 
 
 
-function JSON_Parser_nextChar__P110579(s) {
+function JSON_Parser_nextChar__P85363(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56435,7 +56313,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
     r0 = s.arg0.fields["ptr"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["s"];
@@ -56463,12 +56341,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_nextChar__P110579.info = {"start":1514,"length":138,"line":62,"column":8,"endLine":66,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"nextChar","argumentNames":["this"]}
+JSON_Parser_nextChar__P85363.info = {"start":1514,"length":138,"line":62,"column":8,"endLine":66,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"nextChar","argumentNames":["this"]}
 
-function JSON_Parser_nextChar__P110579_mk(s) {
+function JSON_Parser_nextChar__P85363_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_nextChar__P110579, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_nextChar__P85363, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56485,7 +56363,7 @@ function JSON_Parser_nextChar__P110579_mk(s) {
 
 
 
-function JSON_Parser_doObject__P110582(s) {
+function JSON_Parser_doObject__P85366(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56495,18 +56373,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___125553 = undefined;
-    s.c___125559 = undefined;
-    s.k___125571 = undefined;
-    s.v___125583 = undefined;
+    s.r___100937 = undefined;
+    s.c___100943 = undefined;
+    s.k___100955 = undefined;
+    s.v___100967 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mkMap();
-    s.r___125553 = (r0);
+    s.r___100937 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["ptr"];
     s.tmp_2 = r0;
@@ -56514,13 +56392,13 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["ptr"] = (s.tmp_1);
   case 1:
-    s.tmp_0 = JSON_Parser_skipWS__P110578_mk(s);
+    s.tmp_0 = JSON_Parser_skipWS__P85362_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 54; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.c___125559 = (r0);
-    r0 = (s.c___125559 == 125);
+    s.c___100943 = (r0);
+    r0 = (s.c___100943 == 125);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
@@ -56530,47 +56408,47 @@ switch (step) {
     r0 = (s.tmp_3 + 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["ptr"] = (s.tmp_2);
-    r0 = s.r___125553;
+    r0 = s.r___100937;
     { step = 15; continue; }
   case 2:
   case 3:
-    r0 = (s.c___125559 != 34);
+    r0 = (s.c___100943 != 34);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = JSON_Parser_error__P110577_mk(s);
+    s.tmp_1 = JSON_Parser_error__P85361_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = "expecting key";
     s.callLocIdx = 55; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    r0 = s.r___125553;
+    r0 = s.r___100937;
     { step = 15; continue; }
   case 4:
   case 5:
-    s.tmp_0 = JSON_Parser_doString__P110580_mk(s);
+    s.tmp_0 = JSON_Parser_doString__P85364_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 56; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.k___125571 = (r0);
-    s.tmp_0 = JSON_Parser_skipWS__P110578_mk(s);
+    s.k___100955 = (r0);
+    s.tmp_0 = JSON_Parser_skipWS__P85362_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 57; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    s.c___125559 = (r0);
-    r0 = (s.c___125559 != 58);
+    s.c___100943 = (r0);
+    r0 = (s.c___100943 != 58);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_1 = JSON_Parser_error__P110577_mk(s);
+    s.tmp_1 = JSON_Parser_error__P85361_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = "expecting colon";
     s.callLocIdx = 58; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
-    r0 = s.r___125553;
+    r0 = s.r___100937;
     { step = 15; continue; }
   case 6:
   case 7:
@@ -56580,12 +56458,12 @@ switch (step) {
     r0 = (s.tmp_2 + 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["ptr"] = (s.tmp_1);
-    s.tmp_0 = JSON_Parser_value__P110585_mk(s);
+    s.tmp_0 = JSON_Parser_value__P85369_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 59; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.v___125583 = (r0);
+    s.v___100967 = (r0);
     r0 = s.arg0.fields["errorMsg"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -56594,14 +56472,14 @@ switch (step) {
     { step = 15; continue; }
   case 8:
   case 9:
-    r0 = pxsim_pxtrt.mapSetGeneric(s.r___125553, s.k___125571, s.v___125583);
-    s.tmp_0 = JSON_Parser_skipWS__P110578_mk(s);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.r___100937, s.k___100955, s.v___100967);
+    s.tmp_0 = JSON_Parser_skipWS__P85362_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 60; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
-    s.c___125559 = (r0);
-    r0 = (s.c___125559 == 44);
+    s.c___100943 = (r0);
+    r0 = (s.c___100943 == 44);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
@@ -56614,16 +56492,16 @@ switch (step) {
     { step = 14; continue; }
   case 10:
   case 11:
-    r0 = (s.c___125559 == 125);
+    r0 = (s.c___100943 == 125);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
     { step = 14; continue; }
   case 12:
   case 13:
-    s.tmp_1 = JSON_Parser_error__P110577_mk(s);
+    s.tmp_1 = JSON_Parser_error__P85361_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    r0 = pxsim_String_.fromCharCode(s.c___125559);
+    r0 = pxsim_String_.fromCharCode(s.c___100943);
     s.tmp_3 = r0;
     if ((s.tmp_3) && (s.tmp_3).vtable) {
     setupResume(s, 24);
@@ -56646,21 +56524,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_doObject__P110582.info = {"start":3123,"length":1036,"line":116,"column":8,"endLine":149,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doObject","argumentNames":["this"]}
+JSON_Parser_doObject__P85366.info = {"start":3123,"length":1036,"line":116,"column":8,"endLine":149,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doObject","argumentNames":["this"]}
 
-function JSON_Parser_doObject__P110582_mk(s) {
+function JSON_Parser_doObject__P85366_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_doObject__P110582, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_doObject__P85366, 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,
-  r___125553: undefined,
-  c___125559: undefined,
-  k___125571: undefined,
-  v___125583: undefined,
+  r___100937: undefined,
+  c___100943: undefined,
+  k___100955: undefined,
+  v___100967: undefined,
   arg0: undefined,
 } }
 
@@ -56668,7 +56546,7 @@ function JSON_Parser_doObject__P110582_mk(s) {
 
 
 
-function JSON_Parser_doArray__P110581(s) {
+function JSON_Parser_doArray__P85365(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56678,17 +56556,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___125518 = undefined;
-    s.c___125524 = undefined;
-    s.v___125532 = undefined;
+    s.r___100902 = undefined;
+    s.c___100908 = undefined;
+    s.v___100916 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
-    s.r___125518 = (r0);
+    s.r___100902 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["ptr"];
     s.tmp_2 = r0;
@@ -56696,13 +56574,13 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["ptr"] = (s.tmp_1);
   case 1:
-    s.tmp_0 = JSON_Parser_skipWS__P110578_mk(s);
+    s.tmp_0 = JSON_Parser_skipWS__P85362_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 50; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.c___125524 = (r0);
-    r0 = (s.c___125524 == 93);
+    s.c___100908 = (r0);
+    r0 = (s.c___100908 == 93);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
@@ -56712,16 +56590,16 @@ switch (step) {
     r0 = (s.tmp_3 + 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["ptr"] = (s.tmp_2);
-    r0 = s.r___125518;
+    r0 = s.r___100902;
     { step = 11; continue; }
   case 2:
   case 3:
-    s.tmp_0 = JSON_Parser_value__P110585_mk(s);
+    s.tmp_0 = JSON_Parser_value__P85369_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 51; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.v___125532 = (r0);
+    s.v___100916 = (r0);
     r0 = s.arg0.fields["errorMsg"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -56730,14 +56608,14 @@ switch (step) {
     { step = 11; continue; }
   case 4:
   case 5:
-    r0 = pxsim_Array__push(s.r___125518, s.v___125532);
-    s.tmp_0 = JSON_Parser_skipWS__P110578_mk(s);
+    r0 = pxsim_Array__push(s.r___100902, s.v___100916);
+    s.tmp_0 = JSON_Parser_skipWS__P85362_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 52; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.c___125524 = (r0);
-    r0 = (s.c___125524 == 44);
+    s.c___100908 = (r0);
+    r0 = (s.c___100908 == 44);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
@@ -56750,14 +56628,14 @@ switch (step) {
     { step = 10; continue; }
   case 6:
   case 7:
-    r0 = (s.c___125524 == 93);
+    r0 = (s.c___100908 == 93);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
     { step = 10; continue; }
   case 8:
   case 9:
-    s.tmp_1 = JSON_Parser_error__P110577_mk(s);
+    s.tmp_1 = JSON_Parser_error__P85361_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = "expecting comma";
     s.callLocIdx = 53; s.pc = 15; return s.tmp_1;
@@ -56770,20 +56648,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_doArray__P110581.info = {"start":2467,"length":646,"line":92,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doArray","argumentNames":["this"]}
+JSON_Parser_doArray__P85365.info = {"start":2467,"length":646,"line":92,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doArray","argumentNames":["this"]}
 
-function JSON_Parser_doArray__P110581_mk(s) {
+function JSON_Parser_doArray__P85365_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_doArray__P110581, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_doArray__P85365, 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,
-  r___125518: undefined,
-  c___125524: undefined,
-  v___125532: undefined,
+  r___100902: undefined,
+  c___100908: undefined,
+  v___100916: undefined,
   arg0: undefined,
 } }
 
@@ -56791,7 +56669,7 @@ function JSON_Parser_doArray__P110581_mk(s) {
 
 
 
-function JSON_Parser_doString__P110580(s) {
+function JSON_Parser_doString__P85364(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56801,17 +56679,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___125304 = undefined;
-    s.c___125309 = undefined;
-    s.q___125323 = undefined;
+    s.r___100688 = undefined;
+    s.c___100693 = undefined;
+    s.q___100707 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
-    s.r___125304 = (r0);
+    s.r___100688 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["ptr"];
     s.tmp_2 = r0;
@@ -56828,16 +56706,16 @@ switch (step) {
     r0 = s.arg0.fields["s"];
     s.tmp_3 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_2);
-    s.c___125309 = (r0);
-    r0 = (s.c___125309 == "\"");
+    s.c___100693 = (r0);
+    r0 = (s.c___100693 == "\"");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = s.r___125304;
+    r0 = s.r___100688;
     { step = 16; continue; }
   case 2:
   case 3:
-    r0 = (s.c___125309 == "\\");
+    r0 = (s.c___100693 == "\\");
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 14; continue; }
@@ -56850,41 +56728,41 @@ switch (step) {
     r0 = s.arg0.fields["s"];
     s.tmp_5 = r0;
     r0 = pxsim_String_.charAt(s.tmp_5, s.tmp_4);
-    s.q___125323 = (r0);
-    r0 = (s.q___125323 == "b");
+    s.q___100707 = (r0);
+    r0 = (s.q___100707 == "b");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.q___125323 = ("\b");
+    s.q___100707 = ("\b");
     { step = 13; continue; }
   case 4:
-    r0 = (s.q___125323 == "n");
+    r0 = (s.q___100707 == "n");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.q___125323 = ("\n");
+    s.q___100707 = ("\n");
     { step = 12; continue; }
   case 5:
-    r0 = (s.q___125323 == "r");
+    r0 = (s.q___100707 == "r");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.q___125323 = ("\r");
+    s.q___100707 = ("\r");
     { step = 11; continue; }
   case 6:
-    r0 = (s.q___125323 == "t");
+    r0 = (s.q___100707 == "t");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.q___125323 = ("\t");
+    s.q___100707 = ("\t");
     { step = 10; continue; }
   case 7:
-    r0 = (s.q___125323 == "u");
+    r0 = (s.q___100707 == "u");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_2 = JSON_parseIntRadix__P106984_mk(s);
-    s.tmp_3 = helpers_stringSlice__P106724_mk(s);
+    s.tmp_2 = JSON_parseIntRadix__P81648_mk(s);
+    s.tmp_3 = helpers_stringSlice__P81388_mk(s);
     r0 = s.arg0.fields["s"];
     s.tmp_3.arg0 = r0;
     r0 = s.arg0.fields["ptr"];
@@ -56903,7 +56781,7 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String_.fromCharCode(s.tmp_1);
-    s.q___125323 = (r0);
+    s.q___100707 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["ptr"];
     s.tmp_2 = r0;
@@ -56916,48 +56794,48 @@ switch (step) {
   case 11:
   case 12:
   case 13:
-    if ((s.r___125304) && (s.r___125304).vtable) {
+    if ((s.r___100688) && (s.r___100688).vtable) {
     setupResume(s, 19);
-    pxsim_String__stringConv(s.r___125304);
+    pxsim_String__stringConv(s.r___100688);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___125304) + ""; }
+    } else { s.retval = (s.r___100688) + ""; }
   case 19:
     r0 = s.retval;
     s.tmp_0 = r0;
-    if ((s.q___125323) && (s.q___125323).vtable) {
+    if ((s.q___100707) && (s.q___100707).vtable) {
     setupResume(s, 20);
-    pxsim_String__stringConv(s.q___125323);
+    pxsim_String__stringConv(s.q___100707);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.q___125323) + ""; }
+    } else { s.retval = (s.q___100707) + ""; }
   case 20:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.r___125304 = (r0);
+    s.r___100688 = (r0);
     { step = 15; continue; }
   case 14:
-    if ((s.r___125304) && (s.r___125304).vtable) {
+    if ((s.r___100688) && (s.r___100688).vtable) {
     setupResume(s, 21);
-    pxsim_String__stringConv(s.r___125304);
+    pxsim_String__stringConv(s.r___100688);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___125304) + ""; }
+    } else { s.retval = (s.r___100688) + ""; }
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
-    if ((s.c___125309) && (s.c___125309).vtable) {
+    if ((s.c___100693) && (s.c___100693).vtable) {
     setupResume(s, 22);
-    pxsim_String__stringConv(s.c___125309);
+    pxsim_String__stringConv(s.c___100693);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.c___125309) + ""; }
+    } else { s.retval = (s.c___100693) + ""; }
   case 22:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.r___125304 = (r0);
+    s.r___100688 = (r0);
   case 15:
     { step = 1; continue; }
     r0 = undefined;
@@ -56965,12 +56843,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_doString__P110580.info = {"start":1662,"length":795,"line":68,"column":8,"endLine":90,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doString","argumentNames":["this"]}
+JSON_Parser_doString__P85364.info = {"start":1662,"length":795,"line":68,"column":8,"endLine":90,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doString","argumentNames":["this"]}
 
-function JSON_Parser_doString__P110580_mk(s) {
+function JSON_Parser_doString__P85364_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_doString__P110580, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_doString__P85364, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56978,9 +56856,9 @@ function JSON_Parser_doString__P110580_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  r___125304: undefined,
-  c___125309: undefined,
-  q___125323: undefined,
+  r___100688: undefined,
+  c___100693: undefined,
+  q___100707: undefined,
   arg0: undefined,
 } }
 
@@ -56988,7 +56866,7 @@ function JSON_Parser_doString__P110580_mk(s) {
 
 
 
-function JSON_parseIntRadix__P106984(s) {
+function JSON_parseIntRadix__P81648(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56998,11 +56876,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.m___125387 = undefined;
-    s.r___125388 = undefined;
-    s.i___125389 = undefined;
-    s.c___125395 = undefined;
-    s.v___125420 = undefined;
+    s.m___100771 = undefined;
+    s.r___100772 = undefined;
+    s.i___100773 = undefined;
+    s.c___100779 = undefined;
+    s.v___100804 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -57027,27 +56905,27 @@ switch (step) {
     { step = 36; continue; }
   case 3:
   case 4:
-    s.m___125387 = (false);
-    s.r___125388 = (0);
-    s.i___125389 = (0);
+    s.m___100771 = (false);
+    s.r___100772 = (0);
+    s.i___100773 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___125389;
+    s.tmp_1 = r0 = s.i___100773;
     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 = 33; continue; }
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___125389);
-    s.c___125395 = (r0);
-    r0 = (s.c___125395 == 32);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___100773);
+    s.c___100779 = (r0);
+    r0 = (s.c___100779 == 32);
     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.c___125395 == 10);
+    r0 = (s.c___100779 == 10);
   case 7:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -57056,7 +56934,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 9; continue; }
   case 8:
-    r0 = (s.c___125395 == 13);
+    r0 = (s.c___100779 == 13);
   case 9:
     // jmp value (already in r0)
     s.tmp_2 = r0;
@@ -57065,7 +56943,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 11; continue; }
   case 10:
-    r0 = (s.c___125395 == 9);
+    r0 = (s.c___100779 == 9);
   case 11:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -57074,14 +56952,14 @@ switch (step) {
     { step = 32; continue; }
   case 12:
   case 13:
-    r0 = (s.r___125388 == 0);
+    r0 = (s.r___100772 == 0);
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBool(s.tmp_4);
     if (r0) { step = 14; continue; }
     r0 = s.tmp_4;
     { step = 15; continue; }
   case 14:
-    r0 = pxsim_numops_toBoolDecr(s.m___125387);
+    r0 = pxsim_numops_toBoolDecr(s.m___100771);
     s.tmp_5 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_5);
   case 15:
@@ -57092,89 +56970,89 @@ switch (step) {
     r0 = s.tmp_6;
     { step = 17; continue; }
   case 16:
-    r0 = (s.c___125395 == 45);
+    r0 = (s.c___100779 == 45);
   case 17:
     // jmp value (already in r0)
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 18; continue; }
-    s.m___125387 = (true);
+    s.m___100771 = (true);
     { step = 32; continue; }
   case 18:
   case 19:
-    s.v___125420 = (-1);
-    r0 = (48 <= s.c___125395);
+    s.v___100804 = (-1);
+    r0 = (48 <= s.c___100779);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 20; continue; }
     r0 = s.tmp_0;
     { step = 21; continue; }
   case 20:
-    r0 = (s.c___125395 <= 57);
+    r0 = (s.c___100779 <= 57);
   case 21:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 22; continue; }
-    r0 = (s.c___125395 - 48);
-    s.v___125420 = (r0);
+    r0 = (s.c___100779 - 48);
+    s.v___100804 = (r0);
     { step = 27; continue; }
   case 22:
-    r0 = (s.c___125395 | 32);
-    s.c___125395 = (r0);
-    r0 = (97 <= s.c___125395);
+    r0 = (s.c___100779 | 32);
+    s.c___100779 = (r0);
+    r0 = (97 <= s.c___100779);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 23; continue; }
     r0 = s.tmp_0;
     { step = 24; continue; }
   case 23:
-    r0 = (s.c___125395 <= 122);
+    r0 = (s.c___100779 <= 122);
   case 24:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 25; continue; }
-    r0 = (s.c___125395 - 97);
+    r0 = (s.c___100779 - 97);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 10);
-    s.v___125420 = (r0);
+    s.v___100804 = (r0);
   case 25:
   case 26:
   case 27:
-    r0 = (0 <= s.v___125420);
+    r0 = (0 <= s.v___100804);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 28; continue; }
     r0 = s.tmp_0;
     { step = 29; continue; }
   case 28:
-    r0 = (s.v___125420 < s.arg1);
+    r0 = (s.v___100804 < s.arg1);
   case 29:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 30; continue; }
-    r0 = (s.r___125388 * s.arg1);
-    s.r___125388 = (r0);
-    r0 = (s.r___125388 + s.v___125420);
-    s.r___125388 = (r0);
+    r0 = (s.r___100772 * s.arg1);
+    s.r___100772 = (r0);
+    r0 = (s.r___100772 + s.v___100804);
+    s.r___100772 = (r0);
     { step = 31; continue; }
   case 30:
     r0 = undefined;
     { step = 36; continue; }
   case 31:
   case 32:
-    r0 = (s.i___125389 + 1);
-    s.i___125389 = (r0);
+    r0 = (s.i___100773 + 1);
+    s.i___100773 = (r0);
     { step = 5; continue; }
   case 33:
-    r0 = pxsim_numops_toBoolDecr(s.m___125387);
+    r0 = pxsim_numops_toBoolDecr(s.m___100771);
     if (!r0) { step = 34; continue; }
-    r0 = (0 - s.r___125388);
+    r0 = (0 - s.r___100772);
     { step = 35; continue; }
   case 34:
-    r0 = s.r___125388;
+    r0 = s.r___100772;
   case 35:
     // jmp value (already in r0)
     s.tmp_0 = r0;
@@ -57183,12 +57061,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_parseIntRadix__P106984.info = {"start":21,"length":894,"line":1,"column":4,"endLine":35,"endColumn":5,"fileName":"pxt_modules/base/json.ts","functionName":"parseIntRadix","argumentNames":["s","base"]}
+JSON_parseIntRadix__P81648.info = {"start":21,"length":894,"line":1,"column":4,"endLine":35,"endColumn":5,"fileName":"pxt_modules/base/json.ts","functionName":"parseIntRadix","argumentNames":["s","base"]}
 
-function JSON_parseIntRadix__P106984_mk(s) {
+function JSON_parseIntRadix__P81648_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_parseIntRadix__P106984, depth: s.depth + 1,
+        parent: s, fn: JSON_parseIntRadix__P81648, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57198,11 +57076,11 @@ function JSON_parseIntRadix__P106984_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  m___125387: undefined,
-  r___125388: undefined,
-  i___125389: undefined,
-  c___125395: undefined,
-  v___125420: undefined,
+  m___100771: undefined,
+  r___100772: undefined,
+  i___100773: undefined,
+  c___100779: undefined,
+  v___100804: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -57211,7 +57089,7 @@ function JSON_parseIntRadix__P106984_mk(s) {
 
 
 
-function JSON_Parser_skipWS__P110578(s) {
+function JSON_Parser_skipWS__P85362(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57221,28 +57099,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.c___125208 = undefined;
+    s.c___100592 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
   case 1:
-    s.tmp_0 = JSON_Parser_nextChar__P110579_mk(s);
+    s.tmp_0 = JSON_Parser_nextChar__P85363_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 47; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.c___125208 = (r0);
-    r0 = (s.c___125208 == 32);
+    s.c___100592 = (r0);
+    r0 = (s.c___100592 == 32);
     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.c___125208 == 10);
+    r0 = (s.c___100592 == 10);
   case 3:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -57251,7 +57129,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 5; continue; }
   case 4:
-    r0 = (s.c___125208 == 13);
+    r0 = (s.c___100592 == 13);
   case 5:
     // jmp value (already in r0)
     s.tmp_2 = r0;
@@ -57260,7 +57138,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 7; continue; }
   case 6:
-    r0 = (s.c___125208 == 9);
+    r0 = (s.c___100592 == 9);
   case 7:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -57274,7 +57152,7 @@ switch (step) {
     r0 = (s.tmp_6 - 1);
     s.tmp_5 = r0;
     r0 = (s.tmp_4).fields["ptr"] = (s.tmp_5);
-    r0 = s.c___125208;
+    r0 = s.c___100592;
     { step = 10; continue; }
   case 9:
     { step = 1; continue; }
@@ -57283,12 +57161,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_skipWS__P110578.info = {"start":1203,"length":301,"line":50,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"skipWS","argumentNames":["this"]}
+JSON_Parser_skipWS__P85362.info = {"start":1203,"length":301,"line":50,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"skipWS","argumentNames":["this"]}
 
-function JSON_Parser_skipWS__P110578_mk(s) {
+function JSON_Parser_skipWS__P85362_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_skipWS__P110578, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_skipWS__P85362, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57297,7 +57175,7 @@ function JSON_Parser_skipWS__P110578_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  c___125208: undefined,
+  c___100592: undefined,
   arg0: undefined,
 } }
 
@@ -57305,7 +57183,7 @@ function JSON_Parser_skipWS__P110578_mk(s) {
 
 
 
-function JSON_Parser_error__P110577(s) {
+function JSON_Parser_error__P85361(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57321,7 +57199,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Parser__C110576_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Parser__C85360_VT)) failedCast(r0);
     r0 = s.arg0.fields["errorMsg"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -57377,12 +57255,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Parser_error__P110577.info = {"start":1009,"length":184,"line":43,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"error","argumentNames":["this","msg"]}
+JSON_Parser_error__P85361.info = {"start":1009,"length":184,"line":43,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"error","argumentNames":["this","msg"]}
 
-function JSON_Parser_error__P110577_mk(s) {
+function JSON_Parser_error__P85361_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Parser_error__P110577, depth: s.depth + 1,
+        parent: s, fn: JSON_Parser_error__P85361, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57402,7 +57280,7 @@ function JSON_Parser_error__P110577_mk(s) {
 
 
 
-function settings_exists__P108334(s) {
+function settings_exists__P83110(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57420,12 +57298,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_exists__P108334.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__P83110.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__P108334_mk(s) {
+function settings_exists__P83110_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_exists__P108334, depth: s.depth + 1,
+        parent: s, fn: settings_exists__P83110, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -57434,7 +57312,7 @@ function settings_exists__P108334_mk(s) {
 
 
 
-function kodu_WorldStage_save__P565277(s) {
+function kodu_WorldStage_save__P85230(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57444,14 +57322,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.savedGame___565449 = undefined;
-    s.s___565460 = undefined;
+    s.savedGame___94191 = undefined;
+    s.s___94202 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = s.arg0.fields["gameMode"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 1);
@@ -57461,32 +57339,32 @@ switch (step) {
     r0 = pxsim_pxtcore.throwValue("aah!");
   case 1:
   case 2:
-    s.tmp_2 = kodu_mkSavedGame__P565302_mk(s);
+    s.tmp_2 = kodu_mkSavedGame__P94047_mk(s);
     s.callLocIdx = 1204; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    s.savedGame___565449 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565455);
+    s.savedGame___94191 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94197);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.savedGame___565449);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.savedGame___94191);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 1205; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = JSON_stringify__P106985_mk(s);
-    s.tmp_0.arg0 = s.savedGame___565449;
-    s.tmp_0.arg1 = inline__P565464;
+    s.tmp_0 = JSON_stringify__P81649_mk(s);
+    s.tmp_0.arg0 = s.savedGame___94191;
+    s.tmp_0.arg1 = inline__P94206;
     s.tmp_0.arg2 = 0;
     s.callLocIdx = 1206; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.s___565460 = (r0);
-    s.tmp_0 = settings_writeString__P108325_mk(s);
-    s.tmp_0.arg0 = globals.SAVEGAME___565300;
-    s.tmp_0.arg1 = s.s___565460;
+    s.s___94202 = (r0);
+    s.tmp_0 = settings_writeString__P83101_mk(s);
+    s.tmp_0.arg0 = globals.SAVEGAME___94045;
+    s.tmp_0.arg1 = s.s___94202;
     s.callLocIdx = 1207; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
@@ -57494,18 +57372,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_save__P565277.info = {"start":4158,"length":449,"line":125,"column":8,"endLine":134,"endColumn":9,"fileName":"worldStage.ts","functionName":"save","argumentNames":["this"]}
+kodu_WorldStage_save__P85230.info = {"start":4218,"length":449,"line":126,"column":8,"endLine":135,"endColumn":9,"fileName":"worldStage.ts","functionName":"save","argumentNames":["this"]}
 
-function kodu_WorldStage_save__P565277_mk(s) {
+function kodu_WorldStage_save__P85230_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_save__P565277, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_save__P85230, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  savedGame___565449: undefined,
-  s___565460: undefined,
+  savedGame___94191: undefined,
+  s___94202: undefined,
   arg0: undefined,
 } }
 
@@ -57513,7 +57391,7 @@ function kodu_WorldStage_save__P565277_mk(s) {
 
 
 
-function inline__P565455(s) {
+function inline__P94197(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57527,11 +57405,11 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Component__C345109_v2_3_mk(s);
+    s.tmp_0 = kodu_Component__C84895_v2_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = "save";
     s.tmp_0.arg2 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C345109_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C84895_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.notify;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -57540,12 +57418,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565455.info = {"start":4343,"length":38,"line":130,"column":36,"endLine":130,"endColumn":74,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P94197.info = {"start":4403,"length":38,"line":131,"column":36,"endLine":131,"endColumn":74,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P565455_mk(s) {
+function inline__P94197_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565455, depth: s.depth + 1,
+        parent: s, fn: inline__P94197, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -57555,7 +57433,7 @@ function inline__P565455_mk(s) {
 
 
 
-function inline__P565464(s) {
+function inline__P94206(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57585,12 +57463,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565464.info = {"start":4432,"length":73,"line":131,"column":48,"endLine":131,"endColumn":121,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["key","value"]}
+inline__P94206.info = {"start":4492,"length":73,"line":132,"column":48,"endLine":132,"endColumn":121,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["key","value"]}
 
-function inline__P565464_mk(s) {
+function inline__P94206_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565464, depth: s.depth + 1,
+        parent: s, fn: inline__P94206, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57602,7 +57480,7 @@ function inline__P565464_mk(s) {
 
 
 
-function JSON_stringify__P106985(s) {
+function JSON_stringify__P81649(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57612,16 +57490,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ss___124447 = undefined;
+    s.ss___99782 = 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(JSON_Stringifier__C110586_VT);
-    s.ss___124447 = (r0);
-    s.tmp_0 = r0 = s.ss___124447;
+    r0 = pxsim_pxtcore_mkClassInstance(JSON_Stringifier__C85370_VT);
+    s.ss___99782 = (r0);
+    s.tmp_0 = r0 = s.ss___99782;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["currIndent"] = (s.tmp_1);
@@ -57641,15 +57519,15 @@ switch (step) {
     s.arg2 = (10);
   case 3:
   case 4:
-    s.tmp_0 = r0 = s.ss___124447;
+    s.tmp_0 = r0 = s.ss___99782;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["indentStep"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.ss___124447;
+    s.tmp_0 = r0 = s.ss___99782;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["currIndent"] = (s.tmp_1);
-    r0 = (s.ss___124447).fields["indent"] = (s.arg2);
+    r0 = (s.ss___99782).fields["indent"] = (s.arg2);
   case 5:
     s.tmp_0 = r0 = s.arg2;
     r0 = (s.tmp_0 - 1);
@@ -57658,7 +57536,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 6; continue; }
-    s.tmp_2 = r0 = s.ss___124447;
+    s.tmp_2 = r0 = s.ss___99782;
     r0 = s.tmp_2.fields["indentStep"];
     s.tmp_5 = r0;
     if ((s.tmp_5) && (s.tmp_5).vtable) {
@@ -57675,8 +57553,8 @@ switch (step) {
     r0 = (s.tmp_2).fields["indentStep"] = (s.tmp_3);
     { step = 5; continue; }
   case 6:
-    s.tmp_0 = JSON_Stringifier_go__P110588_mk(s);
-    s.tmp_0.arg0 = s.ss___124447;
+    s.tmp_0 = JSON_Stringifier_go__P85372_mk(s);
+    s.tmp_0.arg0 = s.ss___99782;
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 81; s.pc = 8; return s.tmp_0;
   case 8:
@@ -57684,12 +57562,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_stringify__P106985.info = {"start":8773,"length":414,"line":288,"column":4,"endLine":300,"endColumn":5,"fileName":"pxt_modules/base/json.ts","functionName":"stringify","argumentNames":["value","replacer","indent"]}
+JSON_stringify__P81649.info = {"start":8773,"length":414,"line":288,"column":4,"endLine":300,"endColumn":5,"fileName":"pxt_modules/base/json.ts","functionName":"stringify","argumentNames":["value","replacer","indent"]}
 
-function JSON_stringify__P106985_mk(s) {
+function JSON_stringify__P81649_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_stringify__P106985, depth: s.depth + 1,
+        parent: s, fn: JSON_stringify__P81649, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57697,7 +57575,7 @@ function JSON_stringify__P106985_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  ss___124447: undefined,
+  ss___99782: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -57707,7 +57585,7 @@ function JSON_stringify__P106985_mk(s) {
 
 
 
-function JSON_Stringifier_go__P110588(s) {
+function JSON_Stringifier_go__P85372(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57717,28 +57595,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.t___124488 = undefined;
-    s.arr___124512 = undefined;
-    s.r___124518 = undefined;
-    s.i___124535 = undefined;
-    s.keys___124599 = undefined;
-    s.r___124606 = undefined;
-    s.i___124623 = undefined;
-    s.k___124629 = undefined;
+    s.t___99823 = undefined;
+    s.arr___99847 = undefined;
+    s.r___99853 = undefined;
+    s.i___99870 = undefined;
+    s.keys___99934 = undefined;
+    s.r___99941 = undefined;
+    s.i___99958 = undefined;
+    s.k___99964 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Stringifier__C110586_VT)) failedCast(r0);
+    if (!checkSubtype(r0, JSON_Stringifier__C85370_VT)) failedCast(r0);
     r0 = pxsim_pxtcore.typeOf(s.arg1);
-    s.t___124488 = (r0);
-    r0 = (s.t___124488 == "string");
+    s.t___99823 = (r0);
+    r0 = (s.t___99823 == "string");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = JSON_Stringifier_doString__P110587_mk(s);
+    s.tmp_1 = JSON_Stringifier_doString__P85371_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     s.callLocIdx = 75; s.pc = 38; return s.tmp_1;
@@ -57747,14 +57625,14 @@ switch (step) {
     { step = 37; continue; }
     { step = 36; continue; }
   case 1:
-    r0 = (s.t___124488 == "boolean");
+    r0 = (s.t___99823 == "boolean");
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (!r0) { step = 2; continue; }
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    r0 = (s.t___124488 == "number");
+    r0 = (s.t___99823 == "number");
   case 3:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -57788,8 +57666,8 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 19; continue; }
-    s.arr___124512 = (s.arg1);
-    r0 = pxsim_Array__length(s.arr___124512);
+    s.arr___99847 = (s.arg1);
+    r0 = pxsim_Array__length(s.arr___99847);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
@@ -57799,7 +57677,7 @@ switch (step) {
     { step = 37; continue; }
     { step = 18; continue; }
   case 7:
-    s.r___124518 = ("[");
+    s.r___99853 = ("[");
     r0 = s.arg0.fields["indent"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -57830,34 +57708,34 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_5);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["currIndent"] = (s.tmp_2);
-    if ((s.r___124518) && (s.r___124518).vtable) {
+    if ((s.r___99853) && (s.r___99853).vtable) {
     setupResume(s, 42);
-    pxsim_String__stringConv(s.r___124518);
+    pxsim_String__stringConv(s.r___99853);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124518) + ""; }
+    } else { s.retval = (s.r___99853) + ""; }
   case 42:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, "\n");
-    s.r___124518 = (r0);
+    s.r___99853 = (r0);
   case 8:
   case 9:
-    s.i___124535 = (0);
+    s.i___99870 = (0);
   case 10:
-    s.tmp_1 = r0 = s.i___124535;
-    r0 = pxsim_Array__length(s.arr___124512);
+    s.tmp_1 = r0 = s.i___99870;
+    r0 = pxsim_Array__length(s.arr___99847);
     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; }
-    if ((s.r___124518) && (s.r___124518).vtable) {
+    if ((s.r___99853) && (s.r___99853).vtable) {
     setupResume(s, 43);
-    pxsim_String__stringConv(s.r___124518);
+    pxsim_String__stringConv(s.r___99853);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124518) + ""; }
+    } else { s.retval = (s.r___99853) + ""; }
   case 43:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -57872,9 +57750,9 @@ switch (step) {
   case 44:
     r0 = s.retval;
     s.tmp_6 = r0;
-    s.tmp_10 = JSON_Stringifier_go__P110588_mk(s);
+    s.tmp_10 = JSON_Stringifier_go__P85372_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.arr___124512, s.i___124535);
+    r0 = pxsim_Array__getAt(s.arr___99847, s.i___99870);
     s.tmp_10.arg1 = r0;
     s.callLocIdx = 76; s.pc = 45; return s.tmp_10;
   case 45:
@@ -57901,9 +57779,9 @@ switch (step) {
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_4);
-    s.r___124518 = (r0);
-    s.tmp_1 = r0 = s.i___124535;
-    r0 = pxsim_Array__length(s.arr___124512);
+    s.r___99853 = (r0);
+    s.tmp_1 = r0 = s.i___99870;
+    r0 = pxsim_Array__length(s.arr___99847);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_2 = r0;
@@ -57911,38 +57789,38 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    if ((s.r___124518) && (s.r___124518).vtable) {
+    if ((s.r___99853) && (s.r___99853).vtable) {
     setupResume(s, 48);
-    pxsim_String__stringConv(s.r___124518);
+    pxsim_String__stringConv(s.r___99853);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124518) + ""; }
+    } else { s.retval = (s.r___99853) + ""; }
   case 48:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_4, ",");
-    s.r___124518 = (r0);
+    s.r___99853 = (r0);
   case 11:
   case 12:
     r0 = s.arg0.fields["indent"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    if ((s.r___124518) && (s.r___124518).vtable) {
+    if ((s.r___99853) && (s.r___99853).vtable) {
     setupResume(s, 49);
-    pxsim_String__stringConv(s.r___124518);
+    pxsim_String__stringConv(s.r___99853);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124518) + ""; }
+    } else { s.retval = (s.r___99853) + ""; }
   case 49:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, "\n");
-    s.r___124518 = (r0);
+    s.r___99853 = (r0);
   case 13:
   case 14:
-    r0 = (s.i___124535 + 1);
-    s.i___124535 = (r0);
+    r0 = (s.i___99870 + 1);
+    s.i___99870 = (r0);
     { step = 10; continue; }
   case 15:
     r0 = s.arg0.fields["indent"];
@@ -57950,7 +57828,7 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_stringSlice__P106724_mk(s);
+    s.tmp_3 = helpers_stringSlice__P81388_mk(s);
     r0 = s.arg0.fields["currIndent"];
     s.tmp_3.arg0 = r0;
     r0 = s.arg0.fields["indent"];
@@ -57963,12 +57841,12 @@ switch (step) {
     r0 = (s.tmp_1).fields["currIndent"] = (s.tmp_2);
   case 16:
   case 17:
-    if ((s.r___124518) && (s.r___124518).vtable) {
+    if ((s.r___99853) && (s.r___99853).vtable) {
     setupResume(s, 51);
-    pxsim_String__stringConv(s.r___124518);
+    pxsim_String__stringConv(s.r___99853);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124518) + ""; }
+    } else { s.retval = (s.r___99853) + ""; }
   case 51:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -57995,15 +57873,15 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.r___124518 = (r0);
-    r0 = s.r___124518;
+    s.r___99853 = (r0);
+    r0 = s.r___99853;
     { step = 37; continue; }
   case 18:
     { step = 34; continue; }
   case 19:
     r0 = pxsim_pxtrt.keysOf(s.arg1);
-    s.keys___124599 = (r0);
-    r0 = pxsim_Array__length(s.keys___124599);
+    s.keys___99934 = (r0);
+    r0 = pxsim_Array__length(s.keys___99934);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
@@ -58013,7 +57891,7 @@ switch (step) {
     { step = 37; continue; }
   case 20:
   case 21:
-    s.r___124606 = ("{");
+    s.r___99941 = ("{");
     r0 = s.arg0.fields["indent"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -58044,36 +57922,36 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_5);
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["currIndent"] = (s.tmp_2);
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 56);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 56:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, "\n");
-    s.r___124606 = (r0);
+    s.r___99941 = (r0);
   case 22:
   case 23:
-    s.i___124623 = (0);
+    s.i___99958 = (0);
   case 24:
-    s.tmp_1 = r0 = s.i___124623;
-    r0 = pxsim_Array__length(s.keys___124599);
+    s.tmp_1 = r0 = s.i___99958;
+    r0 = pxsim_Array__length(s.keys___99934);
     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 = 31; continue; }
-    r0 = pxsim_Array__getAt(s.keys___124599, s.i___124623);
-    s.k___124629 = (r0);
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    r0 = pxsim_Array__getAt(s.keys___99934, s.i___99958);
+    s.k___99964 = (r0);
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 57);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 57:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -58088,9 +57966,9 @@ switch (step) {
   case 58:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_7 = JSON_Stringifier_doString__P110587_mk(s);
+    s.tmp_7 = JSON_Stringifier_doString__P85371_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.tmp_7.arg1 = s.k___124629;
+    s.tmp_7.arg1 = s.k___99964;
     s.callLocIdx = 78; s.pc = 59; return s.tmp_7;
   case 59:
     r0 = s.retval;
@@ -58116,48 +57994,48 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.r___124606 = (r0);
+    s.r___99941 = (r0);
     r0 = s.arg0.fields["indent"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 25; continue; }
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 62);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 62:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, ": ");
-    s.r___124606 = (r0);
+    s.r___99941 = (r0);
     { step = 26; continue; }
   case 25:
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 63);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 63:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, ":");
-    s.r___124606 = (r0);
+    s.r___99941 = (r0);
   case 26:
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 64);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 64:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = JSON_Stringifier_go__P110588_mk(s);
+    s.tmp_3 = JSON_Stringifier_go__P85372_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.arg1, s.k___124629);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.arg1, s.k___99964);
     s.tmp_3.arg1 = r0;
     s.callLocIdx = 79; s.pc = 65; return s.tmp_3;
   case 65:
@@ -58173,9 +58051,9 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.r___124606 = (r0);
-    s.tmp_1 = r0 = s.i___124623;
-    r0 = pxsim_Array__length(s.keys___124599);
+    s.r___99941 = (r0);
+    s.tmp_1 = r0 = s.i___99958;
+    r0 = pxsim_Array__length(s.keys___99934);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_2 = r0;
@@ -58183,38 +58061,38 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 27; continue; }
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 67);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 67:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_4, ",");
-    s.r___124606 = (r0);
+    s.r___99941 = (r0);
   case 27:
   case 28:
     r0 = s.arg0.fields["indent"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 29; continue; }
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 68);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 68:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, "\n");
-    s.r___124606 = (r0);
+    s.r___99941 = (r0);
   case 29:
   case 30:
-    r0 = (s.i___124623 + 1);
-    s.i___124623 = (r0);
+    r0 = (s.i___99958 + 1);
+    s.i___99958 = (r0);
     { step = 24; continue; }
   case 31:
     r0 = s.arg0.fields["indent"];
@@ -58222,7 +58100,7 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_stringSlice__P106724_mk(s);
+    s.tmp_3 = helpers_stringSlice__P81388_mk(s);
     r0 = s.arg0.fields["currIndent"];
     s.tmp_3.arg0 = r0;
     r0 = s.arg0.fields["indent"];
@@ -58235,12 +58113,12 @@ switch (step) {
     r0 = (s.tmp_1).fields["currIndent"] = (s.tmp_2);
   case 32:
   case 33:
-    if ((s.r___124606) && (s.r___124606).vtable) {
+    if ((s.r___99941) && (s.r___99941).vtable) {
     setupResume(s, 70);
-    pxsim_String__stringConv(s.r___124606);
+    pxsim_String__stringConv(s.r___99941);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124606) + ""; }
+    } else { s.retval = (s.r___99941) + ""; }
   case 70:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -58267,8 +58145,8 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.r___124606 = (r0);
-    r0 = s.r___124606;
+    s.r___99941 = (r0);
+    r0 = s.r___99941;
     { step = 37; continue; }
   case 34:
   case 35:
@@ -58278,12 +58156,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Stringifier_go__P110588.info = {"start":6319,"length":2076,"line":223,"column":8,"endLine":279,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"go","argumentNames":["this","v"]}
+JSON_Stringifier_go__P85372.info = {"start":6319,"length":2076,"line":223,"column":8,"endLine":279,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"go","argumentNames":["this","v"]}
 
-function JSON_Stringifier_go__P110588_mk(s) {
+function JSON_Stringifier_go__P85372_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Stringifier_go__P110588, depth: s.depth + 1,
+        parent: s, fn: JSON_Stringifier_go__P85372, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58296,14 +58174,14 @@ function JSON_Stringifier_go__P110588_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  t___124488: undefined,
-  arr___124512: undefined,
-  r___124518: undefined,
-  i___124535: undefined,
-  keys___124599: undefined,
-  r___124606: undefined,
-  i___124623: undefined,
-  k___124629: undefined,
+  t___99823: undefined,
+  arr___99847: undefined,
+  r___99853: undefined,
+  i___99870: undefined,
+  keys___99934: undefined,
+  r___99941: undefined,
+  i___99958: undefined,
+  k___99964: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -58312,7 +58190,7 @@ function JSON_Stringifier_go__P110588_mk(s) {
 
 
 
-function JSON_Stringifier_doString__P110587(s) {
+function JSON_Stringifier_doString__P85371(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58322,68 +58200,68 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___124715 = undefined;
-    s.i___124716 = undefined;
-    s.c___124722 = undefined;
+    s.r___100050 = undefined;
+    s.i___100051 = undefined;
+    s.c___100057 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, JSON_Stringifier__C110586_VT)) failedCast(r0);
-    s.r___124715 = ("\"");
-    s.i___124716 = (0);
+    if (!checkSubtype(r0, JSON_Stringifier__C85370_VT)) failedCast(r0);
+    s.r___100050 = ("\"");
+    s.i___100051 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___124716;
+    s.tmp_1 = r0 = s.i___100051;
     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 = 14; continue; }
-    r0 = pxsim_String_.charAt(s.arg1, s.i___124716);
-    s.c___124722 = (r0);
-    r0 = (s.c___124722 == "\n");
+    r0 = pxsim_String_.charAt(s.arg1, s.i___100051);
+    s.c___100057 = (r0);
+    r0 = (s.c___100057 == "\n");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.c___124722 = ("\\n");
+    s.c___100057 = ("\\n");
     { step = 13; continue; }
   case 2:
-    r0 = (s.c___124722 == "\r");
+    r0 = (s.c___100057 == "\r");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.c___124722 = ("\\r");
+    s.c___100057 = ("\\r");
     { step = 12; continue; }
   case 3:
-    r0 = (s.c___124722 == "\t");
+    r0 = (s.c___100057 == "\t");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.c___124722 = ("\\t");
+    s.c___100057 = ("\\t");
     { step = 11; continue; }
   case 4:
-    r0 = (s.c___124722 == "\b");
+    r0 = (s.c___100057 == "\b");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.c___124722 = ("\\b");
+    s.c___100057 = ("\\b");
     { step = 10; continue; }
   case 5:
-    r0 = (s.c___124722 == "\\");
+    r0 = (s.c___100057 == "\\");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.c___124722 = ("\\\\");
+    s.c___100057 = ("\\\\");
     { step = 9; continue; }
   case 6:
-    r0 = (s.c___124722 == "\"");
+    r0 = (s.c___100057 == "\"");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.c___124722 = ("\\\"");
+    s.c___100057 = ("\\\"");
   case 7:
   case 8:
   case 9:
@@ -58391,36 +58269,36 @@ switch (step) {
   case 11:
   case 12:
   case 13:
-    if ((s.r___124715) && (s.r___124715).vtable) {
+    if ((s.r___100050) && (s.r___100050).vtable) {
     setupResume(s, 15);
-    pxsim_String__stringConv(s.r___124715);
+    pxsim_String__stringConv(s.r___100050);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124715) + ""; }
+    } else { s.retval = (s.r___100050) + ""; }
   case 15:
     r0 = s.retval;
     s.tmp_0 = r0;
-    if ((s.c___124722) && (s.c___124722).vtable) {
+    if ((s.c___100057) && (s.c___100057).vtable) {
     setupResume(s, 16);
-    pxsim_String__stringConv(s.c___124722);
+    pxsim_String__stringConv(s.c___100057);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.c___124722) + ""; }
+    } else { s.retval = (s.c___100057) + ""; }
   case 16:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.r___124715 = (r0);
-    r0 = (s.i___124716 + 1);
-    s.i___124716 = (r0);
+    s.r___100050 = (r0);
+    r0 = (s.i___100051 + 1);
+    s.i___100051 = (r0);
     { step = 1; continue; }
   case 14:
-    if ((s.r___124715) && (s.r___124715).vtable) {
+    if ((s.r___100050) && (s.r___100050).vtable) {
     setupResume(s, 17);
-    pxsim_String__stringConv(s.r___124715);
+    pxsim_String__stringConv(s.r___100050);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___124715) + ""; }
+    } else { s.retval = (s.r___100050) + ""; }
   case 17:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -58428,19 +58306,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-JSON_Stringifier_doString__P110587.info = {"start":5837,"length":472,"line":208,"column":8,"endLine":221,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doString","argumentNames":["this","s"]}
+JSON_Stringifier_doString__P85371.info = {"start":5837,"length":472,"line":208,"column":8,"endLine":221,"endColumn":9,"fileName":"pxt_modules/base/json.ts","functionName":"doString","argumentNames":["this","s"]}
 
-function JSON_Stringifier_doString__P110587_mk(s) {
+function JSON_Stringifier_doString__P85371_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: JSON_Stringifier_doString__P110587, depth: s.depth + 1,
+        parent: s, fn: JSON_Stringifier_doString__P85371, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  r___124715: undefined,
-  i___124716: undefined,
-  c___124722: undefined,
+  r___100050: undefined,
+  i___100051: undefined,
+  c___100057: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -58449,7 +58327,7 @@ function JSON_Stringifier_doString__P110587_mk(s) {
 
 
 
-function kodu_mkSavedGame__P565302(s) {
+function kodu_mkSavedGame__P94047(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58478,12 +58356,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_mkSavedGame__P565302.info = {"start":211,"length":162,"line":10,"column":4,"endLine":16,"endColumn":5,"fileName":"worldStage.ts","functionName":"mkSavedGame","argumentNames":[]}
+kodu_mkSavedGame__P94047.info = {"start":211,"length":162,"line":10,"column":4,"endLine":16,"endColumn":5,"fileName":"worldStage.ts","functionName":"mkSavedGame","argumentNames":[]}
 
-function kodu_mkSavedGame__P565302_mk(s) {
+function kodu_mkSavedGame__P94047_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_mkSavedGame__P565302, depth: s.depth + 1,
+        parent: s, fn: kodu_mkSavedGame__P94047, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58495,7 +58373,7 @@ function kodu_mkSavedGame__P565302_mk(s) {
 
 
 
-function kodu_Cursor_disable__P549534(s) {
+function kodu_Cursor_disable__P84993(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58510,32 +58388,32 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = (s.arg0).fields["disabled"] = (true);
-    s.tmp_0 = kodu_Kelpie_invisible__P110508_mk(s);
+    s.tmp_0 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["kel0"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 337; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 336; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_invisible__P110508_mk(s);
+    s.tmp_0 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["kel1"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 338; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 337; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_disable__P549534.info = {"start":1733,"length":142,"line":54,"column":8,"endLine":58,"endColumn":9,"fileName":"cursor.ts","functionName":"disable","argumentNames":["this"]}
+kodu_Cursor_disable__P84993.info = {"start":1733,"length":142,"line":54,"column":8,"endLine":58,"endColumn":9,"fileName":"cursor.ts","functionName":"disable","argumentNames":["this"]}
 
-function kodu_Cursor_disable__P549534_mk(s) {
+function kodu_Cursor_disable__P84993_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_disable__P549534, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_disable__P84993, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -58545,7 +58423,7 @@ function kodu_Cursor_disable__P549534_mk(s) {
 
 
 
-function kodu_Camera_follow__P530760(s) {
+function kodu_Camera_follow__P84889(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58561,18 +58439,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Camera__C530755_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Camera__C84878_VT)) failedCast(r0);
     r0 = (s.arg0).fields["following"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Camera_follow__P530760.info = {"start":1057,"length":77,"line":29,"column":8,"endLine":31,"endColumn":9,"fileName":"camera.ts","functionName":"follow","argumentNames":["this","char"]}
+kodu_Camera_follow__P84889.info = {"start":1057,"length":77,"line":29,"column":8,"endLine":31,"endColumn":9,"fileName":"camera.ts","functionName":"follow","argumentNames":["this","char"]}
 
-function kodu_Camera_follow__P530760_mk(s) {
+function kodu_Camera_follow__P84889_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Camera_follow__P530760, depth: s.depth + 1,
+        parent: s, fn: kodu_Camera_follow__P84889, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -58582,7 +58460,7 @@ function kodu_Camera_follow__P530760_mk(s) {
 
 
 
-function kodu_Character_addBump__P538178(s) {
+function kodu_Character_addBump__P85025(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58598,7 +58476,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = s.arg0.fields["bumps"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
@@ -58606,12 +58484,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_addBump__P538178.info = {"start":3519,"length":78,"line":108,"column":8,"endLine":110,"endColumn":9,"fileName":"character.ts","functionName":"addBump","argumentNames":["this","char"]}
+kodu_Character_addBump__P85025.info = {"start":3519,"length":78,"line":108,"column":8,"endLine":110,"endColumn":9,"fileName":"character.ts","functionName":"addBump","argumentNames":["this","char"]}
 
-function kodu_Character_addBump__P538178_mk(s) {
+function kodu_Character_addBump__P85025_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_addBump__P538178, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_addBump__P85025, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -58622,7 +58500,7 @@ function kodu_Character_addBump__P538178_mk(s) {
 
 
 
-function kodu_WorldStage_updateHover__P565292(s) {
+function kodu_WorldStage_updateHover__P85241(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58632,55 +58510,55 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buttons___565778 = undefined;
-    s.overlapping___565789 = undefined;
-    s.button___565815 = undefined;
+    s.buttons___94524 = undefined;
+    s.overlapping___94535 = undefined;
+    s.button___94561 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = helpers_arrayFilter__P106717_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P565781;
+    s.tmp_0.arg1 = inline__P94527;
     s.callLocIdx = 1278; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.buttons___565778 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_1 = helpers_arraySort__P106712_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3 = kodu_Cursor_getAllOverlapping__P549536_mk(s);
+    s.buttons___94524 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_1 = helpers_arraySort__P81374_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3 = kodu_Cursor_getAllOverlapping__P84995_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 1279; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P565798;
+    s.tmp_2.arg1 = inline__P94544;
     s.callLocIdx = 1281; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P565804;
+    s.tmp_1.arg1 = inline__P94550;
     s.callLocIdx = 1284; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P565791;
+    s.tmp_0.arg1 = inline__P94537;
     s.callLocIdx = 1286; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.overlapping___565789 = (r0);
-    r0 = pxsim_Array_.removeAt(s.overlapping___565789, 0);
-    s.button___565815 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565821);
+    s.overlapping___94535 = (r0);
+    r0 = pxsim_Array_.removeAt(s.overlapping___94535, 0);
+    s.button___94561 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94567);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.button___565815);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1.arg0 = s.buttons___565778;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.button___94561);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1.arg0 = s.buttons___94524;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 1289; s.pc = 6; return s.tmp_1;
   case 6:
@@ -58689,20 +58567,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_updateHover__P565292.info = {"start":9750,"length":483,"line":281,"column":8,"endLine":290,"endColumn":9,"fileName":"worldStage.ts","functionName":"updateHover","argumentNames":["this"]}
+kodu_WorldStage_updateHover__P85241.info = {"start":9810,"length":483,"line":282,"column":8,"endLine":291,"endColumn":9,"fileName":"worldStage.ts","functionName":"updateHover","argumentNames":["this"]}
 
-function kodu_WorldStage_updateHover__P565292_mk(s) {
+function kodu_WorldStage_updateHover__P85241_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_updateHover__P565292, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_updateHover__P85241, 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,
-  buttons___565778: undefined,
-  overlapping___565789: undefined,
-  button___565815: undefined,
+  buttons___94524: undefined,
+  overlapping___94535: undefined,
+  button___94561: undefined,
   arg0: undefined,
 } }
 
@@ -58710,7 +58588,7 @@ function kodu_WorldStage_updateHover__P565292_mk(s) {
 
 
 
-function inline__P565781(s) {
+function inline__P94527(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58730,12 +58608,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565781.info = {"start":9834,"length":30,"line":283,"column":24,"endLine":283,"endColumn":54,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P94527.info = {"start":9894,"length":30,"line":284,"column":24,"endLine":284,"endColumn":54,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P565781_mk(s) {
+function inline__P94527_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565781, depth: s.depth + 1,
+        parent: s, fn: inline__P94527, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -58745,7 +58623,7 @@ function inline__P565781_mk(s) {
 
 
 
-function inline__P565798(s) {
+function inline__P94544(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58759,7 +58637,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_2 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 1280; s.pc = 1; return s.tmp_2;
   case 1:
@@ -58771,12 +58649,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565798.info = {"start":9967,"length":36,"line":285,"column":24,"endLine":285,"endColumn":60,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["spr"]}
+inline__P94544.info = {"start":10027,"length":36,"line":286,"column":24,"endLine":286,"endColumn":60,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["spr"]}
 
-function inline__P565798_mk(s) {
+function inline__P94544_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565798, depth: s.depth + 1,
+        parent: s, fn: inline__P94544, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58788,7 +58666,7 @@ function inline__P565798_mk(s) {
 
 
 
-function inline__P565804(s) {
+function inline__P94550(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58811,12 +58689,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565804.info = {"start":10027,"length":19,"line":286,"column":22,"endLine":286,"endColumn":41,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P94550.info = {"start":10087,"length":19,"line":287,"column":22,"endLine":287,"endColumn":41,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P565804_mk(s) {
+function inline__P94550_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565804, depth: s.depth + 1,
+        parent: s, fn: inline__P94550, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58828,7 +58706,7 @@ function inline__P565804_mk(s) {
 
 
 
-function inline__P565791(s) {
+function inline__P94537(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58842,7 +58720,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1285; s.pc = 1; return s.tmp_1;
   case 1:
@@ -58852,12 +58730,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565791.info = {"start":10069,"length":38,"line":287,"column":21,"endLine":287,"endColumn":59,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["spr"]}
+inline__P94537.info = {"start":10129,"length":38,"line":288,"column":21,"endLine":288,"endColumn":59,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["spr"]}
 
-function inline__P565791_mk(s) {
+function inline__P94537_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565791, depth: s.depth + 1,
+        parent: s, fn: inline__P94537, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58868,7 +58746,7 @@ function inline__P565791_mk(s) {
 
 
 
-function inline__P565821(s) {
+function inline__P94567(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58882,7 +58760,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Button_hover__P522440_mk(s);
+    s.tmp_0 = kodu_Button_hover__P84873_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg0 === s.caps[0]);
     s.tmp_0.arg1 = r0;
@@ -58893,12 +58771,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565821.info = {"start":10186,"length":35,"line":289,"column":28,"endLine":289,"endColumn":63,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P94567.info = {"start":10246,"length":35,"line":290,"column":28,"endLine":290,"endColumn":63,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P565821_mk(s) {
+function inline__P94567_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565821, depth: s.depth + 1,
+        parent: s, fn: inline__P94567, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -58908,7 +58786,7 @@ function inline__P565821_mk(s) {
 
 
 
-function kodu_Button_hover__P522440(s) {
+function kodu_Button_hover__P84873(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58924,7 +58802,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
@@ -58976,47 +58854,47 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 11; continue; }
     s.tmp_10 = r0 = s.arg0;
-    s.tmp_12 = textsprite_create__P110077_mk(s);
+    s.tmp_12 = textsprite_create__P84829_mk(s);
     r0 = s.arg0.fields["label"];
     s.tmp_12.arg0 = r0;
     s.tmp_12.arg1 = 1;
     s.tmp_12.arg2 = 15;
-    s.callLocIdx = 167; s.pc = 14; return s.tmp_12;
+    s.callLocIdx = 166; s.pc = 14; return s.tmp_12;
   case 14:
     r0 = s.retval;
     s.tmp_11 = r0;
     r0 = (s.tmp_10).fields["text"] = (s.tmp_11);
-    s.tmp_0 = TextSprite_setBorder__P110072_mk(s);
+    s.tmp_0 = TextSprite_setBorder__P84824_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 15;
     s.tmp_0.arg3 = 0;
-    s.callLocIdx = 168; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 167; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    s.tmp_0 = Sprite_x__P108523_mk(s);
+    s.tmp_0 = Sprite_x__P83305_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 169; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 168; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P108525_mk(s);
+    s.tmp_0 = Sprite_y__P83307_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_1 = r0;
-    s.tmp_3 = kodu_Button_height__P522429_mk(s);
+    s.tmp_3 = kodu_Button_height__P84862_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 170; s.pc = 18; return s.tmp_3;
+    s.callLocIdx = 169; s.pc = 18; return s.tmp_3;
   case 18:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 171; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 170; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
     s.tmp_0 = if_z_2_mk(s);
@@ -59032,18 +58910,18 @@ 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 = 173; s.pc = 19; return s.tmp_0; }
+     else { s.callLocIdx = 172; s.pc = 19; return s.tmp_0; }
     }
   case 19:
     r0 = s.retval;
     { step = 12; continue; }
   case 11:
-    s.tmp_0 = Sprite_destroy__P108584_mk(s);
+    s.tmp_0 = Sprite_destroy__P83368_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 174; s.pc = 20; return s.tmp_0;
+    s.callLocIdx = 173; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     r0 = (s.arg0).fields["text"] = (null);
@@ -59053,12 +58931,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_hover__P522440.info = {"start":3144,"length":538,"line":102,"column":8,"endLine":116,"endColumn":9,"fileName":"button.ts","functionName":"hover","argumentNames":["this","hov"]}
+kodu_Button_hover__P84873.info = {"start":3144,"length":538,"line":102,"column":8,"endLine":116,"endColumn":9,"fileName":"button.ts","functionName":"hover","argumentNames":["this","hov"]}
 
-function kodu_Button_hover__P522440_mk(s) {
+function kodu_Button_hover__P84873_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_hover__P522440, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_hover__P84873, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59081,7 +58959,7 @@ function kodu_Button_hover__P522440_mk(s) {
 
 
 
-function TextSprite_setBorder__P110072(s) {
+function TextSprite_setBorder__P84824(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59099,41 +58977,41 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, TextSprite__C110066_VT)) failedCast(r0);
+    if (!checkSubtype(r0, TextSprite__C84818_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P106734_mk(s);
+    s.tmp_2 = Math_max__P81398_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1266; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1256; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["borderWidth"] = (s.tmp_1);
     r0 = (s.arg0).fields["borderColor"] = (s.arg2);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P106734_mk(s);
+    s.tmp_2 = Math_max__P81398_mk(s);
     s.tmp_2.arg0 = s.arg3;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1267; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 1257; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["padding"] = (s.tmp_1);
-    s.tmp_0 = TextSprite_update__P110068_mk(s);
+    s.tmp_0 = TextSprite_update__P84820_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1268; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1258; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-TextSprite_setBorder__P110072.info = {"start":2748,"length":223,"line":77,"column":4,"endLine":82,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"setBorder","argumentNames":["this","width","color","padding"]}
+TextSprite_setBorder__P84824.info = {"start":2748,"length":223,"line":77,"column":4,"endLine":82,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"setBorder","argumentNames":["this","width","color","padding"]}
 
-function TextSprite_setBorder__P110072_mk(s) {
+function TextSprite_setBorder__P84824_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: TextSprite_setBorder__P110072, depth: s.depth + 1,
+        parent: s, fn: TextSprite_setBorder__P84824, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59148,7 +59026,7 @@ function TextSprite_setBorder__P110072_mk(s) {
 
 
 
-function TextSprite_update__P110068(s) {
+function TextSprite_update__P84820(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59158,21 +59036,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.borderAndPadding___126035 = undefined;
-    s.iconWidth___126045 = undefined;
-    s.iconHeight___126059 = undefined;
-    s.font___126066 = undefined;
-    s.width___126075 = undefined;
-    s.height___126088 = undefined;
-    s.img___126098 = undefined;
-    s.iconHeightOffset___126129 = undefined;
-    s.textHeightOffset___126141 = undefined;
+    s.borderAndPadding___101428 = undefined;
+    s.iconWidth___101438 = undefined;
+    s.iconHeight___101452 = undefined;
+    s.font___101459 = undefined;
+    s.width___101468 = undefined;
+    s.height___101481 = undefined;
+    s.img___101491 = undefined;
+    s.iconHeightOffset___101522 = undefined;
+    s.textHeightOffset___101534 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, TextSprite__C110066_VT)) failedCast(r0);
+    if (!checkSubtype(r0, TextSprite__C84818_VT)) failedCast(r0);
     r0 = s.arg0.fields["borderWidth"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["padding"];
@@ -59182,7 +59060,7 @@ switch (step) {
     r0 = s.arg0.fields["outlineWidth"];
     s.tmp_3 = r0;
     r0 = (s.tmp_0 + s.tmp_3);
-    s.borderAndPadding___126035 = (r0);
+    s.borderAndPadding___101428 = (r0);
     r0 = s.arg0.fields["icon"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -59204,7 +59082,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    s.iconWidth___126045 = (s.tmp_6);
+    s.iconWidth___101438 = (s.tmp_6);
     r0 = s.arg0.fields["icon"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -59218,26 +59096,26 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.iconHeight___126059 = (s.tmp_2);
-    s.tmp_0 = textsprite_getFontForTextAndHeight__P110076_mk(s);
+    s.iconHeight___101452 = (s.tmp_2);
+    s.tmp_0 = textsprite_getFontForTextAndHeight__P84828_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["maxFontHeight"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1256; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1246; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.font___126066 = (r0);
-    s.tmp_1 = r0 = s.iconWidth___126045;
+    s.font___101459 = (r0);
+    s.tmp_1 = r0 = s.iconWidth___101438;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = s.font___126066;
+    s.tmp_4.arg0 = s.font___101459;
     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 = 1257; s.pc = 10; return s.tmp_4; }
+     else { s.callLocIdx = 1247; s.pc = 10; return s.tmp_4; }
     }
   case 10:
     r0 = s.retval;
@@ -59250,52 +59128,52 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0 = r0;
-    r0 = (2 * s.borderAndPadding___126035);
+    r0 = (2 * s.borderAndPadding___101428);
     s.tmp_7 = r0;
     r0 = (s.tmp_0 + s.tmp_7);
-    s.width___126075 = (r0);
-    s.tmp_1 = Math_max__P106734_mk(s);
-    s.tmp_1.arg0 = s.iconHeight___126059;
+    s.width___101468 = (r0);
+    s.tmp_1 = Math_max__P81398_mk(s);
+    s.tmp_1.arg0 = s.iconHeight___101452;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___126066;
+    s.tmp_2.arg0 = s.font___101459;
     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 = 1258; s.pc = 12; return s.tmp_2; }
+     else { s.callLocIdx = 1248; s.pc = 12; return s.tmp_2; }
     }
   case 12:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1259; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 1249; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (2 * s.borderAndPadding___126035);
+    r0 = (2 * s.borderAndPadding___101428);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 + s.tmp_3);
-    s.height___126088 = (r0);
-    r0 = pxsim.image.create(s.width___126075, s.height___126088);
-    s.img___126098 = (r0);
+    s.height___101481 = (r0);
+    r0 = pxsim.image.create(s.width___101468, s.height___101481);
+    s.img___101491 = (r0);
     r0 = s.arg0.fields["borderColor"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.fill(s.img___126098, s.tmp_0);
-    s.tmp_0 = helpers_imageFillRect__P108224_mk(s);
-    s.tmp_0.arg0 = s.img___126098;
+    r0 = pxsim_ImageMethods.fill(s.img___101491, s.tmp_0);
+    s.tmp_0 = helpers_imageFillRect__P83001_mk(s);
+    s.tmp_0.arg0 = s.img___101491;
     r0 = s.arg0.fields["borderWidth"];
     s.tmp_0.arg1 = r0;
     r0 = s.arg0.fields["borderWidth"];
     s.tmp_0.arg2 = r0;
-    s.tmp_1 = r0 = s.width___126075;
+    s.tmp_1 = r0 = s.width___101468;
     r0 = s.arg0.fields["borderWidth"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 * 2);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg3 = r0;
-    s.tmp_4 = r0 = s.height___126088;
+    s.tmp_4 = r0 = s.height___101481;
     r0 = s.arg0.fields["borderWidth"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 * 2);
@@ -59304,39 +59182,39 @@ switch (step) {
     s.tmp_0.arg4 = r0;
     r0 = s.arg0.fields["bg"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 1260; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1250; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = s.arg0.fields["icon"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = (s.height___126088 - s.iconHeight___126059);
+    r0 = (s.height___101481 - s.iconHeight___101452);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 2);
-    s.iconHeightOffset___126129 = (r0);
-    s.tmp_0 = textsprite_renderScaledImage__P110075_mk(s);
+    s.iconHeightOffset___101522 = (r0);
+    s.tmp_0 = textsprite_renderScaledImage__P84827_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.img___126098;
-    s.tmp_0.arg2 = s.borderAndPadding___126035;
-    s.tmp_0.arg3 = s.iconHeightOffset___126129;
+    s.tmp_0.arg1 = s.img___101491;
+    s.tmp_0.arg2 = s.borderAndPadding___101428;
+    s.tmp_0.arg3 = s.iconHeightOffset___101522;
     s.tmp_0.arg4 = 0;
-    s.callLocIdx = 1261; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1251; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 5:
   case 6:
-    s.tmp_1 = r0 = s.height___126088;
+    s.tmp_1 = r0 = s.height___101481;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.font___126066;
+    s.tmp_3.arg0 = s.font___101459;
     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 = 1262; s.pc = 15; return s.tmp_3; }
+     else { s.callLocIdx = 1252; s.pc = 15; return s.tmp_3; }
     }
   case 15:
     r0 = s.retval;
@@ -59344,19 +59222,19 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    s.textHeightOffset___126141 = (r0);
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_0.arg0 = s.img___126098;
+    s.textHeightOffset___101534 = (r0);
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_0.arg0 = s.img___101491;
     r0 = s.arg0.fields["text"];
     s.tmp_0.arg1 = r0;
-    r0 = (s.iconWidth___126045 + s.borderAndPadding___126035);
+    r0 = (s.iconWidth___101438 + s.borderAndPadding___101428);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.textHeightOffset___126141;
+    s.tmp_0.arg3 = s.textHeightOffset___101534;
     r0 = s.arg0.fields["fg"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___126066;
+    s.tmp_0.arg5 = s.font___101459;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1263; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1253; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
     r0 = s.arg0.fields["outlineWidth"];
@@ -59365,35 +59243,35 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_2 = textsprite_outlineOtherColor__P110078_mk(s);
-    s.tmp_2.arg0 = s.img___126098;
+    s.tmp_2 = textsprite_outlineOtherColor__P84830_mk(s);
+    s.tmp_2.arg0 = s.img___101491;
     r0 = s.arg0.fields["fg"];
     s.tmp_2.arg1 = r0;
     r0 = s.arg0.fields["outlineWidth"];
     s.tmp_2.arg2 = r0;
     r0 = s.arg0.fields["outlineColor"];
     s.tmp_2.arg3 = r0;
-    s.callLocIdx = 1264; s.pc = 17; return s.tmp_2;
+    s.callLocIdx = 1254; s.pc = 17; return s.tmp_2;
   case 17:
     r0 = s.retval;
   case 7:
   case 8:
-    s.tmp_0 = Sprite_setImage__P108553_mk(s);
+    s.tmp_0 = Sprite_setImage__P83335_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.img___126098;
-    s.callLocIdx = 1265; s.pc = 18; return s.tmp_0;
+    s.tmp_0.arg1 = s.img___101491;
+    s.callLocIdx = 1255; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-TextSprite_update__P110068.info = {"start":678,"length":1260,"line":26,"column":4,"endLine":45,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"update","argumentNames":["this"]}
+TextSprite_update__P84820.info = {"start":678,"length":1260,"line":26,"column":4,"endLine":45,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"update","argumentNames":["this"]}
 
-function TextSprite_update__P110068_mk(s) {
+function TextSprite_update__P84820_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: TextSprite_update__P110068, depth: s.depth + 1,
+        parent: s, fn: TextSprite_update__P84820, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59403,15 +59281,15 @@ function TextSprite_update__P110068_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  borderAndPadding___126035: undefined,
-  iconWidth___126045: undefined,
-  iconHeight___126059: undefined,
-  font___126066: undefined,
-  width___126075: undefined,
-  height___126088: undefined,
-  img___126098: undefined,
-  iconHeightOffset___126129: undefined,
-  textHeightOffset___126141: undefined,
+  borderAndPadding___101428: undefined,
+  iconWidth___101438: undefined,
+  iconHeight___101452: undefined,
+  font___101459: undefined,
+  width___101468: undefined,
+  height___101481: undefined,
+  img___101491: undefined,
+  iconHeightOffset___101522: undefined,
+  textHeightOffset___101534: undefined,
   arg0: undefined,
 } }
 
@@ -59419,7 +59297,7 @@ function TextSprite_update__P110068_mk(s) {
 
 
 
-function textsprite_outlineOtherColor__P110078(s) {
+function textsprite_outlineOtherColor__P84830(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59429,15 +59307,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.toOutlineX___126391 = undefined;
-    s.toOutlineY___126393 = undefined;
-    s.x___126395 = undefined;
-    s.y___126401 = undefined;
-    s.sx___126407 = undefined;
-    s.sy___126412 = undefined;
-    s.i___126491 = undefined;
-    s.x___126497 = undefined;
-    s.y___126501 = undefined;
+    s.toOutlineX___101784 = undefined;
+    s.toOutlineY___101786 = undefined;
+    s.x___101788 = undefined;
+    s.y___101794 = undefined;
+    s.sx___101800 = undefined;
+    s.sy___101805 = undefined;
+    s.i___101884 = undefined;
+    s.x___101890 = undefined;
+    s.y___101894 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -59446,40 +59324,40 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.toOutlineX___126391 = (r0);
+    s.toOutlineX___101784 = (r0);
     r0 = pxsim_Array__mk();
-    s.toOutlineY___126393 = (r0);
-    s.x___126395 = (0);
+    s.toOutlineY___101786 = (r0);
+    s.x___101788 = (0);
   case 1:
-    s.tmp_1 = r0 = s.x___126395;
+    s.tmp_1 = r0 = s.x___101788;
     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 = 21; continue; }
-    s.y___126401 = (0);
+    s.y___101794 = (0);
   case 2:
-    s.tmp_1 = r0 = s.y___126401;
+    s.tmp_1 = r0 = s.y___101794;
     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 = 20; continue; }
-    s.sx___126407 = (0);
+    s.sx___101800 = (0);
   case 3:
-    r0 = (s.sx___126407 <= s.arg2);
+    r0 = (s.sx___101800 <= s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    s.sy___126412 = (0);
+    s.sy___101805 = (0);
   case 4:
-    r0 = (s.sy___126412 <= s.arg2);
+    r0 = (s.sy___101805 <= s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    r0 = (s.sx___126407 + s.sy___126412);
+    r0 = (s.sx___101800 + s.sy___101805);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 === 0);
     s.tmp_1 = r0;
@@ -59488,7 +59366,7 @@ switch (step) {
     { step = 17; continue; }
   case 5:
   case 6:
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___126395, s.y___126401);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___101788, s.y___101794);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 === s.arg1);
     s.tmp_3 = r0;
@@ -59498,9 +59376,9 @@ switch (step) {
   case 7:
   case 8:
     s.tmp_7 = r0 = s.arg0;
-    r0 = (s.x___126395 + s.sx___126407);
+    r0 = (s.x___101788 + s.sx___101800);
     s.tmp_8 = r0;
-    r0 = (s.y___126401 + s.sy___126412);
+    r0 = (s.y___101794 + s.sy___101805);
     s.tmp_9 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_7, s.tmp_8, s.tmp_9);
     s.tmp_6 = r0;
@@ -59512,9 +59390,9 @@ switch (step) {
     { step = 10; continue; }
   case 9:
     s.tmp_11 = r0 = s.arg0;
-    r0 = (s.x___126395 - s.sx___126407);
+    r0 = (s.x___101788 - s.sx___101800);
     s.tmp_12 = r0;
-    r0 = (s.y___126401 + s.sy___126412);
+    r0 = (s.y___101794 + s.sy___101805);
     s.tmp_13 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_11, s.tmp_12, s.tmp_13);
     s.tmp_10 = r0;
@@ -59528,9 +59406,9 @@ switch (step) {
     { step = 12; continue; }
   case 11:
     s.tmp_16 = r0 = s.arg0;
-    r0 = (s.x___126395 + s.sx___126407);
+    r0 = (s.x___101788 + s.sx___101800);
     s.tmp_17 = r0;
-    r0 = (s.y___126401 - s.sy___126412);
+    r0 = (s.y___101794 - s.sy___101805);
     s.tmp_18 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_16, s.tmp_17, s.tmp_18);
     s.tmp_15 = r0;
@@ -59544,9 +59422,9 @@ switch (step) {
     { step = 14; continue; }
   case 13:
     s.tmp_21 = r0 = s.arg0;
-    r0 = (s.x___126395 - s.sx___126407);
+    r0 = (s.x___101788 - s.sx___101800);
     s.tmp_22 = r0;
-    r0 = (s.y___126401 - s.sy___126412);
+    r0 = (s.y___101794 - s.sy___101805);
     s.tmp_23 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_21, s.tmp_22, s.tmp_23);
     s.tmp_20 = r0;
@@ -59556,55 +59434,55 @@ switch (step) {
     s.tmp_24 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_24);
     if (!r0) { step = 15; continue; }
-    r0 = pxsim_Array__push(s.toOutlineX___126391, s.x___126395);
-    r0 = pxsim_Array__push(s.toOutlineY___126393, s.y___126401);
+    r0 = pxsim_Array__push(s.toOutlineX___101784, s.x___101788);
+    r0 = pxsim_Array__push(s.toOutlineY___101786, s.y___101794);
   case 15:
   case 16:
   case 17:
-    r0 = (s.sy___126412 + 1);
-    s.sy___126412 = (r0);
+    r0 = (s.sy___101805 + 1);
+    s.sy___101805 = (r0);
     { step = 4; continue; }
   case 18:
-    r0 = (s.sx___126407 + 1);
-    s.sx___126407 = (r0);
+    r0 = (s.sx___101800 + 1);
+    s.sx___101800 = (r0);
     { step = 3; continue; }
   case 19:
-    r0 = (s.y___126401 + 1);
-    s.y___126401 = (r0);
+    r0 = (s.y___101794 + 1);
+    s.y___101794 = (r0);
     { step = 2; continue; }
   case 20:
-    r0 = (s.x___126395 + 1);
-    s.x___126395 = (r0);
+    r0 = (s.x___101788 + 1);
+    s.x___101788 = (r0);
     { step = 1; continue; }
   case 21:
-    s.i___126491 = (0);
+    s.i___101884 = (0);
   case 22:
-    s.tmp_1 = r0 = s.i___126491;
-    r0 = pxsim_Array__length(s.toOutlineX___126391);
+    s.tmp_1 = r0 = s.i___101884;
+    r0 = pxsim_Array__length(s.toOutlineX___101784);
     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 = 23; continue; }
-    r0 = pxsim_Array__getAt(s.toOutlineX___126391, s.i___126491);
-    s.x___126497 = (r0);
-    r0 = pxsim_Array__getAt(s.toOutlineY___126393, s.i___126491);
-    s.y___126501 = (r0);
-    r0 = pxsim_ImageMethods.setPixel(s.arg0, s.x___126497, s.y___126501, s.arg3);
-    r0 = (s.i___126491 + 1);
-    s.i___126491 = (r0);
+    r0 = pxsim_Array__getAt(s.toOutlineX___101784, s.i___101884);
+    s.x___101890 = (r0);
+    r0 = pxsim_Array__getAt(s.toOutlineY___101786, s.i___101884);
+    s.y___101894 = (r0);
+    r0 = pxsim_ImageMethods.setPixel(s.arg0, s.x___101890, s.y___101894, s.arg3);
+    r0 = (s.i___101884 + 1);
+    s.i___101884 = (r0);
     { step = 22; continue; }
   case 23:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-textsprite_outlineOtherColor__P110078.info = {"start":5293,"length":1299,"line":148,"column":4,"endLine":176,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"outlineOtherColor","argumentNames":["img","targetColor","outlineWidth","outlineColor"]}
+textsprite_outlineOtherColor__P84830.info = {"start":5293,"length":1299,"line":148,"column":4,"endLine":176,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"outlineOtherColor","argumentNames":["img","targetColor","outlineWidth","outlineColor"]}
 
-function textsprite_outlineOtherColor__P110078_mk(s) {
+function textsprite_outlineOtherColor__P84830_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: textsprite_outlineOtherColor__P110078, depth: s.depth + 1,
+        parent: s, fn: textsprite_outlineOtherColor__P84830, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59631,15 +59509,15 @@ function textsprite_outlineOtherColor__P110078_mk(s) {
   tmp_22: undefined,
   tmp_23: undefined,
   tmp_24: undefined,
-  toOutlineX___126391: undefined,
-  toOutlineY___126393: undefined,
-  x___126395: undefined,
-  y___126401: undefined,
-  sx___126407: undefined,
-  sy___126412: undefined,
-  i___126491: undefined,
-  x___126497: undefined,
-  y___126501: undefined,
+  toOutlineX___101784: undefined,
+  toOutlineY___101786: undefined,
+  x___101788: undefined,
+  y___101794: undefined,
+  sx___101800: undefined,
+  sy___101805: undefined,
+  i___101884: undefined,
+  x___101890: undefined,
+  y___101894: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -59650,7 +59528,7 @@ function textsprite_outlineOtherColor__P110078_mk(s) {
 
 
 
-function textsprite_getFontForTextAndHeight__P110076(s) {
+function textsprite_getFontForTextAndHeight__P84828(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59660,119 +59538,119 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.baseFont___126574 = undefined;
-    s.hasUnicode___126578 = undefined;
-    s.availableFonts___126582 = undefined;
-    s.remainders___126590 = undefined;
-    s.fontIdx___126600 = undefined;
-    s.font___126615 = undefined;
+    s.baseFont___101967 = undefined;
+    s.hasUnicode___101971 = undefined;
+    s.availableFonts___101975 = undefined;
+    s.remainders___101983 = undefined;
+    s.fontIdx___101993 = undefined;
+    s.font___102008 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = image_getFontForText__P108243_mk(s);
+    s.tmp_0 = image_getFontForText__P83020_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1269; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1259; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.baseFont___126574 = (r0);
+    s.baseFont___101967 = (r0);
     s.tmp_1 = if_charHeight_1_mk(s);
-    s.tmp_1.arg0 = s.baseFont___126574;
+    s.tmp_1.arg0 = s.baseFont___101967;
     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 = 1270; s.pc = 4; return s.tmp_1; }
+     else { s.callLocIdx = 1260; s.pc = 4; return s.tmp_1; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 === 12);
-    s.hasUnicode___126578 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.hasUnicode___126578);
+    s.hasUnicode___101971 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.hasUnicode___101971);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.baseFont___126574);
+    r0 = pxsim_Array__push(s.tmp_0, s.baseFont___101967);
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
-    r0 = pxsim_Array__push(s.tmp_1, globals.font8___108241);
-    r0 = pxsim_Array__push(s.tmp_1, globals.font5___108246);
+    r0 = pxsim_Array__push(s.tmp_1, globals.font8___83018);
+    r0 = pxsim_Array__push(s.tmp_1, globals.font5___83023);
     r0 = s.tmp_1;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.availableFonts___126582 = (s.tmp_2);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P126592);
+    s.availableFonts___101975 = (s.tmp_2);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P101985);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_1.arg0 = s.availableFonts___126582;
+    s.tmp_1 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_1.arg0 = s.availableFonts___101975;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1272; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1262; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.remainders___126590 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P126604);
+    s.remainders___101983 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P101997);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.remainders___126590);
-    s.tmp_1 = helpers_arrayReduce__P106719_mk(s);
-    s.tmp_1.arg0 = s.remainders___126590;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.remainders___101983);
+    s.tmp_1 = helpers_arrayReduce__P81381_mk(s);
+    s.tmp_1.arg0 = s.remainders___101983;
     s.tmp_1.arg1 = s.tmp_0;
     s.tmp_1.arg2 = 99;
-    s.callLocIdx = 1273; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1263; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    s.fontIdx___126600 = (r0);
-    r0 = pxsim_Array__getAt(s.availableFonts___126582, s.fontIdx___126600);
-    s.font___126615 = (r0);
-    s.tmp_0 = image_scaledFont__P108245_mk(s);
-    s.tmp_0.arg0 = s.font___126615;
+    s.fontIdx___101993 = (r0);
+    r0 = pxsim_Array__getAt(s.availableFonts___101975, s.fontIdx___101993);
+    s.font___102008 = (r0);
+    s.tmp_0 = image_scaledFont__P83022_mk(s);
+    s.tmp_0.arg0 = s.font___102008;
     s.tmp_1 = r0 = s.arg1;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.font___126615;
+    s.tmp_3.arg0 = s.font___102008;
     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 = 1274; s.pc = 8; return s.tmp_3; }
+     else { s.callLocIdx = 1264; s.pc = 8; return s.tmp_3; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1275; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1265; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-textsprite_getFontForTextAndHeight__P110076.info = {"start":4027,"length":663,"line":116,"column":4,"endLine":126,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"getFontForTextAndHeight","argumentNames":["text","maxHeight"]}
+textsprite_getFontForTextAndHeight__P84828.info = {"start":4027,"length":663,"line":116,"column":4,"endLine":126,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"getFontForTextAndHeight","argumentNames":["text","maxHeight"]}
 
-function textsprite_getFontForTextAndHeight__P110076_mk(s) {
+function textsprite_getFontForTextAndHeight__P84828_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: textsprite_getFontForTextAndHeight__P110076, depth: s.depth + 1,
+        parent: s, fn: textsprite_getFontForTextAndHeight__P84828, 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,
-  baseFont___126574: undefined,
-  hasUnicode___126578: undefined,
-  availableFonts___126582: undefined,
-  remainders___126590: undefined,
-  fontIdx___126600: undefined,
-  font___126615: undefined,
+  baseFont___101967: undefined,
+  hasUnicode___101971: undefined,
+  availableFonts___101975: undefined,
+  remainders___101983: undefined,
+  fontIdx___101993: undefined,
+  font___102008: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -59781,7 +59659,7 @@ function textsprite_getFontForTextAndHeight__P110076_mk(s) {
 
 
 
-function inline__P126592(s) {
+function inline__P101985(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59804,7 +59682,7 @@ switch (step) {
       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 = 1271; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1261; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -59813,12 +59691,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P126592.info = {"start":4455,"length":29,"line":122,"column":46,"endLine":122,"endColumn":75,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"inline","argumentNames":["s"]}
+inline__P101985.info = {"start":4455,"length":29,"line":122,"column":46,"endLine":122,"endColumn":75,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P126592_mk(s) {
+function inline__P101985_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P126592, depth: s.depth + 1,
+        parent: s, fn: inline__P101985, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59830,7 +59708,7 @@ function inline__P126592_mk(s) {
 
 
 
-function inline__P126604(s) {
+function inline__P101997(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59863,12 +59741,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P126604.info = {"start":4528,"length":39,"line":123,"column":42,"endLine":123,"endColumn":81,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"inline","argumentNames":["p","n","i"]}
+inline__P101997.info = {"start":4528,"length":39,"line":123,"column":42,"endLine":123,"endColumn":81,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"inline","argumentNames":["p","n","i"]}
 
-function inline__P126604_mk(s) {
+function inline__P101997_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P126604, depth: s.depth + 1,
+        parent: s, fn: inline__P101997, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59882,7 +59760,7 @@ function inline__P126604_mk(s) {
 
 
 
-function textsprite_renderScaledImage__P110075(s) {
+function textsprite_renderScaledImage__P84827(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59892,10 +59770,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___126518 = undefined;
-    s.tile___126520 = undefined;
-    s.i___126522 = undefined;
-    s.j___126528 = undefined;
+    s.scale___101911 = undefined;
+    s.tile___101913 = undefined;
+    s.i___101915 = undefined;
+    s.j___101921 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -59904,27 +59782,27 @@ switch (step) {
       s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
-    s.scale___126518 = (s.arg4);
-    s.tile___126520 = (s.arg0);
-    s.i___126522 = (0);
+    s.scale___101911 = (s.arg4);
+    s.tile___101913 = (s.arg0);
+    s.i___101915 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___126522;
+    s.tmp_1 = r0 = s.i___101915;
     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___126528 = (0);
+    s.j___101921 = (0);
   case 2:
-    s.tmp_1 = r0 = s.j___126528;
+    s.tmp_1 = r0 = s.j___101921;
     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___126522, s.j___126528);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___101915, s.j___101921);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 != 0);
     s.tmp_3 = r0;
@@ -59932,44 +59810,44 @@ switch (step) {
     if (!r0) { step = 3; continue; }
     s.tmp_5 = r0 = s.arg1;
     s.tmp_7 = r0 = s.arg2;
-    r0 = (s.i___126522 >> s.scale___126518);
+    r0 = (s.i___101915 >> s.scale___101911);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6 = r0;
     s.tmp_10 = r0 = s.arg3;
-    r0 = (s.j___126528 >> s.scale___126518);
+    r0 = (s.j___101921 >> s.scale___101911);
     s.tmp_11 = r0;
     r0 = (s.tmp_10 + s.tmp_11);
     s.tmp_9 = r0;
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___126522, s.j___126528);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___101915, s.j___101921);
     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___126528;
-    r0 = (1 << s.scale___126518);
+    s.tmp_0 = r0 = s.j___101921;
+    r0 = (1 << s.scale___101911);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.j___126528 = (r0);
+    s.j___101921 = (r0);
     { step = 2; continue; }
   case 5:
-    s.tmp_0 = r0 = s.i___126522;
-    r0 = (1 << s.scale___126518);
+    s.tmp_0 = r0 = s.i___101915;
+    r0 = (1 << s.scale___101911);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.i___126522 = (r0);
+    s.i___101915 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-textsprite_renderScaledImage__P110075.info = {"start":3500,"length":521,"line":104,"column":4,"endLine":114,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"renderScaledImage","argumentNames":["source","destination","x","y","downScalePowerOfTwo"]}
+textsprite_renderScaledImage__P84827.info = {"start":3500,"length":521,"line":104,"column":4,"endLine":114,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"renderScaledImage","argumentNames":["source","destination","x","y","downScalePowerOfTwo"]}
 
-function textsprite_renderScaledImage__P110075_mk(s) {
+function textsprite_renderScaledImage__P84827_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: textsprite_renderScaledImage__P110075, depth: s.depth + 1,
+        parent: s, fn: textsprite_renderScaledImage__P84827, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59984,10 +59862,10 @@ function textsprite_renderScaledImage__P110075_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  scale___126518: undefined,
-  tile___126520: undefined,
-  i___126522: undefined,
-  j___126528: undefined,
+  scale___101911: undefined,
+  tile___101913: undefined,
+  i___101915: undefined,
+  j___101921: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -59999,7 +59877,7 @@ function textsprite_renderScaledImage__P110075_mk(s) {
 
 
 
-function textsprite_create__P110077(s) {
+function textsprite_create__P84829(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60009,16 +59887,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sprite___126674 = undefined;
+    s.sprite___102067 = 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(TextSprite__C110066_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(TextSprite__C84818_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = TextSprite_constructor__P110067_mk(s);
+    s.tmp_1 = TextSprite_constructor__P84819_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -60030,37 +59908,37 @@ switch (step) {
     s.tmp_1.arg8 = 0;
     s.tmp_1.arg9 = 0;
     s.tmp_1.arg10 = null;
-    s.callLocIdx = 1276; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1266; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.sprite___126674 = (s.tmp_0);
-    s.tmp_0 = PhysicsEngine__C108656_v0_2_mk(s);
-    s.tmp_1 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 1277; s.pc = 3; return s.tmp_1;
+    s.sprite___102067 = (s.tmp_0);
+    s.tmp_0 = PhysicsEngine__C83440_v0_2_mk(s);
+    s.tmp_1 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 1267; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.sprite___126674;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C108656_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.sprite___102067;
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C83440_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.addSprite;
     s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    r0 = s.sprite___126674;
+    r0 = s.sprite___102067;
     return leave(s, r0)
   default: oops()
 } } }
-textsprite_create__P110077.info = {"start":5013,"length":274,"line":138,"column":4,"endLine":146,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"create","argumentNames":["text","bg","fg"]}
+textsprite_create__P84829.info = {"start":5013,"length":274,"line":138,"column":4,"endLine":146,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"create","argumentNames":["text","bg","fg"]}
 
-function textsprite_create__P110077_mk(s) {
+function textsprite_create__P84829_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: textsprite_create__P110077, depth: s.depth + 1,
+        parent: s, fn: textsprite_create__P84829, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  sprite___126674: undefined,
+  sprite___102067: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -60070,7 +59948,7 @@ function textsprite_create__P110077_mk(s) {
 
 
 
-function TextSprite_constructor__P110067(s) {
+function TextSprite_constructor__P84819(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60095,7 +59973,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, TextSprite__C110066_VT)) failedCast(r0);
+    if (!checkSubtype(r0, TextSprite__C84818_VT)) failedCast(r0);
     r0 = (s.arg0).fields["text"] = (s.arg1);
     r0 = (s.arg0).fields["bg"] = (s.arg2);
     r0 = (s.arg0).fields["fg"] = (s.arg3);
@@ -60106,41 +59984,41 @@ switch (step) {
     r0 = (s.arg0).fields["outlineWidth"] = (s.arg8);
     r0 = (s.arg0).fields["outlineColor"] = (s.arg9);
     r0 = (s.arg0).fields["icon"] = (s.arg10);
-    s.tmp_0 = Sprite_constructor__P108550_mk(s);
+    s.tmp_0 = Sprite_constructor__P83332_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim.image.create(0, 0);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1252; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1242; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setKind__P108568_mk(s);
+    s.tmp_0 = Sprite_setKind__P83350_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.Text___110065;
-    s.callLocIdx = 1253; s.pc = 2; return s.tmp_0;
+    s.tmp_0.arg1 = globals.Text___84817;
+    s.callLocIdx = 1243; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setFlag__P108576_mk(s);
+    s.tmp_0 = Sprite_setFlag__P83360_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = 1;
+    s.tmp_0.arg1 = 7168;
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 1254; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1244; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = TextSprite_update__P110068_mk(s);
+    s.tmp_0 = TextSprite_update__P84820_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1255; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1245; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-TextSprite_constructor__P110067.info = {"start":171,"length":501,"line":8,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"inline","argumentNames":["this","text","bg","fg","maxFontHeight","borderWidth","borderColor","padding","outlineWidth","outlineColor","icon"]}
+TextSprite_constructor__P84819.info = {"start":171,"length":501,"line":8,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/arcade-text/text.ts","functionName":"inline","argumentNames":["this","text","bg","fg","maxFontHeight","borderWidth","borderColor","padding","outlineWidth","outlineColor","icon"]}
 
-function TextSprite_constructor__P110067_mk(s) {
+function TextSprite_constructor__P84819_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: TextSprite_constructor__P110067, depth: s.depth + 1,
+        parent: s, fn: TextSprite_constructor__P84819, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60160,7 +60038,7 @@ function TextSprite_constructor__P110067_mk(s) {
 
 
 
-function kodu_WorldStage_get__P565293(s) {
+function kodu_WorldStage_get__P85242(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60176,7 +60054,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtcore.switch_eq("gameMode", s.tmp_0);
     if (r0) { step = 1; continue; }
@@ -60198,12 +60076,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_get__P565293.info = {"start":10243,"length":261,"line":292,"column":8,"endLine":298,"endColumn":9,"fileName":"worldStage.ts","functionName":"get","argumentNames":["this","field"]}
+kodu_WorldStage_get__P85242.info = {"start":10303,"length":261,"line":293,"column":8,"endLine":299,"endColumn":9,"fileName":"worldStage.ts","functionName":"get","argumentNames":["this","field"]}
 
-function kodu_WorldStage_get__P565293_mk(s) {
+function kodu_WorldStage_get__P85242_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_get__P565293, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_get__P85242, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60214,7 +60092,7 @@ function kodu_WorldStage_get__P565293_mk(s) {
 
 
 
-function kodu_WorldStage_handleCursorCancel__P565286(s) {
+function kodu_WorldStage_handleCursorCancel__P85235(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60229,8 +60107,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_closeMenus__P565287_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_closeMenus__P85236_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1258; s.pc = 1; return s.tmp_0;
   case 1:
@@ -60239,12 +60117,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleCursorCancel__P565286.info = {"start":8630,"length":70,"line":244,"column":8,"endLine":246,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorCancel","argumentNames":["this"]}
+kodu_WorldStage_handleCursorCancel__P85235.info = {"start":8690,"length":70,"line":245,"column":8,"endLine":247,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorCancel","argumentNames":["this"]}
 
-function kodu_WorldStage_handleCursorCancel__P565286_mk(s) {
+function kodu_WorldStage_handleCursorCancel__P85235_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleCursorCancel__P565286, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleCursorCancel__P85235, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60254,7 +60132,7 @@ function kodu_WorldStage_handleCursorCancel__P565286_mk(s) {
 
 
 
-function kodu_WorldStage_closeMenus__P565287(s) {
+function kodu_WorldStage_closeMenus__P85236(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60269,14 +60147,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Menu_hide__P518587_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Menu_hide__P85040_mk(s);
     r0 = s.arg0.fields["createMenu"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1259; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Menu_hide__P518587_mk(s);
+    s.tmp_0 = kodu_Menu_hide__P85040_mk(s);
     r0 = s.arg0.fields["charMenu"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1260; s.pc = 2; return s.tmp_0;
@@ -60286,12 +60164,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_closeMenus__P565287.info = {"start":8710,"length":101,"line":248,"column":8,"endLine":251,"endColumn":9,"fileName":"worldStage.ts","functionName":"closeMenus","argumentNames":["this"]}
+kodu_WorldStage_closeMenus__P85236.info = {"start":8770,"length":101,"line":249,"column":8,"endLine":252,"endColumn":9,"fileName":"worldStage.ts","functionName":"closeMenus","argumentNames":["this"]}
 
-function kodu_WorldStage_closeMenus__P565287_mk(s) {
+function kodu_WorldStage_closeMenus__P85236_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_closeMenus__P565287, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_closeMenus__P85236, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60301,7 +60179,7 @@ function kodu_WorldStage_closeMenus__P565287_mk(s) {
 
 
 
-function kodu_Menu_hide__P518587(s) {
+function kodu_Menu_hide__P85040(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60311,39 +60189,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.button___518723 = undefined;
-    s.unnamed16850___U1 = undefined;
-    s.unnamed16851___U2 = undefined;
+    s.button___89905 = undefined;
+    s.unnamed1902___U1 = undefined;
+    s.unnamed1903___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Menu__C518584_VT)) failedCast(r0);
-    s.button___518723 = (undefined);
+    if (!checkSubtype(r0, kodu_Menu__C85036_VT)) failedCast(r0);
+    s.button___89905 = (undefined);
     r0 = s.arg0.fields["buttons"];
-    s.unnamed16850___U1 = (r0);
-    s.unnamed16851___U2 = (0);
+    s.unnamed1902___U1 = (r0);
+    s.unnamed1903___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16851___U2;
-    r0 = pxsim_Array__length(s.unnamed16850___U1);
+    s.tmp_0 = r0 = s.unnamed1903___U2;
+    r0 = pxsim_Array__length(s.unnamed1902___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16850___U1, s.unnamed16851___U2);
-    s.button___518723 = (r0);
-    s.tmp_2 = kodu_Button__C522425_v0_1_mk(s);
-    s.tmp_2.arg0 = s.button___518723;
-    if (!checkSubtype(s.tmp_2.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_2.arg0);
+    r0 = pxsim_Array__getAt(s.unnamed1902___U1, s.unnamed1903___U2);
+    s.button___89905 = (r0);
+    s.tmp_2 = kodu_Button__C84856_v0_1_mk(s);
+    s.tmp_2.arg0 = s.button___89905;
+    if (!checkSubtype(s.tmp_2.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_2.arg0);
     s.tmp_2.fn = s.tmp_2.arg0.vtable.methods.destroy;
     s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed16851___U2 + 1);
-    s.unnamed16851___U2 = (r0);
+    r0 = (s.unnamed1903___U2 + 1);
+    s.unnamed1903___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16850___U1 = (undefined);
+    s.unnamed1902___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -60352,19 +60230,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Menu_hide__P518587.info = {"start":1608,"length":151,"line":41,"column":8,"endLine":46,"endColumn":9,"fileName":"menu.ts","functionName":"hide","argumentNames":["this"]}
+kodu_Menu_hide__P85040.info = {"start":1608,"length":151,"line":41,"column":8,"endLine":46,"endColumn":9,"fileName":"menu.ts","functionName":"hide","argumentNames":["this"]}
 
-function kodu_Menu_hide__P518587_mk(s) {
+function kodu_Menu_hide__P85040_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Menu_hide__P518587, depth: s.depth + 1,
+        parent: s, fn: kodu_Menu_hide__P85040, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  button___518723: undefined,
-  unnamed16850___U1: undefined,
-  unnamed16851___U2: undefined,
+  button___89905: undefined,
+  unnamed1902___U1: undefined,
+  unnamed1903___U2: undefined,
   arg0: undefined,
 } }
 
@@ -60372,7 +60250,7 @@ function kodu_Menu_hide__P518587_mk(s) {
 
 
 
-function kodu_WorldStage_handleCursorButtonClick__P565285(s) {
+function kodu_WorldStage_handleCursorButtonClick__P85234(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60388,7 +60266,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = s.arg0.fields["carryTarget"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -60397,7 +60275,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = kodu_Button_click__P522438_mk(s);
+    s.tmp_3 = kodu_Button_click__P84871_mk(s);
     s.tmp_3.arg0 = s.arg1;
     s.callLocIdx = 1257; s.pc = 3; return s.tmp_3;
   case 3:
@@ -60408,12 +60286,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleCursorButtonClick__P565285.info = {"start":8479,"length":141,"line":238,"column":8,"endLine":242,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorButtonClick","argumentNames":["this","button"]}
+kodu_WorldStage_handleCursorButtonClick__P85234.info = {"start":8539,"length":141,"line":239,"column":8,"endLine":243,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorButtonClick","argumentNames":["this","button"]}
 
-function kodu_WorldStage_handleCursorButtonClick__P565285_mk(s) {
+function kodu_WorldStage_handleCursorButtonClick__P85234_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleCursorButtonClick__P565285, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleCursorButtonClick__P85234, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60427,7 +60305,7 @@ function kodu_WorldStage_handleCursorButtonClick__P565285_mk(s) {
 
 
 
-function kodu_Button_click__P522438(s) {
+function kodu_Button_click__P84871(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60442,11 +60320,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Kelpie_invisible__P110507_mk(s);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Kelpie_invisible__P85290_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 165; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 164; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -60464,12 +60342,12 @@ switch (step) {
     s.tmp_3.arg1 = s.arg0;
     if (!s.tmp_3.arg0.vtable.iface) {
       setupLambda(s.tmp_3, pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "onClick"), 2);
-      s.callLocIdx = 166; s.pc = 7; return s.tmp_3;
+      s.callLocIdx = 165; s.pc = 7; return s.tmp_3;
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["onClick"];
-      if (s.tmp_3.fn == null) { setupLambda(s.tmp_3, s.tmp_3.arg0.fields["onClick"], 2); s.callLocIdx = 166; s.pc = 7; return s.tmp_3; }
-      else if (s.tmp_3.fn.isGetter) { s.tmp_3.stage2Call = true; s.callLocIdx = 166; s.pc = 7; return s.tmp_3;; }
-     else { s.callLocIdx = 166; s.pc = 7; return s.tmp_3; }
+      if (s.tmp_3.fn == null) { setupLambda(s.tmp_3, s.tmp_3.arg0.fields["onClick"], 2); s.callLocIdx = 165; s.pc = 7; return s.tmp_3; }
+      else if (s.tmp_3.fn.isGetter) { s.tmp_3.stage2Call = true; s.callLocIdx = 165; s.pc = 7; return s.tmp_3;; }
+     else { s.callLocIdx = 165; s.pc = 7; return s.tmp_3; }
     }
   case 7:
     r0 = s.retval;
@@ -60480,12 +60358,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_click__P522438.info = {"start":2872,"length":157,"line":90,"column":8,"endLine":95,"endColumn":9,"fileName":"button.ts","functionName":"click","argumentNames":["this"]}
+kodu_Button_click__P84871.info = {"start":2872,"length":157,"line":90,"column":8,"endLine":95,"endColumn":9,"fileName":"button.ts","functionName":"click","argumentNames":["this"]}
 
-function kodu_Button_click__P522438_mk(s) {
+function kodu_Button_click__P84871_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_click__P522438, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_click__P84871, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60498,7 +60376,7 @@ function kodu_Button_click__P522438_mk(s) {
 
 
 
-function kodu_WorldStage_handleCursorCharacterClick__P565283(s) {
+function kodu_WorldStage_handleCursorCharacterClick__P85233(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60516,7 +60394,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg2);
@@ -60535,20 +60413,20 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 1; continue; }
-    s.tmp_5 = kodu_WorldStage_cursorDrop__P565289_mk(s);
+    s.tmp_5 = kodu_WorldStage_cursorDrop__P85238_mk(s);
     s.tmp_5.arg0 = s.arg0;
     s.callLocIdx = 1241; s.pc = 5; return s.tmp_5;
   case 5:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_WorldStage_closeMenus__P565287_mk(s);
+    s.tmp_0 = kodu_WorldStage_closeMenus__P85236_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1242; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg2;
-    s.tmp_2 = kodu_Character_x__P538093_mk(s);
+    s.tmp_2 = kodu_Character_x__P85014_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 1243; s.pc = 7; return s.tmp_2;
   case 7:
@@ -60556,14 +60434,14 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     s.tmp_0 = r0 = s.arg3;
-    s.tmp_2 = kodu_Character_y__P538094_mk(s);
+    s.tmp_2 = kodu_Character_y__P85016_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 1244; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    s.tmp_0 = kodu_Cursor_moveTo__P549533_mk(s);
+    s.tmp_0 = kodu_Cursor_moveTo__P84992_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg2);
@@ -60573,13 +60451,13 @@ switch (step) {
     s.callLocIdx = 1245; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(4, inline__P565649);
+    r0 = pxsim_pxtcore_mkAction(4, inline__P94394);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg2);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg3);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.arg1);
-    s.tmp_1 = kodu_Menu_show__P518586_mk(s);
+    s.tmp_1 = kodu_Menu_show__P85039_mk(s);
     r0 = s.arg0.fields["charMenu"];
     s.tmp_1.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg2);
@@ -60593,7 +60471,7 @@ switch (step) {
     s.callLocIdx = 1247; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = kodu_WorldStage_updateHover__P565292_mk(s);
+    s.tmp_0 = kodu_WorldStage_updateHover__P85241_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1248; s.pc = 11; return s.tmp_0;
   case 11:
@@ -60605,12 +60483,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleCursorCharacterClick__P565283.info = {"start":7110,"length":586,"line":199,"column":8,"endLine":212,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorCharacterClick","argumentNames":["this","char","x","y"]}
+kodu_WorldStage_handleCursorCharacterClick__P85233.info = {"start":7170,"length":586,"line":200,"column":8,"endLine":213,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorCharacterClick","argumentNames":["this","char","x","y"]}
 
-function kodu_WorldStage_handleCursorCharacterClick__P565283_mk(s) {
+function kodu_WorldStage_handleCursorCharacterClick__P85233_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleCursorCharacterClick__P565283, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleCursorCharacterClick__P85233, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60628,7 +60506,7 @@ function kodu_WorldStage_handleCursorCharacterClick__P565283_mk(s) {
 
 
 
-function inline__P565649(s) {
+function inline__P94394(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60642,7 +60520,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_WorldStage_handleCharacterMenuSelection__P565284_mk(s);
+    s.tmp_0 = kodu_WorldStage_handleCharacterMenuSelection__P93839_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_0.arg1 = r0;
@@ -60657,12 +60535,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565649.info = {"start":7547,"length":65,"line":208,"column":58,"endLine":208,"endColumn":123,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P94394.info = {"start":7607,"length":65,"line":209,"column":58,"endLine":209,"endColumn":123,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P565649_mk(s) {
+function inline__P94394_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565649, depth: s.depth + 1,
+        parent: s, fn: inline__P94394, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60672,7 +60550,7 @@ function inline__P565649_mk(s) {
 
 
 
-function kodu_WorldStage_handleCharacterMenuSelection__P565284(s) {
+function kodu_WorldStage_handleCharacterMenuSelection__P93839(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60691,13 +60569,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_closeMenus__P565287_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_closeMenus__P85236_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1249; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_moveTo__P549533_mk(s);
+    s.tmp_0 = kodu_Cursor_moveTo__P84992_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
@@ -60718,9 +60596,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 1:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_KodeStage__C509651_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_KodeStage__C85245_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = kodu_KodeStage_constructor__P509666_mk(s);
+    s.tmp_2 = kodu_KodeStage_constructor__P85252_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     r0 = s.arg0.fields["app"];
     s.tmp_2.arg1 = r0;
@@ -60728,7 +60606,7 @@ switch (step) {
     s.callLocIdx = 1252; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    s.tmp_3 = kodu_App_pushStage__P110411_mk(s);
+    s.tmp_3 = kodu_App_pushStage__P85194_mk(s);
     r0 = s.arg0.fields["app"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_1;
@@ -60737,7 +60615,7 @@ switch (step) {
     r0 = s.retval;
     { step = 5; continue; }
   case 2:
-    s.tmp_0 = kodu_WorldStage_cursorPickUp__P565288_mk(s);
+    s.tmp_0 = kodu_WorldStage_cursorPickUp__P85237_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg4;
     s.callLocIdx = 1254; s.pc = 10; return s.tmp_0;
@@ -60745,7 +60623,7 @@ switch (step) {
     r0 = s.retval;
     { step = 5; continue; }
   case 3:
-    s.tmp_0 = kodu_WorldStage_duplicate__P565290_mk(s);
+    s.tmp_0 = kodu_WorldStage_duplicate__P85239_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg4;
     s.callLocIdx = 1255; s.pc = 11; return s.tmp_0;
@@ -60753,14 +60631,14 @@ switch (step) {
     r0 = s.retval;
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = kodu_Character__C538168_v0_1_mk(s);
+    s.tmp_0 = kodu_Character__C85005_v0_1_mk(s);
     s.tmp_0.arg0 = s.arg4;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Character__C538168_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Character__C85005_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = kodu_WorldStage_save__P565277_mk(s);
+    s.tmp_0 = kodu_WorldStage_save__P85230_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1256; s.pc = 13; return s.tmp_0;
   case 13:
@@ -60770,12 +60648,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleCharacterMenuSelection__P565284.info = {"start":7706,"length":763,"line":214,"column":8,"endLine":236,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCharacterMenuSelection","argumentNames":["this","x","y","selection","char"]}
+kodu_WorldStage_handleCharacterMenuSelection__P93839.info = {"start":7766,"length":763,"line":215,"column":8,"endLine":237,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCharacterMenuSelection","argumentNames":["this","x","y","selection","char"]}
 
-function kodu_WorldStage_handleCharacterMenuSelection__P565284_mk(s) {
+function kodu_WorldStage_handleCharacterMenuSelection__P93839_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleCharacterMenuSelection__P565284, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleCharacterMenuSelection__P93839, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60792,7 +60670,7 @@ function kodu_WorldStage_handleCharacterMenuSelection__P565284_mk(s) {
 
 
 
-function kodu_WorldStage_duplicate__P565290(s) {
+function kodu_WorldStage_duplicate__P85239(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60808,10 +60686,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_spawnCharacter__P565282_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_spawnCharacter__P85232_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = kodu_Character_x__P538093_mk(s);
+    s.tmp_2 = kodu_Character_x__P85014_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 1269; s.pc = 2; return s.tmp_2;
   case 2:
@@ -60819,7 +60697,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 8);
     s.tmp_0.arg1 = r0;
-    s.tmp_4 = kodu_Character_y__P538094_mk(s);
+    s.tmp_4 = kodu_Character_y__P85016_mk(s);
     s.tmp_4.arg0 = s.arg1;
     s.callLocIdx = 1270; s.pc = 3; return s.tmp_4;
   case 3:
@@ -60838,12 +60716,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_duplicate__P565290.info = {"start":9244,"length":125,"line":267,"column":8,"endLine":269,"endColumn":9,"fileName":"worldStage.ts","functionName":"duplicate","argumentNames":["this","char"]}
+kodu_WorldStage_duplicate__P85239.info = {"start":9304,"length":125,"line":268,"column":8,"endLine":270,"endColumn":9,"fileName":"worldStage.ts","functionName":"duplicate","argumentNames":["this","char"]}
 
-function kodu_WorldStage_duplicate__P565290_mk(s) {
+function kodu_WorldStage_duplicate__P85239_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_duplicate__P565290, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_duplicate__P85239, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60858,7 +60736,7 @@ function kodu_WorldStage_duplicate__P565290_mk(s) {
 
 
 
-function kodu_WorldStage_cursorPickUp__P565288(s) {
+function kodu_WorldStage_cursorPickUp__P85237(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60874,17 +60752,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_cursorDrop__P565289_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_cursorDrop__P85238_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1261; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["carryTarget"] = (s.arg1);
-    s.tmp_0 = kodu_Character_x__P538170_mk(s);
+    s.tmp_0 = kodu_Character_x__P85015_mk(s);
     r0 = s.arg0.fields["carryTarget"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_1 = kodu_Cursor_x__P84986_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_1.arg0 = r0;
     s.callLocIdx = 1262; s.pc = 3; return s.tmp_1;
@@ -60894,10 +60772,10 @@ switch (step) {
     s.callLocIdx = 1263; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_Character_y__P538171_mk(s);
+    s.tmp_0 = kodu_Character_y__P85017_mk(s);
     r0 = s.arg0.fields["carryTarget"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_1 = kodu_Cursor_y__P84987_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_1.arg0 = r0;
     s.callLocIdx = 1264; s.pc = 5; return s.tmp_1;
@@ -60907,7 +60785,7 @@ switch (step) {
     s.callLocIdx = 1265; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_setCursorMode__P549532_mk(s);
+    s.tmp_0 = kodu_Cursor_setCursorMode__P84991_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = "burdened";
@@ -60918,12 +60796,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_cursorPickUp__P565288.info = {"start":8821,"length":263,"line":253,"column":8,"endLine":259,"endColumn":9,"fileName":"worldStage.ts","functionName":"cursorPickUp","argumentNames":["this","char"]}
+kodu_WorldStage_cursorPickUp__P85237.info = {"start":8881,"length":263,"line":254,"column":8,"endLine":260,"endColumn":9,"fileName":"worldStage.ts","functionName":"cursorPickUp","argumentNames":["this","char"]}
 
-function kodu_WorldStage_cursorPickUp__P565288_mk(s) {
+function kodu_WorldStage_cursorPickUp__P85237_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_cursorPickUp__P565288, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_cursorPickUp__P85237, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60935,7 +60813,7 @@ function kodu_WorldStage_cursorPickUp__P565288_mk(s) {
 
 
 
-function kodu_KodeStage_constructor__P509666(s) {
+function kodu_KodeStage_constructor__P85252(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60952,12 +60830,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
     r0 = (s.arg0).fields["char"] = (s.arg2);
-    s.tmp_0 = kodu_Stage_constructor__P468829_mk(s);
+    s.tmp_0 = kodu_Stage_constructor__P85050_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.tmp_0.arg2 = globals.STAGE_ID___511062;
+    s.tmp_0.arg2 = globals.STAGE_ID___96035;
     s.callLocIdx = 1535; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
@@ -60965,12 +60843,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_constructor__P509666.info = {"start":20480,"length":91,"line":568,"column":8,"endLine":570,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","app","char"]}
+kodu_KodeStage_constructor__P85252.info = {"start":20480,"length":91,"line":568,"column":8,"endLine":570,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","app","char"]}
 
-function kodu_KodeStage_constructor__P509666_mk(s) {
+function kodu_KodeStage_constructor__P85252_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_constructor__P509666, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_constructor__P85252, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60982,7 +60860,7 @@ function kodu_KodeStage_constructor__P509666_mk(s) {
 
 
 
-function kodu_Menu_show__P518586(s) {
+function kodu_Menu_show__P85039(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60992,8 +60870,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.origX___518608 = undefined;
-    s.origY___518610 = undefined;
+    s.origX___89790 = undefined;
+    s.origY___89792 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -61003,7 +60881,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Menu__C518584_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Menu__C85036_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
@@ -61013,9 +60891,9 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_1, s.arg2);
     s.arg2 = (s.tmp_1);
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
-    s.origX___518608 = (r0);
+    s.origX___89790 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.arg2);
-    s.origY___518610 = (r0);
+    s.origY___89792 = (r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_2 = r0;
     r0 = pxsim_Array__length(s.tmp_2);
@@ -61024,46 +60902,46 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = kodu_Menu_hide__P518587_mk(s);
+    s.tmp_3 = kodu_Menu_hide__P85040_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 454; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 453; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkAction(7, inline__P518617);
+    r0 = pxsim_pxtcore_mkAction(7, inline__P89799);
     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);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.arg4);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.arg3);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.origX___518608);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.origY___518610);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.origX___89790);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.origY___89792);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["items"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 464; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 463; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Menu_show__P518586.info = {"start":492,"length":1106,"line":21,"column":8,"endLine":39,"endColumn":9,"fileName":"menu.ts","functionName":"show","argumentNames":["this","x","y","direction","onSelect"]}
+kodu_Menu_show__P85039.info = {"start":492,"length":1106,"line":21,"column":8,"endLine":39,"endColumn":9,"fileName":"menu.ts","functionName":"show","argumentNames":["this","x","y","direction","onSelect"]}
 
-function kodu_Menu_show__P518586_mk(s) {
+function kodu_Menu_show__P85039_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Menu_show__P518586, depth: s.depth + 1,
+        parent: s, fn: kodu_Menu_show__P85039, 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,
-  origX___518608: undefined,
-  origY___518610: undefined,
+  origX___89790: undefined,
+  origY___89792: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -61075,7 +60953,7 @@ function kodu_Menu_show__P518586_mk(s) {
 
 
 
-function inline__P518617(s) {
+function inline__P89799(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61085,14 +60963,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.icon___518620 = undefined;
-    s.button___518632 = undefined;
+    s.icon___89802 = undefined;
+    s.button___89814 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_icons_get__P110155_mk(s);
+    s.tmp_0 = kodu_icons_get__P84907_mk(s);
     s.tmp_1 = if_icon_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -61101,16 +60979,16 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["icon"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["icon"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 455; s.pc = 22; return s.tmp_1; }
+     else { s.callLocIdx = 454; s.pc = 22; return s.tmp_1; }
     }
   case 22:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 456; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 455; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.icon___518620 = (r0);
+    s.icon___89802 = (r0);
     s.tmp_1 = if_style_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -61119,7 +60997,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["style"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["style"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 457; s.pc = 23; return s.tmp_1; }
+     else { s.callLocIdx = 456; s.pc = 23; return s.tmp_1; }
     }
   case 23:
     r0 = s.retval;
@@ -61142,16 +61020,16 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["set/style"];
       if (s.tmp_3.fn === null) { s.tmp_3.arg0.fields["style"] = s.tmp_3.arg1; }
       else if (s.tmp_3.fn === undefined) { failedCast(s.tmp_3.arg0) } 
-     else { s.callLocIdx = 458; s.pc = 24; return s.tmp_3; }
+     else { s.callLocIdx = 457; s.pc = 24; return s.tmp_3; }
     }
   case 24:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P518648);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89830);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.caps[3]);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     r0 = s.caps[0].fields["stage"];
     s.tmp_2.arg1 = r0;
@@ -61163,7 +61041,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["style"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["style"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 459; s.pc = 26; return s.tmp_3; }
+     else { s.callLocIdx = 458; s.pc = 26; return s.tmp_3; }
     }
   case 26:
     r0 = s.retval;
@@ -61176,7 +61054,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["icon"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["icon"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 460; s.pc = 27; return s.tmp_4; }
+     else { s.callLocIdx = 459; s.pc = 27; return s.tmp_4; }
     }
   case 27:
     r0 = s.retval;
@@ -61189,7 +61067,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["label"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["label"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 461; s.pc = 28; return s.tmp_5; }
+     else { s.callLocIdx = 460; s.pc = 28; return s.tmp_5; }
     }
   case 28:
     r0 = s.retval;
@@ -61201,13 +61079,13 @@ switch (step) {
     r0 = s.caps[0].fields["hud"];
     s.tmp_2.arg7 = r0;
     s.tmp_2.arg8 = s.tmp_1;
-    s.callLocIdx = 463; s.pc = 25; return s.tmp_2;
+    s.callLocIdx = 462; s.pc = 25; return s.tmp_2;
   case 25:
     r0 = s.retval;
-    s.button___518632 = (s.tmp_0);
+    s.button___89814 = (s.tmp_0);
     r0 = s.caps[0].fields["buttons"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.button___518632);
+    r0 = pxsim_Array__push(s.tmp_0, s.button___89814);
     r0 = (s.caps[4] === "right");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -61215,7 +61093,7 @@ switch (step) {
     s.tmp_1 = r0 = s.caps[1];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.width(s.icon___518620);
+    r0 = pxsim_ImageMethods.width(s.icon___89802);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
@@ -61229,7 +61107,7 @@ switch (step) {
     s.tmp_1 = r0 = s.caps[2];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.height(s.icon___518620);
+    r0 = pxsim_ImageMethods.height(s.icon___89802);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_2 = r0;
@@ -61243,7 +61121,7 @@ switch (step) {
     s.tmp_1 = r0 = s.caps[2];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.height(s.icon___518620);
+    r0 = pxsim_ImageMethods.height(s.icon___89802);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
@@ -61291,7 +61169,7 @@ switch (step) {
     s.tmp_9 = r0 = s.caps[2];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_11 = r0;
-    r0 = pxsim_ImageMethods.height(s.icon___518620);
+    r0 = pxsim_ImageMethods.height(s.icon___89802);
     s.tmp_12 = r0;
     r0 = (s.tmp_11 + s.tmp_12);
     s.tmp_10 = r0;
@@ -61306,7 +61184,7 @@ switch (step) {
     s.tmp_1 = r0 = s.caps[1];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.width(s.icon___518620);
+    r0 = pxsim_ImageMethods.width(s.icon___89802);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_2 = r0;
@@ -61321,7 +61199,7 @@ switch (step) {
     s.tmp_1 = r0 = s.caps[1];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.width(s.icon___518620);
+    r0 = pxsim_ImageMethods.width(s.icon___89802);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
@@ -61337,12 +61215,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P518617.info = {"start":730,"length":856,"line":25,"column":31,"endLine":38,"endColumn":13,"fileName":"menu.ts","functionName":"inline","argumentNames":["item","index"]}
+inline__P89799.info = {"start":730,"length":856,"line":25,"column":31,"endLine":38,"endColumn":13,"fileName":"menu.ts","functionName":"inline","argumentNames":["item","index"]}
 
-function inline__P518617_mk(s) {
+function inline__P89799_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P518617, depth: s.depth + 1,
+        parent: s, fn: inline__P89799, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61357,8 +61235,8 @@ function inline__P518617_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  icon___518620: undefined,
-  button___518632: undefined,
+  icon___89802: undefined,
+  button___89814: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -61367,7 +61245,7 @@ function inline__P518617_mk(s) {
 
 
 
-function inline__P518648(s) {
+function inline__P89830(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61385,19 +61263,19 @@ switch (step) {
     s.tmp_0.argL = s.caps[0];
     s.tmp_0.arg0 = s.arg0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 462; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 461; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P518648.info = {"start":957,"length":28,"line":28,"column":105,"endLine":28,"endColumn":133,"fileName":"menu.ts","functionName":"inline","argumentNames":["button"]}
+inline__P89830.info = {"start":957,"length":28,"line":28,"column":105,"endLine":28,"endColumn":133,"fileName":"menu.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P518648_mk(s) {
+function inline__P89830_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P518648, depth: s.depth + 1,
+        parent: s, fn: inline__P89830, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61407,7 +61285,7 @@ function inline__P518648_mk(s) {
 
 
 
-function kodu_Menu_isVisible__P518589(s) {
+function kodu_Menu_isVisible__P85042(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61422,7 +61300,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Menu__C518584_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Menu__C85036_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.tmp_1);
@@ -61431,12 +61309,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Menu_isVisible__P518589.info = {"start":1869,"length":74,"line":53,"column":8,"endLine":55,"endColumn":9,"fileName":"menu.ts","functionName":"isVisible","argumentNames":["this"]}
+kodu_Menu_isVisible__P85042.info = {"start":1869,"length":74,"line":53,"column":8,"endLine":55,"endColumn":9,"fileName":"menu.ts","functionName":"isVisible","argumentNames":["this"]}
 
-function kodu_Menu_isVisible__P518589_mk(s) {
+function kodu_Menu_isVisible__P85042_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Menu_isVisible__P518589, depth: s.depth + 1,
+        parent: s, fn: kodu_Menu_isVisible__P85042, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61447,7 +61325,7 @@ function kodu_Menu_isVisible__P518589_mk(s) {
 
 
 
-function kodu_Cursor_moveTo__P549533(s) {
+function kodu_Cursor_moveTo__P84992(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61464,7 +61342,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = s.arg0.fields["disabled"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -61472,16 +61350,16 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_1 = kodu_Cursor_x__P549530_mk(s);
+    s.tmp_1 = kodu_Cursor_x__P84988_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 335; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 334; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_y__P549531_mk(s);
+    s.tmp_0 = kodu_Cursor_y__P84989_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 336; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 335; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 3:
@@ -61489,12 +61367,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_moveTo__P549533.info = {"start":1585,"length":138,"line":48,"column":8,"endLine":52,"endColumn":9,"fileName":"cursor.ts","functionName":"moveTo","argumentNames":["this","x","y"]}
+kodu_Cursor_moveTo__P84992.info = {"start":1585,"length":138,"line":48,"column":8,"endLine":52,"endColumn":9,"fileName":"cursor.ts","functionName":"moveTo","argumentNames":["this","x","y"]}
 
-function kodu_Cursor_moveTo__P549533_mk(s) {
+function kodu_Cursor_moveTo__P84992_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_moveTo__P549533, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_moveTo__P84992, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61507,7 +61385,7 @@ function kodu_Cursor_moveTo__P549533_mk(s) {
 
 
 
-function kodu_WorldStage_cursorDrop__P565289(s) {
+function kodu_WorldStage_cursorDrop__P85238(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61522,16 +61400,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = (s.arg0).fields["carryTarget"] = (null);
-    s.tmp_0 = kodu_Cursor_setCursorMode__P549532_mk(s);
+    s.tmp_0 = kodu_Cursor_setCursorMode__P84991_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = "free";
     s.callLocIdx = 1267; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_WorldStage_save__P565277_mk(s);
+    s.tmp_0 = kodu_WorldStage_save__P85230_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1268; s.pc = 2; return s.tmp_0;
   case 2:
@@ -61540,12 +61418,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_cursorDrop__P565289.info = {"start":9094,"length":140,"line":261,"column":8,"endLine":265,"endColumn":9,"fileName":"worldStage.ts","functionName":"cursorDrop","argumentNames":["this"]}
+kodu_WorldStage_cursorDrop__P85238.info = {"start":9154,"length":140,"line":262,"column":8,"endLine":266,"endColumn":9,"fileName":"worldStage.ts","functionName":"cursorDrop","argumentNames":["this"]}
 
-function kodu_WorldStage_cursorDrop__P565289_mk(s) {
+function kodu_WorldStage_cursorDrop__P85238_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_cursorDrop__P565289, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_cursorDrop__P85238, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61555,7 +61433,7 @@ function kodu_WorldStage_cursorDrop__P565289_mk(s) {
 
 
 
-function kodu_WorldStage_handleCursorCanvasClick__P565279(s) {
+function kodu_WorldStage_handleCursorCanvasClick__P85231(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61572,14 +61450,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = s.arg0.fields["gameMode"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = kodu_WorldStage_editModeHandleCanvasClick__P565280_mk(s);
+    s.tmp_2 = kodu_WorldStage_editModeHandleCanvasClick__P93837_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = s.arg2;
@@ -61592,12 +61470,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleCursorCanvasClick__P565279.info = {"start":5953,"length":183,"line":167,"column":8,"endLine":171,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorCanvasClick","argumentNames":["this","x","y"]}
+kodu_WorldStage_handleCursorCanvasClick__P85231.info = {"start":6013,"length":183,"line":168,"column":8,"endLine":172,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCursorCanvasClick","argumentNames":["this","x","y"]}
 
-function kodu_WorldStage_handleCursorCanvasClick__P565279_mk(s) {
+function kodu_WorldStage_handleCursorCanvasClick__P85231_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleCursorCanvasClick__P565279, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleCursorCanvasClick__P85231, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61611,7 +61489,7 @@ function kodu_WorldStage_handleCursorCanvasClick__P565279_mk(s) {
 
 
 
-function kodu_WorldStage_editModeHandleCanvasClick__P565280(s) {
+function kodu_WorldStage_editModeHandleCanvasClick__P93837(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61628,29 +61506,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = s.arg0.fields["carryTarget"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_WorldStage_cursorDrop__P565289_mk(s);
+    s.tmp_1 = kodu_WorldStage_cursorDrop__P85238_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1228; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_WorldStage_closeMenus__P565287_mk(s);
+    s.tmp_0 = kodu_WorldStage_closeMenus__P85236_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1229; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(3, inline__P565571);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P94316);
     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 = kodu_Menu_show__P518586_mk(s);
+    s.tmp_1 = kodu_Menu_show__P85039_mk(s);
     r0 = s.arg0.fields["createMenu"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
@@ -61660,7 +61538,7 @@ switch (step) {
     s.callLocIdx = 1231; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = kodu_WorldStage_updateHover__P565292_mk(s);
+    s.tmp_0 = kodu_WorldStage_updateHover__P85241_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1232; s.pc = 6; return s.tmp_0;
   case 6:
@@ -61670,12 +61548,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_editModeHandleCanvasClick__P565280.info = {"start":6146,"length":355,"line":173,"column":8,"endLine":181,"endColumn":9,"fileName":"worldStage.ts","functionName":"editModeHandleCanvasClick","argumentNames":["this","x","y"]}
+kodu_WorldStage_editModeHandleCanvasClick__P93837.info = {"start":6206,"length":355,"line":174,"column":8,"endLine":182,"endColumn":9,"fileName":"worldStage.ts","functionName":"editModeHandleCanvasClick","argumentNames":["this","x","y"]}
 
-function kodu_WorldStage_editModeHandleCanvasClick__P565280_mk(s) {
+function kodu_WorldStage_editModeHandleCanvasClick__P93837_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_editModeHandleCanvasClick__P565280, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_editModeHandleCanvasClick__P93837, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61688,7 +61566,7 @@ function kodu_WorldStage_editModeHandleCanvasClick__P565280_mk(s) {
 
 
 
-function inline__P565571(s) {
+function inline__P94316(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61702,7 +61580,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_WorldStage_handleCreateMenuSelection__P565281_mk(s);
+    s.tmp_0 = kodu_WorldStage_handleCreateMenuSelection__P93838_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.caps[1];
     s.tmp_0.arg2 = s.caps[2];
@@ -61714,12 +61592,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565571.info = {"start":6383,"length":56,"line":178,"column":52,"endLine":178,"endColumn":108,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P94316.info = {"start":6443,"length":56,"line":179,"column":52,"endLine":179,"endColumn":108,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P565571_mk(s) {
+function inline__P94316_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565571, depth: s.depth + 1,
+        parent: s, fn: inline__P94316, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61729,7 +61607,7 @@ function inline__P565571_mk(s) {
 
 
 
-function kodu_WorldStage_handleCreateMenuSelection__P565281(s) {
+function kodu_WorldStage_handleCreateMenuSelection__P93838(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61739,7 +61617,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.charDefn___565588 = undefined;
+    s.charDefn___94333 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -61748,13 +61626,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_closeMenus__P565287_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_closeMenus__P85236_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1233; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_moveTo__P549533_mk(s);
+    s.tmp_0 = kodu_Cursor_moveTo__P84992_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
@@ -61763,7 +61641,7 @@ switch (step) {
   case 4:
     r0 = s.retval;
     s.tmp_1 = if_characters_1_mk(s);
-    s.tmp_1.arg0 = globals.chardb___110401;
+    s.tmp_1.arg0 = globals.chardb___85154;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "characters");
     } else {
@@ -61778,14 +61656,14 @@ switch (step) {
     r0 = s.arg3.fields["iconId"];
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, s.tmp_2);
-    s.charDefn___565588 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.charDefn___565588);
+    s.charDefn___94333 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.charDefn___94333);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = kodu_WorldStage_spawnCharacter__P565282_mk(s);
+    s.tmp_0 = kodu_WorldStage_spawnCharacter__P85232_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.charDefn___565588;
+    s.tmp_0.arg3 = s.charDefn___94333;
     s.tmp_0.arg4 = undefined;
     s.callLocIdx = 1237; s.pc = 6; return s.tmp_0;
   case 6:
@@ -61796,17 +61674,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleCreateMenuSelection__P565281.info = {"start":6511,"length":312,"line":183,"column":8,"endLine":190,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCreateMenuSelection","argumentNames":["this","x","y","selection"]}
+kodu_WorldStage_handleCreateMenuSelection__P93838.info = {"start":6571,"length":312,"line":184,"column":8,"endLine":191,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleCreateMenuSelection","argumentNames":["this","x","y","selection"]}
 
-function kodu_WorldStage_handleCreateMenuSelection__P565281_mk(s) {
+function kodu_WorldStage_handleCreateMenuSelection__P93838_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleCreateMenuSelection__P565281, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleCreateMenuSelection__P93838, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  charDefn___565588: undefined,
+  charDefn___94333: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -61817,7 +61695,7 @@ function kodu_WorldStage_handleCreateMenuSelection__P565281_mk(s) {
 
 
 
-function kodu_WorldStage_handleMenuPressed__P565271(s) {
+function kodu_WorldStage_handleMenuPressed__P85229(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61832,22 +61710,22 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_toggleGameMode__P565272_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_toggleGameMode__P93831_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1187; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1186; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleMenuPressed__P565271.info = {"start":2661,"length":66,"line":81,"column":8,"endLine":83,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleMenuPressed","argumentNames":["this"]}
+kodu_WorldStage_handleMenuPressed__P85229.info = {"start":2661,"length":66,"line":81,"column":8,"endLine":83,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleMenuPressed","argumentNames":["this"]}
 
-function kodu_WorldStage_handleMenuPressed__P565271_mk(s) {
+function kodu_WorldStage_handleMenuPressed__P85229_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleMenuPressed__P565271, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleMenuPressed__P85229, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61857,7 +61735,7 @@ function kodu_WorldStage_handleMenuPressed__P565271_mk(s) {
 
 
 
-function kodu_WorldStage_toggleGameMode__P565272(s) {
+function kodu_WorldStage_toggleGameMode__P93831(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61872,25 +61750,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = s.arg0.fields["gameMode"];
     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 = kodu_WorldStage_setGameMode__P565276_mk(s);
+    s.tmp_2 = kodu_WorldStage_setGameMode__P93835_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1188; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1187; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_WorldStage_setGameMode__P565276_mk(s);
+    s.tmp_0 = kodu_WorldStage_setGameMode__P93835_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.callLocIdx = 1189; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1188; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 2:
@@ -61898,12 +61776,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_toggleGameMode__P565272.info = {"start":2737,"length":220,"line":85,"column":8,"endLine":91,"endColumn":9,"fileName":"worldStage.ts","functionName":"toggleGameMode","argumentNames":["this"]}
+kodu_WorldStage_toggleGameMode__P93831.info = {"start":2737,"length":220,"line":85,"column":8,"endLine":91,"endColumn":9,"fileName":"worldStage.ts","functionName":"toggleGameMode","argumentNames":["this"]}
 
-function kodu_WorldStage_toggleGameMode__P565272_mk(s) {
+function kodu_WorldStage_toggleGameMode__P93831_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_toggleGameMode__P565272, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_toggleGameMode__P93831, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61915,7 +61793,7 @@ function kodu_WorldStage_toggleGameMode__P565272_mk(s) {
 
 
 
-function kodu_WorldStage_setGameMode__P565276(s) {
+function kodu_WorldStage_setGameMode__P93835(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61931,7 +61809,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
     r0 = s.arg0.fields["gameMode"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === s.arg1);
@@ -61945,7 +61823,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = kodu_WorldStage_save__P565277_mk(s);
+    s.tmp_3 = kodu_WorldStage_save__P85230_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 1196; s.pc = 8; return s.tmp_3;
   case 8:
@@ -61957,14 +61835,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = kodu_WorldStage_load__P565278_mk(s);
+    s.tmp_1 = kodu_WorldStage_load__P93836_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1197; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
   case 5:
   case 6:
-    s.tmp_0 = kodu_Button_setVisible__P522436_mk(s);
+    s.tmp_0 = kodu_Button_setVisible__P84869_mk(s);
     r0 = s.arg0.fields["playBtn"];
     s.tmp_0.arg0 = r0;
     r0 = (s.arg1 === 0);
@@ -61972,7 +61850,7 @@ switch (step) {
     s.callLocIdx = 1198; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button_setVisible__P522436_mk(s);
+    s.tmp_0 = kodu_Button_setVisible__P84869_mk(s);
     r0 = s.arg0.fields["newBtn"];
     s.tmp_0.arg0 = r0;
     r0 = (s.arg1 === 0);
@@ -61980,7 +61858,7 @@ switch (step) {
     s.callLocIdx = 1199; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button_setVisible__P522436_mk(s);
+    s.tmp_0 = kodu_Button_setVisible__P84869_mk(s);
     r0 = s.arg0.fields["stopBtn"];
     s.tmp_0.arg0 = r0;
     r0 = (s.arg1 === 1);
@@ -61988,22 +61866,22 @@ switch (step) {
     s.callLocIdx = 1200; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = kodu_Menu_hide__P518587_mk(s);
+    s.tmp_0 = kodu_Menu_hide__P85040_mk(s);
     r0 = s.arg0.fields["createMenu"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1201; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = kodu_Menu_hide__P518587_mk(s);
+    s.tmp_0 = kodu_Menu_hide__P85040_mk(s);
     r0 = s.arg0.fields["charMenu"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1202; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565439);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94181);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
@@ -62015,12 +61893,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_setGameMode__P565276.info = {"start":3427,"length":721,"line":110,"column":8,"endLine":123,"endColumn":9,"fileName":"worldStage.ts","functionName":"setGameMode","argumentNames":["this","mode"]}
+kodu_WorldStage_setGameMode__P93835.info = {"start":3487,"length":721,"line":111,"column":8,"endLine":124,"endColumn":9,"fileName":"worldStage.ts","functionName":"setGameMode","argumentNames":["this","mode"]}
 
-function kodu_WorldStage_setGameMode__P565276_mk(s) {
+function kodu_WorldStage_setGameMode__P93835_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_setGameMode__P565276, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_setGameMode__P93835, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62034,7 +61912,7 @@ function kodu_WorldStage_setGameMode__P565276_mk(s) {
 
 
 
-function inline__P565439(s) {
+function inline__P94181(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62048,11 +61926,11 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Component__C345109_v2_3_mk(s);
+    s.tmp_0 = kodu_Component__C84895_v2_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = "gameModeChanged";
     s.tmp_0.arg2 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C345109_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C84895_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.notify;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -62061,12 +61939,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565439.info = {"start":4092,"length":44,"line":122,"column":36,"endLine":122,"endColumn":80,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P94181.info = {"start":4152,"length":44,"line":123,"column":36,"endLine":123,"endColumn":80,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P565439_mk(s) {
+function inline__P94181_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565439, depth: s.depth + 1,
+        parent: s, fn: inline__P94181, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -62076,7 +61954,7 @@ function inline__P565439_mk(s) {
 
 
 
-function kodu_Button_setVisible__P522436(s) {
+function kodu_Button_setVisible__P84869(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62092,29 +61970,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_invisible__P110508_mk(s);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 161; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 160; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["back"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Kelpie_invisible__P110508_mk(s);
+    s.tmp_1 = kodu_Kelpie_invisible__P85291_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 162; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 161; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
   case 1:
@@ -62123,7 +62001,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = Sprite_setFlag__P108576_mk(s);
+    s.tmp_1 = Sprite_setFlag__P83360_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 128;
@@ -62131,7 +62009,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 163; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 162; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
   case 3:
@@ -62142,10 +62020,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = kodu_Button_hover__P522440_mk(s);
+    s.tmp_2 = kodu_Button_hover__P84873_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 164; s.pc = 10; return s.tmp_2;
+    s.callLocIdx = 163; s.pc = 10; return s.tmp_2;
   case 10:
     r0 = s.retval;
   case 5:
@@ -62154,12 +62032,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_setVisible__P522436.info = {"start":2432,"length":369,"line":75,"column":8,"endLine":86,"endColumn":9,"fileName":"button.ts","functionName":"setVisible","argumentNames":["this","visible"]}
+kodu_Button_setVisible__P84869.info = {"start":2432,"length":369,"line":75,"column":8,"endLine":86,"endColumn":9,"fileName":"button.ts","functionName":"setVisible","argumentNames":["this","visible"]}
 
-function kodu_Button_setVisible__P522436_mk(s) {
+function kodu_Button_setVisible__P84869_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_setVisible__P522436, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_setVisible__P84869, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62172,7 +62050,7 @@ function kodu_Button_setVisible__P522436_mk(s) {
 
 
 
-function kodu_WorldStage_initScene__P565270(s) {
+function kodu_WorldStage_initScene__P85228(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62182,39 +62060,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.createMenuItems___565342 = undefined;
-    s.charMenuItems___565358 = undefined;
+    s.createMenuItems___94082 = undefined;
+    s.charMenuItems___94098 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Stage_initScene__P468701_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Stage_initScene__P85063_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1170; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1169; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Physics__C110391_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Physics__C85144_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Physics_constructor__P110394_mk(s);
+    s.tmp_1 = kodu_Physics_constructor__P85147_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 1171; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1170; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["physics"] = (s.tmp_0);
-    s.tmp_0 = scene_setBackgroundColor__P108954_mk(s);
+    s.tmp_0 = scene_setBackgroundColor__P83733_mk(s);
     s.tmp_0.arg0 = 13;
-    s.callLocIdx = 1172; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1171; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565326);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94068);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = "white";
@@ -62224,16 +62102,16 @@ switch (step) {
     s.tmp_2.arg6 = 112;
     s.tmp_2.arg7 = true;
     s.tmp_2.arg8 = s.tmp_1;
-    s.callLocIdx = 1174; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1173; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["playBtn"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565333);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94074);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = "white";
@@ -62243,16 +62121,16 @@ switch (step) {
     s.tmp_2.arg6 = 112;
     s.tmp_2.arg7 = true;
     s.tmp_2.arg8 = s.tmp_1;
-    s.callLocIdx = 1176; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1175; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     r0 = (s.arg0).fields["stopBtn"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565340);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94080);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = "danger";
@@ -62262,30 +62140,30 @@ switch (step) {
     s.tmp_2.arg6 = 8;
     s.tmp_2.arg7 = true;
     s.tmp_2.arg8 = s.tmp_1;
-    s.callLocIdx = 1178; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 1177; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["newBtn"] = (s.tmp_0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_1 = kodu_Characters_getCharacters__P110400_mk(s);
-    s.callLocIdx = 1179; s.pc = 8; return s.tmp_1;
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_1 = kodu_Characters_getCharacters__P85153_mk(s);
+    s.callLocIdx = 1178; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P565344;
-    s.callLocIdx = 1182; s.pc = 7; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P94084;
+    s.callLocIdx = 1181; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.createMenuItems___565342 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Menu__C518584_VT);
+    s.createMenuItems___94082 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Menu__C85036_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Menu_constructor__P518591_mk(s);
+    s.tmp_1 = kodu_Menu_constructor__P85038_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.tmp_1.arg2 = s.createMenuItems___565342;
+    s.tmp_1.arg2 = s.createMenuItems___94082;
     s.tmp_1.arg3 = false;
     s.tmp_1.arg4 = 4;
-    s.callLocIdx = 1183; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 1182; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     r0 = (s.arg0).fields["createMenu"] = (s.tmp_0);
@@ -62312,48 +62190,48 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_4, "label", "Delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_4, "style", "danger");
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_4);
-    s.charMenuItems___565358 = (s.tmp_1);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Menu__C518584_VT);
+    s.charMenuItems___94098 = (s.tmp_1);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Menu__C85036_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Menu_constructor__P518591_mk(s);
+    s.tmp_1 = kodu_Menu_constructor__P85038_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.tmp_1.arg2 = s.charMenuItems___565358;
+    s.tmp_1.arg2 = s.charMenuItems___94098;
     s.tmp_1.arg3 = false;
     s.tmp_1.arg4 = 4;
-    s.callLocIdx = 1184; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 1183; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     r0 = (s.arg0).fields["charMenu"] = (s.tmp_0);
-    s.tmp_0 = kodu_WorldStage_setGameMode__P565276_mk(s);
+    s.tmp_0 = kodu_WorldStage_setGameMode__P93835_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1185; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1184; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = kodu_Stage_start__P468702_mk(s);
+    s.tmp_0 = kodu_Stage_start__P88124_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1186; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1185; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_initScene__P565270.info = {"start":904,"length":1747,"line":42,"column":8,"endLine":79,"endColumn":9,"fileName":"worldStage.ts","functionName":"initScene","argumentNames":["this"]}
+kodu_WorldStage_initScene__P85228.info = {"start":904,"length":1747,"line":42,"column":8,"endLine":79,"endColumn":9,"fileName":"worldStage.ts","functionName":"initScene","argumentNames":["this"]}
 
-function kodu_WorldStage_initScene__P565270_mk(s) {
+function kodu_WorldStage_initScene__P85228_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_initScene__P565270, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_initScene__P85228, 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,
-  createMenuItems___565342: undefined,
-  charMenuItems___565358: undefined,
+  createMenuItems___94082: undefined,
+  charMenuItems___94098: undefined,
   arg0: undefined,
 } }
 
@@ -62361,7 +62239,7 @@ function kodu_WorldStage_initScene__P565270_mk(s) {
 
 
 
-function inline__P565326(s) {
+function inline__P94068(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62371,21 +62249,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_WorldStage_handlePlayClicked__P565273_mk(s);
+    s.tmp_0 = kodu_WorldStage_handlePlayClicked__P93832_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1173; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1172; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565326.info = {"start":1120,"length":30,"line":46,"column":83,"endLine":46,"endColumn":113,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
+inline__P94068.info = {"start":1120,"length":30,"line":46,"column":83,"endLine":46,"endColumn":113,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P565326_mk(s) {
+function inline__P94068_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565326, depth: s.depth + 1,
+        parent: s, fn: inline__P94068, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -62394,7 +62272,7 @@ function inline__P565326_mk(s) {
 
 
 
-function inline__P565333(s) {
+function inline__P94074(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62404,21 +62282,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_WorldStage_handleStopClicked__P565274_mk(s);
+    s.tmp_0 = kodu_WorldStage_handleStopClicked__P93833_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1175; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1174; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565333.info = {"start":1236,"length":30,"line":47,"column":83,"endLine":47,"endColumn":113,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
+inline__P94074.info = {"start":1236,"length":30,"line":47,"column":83,"endLine":47,"endColumn":113,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P565333_mk(s) {
+function inline__P94074_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565333, depth: s.depth + 1,
+        parent: s, fn: inline__P94074, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -62427,7 +62305,7 @@ function inline__P565333_mk(s) {
 
 
 
-function inline__P565340(s) {
+function inline__P94080(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62437,21 +62315,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_WorldStage_handleNewFileClicked__P565275_mk(s);
+    s.tmp_0 = kodu_WorldStage_handleNewFileClicked__P93834_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1177; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1176; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565340.info = {"start":1581,"length":33,"line":50,"column":84,"endLine":50,"endColumn":117,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
+inline__P94080.info = {"start":1581,"length":33,"line":50,"column":84,"endLine":50,"endColumn":117,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P565340_mk(s) {
+function inline__P94080_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565340, depth: s.depth + 1,
+        parent: s, fn: inline__P94080, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -62460,7 +62338,7 @@ function inline__P565340_mk(s) {
 
 
 
-function inline__P565344(s) {
+function inline__P94084(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62484,7 +62362,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["id"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["id"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1180; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1179; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -62498,7 +62376,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["name"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["name"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1181; s.pc = 2; return s.tmp_4; }
+     else { s.callLocIdx = 1180; s.pc = 2; return s.tmp_4; }
     }
   case 2:
     r0 = s.retval;
@@ -62508,12 +62386,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565344.info = {"start":1684,"length":139,"line":51,"column":67,"endLine":56,"endColumn":13,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["char"]}
+inline__P94084.info = {"start":1684,"length":139,"line":51,"column":67,"endLine":56,"endColumn":13,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["char"]}
 
-function inline__P565344_mk(s) {
+function inline__P94084_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565344, depth: s.depth + 1,
+        parent: s, fn: inline__P94084, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62527,7 +62405,7 @@ function inline__P565344_mk(s) {
 
 
 
-function kodu_Stage_start__P468702(s) {
+function kodu_Stage_start__P88124(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62542,29 +62420,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim.control.millis();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["prevMs"] = (s.tmp_1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P468938);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90040);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = game_onUpdate__P109040_mk(s);
+    s.tmp_1 = game_onUpdate__P83819_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 480; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 479; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_start__P468702.info = {"start":1812,"length":278,"line":61,"column":8,"endLine":70,"endColumn":9,"fileName":"stage.ts","functionName":"start","argumentNames":["this"]}
+kodu_Stage_start__P88124.info = {"start":1812,"length":278,"line":61,"column":8,"endLine":70,"endColumn":9,"fileName":"stage.ts","functionName":"start","argumentNames":["this"]}
 
-function kodu_Stage_start__P468702_mk(s) {
+function kodu_Stage_start__P88124_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_start__P468702, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_start__P88124, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62575,7 +62453,7 @@ function kodu_Stage_start__P468702_mk(s) {
 
 
 
-function inline__P468938(s) {
+function inline__P90040(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62585,44 +62463,44 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.t___468939 = undefined;
-    s.dt___468942 = undefined;
+    s.t___90041 = undefined;
+    s.dt___90044 = undefined;
     r0 = pxsim.control.millis();
-    s.t___468939 = (r0);
+    s.t___90041 = (r0);
     r0 = s.caps[0].fields["prevMs"];
     s.tmp_0 = r0;
-    r0 = (s.t___468939 - s.tmp_0);
-    s.dt___468942 = (r0);
-    s.tmp_0 = kodu_Stage__C468688_v1_2_mk(s);
+    r0 = (s.t___90041 - s.tmp_0);
+    s.dt___90044 = (r0);
+    s.tmp_0 = kodu_Stage__C85045_v1_2_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_0.arg1 = s.dt___468942;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.dt___90044;
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_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:
     r0 = s.retval;
-    r0 = (s.caps[0]).fields["prevMs"] = (s.t___468939);
+    r0 = (s.caps[0]).fields["prevMs"] = (s.t___90041);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468938.info = {"start":1903,"length":175,"line":64,"column":26,"endLine":69,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
+inline__P90040.info = {"start":1903,"length":175,"line":64,"column":26,"endLine":69,"endColumn":13,"fileName":"stage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P468938_mk(s) {
+function inline__P90040_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468938, depth: s.depth + 1,
+        parent: s, fn: inline__P90040, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  t___468939: undefined,
-  dt___468942: undefined,
+  t___90041: undefined,
+  dt___90044: undefined,
 } }
 
 
 
 
 
-function kodu_Stage_update__P468691(s) {
+function kodu_Stage_update__P85053(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62638,27 +62516,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P468845);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89947);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 468; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 467; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_update__P468691.info = {"start":341,"length":99,"line":13,"column":8,"endLine":15,"endColumn":9,"fileName":"stage.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_Stage_update__P85053.info = {"start":341,"length":99,"line":13,"column":8,"endLine":15,"endColumn":9,"fileName":"stage.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_Stage_update__P468691_mk(s) {
+function kodu_Stage_update__P85053_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_update__P468691, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_update__P85053, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62670,7 +62548,7 @@ function kodu_Stage_update__P468691_mk(s) {
 
 
 
-function inline__P468845(s) {
+function inline__P89947(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62684,10 +62562,10 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Component__C345109_v1_2_mk(s);
+    s.tmp_0 = kodu_Component__C84895_v1_2_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C345109_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C84895_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:
@@ -62696,12 +62574,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468845.info = {"start":405,"length":23,"line":14,"column":36,"endLine":14,"endColumn":59,"fileName":"stage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P89947.info = {"start":405,"length":23,"line":14,"column":36,"endLine":14,"endColumn":59,"fileName":"stage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P468845_mk(s) {
+function inline__P89947_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468845, depth: s.depth + 1,
+        parent: s, fn: inline__P89947, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -62711,7 +62589,7 @@ function inline__P468845_mk(s) {
 
 
 
-function kodu_Component_update__P345111(s) {
+function kodu_Component_update__P84898(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62727,17 +62605,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Component__C345109_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Component__C84895_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Component_update__P345111.info = {"start":327,"length":21,"line":12,"column":8,"endLine":12,"endColumn":29,"fileName":"component.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_Component_update__P84898.info = {"start":327,"length":21,"line":12,"column":8,"endLine":12,"endColumn":29,"fileName":"component.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_Component_update__P345111_mk(s) {
+function kodu_Component_update__P84898_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Component_update__P345111, depth: s.depth + 1,
+        parent: s, fn: kodu_Component_update__P84898, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -62747,7 +62625,7 @@ function kodu_Component_update__P345111_mk(s) {
 
 
 
-function kodu_Menu_constructor__P518591(s) {
+function kodu_Menu_constructor__P85038(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62766,15 +62644,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Menu__C518584_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Menu__C85036_VT)) failedCast(r0);
     r0 = (s.arg0).fields["items"] = (s.arg2);
     r0 = (s.arg0).fields["hud"] = (s.arg3);
     r0 = (s.arg0).fields["wrap"] = (s.arg4);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "menu";
-    s.callLocIdx = 452; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 451; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -62785,12 +62663,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Menu_constructor__P518591.info = {"start":301,"length":181,"line":16,"column":8,"endLine":19,"endColumn":9,"fileName":"menu.ts","functionName":"inline","argumentNames":["this","stage","items","hud","wrap"]}
+kodu_Menu_constructor__P85038.info = {"start":301,"length":181,"line":16,"column":8,"endLine":19,"endColumn":9,"fileName":"menu.ts","functionName":"inline","argumentNames":["this","stage","items","hud","wrap"]}
 
-function kodu_Menu_constructor__P518591_mk(s) {
+function kodu_Menu_constructor__P85038_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Menu_constructor__P518591, depth: s.depth + 1,
+        parent: s, fn: kodu_Menu_constructor__P85038, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62805,7 +62683,7 @@ function kodu_Menu_constructor__P518591_mk(s) {
 
 
 
-function kodu_Characters_getCharacters__P110400(s) {
+function kodu_Characters_getCharacters__P85153(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62815,57 +62693,57 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.chars___117027 = undefined;
-    s.tmp_0 = helpers_arraySort__P106712_mk(s);
-    s.tmp_1 = helpers_arrayMap__P106713_mk(s);
+    s.chars___91916 = undefined;
+    s.tmp_0 = helpers_arraySort__P81374_mk(s);
+    s.tmp_1 = helpers_arrayMap__P81375_mk(s);
     s.tmp_3 = if_characters_1_mk(s);
-    s.tmp_3.arg0 = globals.chardb___110401;
+    s.tmp_3.arg0 = globals.chardb___85154;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "characters");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["characters"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["characters"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 873; s.pc = 3; return s.tmp_3; }
+     else { s.callLocIdx = 872; s.pc = 3; return s.tmp_3; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt.keysOf(s.tmp_2);
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P117038;
-    s.callLocIdx = 875; s.pc = 2; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P91927;
+    s.callLocIdx = 874; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P117029;
-    s.callLocIdx = 878; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P91918;
+    s.callLocIdx = 877; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.chars___117027 = (r0);
-    r0 = s.chars___117027;
+    s.chars___91916 = (r0);
+    r0 = s.chars___91916;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Characters_getCharacters__P110400.info = {"start":467,"length":245,"line":19,"column":8,"endLine":24,"endColumn":9,"fileName":"characters.ts","functionName":"getCharacters","argumentNames":[]}
+kodu_Characters_getCharacters__P85153.info = {"start":467,"length":245,"line":19,"column":8,"endLine":24,"endColumn":9,"fileName":"characters.ts","functionName":"getCharacters","argumentNames":[]}
 
-function kodu_Characters_getCharacters__P110400_mk(s) {
+function kodu_Characters_getCharacters__P85153_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Characters_getCharacters__P110400, depth: s.depth + 1,
+        parent: s, fn: kodu_Characters_getCharacters__P85153, 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,
-  chars___117027: undefined,
+  chars___91916: undefined,
 } }
 
 
 
 
 
-function inline__P117038(s) {
+function inline__P91927(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62880,14 +62758,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_characters_1_mk(s);
-    s.tmp_1.arg0 = globals.chardb___110401;
+    s.tmp_1.arg0 = globals.chardb___85154;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "characters");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["characters"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["characters"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 874; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 873; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -62896,12 +62774,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117038.info = {"start":594,"length":27,"line":21,"column":21,"endLine":21,"endColumn":48,"fileName":"characters.ts","functionName":"inline","argumentNames":["id"]}
+inline__P91927.info = {"start":594,"length":27,"line":21,"column":21,"endLine":21,"endColumn":48,"fileName":"characters.ts","functionName":"inline","argumentNames":["id"]}
 
-function inline__P117038_mk(s) {
+function inline__P91927_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117038, depth: s.depth + 1,
+        parent: s, fn: inline__P91927, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62912,7 +62790,7 @@ function inline__P117038_mk(s) {
 
 
 
-function inline__P117029(s) {
+function inline__P91918(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62935,7 +62813,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 876; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 875; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -62948,7 +62826,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["weight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["weight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 877; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 876; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -62957,12 +62835,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P117029.info = {"start":645,"length":29,"line":22,"column":22,"endLine":22,"endColumn":51,"fileName":"characters.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P91918.info = {"start":645,"length":29,"line":22,"column":22,"endLine":22,"endColumn":51,"fileName":"characters.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P117029_mk(s) {
+function inline__P91918_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P117029, depth: s.depth + 1,
+        parent: s, fn: inline__P91918, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62976,7 +62854,7 @@ function inline__P117029_mk(s) {
 
 
 
-function kodu_WorldStage_handleNewFileClicked__P565275(s) {
+function kodu_WorldStage_handleNewFileClicked__P93834(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62991,11 +62869,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P565389);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P94131);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = setTimeout__P107021_mk(s);
+    s.tmp_1 = setTimeout__P81685_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.callLocIdx = 1195; s.pc = 1; return s.tmp_1;
@@ -63005,12 +62883,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleNewFileClicked__P565275.info = {"start":3155,"length":262,"line":101,"column":8,"endLine":108,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleNewFileClicked","argumentNames":["this"]}
+kodu_WorldStage_handleNewFileClicked__P93834.info = {"start":3215,"length":262,"line":102,"column":8,"endLine":109,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleNewFileClicked","argumentNames":["this"]}
 
-function kodu_WorldStage_handleNewFileClicked__P565275_mk(s) {
+function kodu_WorldStage_handleNewFileClicked__P93834_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleNewFileClicked__P565275, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleNewFileClicked__P93834, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63021,7 +62899,7 @@ function kodu_WorldStage_handleNewFileClicked__P565275_mk(s) {
 
 
 
-function inline__P565389(s) {
+function inline__P94131(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63031,7 +62909,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_1 = game_ask__P109079_mk(s);
+    s.tmp_1 = game_ask__P83858_mk(s);
     s.tmp_1.arg0 = "New Game";
     s.tmp_1.arg1 = "Are you sure?";
     s.callLocIdx = 1192; s.pc = 3; return s.tmp_1;
@@ -63040,13 +62918,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = settings_writeString__P108325_mk(s);
-    s.tmp_2.arg0 = globals.SAVEGAME___565300;
+    s.tmp_2 = settings_writeString__P83101_mk(s);
+    s.tmp_2.arg0 = globals.SAVEGAME___94045;
     s.tmp_2.arg1 = null;
     s.callLocIdx = 1193; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = kodu_WorldStage_load__P565278_mk(s);
+    s.tmp_0 = kodu_WorldStage_load__P93836_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 1194; s.pc = 5; return s.tmp_0;
   case 5:
@@ -63057,12 +62935,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565389.info = {"start":3211,"length":191,"line":102,"column":23,"endLine":107,"endColumn":13,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
+inline__P94131.info = {"start":3271,"length":191,"line":103,"column":23,"endLine":108,"endColumn":13,"fileName":"worldStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P565389_mk(s) {
+function inline__P94131_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565389, depth: s.depth + 1,
+        parent: s, fn: inline__P94131, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63073,7 +62951,7 @@ function inline__P565389_mk(s) {
 
 
 
-function game_ask__P109079(s) {
+function game_ask__P83858(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63083,82 +62961,84 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.answer___124781 = undefined;
+    s.answer___100118 = undefined;
+    s.aNotHeld___100120 = undefined;
+    s.bNotHeld___100121 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_eventContext__P109032_mk(s);
-    s.callLocIdx = 908; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = controller__setUserEventsEnabled__P83227_mk(s);
+    s.tmp_0.arg0 = false;
+    s.callLocIdx = 912; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = control_pushEventContext__P107007_mk(s);
-    s.callLocIdx = 909; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = game_eventContext__P83811_mk(s);
+    s.callLocIdx = 913; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_showDialog__P109035_mk(s);
+    s.tmp_0 = control_pushEventContext__P81671_mk(s);
+    s.callLocIdx = 914; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+    s.tmp_0 = game_showDialog__P83814_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "A = OK, B = CANCEL";
-    s.callLocIdx = 910; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    r0 = pxsim_pxtrt.mklocRef();
-    s.answer___124781 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.answer___124781, null);
-    s.tmp_0 = pause__P107011_mk(s);
-    s.tmp_0.arg0 = 500;
-    s.callLocIdx = 911; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 915; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P124787);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___124781);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.A___108374;
-    s.tmp_1.arg1 = 2049;
-    s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 912; s.pc = 5; return s.tmp_1;
+    s.tmp_0 = pause__P81675_mk(s);
+    s.tmp_0.arg0 = 500;
+    s.callLocIdx = 916; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P124792);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___124781);
-    s.tmp_1 = controller_Button_onEvent__P108407_mk(s);
-    s.tmp_1.arg0 = globals.B___108375;
-    s.tmp_1.arg1 = 2049;
-    s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 913; s.pc = 6; return s.tmp_1;
-  case 6:
-    r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P124796);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___124781);
-    s.tmp_1 = pauseUntil__P106965_mk(s);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.answer___100118 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.answer___100118, null);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.aNotHeld___100120 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.aNotHeld___100120, false);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.bNotHeld___100121 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.bNotHeld___100121, false);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P100124);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.aNotHeld___100120);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.bNotHeld___100121);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.answer___100118);
+    s.tmp_1 = pauseUntil__P81629_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 914; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 917; s.pc = 6; return s.tmp_1;
+  case 6:
+    r0 = s.retval;
+    s.tmp_0 = control_popEventContext__P81672_mk(s);
+    s.callLocIdx = 918; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = control_popEventContext__P107008_mk(s);
-    s.callLocIdx = 915; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = controller__setUserEventsEnabled__P83227_mk(s);
+    s.tmp_0.arg0 = true;
+    s.callLocIdx = 919; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.answer___124781);
+    r0 = pxsim_pxtrt_ldlocRef(s.answer___100118);
     return leave(s, r0)
   default: oops()
 } } }
-game_ask__P109079.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"]}
+game_ask__P83858.info = {"start":261,"length":956,"line":10,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/game/ask.ts","functionName":"ask","argumentNames":["title","subtitle"]}
 
-function game_ask__P109079_mk(s) {
+function game_ask__P83858_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_ask__P109079, depth: s.depth + 1,
+        parent: s, fn: game_ask__P83858, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  answer___124781: undefined,
+  answer___100118: undefined,
+  aNotHeld___100120: undefined,
+  bNotHeld___100121: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -63167,63 +63047,7 @@ function game_ask__P109079_mk(s) {
 
 
 
-function inline__P124787(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_pxtrt_stlocRef(s.caps[0], true);
-    r0 = true;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P124787.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__P124787_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P124787, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-} }
-
-
-
-
-
-function inline__P124792(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_pxtrt_stlocRef(s.caps[0], false);
-    r0 = false;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P124792.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__P124792_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P124792, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-} }
-
-
-
-
-
-function inline__P124796(s) {
+function inline__P100124(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63235,25 +63059,118 @@ switch (step) {
 
     r0 = pxsim_pxtrt_ldlocRef(s.caps[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:
+    s.tmp_3 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_3.arg0 = globals.A___83150;
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_3.arg0);
+    s.tmp_3.fn = s.tmp_3.arg0.vtable.methods.isPressed;
+    s.pc = 13; return s.tmp_3;
+  case 13:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    r0 = pxsim_pxtrt_stlocRef(s.caps[0], s.tmp_4);
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
+    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:
+    s.tmp_3 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_3.arg0 = globals.B___83151;
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_3.arg0);
+    s.tmp_3.fn = s.tmp_3.arg0.vtable.methods.isPressed;
+    s.pc = 14; return s.tmp_3;
+  case 14:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+  case 4:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    r0 = pxsim_pxtrt_stlocRef(s.caps[1], s.tmp_4);
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
+    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_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.A___83150;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
+    s.pc = 15; return s.tmp_1;
+  case 15:
+    r0 = s.retval;
+  case 6:
+    // jmp value (already in r0)
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 7; continue; }
+    r0 = pxsim_pxtrt_stlocRef(s.caps[2], true);
+    { step = 12; continue; }
+  case 7:
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 8; continue; }
+    r0 = s.tmp_0;
+    { step = 9; continue; }
+  case 8:
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.B___83151;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
+    s.pc = 16; return s.tmp_1;
+  case 16:
+    r0 = s.retval;
+  case 9:
+    // jmp value (already in r0)
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 10; continue; }
+    r0 = pxsim_pxtrt_stlocRef(s.caps[2], false);
+  case 10:
+  case 11:
+  case 12:
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
+    s.tmp_0 = r0;
     r0 = (s.tmp_0 !== null);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P124796.info = {"start":784,"length":21,"line":20,"column":19,"endLine":20,"endColumn":40,"fileName":"pxt_modules/game---hw/ask.ts","functionName":"inline","argumentNames":[]}
+inline__P100124.info = {"start":728,"length":374,"line":21,"column":19,"endLine":31,"endColumn":9,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P124796_mk(s) {
+function inline__P100124_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P124796, depth: s.depth + 1,
+        parent: s, fn: inline__P100124, 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,
 } }
 
 
 
 
 
-function game_showDialog__P109035(s) {
+function game_showDialog__P83814(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63263,22 +63180,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.titleFont___124836 = undefined;
-    s.subFont___124841 = undefined;
-    s.footerFont___124846 = undefined;
-    s.h___124851 = undefined;
-    s.top___124870 = undefined;
-    s.y___124874 = undefined;
-    s.footerTop___124911 = undefined;
+    s.titleFont___100189 = undefined;
+    s.subFont___100194 = undefined;
+    s.footerFont___100199 = undefined;
+    s.h___100204 = undefined;
+    s.top___100223 = undefined;
+    s.y___100227 = undefined;
+    s.footerTop___100264 = 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__P110879_mk(s);
+    s.tmp_0 = game_init__P85718_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 879; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 883; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -63291,12 +63208,12 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P108243_mk(s);
+    s.tmp_2 = image_getFontForText__P83020_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 880; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 884; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
-    s.titleFont___124836 = (r0);
+    s.titleFont___100189 = (r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -63307,12 +63224,12 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P108243_mk(s);
+    s.tmp_2 = image_getFontForText__P83020_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 881; s.pc = 23; return s.tmp_2;
+    s.callLocIdx = 885; s.pc = 23; return s.tmp_2;
   case 23:
     r0 = s.retval;
-    s.subFont___124841 = (r0);
+    s.subFont___100194 = (r0);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -63323,45 +63240,45 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P108243_mk(s);
+    s.tmp_2 = image_getFontForText__P83020_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 882; s.pc = 24; return s.tmp_2;
+    s.callLocIdx = 886; s.pc = 24; return s.tmp_2;
   case 24:
     r0 = s.retval;
-    s.footerFont___124846 = (r0);
-    s.h___124851 = (8);
+    s.footerFont___100199 = (r0);
+    s.h___100204 = (8);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = r0 = s.h___124851;
+    s.tmp_0 = r0 = s.h___100204;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.titleFont___124836;
+    s.tmp_2.arg0 = s.titleFont___100189;
     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 = 883; s.pc = 25; return s.tmp_2; }
+     else { s.callLocIdx = 887; 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___124851 = (r0);
+    s.h___100204 = (r0);
   case 7:
   case 8:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 9; continue; }
-    s.tmp_0 = r0 = s.h___124851;
+    s.tmp_0 = r0 = s.h___100204;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.subFont___124841;
+    s.tmp_3.arg0 = s.subFont___100194;
     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 = 884; s.pc = 26; return s.tmp_3; }
+     else { s.callLocIdx = 888; s.pc = 26; return s.tmp_3; }
     }
   case 26:
     r0 = s.retval;
@@ -63369,23 +63286,23 @@ switch (step) {
     r0 = (2 + s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.h___124851 = (r0);
+    s.h___100204 = (r0);
   case 9:
   case 10:
-    r0 = (s.h___124851 + 8);
-    s.h___124851 = (r0);
-    s.tmp_0 = game_showDialogBackground__P110880_mk(s);
-    s.tmp_0.arg0 = s.h___124851;
+    r0 = (s.h___100204 + 8);
+    s.h___100204 = (r0);
+    s.tmp_0 = game_showDialogBackground__P85719_mk(s);
+    s.tmp_0.arg0 = s.h___100204;
     s.tmp_0.arg1 = 9;
-    s.callLocIdx = 885; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 889; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.top___124870 = (r0);
-    r0 = (s.top___124870 + 8);
-    s.y___124874 = (r0);
+    s.top___100223 = (r0);
+    r0 = (s.top___100223 + 8);
+    s.y___100227 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 13; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___108298);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___83075);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
@@ -63396,27 +63313,27 @@ switch (step) {
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_2.arg0 = globals.screen___108298;
+    s.tmp_2 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_2.arg0 = globals.screen___83075;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = 8;
-    s.tmp_2.arg3 = s.y___124874;
+    s.tmp_2.arg3 = s.y___100227;
     s.tmp_2.arg4 = s.tmp_1;
-    s.tmp_2.arg5 = s.titleFont___124836;
+    s.tmp_2.arg5 = s.titleFont___100189;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 886; s.pc = 28; return s.tmp_2;
+    s.callLocIdx = 890; s.pc = 28; return s.tmp_2;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.y___124874;
+    s.tmp_0 = r0 = s.y___100227;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.titleFont___124836;
+    s.tmp_3.arg0 = s.titleFont___100189;
     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 = 887; s.pc = 29; return s.tmp_3; }
+     else { s.callLocIdx = 891; s.pc = 29; return s.tmp_3; }
     }
   case 29:
     r0 = s.retval;
@@ -63424,12 +63341,12 @@ switch (step) {
     r0 = (s.tmp_2 + 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y___124874 = (r0);
+    s.y___100227 = (r0);
   case 13:
   case 14:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 17; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___108298);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___83075);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
@@ -63440,27 +63357,27 @@ switch (step) {
   case 16:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_2.arg0 = globals.screen___108298;
+    s.tmp_2 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_2.arg0 = globals.screen___83075;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = 8;
-    s.tmp_2.arg3 = s.y___124874;
+    s.tmp_2.arg3 = s.y___100227;
     s.tmp_2.arg4 = s.tmp_1;
-    s.tmp_2.arg5 = s.subFont___124841;
+    s.tmp_2.arg5 = s.subFont___100194;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 888; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 892; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.y___124874;
+    s.tmp_0 = r0 = s.y___100227;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.subFont___124841;
+    s.tmp_3.arg0 = s.subFont___100194;
     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 = 889; s.pc = 31; return s.tmp_3; }
+     else { s.callLocIdx = 893; s.pc = 31; return s.tmp_3; }
     }
   case 31:
     r0 = s.retval;
@@ -63468,22 +63385,22 @@ switch (step) {
     r0 = (s.tmp_2 + 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y___124874 = (r0);
+    s.y___100227 = (r0);
   case 17:
   case 18:
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 19; continue; }
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_1 = r0;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.footerFont___124846;
+    s.tmp_3.arg0 = s.footerFont___100199;
     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 = 890; s.pc = 32; return s.tmp_3; }
+     else { s.callLocIdx = 894; s.pc = 32; return s.tmp_3; }
     }
   case 32:
     r0 = s.retval;
@@ -63491,22 +63408,22 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.footerTop___124911 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P108224_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.footerTop___100264 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P83001_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.footerTop___124911;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    s.tmp_0.arg2 = s.footerTop___100264;
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_0.arg3 = r0;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.footerFont___124846;
+    s.tmp_2.arg0 = s.footerFont___100199;
     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 = 891; s.pc = 34; return s.tmp_2; }
+     else { s.callLocIdx = 895; s.pc = 34; return s.tmp_2; }
     }
   case 34:
     r0 = s.retval;
@@ -63514,36 +63431,36 @@ switch (step) {
     r0 = (s.tmp_1 + 4);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 892; s.pc = 33; return s.tmp_0;
+    s.callLocIdx = 896; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P108226_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imageDrawLine__P83003_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.footerTop___124911;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    s.tmp_0.arg2 = s.footerTop___100264;
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = s.footerTop___124911;
+    s.tmp_0.arg4 = s.footerTop___100264;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 893; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 897; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = s.arg2;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     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___124846;
+    s.tmp_6.arg0 = s.footerFont___100199;
     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 = 894; s.pc = 37; return s.tmp_6; }
+     else { s.callLocIdx = 898; s.pc = 37; return s.tmp_6; }
     }
   case 37:
     r0 = s.retval;
@@ -63554,17 +63471,17 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 8);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_8 = r0;
     s.tmp_10 = if_charHeight_1_mk(s);
-    s.tmp_10.arg0 = s.footerFont___124846;
+    s.tmp_10.arg0 = s.footerFont___100199;
     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 = 895; s.pc = 38; return s.tmp_10; }
+     else { s.callLocIdx = 899; s.pc = 38; return s.tmp_10; }
     }
   case 38:
     r0 = s.retval;
@@ -63574,9 +63491,9 @@ switch (step) {
     r0 = (s.tmp_7 - 2);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.footerFont___124846;
+    s.tmp_0.arg5 = s.footerFont___100199;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 896; s.pc = 36; return s.tmp_0;
+    s.callLocIdx = 900; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
   case 19:
@@ -63585,12 +63502,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_showDialog__P109035.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"]}
+game_showDialog__P83814.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"]}
 
-function game_showDialog__P109035_mk(s) {
+function game_showDialog__P83814_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showDialog__P109035, depth: s.depth + 1,
+        parent: s, fn: game_showDialog__P83814, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63603,13 +63520,13 @@ function game_showDialog__P109035_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  titleFont___124836: undefined,
-  subFont___124841: undefined,
-  footerFont___124846: undefined,
-  h___124851: undefined,
-  top___124870: undefined,
-  y___124874: undefined,
-  footerTop___124911: undefined,
+  titleFont___100189: undefined,
+  subFont___100194: undefined,
+  footerFont___100199: undefined,
+  h___100204: undefined,
+  top___100223: undefined,
+  y___100227: undefined,
+  footerTop___100264: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -63619,7 +63536,7 @@ function game_showDialog__P109035_mk(s) {
 
 
 
-function game_showDialogBackground__P110880(s) {
+function game_showDialogBackground__P85719(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63629,72 +63546,72 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.top___124971 = undefined;
+    s.top___100324 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - s.arg0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.top___124971 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P108224_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.top___100324 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P83001_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.top___124971;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    s.tmp_0.arg2 = s.top___100324;
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg0;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 876; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 880; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P108226_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imageDrawLine__P83003_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.top___124971;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    s.tmp_0.arg2 = s.top___100324;
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = s.top___124971;
+    s.tmp_0.arg4 = s.top___100324;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 877; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 881; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P108226_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.tmp_0 = helpers_imageDrawLine__P83003_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     s.tmp_0.arg1 = 0;
-    r0 = (s.top___124971 + s.arg0);
+    r0 = (s.top___100324 + s.arg0);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_0.arg3 = r0;
-    r0 = (s.top___124971 + s.arg0);
+    r0 = (s.top___100324 + s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 878; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 882; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = s.top___124971;
+    r0 = s.top___100324;
     return leave(s, r0)
   default: oops()
 } } }
-game_showDialogBackground__P110880.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"]}
+game_showDialogBackground__P85719.info = {"start":2587,"length":302,"line":95,"column":4,"endLine":102,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"showDialogBackground","argumentNames":["h","c"]}
 
-function game_showDialogBackground__P110880_mk(s) {
+function game_showDialogBackground__P85719_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showDialogBackground__P110880, depth: s.depth + 1,
+        parent: s, fn: game_showDialogBackground__P85719, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  top___124971: undefined,
+  top___100324: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -63703,7 +63620,7 @@ function game_showDialogBackground__P110880_mk(s) {
 
 
 
-function kodu_WorldStage_handleStopClicked__P565274(s) {
+function kodu_WorldStage_handleStopClicked__P93833(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63718,8 +63635,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_setGameMode__P565276_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_setGameMode__P93835_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 1191; s.pc = 1; return s.tmp_0;
@@ -63729,12 +63646,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handleStopClicked__P565274.info = {"start":3061,"length":84,"line":97,"column":8,"endLine":99,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleStopClicked","argumentNames":["this"]}
+kodu_WorldStage_handleStopClicked__P93833.info = {"start":3121,"length":84,"line":98,"column":8,"endLine":100,"endColumn":9,"fileName":"worldStage.ts","functionName":"handleStopClicked","argumentNames":["this"]}
 
-function kodu_WorldStage_handleStopClicked__P565274_mk(s) {
+function kodu_WorldStage_handleStopClicked__P93833_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handleStopClicked__P565274, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handleStopClicked__P93833, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -63744,7 +63661,7 @@ function kodu_WorldStage_handleStopClicked__P565274_mk(s) {
 
 
 
-function kodu_WorldStage_handlePlayClicked__P565273(s) {
+function kodu_WorldStage_handlePlayClicked__P93832(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63759,25 +63676,45 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_setGameMode__P565276_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+  case 1:
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.A___83150;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
+    s.pc = 3; return s.tmp_1;
+  case 3:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    s.tmp_2 = pause__P81675_mk(s);
+    s.tmp_2.arg0 = 10;
+    s.callLocIdx = 1189; s.pc = 4; return s.tmp_2;
+  case 4:
+    r0 = s.retval;
+    { step = 1; continue; }
+  case 2:
+    s.tmp_0 = kodu_WorldStage_setGameMode__P93835_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.callLocIdx = 1190; s.pc = 1; return s.tmp_0;
-  case 1:
+    s.callLocIdx = 1190; s.pc = 5; return s.tmp_0;
+  case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_handlePlayClicked__P565273.info = {"start":2967,"length":84,"line":93,"column":8,"endLine":95,"endColumn":9,"fileName":"worldStage.ts","functionName":"handlePlayClicked","argumentNames":["this"]}
+kodu_WorldStage_handlePlayClicked__P93832.info = {"start":2967,"length":144,"line":93,"column":8,"endLine":96,"endColumn":9,"fileName":"worldStage.ts","functionName":"handlePlayClicked","argumentNames":["this"]}
 
-function kodu_WorldStage_handlePlayClicked__P565273_mk(s) {
+function kodu_WorldStage_handlePlayClicked__P93832_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_handlePlayClicked__P565273, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_handlePlayClicked__P93832, 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,
 } }
 
@@ -63785,7 +63722,7 @@ function kodu_WorldStage_handlePlayClicked__P565273_mk(s) {
 
 
 
-function scene_setBackgroundColor__P108954(s) {
+function scene_setBackgroundColor__P83733(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63795,32 +63732,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___125013 = undefined;
+    s.scene___100360 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 848; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 852; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___125013 = (r0);
-    r0 = s.scene___125013.fields["background"];
+    s.scene___100360 = (r0);
+    r0 = s.scene___100360.fields["background"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["color"] = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setBackgroundColor__P108954.info = {"start":1207,"length":140,"line":53,"column":4,"endLine":56,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"setBackgroundColor","argumentNames":["color"]}
+scene_setBackgroundColor__P83733.info = {"start":1207,"length":140,"line":53,"column":4,"endLine":56,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setBackgroundColor","argumentNames":["color"]}
 
-function scene_setBackgroundColor__P108954_mk(s) {
+function scene_setBackgroundColor__P83733_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setBackgroundColor__P108954, depth: s.depth + 1,
+        parent: s, fn: scene_setBackgroundColor__P83733, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___125013: undefined,
+  scene___100360: undefined,
   arg0: undefined,
 } }
 
@@ -63828,7 +63765,7 @@ function scene_setBackgroundColor__P108954_mk(s) {
 
 
 
-function kodu_Program_constructor__P136395(s) {
+function kodu_Program_constructor__P85168(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63844,18 +63781,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Program__C136367_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Program__C85160_VT)) failedCast(r0);
     r0 = (s.arg0).fields["char"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     s.tmp_2 = if_None_1_mk(s);
-    s.tmp_2.arg0 = globals.Feeling___136331;
+    s.tmp_2.arg0 = globals.Feeling___85159;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "None");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["None"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["None"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1078; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1077; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
@@ -63863,12 +63800,12 @@ switch (step) {
     r0 = (s.tmp_0).fields["feeling"] = (s.tmp_1);
     r0 = (s.arg0).fields["prevFeeling"] = (s.tmp_1);
     r0 = (s.arg0).fields["currPage"] = (0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Wander__C136748_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Wander__C93218_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Wander_constructor__P136756_mk(s);
+    s.tmp_1 = kodu_Wander_constructor__P93226_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 1079; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 1078; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["wander"] = (s.tmp_0);
@@ -63876,16 +63813,16 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P136766);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P93235);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
     s.tmp_2 = r0 = s.arg0;
-    s.tmp_4 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_4 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg1.fields["bdefn"];
     r0 = r0.fields["pages"];
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.tmp_1;
-    s.callLocIdx = 1081; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 1080; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -63901,12 +63838,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Program_constructor__P136395.info = {"start":388,"length":377,"line":18,"column":8,"endLine":27,"endColumn":9,"fileName":"program.ts","functionName":"inline","argumentNames":["this","char"]}
+kodu_Program_constructor__P85168.info = {"start":388,"length":377,"line":18,"column":8,"endLine":27,"endColumn":9,"fileName":"program.ts","functionName":"inline","argumentNames":["this","char"]}
 
-function kodu_Program_constructor__P136395_mk(s) {
+function kodu_Program_constructor__P85168_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Program_constructor__P136395, depth: s.depth + 1,
+        parent: s, fn: kodu_Program_constructor__P85168, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63921,7 +63858,7 @@ function kodu_Program_constructor__P136395_mk(s) {
 
 
 
-function inline__P136766(s) {
+function inline__P93235(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63936,26 +63873,26 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Page__C136770_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Page__C93239_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Page_constructor__P136775_mk(s);
+    s.tmp_1 = kodu_Page_constructor__P93244_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.caps[0];
     s.tmp_1.arg2 = s.arg0;
     s.tmp_1.arg3 = s.arg1;
-    s.callLocIdx = 1080; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1079; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P136766.info = {"start":641,"length":44,"line":23,"column":50,"endLine":23,"endColumn":94,"fileName":"program.ts","functionName":"inline","argumentNames":["elem","index"]}
+inline__P93235.info = {"start":641,"length":44,"line":23,"column":50,"endLine":23,"endColumn":94,"fileName":"program.ts","functionName":"inline","argumentNames":["elem","index"]}
 
-function inline__P136766_mk(s) {
+function inline__P93235_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P136766, depth: s.depth + 1,
+        parent: s, fn: inline__P93235, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63967,7 +63904,7 @@ function inline__P136766_mk(s) {
 
 
 
-function kodu_Wander_constructor__P136756(s) {
+function kodu_Wander_constructor__P93226(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63983,19 +63920,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Wander__C136748_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Wander__C93218_VT)) failedCast(r0);
     r0 = (s.arg0).fields["prog"] = (s.arg1);
     r0 = (s.arg0).fields["margin"] = (10);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Wander_constructor__P136756.info = {"start":6707,"length":36,"line":208,"column":8,"endLine":208,"endColumn":44,"fileName":"program.ts","functionName":"inline","argumentNames":["this","prog"]}
+kodu_Wander_constructor__P93226.info = {"start":6707,"length":36,"line":208,"column":8,"endLine":208,"endColumn":44,"fileName":"program.ts","functionName":"inline","argumentNames":["this","prog"]}
 
-function kodu_Wander_constructor__P136756_mk(s) {
+function kodu_Wander_constructor__P93226_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Wander_constructor__P136756, depth: s.depth + 1,
+        parent: s, fn: kodu_Wander_constructor__P93226, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -64005,7 +63942,7 @@ function kodu_Wander_constructor__P136756_mk(s) {
 
 
 
-function kodu_Character_constructor__P538221(s) {
+function kodu_Character_constructor__P85020(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64015,8 +63952,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.icon___538230 = undefined;
-    s.physics___538281 = undefined;
+    s.icon___89382 = undefined;
+    s.physics___89430 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -64027,16 +63964,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = (s.arg0).fields["defn"] = (s.arg4);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "character";
-    s.callLocIdx = 394; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 393; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_icons_get__P110155_mk(s);
+    s.tmp_0 = kodu_icons_get__P84907_mk(s);
     s.tmp_1 = if_id_1_mk(s);
     s.tmp_1.arg0 = s.arg4;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -64045,72 +63982,72 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["id"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["id"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 395; s.pc = 5; return s.tmp_1; }
+     else { s.callLocIdx = 394; s.pc = 5; return s.tmp_1; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 396; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 395; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.icon___538230 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C110487_VT);
+    s.icon___89382 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C85270_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Kelpie_constructor__P110509_mk(s);
+    s.tmp_1 = kodu_Kelpie_constructor__P85292_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.icon___538230;
-    s.callLocIdx = 397; s.pc = 6; return s.tmp_1;
+    s.tmp_1.arg1 = s.icon___89382;
+    s.callLocIdx = 396; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["kelpie"] = (s.tmp_0);
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 398; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 397; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg3;
-    s.callLocIdx = 399; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 398; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 400; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 399; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 401; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 400; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "kind", "character");
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 402; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 401; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "component", s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P538261);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89414);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1).fields["onUpdate"] = (s.tmp_0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = kodu_BrainDefn_clone__P110362_mk(s);
+    s.tmp_2 = kodu_BrainDefn_clone__P85115_mk(s);
     s.tmp_2.arg0 = s.arg5;
-    s.callLocIdx = 404; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 403; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -64124,25 +64061,25 @@ switch (step) {
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["bumps"] = (s.tmp_1);
-    s.tmp_0 = kodu_Stage__C468688_v0_2_mk(s);
+    s.tmp_0 = kodu_Stage__C85045_v0_2_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = "physics";
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.get;
     s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.physics___538281 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.physics___538281);
+    s.physics___89430 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.physics___89430);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Body__C110375_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Body__C85128_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Body_constructor__P110388_mk(s);
+    s.tmp_1 = kodu_Body_constructor__P85141_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["kelpie"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 405; s.pc = 14; return s.tmp_1;
+    s.callLocIdx = 404; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
     r0 = (s.arg0).fields["body"] = (s.tmp_0);
@@ -64158,7 +64095,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["defaults"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["defaults"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 406; s.pc = 16; return s.tmp_3; }
+     else { s.callLocIdx = 405; s.pc = 16; return s.tmp_3; }
     }
   case 16:
     r0 = s.retval;
@@ -64169,7 +64106,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["mass"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["mass"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 407; s.pc = 15; return s.tmp_2; }
+     else { s.callLocIdx = 406; s.pc = 15; return s.tmp_2; }
     }
   case 15:
     r0 = s.retval;
@@ -64187,7 +64124,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["defaults"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["defaults"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 408; s.pc = 18; return s.tmp_3; }
+     else { s.callLocIdx = 407; s.pc = 18; return s.tmp_3; }
     }
   case 18:
     r0 = s.retval;
@@ -64198,7 +64135,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["friction"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["friction"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 409; s.pc = 17; return s.tmp_2; }
+     else { s.callLocIdx = 408; s.pc = 17; return s.tmp_2; }
     }
   case 17:
     r0 = s.retval;
@@ -64216,7 +64153,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["defaults"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["defaults"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 410; s.pc = 20; return s.tmp_3; }
+     else { s.callLocIdx = 409; s.pc = 20; return s.tmp_3; }
     }
   case 20:
     r0 = s.retval;
@@ -64227,7 +64164,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["restitution"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["restitution"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 411; s.pc = 19; return s.tmp_2; }
+     else { s.callLocIdx = 410; s.pc = 19; return s.tmp_2; }
     }
   case 19:
     r0 = s.retval;
@@ -64245,7 +64182,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["defaults"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["defaults"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 412; s.pc = 22; return s.tmp_3; }
+     else { s.callLocIdx = 411; s.pc = 22; return s.tmp_3; }
     }
   case 22:
     r0 = s.retval;
@@ -64256,17 +64193,17 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["bumpCanMove"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["bumpCanMove"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 413; s.pc = 21; return s.tmp_2; }
+     else { s.callLocIdx = 412; s.pc = 21; return s.tmp_2; }
     }
   case 21:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["bumpCanMove"] = (s.tmp_1);
-    s.tmp_0 = kodu_Physics_addBody__P110395_mk(s);
-    s.tmp_0.arg0 = s.physics___538281;
+    s.tmp_0 = kodu_Physics_addBody__P85148_mk(s);
+    s.tmp_0.arg0 = s.physics___89430;
     r0 = s.arg0.fields["body"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 414; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 413; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
   case 1:
@@ -64275,19 +64212,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_constructor__P538221.info = {"start":1098,"length":1102,"line":37,"column":8,"endLine":61,"endColumn":9,"fileName":"character.ts","functionName":"inline","argumentNames":["this","stage","x","y","defn","bdefn"]}
+kodu_Character_constructor__P85020.info = {"start":1098,"length":1102,"line":37,"column":8,"endLine":61,"endColumn":9,"fileName":"character.ts","functionName":"inline","argumentNames":["this","stage","x","y","defn","bdefn"]}
 
-function kodu_Character_constructor__P538221_mk(s) {
+function kodu_Character_constructor__P85020_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_constructor__P538221, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_constructor__P85020, 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,
-  icon___538230: undefined,
-  physics___538281: undefined,
+  icon___89382: undefined,
+  physics___89430: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -64300,7 +64237,7 @@ function kodu_Character_constructor__P538221_mk(s) {
 
 
 
-function inline__P538261(s) {
+function inline__P89414(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64314,22 +64251,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Character_kelpieUpdate__P538186_mk(s);
+    s.tmp_0 = kodu_Character_kelpieUpdate__P85033_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 403; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 402; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P538261.info = {"start":1550,"length":29,"line":46,"column":35,"endLine":46,"endColumn":64,"fileName":"character.ts","functionName":"inline","argumentNames":["dt"]}
+inline__P89414.info = {"start":1550,"length":29,"line":46,"column":35,"endLine":46,"endColumn":64,"fileName":"character.ts","functionName":"inline","argumentNames":["dt"]}
 
-function inline__P538261_mk(s) {
+function inline__P89414_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P538261, depth: s.depth + 1,
+        parent: s, fn: inline__P89414, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64339,7 +64276,7 @@ function inline__P538261_mk(s) {
 
 
 
-function kodu_Physics_addBody__P110395(s) {
+function kodu_Physics_addBody__P85148(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64355,7 +64292,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Physics__C110391_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Physics__C85144_VT)) failedCast(r0);
     r0 = s.arg0.fields["bodies"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
@@ -64364,12 +64301,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Physics_addBody__P110395.info = {"start":1596,"length":107,"line":56,"column":8,"endLine":59,"endColumn":9,"fileName":"physics.ts","functionName":"addBody","argumentNames":["this","body"]}
+kodu_Physics_addBody__P85148.info = {"start":1596,"length":107,"line":56,"column":8,"endLine":59,"endColumn":9,"fileName":"physics.ts","functionName":"addBody","argumentNames":["this","body"]}
 
-function kodu_Physics_addBody__P110395_mk(s) {
+function kodu_Physics_addBody__P85148_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Physics_addBody__P110395, depth: s.depth + 1,
+        parent: s, fn: kodu_Physics_addBody__P85148, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64380,7 +64317,7 @@ function kodu_Physics_addBody__P110395_mk(s) {
 
 
 
-function kodu_Body_constructor__P110388(s) {
+function kodu_Body_constructor__P85141(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64390,14 +64327,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hitbox___116693 = undefined;
+    s.hitbox___91582 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Body__C110375_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Body__C85128_VT)) failedCast(r0);
     r0 = (s.arg0).fields["kelpie"] = (s.arg1);
     r0 = (s.arg0).fields["vx"] = (0);
     r0 = (s.arg0).fields["vy"] = (0);
@@ -64405,20 +64342,20 @@ switch (step) {
     r0 = (s.arg0).fields["friction"] = (0);
     r0 = (s.arg0).fields["restitution"] = (1);
     r0 = (s.arg0).fields["bumpCanMove"] = (true);
-    s.tmp_0 = util_calculateHitbox__P110099_mk(s);
+    s.tmp_0 = util_calculateHitbox__P84851_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 855; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 854; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.hitbox___116693 = (r0);
+    s.hitbox___91582 = (r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = Math_max__P106734_mk(s);
-    r0 = s.hitbox___116693.fields["width"];
+    s.tmp_3 = Math_max__P81398_mk(s);
+    r0 = s.hitbox___91582.fields["width"];
     s.tmp_3.arg0 = r0;
-    r0 = s.hitbox___116693.fields["height"];
+    r0 = s.hitbox___91582.fields["height"];
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 856; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 855; s.pc = 2; return s.tmp_3;
   case 2:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -64429,18 +64366,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Body_constructor__P110388.info = {"start":428,"length":357,"line":16,"column":8,"endLine":25,"endColumn":9,"fileName":"physics.ts","functionName":"inline","argumentNames":["this","kelpie"]}
+kodu_Body_constructor__P85141.info = {"start":428,"length":357,"line":16,"column":8,"endLine":25,"endColumn":9,"fileName":"physics.ts","functionName":"inline","argumentNames":["this","kelpie"]}
 
-function kodu_Body_constructor__P110388_mk(s) {
+function kodu_Body_constructor__P85141_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Body_constructor__P110388, depth: s.depth + 1,
+        parent: s, fn: kodu_Body_constructor__P85141, 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,
-  hitbox___116693: undefined,
+  hitbox___91582: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -64449,7 +64386,7 @@ function kodu_Body_constructor__P110388_mk(s) {
 
 
 
-function kodu_BrainDefn_clone__P110362(s) {
+function kodu_BrainDefn_clone__P85115(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64459,46 +64396,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.brain___115558 = undefined;
+    s.brain___90447 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_BrainDefn__C110359_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C110359_VT);
+    if (!checkSubtype(r0, kodu_BrainDefn__C85112_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C85112_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_BrainDefn_constructor__P110361_mk(s);
+    s.tmp_1 = kodu_BrainDefn_constructor__P85114_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 527; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 526; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.brain___115558 = (s.tmp_0);
-    s.tmp_0 = r0 = s.brain___115558;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.brain___90447 = (s.tmp_0);
+    s.tmp_0 = r0 = s.brain___90447;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["pages"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115566;
-    s.callLocIdx = 529; s.pc = 2; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90455;
+    s.callLocIdx = 528; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["pages"] = (s.tmp_1);
-    r0 = s.brain___115558;
+    r0 = s.brain___90447;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainDefn_clone__P110362.info = {"start":5937,"length":170,"line":197,"column":8,"endLine":201,"endColumn":9,"fileName":"language.ts","functionName":"clone","argumentNames":["this"]}
+kodu_BrainDefn_clone__P85115.info = {"start":5937,"length":170,"line":197,"column":8,"endLine":201,"endColumn":9,"fileName":"language.ts","functionName":"clone","argumentNames":["this"]}
 
-function kodu_BrainDefn_clone__P110362_mk(s) {
+function kodu_BrainDefn_clone__P85115_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainDefn_clone__P110362, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainDefn_clone__P85115, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  brain___115558: undefined,
+  brain___90447: undefined,
   arg0: undefined,
 } }
 
@@ -64506,7 +64443,7 @@ function kodu_BrainDefn_clone__P110362_mk(s) {
 
 
 
-function inline__P115566(s) {
+function inline__P90455(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64520,20 +64457,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_PageDefn_clone__P110353_mk(s);
+    s.tmp_0 = kodu_PageDefn_clone__P85106_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 528; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 527; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115566.info = {"start":6049,"length":20,"line":199,"column":41,"endLine":199,"endColumn":61,"fileName":"language.ts","functionName":"inline","argumentNames":["page"]}
+inline__P90455.info = {"start":6049,"length":20,"line":199,"column":41,"endLine":199,"endColumn":61,"fileName":"language.ts","functionName":"inline","argumentNames":["page"]}
 
-function inline__P115566_mk(s) {
+function inline__P90455_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115566, depth: s.depth + 1,
+        parent: s, fn: inline__P90455, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64543,7 +64480,7 @@ function inline__P115566_mk(s) {
 
 
 
-function kodu_PageDefn_clone__P110353(s) {
+function kodu_PageDefn_clone__P85106(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64553,46 +64490,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.page___115410 = undefined;
+    s.page___90299 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageDefn__C110350_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C110350_VT);
+    if (!checkSubtype(r0, kodu_PageDefn__C85103_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C85103_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_PageDefn_constructor__P110352_mk(s);
+    s.tmp_1 = kodu_PageDefn_constructor__P85105_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 513; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 512; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.page___115410 = (s.tmp_0);
-    s.tmp_0 = r0 = s.page___115410;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.page___90299 = (s.tmp_0);
+    s.tmp_0 = r0 = s.page___90299;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["rules"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115418;
-    s.callLocIdx = 515; s.pc = 2; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90307;
+    s.callLocIdx = 514; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["rules"] = (s.tmp_1);
-    r0 = s.page___115410;
+    r0 = s.page___90299;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageDefn_clone__P110353.info = {"start":3981,"length":165,"line":133,"column":8,"endLine":137,"endColumn":9,"fileName":"language.ts","functionName":"clone","argumentNames":["this"]}
+kodu_PageDefn_clone__P85106.info = {"start":3981,"length":165,"line":133,"column":8,"endLine":137,"endColumn":9,"fileName":"language.ts","functionName":"clone","argumentNames":["this"]}
 
-function kodu_PageDefn_clone__P110353_mk(s) {
+function kodu_PageDefn_clone__P85106_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageDefn_clone__P110353, depth: s.depth + 1,
+        parent: s, fn: kodu_PageDefn_clone__P85106, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  page___115410: undefined,
+  page___90299: undefined,
   arg0: undefined,
 } }
 
@@ -64600,7 +64537,7 @@ function kodu_PageDefn_clone__P110353_mk(s) {
 
 
 
-function inline__P115418(s) {
+function inline__P90307(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64614,20 +64551,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleDefn_clone__P110346_mk(s);
+    s.tmp_0 = kodu_RuleDefn_clone__P85099_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 514; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 513; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115418.info = {"start":4089,"length":20,"line":135,"column":40,"endLine":135,"endColumn":60,"fileName":"language.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P90307.info = {"start":4089,"length":20,"line":135,"column":40,"endLine":135,"endColumn":60,"fileName":"language.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P115418_mk(s) {
+function inline__P90307_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115418, depth: s.depth + 1,
+        parent: s, fn: inline__P90307, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64637,7 +64574,7 @@ function inline__P115418_mk(s) {
 
 
 
-function kodu_RuleDefn_clone__P110346(s) {
+function kodu_RuleDefn_clone__P85099(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64647,67 +64584,67 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___115237 = undefined;
+    s.rule___90126 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleDefn__C110339_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C110339_VT);
+    if (!checkSubtype(r0, kodu_RuleDefn__C85092_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C85092_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_RuleDefn_constructor__P110345_mk(s);
+    s.tmp_1 = kodu_RuleDefn_constructor__P85098_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 491; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 490; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.rule___115237 = (s.tmp_0);
+    s.rule___90126 = (s.tmp_0);
     r0 = s.arg0.fields["condition"];
     s.tmp_0 = r0;
-    r0 = (s.rule___115237).fields["condition"] = (s.tmp_0);
+    r0 = (s.rule___90126).fields["condition"] = (s.tmp_0);
     r0 = s.arg0.fields["sensor"];
     s.tmp_0 = r0;
-    r0 = (s.rule___115237).fields["sensor"] = (s.tmp_0);
+    r0 = (s.rule___90126).fields["sensor"] = (s.tmp_0);
     r0 = s.arg0.fields["actuator"];
     s.tmp_0 = r0;
-    r0 = (s.rule___115237).fields["actuator"] = (s.tmp_0);
-    s.tmp_0 = r0 = s.rule___115237;
-    s.tmp_2 = helpers_arraySlice__P106721_mk(s);
+    r0 = (s.rule___90126).fields["actuator"] = (s.tmp_0);
+    s.tmp_0 = r0 = s.rule___90126;
+    s.tmp_2 = helpers_arraySlice__P81384_mk(s);
     r0 = s.arg0.fields["filters"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 492; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 491; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["filters"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.rule___115237;
-    s.tmp_2 = helpers_arraySlice__P106721_mk(s);
+    s.tmp_0 = r0 = s.rule___90126;
+    s.tmp_2 = helpers_arraySlice__P81384_mk(s);
     r0 = s.arg0.fields["modifiers"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 493; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 492; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["modifiers"] = (s.tmp_1);
-    r0 = s.rule___115237;
+    r0 = s.rule___90126;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleDefn_clone__P110346.info = {"start":1854,"length":333,"line":70,"column":8,"endLine":78,"endColumn":9,"fileName":"language.ts","functionName":"clone","argumentNames":["this"]}
+kodu_RuleDefn_clone__P85099.info = {"start":1854,"length":333,"line":70,"column":8,"endLine":78,"endColumn":9,"fileName":"language.ts","functionName":"clone","argumentNames":["this"]}
 
-function kodu_RuleDefn_clone__P110346_mk(s) {
+function kodu_RuleDefn_clone__P85099_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleDefn_clone__P110346, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleDefn_clone__P85099, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  rule___115237: undefined,
+  rule___90126: undefined,
   arg0: undefined,
 } }
 
@@ -64715,7 +64652,7 @@ function kodu_RuleDefn_clone__P110346_mk(s) {
 
 
 
-function kodu_Character_kelpieUpdate__P538186(s) {
+function kodu_Character_kelpieUpdate__P85033(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64725,36 +64662,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.t___538555 = undefined;
+    s.t___89705 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 100);
-    s.t___538555 = (r0);
+    s.t___89705 = (r0);
     r0 = s.arg0.fields["feeling"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Kelpie_y__P110492_mk(s);
+    s.tmp_1 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["feeling"];
     s.tmp_1.arg0 = r0;
-    s.tmp_3 = kodu_Kelpie_top__P110498_mk(s);
+    s.tmp_3 = kodu_Kelpie_top__P85281_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 440; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 439; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
-    s.tmp_6 = Math_abs__P106732_mk(s);
-    r0 = pxsim.Math_.sin(s.t___538555);
+    s.tmp_6 = Math_abs__P81396_mk(s);
+    r0 = pxsim.Math_.sin(s.t___89705);
     s.tmp_6.arg0 = r0;
-    s.callLocIdx = 441; s.pc = 5; return s.tmp_6;
+    s.callLocIdx = 440; s.pc = 5; return s.tmp_6;
   case 5:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -64762,20 +64699,20 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 442; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 441; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["feeling"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = kodu_Kelpie_right__P110497_mk(s);
+    s.tmp_1 = kodu_Kelpie_right__P85280_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 443; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 442; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 444; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 443; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 1:
@@ -64784,12 +64721,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_kelpieUpdate__P538186.info = {"start":5452,"length":257,"line":164,"column":8,"endLine":170,"endColumn":9,"fileName":"character.ts","functionName":"kelpieUpdate","argumentNames":["this","dt"]}
+kodu_Character_kelpieUpdate__P85033.info = {"start":5452,"length":257,"line":164,"column":8,"endLine":170,"endColumn":9,"fileName":"character.ts","functionName":"kelpieUpdate","argumentNames":["this","dt"]}
 
-function kodu_Character_kelpieUpdate__P538186_mk(s) {
+function kodu_Character_kelpieUpdate__P85033_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_kelpieUpdate__P538186, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_kelpieUpdate__P85033, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64798,7 +64735,7 @@ function kodu_Character_kelpieUpdate__P538186_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  t___538555: undefined,
+  t___89705: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -64807,7 +64744,7 @@ function kodu_Character_kelpieUpdate__P538186_mk(s) {
 
 
 
-function kodu_Kelpie_right__P110497(s) {
+function kodu_Kelpie_right__P85280(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64822,8 +64759,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Kelpie_left__P110495_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Kelpie_left__P85278_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1601; s.pc = 1; return s.tmp_1;
   case 1:
@@ -64837,13 +64774,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_right__P110497.info = {"start":1321,"length":66,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"kelpie.ts","functionName":"right","argumentNames":["this"]}
-kodu_Kelpie_right__P110497.isGetter = true;
+kodu_Kelpie_right__P85280.info = {"start":1321,"length":66,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"kelpie.ts","functionName":"right","argumentNames":["this"]}
+kodu_Kelpie_right__P85280.isGetter = true;
 
-function kodu_Kelpie_right__P110497_mk(s) {
+function kodu_Kelpie_right__P85280_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_right__P110497, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_right__P85280, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64856,7 +64793,7 @@ function kodu_Kelpie_right__P110497_mk(s) {
 
 
 
-function kodu_Kelpie_left__P110495(s) {
+function kodu_Kelpie_left__P85278(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64871,8 +64808,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Kelpie_x__P110489_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Kelpie_x__P85272_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1597; s.pc = 1; return s.tmp_1;
   case 1:
@@ -64888,13 +64825,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_left__P110495.info = {"start":1096,"length":69,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"kelpie.ts","functionName":"left","argumentNames":["this"]}
-kodu_Kelpie_left__P110495.isGetter = true;
+kodu_Kelpie_left__P85278.info = {"start":1096,"length":69,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"kelpie.ts","functionName":"left","argumentNames":["this"]}
+kodu_Kelpie_left__P85278.isGetter = true;
 
-function kodu_Kelpie_left__P110495_mk(s) {
+function kodu_Kelpie_left__P85278_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_left__P110495, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_left__P85278, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64908,7 +64845,7 @@ function kodu_Kelpie_left__P110495_mk(s) {
 
 
 
-function kodu_Kelpie_top__P110498(s) {
+function kodu_Kelpie_top__P85281(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64923,8 +64860,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Kelpie_y__P110491_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Kelpie_y__P85274_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1603; s.pc = 1; return s.tmp_1;
   case 1:
@@ -64940,13 +64877,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_top__P110498.info = {"start":1449,"length":69,"line":57,"column":8,"endLine":59,"endColumn":9,"fileName":"kelpie.ts","functionName":"top","argumentNames":["this"]}
-kodu_Kelpie_top__P110498.isGetter = true;
+kodu_Kelpie_top__P85281.info = {"start":1449,"length":69,"line":57,"column":8,"endLine":59,"endColumn":9,"fileName":"kelpie.ts","functionName":"top","argumentNames":["this"]}
+kodu_Kelpie_top__P85281.isGetter = true;
 
-function kodu_Kelpie_top__P110498_mk(s) {
+function kodu_Kelpie_top__P85281_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_top__P110498, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_top__P85281, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64960,7 +64897,7 @@ function kodu_Kelpie_top__P110498_mk(s) {
 
 
 
-function kodu_Component_destroy__P345110(s) {
+function kodu_Component_destroy__P84897(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64970,42 +64907,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fff___345167 = undefined;
+    s.fff___88399 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Component__C345109_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Component__C84895_VT)) failedCast(r0);
     r0 = s.arg0.fields["stage"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Stage_remove__P468692_mk(s);
+    s.tmp_1 = kodu_Stage_remove__P85054_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 215; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 214; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.fff___345167 = (0);
+    s.fff___88399 = (0);
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Component_destroy__P345110.info = {"start":162,"length":156,"line":5,"column":8,"endLine":11,"endColumn":9,"fileName":"component.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Component_destroy__P84897.info = {"start":162,"length":156,"line":5,"column":8,"endLine":11,"endColumn":9,"fileName":"component.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Component_destroy__P345110_mk(s) {
+function kodu_Component_destroy__P84897_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Component_destroy__P345110, depth: s.depth + 1,
+        parent: s, fn: kodu_Component_destroy__P84897, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  fff___345167: undefined,
+  fff___88399: undefined,
   arg0: undefined,
 } }
 
@@ -65013,7 +64950,7 @@ function kodu_Component_destroy__P345110_mk(s) {
 
 
 
-function kodu_Character_y__P538171(s) {
+function kodu_Character_y__P85017(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65029,24 +64966,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 390; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 389; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_y__P538171.info = {"start":912,"length":46,"line":33,"column":8,"endLine":33,"endColumn":54,"fileName":"character.ts","functionName":"y","argumentNames":["this","v"]}
+kodu_Character_y__P85017.info = {"start":912,"length":46,"line":33,"column":8,"endLine":33,"endColumn":54,"fileName":"character.ts","functionName":"y","argumentNames":["this","v"]}
 
-function kodu_Character_y__P538171_mk(s) {
+function kodu_Character_y__P85017_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_y__P538171, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_y__P85017, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -65057,7 +64994,7 @@ function kodu_Character_y__P538171_mk(s) {
 
 
 
-function kodu_Character_x__P538170(s) {
+function kodu_Character_x__P85015(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65073,24 +65010,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 388; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 387; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_x__P538170.info = {"start":808,"length":46,"line":31,"column":8,"endLine":31,"endColumn":54,"fileName":"character.ts","functionName":"x","argumentNames":["this","v"]}
+kodu_Character_x__P85015.info = {"start":808,"length":46,"line":31,"column":8,"endLine":31,"endColumn":54,"fileName":"character.ts","functionName":"x","argumentNames":["this","v"]}
 
-function kodu_Character_x__P538170_mk(s) {
+function kodu_Character_x__P85015_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_x__P538170, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_x__P85015, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -65101,7 +65038,7 @@ function kodu_Character_x__P538170_mk(s) {
 
 
 
-function kodu_Rule_constructor__P136878(s) {
+function kodu_Rule_constructor__P85184(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65118,7 +65055,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Rule__C136623_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Rule__C85174_VT)) failedCast(r0);
     r0 = (s.arg0).fields["page"] = (s.arg1);
     r0 = (s.arg0).fields["defn"] = (s.arg2);
     s.tmp_0 = r0 = s.arg0;
@@ -65138,28 +65075,28 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_2 = if_sensors_1_mk(s);
-    s.tmp_2.arg0 = globals.tiles___110373;
+    s.tmp_2.arg0 = globals.tiles___85126;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "sensors");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["sensors"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["sensors"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1094; s.pc = 19; return s.tmp_2; }
+     else { s.callLocIdx = 1093; s.pc = 19; return s.tmp_2; }
     }
   case 19:
     r0 = s.retval;
     s.tmp_1 = r0;
     s.tmp_4 = if_always_1_mk(s);
     s.tmp_5 = if_sensor_1_mk(s);
-    s.tmp_5.arg0 = globals.tid___110372;
+    s.tmp_5.arg0 = globals.tid___85125;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "sensor");
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["sensor"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["sensor"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1095; s.pc = 21; return s.tmp_5; }
+     else { s.callLocIdx = 1094; s.pc = 21; return s.tmp_5; }
     }
   case 21:
     r0 = s.retval;
@@ -65170,7 +65107,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["always"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["always"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1096; s.pc = 20; return s.tmp_4; }
+     else { s.callLocIdx = 1095; s.pc = 20; return s.tmp_4; }
     }
   case 20:
     r0 = s.retval;
@@ -65180,7 +65117,7 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_6 = r0;
     s.tmp_7 = r0 = s.arg0;
-    s.tmp_9 = kodu_Library_getFunction__P110404_mk(s);
+    s.tmp_9 = kodu_Library_getFunction__P85157_mk(s);
     s.tmp_10 = if_tid_1_mk(s);
     s.tmp_10.arg0 = s.tmp_6;
     if (!s.tmp_10.arg0.vtable.iface) {
@@ -65189,12 +65126,12 @@ switch (step) {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["tid"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["tid"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 1097; s.pc = 23; return s.tmp_10; }
+     else { s.callLocIdx = 1096; s.pc = 23; return s.tmp_10; }
     }
   case 23:
     r0 = s.retval;
     s.tmp_9.arg0 = r0;
-    s.callLocIdx = 1098; s.pc = 22; return s.tmp_9;
+    s.callLocIdx = 1097; s.pc = 22; return s.tmp_9;
   case 22:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -65212,23 +65149,23 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     s.tmp_2 = r0 = s.arg0;
-    s.tmp_4 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_5 = helpers_arraySort__P106712_mk(s);
-    s.tmp_6 = helpers_arraySlice__P106721_mk(s);
+    s.tmp_4 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_5 = helpers_arraySort__P81374_mk(s);
+    s.tmp_6 = helpers_arraySlice__P81384_mk(s);
     s.tmp_6.arg0 = s.tmp_1;
     s.tmp_6.arg1 = undefined;
     s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1099; s.pc = 26; return s.tmp_6;
+    s.callLocIdx = 1098; s.pc = 26; return s.tmp_6;
   case 26:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = inline__P136952;
-    s.callLocIdx = 1102; s.pc = 25; return s.tmp_5;
+    s.tmp_5.arg1 = inline__P93417;
+    s.callLocIdx = 1101; s.pc = 25; return s.tmp_5;
   case 25:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = inline__P136961;
-    s.callLocIdx = 1105; s.pc = 24; return s.tmp_4;
+    s.tmp_4.arg1 = inline__P93426;
+    s.callLocIdx = 1104; s.pc = 24; return s.tmp_4;
   case 24:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -65246,7 +65183,7 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     s.tmp_2 = r0 = s.arg0;
-    s.tmp_4 = kodu_Library_getFunction__P110404_mk(s);
+    s.tmp_4 = kodu_Library_getFunction__P85157_mk(s);
     s.tmp_5 = if_tid_1_mk(s);
     s.tmp_5.arg0 = s.tmp_1;
     if (!s.tmp_5.arg0.vtable.iface) {
@@ -65255,12 +65192,12 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["tid"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["tid"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1106; s.pc = 28; return s.tmp_5; }
+     else { s.callLocIdx = 1105; s.pc = 28; return s.tmp_5; }
     }
   case 28:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 1107; s.pc = 27; return s.tmp_4;
+    s.callLocIdx = 1106; s.pc = 27; return s.tmp_4;
   case 27:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -65278,23 +65215,23 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     s.tmp_2 = r0 = s.arg0;
-    s.tmp_4 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_5 = helpers_arraySort__P106712_mk(s);
-    s.tmp_6 = helpers_arraySlice__P106721_mk(s);
+    s.tmp_4 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_5 = helpers_arraySort__P81374_mk(s);
+    s.tmp_6 = helpers_arraySlice__P81384_mk(s);
     s.tmp_6.arg0 = s.tmp_1;
     s.tmp_6.arg1 = undefined;
     s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1108; s.pc = 31; return s.tmp_6;
+    s.callLocIdx = 1107; s.pc = 31; return s.tmp_6;
   case 31:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = inline__P136989;
-    s.callLocIdx = 1111; s.pc = 30; return s.tmp_5;
+    s.tmp_5.arg1 = inline__P93452;
+    s.callLocIdx = 1110; s.pc = 30; return s.tmp_5;
   case 30:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = inline__P136998;
-    s.callLocIdx = 1114; s.pc = 29; return s.tmp_4;
+    s.tmp_4.arg1 = inline__P93461;
+    s.callLocIdx = 1113; s.pc = 29; return s.tmp_4;
   case 29:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -65317,7 +65254,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["constraints"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["constraints"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1115; s.pc = 32; return s.tmp_1; }
+     else { s.callLocIdx = 1114; s.pc = 32; return s.tmp_1; }
     }
   case 32:
     r0 = s.retval;
@@ -65340,7 +65277,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["constraints"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["constraints"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1116; s.pc = 34; return s.tmp_5; }
+     else { s.callLocIdx = 1115; s.pc = 34; return s.tmp_5; }
     }
   case 34:
     r0 = s.retval;
@@ -65351,7 +65288,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["provides"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["provides"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1117; s.pc = 33; return s.tmp_4; }
+     else { s.callLocIdx = 1116; s.pc = 33; return s.tmp_4; }
     }
   case 33:
     r0 = s.retval;
@@ -65365,10 +65302,10 @@ switch (step) {
   case 13:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    s.tmp_7 = helpers_arraySome__P106714_mk(s);
+    s.tmp_7 = helpers_arraySome__P81376_mk(s);
     s.tmp_7.arg0 = s.tmp_6;
-    s.tmp_7.arg1 = inline__P137023;
-    s.callLocIdx = 1118; s.pc = 35; return s.tmp_7;
+    s.tmp_7.arg1 = inline__P93485;
+    s.callLocIdx = 1117; s.pc = 35; return s.tmp_7;
   case 35:
     r0 = s.retval;
   case 14:
@@ -65393,7 +65330,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["category"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["category"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1119; s.pc = 36; return s.tmp_1; }
+     else { s.callLocIdx = 1118; s.pc = 36; return s.tmp_1; }
     }
   case 36:
     r0 = s.retval;
@@ -65415,7 +65352,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["category"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["category"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1120; s.pc = 37; return s.tmp_4; }
+     else { s.callLocIdx = 1119; s.pc = 37; return s.tmp_4; }
     }
   case 37:
     r0 = s.retval;
@@ -65429,12 +65366,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Rule_constructor__P136878.info = {"start":3164,"length":1106,"line":118,"column":8,"endLine":139,"endColumn":9,"fileName":"program.ts","functionName":"inline","argumentNames":["this","page","defn"]}
+kodu_Rule_constructor__P85184.info = {"start":3164,"length":1106,"line":118,"column":8,"endLine":139,"endColumn":9,"fileName":"program.ts","functionName":"inline","argumentNames":["this","page","defn"]}
 
-function kodu_Rule_constructor__P136878_mk(s) {
+function kodu_Rule_constructor__P85184_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Rule_constructor__P136878, depth: s.depth + 1,
+        parent: s, fn: kodu_Rule_constructor__P85184, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65456,7 +65393,7 @@ function kodu_Rule_constructor__P136878_mk(s) {
 
 
 
-function inline__P136952(s) {
+function inline__P93417(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65479,7 +65416,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["priority"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["priority"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1100; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 1099; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -65492,7 +65429,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["priority"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["priority"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1101; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 1100; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -65501,12 +65438,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P136952.info = {"start":3493,"length":33,"line":124,"column":22,"endLine":124,"endColumn":55,"fileName":"program.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P93417.info = {"start":3493,"length":33,"line":124,"column":22,"endLine":124,"endColumn":55,"fileName":"program.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P136952_mk(s) {
+function inline__P93417_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P136952, depth: s.depth + 1,
+        parent: s, fn: inline__P93417, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65520,7 +65457,7 @@ function inline__P136952_mk(s) {
 
 
 
-function inline__P136961(s) {
+function inline__P93426(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65534,7 +65471,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Library_getFunction__P110404_mk(s);
+    s.tmp_0 = kodu_Library_getFunction__P85157_mk(s);
     s.tmp_1 = if_tid_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -65543,23 +65480,23 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["tid"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["tid"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1103; s.pc = 2; return s.tmp_1; }
+     else { s.callLocIdx = 1102; s.pc = 2; return s.tmp_1; }
     }
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1104; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1103; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P136961.info = {"start":3549,"length":37,"line":125,"column":21,"endLine":125,"endColumn":58,"fileName":"program.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P93426.info = {"start":3549,"length":37,"line":125,"column":21,"endLine":125,"endColumn":58,"fileName":"program.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P136961_mk(s) {
+function inline__P93426_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P136961, depth: s.depth + 1,
+        parent: s, fn: inline__P93426, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65570,7 +65507,7 @@ function inline__P136961_mk(s) {
 
 
 
-function inline__P136989(s) {
+function inline__P93452(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65593,7 +65530,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["priority"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["priority"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1109; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 1108; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -65606,7 +65543,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["priority"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["priority"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1110; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 1109; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -65615,12 +65552,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P136989.info = {"start":3783,"length":33,"line":129,"column":22,"endLine":129,"endColumn":55,"fileName":"program.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P93452.info = {"start":3783,"length":33,"line":129,"column":22,"endLine":129,"endColumn":55,"fileName":"program.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P136989_mk(s) {
+function inline__P93452_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P136989, depth: s.depth + 1,
+        parent: s, fn: inline__P93452, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65634,7 +65571,7 @@ function inline__P136989_mk(s) {
 
 
 
-function inline__P136998(s) {
+function inline__P93461(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65648,7 +65585,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Library_getFunction__P110404_mk(s);
+    s.tmp_0 = kodu_Library_getFunction__P85157_mk(s);
     s.tmp_1 = if_tid_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -65657,23 +65594,23 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["tid"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["tid"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1112; s.pc = 2; return s.tmp_1; }
+     else { s.callLocIdx = 1111; s.pc = 2; return s.tmp_1; }
     }
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1113; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1112; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P136998.info = {"start":3839,"length":37,"line":130,"column":21,"endLine":130,"endColumn":58,"fileName":"program.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P93461.info = {"start":3839,"length":37,"line":130,"column":21,"endLine":130,"endColumn":58,"fileName":"program.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P136998_mk(s) {
+function inline__P93461_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P136998, depth: s.depth + 1,
+        parent: s, fn: inline__P93461, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65684,7 +65621,7 @@ function inline__P136998_mk(s) {
 
 
 
-function inline__P137023(s) {
+function inline__P93485(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65702,12 +65639,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P137023.info = {"start":4058,"length":24,"line":134,"column":67,"endLine":134,"endColumn":91,"fileName":"program.ts","functionName":"inline","argumentNames":["item"]}
+inline__P93485.info = {"start":4058,"length":24,"line":134,"column":67,"endLine":134,"endColumn":91,"fileName":"program.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P137023_mk(s) {
+function inline__P93485_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P137023, depth: s.depth + 1,
+        parent: s, fn: inline__P93485, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -65716,7 +65653,7 @@ function inline__P137023_mk(s) {
 
 
 
-function kodu_Library_getFunction__P110404(s) {
+function kodu_Library_getFunction__P85157(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65741,14 +65678,14 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     s.arg0 = (s.tmp_1);
-    r0 = pxsim_pxtrt.mapGetGeneric(globals.librarydb___117059, s.arg0);
+    r0 = pxsim_pxtrt.mapGetGeneric(globals.librarydb___91948, s.arg0);
     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 = pxsim_pxtrt.mapGetGeneric(globals.librarydb___117059, "noop");
+    r0 = pxsim_pxtrt.mapGetGeneric(globals.librarydb___91948, "noop");
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -65756,12 +65693,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Library_getFunction__P110404.info = {"start":178,"length":146,"line":8,"column":8,"endLine":11,"endColumn":9,"fileName":"library.ts","functionName":"getFunction","argumentNames":["id"]}
+kodu_Library_getFunction__P85157.info = {"start":178,"length":146,"line":8,"column":8,"endLine":11,"endColumn":9,"fileName":"library.ts","functionName":"getFunction","argumentNames":["id"]}
 
-function kodu_Library_getFunction__P110404_mk(s) {
+function kodu_Library_getFunction__P85157_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Library_getFunction__P110404, depth: s.depth + 1,
+        parent: s, fn: kodu_Library_getFunction__P85157, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65772,7 +65709,7 @@ function kodu_Library_getFunction__P110404_mk(s) {
 
 
 
-function controller_AnyButton_isPressed__P110712(s) {
+function controller_AnyButton_isPressed__P85538(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65782,36 +65719,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctrl___132100 = undefined;
-    s.b___132104 = undefined;
-    s.unnamed16744___U2 = undefined;
-    s.unnamed16745___U3 = undefined;
+    s.ctrl___107750 = undefined;
+    s.b___107754 = undefined;
+    s.unnamed1796___U2 = undefined;
+    s.unnamed1797___U3 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_AnyButton__C110710_VT)) failedCast(r0);
-    s.tmp_0 = controller__player1__P108414_mk(s);
-    s.callLocIdx = 185; s.pc = 6; return s.tmp_0;
+    if (!checkSubtype(r0, controller_AnyButton__C85536_VT)) failedCast(r0);
+    s.tmp_0 = controller__player1__P83190_mk(s);
+    s.callLocIdx = 194; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.ctrl___132100 = (r0);
-    s.b___132104 = (undefined);
-    r0 = s.ctrl___132100.fields["buttons"];
-    s.unnamed16744___U2 = (r0);
-    s.unnamed16745___U3 = (0);
+    s.ctrl___107750 = (r0);
+    s.b___107754 = (undefined);
+    r0 = s.ctrl___107750.fields["buttons"];
+    s.unnamed1796___U2 = (r0);
+    s.unnamed1797___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16745___U3;
-    r0 = pxsim_Array__length(s.unnamed16744___U2);
+    s.tmp_0 = r0 = s.unnamed1797___U3;
+    r0 = pxsim_Array__length(s.unnamed1796___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16744___U2, s.unnamed16745___U3);
-    s.b___132104 = (r0);
-    s.tmp_3 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_3.arg0 = s.b___132104;
-    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_3.arg0);
+    r0 = pxsim_Array__getAt(s.unnamed1796___U2, s.unnamed1797___U3);
+    s.b___107754 = (r0);
+    s.tmp_3 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_3.arg0 = s.b___107754;
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C83176_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:
@@ -65823,31 +65760,31 @@ switch (step) {
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.unnamed16745___U3 + 1);
-    s.unnamed16745___U3 = (r0);
+    r0 = (s.unnamed1797___U3 + 1);
+    s.unnamed1797___U3 = (r0);
     { step = 1; continue; }
   case 4:
-    s.unnamed16744___U2 = (undefined);
+    s.unnamed1796___U2 = (undefined);
     r0 = false;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-controller_AnyButton_isPressed__P110712.info = {"start":5874,"length":202,"line":185,"column":8,"endLine":192,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"isPressed","argumentNames":["this"]}
+controller_AnyButton_isPressed__P85538.info = {"start":5874,"length":202,"line":185,"column":8,"endLine":192,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"isPressed","argumentNames":["this"]}
 
-function controller_AnyButton_isPressed__P110712_mk(s) {
+function controller_AnyButton_isPressed__P85538_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_AnyButton_isPressed__P110712, depth: s.depth + 1,
+        parent: s, fn: controller_AnyButton_isPressed__P85538, 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___132100: undefined,
-  b___132104: undefined,
-  unnamed16744___U2: undefined,
-  unnamed16745___U3: undefined,
+  ctrl___107750: undefined,
+  b___107754: undefined,
+  unnamed1796___U2: undefined,
+  unnamed1797___U3: undefined,
   arg0: undefined,
 } }
 
@@ -65855,7 +65792,7 @@ function controller_AnyButton_isPressed__P110712_mk(s) {
 
 
 
-function controller_Button_toString__P108405(s) {
+function controller_Button_toString__P83181(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65870,7 +65807,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C108400_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C83176_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -65910,12 +65847,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_toString__P108405.info = {"start":1479,"length":100,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"toString","argumentNames":["this"]}
+controller_Button_toString__P83181.info = {"start":1479,"length":100,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"toString","argumentNames":["this"]}
 
-function controller_Button_toString__P108405_mk(s) {
+function controller_Button_toString__P83181_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_toString__P108405, depth: s.depth + 1,
+        parent: s, fn: controller_Button_toString__P83181, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65931,7 +65868,7 @@ function controller_Button_toString__P108405_mk(s) {
 
 
 
-function kodu_Body_y__P110387(s) {
+function kodu_Body_y__P85140(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65947,24 +65884,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Body__C110375_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    if (!checkSubtype(r0, kodu_Body__C85128_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 854; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 853; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Body_y__P110387.info = {"start":379,"length":39,"line":14,"column":8,"endLine":14,"endColumn":47,"fileName":"physics.ts","functionName":"y","argumentNames":["this","n"]}
+kodu_Body_y__P85140.info = {"start":379,"length":39,"line":14,"column":8,"endLine":14,"endColumn":47,"fileName":"physics.ts","functionName":"y","argumentNames":["this","n"]}
 
-function kodu_Body_y__P110387_mk(s) {
+function kodu_Body_y__P85140_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Body_y__P110387, depth: s.depth + 1,
+        parent: s, fn: kodu_Body_y__P85140, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -65975,7 +65912,7 @@ function kodu_Body_y__P110387_mk(s) {
 
 
 
-function kodu_Body_y__P110385(s) {
+function kodu_Body_y__P85138(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65990,23 +65927,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Body__C110375_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_y__P110491_mk(s);
+    if (!checkSubtype(r0, kodu_Body__C85128_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_y__P85274_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 852; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 851; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Body_y__P110385.info = {"start":289,"length":33,"line":12,"column":8,"endLine":12,"endColumn":41,"fileName":"physics.ts","functionName":"y","argumentNames":["this"]}
-kodu_Body_y__P110385.isGetter = true;
+kodu_Body_y__P85138.info = {"start":289,"length":33,"line":12,"column":8,"endLine":12,"endColumn":41,"fileName":"physics.ts","functionName":"y","argumentNames":["this"]}
+kodu_Body_y__P85138.isGetter = true;
 
-function kodu_Body_y__P110385_mk(s) {
+function kodu_Body_y__P85138_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Body_y__P110385, depth: s.depth + 1,
+        parent: s, fn: kodu_Body_y__P85138, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -66016,7 +65953,7 @@ function kodu_Body_y__P110385_mk(s) {
 
 
 
-function kodu_Body_x__P110386(s) {
+function kodu_Body_x__P85139(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66032,24 +65969,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Body__C110375_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    if (!checkSubtype(r0, kodu_Body__C85128_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 853; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 852; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Body_x__P110386.info = {"start":331,"length":39,"line":13,"column":8,"endLine":13,"endColumn":47,"fileName":"physics.ts","functionName":"x","argumentNames":["this","n"]}
+kodu_Body_x__P85139.info = {"start":331,"length":39,"line":13,"column":8,"endLine":13,"endColumn":47,"fileName":"physics.ts","functionName":"x","argumentNames":["this","n"]}
 
-function kodu_Body_x__P110386_mk(s) {
+function kodu_Body_x__P85139_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Body_x__P110386, depth: s.depth + 1,
+        parent: s, fn: kodu_Body_x__P85139, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -66060,7 +65997,7 @@ function kodu_Body_x__P110386_mk(s) {
 
 
 
-function kodu_Body_x__P110384(s) {
+function kodu_Body_x__P85137(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66075,23 +66012,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Body__C110375_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110489_mk(s);
+    if (!checkSubtype(r0, kodu_Body__C85128_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85272_mk(s);
     r0 = s.arg0.fields["kelpie"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 851; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 850; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Body_x__P110384.info = {"start":247,"length":33,"line":11,"column":8,"endLine":11,"endColumn":41,"fileName":"physics.ts","functionName":"x","argumentNames":["this"]}
-kodu_Body_x__P110384.isGetter = true;
+kodu_Body_x__P85137.info = {"start":247,"length":33,"line":11,"column":8,"endLine":11,"endColumn":41,"fileName":"physics.ts","functionName":"x","argumentNames":["this"]}
+kodu_Body_x__P85137.isGetter = true;
 
-function kodu_Body_x__P110384_mk(s) {
+function kodu_Body_x__P85137_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Body_x__P110384, depth: s.depth + 1,
+        parent: s, fn: kodu_Body_x__P85137, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -66101,7 +66038,7 @@ function kodu_Body_x__P110384_mk(s) {
 
 
 
-function kodu_Wander_direction__P136752(s) {
+function kodu_Wander_direction__P93222(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66111,16 +66048,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dx___137232 = undefined;
-    s.dy___137242 = undefined;
-    s.distSq___137252 = undefined;
-    s.dist___137265 = undefined;
+    s.dx___93693 = undefined;
+    s.dy___93703 = undefined;
+    s.distSq___93713 = undefined;
+    s.dist___93726 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Wander__C136748_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Wander__C93218_VT)) failedCast(r0);
     r0 = (s.arg0).fields["poked"] = (true);
     r0 = s.arg0.fields["dest"];
     s.tmp_2 = r0;
@@ -66130,9 +66067,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = kodu_Wander_pickDest__P136755_mk(s);
+    s.tmp_3 = kodu_Wander_pickDest__P93225_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1146; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1145; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
   case 1:
@@ -66140,36 +66077,36 @@ switch (step) {
     r0 = s.arg0.fields["dest"];
     r0 = r0.fields["x"];
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_Character_x__P538093_mk(s);
+    s.tmp_2 = kodu_Character_x__P85014_mk(s);
     r0 = s.arg0.fields["prog"];
     r0 = r0.fields["char"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1147; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1146; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.dx___137232 = (r0);
+    s.dx___93693 = (r0);
     r0 = s.arg0.fields["dest"];
     r0 = r0.fields["y"];
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_Character_y__P538094_mk(s);
+    s.tmp_2 = kodu_Character_y__P85016_mk(s);
     r0 = s.arg0.fields["prog"];
     r0 = r0.fields["char"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1148; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1147; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.dy___137242 = (r0);
-    r0 = (s.dx___137232 * s.dx___137232);
+    s.dy___93703 = (r0);
+    r0 = (s.dx___93693 * s.dx___93693);
     s.tmp_0 = r0;
-    r0 = (s.dy___137242 * s.dy___137242);
+    r0 = (s.dy___93703 * s.dy___93703);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.distSq___137252 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.distSq___137252);
+    s.distSq___93713 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.distSq___93713);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -66179,35 +66116,35 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    r0 = pxsim.Math_.sqrt(s.distSq___137252);
-    s.dist___137265 = (r0);
-    s.tmp_0 = kodu_mkVec2__P110429_mk(s);
-    r0 = (s.dx___137232 / s.dist___137265);
+    r0 = pxsim.Math_.sqrt(s.distSq___93713);
+    s.dist___93726 = (r0);
+    s.tmp_0 = kodu_mkVec2__P85212_mk(s);
+    r0 = (s.dx___93693 / s.dist___93726);
     s.tmp_0.arg0 = r0;
-    r0 = (s.dy___137242 / s.dist___137265);
+    r0 = (s.dy___93703 / s.dist___93726);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1149; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1148; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Wander_direction__P136752.info = {"start":7246,"length":478,"line":228,"column":8,"endLine":243,"endColumn":9,"fileName":"program.ts","functionName":"direction","argumentNames":["this"]}
+kodu_Wander_direction__P93222.info = {"start":7246,"length":478,"line":228,"column":8,"endLine":243,"endColumn":9,"fileName":"program.ts","functionName":"direction","argumentNames":["this"]}
 
-function kodu_Wander_direction__P136752_mk(s) {
+function kodu_Wander_direction__P93222_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Wander_direction__P136752, depth: s.depth + 1,
+        parent: s, fn: kodu_Wander_direction__P93222, 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,
-  dx___137232: undefined,
-  dy___137242: undefined,
-  distSq___137252: undefined,
-  dist___137265: undefined,
+  dx___93693: undefined,
+  dy___93703: undefined,
+  distSq___93713: undefined,
+  dist___93726: undefined,
   arg0: undefined,
 } }
 
@@ -66215,7 +66152,7 @@ function kodu_Wander_direction__P136752_mk(s) {
 
 
 
-function kodu_Wander_pickDest__P136755(s) {
+function kodu_Wander_pickDest__P93225(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66225,16 +66162,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.camx___137302 = undefined;
-    s.camy___137309 = undefined;
-    s.x___137316 = undefined;
-    s.y___137334 = undefined;
+    s.camx___93763 = undefined;
+    s.camy___93770 = undefined;
+    s.x___93777 = undefined;
+    s.y___93795 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Wander__C136748_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Wander__C93218_VT)) failedCast(r0);
     r0 = s.arg0.fields["prog"];
     r0 = r0.fields["char"];
     r0 = r0.fields["kelpie"];
@@ -66253,20 +66190,20 @@ switch (step) {
     r0 = r0.fields["stage"];
     r0 = r0.fields["camera"];
     r0 = r0.fields["x"];
-    s.camx___137302 = (r0);
+    s.camx___93763 = (r0);
     r0 = s.arg0.fields["prog"];
     r0 = r0.fields["char"];
     r0 = r0.fields["stage"];
     r0 = r0.fields["camera"];
     r0 = r0.fields["y"];
-    s.camy___137309 = (r0);
+    s.camy___93770 = (r0);
     r0 = s.arg0.fields["margin"];
     s.tmp_3 = r0;
     r0 = (80 + s.tmp_3);
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 + s.camx___137302);
+    r0 = (s.tmp_1 + s.camx___93763);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.random();
     s.tmp_5 = r0;
@@ -66279,14 +66216,14 @@ switch (step) {
     r0 = (s.tmp_5 * s.tmp_6);
     s.tmp_4 = r0;
     r0 = (s.tmp_0 + s.tmp_4);
-    s.x___137316 = (r0);
+    s.x___93777 = (r0);
     r0 = s.arg0.fields["margin"];
     s.tmp_3 = r0;
     r0 = (60 + s.tmp_3);
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 + s.camy___137309);
+    r0 = (s.tmp_1 + s.camy___93770);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.random();
     s.tmp_5 = r0;
@@ -66299,12 +66236,12 @@ switch (step) {
     r0 = (s.tmp_5 * s.tmp_6);
     s.tmp_4 = r0;
     r0 = (s.tmp_0 + s.tmp_4);
-    s.y___137334 = (r0);
+    s.y___93795 = (r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = kodu_mkVec2__P110429_mk(s);
-    s.tmp_2.arg0 = s.x___137316;
-    s.tmp_2.arg1 = s.y___137334;
-    s.callLocIdx = 1153; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = kodu_mkVec2__P85212_mk(s);
+    s.tmp_2.arg0 = s.x___93777;
+    s.tmp_2.arg1 = s.y___93795;
+    s.callLocIdx = 1152; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -66314,12 +66251,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Wander_pickDest__P136755.info = {"start":8008,"length":416,"line":256,"column":8,"endLine":263,"endColumn":9,"fileName":"program.ts","functionName":"pickDest","argumentNames":["this"]}
+kodu_Wander_pickDest__P93225.info = {"start":8008,"length":416,"line":256,"column":8,"endLine":263,"endColumn":9,"fileName":"program.ts","functionName":"pickDest","argumentNames":["this"]}
 
-function kodu_Wander_pickDest__P136755_mk(s) {
+function kodu_Wander_pickDest__P93225_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Wander_pickDest__P136755, depth: s.depth + 1,
+        parent: s, fn: kodu_Wander_pickDest__P93225, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66330,10 +66267,10 @@ function kodu_Wander_pickDest__P136755_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  camx___137302: undefined,
-  camy___137309: undefined,
-  x___137316: undefined,
-  y___137334: undefined,
+  camx___93763: undefined,
+  camy___93770: undefined,
+  x___93777: undefined,
+  y___93795: undefined,
   arg0: undefined,
 } }
 
@@ -66341,7 +66278,7 @@ function kodu_Wander_pickDest__P136755_mk(s) {
 
 
 
-function kodu_KodeStage_notify__P509665(s) {
+function kodu_KodeStage_notify__P85265(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66358,19 +66295,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
     r0 = (s.arg1 === "cursor:moved");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_KodeStage_updateHover__P509662_mk(s);
+    s.tmp_1 = kodu_KodeStage_updateHover__P85262_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1591; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_Stage_notify__P468704_mk(s);
+    s.tmp_0 = kodu_Stage_notify__P85065_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -66382,12 +66319,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_notify__P509665.info = {"start":24884,"length":203,"line":699,"column":8,"endLine":705,"endColumn":9,"fileName":"kodeStage.ts","functionName":"notify","argumentNames":["this","event","parm"]}
+kodu_KodeStage_notify__P85265.info = {"start":24884,"length":203,"line":699,"column":8,"endLine":705,"endColumn":9,"fileName":"kodeStage.ts","functionName":"notify","argumentNames":["this","event","parm"]}
 
-function kodu_KodeStage_notify__P509665_mk(s) {
+function kodu_KodeStage_notify__P85265_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_notify__P509665, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_notify__P85265, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66400,7 +66337,7 @@ function kodu_KodeStage_notify__P509665_mk(s) {
 
 
 
-function kodu_KodeStage_updateHover__P509662(s) {
+function kodu_KodeStage_updateHover__P85262(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66410,55 +66347,55 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buttons___511189 = undefined;
-    s.overlapping___511200 = undefined;
-    s.button___511226 = undefined;
+    s.buttons___96159 = undefined;
+    s.overlapping___96170 = undefined;
+    s.button___96196 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    s.tmp_0 = helpers_arrayFilter__P106717_mk(s);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    s.tmp_0 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P511192;
+    s.tmp_0.arg1 = inline__P96162;
     s.callLocIdx = 1559; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.buttons___511189 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_1 = helpers_arraySort__P106712_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_3 = kodu_Cursor_getAllOverlapping__P549536_mk(s);
+    s.buttons___96159 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_1 = helpers_arraySort__P81374_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_3 = kodu_Cursor_getAllOverlapping__P84995_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 1560; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P511209;
+    s.tmp_2.arg1 = inline__P96179;
     s.callLocIdx = 1562; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P511215;
+    s.tmp_1.arg1 = inline__P96185;
     s.callLocIdx = 1565; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P511202;
+    s.tmp_0.arg1 = inline__P96172;
     s.callLocIdx = 1567; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.overlapping___511200 = (r0);
-    r0 = pxsim_Array_.removeAt(s.overlapping___511200, 0);
-    s.button___511226 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511232);
+    s.overlapping___96170 = (r0);
+    r0 = pxsim_Array_.removeAt(s.overlapping___96170, 0);
+    s.button___96196 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96202);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.button___511226);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_1.arg0 = s.buttons___511189;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.button___96196);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_1.arg0 = s.buttons___96159;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 1570; s.pc = 6; return s.tmp_1;
   case 6:
@@ -66467,20 +66404,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_updateHover__P509662.info = {"start":22846,"length":483,"line":641,"column":8,"endLine":650,"endColumn":9,"fileName":"kodeStage.ts","functionName":"updateHover","argumentNames":["this"]}
+kodu_KodeStage_updateHover__P85262.info = {"start":22846,"length":483,"line":641,"column":8,"endLine":650,"endColumn":9,"fileName":"kodeStage.ts","functionName":"updateHover","argumentNames":["this"]}
 
-function kodu_KodeStage_updateHover__P509662_mk(s) {
+function kodu_KodeStage_updateHover__P85262_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_updateHover__P509662, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_updateHover__P85262, 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,
-  buttons___511189: undefined,
-  overlapping___511200: undefined,
-  button___511226: undefined,
+  buttons___96159: undefined,
+  overlapping___96170: undefined,
+  button___96196: undefined,
   arg0: undefined,
 } }
 
@@ -66488,7 +66425,7 @@ function kodu_KodeStage_updateHover__P509662_mk(s) {
 
 
 
-function inline__P511192(s) {
+function inline__P96162(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66508,12 +66445,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511192.info = {"start":22930,"length":30,"line":643,"column":24,"endLine":643,"endColumn":54,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P96162.info = {"start":22930,"length":30,"line":643,"column":24,"endLine":643,"endColumn":54,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P511192_mk(s) {
+function inline__P96162_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511192, depth: s.depth + 1,
+        parent: s, fn: inline__P96162, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -66523,7 +66460,7 @@ function inline__P511192_mk(s) {
 
 
 
-function inline__P511209(s) {
+function inline__P96179(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66537,7 +66474,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_2 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 1561; s.pc = 1; return s.tmp_2;
   case 1:
@@ -66549,12 +66486,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511209.info = {"start":23063,"length":36,"line":645,"column":24,"endLine":645,"endColumn":60,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["spr"]}
+inline__P96179.info = {"start":23063,"length":36,"line":645,"column":24,"endLine":645,"endColumn":60,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["spr"]}
 
-function inline__P511209_mk(s) {
+function inline__P96179_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511209, depth: s.depth + 1,
+        parent: s, fn: inline__P96179, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66566,7 +66503,7 @@ function inline__P511209_mk(s) {
 
 
 
-function inline__P511215(s) {
+function inline__P96185(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66589,12 +66526,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511215.info = {"start":23123,"length":19,"line":646,"column":22,"endLine":646,"endColumn":41,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P96185.info = {"start":23123,"length":19,"line":646,"column":22,"endLine":646,"endColumn":41,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P511215_mk(s) {
+function inline__P96185_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511215, depth: s.depth + 1,
+        parent: s, fn: inline__P96185, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66606,7 +66543,7 @@ function inline__P511215_mk(s) {
 
 
 
-function inline__P511202(s) {
+function inline__P96172(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66620,7 +66557,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = kodu_Kelpie_data__P110501_mk(s);
+    s.tmp_1 = kodu_Kelpie_data__P85284_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1566; s.pc = 1; return s.tmp_1;
   case 1:
@@ -66630,12 +66567,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511202.info = {"start":23165,"length":38,"line":647,"column":21,"endLine":647,"endColumn":59,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["spr"]}
+inline__P96172.info = {"start":23165,"length":38,"line":647,"column":21,"endLine":647,"endColumn":59,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["spr"]}
 
-function inline__P511202_mk(s) {
+function inline__P96172_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511202, depth: s.depth + 1,
+        parent: s, fn: inline__P96172, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66646,7 +66583,7 @@ function inline__P511202_mk(s) {
 
 
 
-function inline__P511232(s) {
+function inline__P96202(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66660,7 +66597,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Button_hover__P522440_mk(s);
+    s.tmp_0 = kodu_Button_hover__P84873_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg0 === s.caps[0]);
     s.tmp_0.arg1 = r0;
@@ -66671,12 +66608,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511232.info = {"start":23282,"length":35,"line":649,"column":28,"endLine":649,"endColumn":63,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P96202.info = {"start":23282,"length":35,"line":649,"column":28,"endLine":649,"endColumn":63,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P511232_mk(s) {
+function inline__P96202_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511232, depth: s.depth + 1,
+        parent: s, fn: inline__P96202, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -66686,7 +66623,7 @@ function inline__P511232_mk(s) {
 
 
 
-function kodu_KodeStage_initScene__P509663(s) {
+function kodu_KodeStage_initScene__P85263(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66701,23 +66638,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Stage_initScene__P468701_mk(s);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Stage_initScene__P85063_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1571; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = scene_setBackgroundColor__P108954_mk(s);
+    s.tmp_0 = scene_setBackgroundColor__P83733_mk(s);
     s.tmp_0.arg0 = 11;
     s.callLocIdx = 1572; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511247);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96216);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = "white";
@@ -66731,12 +66668,12 @@ switch (step) {
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["cancelBtn"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511254);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96222);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = "white";
@@ -66750,7 +66687,7 @@ switch (step) {
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["okBtn"] = (s.tmp_0);
-    s.tmp_0 = kodu_Cursor_moveTo__P549533_mk(s);
+    s.tmp_0 = kodu_Cursor_moveTo__P84992_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
@@ -66758,7 +66695,7 @@ switch (step) {
     s.callLocIdx = 1577; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = kodu_Camera_moveTo__P530759_mk(s);
+    s.tmp_0 = kodu_Camera_moveTo__P84888_mk(s);
     r0 = s.arg0.fields["camera"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
@@ -66766,12 +66703,12 @@ switch (step) {
     s.callLocIdx = 1578; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511271);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96238);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = "clear";
@@ -66800,12 +66737,12 @@ switch (step) {
   case 7:
     r0 = s.retval;
     r0 = (s.arg0).fields["charBtn"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainUI__C509681_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainUI__C94654_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_BrainUI_constructor__P509686_mk(s);
+    s.tmp_1 = kodu_BrainUI_constructor__P94659_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.tmp_2 = kodu_BrainDefn_clone__P110362_mk(s);
+    s.tmp_2 = kodu_BrainDefn_clone__P85115_mk(s);
     r0 = s.arg0.fields["char"];
     r0 = r0.fields["bdefn"];
     s.tmp_2.arg0 = r0;
@@ -66819,21 +66756,21 @@ switch (step) {
   case 9:
     r0 = s.retval;
     r0 = (s.arg0).fields["brain"] = (s.tmp_0);
-    s.tmp_0 = kodu_BrainUI_layout__P509683_mk(s);
+    s.tmp_0 = kodu_BrainUI_layout__P94656_mk(s);
     r0 = s.arg0.fields["brain"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1584; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = kodu_Stage_start__P468702_mk(s);
+    s.tmp_0 = kodu_Stage_start__P88124_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1585; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511290);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96257);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = game_onUpdateInterval__P109041_mk(s);
+    s.tmp_1 = game_onUpdateInterval__P83820_mk(s);
     s.tmp_1.arg0 = 5000;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 1589; s.pc = 13; return s.tmp_1;
@@ -66843,12 +66780,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_initScene__P509663.info = {"start":23339,"length":1433,"line":652,"column":8,"endLine":692,"endColumn":9,"fileName":"kodeStage.ts","functionName":"initScene","argumentNames":["this"]}
+kodu_KodeStage_initScene__P85263.info = {"start":23339,"length":1433,"line":652,"column":8,"endLine":692,"endColumn":9,"fileName":"kodeStage.ts","functionName":"initScene","argumentNames":["this"]}
 
-function kodu_KodeStage_initScene__P509663_mk(s) {
+function kodu_KodeStage_initScene__P85263_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_initScene__P509663, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_initScene__P85263, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66861,7 +66798,7 @@ function kodu_KodeStage_initScene__P509663_mk(s) {
 
 
 
-function inline__P511247(s) {
+function inline__P96216(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66871,7 +66808,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_KodeStage_handleCancelBtnClicked__P509657_mk(s);
+    s.tmp_0 = kodu_KodeStage_handleCancelBtnClicked__P85257_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 1573; s.pc = 1; return s.tmp_0;
   case 1:
@@ -66880,12 +66817,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511247.info = {"start":23612,"length":35,"line":661,"column":16,"endLine":661,"endColumn":51,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
+inline__P96216.info = {"start":23612,"length":35,"line":661,"column":16,"endLine":661,"endColumn":51,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P511247_mk(s) {
+function inline__P96216_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511247, depth: s.depth + 1,
+        parent: s, fn: inline__P96216, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -66894,7 +66831,7 @@ function inline__P511247_mk(s) {
 
 
 
-function inline__P511254(s) {
+function inline__P96222(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66904,7 +66841,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_KodeStage_handleOkBtnClicked__P509658_mk(s);
+    s.tmp_0 = kodu_KodeStage_handleOkBtnClicked__P85258_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 1575; s.pc = 1; return s.tmp_0;
   case 1:
@@ -66913,12 +66850,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511254.info = {"start":23824,"length":31,"line":668,"column":16,"endLine":668,"endColumn":47,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
+inline__P96222.info = {"start":23824,"length":31,"line":668,"column":16,"endLine":668,"endColumn":47,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P511254_mk(s) {
+function inline__P96222_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511254, depth: s.depth + 1,
+        parent: s, fn: inline__P96222, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -66927,7 +66864,7 @@ function inline__P511254_mk(s) {
 
 
 
-function inline__P511271(s) {
+function inline__P96238(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66937,7 +66874,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_KodeStage_handleCharBtnClick__P509661_mk(s);
+    s.tmp_0 = kodu_KodeStage_handleCharBtnClick__P85261_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 1580; s.pc = 1; return s.tmp_0;
   case 1:
@@ -66946,12 +66883,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511271.info = {"start":24022,"length":31,"line":671,"column":88,"endLine":671,"endColumn":119,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
+inline__P96238.info = {"start":24022,"length":31,"line":671,"column":88,"endLine":671,"endColumn":119,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P511271_mk(s) {
+function inline__P96238_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511271, depth: s.depth + 1,
+        parent: s, fn: inline__P96238, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -66960,7 +66897,7 @@ function inline__P511271_mk(s) {
 
 
 
-function inline__P511290(s) {
+function inline__P96257(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66970,10 +66907,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.caps[0].fields["components"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P511294;
+    s.tmp_0.arg1 = inline__P96261;
     s.callLocIdx = 1588; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
@@ -66981,12 +66918,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511290.info = {"start":24548,"length":212,"line":685,"column":40,"endLine":691,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
+inline__P96257.info = {"start":24548,"length":212,"line":685,"column":40,"endLine":691,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P511290_mk(s) {
+function inline__P96257_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511290, depth: s.depth + 1,
+        parent: s, fn: inline__P96257, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -66995,7 +66932,7 @@ function inline__P511290_mk(s) {
 
 
 
-function inline__P511294(s) {
+function inline__P96261(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67005,7 +66942,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.f___511305 = undefined;
+    s.f___96272 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -67049,19 +66986,19 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 3; continue; }
-    s.f___511305 = (0);
+    s.f___96272 = (0);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511294.info = {"start":24596,"length":147,"line":686,"column":40,"endLine":690,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["item"]}
+inline__P96261.info = {"start":24596,"length":147,"line":686,"column":40,"endLine":690,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P511294_mk(s) {
+function inline__P96261_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511294, depth: s.depth + 1,
+        parent: s, fn: inline__P96261, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67069,7 +67006,7 @@ function inline__P511294_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  f___511305: undefined,
+  f___96272: undefined,
   arg0: undefined,
 } }
 
@@ -67077,7 +67014,7 @@ function inline__P511294_mk(s) {
 
 
 
-function kodu_BrainUI_layout__P509683(s) {
+function kodu_BrainUI_layout__P94656(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67087,65 +67024,65 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.top___509719 = undefined;
-    s.page___509723 = undefined;
-    s.unnamed16864___U2 = undefined;
-    s.unnamed16865___U3 = undefined;
+    s.top___94692 = undefined;
+    s.page___94696 = undefined;
+    s.unnamed1916___U2 = undefined;
+    s.unnamed1917___U3 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_BrainUI__C509681_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_BrainUI__C94654_VT)) failedCast(r0);
     r0 = s.arg0.fields["top"];
-    s.top___509719 = (r0);
-    s.page___509723 = (undefined);
+    s.top___94692 = (r0);
+    s.page___94696 = (undefined);
     r0 = s.arg0.fields["pages"];
-    s.unnamed16864___U2 = (r0);
-    s.unnamed16865___U3 = (0);
+    s.unnamed1916___U2 = (r0);
+    s.unnamed1917___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16865___U3;
-    r0 = pxsim_Array__length(s.unnamed16864___U2);
+    s.tmp_0 = r0 = s.unnamed1917___U3;
+    r0 = pxsim_Array__length(s.unnamed1916___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16864___U2, s.unnamed16865___U3);
-    s.page___509723 = (r0);
-    s.tmp_2 = kodu_PageUI_layout__P509707_mk(s);
-    s.tmp_2.arg0 = s.page___509723;
+    r0 = pxsim_Array__getAt(s.unnamed1916___U2, s.unnamed1917___U3);
+    s.page___94696 = (r0);
+    s.tmp_2 = kodu_PageUI_layout__P94680_mk(s);
+    s.tmp_2.arg0 = s.page___94696;
     r0 = s.arg0.fields["left"];
     s.tmp_2.arg1 = r0;
-    s.tmp_2.arg2 = s.top___509719;
+    s.tmp_2.arg2 = s.top___94692;
     s.callLocIdx = 1313; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = s.page___509723.fields["height"];
+    r0 = s.page___94696.fields["height"];
     s.tmp_0 = r0;
-    r0 = (s.top___509719 + s.tmp_0);
-    s.top___509719 = (r0);
-    r0 = (s.unnamed16865___U3 + 1);
-    s.unnamed16865___U3 = (r0);
+    r0 = (s.top___94692 + s.tmp_0);
+    s.top___94692 = (r0);
+    r0 = (s.unnamed1917___U3 + 1);
+    s.unnamed1917___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16864___U2 = (undefined);
+    s.unnamed1916___U2 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainUI_layout__P509683.info = {"start":344,"length":199,"line":10,"column":8,"endLine":16,"endColumn":9,"fileName":"kodeStage.ts","functionName":"layout","argumentNames":["this"]}
+kodu_BrainUI_layout__P94656.info = {"start":344,"length":199,"line":10,"column":8,"endLine":16,"endColumn":9,"fileName":"kodeStage.ts","functionName":"layout","argumentNames":["this"]}
 
-function kodu_BrainUI_layout__P509683_mk(s) {
+function kodu_BrainUI_layout__P94656_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainUI_layout__P509683, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainUI_layout__P94656, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  top___509719: undefined,
-  page___509723: undefined,
-  unnamed16864___U2: undefined,
-  unnamed16865___U3: undefined,
+  top___94692: undefined,
+  page___94696: undefined,
+  unnamed1916___U2: undefined,
+  unnamed1917___U3: undefined,
   arg0: undefined,
 } }
 
@@ -67153,7 +67090,7 @@ function kodu_BrainUI_layout__P509683_mk(s) {
 
 
 
-function kodu_PageUI_layout__P509707(s) {
+function kodu_PageUI_layout__P94680(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67163,9 +67100,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___509841 = undefined;
-    s.unnamed16866___U1 = undefined;
-    s.unnamed16867___U2 = undefined;
+    s.rule___94814 = undefined;
+    s.unnamed1918___U1 = undefined;
+    s.unnamed1919___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -67173,10 +67110,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
     r0 = (s.arg0).fields["left"] = (s.arg1);
     r0 = (s.arg0).fields["top"] = (s.arg2);
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["pageBtn"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
@@ -67185,7 +67122,7 @@ switch (step) {
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg2;
-    s.tmp_3 = kodu_Button_height__P522429_mk(s);
+    s.tmp_3 = kodu_Button_height__P84862_mk(s);
     r0 = s.arg0.fields["pageBtn"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 1325; s.pc = 4; return s.tmp_3;
@@ -67196,34 +67133,34 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
     s.arg2 = (r0);
-    s.rule___509841 = (undefined);
+    s.rule___94814 = (undefined);
     r0 = s.arg0.fields["rules"];
-    s.unnamed16866___U1 = (r0);
-    s.unnamed16867___U2 = (0);
+    s.unnamed1918___U1 = (r0);
+    s.unnamed1919___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16867___U2;
-    r0 = pxsim_Array__length(s.unnamed16866___U1);
+    s.tmp_0 = r0 = s.unnamed1919___U2;
+    r0 = pxsim_Array__length(s.unnamed1918___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16866___U1, s.unnamed16867___U2);
-    s.rule___509841 = (r0);
-    s.tmp_2 = kodu_RuleUI_layout__P509777_mk(s);
-    s.tmp_2.arg0 = s.rule___509841;
+    r0 = pxsim_Array__getAt(s.unnamed1918___U1, s.unnamed1919___U2);
+    s.rule___94814 = (r0);
+    s.tmp_2 = kodu_RuleUI_layout__P94750_mk(s);
+    s.tmp_2.arg0 = s.rule___94814;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = s.arg2;
     s.callLocIdx = 1326; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    r0 = s.rule___509841.fields["height"];
+    r0 = s.rule___94814.fields["height"];
     s.tmp_0 = r0;
     r0 = (s.arg2 + s.tmp_0);
     s.arg2 = (r0);
-    r0 = (s.unnamed16867___U2 + 1);
-    s.unnamed16867___U2 = (r0);
+    r0 = (s.unnamed1919___U2 + 1);
+    s.unnamed1919___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16866___U1 = (undefined);
+    s.unnamed1918___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["top"];
     s.tmp_3 = r0;
@@ -67236,20 +67173,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_layout__P509707.info = {"start":1469,"length":382,"line":50,"column":8,"endLine":61,"endColumn":9,"fileName":"kodeStage.ts","functionName":"layout","argumentNames":["this","left","top"]}
+kodu_PageUI_layout__P94680.info = {"start":1469,"length":382,"line":50,"column":8,"endLine":61,"endColumn":9,"fileName":"kodeStage.ts","functionName":"layout","argumentNames":["this","left","top"]}
 
-function kodu_PageUI_layout__P509707_mk(s) {
+function kodu_PageUI_layout__P94680_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_layout__P509707, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_layout__P94680, 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,
-  rule___509841: undefined,
-  unnamed16866___U1: undefined,
-  unnamed16867___U2: undefined,
+  rule___94814: undefined,
+  unnamed1918___U1: undefined,
+  unnamed1919___U2: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -67259,7 +67196,7 @@ function kodu_PageUI_layout__P509707_mk(s) {
 
 
 
-function kodu_RuleUI_layout__P509777(s) {
+function kodu_RuleUI_layout__P94750(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67276,7 +67213,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
@@ -67286,7 +67223,7 @@ switch (step) {
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["left"] = (s.tmp_1);
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["handleBtn"];
     s.tmp_0.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -67298,7 +67235,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_2 = r0;
-    s.tmp_6 = kodu_Button_width__P522428_mk(s);
+    s.tmp_6 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["handleBtn"];
     s.tmp_6.arg0 = r0;
     s.callLocIdx = 1357; s.pc = 6; return s.tmp_6;
@@ -67307,7 +67244,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
-    s.tmp_9 = kodu_Button_width__P522428_mk(s);
+    s.tmp_9 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["whenBtn"];
     s.tmp_9.arg0 = r0;
     s.callLocIdx = 1358; s.pc = 7; return s.tmp_9;
@@ -67321,7 +67258,7 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["whenBtn"];
     s.tmp_0.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -67333,7 +67270,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_2 = r0;
-    s.tmp_6 = kodu_Button_width__P522428_mk(s);
+    s.tmp_6 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["whenBtn"];
     s.tmp_6.arg0 = r0;
     s.callLocIdx = 1360; s.pc = 9; return s.tmp_6;
@@ -67342,7 +67279,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
-    s.tmp_9 = kodu_Button_width__P522428_mk(s);
+    s.tmp_9 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["whenInsertBtn"];
     s.tmp_9.arg0 = r0;
     s.callLocIdx = 1361; s.pc = 10; return s.tmp_9;
@@ -67360,7 +67297,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_1 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["sensor"];
     s.tmp_1.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -67372,7 +67309,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_2 = r0;
-    s.tmp_4 = kodu_Button_width__P522428_mk(s);
+    s.tmp_4 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["sensor"];
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 1363; s.pc = 12; return s.tmp_4;
@@ -67384,18 +67321,18 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkAction(2, inline__P510186);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P95159);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg2);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["filters"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 1366; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["whenInsertBtn"];
     s.tmp_0.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -67407,7 +67344,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_2 = r0;
-    s.tmp_7 = kodu_Button_width__P522428_mk(s);
+    s.tmp_7 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["whenInsertBtn"];
     s.tmp_7.arg0 = r0;
     s.callLocIdx = 1368; s.pc = 15; return s.tmp_7;
@@ -67418,7 +67355,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (4 + s.tmp_5);
     s.tmp_4 = r0;
-    s.tmp_10 = kodu_Button_width__P522428_mk(s);
+    s.tmp_10 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["doBtn"];
     s.tmp_10.arg0 = r0;
     s.callLocIdx = 1369; s.pc = 16; return s.tmp_10;
@@ -67432,7 +67369,7 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["doBtn"];
     s.tmp_0.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -67444,7 +67381,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_2 = r0;
-    s.tmp_6 = kodu_Button_width__P522428_mk(s);
+    s.tmp_6 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["doBtn"];
     s.tmp_6.arg0 = r0;
     s.callLocIdx = 1371; s.pc = 18; return s.tmp_6;
@@ -67453,7 +67390,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
-    s.tmp_9 = kodu_Button_width__P522428_mk(s);
+    s.tmp_9 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["doInsertBtn"];
     s.tmp_9.arg0 = r0;
     s.callLocIdx = 1372; s.pc = 19; return s.tmp_9;
@@ -67471,7 +67408,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_1 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["actuator"];
     s.tmp_1.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -67483,7 +67420,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_2 = r0;
-    s.tmp_4 = kodu_Button_width__P522428_mk(s);
+    s.tmp_4 = kodu_Button_width__P84861_mk(s);
     r0 = s.arg0.fields["actuator"];
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 1374; s.pc = 21; return s.tmp_4;
@@ -67495,18 +67432,18 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkAction(2, inline__P510256);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P95229);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg2);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["modifiers"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 1377; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     r0 = s.arg0.fields["doInsertBtn"];
     s.tmp_0.arg0 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -67516,7 +67453,7 @@ switch (step) {
   case 23:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = kodu_Button_height__P522429_mk(s);
+    s.tmp_3 = kodu_Button_height__P84862_mk(s);
     r0 = s.arg0.fields["whenBtn"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 1379; s.pc = 24; return s.tmp_3;
@@ -67530,12 +67467,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_layout__P509777.info = {"start":5902,"length":1283,"line":186,"column":8,"endLine":215,"endColumn":9,"fileName":"kodeStage.ts","functionName":"layout","argumentNames":["this","left","top"]}
+kodu_RuleUI_layout__P94750.info = {"start":5902,"length":1283,"line":186,"column":8,"endLine":215,"endColumn":9,"fileName":"kodeStage.ts","functionName":"layout","argumentNames":["this","left","top"]}
 
-function kodu_RuleUI_layout__P509777_mk(s) {
+function kodu_RuleUI_layout__P94750_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_layout__P509777, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_layout__P94750, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67557,7 +67494,7 @@ function kodu_RuleUI_layout__P509777_mk(s) {
 
 
 
-function inline__P510186(s) {
+function inline__P95159(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67571,7 +67508,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg1 = r0;
@@ -67582,7 +67519,7 @@ switch (step) {
     s.tmp_0 = r0 = s.caps[0];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_2 = r0;
-    s.tmp_4 = kodu_Button_width__P522428_mk(s);
+    s.tmp_4 = kodu_Button_width__P84861_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.callLocIdx = 1365; s.pc = 2; return s.tmp_4;
   case 2:
@@ -67595,12 +67532,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510186.info = {"start":6421,"length":107,"line":197,"column":33,"endLine":200,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["filter"]}
+inline__P95159.info = {"start":6421,"length":107,"line":197,"column":33,"endLine":200,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["filter"]}
 
-function inline__P510186_mk(s) {
+function inline__P95159_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510186, depth: s.depth + 1,
+        parent: s, fn: inline__P95159, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67614,7 +67551,7 @@ function inline__P510186_mk(s) {
 
 
 
-function inline__P510256(s) {
+function inline__P95229(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67628,7 +67565,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Button_moveTo__P522439_mk(s);
+    s.tmp_0 = kodu_Button_moveTo__P84872_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg1 = r0;
@@ -67639,7 +67576,7 @@ switch (step) {
     s.tmp_0 = r0 = s.caps[0];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_2 = r0;
-    s.tmp_4 = kodu_Button_width__P522428_mk(s);
+    s.tmp_4 = kodu_Button_width__P84861_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.callLocIdx = 1376; s.pc = 2; return s.tmp_4;
   case 2:
@@ -67652,12 +67589,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510256.info = {"start":6961,"length":113,"line":209,"column":35,"endLine":212,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["modifier"]}
+inline__P95229.info = {"start":6961,"length":113,"line":209,"column":35,"endLine":212,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["modifier"]}
 
-function inline__P510256_mk(s) {
+function inline__P95229_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510256, depth: s.depth + 1,
+        parent: s, fn: inline__P95229, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67671,7 +67608,7 @@ function inline__P510256_mk(s) {
 
 
 
-function kodu_Button_moveTo__P522439(s) {
+function kodu_Button_moveTo__P84872(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67688,19 +67625,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = (s.arg0).fields["x"] = (s.arg1);
     r0 = (s.arg0).fields["y"] = (s.arg2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_moveTo__P522439.info = {"start":3039,"length":95,"line":97,"column":8,"endLine":100,"endColumn":9,"fileName":"button.ts","functionName":"moveTo","argumentNames":["this","x","y"]}
+kodu_Button_moveTo__P84872.info = {"start":3039,"length":95,"line":97,"column":8,"endLine":100,"endColumn":9,"fileName":"button.ts","functionName":"moveTo","argumentNames":["this","x","y"]}
 
-function kodu_Button_moveTo__P522439_mk(s) {
+function kodu_Button_moveTo__P84872_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_moveTo__P522439, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_moveTo__P84872, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -67711,7 +67648,7 @@ function kodu_Button_moveTo__P522439_mk(s) {
 
 
 
-function kodu_BrainUI_constructor__P509686(s) {
+function kodu_BrainUI_constructor__P94659(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67730,23 +67667,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_BrainUI__C509681_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_BrainUI__C94654_VT)) failedCast(r0);
     r0 = (s.arg0).fields["kstage"] = (s.arg1);
     r0 = (s.arg0).fields["left"] = (s.arg3);
     r0 = (s.arg0).fields["top"] = (s.arg4);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "brainui";
     s.callLocIdx = 1310; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(2, inline__P509700);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P94673);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg0);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_3 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg2.fields["pages"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
@@ -67759,12 +67696,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainUI_constructor__P509686.info = {"start":90,"length":244,"line":5,"column":8,"endLine":8,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","kstage","brain","left","top"]}
+kodu_BrainUI_constructor__P94659.info = {"start":90,"length":244,"line":5,"column":8,"endLine":8,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","kstage","brain","left","top"]}
 
-function kodu_BrainUI_constructor__P509686_mk(s) {
+function kodu_BrainUI_constructor__P94659_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainUI_constructor__P509686, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainUI_constructor__P94659, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67781,7 +67718,7 @@ function kodu_BrainUI_constructor__P509686_mk(s) {
 
 
 
-function inline__P509700(s) {
+function inline__P94673(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67796,9 +67733,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageUI__C509704_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageUI__C94677_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_PageUI_constructor__P509714_mk(s);
+    s.tmp_1 = kodu_PageUI_constructor__P94687_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.caps[0];
     s.tmp_1.arg2 = s.caps[1];
@@ -67811,12 +67748,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P509700.info = {"start":268,"length":54,"line":7,"column":41,"endLine":7,"endColumn":95,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
+inline__P94673.info = {"start":268,"length":54,"line":7,"column":41,"endLine":7,"endColumn":95,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
 
-function inline__P509700_mk(s) {
+function inline__P94673_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P509700, depth: s.depth + 1,
+        parent: s, fn: inline__P94673, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67828,7 +67765,7 @@ function inline__P509700_mk(s) {
 
 
 
-function kodu_PageUI_constructor__P509714(s) {
+function kodu_PageUI_constructor__P94687(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67847,25 +67784,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
     r0 = (s.arg0).fields["kstage"] = (s.arg1);
     r0 = (s.arg0).fields["defn"] = (s.arg3);
     r0 = (s.arg0).fields["height"] = (0);
     r0 = (s.arg0).fields["left"] = (0);
     r0 = (s.arg0).fields["top"] = (0);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "pageui";
     s.callLocIdx = 1317; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(2, inline__P509770);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P94743);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg0);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_3 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg3.fields["rules"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
@@ -67874,19 +67811,19 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["rules"] = (s.tmp_2);
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1320; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_1 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = "clear";
     s.tmp_3 = if_modifier_1_mk(s);
-    s.tmp_3.arg0 = globals.tid___110372;
+    s.tmp_3.arg0 = globals.tid___85125;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifier");
     } else {
@@ -67922,7 +67859,7 @@ switch (step) {
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["pageBtn"] = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
     r0 = s.arg0.fields["pageBtn"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 800;
@@ -67933,12 +67870,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_constructor__P509714.info = {"start":954,"length":505,"line":37,"column":8,"endLine":48,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","kstage","brainui","defn","index"]}
+kodu_PageUI_constructor__P94687.info = {"start":954,"length":505,"line":37,"column":8,"endLine":48,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","kstage","brainui","defn","index"]}
 
-function kodu_PageUI_constructor__P509714_mk(s) {
+function kodu_PageUI_constructor__P94687_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_constructor__P509714, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_constructor__P94687, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67958,7 +67895,7 @@ function kodu_PageUI_constructor__P509714_mk(s) {
 
 
 
-function inline__P509770(s) {
+function inline__P94743(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67973,9 +67910,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleUI__C509774_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleUI__C94747_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_RuleUI_constructor__P509794_mk(s);
+    s.tmp_1 = kodu_RuleUI_constructor__P94767_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.caps[0];
     s.tmp_1.arg2 = s.caps[1];
@@ -67988,12 +67925,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P509770.info = {"start":1127,"length":54,"line":39,"column":40,"endLine":39,"endColumn":94,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
+inline__P94743.info = {"start":1127,"length":54,"line":39,"column":40,"endLine":39,"endColumn":94,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
 
-function inline__P509770_mk(s) {
+function inline__P94743_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P509770, depth: s.depth + 1,
+        parent: s, fn: inline__P94743, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68005,7 +67942,7 @@ function inline__P509770_mk(s) {
 
 
 
-function kodu_PageUI_ensureFinalEmptyRule__P509710(s) {
+function kodu_PageUI_ensureFinalEmptyRule__P94683(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68020,8 +67957,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
-    s.tmp_0 = kodu_PageUI_trim__P509709_mk(s);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
+    s.tmp_0 = kodu_PageUI_trim__P94682_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1327; s.pc = 5; return s.tmp_0;
   case 5:
@@ -68039,7 +67976,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_6 = kodu_RuleUI_isEmpty__P509780_mk(s);
+    s.tmp_6 = kodu_RuleUI_isEmpty__P94753_mk(s);
     r0 = s.arg0.fields["rules"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["rules"];
@@ -68062,16 +67999,16 @@ switch (step) {
     s.tmp_11 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_11);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleUI__C509774_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleUI__C94747_VT);
     s.tmp_12 = r0;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C110339_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C85092_VT);
     s.tmp_13 = r0;
-    s.tmp_14 = kodu_RuleDefn_constructor__P110345_mk(s);
+    s.tmp_14 = kodu_RuleDefn_constructor__P85098_mk(s);
     s.tmp_14.arg0 = s.tmp_13;
     s.callLocIdx = 1329; s.pc = 7; return s.tmp_14;
   case 7:
     r0 = s.retval;
-    s.tmp_15 = kodu_RuleUI_constructor__P509794_mk(s);
+    s.tmp_15 = kodu_RuleUI_constructor__P94767_mk(s);
     s.tmp_15.arg0 = s.tmp_12;
     r0 = s.arg0.fields["kstage"];
     s.tmp_15.arg1 = r0;
@@ -68093,12 +68030,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_ensureFinalEmptyRule__P509710.info = {"start":2196,"length":265,"line":75,"column":8,"endLine":80,"endColumn":9,"fileName":"kodeStage.ts","functionName":"ensureFinalEmptyRule","argumentNames":["this"]}
+kodu_PageUI_ensureFinalEmptyRule__P94683.info = {"start":2196,"length":265,"line":75,"column":8,"endLine":80,"endColumn":9,"fileName":"kodeStage.ts","functionName":"ensureFinalEmptyRule","argumentNames":["this"]}
 
-function kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s) {
+function kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_ensureFinalEmptyRule__P509710, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_ensureFinalEmptyRule__P94683, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68125,7 +68062,7 @@ function kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s) {
 
 
 
-function kodu_RuleUI_isEmpty__P509780(s) {
+function kodu_RuleUI_isEmpty__P94753(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68140,7 +68077,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     r0 = s.arg0.fields["sensor"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -68190,12 +68127,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_isEmpty__P509780.info = {"start":8155,"length":215,"line":243,"column":8,"endLine":249,"endColumn":9,"fileName":"kodeStage.ts","functionName":"isEmpty","argumentNames":["this"]}
+kodu_RuleUI_isEmpty__P94753.info = {"start":8155,"length":215,"line":243,"column":8,"endLine":249,"endColumn":9,"fileName":"kodeStage.ts","functionName":"isEmpty","argumentNames":["this"]}
 
-function kodu_RuleUI_isEmpty__P509780_mk(s) {
+function kodu_RuleUI_isEmpty__P94753_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_isEmpty__P509780, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_isEmpty__P94753, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68216,7 +68153,7 @@ function kodu_RuleUI_isEmpty__P509780_mk(s) {
 
 
 
-function kodu_PageUI_trim__P509709(s) {
+function kodu_PageUI_trim__P94682(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68231,17 +68168,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_trim__P509709.info = {"start":1973,"length":213,"line":68,"column":8,"endLine":73,"endColumn":9,"fileName":"kodeStage.ts","functionName":"trim","argumentNames":["this"]}
+kodu_PageUI_trim__P94682.info = {"start":1973,"length":213,"line":68,"column":8,"endLine":73,"endColumn":9,"fileName":"kodeStage.ts","functionName":"trim","argumentNames":["this"]}
 
-function kodu_PageUI_trim__P509709_mk(s) {
+function kodu_PageUI_trim__P94682_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_trim__P509709, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_trim__P94682, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -68250,7 +68187,7 @@ function kodu_PageUI_trim__P509709_mk(s) {
 
 
 
-function kodu_RuleUI_constructor__P509794(s) {
+function kodu_RuleUI_constructor__P94767(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68269,7 +68206,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     r0 = (s.arg0).fields["kstage"] = (s.arg1);
     r0 = (s.arg0).fields["pageui"] = (s.arg2);
     r0 = (s.arg0).fields["defn"] = (s.arg3);
@@ -68277,7 +68214,7 @@ switch (step) {
     r0 = (s.arg0).fields["top"] = (0);
     r0 = (s.arg0).fields["left"] = (0);
     r0 = (s.arg0).fields["height"] = (0);
-    s.tmp_0 = kodu_Component_constructor__P345119_mk(s);
+    s.tmp_0 = kodu_Component_constructor__P84896_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "ruleui";
@@ -68292,12 +68229,12 @@ switch (step) {
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["modifiers"] = (s.tmp_1);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510060);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95033);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = null;
@@ -68312,16 +68249,16 @@ switch (step) {
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["handleBtn"] = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
     r0 = s.arg0.fields["handleBtn"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1344; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_1 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = null;
@@ -68335,19 +68272,19 @@ switch (step) {
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["whenBtn"] = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
     r0 = s.arg0.fields["whenBtn"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1346; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510086);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95059);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = "beige";
@@ -68361,16 +68298,16 @@ switch (step) {
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["whenInsertBtn"] = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
     r0 = s.arg0.fields["whenInsertBtn"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1349; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_1 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = null;
@@ -68384,19 +68321,19 @@ switch (step) {
   case 8:
     r0 = s.retval;
     r0 = (s.arg0).fields["doBtn"] = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
     r0 = s.arg0.fields["doBtn"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1351; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510112);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95085);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = "beige";
@@ -68410,14 +68347,14 @@ switch (step) {
   case 10:
     r0 = s.retval;
     r0 = (s.arg0).fields["doInsertBtn"] = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
     r0 = s.arg0.fields["doInsertBtn"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1354; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg3;
     s.callLocIdx = 1355; s.pc = 12; return s.tmp_0;
@@ -68427,12 +68364,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_constructor__P509794.info = {"start":4413,"length":1479,"line":140,"column":8,"endLine":184,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","kstage","pageui","defn","index"]}
+kodu_RuleUI_constructor__P94767.info = {"start":4413,"length":1479,"line":140,"column":8,"endLine":184,"endColumn":9,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["this","kstage","pageui","defn","index"]}
 
-function kodu_RuleUI_constructor__P509794_mk(s) {
+function kodu_RuleUI_constructor__P94767_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_constructor__P509794, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_constructor__P94767, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68448,7 +68385,7 @@ function kodu_RuleUI_constructor__P509794_mk(s) {
 
 
 
-function inline__P510060(s) {
+function inline__P95033(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68462,7 +68399,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_handleRuleHandleClick__P509789_mk(s);
+    s.tmp_0 = kodu_RuleUI_handleRuleHandleClick__P94762_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 1342; s.pc = 1; return s.tmp_0;
@@ -68472,12 +68409,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510060.info = {"start":4808,"length":46,"line":150,"column":16,"endLine":150,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P95033.info = {"start":4808,"length":46,"line":150,"column":16,"endLine":150,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P510060_mk(s) {
+function inline__P95033_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510060, depth: s.depth + 1,
+        parent: s, fn: inline__P95033, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -68487,7 +68424,7 @@ function inline__P510060_mk(s) {
 
 
 
-function inline__P510086(s) {
+function inline__P95059(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68501,7 +68438,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_handleWhenInsertClick__P509787_mk(s);
+    s.tmp_0 = kodu_RuleUI_handleWhenInsertClick__P94760_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 1347; s.pc = 1; return s.tmp_0;
@@ -68511,12 +68448,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510086.info = {"start":5284,"length":46,"line":165,"column":16,"endLine":165,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P95059.info = {"start":5284,"length":46,"line":165,"column":16,"endLine":165,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P510086_mk(s) {
+function inline__P95059_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510086, depth: s.depth + 1,
+        parent: s, fn: inline__P95059, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -68526,7 +68463,7 @@ function inline__P510086_mk(s) {
 
 
 
-function inline__P510112(s) {
+function inline__P95085(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68540,7 +68477,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_handleDoInsertClick__P509788_mk(s);
+    s.tmp_0 = kodu_RuleUI_handleDoInsertClick__P94761_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 1352; s.pc = 1; return s.tmp_0;
@@ -68550,12 +68487,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510112.info = {"start":5756,"length":44,"line":180,"column":16,"endLine":180,"endColumn":60,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P95085.info = {"start":5756,"length":44,"line":180,"column":16,"endLine":180,"endColumn":60,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P510112_mk(s) {
+function inline__P95085_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510112, depth: s.depth + 1,
+        parent: s, fn: inline__P95085, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -68565,7 +68502,7 @@ function inline__P510112_mk(s) {
 
 
 
-function kodu_RuleUI_instantiateTiles__P509782(s) {
+function kodu_RuleUI_instantiateTiles__P94755(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68581,8 +68518,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
-    s.tmp_0 = kodu_RuleUI_destroyTiles__P509779_mk(s);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
+    s.tmp_0 = kodu_RuleUI_destroyTiles__P94752_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1385; s.pc = 5; return s.tmp_0;
   case 5:
@@ -68592,7 +68529,7 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = kodu_RuleUI_createSensorBtn__P509790_mk(s);
+    s.tmp_3 = kodu_RuleUI_createSensorBtn__P94763_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.tmp_4 = if_tid_1_mk(s);
     r0 = s.arg1.fields["sensor"];
@@ -68615,11 +68552,11 @@ switch (step) {
     r0 = (s.tmp_1).fields["sensor"] = (s.tmp_2);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510392);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95365);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_3 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg1.fields["filters"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
@@ -68633,7 +68570,7 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = kodu_RuleUI_createActuatorBtn__P509791_mk(s);
+    s.tmp_3 = kodu_RuleUI_createActuatorBtn__P94764_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.tmp_4 = if_tid_1_mk(s);
     r0 = s.arg1.fields["actuator"];
@@ -68656,11 +68593,11 @@ switch (step) {
     r0 = (s.tmp_1).fields["actuator"] = (s.tmp_2);
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510412);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95385);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_3 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg1.fields["modifiers"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
@@ -68673,12 +68610,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_instantiateTiles__P509782.info = {"start":8465,"length":601,"line":255,"column":8,"endLine":269,"endColumn":9,"fileName":"kodeStage.ts","functionName":"instantiateTiles","argumentNames":["this","defn"]}
+kodu_RuleUI_instantiateTiles__P94755.info = {"start":8465,"length":601,"line":255,"column":8,"endLine":269,"endColumn":9,"fileName":"kodeStage.ts","functionName":"instantiateTiles","argumentNames":["this","defn"]}
 
-function kodu_RuleUI_instantiateTiles__P509782_mk(s) {
+function kodu_RuleUI_instantiateTiles__P94755_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_instantiateTiles__P509782, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_instantiateTiles__P94755, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68693,7 +68630,7 @@ function kodu_RuleUI_instantiateTiles__P509782_mk(s) {
 
 
 
-function inline__P510392(s) {
+function inline__P95365(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68708,7 +68645,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_createFilterBtn__P509792_mk(s);
+    s.tmp_0 = kodu_RuleUI_createFilterBtn__P94765_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_1 = if_tid_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
@@ -68730,12 +68667,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510392.info = {"start":8691,"length":94,"line":260,"column":44,"endLine":262,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
+inline__P95365.info = {"start":8691,"length":94,"line":260,"column":44,"endLine":262,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
 
-function inline__P510392_mk(s) {
+function inline__P95365_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510392, depth: s.depth + 1,
+        parent: s, fn: inline__P95365, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68747,7 +68684,7 @@ function inline__P510392_mk(s) {
 
 
 
-function inline__P510412(s) {
+function inline__P95385(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68762,7 +68699,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_createModifierBtn__P509793_mk(s);
+    s.tmp_0 = kodu_RuleUI_createModifierBtn__P94766_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_1 = if_tid_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
@@ -68784,12 +68721,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510412.info = {"start":8958,"length":96,"line":266,"column":48,"endLine":268,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
+inline__P95385.info = {"start":8958,"length":96,"line":266,"column":48,"endLine":268,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem","index"]}
 
-function inline__P510412_mk(s) {
+function inline__P95385_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510412, depth: s.depth + 1,
+        parent: s, fn: inline__P95385, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68801,7 +68738,7 @@ function inline__P510412_mk(s) {
 
 
 
-function kodu_RuleUI_createModifierBtn__P509793(s) {
+function kodu_RuleUI_createModifierBtn__P94766(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68811,8 +68748,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.defn___511031 = undefined;
-    s.button___511037 = undefined;
+    s.defn___96004 = undefined;
+    s.button___96010 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -68820,9 +68757,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     s.tmp_1 = if_modifiers_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "modifiers");
     } else {
@@ -68835,21 +68772,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, s.arg1);
-    s.defn___511031 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.defn___511031);
+    s.defn___96004 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.defn___96004);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511046);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96019);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     r0 = s.arg0.fields["stage"];
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = "beige";
     s.tmp_3 = if_tid_1_mk(s);
-    s.tmp_3.arg0 = s.defn___511031;
+    s.tmp_3.arg0 = s.defn___96004;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "tid");
     } else {
@@ -68862,7 +68799,7 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
     s.tmp_4 = if_name_1_mk(s);
-    s.tmp_4.arg0 = s.defn___511031;
+    s.tmp_4.arg0 = s.defn___96004;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "name");
     } else {
@@ -68881,28 +68818,28 @@ switch (step) {
     s.callLocIdx = 1531; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.button___511037 = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
-    s.tmp_0.arg0 = s.button___511037;
+    s.button___96010 = (s.tmp_0);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
+    s.tmp_0.arg0 = s.button___96010;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1532; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
-    s.tmp_1.arg0 = s.button___511037;
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
+    s.tmp_1.arg0 = s.button___96010;
     s.callLocIdx = 1533; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___511031);
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
-    s.tmp_1.arg0 = s.button___511037;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___96004);
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
+    s.tmp_1.arg0 = s.button___96010;
     s.callLocIdx = 1534; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "index", s.arg2);
-    r0 = s.button___511037;
+    r0 = s.button___96010;
     { step = 3; continue; }
   case 1:
   case 2:
@@ -68911,20 +68848,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_createModifierBtn__P509793.info = {"start":19645,"length":596,"line":539,"column":8,"endLine":555,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createModifierBtn","argumentNames":["this","id","index"]}
+kodu_RuleUI_createModifierBtn__P94766.info = {"start":19645,"length":596,"line":539,"column":8,"endLine":555,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createModifierBtn","argumentNames":["this","id","index"]}
 
-function kodu_RuleUI_createModifierBtn__P509793_mk(s) {
+function kodu_RuleUI_createModifierBtn__P94766_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_createModifierBtn__P509793, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_createModifierBtn__P94766, 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,
-  defn___511031: undefined,
-  button___511037: undefined,
+  defn___96004: undefined,
+  button___96010: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -68934,7 +68871,7 @@ function kodu_RuleUI_createModifierBtn__P509793_mk(s) {
 
 
 
-function inline__P511046(s) {
+function inline__P96019(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68948,7 +68885,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_handleModifierClick__P509786_mk(s);
+    s.tmp_0 = kodu_RuleUI_handleModifierClick__P94759_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 1530; s.pc = 1; return s.tmp_0;
@@ -68958,12 +68895,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511046.info = {"start":19988,"length":44,"line":548,"column":20,"endLine":548,"endColumn":64,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P96019.info = {"start":19988,"length":44,"line":548,"column":20,"endLine":548,"endColumn":64,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P511046_mk(s) {
+function inline__P96019_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511046, depth: s.depth + 1,
+        parent: s, fn: inline__P96019, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -68973,7 +68910,7 @@ function inline__P511046_mk(s) {
 
 
 
-function kodu_RuleUI_handleModifierClick__P509786(s) {
+function kodu_RuleUI_handleModifierClick__P94759(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68983,50 +68920,50 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___510614 = undefined;
-    s.suggestions___510618 = undefined;
-    s.items___510624 = undefined;
+    s.index___95587 = undefined;
+    s.suggestions___95591 = undefined;
+    s.items___95597 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.callLocIdx = 1437; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "index");
-    s.index___510614 = (r0);
-    s.tmp_0 = kodu_Language_getModifierSuggestions__P110370_mk(s);
+    s.index___95587 = (r0);
+    s.tmp_0 = kodu_Language_getModifierSuggestions__P85123_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___510614;
+    s.tmp_0.arg1 = s.index___95587;
     s.callLocIdx = 1438; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.suggestions___510618 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510618;
-    s.tmp_0.arg1 = inline__P510626;
+    s.suggestions___95591 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95591;
+    s.tmp_0.arg1 = inline__P95599;
     s.callLocIdx = 1441; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.items___510624 = (r0);
+    s.items___95597 = (r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "icon", "delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "label", "Delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "style", "danger");
-    r0 = pxsim_Array__push(s.items___510624, s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P510647);
+    r0 = pxsim_Array__push(s.items___95597, s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P95620);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.index___510614);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.index___95587);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -69035,7 +68972,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510624;
+    s.tmp_1.arg3 = s.items___95597;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1451; s.pc = 4; return s.tmp_1;
@@ -69045,19 +68982,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_handleModifierClick__P509786.info = {"start":12307,"length":1139,"line":353,"column":8,"endLine":379,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleModifierClick","argumentNames":["this","button"]}
+kodu_RuleUI_handleModifierClick__P94759.info = {"start":12307,"length":1139,"line":353,"column":8,"endLine":379,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleModifierClick","argumentNames":["this","button"]}
 
-function kodu_RuleUI_handleModifierClick__P509786_mk(s) {
+function kodu_RuleUI_handleModifierClick__P94759_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_handleModifierClick__P509786, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_handleModifierClick__P94759, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  index___510614: undefined,
-  suggestions___510618: undefined,
-  items___510624: undefined,
+  index___95587: undefined,
+  suggestions___95591: undefined,
+  items___95597: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -69066,7 +69003,7 @@ function kodu_RuleUI_handleModifierClick__P509786_mk(s) {
 
 
 
-function inline__P510626(s) {
+function inline__P95599(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69114,12 +69051,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510626.info = {"start":12526,"length":154,"line":356,"column":42,"endLine":361,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95599.info = {"start":12526,"length":154,"line":356,"column":42,"endLine":361,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510626_mk(s) {
+function inline__P95599_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510626, depth: s.depth + 1,
+        parent: s, fn: inline__P95599, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69133,7 +69070,7 @@ function inline__P510626_mk(s) {
 
 
 
-function inline__P510647(s) {
+function inline__P95620(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69176,7 +69113,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 1; continue; }
-    s.tmp_7 = helpers_arraySplice__P106707_mk(s);
+    s.tmp_7 = helpers_arraySplice__P81369_mk(s);
     r0 = s.caps[0].fields["defn"];
     r0 = r0.fields["modifiers"];
     s.tmp_7.arg0 = r0;
@@ -69192,7 +69129,7 @@ switch (step) {
     s.tmp_0 = r0;
     s.tmp_1 = r0 = s.caps[1];
     s.tmp_4 = if_modifiers_1_mk(s);
-    s.tmp_4.arg0 = globals.tiles___110373;
+    s.tmp_4.arg0 = globals.tiles___85126;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "modifiers");
     } else {
@@ -69210,20 +69147,20 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_0, s.tmp_1, s.tmp_2);
   case 2:
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1448; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1449; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1450; s.pc = 10; return s.tmp_0;
@@ -69235,12 +69172,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510647.info = {"start":12894,"length":540,"line":367,"column":73,"endLine":378,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95620.info = {"start":12894,"length":540,"line":367,"column":73,"endLine":378,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510647_mk(s) {
+function inline__P95620_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510647, depth: s.depth + 1,
+        parent: s, fn: inline__P95620, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69257,7 +69194,7 @@ function inline__P510647_mk(s) {
 
 
 
-function kodu_Language_ensureValid__P110371(s) {
+function kodu_Language_ensureValid__P85124(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69303,12 +69240,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Language_ensureValid__P110371.info = {"start":11432,"length":219,"line":336,"column":8,"endLine":343,"endColumn":9,"fileName":"language.ts","functionName":"ensureValid","argumentNames":["rule"]}
+kodu_Language_ensureValid__P85124.info = {"start":11432,"length":219,"line":336,"column":8,"endLine":343,"endColumn":9,"fileName":"language.ts","functionName":"ensureValid","argumentNames":["rule"]}
 
-function kodu_Language_ensureValid__P110371_mk(s) {
+function kodu_Language_ensureValid__P85124_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Language_ensureValid__P110371, depth: s.depth + 1,
+        parent: s, fn: kodu_Language_ensureValid__P85124, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69322,7 +69259,7 @@ function kodu_Language_ensureValid__P110371_mk(s) {
 
 
 
-function kodu_KodeStage_showMenu__P509653(s) {
+function kodu_KodeStage_showMenu__P85253(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69332,10 +69269,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.curx___511079 = undefined;
-    s.cury___511083 = undefined;
-    s.camx___511087 = undefined;
-    s.camy___511091 = undefined;
+    s.curx___96051 = undefined;
+    s.cury___96055 = undefined;
+    s.camx___96059 = undefined;
+    s.camy___96063 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -69346,35 +69283,35 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    s.tmp_0 = kodu_KodeStage_hideMenu__P509654_mk(s);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    s.tmp_0 = kodu_KodeStage_hideMenu__P85254_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1536; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_0 = kodu_Cursor_x__P84986_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1537; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.curx___511079 = (r0);
-    s.tmp_0 = kodu_Cursor_y__P549462_mk(s);
+    s.curx___96051 = (r0);
+    s.tmp_0 = kodu_Cursor_y__P84987_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1538; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.cury___511083 = (r0);
+    s.cury___96055 = (r0);
     r0 = s.arg0.fields["camera"];
     r0 = r0.fields["x"];
-    s.camx___511087 = (r0);
+    s.camx___96059 = (r0);
     r0 = s.arg0.fields["camera"];
     r0 = r0.fields["y"];
-    s.camy___511091 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Menu__C518584_VT);
+    s.camy___96063 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Menu__C85036_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Menu_constructor__P518591_mk(s);
+    s.tmp_1 = kodu_Menu_constructor__P85038_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg3;
@@ -69384,15 +69321,15 @@ switch (step) {
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["menu"] = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(6, inline__P511107);
+    r0 = pxsim_pxtcore_mkAction(6, inline__P96078);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg5);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.curx___511079);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.cury___511083);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.camx___511087);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.camy___511091);
-    s.tmp_1 = kodu_Menu_show__P518586_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.curx___96051);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.cury___96055);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.camx___96059);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.camy___96063);
+    s.tmp_1 = kodu_Menu_show__P85039_mk(s);
     r0 = s.arg0.fields["menu"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
@@ -69406,19 +69343,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_showMenu__P509653.info = {"start":20581,"length":716,"line":572,"column":8,"endLine":588,"endColumn":9,"fileName":"kodeStage.ts","functionName":"showMenu","argumentNames":["this","x","y","items","direction","onSelect"]}
+kodu_KodeStage_showMenu__P85253.info = {"start":20581,"length":716,"line":572,"column":8,"endLine":588,"endColumn":9,"fileName":"kodeStage.ts","functionName":"showMenu","argumentNames":["this","x","y","items","direction","onSelect"]}
 
-function kodu_KodeStage_showMenu__P509653_mk(s) {
+function kodu_KodeStage_showMenu__P85253_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_showMenu__P509653, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_showMenu__P85253, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  curx___511079: undefined,
-  cury___511083: undefined,
-  camx___511087: undefined,
-  camy___511091: undefined,
+  curx___96051: undefined,
+  cury___96055: undefined,
+  camx___96059: undefined,
+  camy___96063: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -69431,7 +69368,7 @@ function kodu_KodeStage_showMenu__P509653_mk(s) {
 
 
 
-function inline__P511107(s) {
+function inline__P96078(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69445,7 +69382,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_KodeStage_hideMenu__P509654_mk(s);
+    s.tmp_0 = kodu_KodeStage_hideMenu__P85254_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 1540; s.pc = 1; return s.tmp_0;
   case 1:
@@ -69457,14 +69394,14 @@ switch (step) {
     s.callLocIdx = 1541; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_x__P549530_mk(s);
+    s.tmp_0 = kodu_Cursor_x__P84988_mk(s);
     r0 = s.caps[0].fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.caps[2];
     s.callLocIdx = 1542; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_y__P549531_mk(s);
+    s.tmp_0 = kodu_Cursor_y__P84989_mk(s);
     r0 = s.caps[0].fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.caps[3];
@@ -69477,7 +69414,7 @@ switch (step) {
     r0 = s.caps[0].fields["camera"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["y"] = (s.caps[5]);
-    s.tmp_0 = kodu_BrainUI_layout__P509683_mk(s);
+    s.tmp_0 = kodu_BrainUI_layout__P94656_mk(s);
     r0 = s.caps[0].fields["brain"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1544; s.pc = 5; return s.tmp_0;
@@ -69487,12 +69424,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511107.info = {"start":20996,"length":289,"line":579,"column":44,"endLine":587,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P96078.info = {"start":20996,"length":289,"line":579,"column":44,"endLine":587,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P511107_mk(s) {
+function inline__P96078_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511107, depth: s.depth + 1,
+        parent: s, fn: inline__P96078, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -69502,7 +69439,7 @@ function inline__P511107_mk(s) {
 
 
 
-function kodu_KodeStage_hideMenu__P509654(s) {
+function kodu_KodeStage_hideMenu__P85254(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69517,15 +69454,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
     r0 = s.arg0.fields["menu"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Menu__C518584_v0_1_mk(s);
+    s.tmp_1 = kodu_Menu__C85036_v0_1_mk(s);
     r0 = s.arg0.fields["menu"];
     s.tmp_1.arg0 = r0;
-    if (!checkSubtype(s.tmp_1.arg0, kodu_Menu__C518584_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, kodu_Menu__C85036_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.destroy;
     s.pc = 3; return s.tmp_1;
   case 3:
@@ -69537,12 +69474,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_hideMenu__P509654.info = {"start":21307,"length":136,"line":590,"column":8,"endLine":595,"endColumn":9,"fileName":"kodeStage.ts","functionName":"hideMenu","argumentNames":["this"]}
+kodu_KodeStage_hideMenu__P85254.info = {"start":21307,"length":136,"line":590,"column":8,"endLine":595,"endColumn":9,"fileName":"kodeStage.ts","functionName":"hideMenu","argumentNames":["this"]}
 
-function kodu_KodeStage_hideMenu__P509654_mk(s) {
+function kodu_KodeStage_hideMenu__P85254_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_hideMenu__P509654, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_hideMenu__P85254, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69553,7 +69490,7 @@ function kodu_KodeStage_hideMenu__P509654_mk(s) {
 
 
 
-function kodu_Language_getModifierSuggestions__P110370(s) {
+function kodu_Language_getModifierSuggestions__P85123(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69563,88 +69500,88 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.all___115786 = undefined;
-    s.existing___115819 = undefined;
-    s.i___115821 = undefined;
-    s.last___115837 = undefined;
-    s.constraints___115854 = undefined;
-    s.i___115873 = undefined;
+    s.all___90675 = undefined;
+    s.existing___90708 = undefined;
+    s.i___90710 = undefined;
+    s.last___90726 = undefined;
+    s.constraints___90743 = undefined;
+    s.i___90762 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_arraySort__P106712_mk(s);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_0 = helpers_arraySort__P81374_mk(s);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     s.tmp_4 = if_modifiers_1_mk(s);
-    s.tmp_4.arg0 = globals.tiles___110373;
+    s.tmp_4.arg0 = globals.tiles___85126;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "modifiers");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["modifiers"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["modifiers"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 571; s.pc = 21; return s.tmp_4; }
+     else { s.callLocIdx = 570; s.pc = 21; return s.tmp_4; }
     }
   case 21:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.keysOf(s.tmp_3);
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115796;
-    s.callLocIdx = 573; s.pc = 20; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90685;
+    s.callLocIdx = 572; s.pc = 20; return s.tmp_2;
   case 20:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P115801;
-    s.callLocIdx = 575; s.pc = 19; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P90690;
+    s.callLocIdx = 574; s.pc = 19; return s.tmp_1;
   case 19:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P115788;
-    s.callLocIdx = 578; s.pc = 18; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P90677;
+    s.callLocIdx = 577; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.all___115786 = (r0);
+    s.all___90675 = (r0);
     r0 = pxsim_Array__mk();
-    s.existing___115819 = (r0);
-    s.i___115821 = (0);
+    s.existing___90708 = (r0);
+    s.i___90710 = (0);
   case 1:
-    r0 = (s.i___115821 < s.arg1);
+    r0 = (s.i___90710 < s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.existing___115819;
+    s.tmp_1 = r0 = s.existing___90708;
     r0 = s.arg0.fields["modifiers"];
     s.tmp_3 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_3, s.i___115821);
+    r0 = pxsim_Array__getAt(s.tmp_3, s.i___90710);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___115821 + 1);
-    s.i___115821 = (r0);
+    r0 = (s.i___90710 + 1);
+    s.i___90710 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = pxsim_Array__length(s.existing___115819);
+    r0 = pxsim_Array__length(s.existing___90708);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_1 = r0 = s.existing___115819;
-    r0 = pxsim_Array__length(s.existing___115819);
+    s.tmp_1 = r0 = s.existing___90708;
+    r0 = pxsim_Array__length(s.existing___90708);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
-    s.last___115837 = (r0);
+    s.last___90726 = (r0);
     s.tmp_1 = if_constraints_1_mk(s);
-    s.tmp_1.arg0 = s.last___115837;
+    s.tmp_1.arg0 = s.last___90726;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "constraints");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["constraints"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["constraints"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 579; s.pc = 22; return s.tmp_1; }
+     else { s.callLocIdx = 578; s.pc = 22; return s.tmp_1; }
     }
   case 22:
     r0 = s.retval;
@@ -69656,14 +69593,14 @@ switch (step) {
   case 3:
     s.tmp_2 = if_handling_1_mk(s);
     s.tmp_3 = if_constraints_1_mk(s);
-    s.tmp_3.arg0 = s.last___115837;
+    s.tmp_3.arg0 = s.last___90726;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "constraints");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["constraints"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["constraints"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 580; s.pc = 24; return s.tmp_3; }
+     else { s.callLocIdx = 579; s.pc = 24; return s.tmp_3; }
     }
   case 24:
     r0 = s.retval;
@@ -69674,7 +69611,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["handling"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["handling"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 581; s.pc = 23; return s.tmp_2; }
+     else { s.callLocIdx = 580; s.pc = 23; return s.tmp_2; }
     }
   case 23:
     r0 = s.retval;
@@ -69688,14 +69625,14 @@ switch (step) {
   case 5:
     s.tmp_6 = if_handling_1_mk(s);
     s.tmp_7 = if_constraints_1_mk(s);
-    s.tmp_7.arg0 = s.last___115837;
+    s.tmp_7.arg0 = s.last___90726;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "constraints");
     } else {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["constraints"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["constraints"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 582; s.pc = 26; return s.tmp_7; }
+     else { s.callLocIdx = 581; s.pc = 26; return s.tmp_7; }
     }
   case 26:
     r0 = s.retval;
@@ -69706,7 +69643,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["handling"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["handling"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 583; s.pc = 25; return s.tmp_6; }
+     else { s.callLocIdx = 582; s.pc = 25; return s.tmp_6; }
     }
   case 25:
     r0 = s.retval;
@@ -69723,11 +69660,11 @@ switch (step) {
   case 8:
   case 9:
   case 10:
-    s.tmp_9 = kodu_mkConstraints__P115723_mk(s);
-    s.callLocIdx = 584; s.pc = 27; return s.tmp_9;
+    s.tmp_9 = kodu_mkConstraints__P90612_mk(s);
+    s.callLocIdx = 583; s.pc = 27; return s.tmp_9;
   case 27:
     r0 = s.retval;
-    s.constraints___115854 = (r0);
+    s.constraints___90743 = (r0);
     r0 = s.arg0.fields["actuator"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -69741,7 +69678,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["constraints"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["constraints"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 585; s.pc = 28; return s.tmp_1; }
+     else { s.callLocIdx = 584; s.pc = 28; return s.tmp_1; }
     }
   case 28:
     r0 = s.retval;
@@ -69751,10 +69688,10 @@ switch (step) {
   case 12:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.tmp_3 = kodu_mergeConstraints__P115725_mk(s);
-    s.tmp_3.arg0 = s.constraints___115854;
+    s.tmp_3 = kodu_mergeConstraints__P90614_mk(s);
+    s.tmp_3.arg0 = s.constraints___90743;
     s.tmp_3.arg1 = s.tmp_2;
-    s.callLocIdx = 586; s.pc = 29; return s.tmp_3;
+    s.callLocIdx = 585; s.pc = 29; return s.tmp_3;
   case 29:
     r0 = s.retval;
     r0 = s.arg0.fields["sensor"];
@@ -69770,7 +69707,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["constraints"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["constraints"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 587; s.pc = 30; return s.tmp_1; }
+     else { s.callLocIdx = 586; s.pc = 30; return s.tmp_1; }
     }
   case 30:
     r0 = s.retval;
@@ -69780,25 +69717,25 @@ switch (step) {
   case 14:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.tmp_3 = kodu_mergeConstraints__P115725_mk(s);
-    s.tmp_3.arg0 = s.constraints___115854;
+    s.tmp_3 = kodu_mergeConstraints__P90614_mk(s);
+    s.tmp_3.arg0 = s.constraints___90743;
     s.tmp_3.arg1 = s.tmp_2;
-    s.callLocIdx = 588; s.pc = 31; return s.tmp_3;
+    s.callLocIdx = 587; s.pc = 31; return s.tmp_3;
   case 31:
     r0 = s.retval;
-    s.i___115873 = (0);
+    s.i___90762 = (0);
   case 15:
-    s.tmp_1 = r0 = s.i___115873;
-    r0 = pxsim_Array__length(s.existing___115819);
+    s.tmp_1 = r0 = s.i___90762;
+    r0 = pxsim_Array__length(s.existing___90708);
     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 = 16; continue; }
-    s.tmp_3 = kodu_mergeConstraints__P115725_mk(s);
-    s.tmp_3.arg0 = s.constraints___115854;
+    s.tmp_3 = kodu_mergeConstraints__P90614_mk(s);
+    s.tmp_3.arg0 = s.constraints___90743;
     s.tmp_4 = if_constraints_1_mk(s);
-    r0 = pxsim_Array__getAt(s.existing___115819, s.i___115873);
+    r0 = pxsim_Array__getAt(s.existing___90708, s.i___90762);
     s.tmp_4.arg0 = r0;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "constraints");
@@ -69806,34 +69743,34 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["constraints"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["constraints"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 589; s.pc = 33; return s.tmp_4; }
+     else { s.callLocIdx = 588; s.pc = 33; return s.tmp_4; }
     }
   case 33:
     r0 = s.retval;
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 590; s.pc = 32; return s.tmp_3;
+    s.callLocIdx = 589; s.pc = 32; return s.tmp_3;
   case 32:
     r0 = s.retval;
-    r0 = (s.i___115873 + 1);
-    s.i___115873 = (r0);
+    r0 = (s.i___90762 + 1);
+    s.i___90762 = (r0);
     { step = 15; continue; }
   case 16:
-    s.tmp_0 = kodu_Language_getCompatibleSet__P115616_mk(s);
-    s.tmp_0.arg0 = s.all___115786;
-    s.tmp_0.arg1 = s.constraints___115854;
-    s.callLocIdx = 591; s.pc = 34; return s.tmp_0;
+    s.tmp_0 = kodu_Language_getCompatibleSet__P90505_mk(s);
+    s.tmp_0.arg0 = s.all___90675;
+    s.tmp_0.arg1 = s.constraints___90743;
+    s.callLocIdx = 590; s.pc = 34; return s.tmp_0;
   case 34:
     r0 = s.retval;
   case 17:
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Language_getModifierSuggestions__P110370.info = {"start":9028,"length":1424,"line":283,"column":8,"endLine":314,"endColumn":9,"fileName":"language.ts","functionName":"getModifierSuggestions","argumentNames":["rule","index"]}
+kodu_Language_getModifierSuggestions__P85123.info = {"start":9028,"length":1424,"line":283,"column":8,"endLine":314,"endColumn":9,"fileName":"language.ts","functionName":"getModifierSuggestions","argumentNames":["rule","index"]}
 
-function kodu_Language_getModifierSuggestions__P110370_mk(s) {
+function kodu_Language_getModifierSuggestions__P85123_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Language_getModifierSuggestions__P110370, depth: s.depth + 1,
+        parent: s, fn: kodu_Language_getModifierSuggestions__P85123, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69845,12 +69782,12 @@ function kodu_Language_getModifierSuggestions__P110370_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  all___115786: undefined,
-  existing___115819: undefined,
-  i___115821: undefined,
-  last___115837: undefined,
-  constraints___115854: undefined,
-  i___115873: undefined,
+  all___90675: undefined,
+  existing___90708: undefined,
+  i___90710: undefined,
+  last___90726: undefined,
+  constraints___90743: undefined,
+  i___90762: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -69859,7 +69796,7 @@ function kodu_Language_getModifierSuggestions__P110370_mk(s) {
 
 
 
-function inline__P115796(s) {
+function inline__P90685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69874,14 +69811,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_modifiers_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "modifiers");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["modifiers"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["modifiers"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 572; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 571; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -69890,12 +69827,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115796.info = {"start":9188,"length":25,"line":285,"column":21,"endLine":285,"endColumn":46,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
+inline__P90685.info = {"start":9188,"length":25,"line":285,"column":21,"endLine":285,"endColumn":46,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
 
-function inline__P115796_mk(s) {
+function inline__P90685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115796, depth: s.depth + 1,
+        parent: s, fn: inline__P90685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69906,7 +69843,7 @@ function inline__P115796_mk(s) {
 
 
 
-function inline__P115801(s) {
+function inline__P90690(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69928,7 +69865,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["hidden"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["hidden"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 574; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 573; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -69939,12 +69876,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115801.info = {"start":9239,"length":20,"line":286,"column":24,"endLine":286,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P90690.info = {"start":9239,"length":20,"line":286,"column":24,"endLine":286,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P115801_mk(s) {
+function inline__P90690_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115801, depth: s.depth + 1,
+        parent: s, fn: inline__P90690, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69956,7 +69893,7 @@ function inline__P115801_mk(s) {
 
 
 
-function inline__P115788(s) {
+function inline__P90677(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69966,8 +69903,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.wa___115808 = undefined;
-    s.wb___115812 = undefined;
+    s.wa___90697 = undefined;
+    s.wb___90701 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -69981,7 +69918,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 576; s.pc = 5; return s.tmp_1; }
+     else { s.callLocIdx = 575; s.pc = 5; return s.tmp_1; }
     }
   case 5:
     r0 = s.retval;
@@ -69995,7 +69932,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wa___115808 = (s.tmp_2);
+    s.wa___90697 = (s.tmp_2);
     s.tmp_1 = if_weight_1_mk(s);
     s.tmp_1.arg0 = s.arg1;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -70004,7 +69941,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 577; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 576; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -70018,23 +69955,23 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wb___115812 = (s.tmp_2);
-    r0 = (s.wa___115808 - s.wb___115812);
+    s.wb___90701 = (s.tmp_2);
+    r0 = (s.wa___90697 - s.wb___90701);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115788.info = {"start":9283,"length":161,"line":287,"column":22,"endLine":291,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P90677.info = {"start":9283,"length":161,"line":287,"column":22,"endLine":291,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P115788_mk(s) {
+function inline__P90677_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115788, depth: s.depth + 1,
+        parent: s, fn: inline__P90677, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  wa___115808: undefined,
-  wb___115812: undefined,
+  wa___90697: undefined,
+  wb___90701: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -70043,7 +69980,7 @@ function inline__P115788_mk(s) {
 
 
 
-function kodu_Language_getCompatibleSet__P115616(s) {
+function kodu_Language_getCompatibleSet__P90505(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70053,50 +69990,50 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.compat___115892 = undefined;
+    s.compat___90781 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115897);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90786);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115925);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90814);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115951);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90840);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.arg1);
-    s.tmp_3 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_4 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_5 = helpers_arrayFilter__P106717_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_4 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_5 = helpers_arrayFilter__P81379_mk(s);
     s.tmp_5.arg0 = s.arg0;
     s.tmp_5.arg1 = s.tmp_0;
-    s.callLocIdx = 600; s.pc = 3; return s.tmp_5;
+    s.callLocIdx = 599; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.tmp_1;
-    s.callLocIdx = 609; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 608; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_2;
-    s.callLocIdx = 618; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 617; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
-    s.compat___115892 = (r0);
-    r0 = s.compat___115892;
+    s.compat___90781 = (r0);
+    r0 = s.compat___90781;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Language_getCompatibleSet__P115616.info = {"start":10462,"length":960,"line":316,"column":8,"endLine":334,"endColumn":9,"fileName":"language.ts","functionName":"getCompatibleSet","argumentNames":["all","c"]}
+kodu_Language_getCompatibleSet__P90505.info = {"start":10462,"length":960,"line":316,"column":8,"endLine":334,"endColumn":9,"fileName":"language.ts","functionName":"getCompatibleSet","argumentNames":["all","c"]}
 
-function kodu_Language_getCompatibleSet__P115616_mk(s) {
+function kodu_Language_getCompatibleSet__P90505_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Language_getCompatibleSet__P115616, depth: s.depth + 1,
+        parent: s, fn: kodu_Language_getCompatibleSet__P90505, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70104,7 +70041,7 @@ function kodu_Language_getCompatibleSet__P115616_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  compat___115892: undefined,
+  compat___90781: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -70113,7 +70050,7 @@ function kodu_Language_getCompatibleSet__P115616_mk(s) {
 
 
 
-function inline__P115897(s) {
+function inline__P90786(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70123,7 +70060,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.met___115906 = undefined;
+    s.met___90795 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -70136,7 +70073,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["constraints"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["constraints"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 592; s.pc = 6; return s.tmp_3; }
+     else { s.callLocIdx = 591; s.pc = 6; return s.tmp_3; }
     }
   case 6:
     r0 = s.retval;
@@ -70160,7 +70097,7 @@ switch (step) {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["constraints"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["constraints"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 593; s.pc = 8; return s.tmp_8; }
+     else { s.callLocIdx = 592; s.pc = 8; return s.tmp_8; }
     }
   case 8:
     r0 = s.retval;
@@ -70171,7 +70108,7 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["requires"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["requires"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 594; s.pc = 7; return s.tmp_7; }
+     else { s.callLocIdx = 593; s.pc = 7; return s.tmp_7; }
     }
   case 7:
     r0 = s.retval;
@@ -70187,13 +70124,13 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_pxtrt.mklocRef();
-    s.met___115906 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.met___115906, false);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P115911);
+    s.met___90795 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.met___90795, false);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P90800);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.met___115906);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.met___90795);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.caps[0]);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_2 = if_requires_1_mk(s);
     s.tmp_3 = if_constraints_1_mk(s);
     s.tmp_3.arg0 = s.arg0;
@@ -70203,7 +70140,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["constraints"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["constraints"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 595; s.pc = 11; return s.tmp_3; }
+     else { s.callLocIdx = 594; s.pc = 11; return s.tmp_3; }
     }
   case 11:
     r0 = s.retval;
@@ -70214,26 +70151,26 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["requires"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["requires"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 596; s.pc = 10; return s.tmp_2; }
+     else { s.callLocIdx = 595; s.pc = 10; return s.tmp_2; }
     }
   case 10:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 599; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 598; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.met___115906);
+    r0 = pxsim_pxtrt_ldlocRef(s.met___90795);
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115897.info = {"start":10661,"length":329,"line":319,"column":24,"endLine":325,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P90786.info = {"start":10661,"length":329,"line":319,"column":24,"endLine":325,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P115897_mk(s) {
+function inline__P90786_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115897, depth: s.depth + 1,
+        parent: s, fn: inline__P90786, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70244,7 +70181,7 @@ function inline__P115897_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  met___115906: undefined,
+  met___90795: undefined,
   arg0: undefined,
 } }
 
@@ -70252,7 +70189,7 @@ function inline__P115897_mk(s) {
 
 
 
-function inline__P115911(s) {
+function inline__P90800(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70273,10 +70210,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115919);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90808);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arraySome__P106714_mk(s);
+    s.tmp_2 = helpers_arraySome__P81376_mk(s);
     s.tmp_3 = if_provides_1_mk(s);
     s.tmp_3.arg0 = s.caps[1];
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -70285,13 +70222,13 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["provides"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["provides"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 597; s.pc = 4; return s.tmp_3; }
+     else { s.callLocIdx = 596; s.pc = 4; return s.tmp_3; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 598; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 597; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
   case 2:
@@ -70302,12 +70239,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115911.info = {"start":10883,"length":55,"line":323,"column":54,"endLine":323,"endColumn":109,"fileName":"language.ts","functionName":"inline","argumentNames":["req"]}
+inline__P90800.info = {"start":10883,"length":55,"line":323,"column":54,"endLine":323,"endColumn":109,"fileName":"language.ts","functionName":"inline","argumentNames":["req"]}
 
-function inline__P115911_mk(s) {
+function inline__P90800_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115911, depth: s.depth + 1,
+        parent: s, fn: inline__P90800, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70321,7 +70258,7 @@ function inline__P115911_mk(s) {
 
 
 
-function inline__P115919(s) {
+function inline__P90808(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70339,12 +70276,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115919.info = {"start":10919,"length":18,"line":323,"column":90,"endLine":323,"endColumn":108,"fileName":"language.ts","functionName":"inline","argumentNames":["pro"]}
+inline__P90808.info = {"start":10919,"length":18,"line":323,"column":90,"endLine":323,"endColumn":108,"fileName":"language.ts","functionName":"inline","argumentNames":["pro"]}
 
-function inline__P115919_mk(s) {
+function inline__P90808_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115919, depth: s.depth + 1,
+        parent: s, fn: inline__P90808, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -70353,7 +70290,7 @@ function inline__P115919_mk(s) {
 
 
 
-function inline__P115925(s) {
+function inline__P90814(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70367,10 +70304,10 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115929);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90818);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_2 = helpers_arraySome__P106714_mk(s);
+    s.tmp_2 = helpers_arraySome__P81376_mk(s);
     s.tmp_3 = if_categories_1_mk(s);
     s.tmp_4 = if_allow_1_mk(s);
     s.tmp_4.arg0 = s.caps[0];
@@ -70380,7 +70317,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["allow"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["allow"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 601; s.pc = 5; return s.tmp_4; }
+     else { s.callLocIdx = 600; s.pc = 5; return s.tmp_4; }
     }
   case 5:
     r0 = s.retval;
@@ -70391,13 +70328,13 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["categories"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["categories"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 602; s.pc = 4; return s.tmp_3; }
+     else { s.callLocIdx = 601; s.pc = 4; return s.tmp_3; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_0;
-    s.callLocIdx = 604; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 603; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -70406,10 +70343,10 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115945);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90834);
     s.tmp_5 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.arg0);
-    s.tmp_6 = helpers_arraySome__P106714_mk(s);
+    s.tmp_6 = helpers_arraySome__P81376_mk(s);
     s.tmp_7 = if_tiles_1_mk(s);
     s.tmp_8 = if_allow_1_mk(s);
     s.tmp_8.arg0 = s.caps[0];
@@ -70419,7 +70356,7 @@ switch (step) {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["allow"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["allow"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 605; s.pc = 8; return s.tmp_8; }
+     else { s.callLocIdx = 604; s.pc = 8; return s.tmp_8; }
     }
   case 8:
     r0 = s.retval;
@@ -70430,13 +70367,13 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["tiles"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["tiles"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 606; s.pc = 7; return s.tmp_7; }
+     else { s.callLocIdx = 605; s.pc = 7; return s.tmp_7; }
     }
   case 7:
     r0 = s.retval;
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = s.tmp_5;
-    s.callLocIdx = 608; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 607; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
   case 2:
@@ -70446,12 +70383,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115925.info = {"start":11052,"length":108,"line":327,"column":24,"endLine":327,"endColumn":132,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P90814.info = {"start":11052,"length":108,"line":327,"column":24,"endLine":327,"endColumn":132,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P115925_mk(s) {
+function inline__P90814_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115925, depth: s.depth + 1,
+        parent: s, fn: inline__P90814, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70470,7 +70407,7 @@ function inline__P115925_mk(s) {
 
 
 
-function inline__P115929(s) {
+function inline__P90818(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70493,7 +70430,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["category"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["category"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 603; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 602; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -70502,12 +70439,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115929.info = {"start":11084,"length":28,"line":327,"column":56,"endLine":327,"endColumn":84,"fileName":"language.ts","functionName":"inline","argumentNames":["cat"]}
+inline__P90818.info = {"start":11084,"length":28,"line":327,"column":56,"endLine":327,"endColumn":84,"fileName":"language.ts","functionName":"inline","argumentNames":["cat"]}
 
-function inline__P115929_mk(s) {
+function inline__P90818_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115929, depth: s.depth + 1,
+        parent: s, fn: inline__P90818, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70519,7 +70456,7 @@ function inline__P115929_mk(s) {
 
 
 
-function inline__P115945(s) {
+function inline__P90834(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70542,7 +70479,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["tid"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["tid"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 607; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 606; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -70551,12 +70488,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115945.info = {"start":11136,"length":23,"line":327,"column":108,"endLine":327,"endColumn":131,"fileName":"language.ts","functionName":"inline","argumentNames":["tid"]}
+inline__P90834.info = {"start":11136,"length":23,"line":327,"column":108,"endLine":327,"endColumn":131,"fileName":"language.ts","functionName":"inline","argumentNames":["tid"]}
 
-function inline__P115945_mk(s) {
+function inline__P90834_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115945, depth: s.depth + 1,
+        parent: s, fn: inline__P90834, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70568,7 +70505,7 @@ function inline__P115945_mk(s) {
 
 
 
-function inline__P115951(s) {
+function inline__P90840(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70582,10 +70519,10 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115956);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90845);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_4 = helpers_arraySome__P106714_mk(s);
+    s.tmp_4 = helpers_arraySome__P81376_mk(s);
     s.tmp_5 = if_categories_1_mk(s);
     s.tmp_6 = if_disallow_1_mk(s);
     s.tmp_6.arg0 = s.caps[0];
@@ -70595,7 +70532,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["disallow"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["disallow"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 610; s.pc = 5; return s.tmp_6; }
+     else { s.callLocIdx = 609; s.pc = 5; return s.tmp_6; }
     }
   case 5:
     r0 = s.retval;
@@ -70606,13 +70543,13 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["categories"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["categories"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 611; s.pc = 4; return s.tmp_5; }
+     else { s.callLocIdx = 610; s.pc = 4; return s.tmp_5; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.tmp_0;
-    s.callLocIdx = 613; s.pc = 3; return s.tmp_4;
+    s.callLocIdx = 612; s.pc = 3; return s.tmp_4;
   case 3:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -70625,10 +70562,10 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P115969);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90858);
     s.tmp_7 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_7, 0, s.arg0);
-    s.tmp_10 = helpers_arraySome__P106714_mk(s);
+    s.tmp_10 = helpers_arraySome__P81376_mk(s);
     s.tmp_11 = if_tiles_1_mk(s);
     s.tmp_12 = if_disallow_1_mk(s);
     s.tmp_12.arg0 = s.caps[0];
@@ -70638,7 +70575,7 @@ switch (step) {
       s.tmp_12.fn = s.tmp_12.arg0.vtable.iface["disallow"];
       if (s.tmp_12.fn == null) { s.retval = s.tmp_12.arg0.fields["disallow"]; }
       else if (!s.tmp_12.fn.isGetter) { s.retval = bind(s.tmp_12); }
-     else { s.callLocIdx = 614; s.pc = 8; return s.tmp_12; }
+     else { s.callLocIdx = 613; s.pc = 8; return s.tmp_12; }
     }
   case 8:
     r0 = s.retval;
@@ -70649,13 +70586,13 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["tiles"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["tiles"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 615; s.pc = 7; return s.tmp_11; }
+     else { s.callLocIdx = 614; s.pc = 7; return s.tmp_11; }
     }
   case 7:
     r0 = s.retval;
     s.tmp_10.arg0 = r0;
     s.tmp_10.arg1 = s.tmp_7;
-    s.callLocIdx = 617; s.pc = 6; return s.tmp_10;
+    s.callLocIdx = 616; s.pc = 6; return s.tmp_10;
   case 6:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -70669,12 +70606,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115951.info = {"start":11225,"length":116,"line":329,"column":24,"endLine":329,"endColumn":140,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P90840.info = {"start":11225,"length":116,"line":329,"column":24,"endLine":329,"endColumn":140,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P115951_mk(s) {
+function inline__P90840_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115951, depth: s.depth + 1,
+        parent: s, fn: inline__P90840, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70697,7 +70634,7 @@ function inline__P115951_mk(s) {
 
 
 
-function inline__P115956(s) {
+function inline__P90845(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70720,7 +70657,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["category"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["category"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 612; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 611; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -70729,12 +70666,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115956.info = {"start":11261,"length":28,"line":329,"column":60,"endLine":329,"endColumn":88,"fileName":"language.ts","functionName":"inline","argumentNames":["cat"]}
+inline__P90845.info = {"start":11261,"length":28,"line":329,"column":60,"endLine":329,"endColumn":88,"fileName":"language.ts","functionName":"inline","argumentNames":["cat"]}
 
-function inline__P115956_mk(s) {
+function inline__P90845_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115956, depth: s.depth + 1,
+        parent: s, fn: inline__P90845, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70746,7 +70683,7 @@ function inline__P115956_mk(s) {
 
 
 
-function inline__P115969(s) {
+function inline__P90858(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70769,7 +70706,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["tid"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["tid"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 616; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 615; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -70778,12 +70715,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115969.info = {"start":11317,"length":23,"line":329,"column":116,"endLine":329,"endColumn":139,"fileName":"language.ts","functionName":"inline","argumentNames":["tid"]}
+inline__P90858.info = {"start":11317,"length":23,"line":329,"column":116,"endLine":329,"endColumn":139,"fileName":"language.ts","functionName":"inline","argumentNames":["tid"]}
 
-function inline__P115969_mk(s) {
+function inline__P90858_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115969, depth: s.depth + 1,
+        parent: s, fn: inline__P90858, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70795,7 +70732,7 @@ function inline__P115969_mk(s) {
 
 
 
-function kodu_mergeConstraints__P115725(s) {
+function kodu_mergeConstraints__P90614(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70805,10 +70742,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.keys___116093 = undefined;
-    s.key___116099 = undefined;
-    s.unnamed16852___U2 = undefined;
-    s.unnamed16853___U3 = undefined;
+    s.keys___90982 = undefined;
+    s.key___90988 = undefined;
+    s.unnamed1904___U2 = undefined;
+    s.unnamed1905___U3 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -70831,17 +70768,17 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["provides"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["provides"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 619; s.pc = 24; return s.tmp_3; }
+     else { s.callLocIdx = 618; s.pc = 24; return s.tmp_3; }
     }
   case 24:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116012);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90901);
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.arg0);
-    s.tmp_5 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_5 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_6 = if_provides_1_mk(s);
     s.tmp_6.arg0 = s.arg1;
     if (!s.tmp_6.arg0.vtable.iface) {
@@ -70850,13 +70787,13 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["provides"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["provides"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 620; s.pc = 26; return s.tmp_6; }
+     else { s.callLocIdx = 619; s.pc = 26; return s.tmp_6; }
     }
   case 26:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.tmp_4;
-    s.callLocIdx = 622; s.pc = 25; return s.tmp_5;
+    s.callLocIdx = 621; s.pc = 25; return s.tmp_5;
   case 25:
     r0 = s.retval;
   case 3:
@@ -70869,17 +70806,17 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["requires"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["requires"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 623; s.pc = 27; return s.tmp_1; }
+     else { s.callLocIdx = 622; 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 = 5; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116024);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90913);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.arg0);
-    s.tmp_3 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_3 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_4 = if_requires_1_mk(s);
     s.tmp_4.arg0 = s.arg1;
     if (!s.tmp_4.arg0.vtable.iface) {
@@ -70888,13 +70825,13 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["requires"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["requires"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 624; s.pc = 29; return s.tmp_4; }
+     else { s.callLocIdx = 623; s.pc = 29; return s.tmp_4; }
     }
   case 29:
     r0 = s.retval;
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_2;
-    s.callLocIdx = 626; s.pc = 28; return s.tmp_3;
+    s.callLocIdx = 625; s.pc = 28; return s.tmp_3;
   case 28:
     r0 = s.retval;
   case 5:
@@ -70907,7 +70844,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["allow"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["allow"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 627; s.pc = 30; return s.tmp_1; }
+     else { s.callLocIdx = 626; s.pc = 30; return s.tmp_1; }
     }
   case 30:
     r0 = s.retval;
@@ -70923,7 +70860,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["allow"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["allow"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 628; s.pc = 32; return s.tmp_4; }
+     else { s.callLocIdx = 627; s.pc = 32; return s.tmp_4; }
     }
   case 32:
     r0 = s.retval;
@@ -70934,7 +70871,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["tiles"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["tiles"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 629; s.pc = 31; return s.tmp_3; }
+     else { s.callLocIdx = 628; s.pc = 31; return s.tmp_3; }
     }
   case 31:
     r0 = s.retval;
@@ -70948,13 +70885,13 @@ switch (step) {
   case 8:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116039);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90928);
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_6, 0, s.arg0);
-    s.tmp_7 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_7 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_7.arg0 = s.tmp_5;
     s.tmp_7.arg1 = s.tmp_6;
-    s.callLocIdx = 632; s.pc = 33; return s.tmp_7;
+    s.callLocIdx = 631; s.pc = 33; return s.tmp_7;
   case 33:
     r0 = s.retval;
     s.tmp_1 = if_categories_1_mk(s);
@@ -70966,7 +70903,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["allow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["allow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 633; s.pc = 35; return s.tmp_2; }
+     else { s.callLocIdx = 632; s.pc = 35; return s.tmp_2; }
     }
   case 35:
     r0 = s.retval;
@@ -70977,7 +70914,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["categories"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["categories"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 634; s.pc = 34; return s.tmp_1; }
+     else { s.callLocIdx = 633; s.pc = 34; return s.tmp_1; }
     }
   case 34:
     r0 = s.retval;
@@ -70991,13 +70928,13 @@ switch (step) {
   case 10:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116053);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90942);
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.arg0);
-    s.tmp_5 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_5 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_5.arg0 = s.tmp_3;
     s.tmp_5.arg1 = s.tmp_4;
-    s.callLocIdx = 637; s.pc = 36; return s.tmp_5;
+    s.callLocIdx = 636; s.pc = 36; return s.tmp_5;
   case 36:
     r0 = s.retval;
   case 11:
@@ -71010,7 +70947,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["disallow"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["disallow"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 638; s.pc = 37; return s.tmp_1; }
+     else { s.callLocIdx = 637; s.pc = 37; return s.tmp_1; }
     }
   case 37:
     r0 = s.retval;
@@ -71026,7 +70963,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["disallow"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["disallow"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 639; s.pc = 39; return s.tmp_4; }
+     else { s.callLocIdx = 638; s.pc = 39; return s.tmp_4; }
     }
   case 39:
     r0 = s.retval;
@@ -71037,7 +70974,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["tiles"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["tiles"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 640; s.pc = 38; return s.tmp_3; }
+     else { s.callLocIdx = 639; s.pc = 38; return s.tmp_3; }
     }
   case 38:
     r0 = s.retval;
@@ -71051,13 +70988,13 @@ switch (step) {
   case 14:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116069);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90958);
     s.tmp_6 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_6, 0, s.arg0);
-    s.tmp_7 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_7 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_7.arg0 = s.tmp_5;
     s.tmp_7.arg1 = s.tmp_6;
-    s.callLocIdx = 643; s.pc = 40; return s.tmp_7;
+    s.callLocIdx = 642; s.pc = 40; return s.tmp_7;
   case 40:
     r0 = s.retval;
     s.tmp_1 = if_categories_1_mk(s);
@@ -71069,7 +71006,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["disallow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["disallow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 644; s.pc = 42; return s.tmp_2; }
+     else { s.callLocIdx = 643; s.pc = 42; return s.tmp_2; }
     }
   case 42:
     r0 = s.retval;
@@ -71080,7 +71017,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["categories"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["categories"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 645; s.pc = 41; return s.tmp_1; }
+     else { s.callLocIdx = 644; s.pc = 41; return s.tmp_1; }
     }
   case 41:
     r0 = s.retval;
@@ -71094,13 +71031,13 @@ switch (step) {
   case 16:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116083);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P90972);
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.arg0);
-    s.tmp_5 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_5 = helpers_arrayForEach__P81378_mk(s);
     s.tmp_5.arg0 = s.tmp_3;
     s.tmp_5.arg1 = s.tmp_4;
-    s.callLocIdx = 648; s.pc = 43; return s.tmp_5;
+    s.callLocIdx = 647; s.pc = 43; return s.tmp_5;
   case 43:
     r0 = s.retval;
   case 17:
@@ -71113,7 +71050,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["handling"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["handling"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 649; s.pc = 44; return s.tmp_1; }
+     else { s.callLocIdx = 648; s.pc = 44; return s.tmp_1; }
     }
   case 44:
     r0 = s.retval;
@@ -71128,24 +71065,24 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["handling"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["handling"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 650; s.pc = 45; return s.tmp_3; }
+     else { s.callLocIdx = 649; s.pc = 45; return s.tmp_3; }
     }
   case 45:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt.keysOf(s.tmp_2);
-    s.keys___116093 = (r0);
-    s.key___116099 = (undefined);
-    s.unnamed16852___U2 = (s.keys___116093);
-    s.unnamed16853___U3 = (0);
+    s.keys___90982 = (r0);
+    s.key___90988 = (undefined);
+    s.unnamed1904___U2 = (s.keys___90982);
+    s.unnamed1905___U3 = (0);
   case 19:
-    s.tmp_0 = r0 = s.unnamed16853___U3;
-    r0 = pxsim_Array__length(s.unnamed16852___U2);
+    s.tmp_0 = r0 = s.unnamed1905___U3;
+    r0 = pxsim_Array__length(s.unnamed1904___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16852___U2, s.unnamed16853___U3);
-    s.key___116099 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed1904___U2, s.unnamed1905___U3);
+    s.key___90988 = (r0);
     s.tmp_3 = if_handling_1_mk(s);
     s.tmp_3.arg0 = s.arg0;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -71154,12 +71091,12 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["handling"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["handling"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 651; s.pc = 46; return s.tmp_3; }
+     else { s.callLocIdx = 650; s.pc = 46; return s.tmp_3; }
     }
   case 46:
     r0 = s.retval;
     s.tmp_2 = r0;
-    s.tmp_4 = r0 = s.key___116099;
+    s.tmp_4 = r0 = s.key___90988;
     s.tmp_7 = if_handling_1_mk(s);
     s.tmp_7.arg0 = s.arg1;
     if (!s.tmp_7.arg0.vtable.iface) {
@@ -71168,19 +71105,19 @@ switch (step) {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["handling"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["handling"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 652; s.pc = 47; return s.tmp_7; }
+     else { s.callLocIdx = 651; s.pc = 47; return s.tmp_7; }
     }
   case 47:
     r0 = s.retval;
     s.tmp_6 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_6, s.key___116099);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_6, s.key___90988);
     s.tmp_5 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_2, s.tmp_4, s.tmp_5);
-    r0 = (s.unnamed16853___U3 + 1);
-    s.unnamed16853___U3 = (r0);
+    r0 = (s.unnamed1905___U3 + 1);
+    s.unnamed1905___U3 = (r0);
     { step = 19; continue; }
   case 20:
-    s.unnamed16852___U2 = (undefined);
+    s.unnamed1904___U2 = (undefined);
   case 21:
   case 22:
   case 23:
@@ -71188,12 +71125,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_mergeConstraints__P115725.info = {"start":12045,"length":936,"line":363,"column":4,"endLine":385,"endColumn":5,"fileName":"language.ts","functionName":"mergeConstraints","argumentNames":["dst","src"]}
+kodu_mergeConstraints__P90614.info = {"start":12045,"length":936,"line":363,"column":4,"endLine":385,"endColumn":5,"fileName":"language.ts","functionName":"mergeConstraints","argumentNames":["dst","src"]}
 
-function kodu_mergeConstraints__P115725_mk(s) {
+function kodu_mergeConstraints__P90614_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_mergeConstraints__P115725, depth: s.depth + 1,
+        parent: s, fn: kodu_mergeConstraints__P90614, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71203,10 +71140,10 @@ function kodu_mergeConstraints__P115725_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  keys___116093: undefined,
-  key___116099: undefined,
-  unnamed16852___U2: undefined,
-  unnamed16853___U3: undefined,
+  keys___90982: undefined,
+  key___90988: undefined,
+  unnamed1904___U2: undefined,
+  unnamed1905___U3: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -71215,7 +71152,7 @@ function kodu_mergeConstraints__P115725_mk(s) {
 
 
 
-function inline__P116012(s) {
+function inline__P90901(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71237,7 +71174,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["provides"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["provides"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 621; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 620; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -71247,12 +71184,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116012.info = {"start":12201,"length":31,"line":366,"column":33,"endLine":366,"endColumn":64,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
+inline__P90901.info = {"start":12201,"length":31,"line":366,"column":33,"endLine":366,"endColumn":64,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P116012_mk(s) {
+function inline__P90901_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116012, depth: s.depth + 1,
+        parent: s, fn: inline__P90901, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71263,7 +71200,7 @@ function inline__P116012_mk(s) {
 
 
 
-function inline__P116024(s) {
+function inline__P90913(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71285,7 +71222,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["requires"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["requires"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 625; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 624; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -71295,12 +71232,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116024.info = {"start":12306,"length":31,"line":369,"column":33,"endLine":369,"endColumn":64,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
+inline__P90913.info = {"start":12306,"length":31,"line":369,"column":33,"endLine":369,"endColumn":64,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P116024_mk(s) {
+function inline__P90913_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116024, depth: s.depth + 1,
+        parent: s, fn: inline__P90913, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71311,7 +71248,7 @@ function inline__P116024_mk(s) {
 
 
 
-function inline__P116039(s) {
+function inline__P90928(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71334,7 +71271,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["allow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["allow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 630; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 629; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -71345,7 +71282,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["tiles"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["tiles"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 631; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 630; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -71355,12 +71292,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116039.info = {"start":12419,"length":34,"line":372,"column":44,"endLine":372,"endColumn":78,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
+inline__P90928.info = {"start":12419,"length":34,"line":372,"column":44,"endLine":372,"endColumn":78,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P116039_mk(s) {
+function inline__P90928_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116039, depth: s.depth + 1,
+        parent: s, fn: inline__P90928, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71372,7 +71309,7 @@ function inline__P116039_mk(s) {
 
 
 
-function inline__P116053(s) {
+function inline__P90942(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71395,7 +71332,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["allow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["allow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 635; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 634; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -71406,7 +71343,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["categories"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["categories"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 636; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 635; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -71416,12 +71353,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116053.info = {"start":12505,"length":39,"line":373,"column":49,"endLine":373,"endColumn":88,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
+inline__P90942.info = {"start":12505,"length":39,"line":373,"column":49,"endLine":373,"endColumn":88,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P116053_mk(s) {
+function inline__P90942_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116053, depth: s.depth + 1,
+        parent: s, fn: inline__P90942, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71433,7 +71370,7 @@ function inline__P116053_mk(s) {
 
 
 
-function inline__P116069(s) {
+function inline__P90958(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71456,7 +71393,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["disallow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["disallow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 641; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 640; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -71467,7 +71404,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["tiles"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["tiles"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 642; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 641; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -71477,12 +71414,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116069.info = {"start":12632,"length":37,"line":376,"column":47,"endLine":376,"endColumn":84,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
+inline__P90958.info = {"start":12632,"length":37,"line":376,"column":47,"endLine":376,"endColumn":84,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P116069_mk(s) {
+function inline__P90958_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116069, depth: s.depth + 1,
+        parent: s, fn: inline__P90958, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71494,7 +71431,7 @@ function inline__P116069_mk(s) {
 
 
 
-function inline__P116083(s) {
+function inline__P90972(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71517,7 +71454,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["disallow"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["disallow"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 646; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 645; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -71528,7 +71465,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["categories"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["categories"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 647; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 646; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -71538,12 +71475,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116083.info = {"start":12724,"length":42,"line":377,"column":52,"endLine":377,"endColumn":94,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
+inline__P90972.info = {"start":12724,"length":42,"line":377,"column":52,"endLine":377,"endColumn":94,"fileName":"language.ts","functionName":"inline","argumentNames":["item"]}
 
-function inline__P116083_mk(s) {
+function inline__P90972_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116083, depth: s.depth + 1,
+        parent: s, fn: inline__P90972, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71555,7 +71492,7 @@ function inline__P116083_mk(s) {
 
 
 
-function kodu_mkConstraints__P115723(s) {
+function kodu_mkConstraints__P90612(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71565,7 +71502,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.c___115994 = undefined;
+    s.c___90883 = undefined;
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_Array__mk();
@@ -71595,17 +71532,17 @@ switch (step) {
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_9 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "handling", s.tmp_9);
-    s.c___115994 = (s.tmp_0);
-    r0 = s.c___115994;
+    s.c___90883 = (s.tmp_0);
+    r0 = s.c___90883;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_mkConstraints__P115723.info = {"start":11663,"length":376,"line":346,"column":4,"endLine":361,"endColumn":5,"fileName":"language.ts","functionName":"mkConstraints","argumentNames":[]}
+kodu_mkConstraints__P90612.info = {"start":11663,"length":376,"line":346,"column":4,"endLine":361,"endColumn":5,"fileName":"language.ts","functionName":"mkConstraints","argumentNames":[]}
 
-function kodu_mkConstraints__P115723_mk(s) {
+function kodu_mkConstraints__P90612_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_mkConstraints__P115723, depth: s.depth + 1,
+        parent: s, fn: kodu_mkConstraints__P90612, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71617,14 +71554,14 @@ function kodu_mkConstraints__P115723_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  c___115994: undefined,
+  c___90883: undefined,
 } }
 
 
 
 
 
-function kodu_RuleUI_createActuatorBtn__P509791(s) {
+function kodu_RuleUI_createActuatorBtn__P94764(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71634,17 +71571,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.defn___510967 = undefined;
-    s.button___510973 = undefined;
+    s.defn___95940 = undefined;
+    s.button___95946 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     s.tmp_1 = if_actuators_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "actuators");
     } else {
@@ -71657,21 +71594,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, s.arg1);
-    s.defn___510967 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.defn___510967);
+    s.defn___95940 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.defn___95940);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510982);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95955);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     r0 = s.arg0.fields["stage"];
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = "beige";
     s.tmp_3 = if_tid_1_mk(s);
-    s.tmp_3.arg0 = s.defn___510967;
+    s.tmp_3.arg0 = s.defn___95940;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "tid");
     } else {
@@ -71684,7 +71621,7 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
     s.tmp_4 = if_name_1_mk(s);
-    s.tmp_4.arg0 = s.defn___510967;
+    s.tmp_4.arg0 = s.defn___95940;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "name");
     } else {
@@ -71703,21 +71640,21 @@ switch (step) {
     s.callLocIdx = 1516; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.button___510973 = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
-    s.tmp_0.arg0 = s.button___510973;
+    s.button___95946 = (s.tmp_0);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
+    s.tmp_0.arg0 = s.button___95946;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1517; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
-    s.tmp_1.arg0 = s.button___510973;
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
+    s.tmp_1.arg0 = s.button___95946;
     s.callLocIdx = 1518; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___510967);
-    r0 = s.button___510973;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___95940);
+    r0 = s.button___95946;
     { step = 3; continue; }
   case 1:
   case 2:
@@ -71726,20 +71663,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_createActuatorBtn__P509791.info = {"start":18500,"length":535,"line":504,"column":8,"endLine":519,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createActuatorBtn","argumentNames":["this","id"]}
+kodu_RuleUI_createActuatorBtn__P94764.info = {"start":18500,"length":535,"line":504,"column":8,"endLine":519,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createActuatorBtn","argumentNames":["this","id"]}
 
-function kodu_RuleUI_createActuatorBtn__P509791_mk(s) {
+function kodu_RuleUI_createActuatorBtn__P94764_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_createActuatorBtn__P509791, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_createActuatorBtn__P94764, 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,
-  defn___510967: undefined,
-  button___510973: undefined,
+  defn___95940: undefined,
+  button___95946: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -71748,7 +71685,7 @@ function kodu_RuleUI_createActuatorBtn__P509791_mk(s) {
 
 
 
-function inline__P510982(s) {
+function inline__P95955(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71762,7 +71699,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_handleActuatorClick__P509784_mk(s);
+    s.tmp_0 = kodu_RuleUI_handleActuatorClick__P94757_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 1515; s.pc = 1; return s.tmp_0;
@@ -71772,12 +71709,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510982.info = {"start":18828,"length":44,"line":513,"column":20,"endLine":513,"endColumn":64,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P95955.info = {"start":18828,"length":44,"line":513,"column":20,"endLine":513,"endColumn":64,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P510982_mk(s) {
+function inline__P95955_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510982, depth: s.depth + 1,
+        parent: s, fn: inline__P95955, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -71787,7 +71724,7 @@ function inline__P510982_mk(s) {
 
 
 
-function kodu_RuleUI_handleActuatorClick__P509784(s) {
+function kodu_RuleUI_handleActuatorClick__P94757(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71797,39 +71734,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.suggestions___510482 = undefined;
-    s.items___510487 = undefined;
+    s.suggestions___95455 = undefined;
+    s.items___95460 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Language_getActuatorSuggestions__P110369_mk(s);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Language_getActuatorSuggestions__P85122_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1409; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.suggestions___510482 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510482;
-    s.tmp_0.arg1 = inline__P510489;
+    s.suggestions___95455 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95455;
+    s.tmp_0.arg1 = inline__P95462;
     s.callLocIdx = 1412; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.items___510487 = (r0);
+    s.items___95460 = (r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "icon", "delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "label", "Delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "style", "danger");
-    r0 = pxsim_Array__push(s.items___510487, s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510510);
+    r0 = pxsim_Array__push(s.items___95460, s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95483);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -71838,7 +71775,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510487;
+    s.tmp_1.arg3 = s.items___95460;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1421; s.pc = 3; return s.tmp_1;
@@ -71848,18 +71785,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_handleActuatorClick__P509784.info = {"start":10117,"length":1043,"line":298,"column":8,"endLine":323,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleActuatorClick","argumentNames":["this","button"]}
+kodu_RuleUI_handleActuatorClick__P94757.info = {"start":10117,"length":1043,"line":298,"column":8,"endLine":323,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleActuatorClick","argumentNames":["this","button"]}
 
-function kodu_RuleUI_handleActuatorClick__P509784_mk(s) {
+function kodu_RuleUI_handleActuatorClick__P94757_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_handleActuatorClick__P509784, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_handleActuatorClick__P94757, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  suggestions___510482: undefined,
-  items___510487: undefined,
+  suggestions___95455: undefined,
+  items___95460: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -71868,7 +71805,7 @@ function kodu_RuleUI_handleActuatorClick__P509784_mk(s) {
 
 
 
-function inline__P510489(s) {
+function inline__P95462(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71916,12 +71853,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510489.info = {"start":10273,"length":154,"line":300,"column":42,"endLine":305,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95462.info = {"start":10273,"length":154,"line":300,"column":42,"endLine":305,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510489_mk(s) {
+function inline__P95462_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510489, depth: s.depth + 1,
+        parent: s, fn: inline__P95462, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71935,7 +71872,7 @@ function inline__P510489_mk(s) {
 
 
 
-function inline__P510510(s) {
+function inline__P95483(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71973,7 +71910,7 @@ switch (step) {
     r0 = s.caps[0].fields["defn"];
     s.tmp_0 = r0;
     s.tmp_3 = if_actuators_1_mk(s);
-    s.tmp_3.arg0 = globals.tiles___110373;
+    s.tmp_3.arg0 = globals.tiles___85126;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "actuators");
     } else {
@@ -71991,20 +71928,20 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["actuator"] = (s.tmp_1);
   case 2:
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1418; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1419; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1420; s.pc = 8; return s.tmp_0;
@@ -72016,12 +71953,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510510.info = {"start":10641,"length":507,"line":311,"column":73,"endLine":322,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95483.info = {"start":10641,"length":507,"line":311,"column":73,"endLine":322,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510510_mk(s) {
+function inline__P95483_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510510, depth: s.depth + 1,
+        parent: s, fn: inline__P95483, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -72037,7 +71974,7 @@ function inline__P510510_mk(s) {
 
 
 
-function kodu_Language_getActuatorSuggestions__P110369(s) {
+function kodu_Language_getActuatorSuggestions__P85122(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72047,61 +71984,61 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.actuators___115751 = undefined;
+    s.actuators___90640 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_arraySort__P106712_mk(s);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_0 = helpers_arraySort__P81374_mk(s);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     s.tmp_4 = if_actuators_1_mk(s);
-    s.tmp_4.arg0 = globals.tiles___110373;
+    s.tmp_4.arg0 = globals.tiles___85126;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "actuators");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["actuators"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["actuators"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 563; s.pc = 4; return s.tmp_4; }
+     else { s.callLocIdx = 562; s.pc = 4; return s.tmp_4; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.keysOf(s.tmp_3);
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115759;
-    s.callLocIdx = 565; s.pc = 3; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90648;
+    s.callLocIdx = 564; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P115764;
-    s.callLocIdx = 567; s.pc = 2; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P90653;
+    s.callLocIdx = 566; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P115769;
-    s.callLocIdx = 570; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P90658;
+    s.callLocIdx = 569; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.actuators___115751 = (r0);
-    r0 = s.actuators___115751;
+    s.actuators___90640 = (r0);
+    r0 = s.actuators___90640;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Language_getActuatorSuggestions__P110369.info = {"start":8571,"length":447,"line":271,"column":8,"endLine":281,"endColumn":9,"fileName":"language.ts","functionName":"getActuatorSuggestions","argumentNames":["rule"]}
+kodu_Language_getActuatorSuggestions__P85122.info = {"start":8571,"length":447,"line":271,"column":8,"endLine":281,"endColumn":9,"fileName":"language.ts","functionName":"getActuatorSuggestions","argumentNames":["rule"]}
 
-function kodu_Language_getActuatorSuggestions__P110369_mk(s) {
+function kodu_Language_getActuatorSuggestions__P85122_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Language_getActuatorSuggestions__P110369, depth: s.depth + 1,
+        parent: s, fn: kodu_Language_getActuatorSuggestions__P85122, 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,
-  actuators___115751: undefined,
+  actuators___90640: undefined,
   arg0: undefined,
 } }
 
@@ -72109,7 +72046,7 @@ function kodu_Language_getActuatorSuggestions__P110369_mk(s) {
 
 
 
-function inline__P115759(s) {
+function inline__P90648(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72124,14 +72061,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_actuators_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "actuators");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["actuators"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["actuators"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 564; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 563; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -72140,12 +72077,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115759.info = {"start":8720,"length":25,"line":273,"column":21,"endLine":273,"endColumn":46,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
+inline__P90648.info = {"start":8720,"length":25,"line":273,"column":21,"endLine":273,"endColumn":46,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
 
-function inline__P115759_mk(s) {
+function inline__P90648_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115759, depth: s.depth + 1,
+        parent: s, fn: inline__P90648, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -72156,7 +72093,7 @@ function inline__P115759_mk(s) {
 
 
 
-function inline__P115764(s) {
+function inline__P90653(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72178,7 +72115,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["hidden"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["hidden"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 566; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 565; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -72189,12 +72126,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115764.info = {"start":8771,"length":20,"line":274,"column":24,"endLine":274,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P90653.info = {"start":8771,"length":20,"line":274,"column":24,"endLine":274,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P115764_mk(s) {
+function inline__P90653_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115764, depth: s.depth + 1,
+        parent: s, fn: inline__P90653, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -72206,7 +72143,7 @@ function inline__P115764_mk(s) {
 
 
 
-function inline__P115769(s) {
+function inline__P90658(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72216,8 +72153,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.wa___115772 = undefined;
-    s.wb___115776 = undefined;
+    s.wa___90661 = undefined;
+    s.wb___90665 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -72231,7 +72168,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 568; s.pc = 5; return s.tmp_1; }
+     else { s.callLocIdx = 567; s.pc = 5; return s.tmp_1; }
     }
   case 5:
     r0 = s.retval;
@@ -72245,7 +72182,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wa___115772 = (s.tmp_2);
+    s.wa___90661 = (s.tmp_2);
     s.tmp_1 = if_weight_1_mk(s);
     s.tmp_1.arg0 = s.arg1;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -72254,7 +72191,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 569; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 568; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -72268,23 +72205,23 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wb___115776 = (s.tmp_2);
-    r0 = (s.wa___115772 - s.wb___115776);
+    s.wb___90665 = (s.tmp_2);
+    r0 = (s.wa___90661 - s.wb___90665);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115769.info = {"start":8815,"length":161,"line":275,"column":22,"endLine":279,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P90658.info = {"start":8815,"length":161,"line":275,"column":22,"endLine":279,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P115769_mk(s) {
+function inline__P90658_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115769, depth: s.depth + 1,
+        parent: s, fn: inline__P90658, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  wa___115772: undefined,
-  wb___115776: undefined,
+  wa___90661: undefined,
+  wb___90665: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -72293,7 +72230,7 @@ function inline__P115769_mk(s) {
 
 
 
-function kodu_RuleUI_createFilterBtn__P509792(s) {
+function kodu_RuleUI_createFilterBtn__P94765(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72303,8 +72240,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.defn___510997 = undefined;
-    s.button___511003 = undefined;
+    s.defn___95970 = undefined;
+    s.button___95976 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -72312,9 +72249,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     s.tmp_1 = if_filters_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "filters");
     } else {
@@ -72327,21 +72264,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, s.arg1);
-    s.defn___510997 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.defn___510997);
+    s.defn___95970 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.defn___95970);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511012);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95985);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     r0 = s.arg0.fields["stage"];
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = "beige";
     s.tmp_3 = if_tid_1_mk(s);
-    s.tmp_3.arg0 = s.defn___510997;
+    s.tmp_3.arg0 = s.defn___95970;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "tid");
     } else {
@@ -72354,7 +72291,7 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
     s.tmp_4 = if_name_1_mk(s);
-    s.tmp_4.arg0 = s.defn___510997;
+    s.tmp_4.arg0 = s.defn___95970;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "name");
     } else {
@@ -72373,28 +72310,28 @@ switch (step) {
     s.callLocIdx = 1523; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.button___511003 = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
-    s.tmp_0.arg0 = s.button___511003;
+    s.button___95976 = (s.tmp_0);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
+    s.tmp_0.arg0 = s.button___95976;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1524; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
-    s.tmp_1.arg0 = s.button___511003;
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
+    s.tmp_1.arg0 = s.button___95976;
     s.callLocIdx = 1525; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___510997);
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
-    s.tmp_1.arg0 = s.button___511003;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___95970);
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
+    s.tmp_1.arg0 = s.button___95976;
     s.callLocIdx = 1526; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "index", s.arg2);
-    r0 = s.button___511003;
+    r0 = s.button___95976;
     { step = 3; continue; }
   case 1:
   case 2:
@@ -72403,20 +72340,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_createFilterBtn__P509792.info = {"start":19045,"length":590,"line":521,"column":8,"endLine":537,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createFilterBtn","argumentNames":["this","id","index"]}
+kodu_RuleUI_createFilterBtn__P94765.info = {"start":19045,"length":590,"line":521,"column":8,"endLine":537,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createFilterBtn","argumentNames":["this","id","index"]}
 
-function kodu_RuleUI_createFilterBtn__P509792_mk(s) {
+function kodu_RuleUI_createFilterBtn__P94765_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_createFilterBtn__P509792, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_createFilterBtn__P94765, 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,
-  defn___510997: undefined,
-  button___511003: undefined,
+  defn___95970: undefined,
+  button___95976: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -72426,7 +72363,7 @@ function kodu_RuleUI_createFilterBtn__P509792_mk(s) {
 
 
 
-function inline__P511012(s) {
+function inline__P95985(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72440,7 +72377,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_handleFilterClick__P509785_mk(s);
+    s.tmp_0 = kodu_RuleUI_handleFilterClick__P94758_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 1522; s.pc = 1; return s.tmp_0;
@@ -72450,12 +72387,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511012.info = {"start":19384,"length":42,"line":530,"column":20,"endLine":530,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P95985.info = {"start":19384,"length":42,"line":530,"column":20,"endLine":530,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P511012_mk(s) {
+function inline__P95985_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511012, depth: s.depth + 1,
+        parent: s, fn: inline__P95985, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -72465,7 +72402,7 @@ function inline__P511012_mk(s) {
 
 
 
-function kodu_RuleUI_handleFilterClick__P509785(s) {
+function kodu_RuleUI_handleFilterClick__P94758(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72475,50 +72412,50 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___510543 = undefined;
-    s.suggestions___510547 = undefined;
-    s.items___510553 = undefined;
+    s.index___95516 = undefined;
+    s.suggestions___95520 = undefined;
+    s.items___95526 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.callLocIdx = 1422; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, "index");
-    s.index___510543 = (r0);
-    s.tmp_0 = kodu_Language_getFilterSuggestions__P110368_mk(s);
+    s.index___95516 = (r0);
+    s.tmp_0 = kodu_Language_getFilterSuggestions__P85121_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___510543;
+    s.tmp_0.arg1 = s.index___95516;
     s.callLocIdx = 1423; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.suggestions___510547 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510547;
-    s.tmp_0.arg1 = inline__P510555;
+    s.suggestions___95520 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95520;
+    s.tmp_0.arg1 = inline__P95528;
     s.callLocIdx = 1426; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.items___510553 = (r0);
+    s.items___95526 = (r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "icon", "delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "label", "Delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "style", "danger");
-    r0 = pxsim_Array__push(s.items___510553, s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P510576);
+    r0 = pxsim_Array__push(s.items___95526, s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P95549);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.index___510543);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.index___95516);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -72527,7 +72464,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510553;
+    s.tmp_1.arg3 = s.items___95526;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1436; s.pc = 4; return s.tmp_1;
@@ -72537,19 +72474,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_handleFilterClick__P509785.info = {"start":11170,"length":1127,"line":325,"column":8,"endLine":351,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleFilterClick","argumentNames":["this","button"]}
+kodu_RuleUI_handleFilterClick__P94758.info = {"start":11170,"length":1127,"line":325,"column":8,"endLine":351,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleFilterClick","argumentNames":["this","button"]}
 
-function kodu_RuleUI_handleFilterClick__P509785_mk(s) {
+function kodu_RuleUI_handleFilterClick__P94758_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_handleFilterClick__P509785, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_handleFilterClick__P94758, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  index___510543: undefined,
-  suggestions___510547: undefined,
-  items___510553: undefined,
+  index___95516: undefined,
+  suggestions___95520: undefined,
+  items___95526: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -72558,7 +72495,7 @@ function kodu_RuleUI_handleFilterClick__P509785_mk(s) {
 
 
 
-function inline__P510555(s) {
+function inline__P95528(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72606,12 +72543,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510555.info = {"start":11385,"length":154,"line":328,"column":42,"endLine":333,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95528.info = {"start":11385,"length":154,"line":328,"column":42,"endLine":333,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510555_mk(s) {
+function inline__P95528_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510555, depth: s.depth + 1,
+        parent: s, fn: inline__P95528, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -72625,7 +72562,7 @@ function inline__P510555_mk(s) {
 
 
 
-function inline__P510576(s) {
+function inline__P95549(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72668,7 +72605,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 1; continue; }
-    s.tmp_7 = helpers_arraySplice__P106707_mk(s);
+    s.tmp_7 = helpers_arraySplice__P81369_mk(s);
     r0 = s.caps[0].fields["defn"];
     r0 = r0.fields["filters"];
     s.tmp_7.arg0 = r0;
@@ -72684,7 +72621,7 @@ switch (step) {
     s.tmp_0 = r0;
     s.tmp_1 = r0 = s.caps[1];
     s.tmp_4 = if_filters_1_mk(s);
-    s.tmp_4.arg0 = globals.tiles___110373;
+    s.tmp_4.arg0 = globals.tiles___85126;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "filters");
     } else {
@@ -72702,20 +72639,20 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_0, s.tmp_1, s.tmp_2);
   case 2:
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1433; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1434; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1435; s.pc = 10; return s.tmp_0;
@@ -72727,12 +72664,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510576.info = {"start":11753,"length":532,"line":339,"column":73,"endLine":350,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95549.info = {"start":11753,"length":532,"line":339,"column":73,"endLine":350,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510576_mk(s) {
+function inline__P95549_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510576, depth: s.depth + 1,
+        parent: s, fn: inline__P95549, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -72749,7 +72686,7 @@ function inline__P510576_mk(s) {
 
 
 
-function kodu_Language_getFilterSuggestions__P110368(s) {
+function kodu_Language_getFilterSuggestions__P85121(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -72759,88 +72696,88 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.all___115653 = undefined;
-    s.existing___115685 = undefined;
-    s.i___115687 = undefined;
-    s.last___115703 = undefined;
-    s.constraints___115720 = undefined;
-    s.i___115733 = undefined;
+    s.all___90542 = undefined;
+    s.existing___90574 = undefined;
+    s.i___90576 = undefined;
+    s.last___90592 = undefined;
+    s.constraints___90609 = undefined;
+    s.i___90622 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_arraySort__P106712_mk(s);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_0 = helpers_arraySort__P81374_mk(s);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     s.tmp_4 = if_filters_1_mk(s);
-    s.tmp_4.arg0 = globals.tiles___110373;
+    s.tmp_4.arg0 = globals.tiles___85126;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "filters");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["filters"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["filters"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 544; s.pc = 19; return s.tmp_4; }
+     else { s.callLocIdx = 543; s.pc = 19; return s.tmp_4; }
     }
   case 19:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.keysOf(s.tmp_3);
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115661;
-    s.callLocIdx = 546; s.pc = 18; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90550;
+    s.callLocIdx = 545; s.pc = 18; return s.tmp_2;
   case 18:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P115666;
-    s.callLocIdx = 548; s.pc = 17; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P90555;
+    s.callLocIdx = 547; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P115671;
-    s.callLocIdx = 551; s.pc = 16; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P90560;
+    s.callLocIdx = 550; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.all___115653 = (r0);
+    s.all___90542 = (r0);
     r0 = pxsim_Array__mk();
-    s.existing___115685 = (r0);
-    s.i___115687 = (0);
+    s.existing___90574 = (r0);
+    s.i___90576 = (0);
   case 1:
-    r0 = (s.i___115687 < s.arg1);
+    r0 = (s.i___90576 < s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.existing___115685;
+    s.tmp_1 = r0 = s.existing___90574;
     r0 = s.arg0.fields["filters"];
     s.tmp_3 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_3, s.i___115687);
+    r0 = pxsim_Array__getAt(s.tmp_3, s.i___90576);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___115687 + 1);
-    s.i___115687 = (r0);
+    r0 = (s.i___90576 + 1);
+    s.i___90576 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = pxsim_Array__length(s.existing___115685);
+    r0 = pxsim_Array__length(s.existing___90574);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_1 = r0 = s.existing___115685;
-    r0 = pxsim_Array__length(s.existing___115685);
+    s.tmp_1 = r0 = s.existing___90574;
+    r0 = pxsim_Array__length(s.existing___90574);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
-    s.last___115703 = (r0);
+    s.last___90592 = (r0);
     s.tmp_1 = if_constraints_1_mk(s);
-    s.tmp_1.arg0 = s.last___115703;
+    s.tmp_1.arg0 = s.last___90592;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "constraints");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["constraints"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["constraints"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 552; s.pc = 20; return s.tmp_1; }
+     else { s.callLocIdx = 551; s.pc = 20; return s.tmp_1; }
     }
   case 20:
     r0 = s.retval;
@@ -72852,14 +72789,14 @@ switch (step) {
   case 3:
     s.tmp_2 = if_handling_1_mk(s);
     s.tmp_3 = if_constraints_1_mk(s);
-    s.tmp_3.arg0 = s.last___115703;
+    s.tmp_3.arg0 = s.last___90592;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "constraints");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["constraints"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["constraints"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 553; s.pc = 22; return s.tmp_3; }
+     else { s.callLocIdx = 552; s.pc = 22; return s.tmp_3; }
     }
   case 22:
     r0 = s.retval;
@@ -72870,7 +72807,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["handling"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["handling"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 554; s.pc = 21; return s.tmp_2; }
+     else { s.callLocIdx = 553; s.pc = 21; return s.tmp_2; }
     }
   case 21:
     r0 = s.retval;
@@ -72884,14 +72821,14 @@ switch (step) {
   case 5:
     s.tmp_6 = if_handling_1_mk(s);
     s.tmp_7 = if_constraints_1_mk(s);
-    s.tmp_7.arg0 = s.last___115703;
+    s.tmp_7.arg0 = s.last___90592;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "constraints");
     } else {
       s.tmp_7.fn = s.tmp_7.arg0.vtable.iface["constraints"];
       if (s.tmp_7.fn == null) { s.retval = s.tmp_7.arg0.fields["constraints"]; }
       else if (!s.tmp_7.fn.isGetter) { s.retval = bind(s.tmp_7); }
-     else { s.callLocIdx = 555; s.pc = 24; return s.tmp_7; }
+     else { s.callLocIdx = 554; s.pc = 24; return s.tmp_7; }
     }
   case 24:
     r0 = s.retval;
@@ -72902,7 +72839,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["handling"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["handling"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 556; s.pc = 23; return s.tmp_6; }
+     else { s.callLocIdx = 555; s.pc = 23; return s.tmp_6; }
     }
   case 23:
     r0 = s.retval;
@@ -72919,11 +72856,11 @@ switch (step) {
   case 8:
   case 9:
   case 10:
-    s.tmp_9 = kodu_mkConstraints__P115723_mk(s);
-    s.callLocIdx = 557; s.pc = 25; return s.tmp_9;
+    s.tmp_9 = kodu_mkConstraints__P90612_mk(s);
+    s.callLocIdx = 556; s.pc = 25; return s.tmp_9;
   case 25:
     r0 = s.retval;
-    s.constraints___115720 = (r0);
+    s.constraints___90609 = (r0);
     r0 = s.arg0.fields["sensor"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -72937,7 +72874,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["constraints"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["constraints"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 558; s.pc = 26; return s.tmp_1; }
+     else { s.callLocIdx = 557; s.pc = 26; return s.tmp_1; }
     }
   case 26:
     r0 = s.retval;
@@ -72947,25 +72884,25 @@ switch (step) {
   case 12:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.tmp_3 = kodu_mergeConstraints__P115725_mk(s);
-    s.tmp_3.arg0 = s.constraints___115720;
+    s.tmp_3 = kodu_mergeConstraints__P90614_mk(s);
+    s.tmp_3.arg0 = s.constraints___90609;
     s.tmp_3.arg1 = s.tmp_2;
-    s.callLocIdx = 559; s.pc = 27; return s.tmp_3;
+    s.callLocIdx = 558; s.pc = 27; return s.tmp_3;
   case 27:
     r0 = s.retval;
-    s.i___115733 = (0);
+    s.i___90622 = (0);
   case 13:
-    s.tmp_1 = r0 = s.i___115733;
-    r0 = pxsim_Array__length(s.existing___115685);
+    s.tmp_1 = r0 = s.i___90622;
+    r0 = pxsim_Array__length(s.existing___90574);
     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 = kodu_mergeConstraints__P115725_mk(s);
-    s.tmp_3.arg0 = s.constraints___115720;
+    s.tmp_3 = kodu_mergeConstraints__P90614_mk(s);
+    s.tmp_3.arg0 = s.constraints___90609;
     s.tmp_4 = if_constraints_1_mk(s);
-    r0 = pxsim_Array__getAt(s.existing___115685, s.i___115733);
+    r0 = pxsim_Array__getAt(s.existing___90574, s.i___90622);
     s.tmp_4.arg0 = r0;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "constraints");
@@ -72973,34 +72910,34 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["constraints"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["constraints"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 560; s.pc = 29; return s.tmp_4; }
+     else { s.callLocIdx = 559; s.pc = 29; return s.tmp_4; }
     }
   case 29:
     r0 = s.retval;
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 561; s.pc = 28; return s.tmp_3;
+    s.callLocIdx = 560; s.pc = 28; return s.tmp_3;
   case 28:
     r0 = s.retval;
-    r0 = (s.i___115733 + 1);
-    s.i___115733 = (r0);
+    r0 = (s.i___90622 + 1);
+    s.i___90622 = (r0);
     { step = 13; continue; }
   case 14:
-    s.tmp_0 = kodu_Language_getCompatibleSet__P115616_mk(s);
-    s.tmp_0.arg0 = s.all___115653;
-    s.tmp_0.arg1 = s.constraints___115720;
-    s.callLocIdx = 562; s.pc = 30; return s.tmp_0;
+    s.tmp_0 = kodu_Language_getCompatibleSet__P90505_mk(s);
+    s.tmp_0.arg0 = s.all___90542;
+    s.tmp_0.arg1 = s.constraints___90609;
+    s.callLocIdx = 561; s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
   case 15:
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Language_getFilterSuggestions__P110368.info = {"start":7242,"length":1319,"line":239,"column":8,"endLine":269,"endColumn":9,"fileName":"language.ts","functionName":"getFilterSuggestions","argumentNames":["rule","index"]}
+kodu_Language_getFilterSuggestions__P85121.info = {"start":7242,"length":1319,"line":239,"column":8,"endLine":269,"endColumn":9,"fileName":"language.ts","functionName":"getFilterSuggestions","argumentNames":["rule","index"]}
 
-function kodu_Language_getFilterSuggestions__P110368_mk(s) {
+function kodu_Language_getFilterSuggestions__P85121_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Language_getFilterSuggestions__P110368, depth: s.depth + 1,
+        parent: s, fn: kodu_Language_getFilterSuggestions__P85121, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73012,12 +72949,12 @@ function kodu_Language_getFilterSuggestions__P110368_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  all___115653: undefined,
-  existing___115685: undefined,
-  i___115687: undefined,
-  last___115703: undefined,
-  constraints___115720: undefined,
-  i___115733: undefined,
+  all___90542: undefined,
+  existing___90574: undefined,
+  i___90576: undefined,
+  last___90592: undefined,
+  constraints___90609: undefined,
+  i___90622: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -73026,7 +72963,7 @@ function kodu_Language_getFilterSuggestions__P110368_mk(s) {
 
 
 
-function inline__P115661(s) {
+function inline__P90550(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73041,14 +72978,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_filters_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "filters");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["filters"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["filters"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 545; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 544; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -73057,12 +72994,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115661.info = {"start":7394,"length":23,"line":241,"column":21,"endLine":241,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
+inline__P90550.info = {"start":7394,"length":23,"line":241,"column":21,"endLine":241,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
 
-function inline__P115661_mk(s) {
+function inline__P90550_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115661, depth: s.depth + 1,
+        parent: s, fn: inline__P90550, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73073,7 +73010,7 @@ function inline__P115661_mk(s) {
 
 
 
-function inline__P115666(s) {
+function inline__P90555(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73095,7 +73032,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["hidden"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["hidden"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 547; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 546; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -73106,12 +73043,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115666.info = {"start":7443,"length":20,"line":242,"column":24,"endLine":242,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P90555.info = {"start":7443,"length":20,"line":242,"column":24,"endLine":242,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P115666_mk(s) {
+function inline__P90555_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115666, depth: s.depth + 1,
+        parent: s, fn: inline__P90555, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73123,7 +73060,7 @@ function inline__P115666_mk(s) {
 
 
 
-function inline__P115671(s) {
+function inline__P90560(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73133,8 +73070,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.wa___115674 = undefined;
-    s.wb___115678 = undefined;
+    s.wa___90563 = undefined;
+    s.wb___90567 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -73148,7 +73085,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 549; s.pc = 5; return s.tmp_1; }
+     else { s.callLocIdx = 548; s.pc = 5; return s.tmp_1; }
     }
   case 5:
     r0 = s.retval;
@@ -73162,7 +73099,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wa___115674 = (s.tmp_2);
+    s.wa___90563 = (s.tmp_2);
     s.tmp_1 = if_weight_1_mk(s);
     s.tmp_1.arg0 = s.arg1;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -73171,7 +73108,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 550; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 549; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -73185,23 +73122,23 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wb___115678 = (s.tmp_2);
-    r0 = (s.wa___115674 - s.wb___115678);
+    s.wb___90567 = (s.tmp_2);
+    r0 = (s.wa___90563 - s.wb___90567);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115671.info = {"start":7487,"length":161,"line":243,"column":22,"endLine":247,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P90560.info = {"start":7487,"length":161,"line":243,"column":22,"endLine":247,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P115671_mk(s) {
+function inline__P90560_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115671, depth: s.depth + 1,
+        parent: s, fn: inline__P90560, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  wa___115674: undefined,
-  wb___115678: undefined,
+  wa___90563: undefined,
+  wb___90567: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -73210,7 +73147,7 @@ function inline__P115671_mk(s) {
 
 
 
-function kodu_RuleUI_createSensorBtn__P509790(s) {
+function kodu_RuleUI_createSensorBtn__P94763(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73220,17 +73157,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.defn___510938 = undefined;
-    s.button___510944 = undefined;
+    s.defn___95911 = undefined;
+    s.button___95917 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     s.tmp_1 = if_sensors_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "sensors");
     } else {
@@ -73243,21 +73180,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, s.arg1);
-    s.defn___510938 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.defn___510938);
+    s.defn___95911 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.defn___95911);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C522425_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Button__C84856_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510953);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95926);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = kodu_Button_constructor__P522496_mk(s);
+    s.tmp_2 = kodu_Button_constructor__P84866_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     r0 = s.arg0.fields["stage"];
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = "beige";
     s.tmp_3 = if_tid_1_mk(s);
-    s.tmp_3.arg0 = s.defn___510938;
+    s.tmp_3.arg0 = s.defn___95911;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "tid");
     } else {
@@ -73270,7 +73207,7 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
     s.tmp_4 = if_name_1_mk(s);
-    s.tmp_4.arg0 = s.defn___510938;
+    s.tmp_4.arg0 = s.defn___95911;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "name");
     } else {
@@ -73289,21 +73226,21 @@ switch (step) {
     s.callLocIdx = 1509; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.button___510944 = (s.tmp_0);
-    s.tmp_0 = kodu_Button_z__P522431_mk(s);
-    s.tmp_0.arg0 = s.button___510944;
+    s.button___95917 = (s.tmp_0);
+    s.tmp_0 = kodu_Button_z__P84864_mk(s);
+    s.tmp_0.arg0 = s.button___95917;
     s.tmp_0.arg1 = 800;
     s.callLocIdx = 1510; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_1 = kodu_Button_data__P522432_mk(s);
-    s.tmp_1.arg0 = s.button___510944;
+    s.tmp_1 = kodu_Button_data__P84865_mk(s);
+    s.tmp_1.arg0 = s.button___95917;
     s.callLocIdx = 1511; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___510938);
-    r0 = s.button___510944;
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "defn", s.defn___95911);
+    r0 = s.button___95917;
     { step = 3; continue; }
   case 1:
   case 2:
@@ -73312,20 +73249,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_createSensorBtn__P509790.info = {"start":17961,"length":529,"line":487,"column":8,"endLine":502,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createSensorBtn","argumentNames":["this","id"]}
+kodu_RuleUI_createSensorBtn__P94763.info = {"start":17961,"length":529,"line":487,"column":8,"endLine":502,"endColumn":9,"fileName":"kodeStage.ts","functionName":"createSensorBtn","argumentNames":["this","id"]}
 
-function kodu_RuleUI_createSensorBtn__P509790_mk(s) {
+function kodu_RuleUI_createSensorBtn__P94763_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_createSensorBtn__P509790, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_createSensorBtn__P94763, 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,
-  defn___510938: undefined,
-  button___510944: undefined,
+  defn___95911: undefined,
+  button___95917: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -73334,7 +73271,7 @@ function kodu_RuleUI_createSensorBtn__P509790_mk(s) {
 
 
 
-function inline__P510953(s) {
+function inline__P95926(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73348,7 +73285,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_handleSensorClick__P509783_mk(s);
+    s.tmp_0 = kodu_RuleUI_handleSensorClick__P94756_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 1508; s.pc = 1; return s.tmp_0;
@@ -73358,12 +73295,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510953.info = {"start":18285,"length":42,"line":496,"column":20,"endLine":496,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
+inline__P95926.info = {"start":18285,"length":42,"line":496,"column":20,"endLine":496,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P510953_mk(s) {
+function inline__P95926_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510953, depth: s.depth + 1,
+        parent: s, fn: inline__P95926, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -73373,7 +73310,7 @@ function inline__P510953_mk(s) {
 
 
 
-function kodu_RuleUI_handleSensorClick__P509783(s) {
+function kodu_RuleUI_handleSensorClick__P94756(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73383,39 +73320,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.suggestions___510421 = undefined;
-    s.items___510426 = undefined;
+    s.suggestions___95394 = undefined;
+    s.items___95399 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Language_getSensorSuggestions__P110367_mk(s);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Language_getSensorSuggestions__P85120_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1396; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.suggestions___510421 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510421;
-    s.tmp_0.arg1 = inline__P510428;
+    s.suggestions___95394 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95394;
+    s.tmp_0.arg1 = inline__P95401;
     s.callLocIdx = 1399; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.items___510426 = (r0);
+    s.items___95399 = (r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "icon", "delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "label", "Delete");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "style", "danger");
-    r0 = pxsim_Array__push(s.items___510426, s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510449);
+    r0 = pxsim_Array__push(s.items___95399, s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95422);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -73424,7 +73361,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510426;
+    s.tmp_1.arg3 = s.items___95399;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1408; s.pc = 3; return s.tmp_1;
@@ -73434,18 +73371,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_handleSensorClick__P509783.info = {"start":9076,"length":1031,"line":271,"column":8,"endLine":296,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleSensorClick","argumentNames":["this","button"]}
+kodu_RuleUI_handleSensorClick__P94756.info = {"start":9076,"length":1031,"line":271,"column":8,"endLine":296,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleSensorClick","argumentNames":["this","button"]}
 
-function kodu_RuleUI_handleSensorClick__P509783_mk(s) {
+function kodu_RuleUI_handleSensorClick__P94756_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_handleSensorClick__P509783, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_handleSensorClick__P94756, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  suggestions___510421: undefined,
-  items___510426: undefined,
+  suggestions___95394: undefined,
+  items___95399: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -73454,7 +73391,7 @@ function kodu_RuleUI_handleSensorClick__P509783_mk(s) {
 
 
 
-function inline__P510428(s) {
+function inline__P95401(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73502,12 +73439,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510428.info = {"start":9228,"length":154,"line":273,"column":42,"endLine":278,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95401.info = {"start":9228,"length":154,"line":273,"column":42,"endLine":278,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510428_mk(s) {
+function inline__P95401_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510428, depth: s.depth + 1,
+        parent: s, fn: inline__P95401, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73521,7 +73458,7 @@ function inline__P510428_mk(s) {
 
 
 
-function inline__P510449(s) {
+function inline__P95422(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73559,7 +73496,7 @@ switch (step) {
     r0 = s.caps[0].fields["defn"];
     s.tmp_0 = r0;
     s.tmp_3 = if_sensors_1_mk(s);
-    s.tmp_3.arg0 = globals.tiles___110373;
+    s.tmp_3.arg0 = globals.tiles___85126;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensors");
     } else {
@@ -73577,20 +73514,20 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["sensor"] = (s.tmp_1);
   case 2:
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1405; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1406; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1407; s.pc = 8; return s.tmp_0;
@@ -73602,12 +73539,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510449.info = {"start":9596,"length":499,"line":284,"column":73,"endLine":295,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95422.info = {"start":9596,"length":499,"line":284,"column":73,"endLine":295,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510449_mk(s) {
+function inline__P95422_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510449, depth: s.depth + 1,
+        parent: s, fn: inline__P95422, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73623,7 +73560,7 @@ function inline__P510449_mk(s) {
 
 
 
-function kodu_Language_getSensorSuggestions__P110367(s) {
+function kodu_Language_getSensorSuggestions__P85120(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73633,61 +73570,61 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sensors___115618 = undefined;
+    s.sensors___90507 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_arraySort__P106712_mk(s);
-    s.tmp_1 = helpers_arrayFilter__P106717_mk(s);
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_0 = helpers_arraySort__P81374_mk(s);
+    s.tmp_1 = helpers_arrayFilter__P81379_mk(s);
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     s.tmp_4 = if_sensors_1_mk(s);
-    s.tmp_4.arg0 = globals.tiles___110373;
+    s.tmp_4.arg0 = globals.tiles___85126;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "sensors");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["sensors"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["sensors"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 536; s.pc = 4; return s.tmp_4; }
+     else { s.callLocIdx = 535; s.pc = 4; return s.tmp_4; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.keysOf(s.tmp_3);
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115626;
-    s.callLocIdx = 538; s.pc = 3; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90515;
+    s.callLocIdx = 537; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P115631;
-    s.callLocIdx = 540; s.pc = 2; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P90520;
+    s.callLocIdx = 539; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P115636;
-    s.callLocIdx = 543; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P90525;
+    s.callLocIdx = 542; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.sensors___115618 = (r0);
-    r0 = s.sensors___115618;
+    s.sensors___90507 = (r0);
+    r0 = s.sensors___90507;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Language_getSensorSuggestions__P110367.info = {"start":6797,"length":435,"line":227,"column":8,"endLine":237,"endColumn":9,"fileName":"language.ts","functionName":"getSensorSuggestions","argumentNames":["rule"]}
+kodu_Language_getSensorSuggestions__P85120.info = {"start":6797,"length":435,"line":227,"column":8,"endLine":237,"endColumn":9,"fileName":"language.ts","functionName":"getSensorSuggestions","argumentNames":["rule"]}
 
-function kodu_Language_getSensorSuggestions__P110367_mk(s) {
+function kodu_Language_getSensorSuggestions__P85120_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Language_getSensorSuggestions__P110367, depth: s.depth + 1,
+        parent: s, fn: kodu_Language_getSensorSuggestions__P85120, 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,
-  sensors___115618: undefined,
+  sensors___90507: undefined,
   arg0: undefined,
 } }
 
@@ -73695,7 +73632,7 @@ function kodu_Language_getSensorSuggestions__P110367_mk(s) {
 
 
 
-function inline__P115626(s) {
+function inline__P90515(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73710,14 +73647,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_sensors_1_mk(s);
-    s.tmp_1.arg0 = globals.tiles___110373;
+    s.tmp_1.arg0 = globals.tiles___85126;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "sensors");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["sensors"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["sensors"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 537; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 536; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -73726,12 +73663,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115626.info = {"start":6938,"length":23,"line":229,"column":21,"endLine":229,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
+inline__P90515.info = {"start":6938,"length":23,"line":229,"column":21,"endLine":229,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["id"]}
 
-function inline__P115626_mk(s) {
+function inline__P90515_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115626, depth: s.depth + 1,
+        parent: s, fn: inline__P90515, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73742,7 +73679,7 @@ function inline__P115626_mk(s) {
 
 
 
-function inline__P115631(s) {
+function inline__P90520(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73764,7 +73701,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["hidden"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["hidden"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 539; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 538; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
@@ -73775,12 +73712,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115631.info = {"start":6987,"length":20,"line":230,"column":24,"endLine":230,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P90520.info = {"start":6987,"length":20,"line":230,"column":24,"endLine":230,"endColumn":44,"fileName":"language.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P115631_mk(s) {
+function inline__P90520_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115631, depth: s.depth + 1,
+        parent: s, fn: inline__P90520, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73792,7 +73729,7 @@ function inline__P115631_mk(s) {
 
 
 
-function inline__P115636(s) {
+function inline__P90525(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73802,8 +73739,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.wa___115639 = undefined;
-    s.wb___115643 = undefined;
+    s.wa___90528 = undefined;
+    s.wb___90532 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -73817,7 +73754,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 541; s.pc = 5; return s.tmp_1; }
+     else { s.callLocIdx = 540; s.pc = 5; return s.tmp_1; }
     }
   case 5:
     r0 = s.retval;
@@ -73831,7 +73768,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wa___115639 = (s.tmp_2);
+    s.wa___90528 = (s.tmp_2);
     s.tmp_1 = if_weight_1_mk(s);
     s.tmp_1.arg0 = s.arg1;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -73840,7 +73777,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["weight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["weight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 542; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 541; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -73854,23 +73791,23 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.wb___115643 = (s.tmp_2);
-    r0 = (s.wa___115639 - s.wb___115643);
+    s.wb___90532 = (s.tmp_2);
+    r0 = (s.wa___90528 - s.wb___90532);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115636.info = {"start":7031,"length":161,"line":231,"column":22,"endLine":235,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P90525.info = {"start":7031,"length":161,"line":231,"column":22,"endLine":235,"endColumn":17,"fileName":"language.ts","functionName":"inline","argumentNames":["a","b"]}
 
-function inline__P115636_mk(s) {
+function inline__P90525_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115636, depth: s.depth + 1,
+        parent: s, fn: inline__P90525, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  wa___115639: undefined,
-  wb___115643: undefined,
+  wa___90528: undefined,
+  wb___90532: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -73879,7 +73816,7 @@ function inline__P115636_mk(s) {
 
 
 
-function kodu_RuleUI_destroyTiles__P509779(s) {
+function kodu_RuleUI_destroyTiles__P94752(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73894,15 +73831,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     r0 = s.arg0.fields["sensor"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_1 = kodu_Button__C84856_v0_1_mk(s);
     r0 = s.arg0.fields["sensor"];
     s.tmp_1.arg0 = r0;
-    if (!checkSubtype(s.tmp_1.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.destroy;
     s.pc = 9; return s.tmp_1;
   case 9:
@@ -73913,10 +73850,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_1 = kodu_Button__C84856_v0_1_mk(s);
     r0 = s.arg0.fields["actuator"];
     s.tmp_1.arg0 = r0;
-    if (!checkSubtype(s.tmp_1.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.destroy;
     s.pc = 10; return s.tmp_1;
   case 10:
@@ -73927,10 +73864,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["filters"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P510329;
+    s.tmp_1.arg1 = inline__P95302;
     s.callLocIdx = 1382; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
@@ -73940,10 +73877,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["modifiers"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P510338;
+    s.tmp_1.arg1 = inline__P95311;
     s.callLocIdx = 1383; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
@@ -73957,12 +73894,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_destroyTiles__P509779.info = {"start":7685,"length":460,"line":232,"column":8,"endLine":241,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroyTiles","argumentNames":["this"]}
+kodu_RuleUI_destroyTiles__P94752.info = {"start":7685,"length":460,"line":232,"column":8,"endLine":241,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroyTiles","argumentNames":["this"]}
 
-function kodu_RuleUI_destroyTiles__P509779_mk(s) {
+function kodu_RuleUI_destroyTiles__P94752_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_destroyTiles__P509779, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_destroyTiles__P94752, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -73973,7 +73910,7 @@ function kodu_RuleUI_destroyTiles__P509779_mk(s) {
 
 
 
-function inline__P510329(s) {
+function inline__P95302(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -73987,9 +73924,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v0_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -73998,12 +73935,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510329.info = {"start":7871,"length":22,"line":235,"column":53,"endLine":235,"endColumn":75,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95302.info = {"start":7871,"length":22,"line":235,"column":53,"endLine":235,"endColumn":75,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510329_mk(s) {
+function inline__P95302_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510329, depth: s.depth + 1,
+        parent: s, fn: inline__P95302, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -74013,7 +73950,7 @@ function inline__P510329_mk(s) {
 
 
 
-function inline__P510338(s) {
+function inline__P95311(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74027,9 +73964,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v0_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -74038,12 +73975,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510338.info = {"start":7955,"length":22,"line":236,"column":57,"endLine":236,"endColumn":79,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95311.info = {"start":7955,"length":22,"line":236,"column":57,"endLine":236,"endColumn":79,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510338_mk(s) {
+function inline__P95311_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510338, depth: s.depth + 1,
+        parent: s, fn: inline__P95311, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -74053,7 +73990,7 @@ function inline__P510338_mk(s) {
 
 
 
-function kodu_RuleUI_handleDoInsertClick__P509788(s) {
+function kodu_RuleUI_handleDoInsertClick__P94761(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74063,18 +74000,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___510785 = undefined;
-    s.suggestions___510790 = undefined;
-    s.items___510796 = undefined;
-    s.suggestions___510836 = undefined;
-    s.items___510841 = undefined;
+    s.index___95758 = undefined;
+    s.suggestions___95763 = undefined;
+    s.items___95769 = undefined;
+    s.suggestions___95809 = undefined;
+    s.items___95814 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     r0 = s.arg0.fields["actuator"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -74083,26 +74020,26 @@ switch (step) {
     r0 = r0.fields["modifiers"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.tmp_1);
-    s.index___510785 = (r0);
-    s.tmp_0 = kodu_Language_getModifierSuggestions__P110370_mk(s);
+    s.index___95758 = (r0);
+    s.tmp_0 = kodu_Language_getModifierSuggestions__P85123_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___510785;
+    s.tmp_0.arg1 = s.index___95758;
     s.callLocIdx = 1472; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.suggestions___510790 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510790;
-    s.tmp_0.arg1 = inline__P510798;
+    s.suggestions___95763 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95763;
+    s.tmp_0.arg1 = inline__P95771;
     s.callLocIdx = 1475; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.items___510796 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510816);
+    s.items___95769 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95789);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -74111,7 +74048,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510796;
+    s.tmp_1.arg3 = s.items___95769;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1481; s.pc = 5; return s.tmp_1;
@@ -74119,24 +74056,24 @@ switch (step) {
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_Language_getActuatorSuggestions__P110369_mk(s);
+    s.tmp_0 = kodu_Language_getActuatorSuggestions__P85122_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1482; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.suggestions___510836 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510836;
-    s.tmp_0.arg1 = inline__P510843;
+    s.suggestions___95809 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95809;
+    s.tmp_0.arg1 = inline__P95816;
     s.callLocIdx = 1485; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.items___510841 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510861);
+    s.items___95814 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95834);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -74145,7 +74082,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510841;
+    s.tmp_1.arg3 = s.items___95814;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1491; s.pc = 8; return s.tmp_1;
@@ -74156,21 +74093,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_handleDoInsertClick__P509788.info = {"start":14930,"length":1491,"line":414,"column":8,"endLine":445,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleDoInsertClick","argumentNames":["this","button"]}
+kodu_RuleUI_handleDoInsertClick__P94761.info = {"start":14930,"length":1491,"line":414,"column":8,"endLine":445,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleDoInsertClick","argumentNames":["this","button"]}
 
-function kodu_RuleUI_handleDoInsertClick__P509788_mk(s) {
+function kodu_RuleUI_handleDoInsertClick__P94761_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_handleDoInsertClick__P509788, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_handleDoInsertClick__P94761, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  index___510785: undefined,
-  suggestions___510790: undefined,
-  items___510796: undefined,
-  suggestions___510836: undefined,
-  items___510841: undefined,
+  index___95758: undefined,
+  suggestions___95763: undefined,
+  items___95769: undefined,
+  suggestions___95809: undefined,
+  items___95814: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -74179,7 +74116,7 @@ function kodu_RuleUI_handleDoInsertClick__P509788_mk(s) {
 
 
 
-function inline__P510798(s) {
+function inline__P95771(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74227,12 +74164,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510798.info = {"start":15192,"length":160,"line":418,"column":46,"endLine":423,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95771.info = {"start":15192,"length":160,"line":418,"column":46,"endLine":423,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510798_mk(s) {
+function inline__P95771_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510798, depth: s.depth + 1,
+        parent: s, fn: inline__P95771, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74246,7 +74183,7 @@ function inline__P510798_mk(s) {
 
 
 
-function inline__P510816(s) {
+function inline__P95789(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74264,7 +74201,7 @@ switch (step) {
     r0 = r0.fields["modifiers"];
     s.tmp_0 = r0;
     s.tmp_3 = if_modifiers_1_mk(s);
-    s.tmp_3.arg0 = globals.tiles___110373;
+    s.tmp_3.arg0 = globals.tiles___85126;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "modifiers");
     } else {
@@ -74281,20 +74218,20 @@ switch (step) {
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_2, s.tmp_4);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1478; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1479; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1480; s.pc = 4; return s.tmp_0;
@@ -74304,12 +74241,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510816.info = {"start":15432,"length":282,"line":424,"column":77,"endLine":429,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95789.info = {"start":15432,"length":282,"line":424,"column":77,"endLine":429,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510816_mk(s) {
+function inline__P95789_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510816, depth: s.depth + 1,
+        parent: s, fn: inline__P95789, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74323,7 +74260,7 @@ function inline__P510816_mk(s) {
 
 
 
-function inline__P510843(s) {
+function inline__P95816(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74371,12 +74308,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510843.info = {"start":15864,"length":174,"line":432,"column":46,"endLine":437,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95816.info = {"start":15864,"length":174,"line":432,"column":46,"endLine":437,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510843_mk(s) {
+function inline__P95816_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510843, depth: s.depth + 1,
+        parent: s, fn: inline__P95816, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74390,7 +74327,7 @@ function inline__P510843_mk(s) {
 
 
 
-function inline__P510861(s) {
+function inline__P95834(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74407,7 +74344,7 @@ switch (step) {
     r0 = s.caps[0].fields["defn"];
     s.tmp_0 = r0;
     s.tmp_3 = if_actuators_1_mk(s);
-    s.tmp_3.arg0 = globals.tiles___110373;
+    s.tmp_3.arg0 = globals.tiles___85126;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "actuators");
     } else {
@@ -74424,20 +74361,20 @@ switch (step) {
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_2, s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["actuator"] = (s.tmp_1);
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1488; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1489; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1490; s.pc = 4; return s.tmp_0;
@@ -74447,12 +74384,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510861.info = {"start":16118,"length":277,"line":438,"column":77,"endLine":443,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95834.info = {"start":16118,"length":277,"line":438,"column":77,"endLine":443,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510861_mk(s) {
+function inline__P95834_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510861, depth: s.depth + 1,
+        parent: s, fn: inline__P95834, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74466,7 +74403,7 @@ function inline__P510861_mk(s) {
 
 
 
-function kodu_RuleUI_handleWhenInsertClick__P509787(s) {
+function kodu_RuleUI_handleWhenInsertClick__P94760(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74476,18 +74413,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___510687 = undefined;
-    s.suggestions___510692 = undefined;
-    s.items___510698 = undefined;
-    s.suggestions___510738 = undefined;
-    s.items___510743 = undefined;
+    s.index___95660 = undefined;
+    s.suggestions___95665 = undefined;
+    s.items___95671 = undefined;
+    s.suggestions___95711 = undefined;
+    s.items___95716 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     r0 = s.arg0.fields["sensor"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -74496,26 +74433,26 @@ switch (step) {
     r0 = r0.fields["filters"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.tmp_1);
-    s.index___510687 = (r0);
-    s.tmp_0 = kodu_Language_getFilterSuggestions__P110368_mk(s);
+    s.index___95660 = (r0);
+    s.tmp_0 = kodu_Language_getFilterSuggestions__P85121_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___510687;
+    s.tmp_0.arg1 = s.index___95660;
     s.callLocIdx = 1452; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.suggestions___510692 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510692;
-    s.tmp_0.arg1 = inline__P510700;
+    s.suggestions___95665 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95665;
+    s.tmp_0.arg1 = inline__P95673;
     s.callLocIdx = 1455; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.items___510698 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510718);
+    s.items___95671 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95691);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -74524,7 +74461,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510698;
+    s.tmp_1.arg3 = s.items___95671;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1461; s.pc = 5; return s.tmp_1;
@@ -74532,24 +74469,24 @@ switch (step) {
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_Language_getSensorSuggestions__P110367_mk(s);
+    s.tmp_0 = kodu_Language_getSensorSuggestions__P85120_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1462; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.suggestions___510738 = (r0);
-    s.tmp_0 = helpers_arrayMap__P106713_mk(s);
-    s.tmp_0.arg0 = s.suggestions___510738;
-    s.tmp_0.arg1 = inline__P510745;
+    s.suggestions___95711 = (r0);
+    s.tmp_0 = helpers_arrayMap__P81375_mk(s);
+    s.tmp_0.arg0 = s.suggestions___95711;
+    s.tmp_0.arg1 = inline__P95718;
     s.callLocIdx = 1465; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.items___510743 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510763);
+    s.items___95716 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95736);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -74558,7 +74495,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510743;
+    s.tmp_1.arg3 = s.items___95716;
     s.tmp_1.arg4 = "down";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1471; s.pc = 8; return s.tmp_1;
@@ -74569,21 +74506,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_handleWhenInsertClick__P509787.info = {"start":13457,"length":1463,"line":381,"column":8,"endLine":412,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleWhenInsertClick","argumentNames":["this","button"]}
+kodu_RuleUI_handleWhenInsertClick__P94760.info = {"start":13457,"length":1463,"line":381,"column":8,"endLine":412,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleWhenInsertClick","argumentNames":["this","button"]}
 
-function kodu_RuleUI_handleWhenInsertClick__P509787_mk(s) {
+function kodu_RuleUI_handleWhenInsertClick__P94760_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_handleWhenInsertClick__P509787, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_handleWhenInsertClick__P94760, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  index___510687: undefined,
-  suggestions___510692: undefined,
-  items___510698: undefined,
-  suggestions___510738: undefined,
-  items___510743: undefined,
+  index___95660: undefined,
+  suggestions___95665: undefined,
+  items___95671: undefined,
+  suggestions___95711: undefined,
+  items___95716: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -74592,7 +74529,7 @@ function kodu_RuleUI_handleWhenInsertClick__P509787_mk(s) {
 
 
 
-function inline__P510700(s) {
+function inline__P95673(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74640,12 +74577,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510700.info = {"start":13715,"length":160,"line":385,"column":46,"endLine":390,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95673.info = {"start":13715,"length":160,"line":385,"column":46,"endLine":390,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510700_mk(s) {
+function inline__P95673_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510700, depth: s.depth + 1,
+        parent: s, fn: inline__P95673, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74659,7 +74596,7 @@ function inline__P510700_mk(s) {
 
 
 
-function inline__P510718(s) {
+function inline__P95691(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74677,7 +74614,7 @@ switch (step) {
     r0 = r0.fields["filters"];
     s.tmp_0 = r0;
     s.tmp_3 = if_filters_1_mk(s);
-    s.tmp_3.arg0 = globals.tiles___110373;
+    s.tmp_3.arg0 = globals.tiles___85126;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "filters");
     } else {
@@ -74694,20 +74631,20 @@ switch (step) {
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_2, s.tmp_4);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1458; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1459; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1460; s.pc = 4; return s.tmp_0;
@@ -74717,12 +74654,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510718.info = {"start":13955,"length":278,"line":391,"column":77,"endLine":396,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95691.info = {"start":13955,"length":278,"line":391,"column":77,"endLine":396,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510718_mk(s) {
+function inline__P95691_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510718, depth: s.depth + 1,
+        parent: s, fn: inline__P95691, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74736,7 +74673,7 @@ function inline__P510718_mk(s) {
 
 
 
-function inline__P510745(s) {
+function inline__P95718(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74784,12 +74721,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510745.info = {"start":14381,"length":160,"line":399,"column":46,"endLine":404,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P95718.info = {"start":14381,"length":160,"line":399,"column":46,"endLine":404,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P510745_mk(s) {
+function inline__P95718_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510745, depth: s.depth + 1,
+        parent: s, fn: inline__P95718, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74803,7 +74740,7 @@ function inline__P510745_mk(s) {
 
 
 
-function inline__P510763(s) {
+function inline__P95736(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74820,7 +74757,7 @@ switch (step) {
     r0 = s.caps[0].fields["defn"];
     s.tmp_0 = r0;
     s.tmp_3 = if_sensors_1_mk(s);
-    s.tmp_3.arg0 = globals.tiles___110373;
+    s.tmp_3.arg0 = globals.tiles___85126;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "sensors");
     } else {
@@ -74837,20 +74774,20 @@ switch (step) {
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_2, s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["sensor"] = (s.tmp_1);
-    s.tmp_0 = kodu_Language_ensureValid__P110371_mk(s);
+    s.tmp_0 = kodu_Language_ensureValid__P85124_mk(s);
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1468; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI_instantiateTiles__P509782_mk(s);
+    s.tmp_0 = kodu_RuleUI_instantiateTiles__P94755_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     r0 = s.caps[0].fields["defn"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 1469; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1470; s.pc = 4; return s.tmp_0;
@@ -74860,12 +74797,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510763.info = {"start":14621,"length":273,"line":405,"column":77,"endLine":410,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95736.info = {"start":14621,"length":273,"line":405,"column":77,"endLine":410,"endColumn":17,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510763_mk(s) {
+function inline__P95736_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510763, depth: s.depth + 1,
+        parent: s, fn: inline__P95736, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -74879,7 +74816,7 @@ function inline__P510763_mk(s) {
 
 
 
-function kodu_RuleUI_handleRuleHandleClick__P509789(s) {
+function kodu_RuleUI_handleRuleHandleClick__P94762(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -74889,18 +74826,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.items___510881 = undefined;
+    s.items___95854 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     s.tmp_2 = if_HIGH_1_mk(s);
-    s.tmp_2.arg0 = globals.RuleCondition___110338;
+    s.tmp_2.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "HIGH");
     } else {
@@ -74921,7 +74858,7 @@ switch (step) {
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_4 = r0;
     s.tmp_6 = if_LOW_1_mk(s);
-    s.tmp_6.arg0 = globals.RuleCondition___110338;
+    s.tmp_6.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "LOW");
     } else {
@@ -74940,7 +74877,7 @@ switch (step) {
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_7 = r0;
     s.tmp_9 = if_LOW_TO_HIGH_1_mk(s);
-    s.tmp_9.arg0 = globals.RuleCondition___110338;
+    s.tmp_9.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_9.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_9.arg0, "LOW_TO_HIGH");
     } else {
@@ -74959,7 +74896,7 @@ switch (step) {
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_10 = r0;
     s.tmp_12 = if_HIGH_TO_LOW_1_mk(s);
-    s.tmp_12.arg0 = globals.RuleCondition___110338;
+    s.tmp_12.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_12.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_12.arg0, "HIGH_TO_LOW");
     } else {
@@ -74987,11 +74924,11 @@ switch (step) {
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_14, "label", "Delete Rule");
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_14, "style", "danger");
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_14);
-    s.items___510881 = (s.tmp_3);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P510901);
+    s.items___95854 = (s.tmp_3);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P95874);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = kodu_KodeStage_showMenu__P509653_mk(s);
+    s.tmp_1 = kodu_KodeStage_showMenu__P85253_mk(s);
     r0 = s.arg0.fields["kstage"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg1.fields["x"];
@@ -75000,7 +74937,7 @@ switch (step) {
     s.tmp_1.arg1 = r0;
     r0 = s.arg1.fields["y"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.items___510881;
+    s.tmp_1.arg3 = s.items___95854;
     s.tmp_1.arg4 = "right";
     s.tmp_1.arg5 = s.tmp_0;
     s.callLocIdx = 1504; s.pc = 5; return s.tmp_1;
@@ -75010,12 +74947,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_handleRuleHandleClick__P509789.info = {"start":16431,"length":1520,"line":447,"column":8,"endLine":485,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleRuleHandleClick","argumentNames":["this","button"]}
+kodu_RuleUI_handleRuleHandleClick__P94762.info = {"start":16431,"length":1520,"line":447,"column":8,"endLine":485,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleRuleHandleClick","argumentNames":["this","button"]}
 
-function kodu_RuleUI_handleRuleHandleClick__P509789_mk(s) {
+function kodu_RuleUI_handleRuleHandleClick__P94762_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_handleRuleHandleClick__P509789, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_handleRuleHandleClick__P94762, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75032,7 +74969,7 @@ function kodu_RuleUI_handleRuleHandleClick__P509789_mk(s) {
   tmp_12: undefined,
   tmp_13: undefined,
   tmp_14: undefined,
-  items___510881: undefined,
+  items___95854: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -75041,7 +74978,7 @@ function kodu_RuleUI_handleRuleHandleClick__P509789_mk(s) {
 
 
 
-function inline__P510901(s) {
+function inline__P95874(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75068,7 +75005,7 @@ switch (step) {
     r0 = s.arg0.fields["iconId"];
     s.tmp_4 = r0;
     r0 = (s.tmp_3).fields["condition"] = (s.tmp_4);
-    s.tmp_0 = kodu_Button_setIcon__P522434_mk(s);
+    s.tmp_0 = kodu_Button_setIcon__P84868_mk(s);
     r0 = s.caps[0].fields["handleBtn"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["iconId"];
@@ -75084,7 +75021,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = kodu_PageUI_deleteRuleAt__P509711_mk(s);
+    s.tmp_2 = kodu_PageUI_deleteRuleAt__P94684_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_2.arg0 = r0;
     r0 = s.caps[0].fields["index"];
@@ -75100,7 +75037,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = kodu_PageUI_insertRuleAt__P509712_mk(s);
+    s.tmp_2 = kodu_PageUI_insertRuleAt__P94685_mk(s);
     r0 = s.caps[0].fields["pageui"];
     s.tmp_2.arg0 = r0;
     r0 = s.caps[0].fields["index"];
@@ -75116,12 +75053,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510901.info = {"start":17487,"length":452,"line":475,"column":74,"endLine":484,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
+inline__P95874.info = {"start":17487,"length":452,"line":475,"column":74,"endLine":484,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["selection"]}
 
-function inline__P510901_mk(s) {
+function inline__P95874_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510901, depth: s.depth + 1,
+        parent: s, fn: inline__P95874, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75135,7 +75072,7 @@ function inline__P510901_mk(s) {
 
 
 
-function kodu_PageUI_insertRuleAt__P509712(s) {
+function kodu_PageUI_insertRuleAt__P94685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75145,17 +75082,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rules___509957 = undefined;
-    s.i___509959 = undefined;
-    s.i___509983 = undefined;
-    s.i___510003 = undefined;
+    s.rules___94930 = undefined;
+    s.i___94932 = undefined;
+    s.i___94956 = undefined;
+    s.i___94976 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
     r0 = (s.arg1 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -75174,7 +75111,7 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 7; continue; }
-    s.tmp_5 = kodu_PageDefn_insertRuleAt__P110356_mk(s);
+    s.tmp_5 = kodu_PageDefn_insertRuleAt__P85109_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg1;
@@ -75182,33 +75119,33 @@ switch (step) {
   case 11:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
-    s.rules___509957 = (r0);
-    s.i___509959 = (0);
+    s.rules___94930 = (r0);
+    s.i___94932 = (0);
   case 3:
-    r0 = (s.i___509959 < s.arg1);
+    r0 = (s.i___94932 < s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = r0 = s.rules___509957;
+    s.tmp_1 = r0 = s.rules___94930;
     r0 = s.arg0.fields["rules"];
     s.tmp_3 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_3, s.i___509959);
+    r0 = pxsim_Array__getAt(s.tmp_3, s.i___94932);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___509959 + 1);
-    s.i___509959 = (r0);
+    r0 = (s.i___94932 + 1);
+    s.i___94932 = (r0);
     { step = 3; continue; }
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleUI__C509774_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleUI__C94747_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C110339_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C85092_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = kodu_RuleDefn_constructor__P110345_mk(s);
+    s.tmp_2 = kodu_RuleDefn_constructor__P85098_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     s.callLocIdx = 1335; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
-    s.tmp_3 = kodu_RuleUI_constructor__P509794_mk(s);
+    s.tmp_3 = kodu_RuleUI_constructor__P94767_mk(s);
     s.tmp_3.arg0 = s.tmp_0;
     r0 = s.arg0.fields["kstage"];
     s.tmp_3.arg1 = r0;
@@ -75218,10 +75155,10 @@ switch (step) {
     s.callLocIdx = 1336; s.pc = 13; return s.tmp_3;
   case 13:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.rules___509957, s.tmp_0);
-    s.i___509983 = (s.arg1);
+    r0 = pxsim_Array__push(s.rules___94930, s.tmp_0);
+    s.i___94956 = (s.arg1);
   case 5:
-    s.tmp_1 = r0 = s.i___509983;
+    s.tmp_1 = r0 = s.i___94956;
     r0 = s.arg0.fields["rules"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -75230,22 +75167,22 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_4 = r0 = s.rules___509957;
+    s.tmp_4 = r0 = s.rules___94930;
     r0 = s.arg0.fields["rules"];
     s.tmp_6 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_6, s.i___509983);
+    r0 = pxsim_Array__getAt(s.tmp_6, s.i___94956);
     s.tmp_5 = r0;
     r0 = pxsim_Array__push(s.tmp_4, s.tmp_5);
-    r0 = (s.i___509983 + 1);
-    s.i___509983 = (r0);
+    r0 = (s.i___94956 + 1);
+    s.i___94956 = (r0);
     { step = 5; continue; }
   case 6:
-    r0 = (s.arg0).fields["rules"] = (s.rules___509957);
+    r0 = (s.arg0).fields["rules"] = (s.rules___94930);
   case 7:
   case 8:
-    s.i___510003 = (0);
+    s.i___94976 = (0);
   case 9:
-    s.tmp_1 = r0 = s.i___510003;
+    s.tmp_1 = r0 = s.i___94976;
     r0 = s.arg0.fields["rules"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -75256,14 +75193,14 @@ switch (step) {
     if (!r0) { step = 10; continue; }
     r0 = s.arg0.fields["rules"];
     s.tmp_5 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_5, s.i___510003);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___94976);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4).fields["index"] = (s.i___510003);
-    r0 = (s.i___510003 + 1);
-    s.i___510003 = (r0);
+    r0 = (s.tmp_4).fields["index"] = (s.i___94976);
+    r0 = (s.i___94976 + 1);
+    s.i___94976 = (r0);
     { step = 9; continue; }
   case 10:
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1337; s.pc = 14; return s.tmp_0;
   case 14:
@@ -75272,12 +75209,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_insertRuleAt__P509712.info = {"start":2960,"length":925,"line":96,"column":8,"endLine":116,"endColumn":9,"fileName":"kodeStage.ts","functionName":"insertRuleAt","argumentNames":["this","index"]}
+kodu_PageUI_insertRuleAt__P94685.info = {"start":2960,"length":925,"line":96,"column":8,"endLine":116,"endColumn":9,"fileName":"kodeStage.ts","functionName":"insertRuleAt","argumentNames":["this","index"]}
 
-function kodu_PageUI_insertRuleAt__P509712_mk(s) {
+function kodu_PageUI_insertRuleAt__P94685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_insertRuleAt__P509712, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_insertRuleAt__P94685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75286,10 +75223,10 @@ function kodu_PageUI_insertRuleAt__P509712_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  rules___509957: undefined,
-  i___509959: undefined,
-  i___509983: undefined,
-  i___510003: undefined,
+  rules___94930: undefined,
+  i___94932: undefined,
+  i___94956: undefined,
+  i___94976: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -75298,7 +75235,7 @@ function kodu_PageUI_insertRuleAt__P509712_mk(s) {
 
 
 
-function kodu_PageDefn_insertRuleAt__P110356(s) {
+function kodu_PageDefn_insertRuleAt__P85109(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75308,16 +75245,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rules___115464 = undefined;
-    s.i___115466 = undefined;
-    s.i___115485 = undefined;
+    s.rules___90353 = undefined;
+    s.i___90355 = undefined;
+    s.i___90374 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageDefn__C110350_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageDefn__C85103_VT)) failedCast(r0);
     r0 = (s.arg1 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -75337,34 +75274,34 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 7; continue; }
     r0 = pxsim_Array__mk();
-    s.rules___115464 = (r0);
-    s.i___115466 = (0);
+    s.rules___90353 = (r0);
+    s.i___90355 = (0);
   case 3:
-    r0 = (s.i___115466 < s.arg1);
+    r0 = (s.i___90355 < s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = r0 = s.rules___115464;
+    s.tmp_1 = r0 = s.rules___90353;
     r0 = s.arg0.fields["rules"];
     s.tmp_3 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_3, s.i___115466);
+    r0 = pxsim_Array__getAt(s.tmp_3, s.i___90355);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___115466 + 1);
-    s.i___115466 = (r0);
+    r0 = (s.i___90355 + 1);
+    s.i___90355 = (r0);
     { step = 3; continue; }
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C110339_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_RuleDefn__C85092_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_RuleDefn_constructor__P110345_mk(s);
+    s.tmp_1 = kodu_RuleDefn_constructor__P85098_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 517; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 516; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.rules___115464, s.tmp_0);
-    s.i___115485 = (s.arg1);
+    r0 = pxsim_Array__push(s.rules___90353, s.tmp_0);
+    s.i___90374 = (s.arg1);
   case 5:
-    s.tmp_1 = r0 = s.i___115485;
+    s.tmp_1 = r0 = s.i___90374;
     r0 = s.arg0.fields["rules"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -75373,29 +75310,29 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_4 = r0 = s.rules___115464;
+    s.tmp_4 = r0 = s.rules___90353;
     r0 = s.arg0.fields["rules"];
     s.tmp_6 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_6, s.i___115485);
+    r0 = pxsim_Array__getAt(s.tmp_6, s.i___90374);
     s.tmp_5 = r0;
     r0 = pxsim_Array__push(s.tmp_4, s.tmp_5);
-    r0 = (s.i___115485 + 1);
-    s.i___115485 = (r0);
+    r0 = (s.i___90374 + 1);
+    s.i___90374 = (r0);
     { step = 5; continue; }
   case 6:
-    r0 = (s.arg0).fields["rules"] = (s.rules___115464);
+    r0 = (s.arg0).fields["rules"] = (s.rules___90353);
   case 7:
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageDefn_insertRuleAt__P110356.info = {"start":4500,"length":617,"line":151,"column":8,"endLine":165,"endColumn":9,"fileName":"language.ts","functionName":"insertRuleAt","argumentNames":["this","index"]}
+kodu_PageDefn_insertRuleAt__P85109.info = {"start":4500,"length":617,"line":151,"column":8,"endLine":165,"endColumn":9,"fileName":"language.ts","functionName":"insertRuleAt","argumentNames":["this","index"]}
 
-function kodu_PageDefn_insertRuleAt__P110356_mk(s) {
+function kodu_PageDefn_insertRuleAt__P85109_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageDefn_insertRuleAt__P110356, depth: s.depth + 1,
+        parent: s, fn: kodu_PageDefn_insertRuleAt__P85109, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75404,9 +75341,9 @@ function kodu_PageDefn_insertRuleAt__P110356_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  rules___115464: undefined,
-  i___115466: undefined,
-  i___115485: undefined,
+  rules___90353: undefined,
+  i___90355: undefined,
+  i___90374: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -75415,7 +75352,7 @@ function kodu_PageDefn_insertRuleAt__P110356_mk(s) {
 
 
 
-function kodu_PageUI_deleteRuleAt__P509711(s) {
+function kodu_PageUI_deleteRuleAt__P94684(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75425,15 +75362,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___509914 = undefined;
-    s.i___509925 = undefined;
+    s.rule___94887 = undefined;
+    s.i___94898 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
     r0 = (s.arg1 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -75452,7 +75389,7 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    s.tmp_5 = kodu_PageDefn_deleteRuleAt__P110355_mk(s);
+    s.tmp_5 = kodu_PageDefn_deleteRuleAt__P85108_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg1;
@@ -75462,8 +75399,8 @@ switch (step) {
     r0 = s.arg0.fields["rules"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.arg1);
-    s.rule___509914 = (r0);
-    s.tmp_0 = helpers_arraySplice__P106707_mk(s);
+    s.rule___94887 = (r0);
+    s.tmp_0 = helpers_arraySplice__P81369_mk(s);
     r0 = s.arg0.fields["rules"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
@@ -75471,18 +75408,18 @@ switch (step) {
     s.callLocIdx = 1332; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = kodu_RuleUI__C509774_v0_1_mk(s);
-    s.tmp_0.arg0 = s.rule___509914;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_RuleUI__C509774_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0 = kodu_RuleUI__C94747_v0_1_mk(s);
+    s.tmp_0.arg0 = s.rule___94887;
+    if (!checkSubtype(s.tmp_0.arg0, kodu_RuleUI__C94747_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
   case 3:
   case 4:
-    s.i___509925 = (0);
+    s.i___94898 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___509925;
+    s.tmp_1 = r0 = s.i___94898;
     r0 = s.arg0.fields["rules"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -75493,14 +75430,14 @@ switch (step) {
     if (!r0) { step = 6; continue; }
     r0 = s.arg0.fields["rules"];
     s.tmp_5 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_5, s.i___509925);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___94898);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4).fields["index"] = (s.i___509925);
-    r0 = (s.i___509925 + 1);
-    s.i___509925 = (r0);
+    r0 = (s.tmp_4).fields["index"] = (s.i___94898);
+    r0 = (s.i___94898 + 1);
+    s.i___94898 = (r0);
     { step = 5; continue; }
   case 6:
-    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P509710_mk(s);
+    s.tmp_0 = kodu_PageUI_ensureFinalEmptyRule__P94683_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1333; s.pc = 10; return s.tmp_0;
   case 10:
@@ -75509,12 +75446,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_deleteRuleAt__P509711.info = {"start":2471,"length":479,"line":82,"column":8,"endLine":94,"endColumn":9,"fileName":"kodeStage.ts","functionName":"deleteRuleAt","argumentNames":["this","index"]}
+kodu_PageUI_deleteRuleAt__P94684.info = {"start":2471,"length":479,"line":82,"column":8,"endLine":94,"endColumn":9,"fileName":"kodeStage.ts","functionName":"deleteRuleAt","argumentNames":["this","index"]}
 
-function kodu_PageUI_deleteRuleAt__P509711_mk(s) {
+function kodu_PageUI_deleteRuleAt__P94684_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_deleteRuleAt__P509711, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_deleteRuleAt__P94684, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75522,8 +75459,8 @@ function kodu_PageUI_deleteRuleAt__P509711_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  rule___509914: undefined,
-  i___509925: undefined,
+  rule___94887: undefined,
+  i___94898: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -75532,7 +75469,7 @@ function kodu_PageUI_deleteRuleAt__P509711_mk(s) {
 
 
 
-function kodu_RuleUI_destroy__P509778(s) {
+function kodu_RuleUI_destroy__P94751(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75547,48 +75484,48 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
-    s.tmp_0 = kodu_RuleUI_destroyTiles__P509779_mk(s);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
+    s.tmp_0 = kodu_RuleUI_destroyTiles__P94752_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1380; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v0_1_mk(s);
     r0 = s.arg0.fields["handleBtn"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v0_1_mk(s);
     r0 = s.arg0.fields["whenBtn"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v0_1_mk(s);
     r0 = s.arg0.fields["whenInsertBtn"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v0_1_mk(s);
     r0 = s.arg0.fields["doBtn"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = kodu_Button__C522425_v0_1_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v0_1_mk(s);
     r0 = s.arg0.fields["doInsertBtn"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 6; return s.tmp_0;
   case 6:
@@ -75598,7 +75535,7 @@ switch (step) {
     r0 = (s.arg0).fields["whenInsertBtn"] = (undefined);
     r0 = (s.arg0).fields["doBtn"] = (undefined);
     r0 = (s.arg0).fields["doInsertBtn"] = (undefined);
-    s.tmp_0 = kodu_Component_destroy__P345110_mk(s);
+    s.tmp_0 = kodu_Component_destroy__P84897_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1381; s.pc = 7; return s.tmp_0;
   case 7:
@@ -75607,12 +75544,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_destroy__P509778.info = {"start":7195,"length":480,"line":217,"column":8,"endLine":230,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_RuleUI_destroy__P94751.info = {"start":7195,"length":480,"line":217,"column":8,"endLine":230,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_RuleUI_destroy__P509778_mk(s) {
+function kodu_RuleUI_destroy__P94751_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_destroy__P509778, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_destroy__P94751, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -75622,7 +75559,7 @@ function kodu_RuleUI_destroy__P509778_mk(s) {
 
 
 
-function kodu_PageDefn_deleteRuleAt__P110355(s) {
+function kodu_PageDefn_deleteRuleAt__P85108(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75638,7 +75575,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageDefn__C110350_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageDefn__C85103_VT)) failedCast(r0);
     r0 = (s.arg1 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -75657,12 +75594,12 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    s.tmp_5 = helpers_arraySplice__P106707_mk(s);
+    s.tmp_5 = helpers_arraySplice__P81369_mk(s);
     r0 = s.arg0.fields["rules"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg1;
     s.tmp_5.arg2 = 1;
-    s.callLocIdx = 516; s.pc = 5; return s.tmp_5;
+    s.callLocIdx = 515; s.pc = 5; return s.tmp_5;
   case 5:
     r0 = s.retval;
   case 3:
@@ -75671,12 +75608,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageDefn_deleteRuleAt__P110355.info = {"start":4326,"length":164,"line":145,"column":8,"endLine":149,"endColumn":9,"fileName":"language.ts","functionName":"deleteRuleAt","argumentNames":["this","index"]}
+kodu_PageDefn_deleteRuleAt__P85108.info = {"start":4326,"length":164,"line":145,"column":8,"endLine":149,"endColumn":9,"fileName":"language.ts","functionName":"deleteRuleAt","argumentNames":["this","index"]}
 
-function kodu_PageDefn_deleteRuleAt__P110355_mk(s) {
+function kodu_PageDefn_deleteRuleAt__P85108_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageDefn_deleteRuleAt__P110355, depth: s.depth + 1,
+        parent: s, fn: kodu_PageDefn_deleteRuleAt__P85108, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75692,7 +75629,7 @@ function kodu_PageDefn_deleteRuleAt__P110355_mk(s) {
 
 
 
-function kodu_Button_setIcon__P522434(s) {
+function kodu_Button_setIcon__P84868(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75708,29 +75645,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = (s.arg0).fields["iconId"] = (s.arg1);
-    s.tmp_0 = kodu_Button_buildSprite__P522435_mk(s);
+    s.tmp_0 = kodu_Button_buildSprite__P87793_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = kodu_Button_z__P522430_mk(s);
+    s.tmp_1 = kodu_Button_z__P84863_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 140; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 139; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 141; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 140; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_setIcon__P522434.info = {"start":1371,"length":114,"line":45,"column":8,"endLine":48,"endColumn":9,"fileName":"button.ts","functionName":"setIcon","argumentNames":["this","iconId"]}
+kodu_Button_setIcon__P84868.info = {"start":1371,"length":114,"line":45,"column":8,"endLine":48,"endColumn":9,"fileName":"button.ts","functionName":"setIcon","argumentNames":["this","iconId"]}
 
-function kodu_Button_setIcon__P522434_mk(s) {
+function kodu_Button_setIcon__P84868_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_setIcon__P522434, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_setIcon__P84868, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75742,7 +75679,7 @@ function kodu_Button_setIcon__P522434_mk(s) {
 
 
 
-function kodu_KodeStage_handleCharBtnClick__P509661(s) {
+function kodu_KodeStage_handleCharBtnClick__P85261(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75757,8 +75694,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Cursor_moveTo__P549533_mk(s);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Cursor_moveTo__P84992_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
@@ -75766,7 +75703,7 @@ switch (step) {
     s.callLocIdx = 1557; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Camera_moveTo__P530759_mk(s);
+    s.tmp_0 = kodu_Camera_moveTo__P84888_mk(s);
     r0 = s.arg0.fields["camera"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
@@ -75778,12 +75715,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_handleCharBtnClick__P509661.info = {"start":22716,"length":120,"line":636,"column":8,"endLine":639,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCharBtnClick","argumentNames":["this"]}
+kodu_KodeStage_handleCharBtnClick__P85261.info = {"start":22716,"length":120,"line":636,"column":8,"endLine":639,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCharBtnClick","argumentNames":["this"]}
 
-function kodu_KodeStage_handleCharBtnClick__P509661_mk(s) {
+function kodu_KodeStage_handleCharBtnClick__P85261_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_handleCharBtnClick__P509661, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_handleCharBtnClick__P85261, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -75793,7 +75730,7 @@ function kodu_KodeStage_handleCharBtnClick__P509661_mk(s) {
 
 
 
-function kodu_Camera_moveTo__P530759(s) {
+function kodu_Camera_moveTo__P84888(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75810,27 +75747,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Camera__C530755_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Camera__C84878_VT)) failedCast(r0);
     r0 = (s.arg0).fields["x"] = (s.arg1);
     r0 = (s.arg0).fields["y"] = (s.arg2);
-    s.tmp_0 = scene_centerCameraAt__P108962_mk(s);
+    s.tmp_0 = scene_centerCameraAt__P83741_mk(s);
     r0 = s.arg0.fields["x"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 197; 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()
 } } }
-kodu_Camera_moveTo__P530759.info = {"start":902,"length":145,"line":23,"column":8,"endLine":27,"endColumn":9,"fileName":"camera.ts","functionName":"moveTo","argumentNames":["this","x","y"]}
+kodu_Camera_moveTo__P84888.info = {"start":902,"length":145,"line":23,"column":8,"endLine":27,"endColumn":9,"fileName":"camera.ts","functionName":"moveTo","argumentNames":["this","x","y"]}
 
-function kodu_Camera_moveTo__P530759_mk(s) {
+function kodu_Camera_moveTo__P84888_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Camera_moveTo__P530759, depth: s.depth + 1,
+        parent: s, fn: kodu_Camera_moveTo__P84888, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -75842,7 +75779,7 @@ function kodu_Camera_moveTo__P530759_mk(s) {
 
 
 
-function scene_centerCameraAt__P108962(s) {
+function scene_centerCameraAt__P83741(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75852,62 +75789,62 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___125837 = undefined;
+    s.scene___101230 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P109029_mk(s);
-    s.callLocIdx = 849; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P83808_mk(s);
+    s.callLocIdx = 853; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___125837 = (r0);
-    r0 = s.scene___125837.fields["camera"];
+    s.scene___101230 = (r0);
+    r0 = s.scene___101230.fields["camera"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["sprite"] = (undefined);
-    s.tmp_0 = scene_Camera_offsetX__P108863_mk(s);
-    r0 = s.scene___125837.fields["camera"];
+    s.tmp_0 = scene_Camera_offsetX__P83642_mk(s);
+    r0 = s.scene___101230.fields["camera"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 850; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 854; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = scene_Camera_offsetY__P108865_mk(s);
-    r0 = s.scene___125837.fields["camera"];
+    s.tmp_0 = scene_Camera_offsetY__P83644_mk(s);
+    r0 = s.scene___101230.fields["camera"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = r0 = s.arg1;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 851; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 855; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_centerCameraAt__P108962.info = {"start":4348,"length":257,"line":154,"column":4,"endLine":159,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"centerCameraAt","argumentNames":["x","y"]}
+scene_centerCameraAt__P83741.info = {"start":4348,"length":257,"line":154,"column":4,"endLine":159,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"centerCameraAt","argumentNames":["x","y"]}
 
-function scene_centerCameraAt__P108962_mk(s) {
+function scene_centerCameraAt__P83741_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_centerCameraAt__P108962, depth: s.depth + 1,
+        parent: s, fn: scene_centerCameraAt__P83741, 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___125837: undefined,
+  scene___101230: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -75916,7 +75853,7 @@ function scene_centerCameraAt__P108962_mk(s) {
 
 
 
-function kodu_KodeStage_handleOkBtnClicked__P509658(s) {
+function kodu_KodeStage_handleOkBtnClicked__P85258(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75931,11 +75868,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511157);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96127);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = setTimeout__P107021_mk(s);
+    s.tmp_1 = setTimeout__P81685_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.callLocIdx = 1554; s.pc = 1; return s.tmp_1;
@@ -75945,12 +75882,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_handleOkBtnClicked__P509658.info = {"start":22107,"length":414,"line":617,"column":8,"endLine":626,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleOkBtnClicked","argumentNames":["this"]}
+kodu_KodeStage_handleOkBtnClicked__P85258.info = {"start":22107,"length":414,"line":617,"column":8,"endLine":626,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleOkBtnClicked","argumentNames":["this"]}
 
-function kodu_KodeStage_handleOkBtnClicked__P509658_mk(s) {
+function kodu_KodeStage_handleOkBtnClicked__P85258_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_handleOkBtnClicked__P509658, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_handleOkBtnClicked__P85258, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -75961,7 +75898,7 @@ function kodu_KodeStage_handleOkBtnClicked__P509658_mk(s) {
 
 
 
-function inline__P511157(s) {
+function inline__P96127(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -75971,24 +75908,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bdefn___511158 = undefined;
-    s.tmp_0 = kodu_BrainUI_toDefn__P509685_mk(s);
+    s.bdefn___96128 = undefined;
+    s.tmp_0 = kodu_BrainUI_toDefn__P94658_mk(s);
     r0 = s.caps[0].fields["brain"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1551; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.bdefn___511158 = (r0);
+    s.bdefn___96128 = (r0);
     r0 = s.caps[0].fields["char"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0).fields["bdefn"] = (s.bdefn___511158);
-    s.tmp_0 = kodu_App_saveProject__P110410_mk(s);
+    r0 = (s.tmp_0).fields["bdefn"] = (s.bdefn___96128);
+    s.tmp_0 = kodu_App_saveProject__P85193_mk(s);
     r0 = s.caps[0].fields["app"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1552; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = kodu_App_popStage__P110412_mk(s);
+    s.tmp_0 = kodu_App_popStage__P85195_mk(s);
     r0 = s.caps[0].fields["app"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1553; s.pc = 3; return s.tmp_0;
@@ -75998,22 +75935,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511157.info = {"start":22248,"length":258,"line":619,"column":23,"endLine":625,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
+inline__P96127.info = {"start":22248,"length":258,"line":619,"column":23,"endLine":625,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P511157_mk(s) {
+function inline__P96127_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511157, depth: s.depth + 1,
+        parent: s, fn: inline__P96127, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  bdefn___511158: undefined,
+  bdefn___96128: undefined,
 } }
 
 
 
 
 
-function kodu_App_popStage__P110412(s) {
+function kodu_App_popStage__P85195(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76028,23 +75965,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_App__C110406_VT)) failedCast(r0);
-    s.tmp_0 = kodu_StageManager_pop__P468991_mk(s);
+    if (!checkSubtype(r0, kodu_App__C85189_VT)) failedCast(r0);
+    s.tmp_0 = kodu_StageManager_pop__P85070_mk(s);
     r0 = s.arg0.fields["stageManager"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1161; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1160; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_App_popStage__P110412.info = {"start":649,"length":66,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"app.ts","functionName":"popStage","argumentNames":["this"]}
+kodu_App_popStage__P85195.info = {"start":649,"length":66,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"app.ts","functionName":"popStage","argumentNames":["this"]}
 
-function kodu_App_popStage__P110412_mk(s) {
+function kodu_App_popStage__P85195_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_App_popStage__P110412, depth: s.depth + 1,
+        parent: s, fn: kodu_App_popStage__P85195, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76054,7 +75991,7 @@ function kodu_App_popStage__P110412_mk(s) {
 
 
 
-function kodu_StageManager_pop__P468991(s) {
+function kodu_StageManager_pop__P85070(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76064,41 +76001,41 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.stage___469009 = undefined;
+    s.stage___90106 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_StageManager__C468989_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_StageManager__C85066_VT)) failedCast(r0);
     r0 = s.arg0.fields["stack"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.pop(s.tmp_0);
-    s.stage___469009 = (r0);
-    s.tmp_0 = kodu_Stage__C468688_v9_1_mk(s);
-    s.tmp_0.arg0 = s.stage___469009;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_0.arg0);
+    s.stage___90106 = (r0);
+    s.tmp_0 = kodu_Stage__C85045_v9_1_mk(s);
+    s.tmp_0.arg0 = s.stage___90106;
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.shutdownScene;
     s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P109034_mk(s);
-    s.callLocIdx = 489; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = game_popScene__P83813_mk(s);
+    s.callLocIdx = 488; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_StageManager_pop__P468991.info = {"start":3367,"length":132,"line":116,"column":8,"endLine":120,"endColumn":9,"fileName":"stage.ts","functionName":"pop","argumentNames":["this"]}
+kodu_StageManager_pop__P85070.info = {"start":3367,"length":132,"line":116,"column":8,"endLine":120,"endColumn":9,"fileName":"stage.ts","functionName":"pop","argumentNames":["this"]}
 
-function kodu_StageManager_pop__P468991_mk(s) {
+function kodu_StageManager_pop__P85070_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_StageManager_pop__P468991, depth: s.depth + 1,
+        parent: s, fn: kodu_StageManager_pop__P85070, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  stage___469009: undefined,
+  stage___90106: undefined,
   arg0: undefined,
 } }
 
@@ -76106,7 +76043,7 @@ function kodu_StageManager_pop__P468991_mk(s) {
 
 
 
-function kodu_Stage_shutdownScene__P468703(s) {
+function kodu_Stage_shutdownScene__P85064(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76116,19 +76053,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.components___468953 = undefined;
+    s.components___90055 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Stage__C468688_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Stage__C85045_VT)) failedCast(r0);
     r0 = s.arg0.fields["components"];
-    s.components___468953 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_0.arg0 = s.components___468953;
-    s.tmp_0.arg1 = inline__P468958;
-    s.callLocIdx = 481; s.pc = 1; return s.tmp_0;
+    s.components___90055 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_0.arg0 = s.components___90055;
+    s.tmp_0.arg1 = inline__P90060;
+    s.callLocIdx = 480; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["components"] = (null);
@@ -76136,15 +76073,15 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Stage_shutdownScene__P468703.info = {"start":2100,"length":167,"line":72,"column":8,"endLine":76,"endColumn":9,"fileName":"stage.ts","functionName":"shutdownScene","argumentNames":["this"]}
+kodu_Stage_shutdownScene__P85064.info = {"start":2100,"length":167,"line":72,"column":8,"endLine":76,"endColumn":9,"fileName":"stage.ts","functionName":"shutdownScene","argumentNames":["this"]}
 
-function kodu_Stage_shutdownScene__P468703_mk(s) {
+function kodu_Stage_shutdownScene__P85064_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Stage_shutdownScene__P468703, depth: s.depth + 1,
+        parent: s, fn: kodu_Stage_shutdownScene__P85064, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  components___468953: undefined,
+  components___90055: undefined,
   arg0: undefined,
 } }
 
@@ -76152,7 +76089,7 @@ function kodu_Stage_shutdownScene__P468703_mk(s) {
 
 
 
-function inline__P468958(s) {
+function inline__P90060(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76166,9 +76103,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Component__C345109_v0_1_mk(s);
+    s.tmp_0 = kodu_Component__C84895_v0_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C345109_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Component__C84895_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.destroy;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -76177,12 +76114,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P468958.info = {"start":2197,"length":22,"line":74,"column":31,"endLine":74,"endColumn":53,"fileName":"stage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P90060.info = {"start":2197,"length":22,"line":74,"column":31,"endLine":74,"endColumn":53,"fileName":"stage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P468958_mk(s) {
+function inline__P90060_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P468958, depth: s.depth + 1,
+        parent: s, fn: inline__P90060, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76192,7 +76129,7 @@ function inline__P468958_mk(s) {
 
 
 
-function kodu_App_saveProject__P110410(s) {
+function kodu_App_saveProject__P85193(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76207,23 +76144,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_App__C110406_VT)) failedCast(r0);
-    s.tmp_0 = kodu_WorldStage_save__P565277_mk(s);
+    if (!checkSubtype(r0, kodu_App__C85189_VT)) failedCast(r0);
+    s.tmp_0 = kodu_WorldStage_save__P85230_mk(s);
     r0 = s.arg0.fields["worldStage"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1159; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1158; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_App_saveProject__P110410.info = {"start":476,"length":68,"line":15,"column":8,"endLine":17,"endColumn":9,"fileName":"app.ts","functionName":"saveProject","argumentNames":["this"]}
+kodu_App_saveProject__P85193.info = {"start":476,"length":68,"line":15,"column":8,"endLine":17,"endColumn":9,"fileName":"app.ts","functionName":"saveProject","argumentNames":["this"]}
 
-function kodu_App_saveProject__P110410_mk(s) {
+function kodu_App_saveProject__P85193_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_App_saveProject__P110410, depth: s.depth + 1,
+        parent: s, fn: kodu_App_saveProject__P85193, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76233,7 +76170,7 @@ function kodu_App_saveProject__P110410_mk(s) {
 
 
 
-function kodu_BrainUI_toDefn__P509685(s) {
+function kodu_BrainUI_toDefn__P94658(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76243,46 +76180,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.brain___509742 = undefined;
+    s.brain___94715 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_BrainUI__C509681_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C110359_VT);
+    if (!checkSubtype(r0, kodu_BrainUI__C94654_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_BrainDefn__C85112_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_BrainDefn_constructor__P110361_mk(s);
+    s.tmp_1 = kodu_BrainDefn_constructor__P85114_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 1314; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.brain___509742 = (s.tmp_0);
-    s.tmp_0 = r0 = s.brain___509742;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.brain___94715 = (s.tmp_0);
+    s.tmp_0 = r0 = s.brain___94715;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["pages"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P509750;
+    s.tmp_2.arg1 = inline__P94723;
     s.callLocIdx = 1316; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["pages"] = (s.tmp_1);
-    r0 = s.brain___509742;
+    r0 = s.brain___94715;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainUI_toDefn__P509685.info = {"start":622,"length":172,"line":22,"column":8,"endLine":26,"endColumn":9,"fileName":"kodeStage.ts","functionName":"toDefn","argumentNames":["this"]}
+kodu_BrainUI_toDefn__P94658.info = {"start":622,"length":172,"line":22,"column":8,"endLine":26,"endColumn":9,"fileName":"kodeStage.ts","functionName":"toDefn","argumentNames":["this"]}
 
-function kodu_BrainUI_toDefn__P509685_mk(s) {
+function kodu_BrainUI_toDefn__P94658_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainUI_toDefn__P509685, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainUI_toDefn__P94658, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  brain___509742: undefined,
+  brain___94715: undefined,
   arg0: undefined,
 } }
 
@@ -76290,7 +76227,7 @@ function kodu_BrainUI_toDefn__P509685_mk(s) {
 
 
 
-function inline__P509750(s) {
+function inline__P94723(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76304,7 +76241,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_PageUI_toDefn__P509713_mk(s);
+    s.tmp_0 = kodu_PageUI_toDefn__P94686_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1315; s.pc = 1; return s.tmp_0;
   case 1:
@@ -76312,12 +76249,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P509750.info = {"start":735,"length":21,"line":24,"column":41,"endLine":24,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["page"]}
+inline__P94723.info = {"start":735,"length":21,"line":24,"column":41,"endLine":24,"endColumn":62,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["page"]}
 
-function inline__P509750_mk(s) {
+function inline__P94723_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P509750, depth: s.depth + 1,
+        parent: s, fn: inline__P94723, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76327,7 +76264,7 @@ function inline__P509750_mk(s) {
 
 
 
-function kodu_PageUI_toDefn__P509713(s) {
+function kodu_PageUI_toDefn__P94686(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76337,46 +76274,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.page___510021 = undefined;
+    s.page___94994 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C110350_VT);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_PageDefn__C85103_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_PageDefn_constructor__P110352_mk(s);
+    s.tmp_1 = kodu_PageDefn_constructor__P85105_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 1338; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.page___510021 = (s.tmp_0);
-    s.tmp_0 = r0 = s.page___510021;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.page___94994 = (s.tmp_0);
+    s.tmp_0 = r0 = s.page___94994;
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["rules"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P510029;
+    s.tmp_2.arg1 = inline__P95002;
     s.callLocIdx = 1340; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["rules"] = (s.tmp_1);
-    r0 = s.page___510021;
+    r0 = s.page___94994;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_toDefn__P509713.info = {"start":3895,"length":167,"line":118,"column":8,"endLine":122,"endColumn":9,"fileName":"kodeStage.ts","functionName":"toDefn","argumentNames":["this"]}
+kodu_PageUI_toDefn__P94686.info = {"start":3895,"length":167,"line":118,"column":8,"endLine":122,"endColumn":9,"fileName":"kodeStage.ts","functionName":"toDefn","argumentNames":["this"]}
 
-function kodu_PageUI_toDefn__P509713_mk(s) {
+function kodu_PageUI_toDefn__P94686_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_toDefn__P509713, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_toDefn__P94686, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  page___510021: undefined,
+  page___94994: undefined,
   arg0: undefined,
 } }
 
@@ -76384,7 +76321,7 @@ function kodu_PageUI_toDefn__P509713_mk(s) {
 
 
 
-function inline__P510029(s) {
+function inline__P95002(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76398,7 +76335,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleUI_toDefn__P509781_mk(s);
+    s.tmp_0 = kodu_RuleUI_toDefn__P94754_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1339; s.pc = 1; return s.tmp_0;
   case 1:
@@ -76406,12 +76343,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P510029.info = {"start":4004,"length":21,"line":120,"column":40,"endLine":120,"endColumn":61,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["rule"]}
+inline__P95002.info = {"start":4004,"length":21,"line":120,"column":40,"endLine":120,"endColumn":61,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":["rule"]}
 
-function inline__P510029_mk(s) {
+function inline__P95002_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P510029, depth: s.depth + 1,
+        parent: s, fn: inline__P95002, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76421,7 +76358,7 @@ function inline__P510029_mk(s) {
 
 
 
-function kodu_RuleUI_toDefn__P509781(s) {
+function kodu_RuleUI_toDefn__P94754(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76436,8 +76373,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleUI__C509774_VT)) failedCast(r0);
-    s.tmp_0 = kodu_RuleDefn_clone__P110346_mk(s);
+    if (!checkSubtype(r0, kodu_RuleUI__C94747_VT)) failedCast(r0);
+    s.tmp_0 = kodu_RuleDefn_clone__P85099_mk(s);
     r0 = s.arg0.fields["defn"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1384; s.pc = 1; return s.tmp_0;
@@ -76446,12 +76383,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleUI_toDefn__P509781.info = {"start":8380,"length":75,"line":251,"column":8,"endLine":253,"endColumn":9,"fileName":"kodeStage.ts","functionName":"toDefn","argumentNames":["this"]}
+kodu_RuleUI_toDefn__P94754.info = {"start":8380,"length":75,"line":251,"column":8,"endLine":253,"endColumn":9,"fileName":"kodeStage.ts","functionName":"toDefn","argumentNames":["this"]}
 
-function kodu_RuleUI_toDefn__P509781_mk(s) {
+function kodu_RuleUI_toDefn__P94754_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleUI_toDefn__P509781, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleUI_toDefn__P94754, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76461,7 +76398,7 @@ function kodu_RuleUI_toDefn__P509781_mk(s) {
 
 
 
-function kodu_KodeStage_handleCancelBtnClicked__P509657(s) {
+function kodu_KodeStage_handleCancelBtnClicked__P85257(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76476,11 +76413,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511151);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96121);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = setTimeout__P107021_mk(s);
+    s.tmp_1 = setTimeout__P81685_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.callLocIdx = 1550; s.pc = 1; return s.tmp_1;
@@ -76490,12 +76427,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_handleCancelBtnClicked__P509657.info = {"start":21811,"length":286,"line":609,"column":8,"endLine":615,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCancelBtnClicked","argumentNames":["this"]}
+kodu_KodeStage_handleCancelBtnClicked__P85257.info = {"start":21811,"length":286,"line":609,"column":8,"endLine":615,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCancelBtnClicked","argumentNames":["this"]}
 
-function kodu_KodeStage_handleCancelBtnClicked__P509657_mk(s) {
+function kodu_KodeStage_handleCancelBtnClicked__P85257_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_handleCancelBtnClicked__P509657, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_handleCancelBtnClicked__P85257, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -76506,7 +76443,7 @@ function kodu_KodeStage_handleCancelBtnClicked__P509657_mk(s) {
 
 
 
-function inline__P511151(s) {
+function inline__P96121(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76516,7 +76453,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_App_popStage__P110412_mk(s);
+    s.tmp_0 = kodu_App_popStage__P85195_mk(s);
     r0 = s.caps[0].fields["app"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1549; s.pc = 1; return s.tmp_0;
@@ -76526,12 +76463,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511151.info = {"start":21956,"length":126,"line":611,"column":23,"endLine":614,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
+inline__P96121.info = {"start":21956,"length":126,"line":611,"column":23,"endLine":614,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P511151_mk(s) {
+function inline__P96121_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511151, depth: s.depth + 1,
+        parent: s, fn: inline__P96121, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -76540,7 +76477,7 @@ function inline__P511151_mk(s) {
 
 
 
-function kodu_KodeStage_handleCursorButtonClick__P509660(s) {
+function kodu_KodeStage_handleCursorButtonClick__P85260(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76556,8 +76493,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Button_click__P522438_mk(s);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Button_click__P84871_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.callLocIdx = 1556; s.pc = 1; return s.tmp_0;
   case 1:
@@ -76566,12 +76503,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_handleCursorButtonClick__P509660.info = {"start":22627,"length":79,"line":632,"column":8,"endLine":634,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCursorButtonClick","argumentNames":["this","button"]}
+kodu_KodeStage_handleCursorButtonClick__P85260.info = {"start":22627,"length":79,"line":632,"column":8,"endLine":634,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCursorButtonClick","argumentNames":["this","button"]}
 
-function kodu_KodeStage_handleCursorButtonClick__P509660_mk(s) {
+function kodu_KodeStage_handleCursorButtonClick__P85260_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_handleCursorButtonClick__P509660, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_handleCursorButtonClick__P85260, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76582,7 +76519,7 @@ function kodu_KodeStage_handleCursorButtonClick__P509660_mk(s) {
 
 
 
-function kodu_KodeStage_handleCursorCanvasClick__P509659(s) {
+function kodu_KodeStage_handleCursorCanvasClick__P85259(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76599,8 +76536,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    s.tmp_0 = kodu_KodeStage_hideMenu__P509654_mk(s);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    s.tmp_0 = kodu_KodeStage_hideMenu__P85254_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1555; s.pc = 1; return s.tmp_0;
   case 1:
@@ -76609,12 +76546,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_handleCursorCanvasClick__P509659.info = {"start":22531,"length":86,"line":628,"column":8,"endLine":630,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCursorCanvasClick","argumentNames":["this","x","y"]}
+kodu_KodeStage_handleCursorCanvasClick__P85259.info = {"start":22531,"length":86,"line":628,"column":8,"endLine":630,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleCursorCanvasClick","argumentNames":["this","x","y"]}
 
-function kodu_KodeStage_handleCursorCanvasClick__P509659_mk(s) {
+function kodu_KodeStage_handleCursorCanvasClick__P85259_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_handleCursorCanvasClick__P509659, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_handleCursorCanvasClick__P85259, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76626,7 +76563,7 @@ function kodu_KodeStage_handleCursorCanvasClick__P509659_mk(s) {
 
 
 
-function kodu_KodeStage_handleMenuPressed__P509656(s) {
+function kodu_KodeStage_handleMenuPressed__P85256(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76641,11 +76578,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P511145);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P96115);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = setTimeout__P107021_mk(s);
+    s.tmp_1 = setTimeout__P81685_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.callLocIdx = 1548; s.pc = 1; return s.tmp_1;
@@ -76655,12 +76592,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_handleMenuPressed__P509656.info = {"start":21520,"length":281,"line":601,"column":8,"endLine":607,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleMenuPressed","argumentNames":["this"]}
+kodu_KodeStage_handleMenuPressed__P85256.info = {"start":21520,"length":281,"line":601,"column":8,"endLine":607,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleMenuPressed","argumentNames":["this"]}
 
-function kodu_KodeStage_handleMenuPressed__P509656_mk(s) {
+function kodu_KodeStage_handleMenuPressed__P85256_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_handleMenuPressed__P509656, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_handleMenuPressed__P85256, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -76671,7 +76608,7 @@ function kodu_KodeStage_handleMenuPressed__P509656_mk(s) {
 
 
 
-function inline__P511145(s) {
+function inline__P96115(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76681,7 +76618,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_App_popStage__P110412_mk(s);
+    s.tmp_0 = kodu_App_popStage__P85195_mk(s);
     r0 = s.caps[0].fields["app"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1547; s.pc = 1; return s.tmp_0;
@@ -76691,12 +76628,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P511145.info = {"start":21660,"length":126,"line":603,"column":23,"endLine":606,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
+inline__P96115.info = {"start":21660,"length":126,"line":603,"column":23,"endLine":606,"endColumn":13,"fileName":"kodeStage.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P511145_mk(s) {
+function inline__P96115_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P511145, depth: s.depth + 1,
+        parent: s, fn: inline__P96115, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -76705,7 +76642,7 @@ function inline__P511145_mk(s) {
 
 
 
-function kodu_KodeStage_handleBPressed__P509655(s) {
+function kodu_KodeStage_handleBPressed__P85255(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76720,8 +76657,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
-    s.tmp_0 = kodu_KodeStage_hideMenu__P509654_mk(s);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
+    s.tmp_0 = kodu_KodeStage_hideMenu__P85254_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1546; s.pc = 1; return s.tmp_0;
   case 1:
@@ -76730,12 +76667,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_handleBPressed__P509655.info = {"start":21453,"length":57,"line":597,"column":8,"endLine":599,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleBPressed","argumentNames":["this"]}
+kodu_KodeStage_handleBPressed__P85255.info = {"start":21453,"length":57,"line":597,"column":8,"endLine":599,"endColumn":9,"fileName":"kodeStage.ts","functionName":"handleBPressed","argumentNames":["this"]}
 
-function kodu_KodeStage_handleBPressed__P509655_mk(s) {
+function kodu_KodeStage_handleBPressed__P85255_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_handleBPressed__P509655, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_handleBPressed__P85255, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76745,7 +76682,7 @@ function kodu_KodeStage_handleBPressed__P509655_mk(s) {
 
 
 
-function kodu_Menu_update__P518590(s) {
+function kodu_Menu_update__P85043(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76761,27 +76698,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Menu__C518584_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P518746);
+    if (!checkSubtype(r0, kodu_Menu__C85036_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89928);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["buttons"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 467; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 466; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Menu_update__P518590.info = {"start":1953,"length":93,"line":57,"column":8,"endLine":59,"endColumn":9,"fileName":"menu.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_Menu_update__P85043.info = {"start":1953,"length":93,"line":57,"column":8,"endLine":59,"endColumn":9,"fileName":"menu.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_Menu_update__P518590_mk(s) {
+function kodu_Menu_update__P85043_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Menu_update__P518590, depth: s.depth + 1,
+        parent: s, fn: kodu_Menu_update__P85043, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -76793,7 +76730,7 @@ function kodu_Menu_update__P518590_mk(s) {
 
 
 
-function inline__P518746(s) {
+function inline__P89928(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76807,10 +76744,10 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Button__C522425_v1_2_mk(s);
+    s.tmp_0 = kodu_Button__C84856_v1_2_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C522425_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, kodu_Button__C84856_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:
@@ -76819,12 +76756,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P518746.info = {"start":2007,"length":27,"line":58,"column":33,"endLine":58,"endColumn":60,"fileName":"menu.ts","functionName":"inline","argumentNames":["button"]}
+inline__P89928.info = {"start":2007,"length":27,"line":58,"column":33,"endLine":58,"endColumn":60,"fileName":"menu.ts","functionName":"inline","argumentNames":["button"]}
 
-function inline__P518746_mk(s) {
+function inline__P89928_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P518746, depth: s.depth + 1,
+        parent: s, fn: inline__P89928, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76834,7 +76771,7 @@ function inline__P518746_mk(s) {
 
 
 
-function kodu_Menu_destroy__P518588(s) {
+function kodu_Menu_destroy__P85041(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76849,29 +76786,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Menu__C518584_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Menu_hide__P518587_mk(s);
+    if (!checkSubtype(r0, kodu_Menu__C85036_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Menu_hide__P85040_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 465; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 464; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Stage_remove__P468692_mk(s);
+    s.tmp_0 = kodu_Stage_remove__P85054_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 466; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 465; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Menu_destroy__P518588.info = {"start":1769,"length":90,"line":48,"column":8,"endLine":51,"endColumn":9,"fileName":"menu.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Menu_destroy__P85041.info = {"start":1769,"length":90,"line":48,"column":8,"endLine":51,"endColumn":9,"fileName":"menu.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Menu_destroy__P518588_mk(s) {
+function kodu_Menu_destroy__P85041_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Menu_destroy__P518588, depth: s.depth + 1,
+        parent: s, fn: kodu_Menu_destroy__P85041, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76881,7 +76818,7 @@ function kodu_Menu_destroy__P518588_mk(s) {
 
 
 
-function sprites_StaticObstacle_width__P108653(s) {
+function sprites_StaticObstacle_width__P83437(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76896,20 +76833,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C108643_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C83427_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__P108653.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__P108653.isGetter = true;
+sprites_StaticObstacle_width__P83437.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__P83437.isGetter = true;
 
-function sprites_StaticObstacle_width__P108653_mk(s) {
+function sprites_StaticObstacle_width__P83437_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_width__P108653, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_width__P83437, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76919,7 +76856,7 @@ function sprites_StaticObstacle_width__P108653_mk(s) {
 
 
 
-function sprites_StaticObstacle_height__P108652(s) {
+function sprites_StaticObstacle_height__P83436(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76934,20 +76871,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C108643_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C83427_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__P108652.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__P108652.isGetter = true;
+sprites_StaticObstacle_height__P83436.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__P83436.isGetter = true;
 
-function sprites_StaticObstacle_height__P108652_mk(s) {
+function sprites_StaticObstacle_height__P83436_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_height__P108652, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_height__P83436, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -76957,7 +76894,7 @@ function sprites_StaticObstacle_height__P108652_mk(s) {
 
 
 
-function sprites_StaticObstacle_y__P108651(s) {
+function sprites_StaticObstacle_y__P83435(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -76972,7 +76909,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C108643_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C83427_VT)) failedCast(r0);
     r0 = s.arg0.fields["top"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["image"];
@@ -76985,13 +76922,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_y__P108651.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__P108651.isGetter = true;
+sprites_StaticObstacle_y__P83435.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__P83435.isGetter = true;
 
-function sprites_StaticObstacle_y__P108651_mk(s) {
+function sprites_StaticObstacle_y__P83435_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_y__P108651, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_y__P83435, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -77004,7 +76941,7 @@ function sprites_StaticObstacle_y__P108651_mk(s) {
 
 
 
-function sprites_StaticObstacle_x__P108650(s) {
+function sprites_StaticObstacle_x__P83434(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77019,7 +76956,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C108643_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C83427_VT)) failedCast(r0);
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["image"];
@@ -77032,13 +76969,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_x__P108650.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__P108650.isGetter = true;
+sprites_StaticObstacle_x__P83434.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__P83434.isGetter = true;
 
-function sprites_StaticObstacle_x__P108650_mk(s) {
+function sprites_StaticObstacle_x__P83434_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_x__P108650, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_x__P83434, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -77051,7 +76988,7 @@ function sprites_StaticObstacle_x__P108650_mk(s) {
 
 
 
-function tiles_Location_y__P108791(s) {
+function tiles_Location_y__P83577(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77061,22 +76998,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___132144 = undefined;
+    s.scale___107794 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C108786_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C83572_VT)) failedCast(r0);
     r0 = s.arg0.fields["tileMap"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_scale"];
-    s.scale___132144 = (r0);
+    s.scale___107794 = (r0);
     r0 = s.arg0.fields["_row"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 << s.scale___132144);
+    r0 = (s.tmp_1 << s.scale___107794);
     s.tmp_0 = r0;
-    r0 = (s.scale___132144 - 1);
+    r0 = (s.scale___107794 - 1);
     s.tmp_3 = r0;
     r0 = (1 << s.tmp_3);
     s.tmp_2 = r0;
@@ -77084,19 +77021,19 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_y__P108791.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__P108791.isGetter = true;
+tiles_Location_y__P83577.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__P83577.isGetter = true;
 
-function tiles_Location_y__P108791_mk(s) {
+function tiles_Location_y__P83577_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_y__P108791, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_y__P83577, 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___132144: undefined,
+  scale___107794: undefined,
   arg0: undefined,
 } }
 
@@ -77104,7 +77041,7 @@ function tiles_Location_y__P108791_mk(s) {
 
 
 
-function tiles_Location_x__P108790(s) {
+function tiles_Location_x__P83576(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77114,22 +77051,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___132161 = undefined;
+    s.scale___107811 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C108786_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C83572_VT)) failedCast(r0);
     r0 = s.arg0.fields["tileMap"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_scale"];
-    s.scale___132161 = (r0);
+    s.scale___107811 = (r0);
     r0 = s.arg0.fields["_col"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 << s.scale___132161);
+    r0 = (s.tmp_1 << s.scale___107811);
     s.tmp_0 = r0;
-    r0 = (s.scale___132161 - 1);
+    r0 = (s.scale___107811 - 1);
     s.tmp_3 = r0;
     r0 = (1 << s.tmp_3);
     s.tmp_2 = r0;
@@ -77137,19 +77074,19 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_x__P108790.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__P108790.isGetter = true;
+tiles_Location_x__P83576.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__P83576.isGetter = true;
 
-function tiles_Location_x__P108790_mk(s) {
+function tiles_Location_x__P83576_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_x__P108790, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_x__P83576, 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___132161: undefined,
+  scale___107811: undefined,
   arg0: undefined,
 } }
 
@@ -77157,7 +77094,7 @@ function tiles_Location_x__P108790_mk(s) {
 
 
 
-function scene_Renderable___drawCore__P108878(s) {
+function scene_Renderable___drawCore__P83657(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77173,19 +77110,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C108875_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C83654_VT)) failedCast(r0);
     s.tmp_0 = if_handler_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.screen___108298;
+    s.tmp_0.arg1 = globals.screen___83075;
     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 = 814; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 818; 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 = 814; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 814; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 814; 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 = 818; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 818; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 818; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -77193,12 +77130,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable___drawCore__P108878.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"]}
+scene_Renderable___drawCore__P83657.info = {"start":390,"length":86,"line":14,"column":8,"endLine":16,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function scene_Renderable___drawCore__P108878_mk(s) {
+function scene_Renderable___drawCore__P83657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable___drawCore__P108878, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable___drawCore__P83657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -77209,7 +77146,7 @@ function scene_Renderable___drawCore__P108878_mk(s) {
 
 
 
-function scene_Renderable___visible__P108877(s) {
+function scene_Renderable___visible__P83656(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77224,29 +77161,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C108875_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C83654_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 = 813; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 817; 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 = 813; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 813; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 813; 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 = 817; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 817; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 817; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable___visible__P108877.info = {"start":305,"length":75,"line":10,"column":8,"endLine":12,"endColumn":9,"fileName":"pxt_modules/game---hw/renderable.ts","functionName":"__visible","argumentNames":["this"]}
+scene_Renderable___visible__P83656.info = {"start":305,"length":75,"line":10,"column":8,"endLine":12,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"__visible","argumentNames":["this"]}
 
-function scene_Renderable___visible__P108877_mk(s) {
+function scene_Renderable___visible__P83656_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable___visible__P108877, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable___visible__P83656, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -77256,7 +77193,7 @@ function scene_Renderable___visible__P108877_mk(s) {
 
 
 
-function Sprite___drawCore__P108574(s) {
+function Sprite___drawCore__P83356(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77266,24 +77203,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___135062 = undefined;
-    s.oy___135070 = undefined;
-    s.l___135078 = undefined;
-    s.t___135082 = undefined;
-    s.font___135097 = undefined;
-    s.tx___135101 = undefined;
-    s.ty___135103 = undefined;
+    s.ox___107915 = undefined;
+    s.oy___107923 = undefined;
+    s.l___107931 = undefined;
+    s.t___107935 = undefined;
+    s.font___107951 = undefined;
+    s.tx___107955 = undefined;
+    s.ty___107957 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_isOutOfScreen__P108573_mk(s);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_isOutOfScreen__P83355_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 329; s.pc = 20; return s.tmp_1;
+    s.callLocIdx = 338; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -77305,7 +77242,7 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.ox___135062 = (s.tmp_4);
+    s.ox___107915 = (s.tmp_4);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -77319,35 +77256,35 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___135070 = (s.tmp_2);
-    s.tmp_1 = Sprite_left__P108559_mk(s);
+    s.oy___107923 = (s.tmp_2);
+    s.tmp_1 = Sprite_left__P83341_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 330; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 339; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.ox___135062);
-    s.l___135078 = (r0);
-    s.tmp_1 = Sprite_top__P108563_mk(s);
+    r0 = (s.tmp_0 - s.ox___107915);
+    s.l___107931 = (r0);
+    s.tmp_1 = Sprite_top__P83345_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 331; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 340; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.oy___135070);
-    s.t___135082 = (r0);
+    r0 = (s.tmp_0 - s.oy___107923);
+    s.t___107935 = (r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___108298, s.tmp_0, s.l___135078, s.t___135082);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___83075, s.tmp_0, s.l___107931, s.t___107935);
     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___135097 = (globals.font5___108246);
-    s.tx___135101 = (s.l___135078);
-    s.tmp_1 = r0 = s.t___135082;
+    s.font___107951 = (globals.font5___83023);
+    s.tx___107955 = (s.l___107931);
+    s.tmp_1 = r0 = s.t___107935;
     r0 = s.arg0.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
@@ -77355,14 +77292,14 @@ switch (step) {
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 2);
-    s.ty___135103 = (r0);
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
+    s.ty___107957 = (r0);
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
-    s.tmp_7 = Sprite_x__P108522_mk(s);
+    s.tmp_7 = Sprite_x__P83304_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 333; s.pc = 24; return s.tmp_7;
+    s.callLocIdx = 342; s.pc = 24; return s.tmp_7;
   case 24:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -77381,9 +77318,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_11 = Sprite_y__P108524_mk(s);
+    s.tmp_11 = Sprite_y__P83306_mk(s);
     s.tmp_11.arg0 = s.arg0;
-    s.callLocIdx = 334; s.pc = 26; return s.tmp_11;
+    s.callLocIdx = 343; s.pc = 26; return s.tmp_11;
   case 26:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -77400,33 +77337,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___135101;
-    s.tmp_0.arg3 = s.ty___135103;
+    s.tmp_0.arg2 = s.tx___107955;
+    s.tmp_0.arg3 = s.ty___107957;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___135097;
+    s.tmp_0.arg5 = s.font___107951;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 335; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 344; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tx___135101;
+    s.tmp_0 = r0 = s.tx___107955;
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.font___135097;
+    s.tmp_2.arg0 = s.font___107951;
     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 = 336; s.pc = 28; return s.tmp_2; }
+     else { s.callLocIdx = 345; 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___135101 = (r0);
-    s.tmp_1 = Sprite_vx__P108526_mk(s);
+    s.tx___107955 = (r0);
+    s.tmp_1 = Sprite_vx__P83308_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 337; s.pc = 29; return s.tmp_1;
+    s.callLocIdx = 346; s.pc = 29; return s.tmp_1;
   case 29:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -77435,9 +77372,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    s.tmp_2 = Sprite_vy__P108528_mk(s);
+    s.tmp_2 = Sprite_vy__P83310_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 338; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 347; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
   case 8:
@@ -77445,16 +77382,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___135103;
+    s.tmp_4 = r0 = s.ty___107957;
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = s.font___135097;
+    s.tmp_7.arg0 = s.font___107951;
     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 = 339; s.pc = 31; return s.tmp_7; }
+     else { s.callLocIdx = 348; s.pc = 31; return s.tmp_7; }
     }
   case 31:
     r0 = s.retval;
@@ -77462,12 +77399,12 @@ switch (step) {
     r0 = (s.tmp_6 + 2);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
-    s.ty___135103 = (r0);
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
-    s.tmp_6 = Sprite_vx__P108526_mk(s);
+    s.ty___107957 = (r0);
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
+    s.tmp_6 = Sprite_vx__P83308_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 340; s.pc = 33; return s.tmp_6;
+    s.callLocIdx = 349; s.pc = 33; return s.tmp_6;
   case 33:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -77486,9 +77423,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_10 = Sprite_vy__P108528_mk(s);
+    s.tmp_10 = Sprite_vy__P83310_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 341; s.pc = 35; return s.tmp_10;
+    s.callLocIdx = 350; s.pc = 35; return s.tmp_10;
   case 35:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -77505,19 +77442,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___135101;
-    s.tmp_0.arg3 = s.ty___135103;
+    s.tmp_0.arg2 = s.tx___107955;
+    s.tmp_0.arg3 = s.ty___107957;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___135097;
+    s.tmp_0.arg5 = s.font___107951;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 342; s.pc = 32; return s.tmp_0;
+    s.callLocIdx = 351; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
   case 9:
   case 10:
-    s.tmp_1 = Sprite_ax__P108530_mk(s);
+    s.tmp_1 = Sprite_ax__P83312_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 343; s.pc = 37; return s.tmp_1;
+    s.callLocIdx = 352; s.pc = 37; return s.tmp_1;
   case 37:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -77526,9 +77463,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    s.tmp_2 = Sprite_ay__P108532_mk(s);
+    s.tmp_2 = Sprite_ay__P83314_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 344; s.pc = 38; return s.tmp_2;
+    s.callLocIdx = 353; s.pc = 38; return s.tmp_2;
   case 38:
     r0 = s.retval;
   case 12:
@@ -77536,16 +77473,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___135103;
+    s.tmp_4 = r0 = s.ty___107957;
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = s.font___135097;
+    s.tmp_7.arg0 = s.font___107951;
     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 = 345; s.pc = 39; return s.tmp_7; }
+     else { s.callLocIdx = 354; s.pc = 39; return s.tmp_7; }
     }
   case 39:
     r0 = s.retval;
@@ -77553,12 +77490,12 @@ switch (step) {
     r0 = (s.tmp_6 + 2);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
-    s.ty___135103 = (r0);
-    s.tmp_0 = helpers_imagePrint__P108256_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
-    s.tmp_6 = Sprite_ax__P108530_mk(s);
+    s.ty___107957 = (r0);
+    s.tmp_0 = helpers_imagePrint__P83033_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
+    s.tmp_6 = Sprite_ax__P83312_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 346; s.pc = 41; return s.tmp_6;
+    s.callLocIdx = 355; s.pc = 41; return s.tmp_6;
   case 41:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -77577,9 +77514,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_10 = Sprite_ay__P108532_mk(s);
+    s.tmp_10 = Sprite_ay__P83314_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 347; s.pc = 43; return s.tmp_10;
+    s.callLocIdx = 356; s.pc = 43; return s.tmp_10;
   case 43:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -77596,26 +77533,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___135101;
-    s.tmp_0.arg3 = s.ty___135103;
+    s.tmp_0.arg2 = s.tx___107955;
+    s.tmp_0.arg3 = s.ty___107957;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___135097;
+    s.tmp_0.arg5 = s.font___107951;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 348; s.pc = 40; return s.tmp_0;
+    s.callLocIdx = 357; 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___109025);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___83804);
     if (!r0) { step = 17; continue; }
-    s.tmp_0 = helpers_imageDrawRect__P108227_mk(s);
-    s.tmp_0.arg0 = globals.screen___108298;
-    s.tmp_3 = game_Hitbox_left__P108463_mk(s);
+    s.tmp_0 = helpers_imageDrawRect__P83004_mk(s);
+    s.tmp_0.arg0 = globals.screen___83075;
+    s.tmp_3 = game_Hitbox_left__P83239_mk(s);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 349; s.pc = 46; return s.tmp_3;
+    s.callLocIdx = 358; s.pc = 46; return s.tmp_3;
   case 46:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -77623,12 +77560,12 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 8);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.ox___135062);
+    r0 = (s.tmp_1 - s.ox___107915);
     s.tmp_0.arg1 = r0;
-    s.tmp_7 = game_Hitbox_top__P108464_mk(s);
+    s.tmp_7 = game_Hitbox_top__P83240_mk(s);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 351; s.pc = 47; return s.tmp_7;
+    s.callLocIdx = 360; s.pc = 47; return s.tmp_7;
   case 47:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -77636,7 +77573,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 >> 8);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.oy___135070);
+    r0 = (s.tmp_5 - s.oy___107923);
     s.tmp_0.arg2 = r0;
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["width"];
@@ -77653,7 +77590,7 @@ switch (step) {
     r0 = (s.tmp_12 >> 8);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 355; s.pc = 45; return s.tmp_0;
+    s.callLocIdx = 364; s.pc = 45; return s.tmp_0;
   case 45:
     r0 = s.retval;
   case 17:
@@ -77663,12 +77600,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___drawCore__P108574.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"]}
+Sprite___drawCore__P83356.info = {"start":21147,"length":1383,"line":648,"column":4,"endLine":686,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function Sprite___drawCore__P108574_mk(s) {
+function Sprite___drawCore__P83356_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___drawCore__P108574, depth: s.depth + 1,
+        parent: s, fn: Sprite___drawCore__P83356, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -77683,13 +77620,13 @@ function Sprite___drawCore__P108574_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  ox___135062: undefined,
-  oy___135070: undefined,
-  l___135078: undefined,
-  t___135082: undefined,
-  font___135097: undefined,
-  tx___135101: undefined,
-  ty___135103: undefined,
+  ox___107915: undefined,
+  oy___107923: undefined,
+  l___107931: undefined,
+  t___107935: undefined,
+  font___107951: undefined,
+  tx___107955: undefined,
+  ty___107957: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -77698,7 +77635,7 @@ function Sprite___drawCore__P108574_mk(s) {
 
 
 
-function Sprite___visible__P108556(s) {
+function Sprite___visible__P83338(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77713,7 +77650,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C108513_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C83295_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 128);
@@ -77724,12 +77661,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___visible__P108556.info = {"start":8329,"length":72,"line":303,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game---hw/sprite.ts","functionName":"__visible","argumentNames":["this"]}
+Sprite___visible__P83338.info = {"start":8612,"length":72,"line":309,"column":4,"endLine":311,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__visible","argumentNames":["this"]}
 
-function Sprite___visible__P108556_mk(s) {
+function Sprite___visible__P83338_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___visible__P108556, depth: s.depth + 1,
+        parent: s, fn: Sprite___visible__P83338, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -77741,7 +77678,7 @@ function Sprite___visible__P108556_mk(s) {
 
 
 
-function particles_ShapeFactory_drawParticle__P109240(s) {
+function particles_ShapeFactory_drawParticle__P84019(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77751,7 +77688,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pImage___132183 = undefined;
+    s.pImage___107838 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -77760,23 +77697,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C109237_VT)) failedCast(r0);
-    s.tmp_1 = Math_FastRandom_pickRandom__P109088_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C84016_VT)) failedCast(r0);
+    s.tmp_1 = Math_FastRandom_pickRandom__P83867_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["sources"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1188; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1192; 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___132183 = (r0);
+    s.pImage___107838 = (r0);
     r0 = s.arg1.fields["color"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.replace(s.pImage___132183, 15, s.tmp_0);
-    s.tmp_0 = r0 = globals.screen___108298;
-    s.tmp_1 = r0 = s.pImage___132183;
+    r0 = pxsim_ImageMethods.replace(s.pImage___107838, 15, s.tmp_0);
+    s.tmp_0 = r0 = globals.screen___83075;
+    s.tmp_1 = r0 = s.pImage___107838;
     r0 = s.arg0.fields["ox"];
     s.tmp_4 = r0;
     r0 = (s.arg2 - s.tmp_4);
@@ -77798,12 +77735,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_drawParticle__P109240.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"]}
+particles_ShapeFactory_drawParticle__P84019.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"]}
 
-function particles_ShapeFactory_drawParticle__P109240_mk(s) {
+function particles_ShapeFactory_drawParticle__P84019_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_drawParticle__P109240, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_drawParticle__P84019, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -77815,7 +77752,7 @@ function particles_ShapeFactory_drawParticle__P109240_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  pImage___132183: undefined,
+  pImage___107838: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -77826,7 +77763,7 @@ function particles_ShapeFactory_drawParticle__P109240_mk(s) {
 
 
 
-function Math_FastRandom_pickRandom__P109088(s) {
+function Math_FastRandom_pickRandom__P83867(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77842,7 +77779,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C109083_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C83862_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -77865,14 +77802,14 @@ switch (step) {
   case 3:
   case 4:
     s.tmp_4 = r0 = s.arg1;
-    s.tmp_6 = Math_FastRandom_randomRange__P109087_mk(s);
+    s.tmp_6 = Math_FastRandom_randomRange__P83866_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 = 917; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 921; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -77881,12 +77818,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_pickRandom__P109088.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"]}
+Math_FastRandom_pickRandom__P83867.info = {"start":2358,"length":192,"line":70,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"pickRandom","argumentNames":["this","list"]}
 
-function Math_FastRandom_pickRandom__P109088_mk(s) {
+function Math_FastRandom_pickRandom__P83867_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_pickRandom__P109088, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_pickRandom__P83867, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -77904,7 +77841,7 @@ function Math_FastRandom_pickRandom__P109088_mk(s) {
 
 
 
-function particles_AreaFactory_drawParticle__P109228(s) {
+function particles_AreaFactory_drawParticle__P84007(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -77914,7 +77851,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.col___135031 = undefined;
+    s.col___107884 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -77923,7 +77860,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_AreaFactory__C109221_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_AreaFactory__C84000_VT)) failedCast(r0);
     r0 = s.arg1.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 500);
@@ -77950,8 +77887,8 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.col___135031 = (s.tmp_5);
-    s.tmp_0 = r0 = globals.screen___108298;
+    s.col___107884 = (s.tmp_5);
+    s.tmp_0 = r0 = globals.screen___83075;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -77960,17 +77897,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___135031);
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_3, s.col___107884);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_drawParticle__P109228.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"]}
+particles_AreaFactory_drawParticle__P84007.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"]}
 
-function particles_AreaFactory_drawParticle__P109228_mk(s) {
+function particles_AreaFactory_drawParticle__P84007_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_drawParticle__P109228, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_drawParticle__P84007, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -77978,7 +77915,7 @@ function particles_AreaFactory_drawParticle__P109228_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  col___135031: undefined,
+  col___107884: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -77989,7 +77926,7 @@ function particles_AreaFactory_drawParticle__P109228_mk(s) {
 
 
 
-function particles_SprayFactory_drawParticle__P109218(s) {
+function particles_SprayFactory_drawParticle__P83997(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78007,8 +77944,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C109215_VT)) failedCast(r0);
-    s.tmp_0 = r0 = globals.screen___108298;
+    if (!checkSubtype(r0, particles_SprayFactory__C83994_VT)) failedCast(r0);
+    s.tmp_0 = r0 = globals.screen___83075;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -78022,12 +77959,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_drawParticle__P109218.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"]}
+particles_SprayFactory_drawParticle__P83997.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"]}
 
-function particles_SprayFactory_drawParticle__P109218_mk(s) {
+function particles_SprayFactory_drawParticle__P83997_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_drawParticle__P109218, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_drawParticle__P83997, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78044,7 +77981,7 @@ function particles_SprayFactory_drawParticle__P109218_mk(s) {
 
 
 
-function kodu_Button_update__P522441(s) {
+function kodu_Button_update__P84874(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78060,21 +77997,21 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["hud"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Button_updateScreenRelative__P522443_mk(s);
+    s.tmp_1 = kodu_Button_updateScreenRelative__P84876_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 175; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 174; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_Button_updateAbsolute__P522442_mk(s);
+    s.tmp_0 = kodu_Button_updateAbsolute__P84875_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 176; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 175; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 2:
@@ -78082,12 +78019,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_update__P522441.info = {"start":3692,"length":177,"line":118,"column":8,"endLine":124,"endColumn":9,"fileName":"button.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_Button_update__P84874.info = {"start":3692,"length":177,"line":118,"column":8,"endLine":124,"endColumn":9,"fileName":"button.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_Button_update__P522441_mk(s) {
+function kodu_Button_update__P84874_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_update__P522441, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_update__P84874, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78099,7 +78036,7 @@ function kodu_Button_update__P522441_mk(s) {
 
 
 
-function kodu_Button_updateAbsolute__P522442(s) {
+function kodu_Button_updateAbsolute__P84875(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78114,41 +78051,41 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 177; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 176; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 178; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 177; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = s.arg0.fields["back"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Kelpie_x__P110490_mk(s);
+    s.tmp_1 = kodu_Kelpie_x__P85273_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 179; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 178; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     r0 = s.arg0.fields["back"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 180; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 179; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 1:
@@ -78157,28 +78094,28 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = Sprite_x__P108523_mk(s);
+    s.tmp_1 = Sprite_x__P83305_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 181; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 180; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P108525_mk(s);
+    s.tmp_0 = Sprite_y__P83307_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_1 = r0;
-    s.tmp_3 = kodu_Button_height__P522429_mk(s);
+    s.tmp_3 = kodu_Button_height__P84862_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 182; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 181; 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.arg1 = r0;
-    s.callLocIdx = 183; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 182; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 3:
@@ -78187,12 +78124,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_updateAbsolute__P522442.info = {"start":3879,"length":348,"line":126,"column":8,"endLine":137,"endColumn":9,"fileName":"button.ts","functionName":"updateAbsolute","argumentNames":["this"]}
+kodu_Button_updateAbsolute__P84875.info = {"start":3879,"length":348,"line":126,"column":8,"endLine":137,"endColumn":9,"fileName":"button.ts","functionName":"updateAbsolute","argumentNames":["this"]}
 
-function kodu_Button_updateAbsolute__P522442_mk(s) {
+function kodu_Button_updateAbsolute__P84875_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_updateAbsolute__P522442, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_updateAbsolute__P84875, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78205,7 +78142,7 @@ function kodu_Button_updateAbsolute__P522442_mk(s) {
 
 
 
-function kodu_Button_updateScreenRelative__P522443(s) {
+function kodu_Button_updateScreenRelative__P84876(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78215,40 +78152,40 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.camera___522773 = undefined;
+    s.camera___88121 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Button__C522425_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Button__C84856_VT)) failedCast(r0);
     r0 = s.arg0.fields["stage"];
     r0 = r0.fields["camera"];
-    s.camera___522773 = (r0);
-    s.tmp_0 = kodu_Camera_setScreenRelativePosition__P530754_mk(s);
-    s.tmp_0.arg0 = s.camera___522773;
+    s.camera___88121 = (r0);
+    s.tmp_0 = kodu_Camera_setScreenRelativePosition__P84887_mk(s);
+    s.tmp_0.arg0 = s.camera___88121;
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg1 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_0.arg2 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 184; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 183; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = s.arg0.fields["back"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Camera_setScreenRelativePosition__P530754_mk(s);
-    s.tmp_1.arg0 = s.camera___522773;
+    s.tmp_1 = kodu_Camera_setScreenRelativePosition__P84887_mk(s);
+    s.tmp_1.arg0 = s.camera___88121;
     r0 = s.arg0.fields["back"];
     s.tmp_1.arg1 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_1.arg2 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_1.arg3 = r0;
-    s.callLocIdx = 185; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 184; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
   case 1:
@@ -78257,23 +78194,23 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = kodu_Camera_setScreenRelativePosition__P530754_mk(s);
-    s.tmp_1.arg0 = s.camera___522773;
+    s.tmp_1 = kodu_Camera_setScreenRelativePosition__P84887_mk(s);
+    s.tmp_1.arg0 = s.camera___88121;
     r0 = s.arg0.fields["text"];
     s.tmp_1.arg1 = r0;
     r0 = s.arg0.fields["x"];
     s.tmp_1.arg2 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_2 = r0;
-    s.tmp_4 = kodu_Button_height__P522429_mk(s);
+    s.tmp_4 = kodu_Button_height__P84862_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 186; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 185; 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.arg3 = r0;
-    s.callLocIdx = 187; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 186; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
   case 3:
@@ -78282,19 +78219,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Button_updateScreenRelative__P522443.info = {"start":4237,"length":407,"line":139,"column":8,"endLine":148,"endColumn":9,"fileName":"button.ts","functionName":"updateScreenRelative","argumentNames":["this"]}
+kodu_Button_updateScreenRelative__P84876.info = {"start":4237,"length":407,"line":139,"column":8,"endLine":148,"endColumn":9,"fileName":"button.ts","functionName":"updateScreenRelative","argumentNames":["this"]}
 
-function kodu_Button_updateScreenRelative__P522443_mk(s) {
+function kodu_Button_updateScreenRelative__P84876_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Button_updateScreenRelative__P522443, depth: s.depth + 1,
+        parent: s, fn: kodu_Button_updateScreenRelative__P84876, 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,
-  camera___522773: undefined,
+  camera___88121: undefined,
   arg0: undefined,
 } }
 
@@ -78302,7 +78239,7 @@ function kodu_Button_updateScreenRelative__P522443_mk(s) {
 
 
 
-function kodu_Camera_setScreenRelativePosition__P530754(s) {
+function kodu_Camera_setScreenRelativePosition__P84887(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78312,7 +78249,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___530800 = undefined;
+    s.s___88192 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -78321,17 +78258,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Camera__C530755_VT)) failedCast(r0);
-    s.s___530800 = (s.arg1);
+    if (!checkSubtype(r0, kodu_Camera__C84878_VT)) failedCast(r0);
+    s.s___88192 = (s.arg1);
     s.tmp_0 = if_x_2_mk(s);
-    s.tmp_0.arg0 = s.s___530800;
-    s.tmp_4 = scene_cameraProperty__P108965_mk(s);
+    s.tmp_0.arg0 = s.s___88192;
+    s.tmp_4 = scene_cameraProperty__P83744_mk(s);
     s.tmp_4.arg0 = 0;
-    s.callLocIdx = 191; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 190; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 / 2);
     s.tmp_5 = r0;
@@ -78349,19 +78286,19 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/x"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["x"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 193; s.pc = 1; return s.tmp_0; }
+     else { s.callLocIdx = 192; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     s.tmp_0 = if_y_2_mk(s);
-    s.tmp_0.arg0 = s.s___530800;
-    s.tmp_4 = scene_cameraProperty__P108965_mk(s);
+    s.tmp_0.arg0 = s.s___88192;
+    s.tmp_4 = scene_cameraProperty__P83744_mk(s);
     s.tmp_4.arg0 = 1;
-    s.callLocIdx = 194; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 193; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 / 2);
     s.tmp_5 = r0;
@@ -78379,7 +78316,7 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/y"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["y"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 196; s.pc = 3; return s.tmp_0; }
+     else { s.callLocIdx = 195; s.pc = 3; return s.tmp_0; }
     }
   case 3:
     r0 = s.retval;
@@ -78387,12 +78324,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Camera_setScreenRelativePosition__P530754.info = {"start":552,"length":340,"line":17,"column":8,"endLine":21,"endColumn":9,"fileName":"camera.ts","functionName":"setScreenRelativePosition","argumentNames":["this","k","x","y"]}
+kodu_Camera_setScreenRelativePosition__P84887.info = {"start":552,"length":340,"line":17,"column":8,"endLine":21,"endColumn":9,"fileName":"camera.ts","functionName":"setScreenRelativePosition","argumentNames":["this","k","x","y"]}
 
-function kodu_Camera_setScreenRelativePosition__P530754_mk(s) {
+function kodu_Camera_setScreenRelativePosition__P84887_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Camera_setScreenRelativePosition__P530754, depth: s.depth + 1,
+        parent: s, fn: kodu_Camera_setScreenRelativePosition__P84887, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78402,7 +78339,7 @@ function kodu_Camera_setScreenRelativePosition__P530754_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  s___530800: undefined,
+  s___88192: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -78413,7 +78350,7 @@ function kodu_Camera_setScreenRelativePosition__P530754_mk(s) {
 
 
 
-function scene_screenHeight__P108953(s) {
+function scene_screenHeight__P83732(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78423,16 +78360,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenHeight__P108953.info = {"start":876,"length":76,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"screenHeight","argumentNames":[]}
+scene_screenHeight__P83732.info = {"start":876,"length":76,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenHeight","argumentNames":[]}
 
-function scene_screenHeight__P108953_mk(s) {
+function scene_screenHeight__P83732_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenHeight__P108953, depth: s.depth + 1,
+        parent: s, fn: scene_screenHeight__P83732, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -78440,7 +78377,7 @@ function scene_screenHeight__P108953_mk(s) {
 
 
 
-function scene_screenWidth__P108952(s) {
+function scene_screenWidth__P83731(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78450,16 +78387,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenWidth__P108952.info = {"start":604,"length":74,"line":30,"column":4,"endLine":32,"endColumn":5,"fileName":"pxt_modules/game---hw/scenes.ts","functionName":"screenWidth","argumentNames":[]}
+scene_screenWidth__P83731.info = {"start":604,"length":74,"line":30,"column":4,"endLine":32,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenWidth","argumentNames":[]}
 
-function scene_screenWidth__P108952_mk(s) {
+function scene_screenWidth__P83731_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenWidth__P108952, depth: s.depth + 1,
+        parent: s, fn: scene_screenWidth__P83731, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -78467,7 +78404,7 @@ function scene_screenWidth__P108952_mk(s) {
 
 
 
-function kodu_Kelpie___drawCore__P110513(s) {
+function kodu_Kelpie___drawCore__P85296(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78477,18 +78414,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___121168 = undefined;
-    s.oy___121173 = undefined;
-    s.l___121178 = undefined;
-    s.t___121182 = undefined;
+    s.ox___96499 = undefined;
+    s.oy___96504 = undefined;
+    s.l___96509 = undefined;
+    s.t___96513 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Kelpie_isOutOfScreen__P110511_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Kelpie_isOutOfScreen__P85294_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     s.callLocIdx = 1622; s.pc = 8; return s.tmp_1;
@@ -78500,7 +78437,7 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    s.tmp_3 = kodu_Kelpie_hud__P110505_mk(s);
+    s.tmp_3 = kodu_Kelpie_hud__P85288_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 1623; s.pc = 9; return s.tmp_3;
   case 9:
@@ -78515,8 +78452,8 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.ox___121168 = (s.tmp_4);
-    s.tmp_1 = kodu_Kelpie_hud__P110505_mk(s);
+    s.ox___96499 = (s.tmp_4);
+    s.tmp_1 = kodu_Kelpie_hud__P85288_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1624; s.pc = 10; return s.tmp_1;
   case 10:
@@ -78531,47 +78468,47 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___121173 = (s.tmp_2);
-    s.tmp_1 = kodu_Kelpie_left__P110495_mk(s);
+    s.oy___96504 = (s.tmp_2);
+    s.tmp_1 = kodu_Kelpie_left__P85278_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1625; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.ox___121168);
-    s.l___121178 = (r0);
-    s.tmp_1 = kodu_Kelpie_top__P110498_mk(s);
+    r0 = (s.tmp_0 - s.ox___96499);
+    s.l___96509 = (r0);
+    s.tmp_1 = kodu_Kelpie_top__P85281_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1626; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.oy___121173);
-    s.t___121182 = (r0);
+    r0 = (s.tmp_0 - s.oy___96504);
+    s.t___96513 = (r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___108298, s.tmp_0, s.l___121178, s.t___121182);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___83075, s.tmp_0, s.l___96509, s.t___96513);
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie___drawCore__P110513.info = {"start":3591,"length":354,"line":119,"column":8,"endLine":129,"endColumn":9,"fileName":"kelpie.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+kodu_Kelpie___drawCore__P85296.info = {"start":3591,"length":354,"line":119,"column":8,"endLine":129,"endColumn":9,"fileName":"kelpie.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function kodu_Kelpie___drawCore__P110513_mk(s) {
+function kodu_Kelpie___drawCore__P85296_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie___drawCore__P110513, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie___drawCore__P85296, 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,
-  ox___121168: undefined,
-  oy___121173: undefined,
-  l___121178: undefined,
-  t___121182: undefined,
+  ox___96499: undefined,
+  oy___96504: undefined,
+  l___96509: undefined,
+  t___96513: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -78580,7 +78517,7 @@ function kodu_Kelpie___drawCore__P110513_mk(s) {
 
 
 
-function kodu_Kelpie_hud__P110505(s) {
+function kodu_Kelpie_hud__P85288(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78595,7 +78532,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
     r0 = s.arg0.fields["_flags"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 & 0);
@@ -78610,13 +78547,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_hud__P110505.info = {"start":2218,"length":55,"line":87,"column":8,"endLine":87,"endColumn":63,"fileName":"kelpie.ts","functionName":"hud","argumentNames":["this"]}
-kodu_Kelpie_hud__P110505.isGetter = true;
+kodu_Kelpie_hud__P85288.info = {"start":2218,"length":55,"line":87,"column":8,"endLine":87,"endColumn":63,"fileName":"kelpie.ts","functionName":"hud","argumentNames":["this"]}
+kodu_Kelpie_hud__P85288.isGetter = true;
 
-function kodu_Kelpie_hud__P110505_mk(s) {
+function kodu_Kelpie_hud__P85288_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_hud__P110505, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_hud__P85288, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78630,7 +78567,7 @@ function kodu_Kelpie_hud__P110505_mk(s) {
 
 
 
-function kodu_Kelpie_isOutOfScreen__P110511(s) {
+function kodu_Kelpie_isOutOfScreen__P85294(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78640,16 +78577,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___121128 = undefined;
-    s.oy___121133 = undefined;
+    s.ox___96459 = undefined;
+    s.oy___96464 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Kelpie_hud__P110505_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Kelpie_hud__P85288_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1615; s.pc = 11; return s.tmp_1;
   case 11:
@@ -78664,8 +78601,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.ox___121128 = (s.tmp_2);
-    s.tmp_1 = kodu_Kelpie_hud__P110505_mk(s);
+    s.ox___96459 = (s.tmp_2);
+    s.tmp_1 = kodu_Kelpie_hud__P85288_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1616; s.pc = 12; return s.tmp_1;
   case 12:
@@ -78680,16 +78617,16 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___121133 = (s.tmp_2);
-    s.tmp_3 = kodu_Kelpie_left__P110495_mk(s);
+    s.oy___96464 = (s.tmp_2);
+    s.tmp_3 = kodu_Kelpie_left__P85278_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 1617; s.pc = 13; return s.tmp_3;
   case 13:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.ox___121128);
+    r0 = (s.tmp_2 - s.ox___96459);
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___108298);
+    r0 = pxsim_ImageMethods.width(globals.screen___83075);
     s.tmp_4 = r0;
     r0 = (s.tmp_1 > s.tmp_4);
     s.tmp_0 = r0;
@@ -78698,15 +78635,15 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_7 = kodu_Kelpie_top__P110498_mk(s);
+    s.tmp_7 = kodu_Kelpie_top__P85281_mk(s);
     s.tmp_7.arg0 = s.arg0;
     s.callLocIdx = 1618; s.pc = 14; return s.tmp_7;
   case 14:
     r0 = s.retval;
     s.tmp_6 = r0;
-    r0 = (s.tmp_6 - s.oy___121133);
+    r0 = (s.tmp_6 - s.oy___96464);
     s.tmp_5 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___108298);
+    r0 = pxsim_ImageMethods.height(globals.screen___83075);
     s.tmp_8 = r0;
     r0 = (s.tmp_5 > s.tmp_8);
   case 6:
@@ -78717,13 +78654,13 @@ switch (step) {
     r0 = s.tmp_9;
     { step = 8; continue; }
   case 7:
-    s.tmp_12 = kodu_Kelpie_right__P110497_mk(s);
+    s.tmp_12 = kodu_Kelpie_right__P85280_mk(s);
     s.tmp_12.arg0 = s.arg0;
     s.callLocIdx = 1619; s.pc = 15; return s.tmp_12;
   case 15:
     r0 = s.retval;
     s.tmp_11 = r0;
-    r0 = (s.tmp_11 - s.ox___121128);
+    r0 = (s.tmp_11 - s.ox___96459);
     s.tmp_10 = r0;
     r0 = (s.tmp_10 < 0);
   case 8:
@@ -78734,13 +78671,13 @@ switch (step) {
     r0 = s.tmp_13;
     { step = 10; continue; }
   case 9:
-    s.tmp_16 = kodu_Kelpie_bottom__P110500_mk(s);
+    s.tmp_16 = kodu_Kelpie_bottom__P85283_mk(s);
     s.tmp_16.arg0 = s.arg0;
     s.callLocIdx = 1620; s.pc = 16; return s.tmp_16;
   case 16:
     r0 = s.retval;
     s.tmp_15 = r0;
-    r0 = (s.tmp_15 - s.oy___121133);
+    r0 = (s.tmp_15 - s.oy___96464);
     s.tmp_14 = r0;
     r0 = (s.tmp_14 < 0);
   case 10:
@@ -78750,12 +78687,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_isOutOfScreen__P110511.info = {"start":3123,"length":306,"line":108,"column":8,"endLine":112,"endColumn":9,"fileName":"kelpie.ts","functionName":"isOutOfScreen","argumentNames":["this","camera"]}
+kodu_Kelpie_isOutOfScreen__P85294.info = {"start":3123,"length":306,"line":108,"column":8,"endLine":112,"endColumn":9,"fileName":"kelpie.ts","functionName":"isOutOfScreen","argumentNames":["this","camera"]}
 
-function kodu_Kelpie_isOutOfScreen__P110511_mk(s) {
+function kodu_Kelpie_isOutOfScreen__P85294_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_isOutOfScreen__P110511, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_isOutOfScreen__P85294, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78775,8 +78712,8 @@ function kodu_Kelpie_isOutOfScreen__P110511_mk(s) {
   tmp_15: undefined,
   tmp_16: undefined,
   tmp_17: undefined,
-  ox___121128: undefined,
-  oy___121133: undefined,
+  ox___96459: undefined,
+  oy___96464: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -78785,7 +78722,7 @@ function kodu_Kelpie_isOutOfScreen__P110511_mk(s) {
 
 
 
-function kodu_Kelpie_bottom__P110500(s) {
+function kodu_Kelpie_bottom__P85283(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78800,8 +78737,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_1 = kodu_Kelpie_top__P110498_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_1 = kodu_Kelpie_top__P85281_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 1607; s.pc = 1; return s.tmp_1;
   case 1:
@@ -78815,13 +78752,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_bottom__P110500.info = {"start":1674,"length":67,"line":65,"column":8,"endLine":67,"endColumn":9,"fileName":"kelpie.ts","functionName":"bottom","argumentNames":["this"]}
-kodu_Kelpie_bottom__P110500.isGetter = true;
+kodu_Kelpie_bottom__P85283.info = {"start":1674,"length":67,"line":65,"column":8,"endLine":67,"endColumn":9,"fileName":"kelpie.ts","functionName":"bottom","argumentNames":["this"]}
+kodu_Kelpie_bottom__P85283.isGetter = true;
 
-function kodu_Kelpie_bottom__P110500_mk(s) {
+function kodu_Kelpie_bottom__P85283_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_bottom__P110500, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_bottom__P85283, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78834,7 +78771,7 @@ function kodu_Kelpie_bottom__P110500_mk(s) {
 
 
 
-function kodu_Kelpie___visible__P110512(s) {
+function kodu_Kelpie___visible__P85295(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78849,8 +78786,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_2 = kodu_Kelpie_invisible__P110507_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_2 = kodu_Kelpie_invisible__P85290_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 1621; s.pc = 1; return s.tmp_2;
   case 1:
@@ -78862,12 +78799,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie___visible__P110512.info = {"start":3439,"length":142,"line":114,"column":8,"endLine":117,"endColumn":9,"fileName":"kelpie.ts","functionName":"__visible","argumentNames":["this"]}
+kodu_Kelpie___visible__P85295.info = {"start":3439,"length":142,"line":114,"column":8,"endLine":117,"endColumn":9,"fileName":"kelpie.ts","functionName":"__visible","argumentNames":["this"]}
 
-function kodu_Kelpie___visible__P110512_mk(s) {
+function kodu_Kelpie___visible__P85295_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie___visible__P110512, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie___visible__P85295, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78879,7 +78816,7 @@ function kodu_Kelpie___visible__P110512_mk(s) {
 
 
 
-function kodu_Kelpie_top__P110499(s) {
+function kodu_Kelpie_top__P85282(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78895,8 +78832,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_y__P110492_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_y__P85275_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -78914,12 +78851,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_top__P110499.info = {"start":1527,"length":82,"line":60,"column":8,"endLine":62,"endColumn":9,"fileName":"kelpie.ts","functionName":"top","argumentNames":["this","value"]}
+kodu_Kelpie_top__P85282.info = {"start":1527,"length":82,"line":60,"column":8,"endLine":62,"endColumn":9,"fileName":"kelpie.ts","functionName":"top","argumentNames":["this","value"]}
 
-function kodu_Kelpie_top__P110499_mk(s) {
+function kodu_Kelpie_top__P85282_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_top__P110499, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_top__P85282, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78934,7 +78871,7 @@ function kodu_Kelpie_top__P110499_mk(s) {
 
 
 
-function kodu_Kelpie_left__P110496(s) {
+function kodu_Kelpie_left__P85279(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78950,8 +78887,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Kelpie__C110487_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Kelpie_x__P110490_mk(s);
+    if (!checkSubtype(r0, kodu_Kelpie__C85270_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Kelpie_x__P85273_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -78969,12 +78906,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Kelpie_left__P110496.info = {"start":1174,"length":83,"line":47,"column":8,"endLine":49,"endColumn":9,"fileName":"kelpie.ts","functionName":"left","argumentNames":["this","value"]}
+kodu_Kelpie_left__P85279.info = {"start":1174,"length":83,"line":47,"column":8,"endLine":49,"endColumn":9,"fileName":"kelpie.ts","functionName":"left","argumentNames":["this","value"]}
 
-function kodu_Kelpie_left__P110496_mk(s) {
+function kodu_Kelpie_left__P85279_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Kelpie_left__P110496, depth: s.depth + 1,
+        parent: s, fn: kodu_Kelpie_left__P85279, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -78989,7 +78926,7 @@ function kodu_Kelpie_left__P110496_mk(s) {
 
 
 
-function kodu_Cursor_notify__P549540(s) {
+function kodu_Cursor_notify__P84999(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -78999,8 +78936,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.savedGame___549843 = undefined;
-    s.savedGame___549852 = undefined;
+    s.savedGame___89310 = undefined;
+    s.savedGame___89320 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -79008,30 +78945,30 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = (s.arg1 === "save");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.savedGame___549843 = (s.arg2);
+    s.savedGame___89310 = (s.arg2);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_2 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 376; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 375; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "x", s.tmp_1);
-    s.tmp_4 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_4 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 377; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 376; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "y", s.tmp_3);
     s.tmp_5 = if_cursor_2_mk(s);
-    s.tmp_5.arg0 = s.savedGame___549843;
+    s.tmp_5.arg0 = s.savedGame___89310;
     s.tmp_5.arg1 = s.tmp_0;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapSetByString(s.tmp_5.arg0, "cursor", s.tmp_5.arg1);
@@ -79039,7 +78976,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["set/cursor"];
       if (s.tmp_5.fn === null) { s.tmp_5.arg0.fields["cursor"] = s.tmp_5.arg1; }
       else if (s.tmp_5.fn === undefined) { failedCast(s.tmp_5.arg0) } 
-     else { s.callLocIdx = 378; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 377; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
@@ -79049,34 +78986,34 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.savedGame___549852 = (s.arg2);
+    s.savedGame___89320 = (s.arg2);
     s.tmp_1 = if_cursor_1_mk(s);
-    s.tmp_1.arg0 = s.savedGame___549852;
+    s.tmp_1.arg0 = s.savedGame___89320;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "cursor");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["cursor"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["cursor"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 379; s.pc = 10; return s.tmp_1; }
+     else { s.callLocIdx = 378; s.pc = 10; return s.tmp_1; }
     }
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = kodu_Cursor_x__P549530_mk(s);
+    s.tmp_2 = kodu_Cursor_x__P84988_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_3 = if_x_1_mk(s);
     s.tmp_4 = if_cursor_1_mk(s);
-    s.tmp_4.arg0 = s.savedGame___549852;
+    s.tmp_4.arg0 = s.savedGame___89320;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "cursor");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["cursor"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["cursor"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 380; s.pc = 13; return s.tmp_4; }
+     else { s.callLocIdx = 379; s.pc = 13; return s.tmp_4; }
     }
   case 13:
     r0 = s.retval;
@@ -79087,26 +79024,26 @@ 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 = 381; s.pc = 12; return s.tmp_3; }
+     else { s.callLocIdx = 380; s.pc = 12; return s.tmp_3; }
     }
   case 12:
     r0 = s.retval;
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 382; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 381; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_y__P549531_mk(s);
+    s.tmp_0 = kodu_Cursor_y__P84989_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = if_y_1_mk(s);
     s.tmp_2 = if_cursor_1_mk(s);
-    s.tmp_2.arg0 = s.savedGame___549852;
+    s.tmp_2.arg0 = s.savedGame___89320;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "cursor");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["cursor"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["cursor"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 383; s.pc = 16; return s.tmp_2; }
+     else { s.callLocIdx = 382; s.pc = 16; return s.tmp_2; }
     }
   case 16:
     r0 = s.retval;
@@ -79117,22 +79054,22 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["y"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["y"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 384; s.pc = 15; return s.tmp_1; }
+     else { s.callLocIdx = 383; s.pc = 15; return s.tmp_1; }
     }
   case 15:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 385; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 384; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 2:
   case 3:
     r0 = (s.arg0).fields["disabled"] = (false);
-    s.tmp_0 = kodu_Cursor_setCursorMode__P549532_mk(s);
+    s.tmp_0 = kodu_Cursor_setCursorMode__P84991_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["cursorMode"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 386; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 385; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
   case 4:
@@ -79142,12 +79079,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_notify__P549540.info = {"start":4797,"length":552,"line":140,"column":8,"endLine":153,"endColumn":9,"fileName":"cursor.ts","functionName":"notify","argumentNames":["this","event","parm"]}
+kodu_Cursor_notify__P84999.info = {"start":4797,"length":552,"line":140,"column":8,"endLine":153,"endColumn":9,"fileName":"cursor.ts","functionName":"notify","argumentNames":["this","event","parm"]}
 
-function kodu_Cursor_notify__P549540_mk(s) {
+function kodu_Cursor_notify__P84999_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_notify__P549540, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_notify__P84999, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -79155,8 +79092,8 @@ function kodu_Cursor_notify__P549540_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  savedGame___549843: undefined,
-  savedGame___549852: undefined,
+  savedGame___89310: undefined,
+  savedGame___89320: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -79166,7 +79103,7 @@ function kodu_Cursor_notify__P549540_mk(s) {
 
 
 
-function kodu_Cursor_update__P549539(s) {
+function kodu_Cursor_update__P84998(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79176,16 +79113,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x___549758 = undefined;
-    s.y___549759 = undefined;
-    s.t___549785 = undefined;
+    s.x___89225 = undefined;
+    s.y___89226 = undefined;
+    s.t___89252 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = s.arg0.fields["disabled"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -79193,11 +79130,11 @@ switch (step) {
     { step = 17; continue; }
   case 1:
   case 2:
-    s.x___549758 = (0);
-    s.y___549759 = (0);
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.up___108377;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.x___89225 = (0);
+    s.y___89226 = (0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.up___83153;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 18; return s.tmp_1;
   case 18:
@@ -79205,13 +79142,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = (s.y___549759 - 1);
-    s.y___549759 = (r0);
+    r0 = (s.y___89226 - 1);
+    s.y___89226 = (r0);
   case 3:
   case 4:
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.down___108379;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.down___83155;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 19; return s.tmp_1;
   case 19:
@@ -79219,13 +79156,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = (s.y___549759 + 1);
-    s.y___549759 = (r0);
+    r0 = (s.y___89226 + 1);
+    s.y___89226 = (r0);
   case 5:
   case 6:
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.left___108376;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.left___83152;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_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:
@@ -79233,13 +79170,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = (s.x___549758 - 1);
-    s.x___549758 = (r0);
+    r0 = (s.x___89225 - 1);
+    s.x___89225 = (r0);
   case 7:
   case 8:
-    s.tmp_1 = controller_Button__C108400_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.right___108378;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C108400_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C83176_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.right___83154;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C83176_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 21; return s.tmp_1;
   case 21:
@@ -79247,25 +79184,25 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = (s.x___549758 + 1);
-    s.x___549758 = (r0);
+    r0 = (s.x___89225 + 1);
+    s.x___89225 = (r0);
   case 9:
   case 10:
-    s.tmp_0 = r0 = s.x___549758;
+    s.tmp_0 = r0 = s.x___89225;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 11; continue; }
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    r0 = s.y___549759;
+    r0 = s.y___89226;
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 15; continue; }
     r0 = pxsim.control.millis();
-    s.t___549785 = (r0);
-    r0 = (s.t___549785 + 1000);
+    s.t___89252 = (r0);
+    r0 = (s.t___89252 + 1000);
     s.tmp_1 = r0;
     r0 = s.arg0.fields["moveStartMs"];
     s.tmp_2 = r0;
@@ -79273,7 +79210,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (s.arg0).fields["moveStartMs"] = (s.t___549785);
+    r0 = (s.arg0).fields["moveStartMs"] = (s.t___89252);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["cursorSpeed"];
     s.tmp_2 = r0;
@@ -79281,79 +79218,79 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorSpeed"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_min__P106735_mk(s);
+    s.tmp_2 = Math_min__P81399_mk(s);
     r0 = s.arg0.fields["cursorSpeed"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0.2;
-    s.callLocIdx = 369; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 368; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorSpeed"] = (s.tmp_1);
   case 13:
   case 14:
-    s.tmp_0 = kodu_Cursor_x__P549530_mk(s);
+    s.tmp_0 = kodu_Cursor_x__P84988_mk(s);
     s.tmp_1 = r0 = s.arg0;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_3 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 370; s.pc = 24; return s.tmp_3;
+    s.callLocIdx = 369; s.pc = 24; return s.tmp_3;
   case 24:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = s.arg0.fields["cursorSpeed"];
     s.tmp_6 = r0;
-    r0 = (s.x___549758 * s.tmp_6);
+    r0 = (s.x___89225 * s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 * s.arg1);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 371; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 370; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_y__P549531_mk(s);
+    s.tmp_0 = kodu_Cursor_y__P84989_mk(s);
     s.tmp_1 = r0 = s.arg0;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_3 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 372; s.pc = 26; return s.tmp_3;
+    s.callLocIdx = 371; s.pc = 26; return s.tmp_3;
   case 26:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = s.arg0.fields["cursorSpeed"];
     s.tmp_6 = r0;
-    r0 = (s.y___549759 * s.tmp_6);
+    r0 = (s.y___89226 * s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 * s.arg1);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 373; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 372; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_2 = kodu_Cursor_x__P84986_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 374; s.pc = 27; return s.tmp_2;
+    s.callLocIdx = 373; s.pc = 27; return s.tmp_2;
   case 27:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "x", s.tmp_1);
-    s.tmp_4 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_4 = kodu_Cursor_y__P84987_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 375; s.pc = 28; return s.tmp_4;
+    s.callLocIdx = 374; s.pc = 28; return s.tmp_4;
   case 28:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "y", s.tmp_3);
-    s.tmp_5 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_5 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = "cursor:moved";
     s.tmp_5.arg2 = s.tmp_0;
-    if (!checkSubtype(s.tmp_5.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_5.arg0);
     s.tmp_5.fn = s.tmp_5.arg0.vtable.methods.notify;
     s.pc = 29; return s.tmp_5;
   case 29:
@@ -79371,12 +79308,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_update__P549539.info = {"start":3677,"length":1110,"line":108,"column":8,"endLine":138,"endColumn":9,"fileName":"cursor.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_Cursor_update__P84998.info = {"start":3677,"length":1110,"line":108,"column":8,"endLine":138,"endColumn":9,"fileName":"cursor.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_Cursor_update__P549539_mk(s) {
+function kodu_Cursor_update__P84998_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_update__P549539, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_update__P84998, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -79385,9 +79322,9 @@ function kodu_Cursor_update__P549539_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  x___549758: undefined,
-  y___549759: undefined,
-  t___549785: undefined,
+  x___89225: undefined,
+  y___89226: undefined,
+  t___89252: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -79396,7 +79333,7 @@ function kodu_Cursor_update__P549539_mk(s) {
 
 
 
-function kodu_Camera_notify__P530764(s) {
+function kodu_Camera_notify__P84893(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79406,8 +79343,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.savedGame___530960 = undefined;
-    s.savedGame___530978 = undefined;
+    s.savedGame___88349 = undefined;
+    s.savedGame___88370 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -79415,22 +79352,22 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Camera__C530755_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Camera__C84878_VT)) failedCast(r0);
     r0 = (s.arg1 === "save");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.savedGame___530960 = (s.arg2);
+    s.savedGame___88349 = (s.arg2);
     s.tmp_0 = if_x_2_mk(s);
     s.tmp_1 = if_camera_1_mk(s);
-    s.tmp_1.arg0 = s.savedGame___530960;
+    s.tmp_1.arg0 = s.savedGame___88349;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "camera");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["camera"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["camera"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 205; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 204; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -79443,20 +79380,20 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/x"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["x"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 206; 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 = if_y_2_mk(s);
     s.tmp_1 = if_camera_1_mk(s);
-    s.tmp_1.arg0 = s.savedGame___530960;
+    s.tmp_1.arg0 = s.savedGame___88349;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "camera");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["camera"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["camera"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 207; s.pc = 8; return s.tmp_1; }
+     else { s.callLocIdx = 206; s.pc = 8; return s.tmp_1; }
     }
   case 8:
     r0 = s.retval;
@@ -79469,7 +79406,7 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/y"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["y"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 208; s.pc = 7; return s.tmp_0; }
+     else { s.callLocIdx = 207; s.pc = 7; return s.tmp_0; }
     }
   case 7:
     r0 = s.retval;
@@ -79480,18 +79417,18 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
     r0 = (s.arg0).fields["following"] = (null);
-    s.savedGame___530978 = (s.arg2);
+    s.savedGame___88370 = (s.arg2);
     s.tmp_0 = r0 = s.arg0;
     s.tmp_2 = if_x_1_mk(s);
     s.tmp_3 = if_camera_1_mk(s);
-    s.tmp_3.arg0 = s.savedGame___530978;
+    s.tmp_3.arg0 = s.savedGame___88370;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "camera");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["camera"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["camera"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 209; s.pc = 10; return s.tmp_3; }
+     else { s.callLocIdx = 208; s.pc = 10; return s.tmp_3; }
     }
   case 10:
     r0 = s.retval;
@@ -79502,7 +79439,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["x"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["x"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 210; s.pc = 9; return s.tmp_2; }
+     else { s.callLocIdx = 209; s.pc = 9; return s.tmp_2; }
     }
   case 9:
     r0 = s.retval;
@@ -79511,14 +79448,14 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     s.tmp_2 = if_y_1_mk(s);
     s.tmp_3 = if_camera_1_mk(s);
-    s.tmp_3.arg0 = s.savedGame___530978;
+    s.tmp_3.arg0 = s.savedGame___88370;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "camera");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["camera"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["camera"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 211; s.pc = 12; return s.tmp_3; }
+     else { s.callLocIdx = 210; s.pc = 12; return s.tmp_3; }
     }
   case 12:
     r0 = s.retval;
@@ -79529,18 +79466,18 @@ 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 = 212; s.pc = 11; return s.tmp_2; }
+     else { s.callLocIdx = 211; s.pc = 11; return s.tmp_2; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["y"] = (s.tmp_1);
-    s.tmp_0 = scene_centerCameraAt__P108962_mk(s);
+    s.tmp_0 = scene_centerCameraAt__P83741_mk(s);
     r0 = s.arg0.fields["x"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 213; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 212; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
   case 2:
@@ -79550,19 +79487,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Camera_notify__P530764.info = {"start":2291,"length":516,"line":73,"column":8,"endLine":85,"endColumn":9,"fileName":"camera.ts","functionName":"notify","argumentNames":["this","event","parm"]}
+kodu_Camera_notify__P84893.info = {"start":2291,"length":516,"line":73,"column":8,"endLine":85,"endColumn":9,"fileName":"camera.ts","functionName":"notify","argumentNames":["this","event","parm"]}
 
-function kodu_Camera_notify__P530764_mk(s) {
+function kodu_Camera_notify__P84893_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Camera_notify__P530764, depth: s.depth + 1,
+        parent: s, fn: kodu_Camera_notify__P84893, 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,
-  savedGame___530960: undefined,
-  savedGame___530978: undefined,
+  savedGame___88349: undefined,
+  savedGame___88370: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -79572,7 +79509,7 @@ function kodu_Camera_notify__P530764_mk(s) {
 
 
 
-function kodu_Camera_update__P530762(s) {
+function kodu_Camera_update__P84891(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79588,53 +79525,53 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Camera__C530755_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Camera__C84878_VT)) failedCast(r0);
     r0 = (s.arg0).fields["camera_movement_x"] = (0);
     r0 = (s.arg0).fields["camera_movement_y"] = (0);
     r0 = s.arg0.fields["following"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Camera_keepInFrame__P530763_mk(s);
+    s.tmp_1 = kodu_Camera_keepInFrame__P84892_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = kodu_Character_x__P538093_mk(s);
+    s.tmp_2 = kodu_Character_x__P85014_mk(s);
     r0 = s.arg0.fields["following"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 198; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 197; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
-    s.tmp_3 = kodu_Character_y__P538094_mk(s);
+    s.tmp_3 = kodu_Character_y__P85016_mk(s);
     r0 = s.arg0.fields["following"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 199; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 198; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 200; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 199; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = kodu_Camera_keepInFrame__P530763_mk(s);
+    s.tmp_0 = kodu_Camera_keepInFrame__P84892_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = kodu_Cursor_x__P549461_mk(s);
+    s.tmp_1 = kodu_Cursor_x__P84986_mk(s);
     r0 = s.arg0.fields["stage"];
     r0 = r0.fields["cursor"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 201; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 200; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = kodu_Cursor_y__P549462_mk(s);
+    s.tmp_2 = kodu_Cursor_y__P84987_mk(s);
     r0 = s.arg0.fields["stage"];
     r0 = r0.fields["cursor"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 202; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 201; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 203; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 202; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 2:
@@ -79642,12 +79579,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Camera_update__P530762.info = {"start":1210,"length":325,"line":37,"column":8,"endLine":45,"endColumn":9,"fileName":"camera.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_Camera_update__P84891.info = {"start":1210,"length":325,"line":37,"column":8,"endLine":45,"endColumn":9,"fileName":"camera.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_Camera_update__P530762_mk(s) {
+function kodu_Camera_update__P84891_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Camera_update__P530762, depth: s.depth + 1,
+        parent: s, fn: kodu_Camera_update__P84891, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -79661,7 +79598,7 @@ function kodu_Camera_update__P530762_mk(s) {
 
 
 
-function kodu_Camera_keepInFrame__P530763(s) {
+function kodu_Camera_keepInFrame__P84892(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79671,12 +79608,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.camX___530888 = undefined;
-    s.camY___530891 = undefined;
-    s.nxtX___530894 = undefined;
-    s.nxtY___530896 = undefined;
-    s.dx___530898 = undefined;
-    s.dy___530902 = undefined;
+    s.camX___88277 = undefined;
+    s.camY___88280 = undefined;
+    s.nxtX___88283 = undefined;
+    s.nxtY___88285 = undefined;
+    s.dx___88287 = undefined;
+    s.dy___88291 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -79684,91 +79621,91 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Camera__C530755_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Camera__C84878_VT)) failedCast(r0);
     r0 = s.arg0.fields["x"];
-    s.camX___530888 = (r0);
+    s.camX___88277 = (r0);
     r0 = s.arg0.fields["y"];
-    s.camY___530891 = (r0);
-    s.nxtX___530894 = (s.camX___530888);
-    s.nxtY___530896 = (s.camY___530891);
-    r0 = (s.arg1 - s.camX___530888);
-    s.dx___530898 = (r0);
-    r0 = (s.arg2 - s.camY___530891);
-    s.dy___530902 = (r0);
-    r0 = (s.dx___530898 < -80);
+    s.camY___88280 = (r0);
+    s.nxtX___88283 = (s.camX___88277);
+    s.nxtY___88285 = (s.camY___88280);
+    r0 = (s.arg1 - s.camX___88277);
+    s.dx___88287 = (r0);
+    r0 = (s.arg2 - s.camY___88280);
+    s.dy___88291 = (r0);
+    r0 = (s.dx___88287 < -80);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg1 + 80);
-    s.nxtX___530894 = (r0);
+    s.nxtX___88283 = (r0);
   case 1:
   case 2:
-    r0 = (s.dx___530898 >= 80);
+    r0 = (s.dx___88287 >= 80);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = (s.arg1 - 80);
-    s.nxtX___530894 = (r0);
+    s.nxtX___88283 = (r0);
   case 3:
   case 4:
-    r0 = (s.dy___530902 < -60);
+    r0 = (s.dy___88291 < -60);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
     r0 = (s.arg2 + 60);
-    s.nxtY___530896 = (r0);
+    s.nxtY___88285 = (r0);
   case 5:
   case 6:
-    r0 = (s.dy___530902 >= 60);
+    r0 = (s.dy___88291 >= 60);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
     r0 = (s.arg2 - 60);
-    s.nxtY___530896 = (r0);
+    s.nxtY___88285 = (r0);
   case 7:
   case 8:
-    r0 = (s.arg0).fields["x"] = (s.nxtX___530894);
-    r0 = (s.arg0).fields["y"] = (s.nxtY___530896);
+    r0 = (s.arg0).fields["x"] = (s.nxtX___88283);
+    r0 = (s.arg0).fields["y"] = (s.nxtY___88285);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.camX___530888);
+    r0 = (s.tmp_2 - s.camX___88277);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["camera_movement_x"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["y"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.camY___530891);
+    r0 = (s.tmp_2 - s.camY___88280);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["camera_movement_y"] = (s.tmp_1);
-    s.tmp_0 = scene_centerCameraAt__P108962_mk(s);
+    s.tmp_0 = scene_centerCameraAt__P83741_mk(s);
     r0 = s.arg0.fields["x"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["y"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 204; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 203; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Camera_keepInFrame__P530763.info = {"start":1545,"length":736,"line":47,"column":8,"endLine":71,"endColumn":9,"fileName":"camera.ts","functionName":"keepInFrame","argumentNames":["this","x","y"]}
+kodu_Camera_keepInFrame__P84892.info = {"start":1545,"length":736,"line":47,"column":8,"endLine":71,"endColumn":9,"fileName":"camera.ts","functionName":"keepInFrame","argumentNames":["this","x","y"]}
 
-function kodu_Camera_keepInFrame__P530763_mk(s) {
+function kodu_Camera_keepInFrame__P84892_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Camera_keepInFrame__P530763, depth: s.depth + 1,
+        parent: s, fn: kodu_Camera_keepInFrame__P84892, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  camX___530888: undefined,
-  camY___530891: undefined,
-  nxtX___530894: undefined,
-  nxtY___530896: undefined,
-  dx___530898: undefined,
-  dy___530902: undefined,
+  camX___88277: undefined,
+  camY___88280: undefined,
+  nxtX___88283: undefined,
+  nxtY___88285: undefined,
+  dx___88287: undefined,
+  dy___88291: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -79778,7 +79715,7 @@ function kodu_Camera_keepInFrame__P530763_mk(s) {
 
 
 
-function kodu_WorldStage_update__P565291(s) {
+function kodu_WorldStage_update__P85240(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79788,15 +79725,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.chars___565760 = undefined;
+    s.chars___94506 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_WorldStage__C565268_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Stage_update__P468691_mk(s);
+    if (!checkSubtype(r0, kodu_WorldStage__C85217_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Stage_update__P85053_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 1272; s.pc = 3; return s.tmp_0;
@@ -79808,29 +79745,29 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = kodu_Physics_simulate__P110397_mk(s);
+    s.tmp_2 = kodu_Physics_simulate__P85150_mk(s);
     r0 = s.arg0.fields["physics"];
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 1273; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = kodu_Cursor_enable__P549535_mk(s);
+    s.tmp_0 = kodu_Cursor_enable__P84994_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 1274; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = helpers_arrayFilter__P106717_mk(s);
+    s.tmp_0 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["components"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P565763;
+    s.tmp_0.arg1 = inline__P94509;
     s.callLocIdx = 1275; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.chars___565760 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P106716_mk(s);
-    s.tmp_0.arg0 = s.chars___565760;
-    s.tmp_0.arg1 = inline__P565773;
+    s.chars___94506 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P81378_mk(s);
+    s.tmp_0.arg0 = s.chars___94506;
+    s.tmp_0.arg1 = inline__P94519;
     s.callLocIdx = 1277; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
@@ -79840,17 +79777,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_WorldStage_update__P565291.info = {"start":9379,"length":361,"line":271,"column":8,"endLine":279,"endColumn":9,"fileName":"worldStage.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_WorldStage_update__P85240.info = {"start":9439,"length":361,"line":272,"column":8,"endLine":280,"endColumn":9,"fileName":"worldStage.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_WorldStage_update__P565291_mk(s) {
+function kodu_WorldStage_update__P85240_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_WorldStage_update__P565291, depth: s.depth + 1,
+        parent: s, fn: kodu_WorldStage_update__P85240, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  chars___565760: undefined,
+  chars___94506: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -79859,7 +79796,7 @@ function kodu_WorldStage_update__P565291_mk(s) {
 
 
 
-function inline__P565763(s) {
+function inline__P94509(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79879,12 +79816,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565763.info = {"start":9613,"length":33,"line":276,"column":53,"endLine":276,"endColumn":86,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
+inline__P94509.info = {"start":9673,"length":33,"line":277,"column":53,"endLine":277,"endColumn":86,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["comp"]}
 
-function inline__P565763_mk(s) {
+function inline__P94509_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565763, depth: s.depth + 1,
+        parent: s, fn: inline__P94509, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -79894,7 +79831,7 @@ function inline__P565763_mk(s) {
 
 
 
-function inline__P565773(s) {
+function inline__P94519(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79908,7 +79845,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_Character_think__P538183_mk(s);
+    s.tmp_0 = kodu_Character_think__P85030_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1276; s.pc = 1; return s.tmp_0;
   case 1:
@@ -79917,12 +79854,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P565773.info = {"start":9694,"length":20,"line":277,"column":30,"endLine":277,"endColumn":50,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["char"]}
+inline__P94519.info = {"start":9754,"length":20,"line":278,"column":30,"endLine":278,"endColumn":50,"fileName":"worldStage.ts","functionName":"inline","argumentNames":["char"]}
 
-function inline__P565773_mk(s) {
+function inline__P94519_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P565773, depth: s.depth + 1,
+        parent: s, fn: inline__P94519, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -79932,7 +79869,7 @@ function inline__P565773_mk(s) {
 
 
 
-function kodu_Character_think__P538183(s) {
+function kodu_Character_think__P85030(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -79947,7 +79884,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = s.arg0.fields["destroyed"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -79965,10 +79902,10 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = kodu_Program_execute__P136369_mk(s);
+    s.tmp_4 = kodu_Program_execute__P85170_mk(s);
     r0 = s.arg0.fields["prog"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 427; s.pc = 7; return s.tmp_4;
+    s.callLocIdx = 426; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
   case 3:
@@ -79981,9 +79918,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_3 = kodu_Character_applyImpulses__P538185_mk(s);
+    s.tmp_3 = kodu_Character_applyImpulses__P85032_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 428; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 427; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -79996,12 +79933,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_think__P538183.info = {"start":3981,"length":238,"line":124,"column":8,"endLine":132,"endColumn":9,"fileName":"character.ts","functionName":"think","argumentNames":["this"]}
+kodu_Character_think__P85030.info = {"start":3981,"length":238,"line":124,"column":8,"endLine":132,"endColumn":9,"fileName":"character.ts","functionName":"think","argumentNames":["this"]}
 
-function kodu_Character_think__P538183_mk(s) {
+function kodu_Character_think__P85030_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_think__P538183, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_think__P85030, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -80015,7 +79952,7 @@ function kodu_Character_think__P538183_mk(s) {
 
 
 
-function kodu_Character_applyImpulses__P538185(s) {
+function kodu_Character_applyImpulses__P85032(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80025,26 +79962,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.v___538532 = undefined;
+    s.v___89682 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Character_computeImpulses__P538184_mk(s);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Character_computeImpulses__P85031_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 439; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 438; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.v___538532 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.v___538532);
+    s.v___89682 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.v___89682);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["body"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["vx"];
     s.tmp_2 = r0;
-    r0 = s.v___538532.fields["x"];
+    r0 = s.v___89682.fields["x"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
@@ -80053,7 +79990,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["vy"];
     s.tmp_2 = r0;
-    r0 = s.v___538532.fields["y"];
+    r0 = s.v___89682.fields["y"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
@@ -80068,18 +80005,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_applyImpulses__P538185.info = {"start":5224,"length":218,"line":155,"column":8,"endLine":162,"endColumn":9,"fileName":"character.ts","functionName":"applyImpulses","argumentNames":["this"]}
+kodu_Character_applyImpulses__P85032.info = {"start":5224,"length":218,"line":155,"column":8,"endLine":162,"endColumn":9,"fileName":"character.ts","functionName":"applyImpulses","argumentNames":["this"]}
 
-function kodu_Character_applyImpulses__P538185_mk(s) {
+function kodu_Character_applyImpulses__P85032_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_applyImpulses__P538185, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_applyImpulses__P85032, 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,
-  v___538532: undefined,
+  v___89682: undefined,
   arg0: undefined,
 } }
 
@@ -80087,7 +80024,7 @@ function kodu_Character_applyImpulses__P538185_mk(s) {
 
 
 
-function kodu_Program_execute__P136369(s) {
+function kodu_Program_execute__P85170(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80097,13 +80034,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.page___136806 = undefined;
+    s.page___93274 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Program__C136367_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Program__C85160_VT)) failedCast(r0);
     r0 = s.arg0.fields["executing"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -80121,32 +80058,32 @@ switch (step) {
     r0 = s.arg0.fields["currPage"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    s.page___136806 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.page___136806);
+    s.page___93274 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.page___93274);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = kodu_Wander_prepare__P136750_mk(s);
+    s.tmp_0 = kodu_Wander_prepare__P93220_mk(s);
     r0 = s.arg0.fields["wander"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1083; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1082; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = kodu_Page_execute__P136773_mk(s);
-    s.tmp_0.arg0 = s.page___136806;
-    s.callLocIdx = 1084; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = kodu_Page_execute__P93242_mk(s);
+    s.tmp_0.arg0 = s.page___93274;
+    s.callLocIdx = 1083; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = kodu_Wander_update__P136751_mk(s);
+    s.tmp_0 = kodu_Wander_update__P93221_mk(s);
     r0 = s.arg0.fields["wander"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1085; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1084; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 3:
   case 4:
     r0 = (s.arg0).fields["executing"] = (false);
-    s.tmp_0 = kodu_Program_updateExpression__P136373_mk(s);
+    s.tmp_0 = kodu_Program_updateExpression__P89487_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1086; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1085; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
   case 5:
@@ -80154,16 +80091,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Program_execute__P136369.info = {"start":975,"length":504,"line":37,"column":8,"endLine":50,"endColumn":9,"fileName":"program.ts","functionName":"execute","argumentNames":["this"]}
+kodu_Program_execute__P85170.info = {"start":975,"length":504,"line":37,"column":8,"endLine":50,"endColumn":9,"fileName":"program.ts","functionName":"execute","argumentNames":["this"]}
 
-function kodu_Program_execute__P136369_mk(s) {
+function kodu_Program_execute__P85170_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Program_execute__P136369, depth: s.depth + 1,
+        parent: s, fn: kodu_Program_execute__P85170, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  page___136806: undefined,
+  page___93274: undefined,
   arg0: undefined,
 } }
 
@@ -80171,7 +80108,7 @@ function kodu_Program_execute__P136369_mk(s) {
 
 
 
-function kodu_Program_updateExpression__P136373(s) {
+function kodu_Program_updateExpression__P89487(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80186,7 +80123,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Program__C136367_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Program__C85160_VT)) failedCast(r0);
     r0 = s.arg0.fields["feeling"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["prevFeeling"];
@@ -80195,12 +80132,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = kodu_Character_showFeeling__P538175_mk(s);
+    s.tmp_3 = kodu_Character_showFeeling__P85022_mk(s);
     r0 = s.arg0.fields["char"];
     s.tmp_3.arg0 = r0;
     r0 = s.arg0.fields["feeling"];
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 1088; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1087; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
   case 1:
@@ -80209,12 +80146,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Program_updateExpression__P136373.info = {"start":1923,"length":158,"line":69,"column":8,"endLine":73,"endColumn":9,"fileName":"program.ts","functionName":"updateExpression","argumentNames":["this"]}
+kodu_Program_updateExpression__P89487.info = {"start":1923,"length":158,"line":69,"column":8,"endLine":73,"endColumn":9,"fileName":"program.ts","functionName":"updateExpression","argumentNames":["this"]}
 
-function kodu_Program_updateExpression__P136373_mk(s) {
+function kodu_Program_updateExpression__P89487_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Program_updateExpression__P136373, depth: s.depth + 1,
+        parent: s, fn: kodu_Program_updateExpression__P89487, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -80227,7 +80164,7 @@ function kodu_Program_updateExpression__P136373_mk(s) {
 
 
 
-function kodu_Character_showFeeling__P538175(s) {
+function kodu_Character_showFeeling__P85022(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80237,53 +80174,53 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.icon___538378 = undefined;
+    s.icon___89530 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = s.arg0.fields["feeling"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Kelpie_destroy__P110510_mk(s);
+    s.tmp_1 = kodu_Kelpie_destroy__P85293_mk(s);
     r0 = s.arg0.fields["feeling"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 420; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 419; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     r0 = (s.arg0).fields["feeling"] = (null);
   case 1:
   case 2:
-    s.tmp_0 = kodu_icons_get__P110155_mk(s);
+    s.tmp_0 = kodu_icons_get__P84907_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 421; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 420; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.icon___538378 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.icon___538378);
+    s.icon___89530 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.icon___89530);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C110487_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Kelpie__C85270_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = kodu_Kelpie_constructor__P110509_mk(s);
+    s.tmp_1 = kodu_Kelpie_constructor__P85292_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.icon___538378;
-    s.callLocIdx = 422; s.pc = 7; return s.tmp_1;
+    s.tmp_1.arg1 = s.icon___89530;
+    s.callLocIdx = 421; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     r0 = (s.arg0).fields["feeling"] = (s.tmp_0);
-    s.tmp_0 = sprites_BaseSprite_z__P108360_mk(s);
+    s.tmp_0 = sprites_BaseSprite_z__P83136_mk(s);
     r0 = s.arg0.fields["feeling"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["kelpie"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_z"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 424; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 423; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 3:
@@ -80292,16 +80229,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_showFeeling__P538175.info = {"start":2822,"length":356,"line":83,"column":8,"endLine":93,"endColumn":9,"fileName":"character.ts","functionName":"showFeeling","argumentNames":["this","feeling"]}
+kodu_Character_showFeeling__P85022.info = {"start":2822,"length":356,"line":83,"column":8,"endLine":93,"endColumn":9,"fileName":"character.ts","functionName":"showFeeling","argumentNames":["this","feeling"]}
 
-function kodu_Character_showFeeling__P538175_mk(s) {
+function kodu_Character_showFeeling__P85022_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_showFeeling__P538175, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_showFeeling__P85022, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  icon___538378: undefined,
+  icon___89530: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -80310,7 +80247,7 @@ function kodu_Character_showFeeling__P538175_mk(s) {
 
 
 
-function kodu_Wander_update__P136751(s) {
+function kodu_Wander_update__P93221(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80325,7 +80262,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Wander__C136748_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Wander__C93218_VT)) failedCast(r0);
     r0 = s.arg0.fields["poked"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -80337,9 +80274,9 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    s.tmp_2 = kodu_Wander_setTimer__P136754_mk(s);
+    s.tmp_2 = kodu_Wander_setTimer__P93224_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1144; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1143; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     { step = 6; continue; }
@@ -80348,10 +80285,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = clearTimeout__P107022_mk(s);
+    s.tmp_1 = clearTimeout__P81686_mk(s);
     r0 = s.arg0.fields["timer"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1145; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 1144; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     r0 = (s.arg0).fields["timer"] = (null);
@@ -80364,12 +80301,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Wander_update__P136751.info = {"start":6872,"length":364,"line":215,"column":8,"endLine":226,"endColumn":9,"fileName":"program.ts","functionName":"update","argumentNames":["this"]}
+kodu_Wander_update__P93221.info = {"start":6872,"length":364,"line":215,"column":8,"endLine":226,"endColumn":9,"fileName":"program.ts","functionName":"update","argumentNames":["this"]}
 
-function kodu_Wander_update__P136751_mk(s) {
+function kodu_Wander_update__P93221_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Wander_update__P136751, depth: s.depth + 1,
+        parent: s, fn: kodu_Wander_update__P93221, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -80381,7 +80318,7 @@ function kodu_Wander_update__P136751_mk(s) {
 
 
 
-function clearTimeout__P107022(s) {
+function clearTimeout__P81686(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80395,7 +80332,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = control_clearInterval__P106953_mk(s);
+    s.tmp_0 = control_clearInterval__P81617_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
     s.callLocIdx = 106; s.pc = 1; return s.tmp_0;
@@ -80405,12 +80342,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-clearTimeout__P107022.info = {"start":826,"length":114,"line":35,"column":0,"endLine":37,"endColumn":1,"fileName":"pxt_modules/base/scheduling.ts","functionName":"clearTimeout","argumentNames":["intervalId"]}
+clearTimeout__P81686.info = {"start":826,"length":114,"line":35,"column":0,"endLine":37,"endColumn":1,"fileName":"pxt_modules/base/scheduling.ts","functionName":"clearTimeout","argumentNames":["intervalId"]}
 
-function clearTimeout__P107022_mk(s) {
+function clearTimeout__P81686_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: clearTimeout__P107022, depth: s.depth + 1,
+        parent: s, fn: clearTimeout__P81686, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -80420,7 +80357,7 @@ function clearTimeout__P107022_mk(s) {
 
 
 
-function control_clearInterval__P106953(s) {
+function control_clearInterval__P81617(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80430,14 +80367,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___137500 = undefined;
-    s.it___137506 = undefined;
+    s.i___100469 = undefined;
+    s.it___100475 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._intervals___110562);
+    r0 = pxsim_numops_toBoolDecr(globals._intervals___85346);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -80446,18 +80383,18 @@ switch (step) {
     { step = 9; continue; }
   case 1:
   case 2:
-    s.i___137500 = (0);
+    s.i___100469 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___137500;
-    r0 = pxsim_Array__length(globals._intervals___110562);
+    s.tmp_1 = r0 = s.i___100469;
+    r0 = pxsim_Array__length(globals._intervals___85346);
     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_Array__getAt(globals._intervals___110562, s.i___137500);
-    s.it___137506 = (r0);
-    r0 = s.it___137506.fields["id"];
+    r0 = pxsim_Array__getAt(globals._intervals___85346, s.i___100469);
+    s.it___100475 = (r0);
+    r0 = s.it___100475.fields["id"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == s.arg0);
     s.tmp_0 = r0;
@@ -80466,7 +80403,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 4:
-    r0 = s.it___137506.fields["mode"];
+    r0 = s.it___100475.fields["mode"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 == s.arg1);
   case 5:
@@ -80474,16 +80411,16 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 6; continue; }
-    s.tmp_4 = control_Interval_cancel__P110565_mk(s);
-    s.tmp_4.arg0 = s.it___137506;
+    s.tmp_4 = control_Interval_cancel__P85349_mk(s);
+    s.tmp_4.arg0 = s.it___100475;
     s.callLocIdx = 31; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
     { step = 8; continue; }
   case 6:
   case 7:
-    r0 = (s.i___137500 + 1);
-    s.i___137500 = (r0);
+    r0 = (s.i___100469 + 1);
+    s.i___100469 = (r0);
     { step = 3; continue; }
   case 8:
   case 9:
@@ -80491,20 +80428,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_clearInterval__P106953.info = {"start":1826,"length":342,"line":61,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/base/interval.ts","functionName":"clearInterval","argumentNames":["intervalId","mode"]}
+control_clearInterval__P81617.info = {"start":1826,"length":342,"line":61,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/base/interval.ts","functionName":"clearInterval","argumentNames":["intervalId","mode"]}
 
-function control_clearInterval__P106953_mk(s) {
+function control_clearInterval__P81617_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_clearInterval__P106953, depth: s.depth + 1,
+        parent: s, fn: control_clearInterval__P81617, 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___137500: undefined,
-  it___137506: undefined,
+  i___100469: undefined,
+  it___100475: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -80513,7 +80450,7 @@ function control_clearInterval__P106953_mk(s) {
 
 
 
-function control_Interval_cancel__P110565(s) {
+function control_Interval_cancel__P85349(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80528,18 +80465,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_Interval__C110563_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_Interval__C85347_VT)) failedCast(r0);
     r0 = (s.arg0).fields["delay"] = (-1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_Interval_cancel__P110565.info = {"start":1493,"length":49,"line":49,"column":8,"endLine":51,"endColumn":9,"fileName":"pxt_modules/base/interval.ts","functionName":"cancel","argumentNames":["this"]}
+control_Interval_cancel__P85349.info = {"start":1493,"length":49,"line":49,"column":8,"endLine":51,"endColumn":9,"fileName":"pxt_modules/base/interval.ts","functionName":"cancel","argumentNames":["this"]}
 
-function control_Interval_cancel__P110565_mk(s) {
+function control_Interval_cancel__P85349_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_Interval_cancel__P110565, depth: s.depth + 1,
+        parent: s, fn: control_Interval_cancel__P85349, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -80548,7 +80485,7 @@ function control_Interval_cancel__P110565_mk(s) {
 
 
 
-function kodu_Wander_setTimer__P136754(s) {
+function kodu_Wander_setTimer__P93224(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80563,12 +80500,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Wander__C136748_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P137285);
+    if (!checkSubtype(r0, kodu_Wander__C93218_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P93746);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     s.tmp_1 = r0 = s.arg0;
-    s.tmp_3 = setTimeout__P107021_mk(s);
+    s.tmp_3 = setTimeout__P81685_mk(s);
     s.tmp_3.arg0 = s.tmp_0;
     r0 = pxsim.Math_.random();
     s.tmp_7 = r0;
@@ -80580,7 +80517,7 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (1000 * s.tmp_4);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 1152; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 1151; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -80589,12 +80526,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Wander_setTimer__P136754.info = {"start":7839,"length":137,"line":250,"column":8,"endLine":252,"endColumn":9,"fileName":"program.ts","functionName":"setTimer","argumentNames":["this"]}
+kodu_Wander_setTimer__P93224.info = {"start":7839,"length":137,"line":250,"column":8,"endLine":252,"endColumn":9,"fileName":"program.ts","functionName":"setTimer","argumentNames":["this"]}
 
-function kodu_Wander_setTimer__P136754_mk(s) {
+function kodu_Wander_setTimer__P93224_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Wander_setTimer__P136754, depth: s.depth + 1,
+        parent: s, fn: kodu_Wander_setTimer__P93224, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -80611,7 +80548,7 @@ function kodu_Wander_setTimer__P136754_mk(s) {
 
 
 
-function inline__P137285(s) {
+function inline__P93746(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80621,21 +80558,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = kodu_Wander_timerCallback__P136753_mk(s);
+    s.tmp_0 = kodu_Wander_timerCallback__P93223_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1151; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1150; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P137285.info = {"start":7896,"length":26,"line":251,"column":36,"endLine":251,"endColumn":62,"fileName":"program.ts","functionName":"inline","argumentNames":[]}
+inline__P93746.info = {"start":7896,"length":26,"line":251,"column":36,"endLine":251,"endColumn":62,"fileName":"program.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P137285_mk(s) {
+function inline__P93746_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P137285, depth: s.depth + 1,
+        parent: s, fn: inline__P93746, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -80644,7 +80581,7 @@ function inline__P137285_mk(s) {
 
 
 
-function kodu_Wander_timerCallback__P136753(s) {
+function kodu_Wander_timerCallback__P93223(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80659,10 +80596,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Wander__C136748_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Wander_pickDest__P136755_mk(s);
+    if (!checkSubtype(r0, kodu_Wander__C93218_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Wander_pickDest__P93225_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1150; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1149; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["timer"] = (null);
@@ -80670,12 +80607,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Wander_timerCallback__P136753.info = {"start":7734,"length":95,"line":245,"column":8,"endLine":248,"endColumn":9,"fileName":"program.ts","functionName":"timerCallback","argumentNames":["this"]}
+kodu_Wander_timerCallback__P93223.info = {"start":7734,"length":95,"line":245,"column":8,"endLine":248,"endColumn":9,"fileName":"program.ts","functionName":"timerCallback","argumentNames":["this"]}
 
-function kodu_Wander_timerCallback__P136753_mk(s) {
+function kodu_Wander_timerCallback__P93223_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Wander_timerCallback__P136753, depth: s.depth + 1,
+        parent: s, fn: kodu_Wander_timerCallback__P93223, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -80685,7 +80622,7 @@ function kodu_Wander_timerCallback__P136753_mk(s) {
 
 
 
-function kodu_Page_execute__P136773(s) {
+function kodu_Page_execute__P93242(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80695,30 +80632,30 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___136898 = undefined;
-    s.unnamed16860___U1 = undefined;
-    s.unnamed16861___U2 = undefined;
+    s.rule___93365 = undefined;
+    s.unnamed1912___U1 = undefined;
+    s.unnamed1913___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Page__C136770_VT)) failedCast(r0);
-    s.rule___136898 = (undefined);
+    if (!checkSubtype(r0, kodu_Page__C93239_VT)) failedCast(r0);
+    s.rule___93365 = (undefined);
     r0 = s.arg0.fields["rules"];
-    s.unnamed16860___U1 = (r0);
-    s.unnamed16861___U2 = (0);
+    s.unnamed1912___U1 = (r0);
+    s.unnamed1913___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16861___U2;
-    r0 = pxsim_Array__length(s.unnamed16860___U1);
+    s.tmp_0 = r0 = s.unnamed1913___U2;
+    r0 = pxsim_Array__length(s.unnamed1912___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16860___U1, s.unnamed16861___U2);
-    s.rule___136898 = (r0);
-    s.tmp_2 = kodu_Rule_execute__P136626_mk(s);
-    s.tmp_2.arg0 = s.rule___136898;
-    s.callLocIdx = 1092; s.pc = 5; return s.tmp_2;
+    r0 = pxsim_Array__getAt(s.unnamed1912___U1, s.unnamed1913___U2);
+    s.rule___93365 = (r0);
+    s.tmp_2 = kodu_Rule_execute__P85186_mk(s);
+    s.tmp_2.arg0 = s.rule___93365;
+    s.callLocIdx = 1091; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     r0 = s.arg0.fields["prog"];
@@ -80729,28 +80666,28 @@ switch (step) {
     { step = 4; continue; }
   case 2:
   case 3:
-    r0 = (s.unnamed16861___U2 + 1);
-    s.unnamed16861___U2 = (r0);
+    r0 = (s.unnamed1913___U2 + 1);
+    s.unnamed1913___U2 = (r0);
     { step = 1; continue; }
   case 4:
-    s.unnamed16860___U1 = (undefined);
+    s.unnamed1912___U1 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Page_execute__P136773.info = {"start":2549,"length":166,"line":92,"column":8,"endLine":97,"endColumn":9,"fileName":"program.ts","functionName":"execute","argumentNames":["this"]}
+kodu_Page_execute__P93242.info = {"start":2549,"length":166,"line":92,"column":8,"endLine":97,"endColumn":9,"fileName":"program.ts","functionName":"execute","argumentNames":["this"]}
 
-function kodu_Page_execute__P136773_mk(s) {
+function kodu_Page_execute__P93242_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Page_execute__P136773, depth: s.depth + 1,
+        parent: s, fn: kodu_Page_execute__P93242, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  rule___136898: undefined,
-  unnamed16860___U1: undefined,
-  unnamed16861___U2: undefined,
+  rule___93365: undefined,
+  unnamed1912___U1: undefined,
+  unnamed1913___U2: undefined,
   arg0: undefined,
 } }
 
@@ -80758,7 +80695,7 @@ function kodu_Page_execute__P136773_mk(s) {
 
 
 
-function kodu_Rule_execute__P136626(s) {
+function kodu_Rule_execute__P85186(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80773,12 +80710,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Rule__C136623_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Rule__C85174_VT)) failedCast(r0);
     r0 = s.arg0.fields["hasInput"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_1 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
@@ -80789,7 +80726,7 @@ switch (step) {
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
     s.tmp_1.arg2 = r0;
-    if (!checkSubtype(s.tmp_1.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.notify;
     s.pc = 15; return s.tmp_1;
   case 15:
@@ -80825,7 +80762,7 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["phase"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["phase"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1121; s.pc = 16; return s.tmp_4; }
+     else { s.callLocIdx = 1120; s.pc = 16; return s.tmp_4; }
     }
   case 16:
     r0 = s.retval;
@@ -80841,25 +80778,25 @@ switch (step) {
     s.tmp_6.arg1 = s.arg0;
     if (!s.tmp_6.arg0.vtable.iface) {
       setupLambda(s.tmp_6, pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "sensorFn"), 2);
-      s.callLocIdx = 1122; s.pc = 17; return s.tmp_6;
+      s.callLocIdx = 1121; s.pc = 17; return s.tmp_6;
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["sensorFn"];
-      if (s.tmp_6.fn == null) { setupLambda(s.tmp_6, s.tmp_6.arg0.fields["sensorFn"], 2); s.callLocIdx = 1122; s.pc = 17; return s.tmp_6; }
-      else if (s.tmp_6.fn.isGetter) { s.tmp_6.stage2Call = true; s.callLocIdx = 1122; s.pc = 17; return s.tmp_6;; }
-     else { s.callLocIdx = 1122; s.pc = 17; return s.tmp_6; }
+      if (s.tmp_6.fn == null) { setupLambda(s.tmp_6, s.tmp_6.arg0.fields["sensorFn"], 2); s.callLocIdx = 1121; s.pc = 17; return s.tmp_6; }
+      else if (s.tmp_6.fn.isGetter) { s.tmp_6.stage2Call = true; s.callLocIdx = 1121; s.pc = 17; return s.tmp_6;; }
+     else { s.callLocIdx = 1121; s.pc = 17; return s.tmp_6; }
     }
   case 17:
     r0 = s.retval;
   case 5:
   case 6:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P137102);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P93563);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["filterFns"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1124; s.pc = 18; return s.tmp_1;
+    s.callLocIdx = 1123; s.pc = 18; return s.tmp_1;
   case 18:
     r0 = s.retval;
     r0 = s.arg0.fields["defn"];
@@ -80880,7 +80817,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["phase"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["phase"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1125; s.pc = 19; return s.tmp_2; }
+     else { s.callLocIdx = 1124; s.pc = 19; return s.tmp_2; }
     }
   case 19:
     r0 = s.retval;
@@ -80896,20 +80833,20 @@ switch (step) {
     s.tmp_4.arg1 = s.arg0;
     if (!s.tmp_4.arg0.vtable.iface) {
       setupLambda(s.tmp_4, pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "sensorFn"), 2);
-      s.callLocIdx = 1126; s.pc = 20; return s.tmp_4;
+      s.callLocIdx = 1125; s.pc = 20; return s.tmp_4;
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["sensorFn"];
-      if (s.tmp_4.fn == null) { setupLambda(s.tmp_4, s.tmp_4.arg0.fields["sensorFn"], 2); s.callLocIdx = 1126; s.pc = 20; return s.tmp_4; }
-      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1126; s.pc = 20; return s.tmp_4;; }
-     else { s.callLocIdx = 1126; s.pc = 20; return s.tmp_4; }
+      if (s.tmp_4.fn == null) { setupLambda(s.tmp_4, s.tmp_4.arg0.fields["sensorFn"], 2); s.callLocIdx = 1125; s.pc = 20; return s.tmp_4; }
+      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1125; s.pc = 20; return s.tmp_4;; }
+     else { s.callLocIdx = 1125; s.pc = 20; return s.tmp_4; }
     }
   case 20:
     r0 = s.retval;
   case 9:
   case 10:
-    s.tmp_1 = kodu_Rule_evalRuleCondition__P136628_mk(s);
+    s.tmp_1 = kodu_Rule_evalRuleCondition__P91966_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1127; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 1126; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -80919,21 +80856,21 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 11; continue; }
-    s.tmp_3 = kodu_Rule_queueDefaultMovement__P136629_mk(s);
+    s.tmp_3 = kodu_Rule_queueDefaultMovement__P91967_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1128; s.pc = 22; return s.tmp_3;
+    s.callLocIdx = 1127; s.pc = 22; return s.tmp_3;
   case 22:
     r0 = s.retval;
   case 11:
   case 12:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P137122);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P93583);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayForEach__P106716_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P81378_mk(s);
     r0 = s.arg0.fields["modifierFns"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1130; s.pc = 23; return s.tmp_1;
+    s.callLocIdx = 1129; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
     s.tmp_0 = if_actuatorFn_2_mk(s);
@@ -80941,12 +80878,12 @@ switch (step) {
     s.tmp_0.arg1 = s.arg0;
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "actuatorFn"), 2);
-      s.callLocIdx = 1131; s.pc = 24; return s.tmp_0;
+      s.callLocIdx = 1130; s.pc = 24; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["actuatorFn"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["actuatorFn"], 2); s.callLocIdx = 1131; s.pc = 24; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1131; s.pc = 24; return s.tmp_0;; }
-     else { s.callLocIdx = 1131; s.pc = 24; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["actuatorFn"], 2); s.callLocIdx = 1130; s.pc = 24; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1130; s.pc = 24; return s.tmp_0;; }
+     else { s.callLocIdx = 1130; s.pc = 24; return s.tmp_0; }
     }
   case 24:
     r0 = s.retval;
@@ -80956,12 +80893,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Rule_execute__P136626.info = {"start":4603,"length":795,"line":151,"column":8,"endLine":171,"endColumn":9,"fileName":"program.ts","functionName":"execute","argumentNames":["this"]}
+kodu_Rule_execute__P85186.info = {"start":4603,"length":795,"line":151,"column":8,"endLine":171,"endColumn":9,"fileName":"program.ts","functionName":"execute","argumentNames":["this"]}
 
-function kodu_Rule_execute__P136626_mk(s) {
+function kodu_Rule_execute__P85186_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Rule_execute__P136626, depth: s.depth + 1,
+        parent: s, fn: kodu_Rule_execute__P85186, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -80977,7 +80914,7 @@ function kodu_Rule_execute__P136626_mk(s) {
 
 
 
-function inline__P137102(s) {
+function inline__P93563(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -80995,19 +80932,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 = 1123; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1122; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P137102.info = {"start":4987,"length":14,"line":160,"column":35,"endLine":160,"endColumn":49,"fileName":"program.ts","functionName":"inline","argumentNames":["fn"]}
+inline__P93563.info = {"start":4987,"length":14,"line":160,"column":35,"endLine":160,"endColumn":49,"fileName":"program.ts","functionName":"inline","argumentNames":["fn"]}
 
-function inline__P137102_mk(s) {
+function inline__P93563_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P137102, depth: s.depth + 1,
+        parent: s, fn: inline__P93563, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -81017,7 +80954,7 @@ function inline__P137102_mk(s) {
 
 
 
-function inline__P137122(s) {
+function inline__P93583(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81035,19 +80972,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 = 1129; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1128; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P137122.info = {"start":5320,"length":14,"line":168,"column":41,"endLine":168,"endColumn":55,"fileName":"program.ts","functionName":"inline","argumentNames":["fn"]}
+inline__P93583.info = {"start":5320,"length":14,"line":168,"column":41,"endLine":168,"endColumn":55,"fileName":"program.ts","functionName":"inline","argumentNames":["fn"]}
 
-function inline__P137122_mk(s) {
+function inline__P93583_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P137122, depth: s.depth + 1,
+        parent: s, fn: inline__P93583, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -81057,7 +80994,7 @@ function inline__P137122_mk(s) {
 
 
 
-function kodu_Rule_queueDefaultMovement__P136629(s) {
+function kodu_Rule_queueDefaultMovement__P91967(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81067,14 +81004,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dir___137174 = undefined;
-    s.speed___137179 = undefined;
+    s.dir___93635 = undefined;
+    s.speed___93640 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Rule__C136623_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Rule__C85174_VT)) failedCast(r0);
     r0 = s.arg0.fields["state"];
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_3, "direction");
@@ -81103,15 +81040,15 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 3; continue; }
-    s.tmp_8 = kodu_Wander_direction__P136752_mk(s);
+    s.tmp_8 = kodu_Wander_direction__P93222_mk(s);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["wander"];
     s.tmp_8.arg0 = r0;
-    s.callLocIdx = 1137; s.pc = 5; return s.tmp_8;
+    s.callLocIdx = 1136; s.pc = 5; return s.tmp_8;
   case 5:
     r0 = s.retval;
-    s.dir___137174 = (r0);
+    s.dir___93635 = (r0);
     s.tmp_0 = if_speed_1_mk(s);
     s.tmp_1 = if_defaults_1_mk(s);
     r0 = s.arg0.fields["page"];
@@ -81125,7 +81062,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["defaults"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["defaults"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1139; s.pc = 7; return s.tmp_1; }
+     else { s.callLocIdx = 1138; s.pc = 7; return s.tmp_1; }
     }
   case 7:
     r0 = s.retval;
@@ -81136,37 +81073,37 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["speed"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["speed"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 1140; s.pc = 6; return s.tmp_0; }
+     else { s.callLocIdx = 1139; s.pc = 6; return s.tmp_0; }
     }
   case 6:
     r0 = s.retval;
-    s.speed___137179 = (r0);
-    s.tmp_0 = kodu_Character_queueImpulse__P538177_mk(s);
+    s.speed___93640 = (r0);
+    s.tmp_0 = kodu_Character_queueImpulse__P85024_mk(s);
     r0 = s.arg0.fields["page"];
     r0 = r0.fields["prog"];
     r0 = r0.fields["char"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.dir___137174;
-    s.tmp_0.arg2 = s.speed___137179;
+    s.tmp_0.arg1 = s.dir___93635;
+    s.tmp_0.arg2 = s.speed___93640;
     s.tmp_0.arg3 = 2;
-    s.callLocIdx = 1142; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1141; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
     r0 = s.arg0.fields["state"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "direction", s.dir___137174);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, "direction", s.dir___93635);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Rule_queueDefaultMovement__P136629.info = {"start":6150,"length":457,"line":192,"column":8,"endLine":200,"endColumn":9,"fileName":"program.ts","functionName":"queueDefaultMovement","argumentNames":["this"]}
+kodu_Rule_queueDefaultMovement__P91967.info = {"start":6150,"length":457,"line":192,"column":8,"endLine":200,"endColumn":9,"fileName":"program.ts","functionName":"queueDefaultMovement","argumentNames":["this"]}
 
-function kodu_Rule_queueDefaultMovement__P136629_mk(s) {
+function kodu_Rule_queueDefaultMovement__P91967_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Rule_queueDefaultMovement__P136629, depth: s.depth + 1,
+        parent: s, fn: kodu_Rule_queueDefaultMovement__P91967, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -81177,8 +81114,8 @@ function kodu_Rule_queueDefaultMovement__P136629_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  dir___137174: undefined,
-  speed___137179: undefined,
+  dir___93635: undefined,
+  speed___93640: undefined,
   arg0: undefined,
 } }
 
@@ -81186,7 +81123,7 @@ function kodu_Rule_queueDefaultMovement__P136629_mk(s) {
 
 
 
-function kodu_Rule_evalRuleCondition__P136628(s) {
+function kodu_Rule_evalRuleCondition__P91966(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81201,16 +81138,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Rule__C136623_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Rule__C85174_VT)) failedCast(r0);
     s.tmp_1 = if_LOW_1_mk(s);
-    s.tmp_1.arg0 = globals.RuleCondition___110338;
+    s.tmp_1.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "LOW");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["LOW"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["LOW"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1132; s.pc = 10; return s.tmp_1; }
+     else { s.callLocIdx = 1131; s.pc = 10; return s.tmp_1; }
     }
   case 10:
     r0 = s.retval;
@@ -81221,14 +81158,14 @@ switch (step) {
     r0 = pxsim_pxtcore.switch_eq(s.tmp_0, s.tmp_2);
     if (r0) { step = 1; continue; }
     s.tmp_4 = if_LOW_TO_HIGH_1_mk(s);
-    s.tmp_4.arg0 = globals.RuleCondition___110338;
+    s.tmp_4.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "LOW_TO_HIGH");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["LOW_TO_HIGH"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["LOW_TO_HIGH"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1133; s.pc = 11; return s.tmp_4; }
+     else { s.callLocIdx = 1132; s.pc = 11; return s.tmp_4; }
     }
   case 11:
     r0 = s.retval;
@@ -81236,14 +81173,14 @@ switch (step) {
     r0 = pxsim_pxtcore.switch_eq(s.tmp_3, s.tmp_2);
     if (r0) { step = 2; continue; }
     s.tmp_6 = if_HIGH_TO_LOW_1_mk(s);
-    s.tmp_6.arg0 = globals.RuleCondition___110338;
+    s.tmp_6.arg0 = globals.RuleCondition___85091;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "HIGH_TO_LOW");
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["HIGH_TO_LOW"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["HIGH_TO_LOW"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1134; s.pc = 12; return s.tmp_6; }
+     else { s.callLocIdx = 1133; s.pc = 12; return s.tmp_6; }
     }
   case 12:
     r0 = s.retval;
@@ -81313,12 +81250,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Rule_evalRuleCondition__P136628.info = {"start":5506,"length":634,"line":178,"column":8,"endLine":190,"endColumn":9,"fileName":"program.ts","functionName":"evalRuleCondition","argumentNames":["this"]}
+kodu_Rule_evalRuleCondition__P91966.info = {"start":5506,"length":634,"line":178,"column":8,"endLine":190,"endColumn":9,"fileName":"program.ts","functionName":"evalRuleCondition","argumentNames":["this"]}
 
-function kodu_Rule_evalRuleCondition__P136628_mk(s) {
+function kodu_Rule_evalRuleCondition__P91966_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Rule_evalRuleCondition__P136628, depth: s.depth + 1,
+        parent: s, fn: kodu_Rule_evalRuleCondition__P91966, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -81349,7 +81286,7 @@ function kodu_Rule_evalRuleCondition__P136628_mk(s) {
 
 
 
-function kodu_Wander_prepare__P136750(s) {
+function kodu_Wander_prepare__P93220(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81364,7 +81301,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Wander__C136748_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Wander__C93218_VT)) failedCast(r0);
     r0 = (s.arg0).fields["poked"] = (false);
     r0 = s.arg0.fields["dest"];
     s.tmp_2 = r0;
@@ -81374,9 +81311,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = kodu_Wander_pickDest__P136755_mk(s);
+    s.tmp_3 = kodu_Wander_pickDest__P93225_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1143; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1142; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
   case 1:
@@ -81385,12 +81322,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Wander_prepare__P136750.info = {"start":6753,"length":109,"line":210,"column":8,"endLine":213,"endColumn":9,"fileName":"program.ts","functionName":"prepare","argumentNames":["this"]}
+kodu_Wander_prepare__P93220.info = {"start":6753,"length":109,"line":210,"column":8,"endLine":213,"endColumn":9,"fileName":"program.ts","functionName":"prepare","argumentNames":["this"]}
 
-function kodu_Wander_prepare__P136750_mk(s) {
+function kodu_Wander_prepare__P93220_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Wander_prepare__P136750, depth: s.depth + 1,
+        parent: s, fn: kodu_Wander_prepare__P93220, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -81403,7 +81340,7 @@ function kodu_Wander_prepare__P136750_mk(s) {
 
 
 
-function kodu_Cursor_enable__P549535(s) {
+function kodu_Cursor_enable__P84994(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81418,25 +81355,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Cursor__C549528_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Cursor__C84979_VT)) failedCast(r0);
     r0 = (s.arg0).fields["disabled"] = (false);
-    s.tmp_0 = kodu_Cursor_setCursorMode__P549532_mk(s);
+    s.tmp_0 = kodu_Cursor_setCursorMode__P84991_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["cursorMode"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 339; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 338; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Cursor_enable__P549535.info = {"start":1885,"length":111,"line":60,"column":8,"endLine":63,"endColumn":9,"fileName":"cursor.ts","functionName":"enable","argumentNames":["this"]}
+kodu_Cursor_enable__P84994.info = {"start":1885,"length":111,"line":60,"column":8,"endLine":63,"endColumn":9,"fileName":"cursor.ts","functionName":"enable","argumentNames":["this"]}
 
-function kodu_Cursor_enable__P549535_mk(s) {
+function kodu_Cursor_enable__P84994_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Cursor_enable__P549535, depth: s.depth + 1,
+        parent: s, fn: kodu_Cursor_enable__P84994, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -81446,7 +81383,7 @@ function kodu_Cursor_enable__P549535_mk(s) {
 
 
 
-function kodu_Physics_simulate__P110397(s) {
+function kodu_Physics_simulate__P85150(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81456,34 +81393,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___116825 = undefined;
-    s.body1___116832 = undefined;
-    s.j___116840 = undefined;
-    s.body2___116850 = undefined;
-    s.body___116868 = undefined;
-    s.unnamed16854___U5 = undefined;
-    s.unnamed16855___U6 = undefined;
+    s.i___91714 = undefined;
+    s.body1___91721 = undefined;
+    s.j___91729 = undefined;
+    s.body2___91739 = undefined;
+    s.body___91757 = undefined;
+    s.unnamed1906___U5 = undefined;
+    s.unnamed1907___U6 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Physics__C110391_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Physics__C85144_VT)) failedCast(r0);
     r0 = s.arg0.fields["deadBodies"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116810);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P91699);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.arg0);
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_5 = helpers_arrayFilter__P106717_mk(s);
+    s.tmp_5 = helpers_arrayFilter__P81379_mk(s);
     r0 = s.arg0.fields["bodies"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.tmp_2;
-    s.callLocIdx = 863; s.pc = 15; return s.tmp_5;
+    s.callLocIdx = 862; s.pc = 15; return s.tmp_5;
   case 15:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -81494,9 +81431,9 @@ switch (step) {
     r0 = (s.tmp_0).fields["deadBodies"] = (s.tmp_1);
   case 1:
   case 2:
-    s.i___116825 = (0);
+    s.i___91714 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___116825;
+    s.tmp_1 = r0 = s.i___91714;
     r0 = s.arg0.fields["bodies"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -81507,9 +81444,9 @@ switch (step) {
     if (!r0) { step = 12; continue; }
     r0 = s.arg0.fields["bodies"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_4, s.i___116825);
-    s.body1___116832 = (r0);
-    r0 = s.body1___116832.fields["enabled"];
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___91714);
+    s.body1___91721 = (r0);
+    r0 = s.body1___91721.fields["enabled"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -81520,10 +81457,10 @@ switch (step) {
     { step = 11; continue; }
   case 4:
   case 5:
-    r0 = (s.i___116825 + 1);
-    s.j___116840 = (r0);
+    r0 = (s.i___91714 + 1);
+    s.j___91729 = (r0);
   case 6:
-    s.tmp_1 = r0 = s.j___116840;
+    s.tmp_1 = r0 = s.j___91729;
     r0 = s.arg0.fields["bodies"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -81534,9 +81471,9 @@ switch (step) {
     if (!r0) { step = 10; continue; }
     r0 = s.arg0.fields["bodies"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_4, s.j___116840);
-    s.body2___116850 = (r0);
-    r0 = s.body2___116850.fields["enabled"];
+    r0 = pxsim_Array__getAt(s.tmp_4, s.j___91729);
+    s.body2___91739 = (r0);
+    r0 = s.body2___91739.fields["enabled"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -81547,60 +81484,60 @@ switch (step) {
     { step = 9; continue; }
   case 7:
   case 8:
-    s.tmp_3 = kodu_Physics_checkCollision__P116769_mk(s);
+    s.tmp_3 = kodu_Physics_checkCollision__P91658_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.tmp_3.arg1 = s.body1___116832;
-    s.tmp_3.arg2 = s.body2___116850;
-    s.callLocIdx = 864; s.pc = 16; return s.tmp_3;
+    s.tmp_3.arg1 = s.body1___91721;
+    s.tmp_3.arg2 = s.body2___91739;
+    s.callLocIdx = 863; s.pc = 16; return s.tmp_3;
   case 16:
     r0 = s.retval;
   case 9:
-    r0 = (s.j___116840 + 1);
-    s.j___116840 = (r0);
+    r0 = (s.j___91729 + 1);
+    s.j___91729 = (r0);
     { step = 6; continue; }
   case 10:
   case 11:
-    r0 = (s.i___116825 + 1);
-    s.i___116825 = (r0);
+    r0 = (s.i___91714 + 1);
+    s.i___91714 = (r0);
     { step = 3; continue; }
   case 12:
-    s.body___116868 = (undefined);
+    s.body___91757 = (undefined);
     r0 = s.arg0.fields["bodies"];
-    s.unnamed16854___U5 = (r0);
-    s.unnamed16855___U6 = (0);
+    s.unnamed1906___U5 = (r0);
+    s.unnamed1907___U6 = (0);
   case 13:
-    s.tmp_0 = r0 = s.unnamed16855___U6;
-    r0 = pxsim_Array__length(s.unnamed16854___U5);
+    s.tmp_0 = r0 = s.unnamed1907___U6;
+    r0 = pxsim_Array__length(s.unnamed1906___U5);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 14; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16854___U5, s.unnamed16855___U6);
-    s.body___116868 = (r0);
-    s.tmp_2 = kodu_Body_applyFriction__P110389_mk(s);
-    s.tmp_2.arg0 = s.body___116868;
-    s.callLocIdx = 865; s.pc = 17; return s.tmp_2;
+    r0 = pxsim_Array__getAt(s.unnamed1906___U5, s.unnamed1907___U6);
+    s.body___91757 = (r0);
+    s.tmp_2 = kodu_Body_applyFriction__P85142_mk(s);
+    s.tmp_2.arg0 = s.body___91757;
+    s.callLocIdx = 864; s.pc = 17; return s.tmp_2;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = kodu_Body_applyVelocity__P110390_mk(s);
-    s.tmp_0.arg0 = s.body___116868;
-    s.callLocIdx = 866; s.pc = 18; return s.tmp_0;
+    s.tmp_0 = kodu_Body_applyVelocity__P85143_mk(s);
+    s.tmp_0.arg0 = s.body___91757;
+    s.callLocIdx = 865; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    r0 = (s.unnamed16855___U6 + 1);
-    s.unnamed16855___U6 = (r0);
+    r0 = (s.unnamed1907___U6 + 1);
+    s.unnamed1907___U6 = (r0);
     { step = 13; continue; }
   case 14:
-    s.unnamed16854___U5 = (undefined);
+    s.unnamed1906___U5 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Physics_simulate__P110397.info = {"start":1870,"length":778,"line":67,"column":8,"endLine":87,"endColumn":9,"fileName":"physics.ts","functionName":"simulate","argumentNames":["this"]}
+kodu_Physics_simulate__P85150.info = {"start":1870,"length":778,"line":67,"column":8,"endLine":87,"endColumn":9,"fileName":"physics.ts","functionName":"simulate","argumentNames":["this"]}
 
-function kodu_Physics_simulate__P110397_mk(s) {
+function kodu_Physics_simulate__P85150_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Physics_simulate__P110397, depth: s.depth + 1,
+        parent: s, fn: kodu_Physics_simulate__P85150, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -81608,13 +81545,13 @@ function kodu_Physics_simulate__P110397_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  i___116825: undefined,
-  body1___116832: undefined,
-  j___116840: undefined,
-  body2___116850: undefined,
-  body___116868: undefined,
-  unnamed16854___U5: undefined,
-  unnamed16855___U6: undefined,
+  i___91714: undefined,
+  body1___91721: undefined,
+  j___91729: undefined,
+  body2___91739: undefined,
+  body___91757: undefined,
+  unnamed1906___U5: undefined,
+  unnamed1907___U6: undefined,
   arg0: undefined,
 } }
 
@@ -81622,7 +81559,7 @@ function kodu_Physics_simulate__P110397_mk(s) {
 
 
 
-function inline__P116810(s) {
+function inline__P91699(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81636,14 +81573,14 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P116814);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P91703);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_3 = helpers_arrayFind__P106718_mk(s);
+    s.tmp_3 = helpers_arrayFind__P81380_mk(s);
     r0 = s.caps[0].fields["deadBodies"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
-    s.callLocIdx = 862; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 861; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -81653,12 +81590,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116810.info = {"start":1981,"length":52,"line":69,"column":49,"endLine":69,"endColumn":101,"fileName":"physics.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P91699.info = {"start":1981,"length":52,"line":69,"column":49,"endLine":69,"endColumn":101,"fileName":"physics.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P116810_mk(s) {
+function inline__P91699_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116810, depth: s.depth + 1,
+        parent: s, fn: inline__P91699, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -81671,7 +81608,7 @@ function inline__P116810_mk(s) {
 
 
 
-function inline__P116814(s) {
+function inline__P91703(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81689,12 +81626,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P116814.info = {"start":2011,"length":21,"line":69,"column":79,"endLine":69,"endColumn":100,"fileName":"physics.ts","functionName":"inline","argumentNames":["dead"]}
+inline__P91703.info = {"start":2011,"length":21,"line":69,"column":79,"endLine":69,"endColumn":100,"fileName":"physics.ts","functionName":"inline","argumentNames":["dead"]}
 
-function inline__P116814_mk(s) {
+function inline__P91703_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P116814, depth: s.depth + 1,
+        parent: s, fn: inline__P91703, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -81703,7 +81640,7 @@ function inline__P116814_mk(s) {
 
 
 
-function kodu_Body_applyVelocity__P110390(s) {
+function kodu_Body_applyVelocity__P85143(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81718,13 +81655,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Body__C110375_VT)) failedCast(r0);
-    s.tmp_0 = kodu_Body_x__P110386_mk(s);
+    if (!checkSubtype(r0, kodu_Body__C85128_VT)) failedCast(r0);
+    s.tmp_0 = kodu_Body_x__P85139_mk(s);
     s.tmp_1 = r0 = s.arg0;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = kodu_Body_x__P110384_mk(s);
+    s.tmp_3 = kodu_Body_x__P85137_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 857; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 856; s.pc = 2; return s.tmp_3;
   case 2:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -81732,15 +81669,15 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 858; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 857; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = kodu_Body_y__P110387_mk(s);
+    s.tmp_0 = kodu_Body_y__P85140_mk(s);
     s.tmp_1 = r0 = s.arg0;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = kodu_Body_y__P110385_mk(s);
+    s.tmp_3 = kodu_Body_y__P85138_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 859; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 858; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -81748,19 +81685,19 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 860; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 859; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Body_applyVelocity__P110390.info = {"start":1236,"length":89,"line":40,"column":8,"endLine":43,"endColumn":9,"fileName":"physics.ts","functionName":"applyVelocity","argumentNames":["this"]}
+kodu_Body_applyVelocity__P85143.info = {"start":1236,"length":89,"line":40,"column":8,"endLine":43,"endColumn":9,"fileName":"physics.ts","functionName":"applyVelocity","argumentNames":["this"]}
 
-function kodu_Body_applyVelocity__P110390_mk(s) {
+function kodu_Body_applyVelocity__P85143_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Body_applyVelocity__P110390, depth: s.depth + 1,
+        parent: s, fn: kodu_Body_applyVelocity__P85143, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -81774,7 +81711,7 @@ function kodu_Body_applyVelocity__P110390_mk(s) {
 
 
 
-function kodu_Body_applyFriction__P110389(s) {
+function kodu_Body_applyFriction__P85142(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81784,18 +81721,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.vx___116708 = undefined;
-    s.vy___116711 = undefined;
+    s.vx___91597 = undefined;
+    s.vy___91600 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Body__C110375_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Body__C85128_VT)) failedCast(r0);
     r0 = s.arg0.fields["vx"];
-    s.vx___116708 = (r0);
+    s.vx___91597 = (r0);
     r0 = s.arg0.fields["vy"];
-    s.vy___116711 = (r0);
+    s.vy___91600 = (r0);
     r0 = s.arg0.fields["vx"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -81850,7 +81787,7 @@ switch (step) {
   case 7:
     r0 = s.arg0.fields["vx"];
     s.tmp_4 = r0;
-    r0 = (s.vx___116708 == s.tmp_4);
+    r0 = (s.vx___91597 == s.tmp_4);
   case 8:
     // jmp value (already in r0)
     s.tmp_5 = r0;
@@ -81861,7 +81798,7 @@ switch (step) {
   case 9:
     r0 = s.arg0.fields["vy"];
     s.tmp_6 = r0;
-    r0 = (s.vy___116711 == s.tmp_6);
+    r0 = (s.vy___91600 == s.tmp_6);
   case 10:
     // jmp value (already in r0)
     s.tmp_7 = r0;
@@ -81875,12 +81812,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Body_applyFriction__P110389.info = {"start":795,"length":432,"line":27,"column":8,"endLine":39,"endColumn":9,"fileName":"physics.ts","functionName":"applyFriction","argumentNames":["this"]}
+kodu_Body_applyFriction__P85142.info = {"start":795,"length":432,"line":27,"column":8,"endLine":39,"endColumn":9,"fileName":"physics.ts","functionName":"applyFriction","argumentNames":["this"]}
 
-function kodu_Body_applyFriction__P110389_mk(s) {
+function kodu_Body_applyFriction__P85142_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Body_applyFriction__P110389, depth: s.depth + 1,
+        parent: s, fn: kodu_Body_applyFriction__P85142, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -81890,8 +81827,8 @@ function kodu_Body_applyFriction__P110389_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  vx___116708: undefined,
-  vy___116711: undefined,
+  vx___91597: undefined,
+  vy___91600: undefined,
   arg0: undefined,
 } }
 
@@ -81899,7 +81836,7 @@ function kodu_Body_applyFriction__P110389_mk(s) {
 
 
 
-function kodu_Physics_checkCollision__P116769(s) {
+function kodu_Physics_checkCollision__P91658(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -81909,18 +81846,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.minDist___116878 = undefined;
-    s.minDistSq___116885 = undefined;
-    s.vDiffX___116890 = undefined;
-    s.vDiffY___116897 = undefined;
-    s.distSq___116904 = undefined;
-    s.dist___116917 = undefined;
-    s.vNormCollisionX___116921 = undefined;
-    s.vNormCollisionY___116926 = undefined;
-    s.vRelVelocityX___116931 = undefined;
-    s.vRelVelocityY___116938 = undefined;
-    s.speed___116945 = undefined;
-    s.impulse___116964 = undefined;
+    s.minDist___91767 = undefined;
+    s.minDistSq___91774 = undefined;
+    s.vDiffX___91779 = undefined;
+    s.vDiffY___91786 = undefined;
+    s.distSq___91793 = undefined;
+    s.dist___91806 = undefined;
+    s.vNormCollisionX___91810 = undefined;
+    s.vNormCollisionY___91815 = undefined;
+    s.vRelVelocityX___91820 = undefined;
+    s.vRelVelocityY___91827 = undefined;
+    s.speed___91834 = undefined;
+    s.impulse___91853 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -81928,98 +81865,98 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Physics__C110391_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Physics__C85144_VT)) failedCast(r0);
     r0 = s.arg1.fields["radius"];
     s.tmp_0 = r0;
     r0 = s.arg2.fields["radius"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.minDist___116878 = (r0);
-    r0 = (s.minDist___116878 * s.minDist___116878);
-    s.minDistSq___116885 = (r0);
-    s.tmp_1 = kodu_Body_x__P110384_mk(s);
+    s.minDist___91767 = (r0);
+    r0 = (s.minDist___91767 * s.minDist___91767);
+    s.minDistSq___91774 = (r0);
+    s.tmp_1 = kodu_Body_x__P85137_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.callLocIdx = 867; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 866; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = kodu_Body_x__P110384_mk(s);
+    s.tmp_3 = kodu_Body_x__P85137_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 868; s.pc = 9; return s.tmp_3;
+    s.callLocIdx = 867; s.pc = 9; return s.tmp_3;
   case 9:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.vDiffX___116890 = (r0);
-    s.tmp_1 = kodu_Body_y__P110385_mk(s);
+    s.vDiffX___91779 = (r0);
+    s.tmp_1 = kodu_Body_y__P85138_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.callLocIdx = 869; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 868; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = kodu_Body_y__P110385_mk(s);
+    s.tmp_3 = kodu_Body_y__P85138_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 870; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 869; s.pc = 11; return s.tmp_3;
   case 11:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.vDiffY___116897 = (r0);
-    r0 = (s.vDiffX___116890 * s.vDiffX___116890);
+    s.vDiffY___91786 = (r0);
+    r0 = (s.vDiffX___91779 * s.vDiffX___91779);
     s.tmp_0 = r0;
-    r0 = (s.vDiffY___116897 * s.vDiffY___116897);
+    r0 = (s.vDiffY___91786 * s.vDiffY___91786);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.distSq___116904 = (r0);
-    r0 = (s.distSq___116904 > s.minDistSq___116885);
+    s.distSq___91793 = (r0);
+    r0 = (s.distSq___91793 > s.minDistSq___91774);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     { step = 7; continue; }
   case 1:
   case 2:
-    r0 = pxsim.Math_.sqrt(s.distSq___116904);
-    s.dist___116917 = (r0);
-    r0 = (s.vDiffX___116890 / s.dist___116917);
-    s.vNormCollisionX___116921 = (r0);
-    r0 = (s.vDiffY___116897 / s.dist___116917);
-    s.vNormCollisionY___116926 = (r0);
+    r0 = pxsim.Math_.sqrt(s.distSq___91793);
+    s.dist___91806 = (r0);
+    r0 = (s.vDiffX___91779 / s.dist___91806);
+    s.vNormCollisionX___91810 = (r0);
+    r0 = (s.vDiffY___91786 / s.dist___91806);
+    s.vNormCollisionY___91815 = (r0);
     r0 = s.arg1.fields["vx"];
     s.tmp_0 = r0;
     r0 = s.arg2.fields["vx"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.vRelVelocityX___116931 = (r0);
+    s.vRelVelocityX___91820 = (r0);
     r0 = s.arg1.fields["vy"];
     s.tmp_0 = r0;
     r0 = s.arg2.fields["vy"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.vRelVelocityY___116938 = (r0);
-    s.tmp_0 = Math_abs__P106732_mk(s);
-    r0 = (s.vRelVelocityX___116931 * s.vNormCollisionX___116921);
+    s.vRelVelocityY___91827 = (r0);
+    s.tmp_0 = Math_abs__P81396_mk(s);
+    r0 = (s.vRelVelocityX___91820 * s.vNormCollisionX___91810);
     s.tmp_1 = r0;
-    r0 = (s.vRelVelocityY___116938 * s.vNormCollisionY___116926);
+    r0 = (s.vRelVelocityY___91827 * s.vNormCollisionY___91815);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 871; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 870; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.speed___116945 = (r0);
-    s.tmp_0 = r0 = s.speed___116945;
-    s.tmp_2 = Math_min__P106735_mk(s);
+    s.speed___91834 = (r0);
+    s.tmp_0 = r0 = s.speed___91834;
+    s.tmp_2 = Math_min__P81399_mk(s);
     r0 = s.arg1.fields["restitution"];
     s.tmp_2.arg0 = r0;
     r0 = s.arg2.fields["restitution"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 872; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 871; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.speed___116945 = (r0);
-    r0 = (2 * s.speed___116945);
+    s.speed___91834 = (r0);
+    r0 = (2 * s.speed___91834);
     s.tmp_0 = r0;
     r0 = s.arg1.fields["mass"];
     s.tmp_2 = r0;
@@ -82028,7 +81965,7 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 / s.tmp_1);
-    s.impulse___116964 = (r0);
+    s.impulse___91853 = (r0);
     r0 = s.arg1.fields["bumpCanMove"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -82038,9 +81975,9 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = s.arg2.fields["mass"];
     s.tmp_6 = r0;
-    r0 = (s.impulse___116964 * s.tmp_6);
+    r0 = (s.impulse___91853 * s.tmp_6);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 * s.vNormCollisionX___116921);
+    r0 = (s.tmp_5 * s.vNormCollisionX___91810);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 - s.tmp_4);
     s.tmp_2 = r0;
@@ -82050,9 +81987,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = s.arg2.fields["mass"];
     s.tmp_5 = r0;
-    r0 = (s.impulse___116964 * s.tmp_5);
+    r0 = (s.impulse___91853 * s.tmp_5);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 * s.vNormCollisionY___116926);
+    r0 = (s.tmp_4 * s.vNormCollisionY___91815);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
     s.tmp_1 = r0;
@@ -82068,9 +82005,9 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = s.arg1.fields["mass"];
     s.tmp_6 = r0;
-    r0 = (s.impulse___116964 * s.tmp_6);
+    r0 = (s.impulse___91853 * s.tmp_6);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 * s.vNormCollisionX___116921);
+    r0 = (s.tmp_5 * s.vNormCollisionX___91810);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
@@ -82080,9 +82017,9 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = s.arg1.fields["mass"];
     s.tmp_5 = r0;
-    r0 = (s.impulse___116964 * s.tmp_5);
+    r0 = (s.impulse___91853 * s.tmp_5);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 * s.vNormCollisionY___116926);
+    r0 = (s.tmp_4 * s.vNormCollisionY___91815);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
@@ -82093,12 +82030,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "body1", s.arg1);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "body2", s.arg2);
-    s.tmp_1 = kodu_Stage__C468688_v10_3_mk(s);
+    s.tmp_1 = kodu_Stage__C85045_v10_3_mk(s);
     r0 = s.arg0.fields["stage"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = "physics:collision";
     s.tmp_1.arg2 = s.tmp_0;
-    if (!checkSubtype(s.tmp_1.arg0, kodu_Stage__C468688_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, kodu_Stage__C85045_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.notify;
     s.pc = 14; return s.tmp_1;
   case 14:
@@ -82108,12 +82045,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Physics_checkCollision__P116769.info = {"start":2658,"length":1436,"line":89,"column":8,"endLine":118,"endColumn":9,"fileName":"physics.ts","functionName":"checkCollision","argumentNames":["this","body1","body2"]}
+kodu_Physics_checkCollision__P91658.info = {"start":2658,"length":1436,"line":89,"column":8,"endLine":118,"endColumn":9,"fileName":"physics.ts","functionName":"checkCollision","argumentNames":["this","body1","body2"]}
 
-function kodu_Physics_checkCollision__P116769_mk(s) {
+function kodu_Physics_checkCollision__P91658_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Physics_checkCollision__P116769, depth: s.depth + 1,
+        parent: s, fn: kodu_Physics_checkCollision__P91658, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -82122,18 +82059,18 @@ function kodu_Physics_checkCollision__P116769_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  minDist___116878: undefined,
-  minDistSq___116885: undefined,
-  vDiffX___116890: undefined,
-  vDiffY___116897: undefined,
-  distSq___116904: undefined,
-  dist___116917: undefined,
-  vNormCollisionX___116921: undefined,
-  vNormCollisionY___116926: undefined,
-  vRelVelocityX___116931: undefined,
-  vRelVelocityY___116938: undefined,
-  speed___116945: undefined,
-  impulse___116964: undefined,
+  minDist___91767: undefined,
+  minDistSq___91774: undefined,
+  vDiffX___91779: undefined,
+  vDiffY___91786: undefined,
+  distSq___91793: undefined,
+  dist___91806: undefined,
+  vNormCollisionX___91810: undefined,
+  vNormCollisionY___91815: undefined,
+  vRelVelocityX___91820: undefined,
+  vRelVelocityY___91827: undefined,
+  speed___91834: undefined,
+  impulse___91853: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -82143,7 +82080,7 @@ function kodu_Physics_checkCollision__P116769_mk(s) {
 
 
 
-function helpers_arrayFind__P106718(s) {
+function helpers_arrayFind__P81380(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82153,28 +82090,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___125116 = undefined;
-    s.i___125119 = undefined;
-    s.v___125124 = undefined;
+    s.len___100500 = undefined;
+    s.i___100503 = undefined;
+    s.v___100508 = 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___125116 = (r0);
-    s.i___125119 = (0);
+    s.len___100500 = (r0);
+    s.i___100503 = (0);
   case 1:
-    r0 = (s.i___125119 < s.len___125116);
+    r0 = (s.i___100503 < s.len___100500);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.arg0, s.i___125119);
-    s.v___125124 = (r0);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___100503);
+    s.v___100508 = (r0);
     s.tmp_1 = lambda_3_mk(s);
     s.tmp_1.argL = s.arg1;
-    s.tmp_1.arg0 = s.v___125124;
-    s.tmp_1.arg1 = s.i___125119;
+    s.tmp_1.arg0 = s.v___100508;
+    s.tmp_1.arg1 = s.i___100503;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 7; s.pc = 6; return s.tmp_1;
   case 6:
@@ -82182,12 +82119,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = s.v___125124;
+    r0 = s.v___100508;
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___125119 + 1);
-    s.i___125119 = (r0);
+    r0 = (s.i___100503 + 1);
+    s.i___100503 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
@@ -82195,18 +82132,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayFind__P106718.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__P81380.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__P106718_mk(s) {
+function helpers_arrayFind__P81380_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayFind__P106718, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayFind__P81380, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___125116: undefined,
-  i___125119: undefined,
-  v___125124: undefined,
+  len___100500: undefined,
+  i___100503: undefined,
+  v___100508: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -82215,7 +82152,7 @@ function helpers_arrayFind__P106718_mk(s) {
 
 
 
-function kodu_Character_notify__P538187(s) {
+function kodu_Character_notify__P85034(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82225,8 +82162,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.savedGame___538585 = undefined;
-    s.state___538588 = undefined;
+    s.savedGame___89735 = undefined;
+    s.state___89738 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -82234,24 +82171,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = (s.arg1 === "save");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.savedGame___538585 = (s.arg2);
+    s.savedGame___89735 = (s.arg2);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    s.tmp_2 = kodu_Character_x__P538093_mk(s);
+    s.tmp_2 = kodu_Character_x__P85014_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 445; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 444; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "x", s.tmp_1);
-    s.tmp_4 = kodu_Character_y__P538094_mk(s);
+    s.tmp_4 = kodu_Character_y__P85016_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 446; s.pc = 12; return s.tmp_4;
+    s.callLocIdx = 445; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -82265,35 +82202,35 @@ 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 = 447; s.pc = 13; return s.tmp_6; }
+     else { s.callLocIdx = 446; s.pc = 13; return s.tmp_6; }
     }
   case 13:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "id", s.tmp_5);
-    s.tmp_8 = kodu_BrainDefn_toObj__P110364_mk(s);
+    s.tmp_8 = kodu_BrainDefn_toObj__P85117_mk(s);
     r0 = s.arg0.fields["bdefn"];
     s.tmp_8.arg0 = r0;
-    s.callLocIdx = 448; s.pc = 14; return s.tmp_8;
+    s.callLocIdx = 447; s.pc = 14; return s.tmp_8;
   case 14:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "bdefn", s.tmp_7);
-    s.state___538588 = (s.tmp_0);
+    s.state___89738 = (s.tmp_0);
     s.tmp_1 = if_chars_1_mk(s);
-    s.tmp_1.arg0 = s.savedGame___538585;
+    s.tmp_1.arg0 = s.savedGame___89735;
     if (!s.tmp_1.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "chars");
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["chars"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["chars"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 449; s.pc = 15; return s.tmp_1; }
+     else { s.callLocIdx = 448; s.pc = 15; return s.tmp_1; }
     }
   case 15:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.state___538588);
+    r0 = pxsim_Array__push(s.tmp_0, s.state___89738);
     { step = 10; continue; }
   case 1:
     r0 = (s.arg1 === "gameModeChanged");
@@ -82308,10 +82245,10 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 2; continue; }
-    s.tmp_3 = kodu_Program_destroy__P136368_mk(s);
+    s.tmp_3 = kodu_Program_destroy__P85169_mk(s);
     r0 = s.arg0.fields["prog"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 450; s.pc = 16; return s.tmp_3;
+    s.callLocIdx = 449; s.pc = 16; return s.tmp_3;
   case 16:
     r0 = s.retval;
     r0 = (s.arg0).fields["prog"] = (undefined);
@@ -82323,12 +82260,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(kodu_Program__C136367_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(kodu_Program__C85160_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = kodu_Program_constructor__P136395_mk(s);
+    s.tmp_2 = kodu_Program_constructor__P85168_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     s.tmp_2.arg1 = s.arg0;
-    s.callLocIdx = 451; s.pc = 17; return s.tmp_2;
+    s.callLocIdx = 450; s.pc = 17; return s.tmp_2;
   case 17:
     r0 = s.retval;
     r0 = (s.arg0).fields["prog"] = (s.tmp_1);
@@ -82342,12 +82279,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_notify__P538187.info = {"start":5719,"length":778,"line":172,"column":8,"endLine":192,"endColumn":9,"fileName":"character.ts","functionName":"notify","argumentNames":["this","event","parm"]}
+kodu_Character_notify__P85034.info = {"start":5719,"length":778,"line":172,"column":8,"endLine":192,"endColumn":9,"fileName":"character.ts","functionName":"notify","argumentNames":["this","event","parm"]}
 
-function kodu_Character_notify__P538187_mk(s) {
+function kodu_Character_notify__P85034_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_notify__P538187, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_notify__P85034, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -82358,8 +82295,8 @@ function kodu_Character_notify__P538187_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  savedGame___538585: undefined,
-  state___538588: undefined,
+  savedGame___89735: undefined,
+  state___89738: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -82369,7 +82306,7 @@ function kodu_Character_notify__P538187_mk(s) {
 
 
 
-function kodu_Program_destroy__P136368(s) {
+function kodu_Program_destroy__P85169(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82379,56 +82316,56 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.page___136783 = undefined;
-    s.unnamed16856___U1 = undefined;
-    s.unnamed16857___U2 = undefined;
+    s.page___93252 = undefined;
+    s.unnamed1908___U1 = undefined;
+    s.unnamed1909___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Program__C136367_VT)) failedCast(r0);
-    s.page___136783 = (undefined);
+    if (!checkSubtype(r0, kodu_Program__C85160_VT)) failedCast(r0);
+    s.page___93252 = (undefined);
     r0 = s.arg0.fields["pages"];
-    s.unnamed16856___U1 = (r0);
-    s.unnamed16857___U2 = (0);
+    s.unnamed1908___U1 = (r0);
+    s.unnamed1909___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16857___U2;
-    r0 = pxsim_Array__length(s.unnamed16856___U1);
+    s.tmp_0 = r0 = s.unnamed1909___U2;
+    r0 = pxsim_Array__length(s.unnamed1908___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16856___U1, s.unnamed16857___U2);
-    s.page___136783 = (r0);
-    s.tmp_2 = kodu_Page_destroy__P136772_mk(s);
-    s.tmp_2.arg0 = s.page___136783;
-    s.callLocIdx = 1082; s.pc = 3; return s.tmp_2;
+    r0 = pxsim_Array__getAt(s.unnamed1908___U1, s.unnamed1909___U2);
+    s.page___93252 = (r0);
+    s.tmp_2 = kodu_Page_destroy__P93241_mk(s);
+    s.tmp_2.arg0 = s.page___93252;
+    s.callLocIdx = 1081; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed16857___U2 + 1);
-    s.unnamed16857___U2 = (r0);
+    r0 = (s.unnamed1909___U2 + 1);
+    s.unnamed1909___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16856___U1 = (undefined);
+    s.unnamed1908___U1 = (undefined);
     r0 = (s.arg0).fields["pages"] = (undefined);
     r0 = (s.arg0).fields["char"] = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Program_destroy__P136368.info = {"start":775,"length":190,"line":29,"column":8,"endLine":35,"endColumn":9,"fileName":"program.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Program_destroy__P85169.info = {"start":775,"length":190,"line":29,"column":8,"endLine":35,"endColumn":9,"fileName":"program.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Program_destroy__P136368_mk(s) {
+function kodu_Program_destroy__P85169_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Program_destroy__P136368, depth: s.depth + 1,
+        parent: s, fn: kodu_Program_destroy__P85169, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  page___136783: undefined,
-  unnamed16856___U1: undefined,
-  unnamed16857___U2: undefined,
+  page___93252: undefined,
+  unnamed1908___U1: undefined,
+  unnamed1909___U2: undefined,
   arg0: undefined,
 } }
 
@@ -82436,7 +82373,7 @@ function kodu_Program_destroy__P136368_mk(s) {
 
 
 
-function kodu_Page_destroy__P136772(s) {
+function kodu_Page_destroy__P93241(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82446,37 +82383,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___136882 = undefined;
-    s.unnamed16858___U1 = undefined;
-    s.unnamed16859___U2 = undefined;
+    s.rule___93349 = undefined;
+    s.unnamed1910___U1 = undefined;
+    s.unnamed1911___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Page__C136770_VT)) failedCast(r0);
-    s.rule___136882 = (undefined);
+    if (!checkSubtype(r0, kodu_Page__C93239_VT)) failedCast(r0);
+    s.rule___93349 = (undefined);
     r0 = s.arg0.fields["rules"];
-    s.unnamed16858___U1 = (r0);
-    s.unnamed16859___U2 = (0);
+    s.unnamed1910___U1 = (r0);
+    s.unnamed1911___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed16859___U2;
-    r0 = pxsim_Array__length(s.unnamed16858___U1);
+    s.tmp_0 = r0 = s.unnamed1911___U2;
+    r0 = pxsim_Array__length(s.unnamed1910___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed16858___U1, s.unnamed16859___U2);
-    s.rule___136882 = (r0);
-    s.tmp_2 = kodu_Rule_destroy__P136625_mk(s);
-    s.tmp_2.arg0 = s.rule___136882;
-    s.callLocIdx = 1091; s.pc = 3; return s.tmp_2;
+    r0 = pxsim_Array__getAt(s.unnamed1910___U1, s.unnamed1911___U2);
+    s.rule___93349 = (r0);
+    s.tmp_2 = kodu_Rule_destroy__P85185_mk(s);
+    s.tmp_2.arg0 = s.rule___93349;
+    s.callLocIdx = 1090; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed16859___U2 + 1);
-    s.unnamed16859___U2 = (r0);
+    r0 = (s.unnamed1911___U2 + 1);
+    s.unnamed1911___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed16858___U1 = (undefined);
+    s.unnamed1910___U1 = (undefined);
     r0 = (s.arg0).fields["rules"] = (undefined);
     r0 = (s.arg0).fields["defn"] = (undefined);
     r0 = (s.arg0).fields["prog"] = (undefined);
@@ -82484,19 +82421,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Page_destroy__P136772.info = {"start":2314,"length":225,"line":83,"column":8,"endLine":90,"endColumn":9,"fileName":"program.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Page_destroy__P93241.info = {"start":2314,"length":225,"line":83,"column":8,"endLine":90,"endColumn":9,"fileName":"program.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Page_destroy__P136772_mk(s) {
+function kodu_Page_destroy__P93241_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Page_destroy__P136772, depth: s.depth + 1,
+        parent: s, fn: kodu_Page_destroy__P93241, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  rule___136882: undefined,
-  unnamed16858___U1: undefined,
-  unnamed16859___U2: undefined,
+  rule___93349: undefined,
+  unnamed1910___U1: undefined,
+  unnamed1911___U2: undefined,
   arg0: undefined,
 } }
 
@@ -82504,7 +82441,7 @@ function kodu_Page_destroy__P136772_mk(s) {
 
 
 
-function kodu_Rule_destroy__P136625(s) {
+function kodu_Rule_destroy__P85185(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82519,7 +82456,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Rule__C136623_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Rule__C85174_VT)) failedCast(r0);
     r0 = (s.arg0).fields["prevState"] = (undefined);
     r0 = (s.arg0).fields["state"] = (undefined);
     r0 = (s.arg0).fields["sensorFn"] = (undefined);
@@ -82532,12 +82469,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Rule_destroy__P136625.info = {"start":4280,"length":313,"line":141,"column":8,"endLine":149,"endColumn":9,"fileName":"program.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_Rule_destroy__P85185.info = {"start":4280,"length":313,"line":141,"column":8,"endLine":149,"endColumn":9,"fileName":"program.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_Rule_destroy__P136625_mk(s) {
+function kodu_Rule_destroy__P85185_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Rule_destroy__P136625, depth: s.depth + 1,
+        parent: s, fn: kodu_Rule_destroy__P85185, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -82546,7 +82483,7 @@ function kodu_Rule_destroy__P136625_mk(s) {
 
 
 
-function kodu_BrainDefn_toObj__P110364(s) {
+function kodu_BrainDefn_toObj__P85117(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82561,14 +82498,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_BrainDefn__C110359_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_BrainDefn__C85112_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["pages"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115583;
-    s.callLocIdx = 531; s.pc = 1; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90472;
+    s.callLocIdx = 530; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -82577,12 +82514,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainDefn_toObj__P110364.info = {"start":6201,"length":123,"line":207,"column":8,"endLine":211,"endColumn":9,"fileName":"language.ts","functionName":"toObj","argumentNames":["this"]}
+kodu_BrainDefn_toObj__P85117.info = {"start":6201,"length":123,"line":207,"column":8,"endLine":211,"endColumn":9,"fileName":"language.ts","functionName":"toObj","argumentNames":["this"]}
 
-function kodu_BrainDefn_toObj__P110364_mk(s) {
+function kodu_BrainDefn_toObj__P85117_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainDefn_toObj__P110364, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainDefn_toObj__P85117, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -82594,7 +82531,7 @@ function kodu_BrainDefn_toObj__P110364_mk(s) {
 
 
 
-function inline__P115583(s) {
+function inline__P90472(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82608,20 +82545,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_PageDefn_toObj__P110357_mk(s);
+    s.tmp_0 = kodu_PageDefn_toObj__P85110_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 530; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 529; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115583.info = {"start":6278,"length":20,"line":209,"column":34,"endLine":209,"endColumn":54,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90472.info = {"start":6278,"length":20,"line":209,"column":34,"endLine":209,"endColumn":54,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115583_mk(s) {
+function inline__P90472_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115583, depth: s.depth + 1,
+        parent: s, fn: inline__P90472, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -82631,7 +82568,7 @@ function inline__P115583_mk(s) {
 
 
 
-function kodu_PageDefn_toObj__P110357(s) {
+function kodu_PageDefn_toObj__P85110(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82641,34 +82578,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.obj___115506 = undefined;
+    s.obj___90395 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageDefn__C110350_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageDefn__C85103_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    s.tmp_2 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_2 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["rules"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P115511;
-    s.callLocIdx = 519; s.pc = 3; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P90400;
+    s.callLocIdx = 518; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "R", s.tmp_1);
-    s.obj___115506 = (s.tmp_0);
+    s.obj___90395 = (s.tmp_0);
     s.tmp_4 = if_R_1_mk(s);
-    s.tmp_4.arg0 = s.obj___115506;
+    s.tmp_4.arg0 = s.obj___90395;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "R");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["R"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["R"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 520; s.pc = 4; return s.tmp_4; }
+     else { s.callLocIdx = 519; s.pc = 4; return s.tmp_4; }
     }
   case 4:
     r0 = s.retval;
@@ -82681,26 +82618,26 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___115506, "R");
+    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___90395, "R");
   case 1:
   case 2:
-    r0 = s.obj___115506;
+    r0 = s.obj___90395;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageDefn_toObj__P110357.info = {"start":5127,"length":229,"line":167,"column":8,"endLine":175,"endColumn":9,"fileName":"language.ts","functionName":"toObj","argumentNames":["this"]}
+kodu_PageDefn_toObj__P85110.info = {"start":5127,"length":229,"line":167,"column":8,"endLine":175,"endColumn":9,"fileName":"language.ts","functionName":"toObj","argumentNames":["this"]}
 
-function kodu_PageDefn_toObj__P110357_mk(s) {
+function kodu_PageDefn_toObj__P85110_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageDefn_toObj__P110357, depth: s.depth + 1,
+        parent: s, fn: kodu_PageDefn_toObj__P85110, 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,
-  obj___115506: undefined,
+  obj___90395: undefined,
   arg0: undefined,
 } }
 
@@ -82708,7 +82645,7 @@ function kodu_PageDefn_toObj__P110357_mk(s) {
 
 
 
-function inline__P115511(s) {
+function inline__P90400(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82722,20 +82659,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = kodu_RuleDefn_toObj__P110348_mk(s);
+    s.tmp_0 = kodu_RuleDefn_toObj__P85101_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 518; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 517; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115511.info = {"start":5209,"length":20,"line":169,"column":34,"endLine":169,"endColumn":54,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90400.info = {"start":5209,"length":20,"line":169,"column":34,"endLine":169,"endColumn":54,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115511_mk(s) {
+function inline__P90400_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115511, depth: s.depth + 1,
+        parent: s, fn: inline__P90400, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -82745,7 +82682,7 @@ function inline__P115511_mk(s) {
 
 
 
-function kodu_RuleDefn_toObj__P110348(s) {
+function kodu_RuleDefn_toObj__P85101(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -82755,13 +82692,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.obj___115274 = undefined;
+    s.obj___90163 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_RuleDefn__C110339_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_RuleDefn__C85092_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
     r0 = s.arg0.fields["condition"];
@@ -82780,7 +82717,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["tid"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["tid"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 494; s.pc = 15; return s.tmp_3; }
+     else { s.callLocIdx = 493; s.pc = 15; return s.tmp_3; }
     }
   case 15:
     r0 = s.retval;
@@ -82804,7 +82741,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["tid"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["tid"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 495; s.pc = 16; return s.tmp_6; }
+     else { s.callLocIdx = 494; s.pc = 16; return s.tmp_6; }
     }
   case 16:
     r0 = s.retval;
@@ -82815,34 +82752,34 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_7 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "A", s.tmp_7);
-    s.tmp_9 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_9 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["filters"];
     s.tmp_9.arg0 = r0;
-    s.tmp_9.arg1 = inline__P115293;
-    s.callLocIdx = 497; s.pc = 17; return s.tmp_9;
+    s.tmp_9.arg1 = inline__P90182;
+    s.callLocIdx = 496; s.pc = 17; return s.tmp_9;
   case 17:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "F", s.tmp_8);
-    s.tmp_11 = helpers_arrayMap__P106713_mk(s);
+    s.tmp_11 = helpers_arrayMap__P81375_mk(s);
     r0 = s.arg0.fields["modifiers"];
     s.tmp_11.arg0 = r0;
-    s.tmp_11.arg1 = inline__P115300;
-    s.callLocIdx = 499; s.pc = 18; return s.tmp_11;
+    s.tmp_11.arg1 = inline__P90189;
+    s.callLocIdx = 498; s.pc = 18; return s.tmp_11;
   case 18:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "M", s.tmp_10);
-    s.obj___115274 = (s.tmp_0);
+    s.obj___90163 = (s.tmp_0);
     s.tmp_3 = if_C_1_mk(s);
-    s.tmp_3.arg0 = s.obj___115274;
+    s.tmp_3.arg0 = s.obj___90163;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "C");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["C"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["C"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 500; s.pc = 19; return s.tmp_3; }
+     else { s.callLocIdx = 499; s.pc = 19; return s.tmp_3; }
     }
   case 19:
     r0 = s.retval;
@@ -82853,18 +82790,18 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___115274, "C");
+    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___90163, "C");
   case 5:
   case 6:
     s.tmp_3 = if_S_1_mk(s);
-    s.tmp_3.arg0 = s.obj___115274;
+    s.tmp_3.arg0 = s.obj___90163;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "S");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["S"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["S"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 501; s.pc = 20; return s.tmp_3; }
+     else { s.callLocIdx = 500; s.pc = 20; return s.tmp_3; }
     }
   case 20:
     r0 = s.retval;
@@ -82875,18 +82812,18 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___115274, "S");
+    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___90163, "S");
   case 7:
   case 8:
     s.tmp_3 = if_A_1_mk(s);
-    s.tmp_3.arg0 = s.obj___115274;
+    s.tmp_3.arg0 = s.obj___90163;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "A");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["A"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["A"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 502; s.pc = 21; return s.tmp_3; }
+     else { s.callLocIdx = 501; s.pc = 21; return s.tmp_3; }
     }
   case 21:
     r0 = s.retval;
@@ -82897,18 +82834,18 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___115274, "A");
+    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___90163, "A");
   case 9:
   case 10:
     s.tmp_4 = if_F_1_mk(s);
-    s.tmp_4.arg0 = s.obj___115274;
+    s.tmp_4.arg0 = s.obj___90163;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "F");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["F"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["F"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 503; s.pc = 22; return s.tmp_4; }
+     else { s.callLocIdx = 502; s.pc = 22; return s.tmp_4; }
     }
   case 22:
     r0 = s.retval;
@@ -82921,18 +82858,18 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___115274, "F");
+    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___90163, "F");
   case 11:
   case 12:
     s.tmp_4 = if_M_1_mk(s);
-    s.tmp_4.arg0 = s.obj___115274;
+    s.tmp_4.arg0 = s.obj___90163;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "M");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["M"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["M"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 504; s.pc = 23; return s.tmp_4; }
+     else { s.callLocIdx = 503; s.pc = 23; return s.tmp_4; }
     }
   case 23:
     r0 = s.retval;
@@ -82945,19 +82882,19 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___115274, "M");
+    r0 = pxsim_pxtrt.mapDeleteByString(s.obj___90163, "M");
   case 13:
   case 14:
-    r0 = s.obj___115274;
+    r0 = s.obj___90163;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_RuleDefn_toObj__P110348.info = {"start":2295,"length":594,"line":84,"column":8,"endLine":98,"endColumn":9,"fileName":"language.ts","functionName":"toObj","argumentNames":["this"]}
+kodu_RuleDefn_toObj__P85101.info = {"start":2295,"length":594,"line":84,"column":8,"endLine":98,"endColumn":9,"fileName":"language.ts","functionName":"toObj","argumentNames":["this"]}
 
-function kodu_RuleDefn_toObj__P110348_mk(s) {
+function kodu_RuleDefn_toObj__P85101_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_RuleDefn_toObj__P110348, depth: s.depth + 1,
+        parent: s, fn: kodu_RuleDefn_toObj__P85101, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -82971,7 +82908,7 @@ function kodu_RuleDefn_toObj__P110348_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  obj___115274: undefined,
+  obj___90163: undefined,
   arg0: undefined,
 } }
 
@@ -82979,7 +82916,7 @@ function kodu_RuleDefn_toObj__P110348_mk(s) {
 
 
 
-function inline__P115293(s) {
+function inline__P90182(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -83001,19 +82938,19 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["tid"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["tid"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 496; s.pc = 1; return s.tmp_0; }
+     else { s.callLocIdx = 495; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115293.info = {"start":2542,"length":16,"line":89,"column":36,"endLine":89,"endColumn":52,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90182.info = {"start":2542,"length":16,"line":89,"column":36,"endLine":89,"endColumn":52,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115293_mk(s) {
+function inline__P90182_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115293, depth: s.depth + 1,
+        parent: s, fn: inline__P90182, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -83023,7 +82960,7 @@ function inline__P115293_mk(s) {
 
 
 
-function inline__P115300(s) {
+function inline__P90189(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -83045,19 +82982,19 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["tid"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["tid"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 498; s.pc = 1; return s.tmp_0; }
+     else { s.callLocIdx = 497; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P115300.info = {"start":2599,"length":16,"line":90,"column":38,"endLine":90,"endColumn":54,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
+inline__P90189.info = {"start":2599,"length":16,"line":90,"column":38,"endLine":90,"endColumn":54,"fileName":"language.ts","functionName":"inline","argumentNames":["elem"]}
 
-function inline__P115300_mk(s) {
+function inline__P90189_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P115300, depth: s.depth + 1,
+        parent: s, fn: inline__P90189, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -83067,7 +83004,7 @@ function inline__P115300_mk(s) {
 
 
 
-function kodu_Character_update__P538182(s) {
+function kodu_Character_update__P85029(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -83083,17 +83020,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_Character__C538168_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_Character__C85005_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_Character_update__P538182.info = {"start":3941,"length":30,"line":121,"column":8,"endLine":122,"endColumn":9,"fileName":"character.ts","functionName":"update","argumentNames":["this","dt"]}
+kodu_Character_update__P85029.info = {"start":3941,"length":30,"line":121,"column":8,"endLine":122,"endColumn":9,"fileName":"character.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function kodu_Character_update__P538182_mk(s) {
+function kodu_Character_update__P85029_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_Character_update__P538182, depth: s.depth + 1,
+        parent: s, fn: kodu_Character_update__P85029, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -83103,7 +83040,7 @@ function kodu_Character_update__P538182_mk(s) {
 
 
 
-function kodu_PageUI_destroy__P509708(s) {
+function kodu_PageUI_destroy__P94681(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -83118,19 +83055,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_PageUI__C509704_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_PageUI__C94677_VT)) failedCast(r0);
     r0 = (s.arg0).fields["rules"] = (undefined);
     r0 = (s.arg0).fields["pageBtn"] = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_PageUI_destroy__P509708.info = {"start":1861,"length":102,"line":63,"column":8,"endLine":66,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_PageUI_destroy__P94681.info = {"start":1861,"length":102,"line":63,"column":8,"endLine":66,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_PageUI_destroy__P509708_mk(s) {
+function kodu_PageUI_destroy__P94681_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_PageUI_destroy__P509708, depth: s.depth + 1,
+        parent: s, fn: kodu_PageUI_destroy__P94681, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -83139,7 +83076,7 @@ function kodu_PageUI_destroy__P509708_mk(s) {
 
 
 
-function kodu_BrainUI_destroy__P509684(s) {
+function kodu_BrainUI_destroy__P94657(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -83154,18 +83091,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_BrainUI__C509681_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_BrainUI__C94654_VT)) failedCast(r0);
     r0 = (s.arg0).fields["pages"] = (null);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-kodu_BrainUI_destroy__P509684.info = {"start":553,"length":59,"line":18,"column":8,"endLine":20,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroy","argumentNames":["this"]}
+kodu_BrainUI_destroy__P94657.info = {"start":553,"length":59,"line":18,"column":8,"endLine":20,"endColumn":9,"fileName":"kodeStage.ts","functionName":"destroy","argumentNames":["this"]}
 
-function kodu_BrainUI_destroy__P509684_mk(s) {
+function kodu_BrainUI_destroy__P94657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_BrainUI_destroy__P509684, depth: s.depth + 1,
+        parent: s, fn: kodu_BrainUI_destroy__P94657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -83174,7 +83111,7 @@ function kodu_BrainUI_destroy__P509684_mk(s) {
 
 
 
-function kodu_KodeStage_shutdownScene__P509664(s) {
+function kodu_KodeStage_shutdownScene__P85264(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -83189,9 +83126,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, kodu_KodeStage__C509651_VT)) failedCast(r0);
+    if (!checkSubtype(r0, kodu_KodeStage__C85245_VT)) failedCast(r0);
     r0 = (s.arg0).fields["char"] = (null);
-    s.tmp_0 = kodu_Stage_shutdownScene__P468703_mk(s);
+    s.tmp_0 = kodu_Stage_shutdownScene__P85064_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 1590; s.pc = 1; return s.tmp_0;
   case 1:
@@ -83200,12 +83137,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-kodu_KodeStage_shutdownScene__P509664.info = {"start":24782,"length":92,"line":694,"column":8,"endLine":697,"endColumn":9,"fileName":"kodeStage.ts","functionName":"shutdownScene","argumentNames":["this"]}
+kodu_KodeStage_shutdownScene__P85264.info = {"start":24782,"length":92,"line":694,"column":8,"endLine":697,"endColumn":9,"fileName":"kodeStage.ts","functionName":"shutdownScene","argumentNames":["this"]}
 
-function kodu_KodeStage_shutdownScene__P509664_mk(s) {
+function kodu_KodeStage_shutdownScene__P85264_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: kodu_KodeStage_shutdownScene__P509664, depth: s.depth + 1,
+        parent: s, fn: kodu_KodeStage_shutdownScene__P85264, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -83215,7 +83152,7 @@ function kodu_KodeStage_shutdownScene__P509664_mk(s) {
 
 
 
-function controller_Controller_A__P108433(s) {
+function controller_Controller_A__P83209(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -83230,7 +83167,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C108420_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C83196_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (5 - 1);
@@ -83239,13 +83176,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_A__P108433.info = {"start":9681,"length":71,"line":320,"column":8,"endLine":322,"endColumn":9,"fileName":"pxt_modules/game---hw/controller.ts","functionName":"A","argumentNames":["this"]}
-controller_Controller_A__P108433.isGetter = true;
+controller_Controller_A__P83209.info = {"start":9681,"length":71,"line":320,"column":8,"endLine":322,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"A","argumentNames":["this"]}
+controller_Controller_A__P83209.isGetter = true;
 
-function controller_Controller_A__P108433_mk(s) {
+function controller_Controller_A__P83209_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_A__P108433, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_A__P83209, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -83329,7 +83266,7 @@ function if_flags_1_mk(s) {
 } }
 
 
-function particles_ParticleFactory__C109211_v0_2_mk(s) {
+function particles_ParticleFactory__C83990_v0_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -83344,7 +83281,7 @@ function particles_ParticleFactory__C109211_v0_2_mk(s) {
 } }
 
 
-function particles_ParticleSource__C109175_v4_3_mk(s) {
+function particles_ParticleSource__C83954_v4_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -83416,7 +83353,7 @@ function if_condition_1_mk(s) {
 } }
 
 
-function PhysicsEngine__C108656_v4_2_mk(s) {
+function PhysicsEngine__C83440_v4_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -83447,7 +83384,7 @@ function if___update_3_mk(s) {
 } }
 
 
-function PhysicsEngine__C108656_v3_1_mk(s) {
+function PhysicsEngine__C83440_v3_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -83588,7 +83525,7 @@ function if_id_1_mk(s) {
 } }
 
 
-function controller_Button__C108400_v0_1_mk(s) {
+function controller_Button__C83176_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -83707,7 +83644,7 @@ function if_sourceFactory_3_mk(s) {
 } }
 
 
-function PhysicsEngine__C108656_v1_2_mk(s) {
+function PhysicsEngine__C83440_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -83905,7 +83842,7 @@ function if_getText_1_mk(s) {
 } }
 
 
-function PhysicsEngine__C108656_v2_4_mk(s) {
+function PhysicsEngine__C83440_v2_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -83979,7 +83916,7 @@ function if_z_2_mk(s) {
 } }
 
 
-function PhysicsEngine__C108656_v0_2_mk(s) {
+function PhysicsEngine__C83440_v0_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84068,7 +84005,7 @@ function if_updateSay_3_mk(s) {
 } }
 
 
-function particles_ParticleFactory__C109211_v1_4_mk(s) {
+function particles_ParticleFactory__C83990_v1_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84099,7 +84036,7 @@ function if_height_1_mk(s) {
 } }
 
 
-function sprites_BaseSprite__C108355_v0_1_mk(s) {
+function sprites_BaseSprite__C83131_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84113,7 +84050,7 @@ function sprites_BaseSprite__C108355_v0_1_mk(s) {
 } }
 
 
-function sprites_BaseSprite__C108355_v2_2_mk(s) {
+function sprites_BaseSprite__C83131_v2_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84914,7 +84851,7 @@ function if_defaults_1_mk(s) {
 } }
 
 
-function kodu_Character__C538168_v0_1_mk(s) {
+function kodu_Character__C85005_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84928,7 +84865,7 @@ function kodu_Character__C538168_v0_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v8_1_mk(s) {
+function kodu_Stage__C85045_v8_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84942,7 +84879,7 @@ function kodu_Stage__C468688_v8_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v2_1_mk(s) {
+function kodu_Stage__C85045_v2_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84956,7 +84893,7 @@ function kodu_Stage__C468688_v2_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v3_1_mk(s) {
+function kodu_Stage__C85045_v3_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84970,7 +84907,7 @@ function kodu_Stage__C468688_v3_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v10_3_mk(s) {
+function kodu_Stage__C85045_v10_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -84986,7 +84923,7 @@ function kodu_Stage__C468688_v10_3_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v4_3_mk(s) {
+function kodu_Stage__C85045_v4_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85016,7 +84953,7 @@ function if_button_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v5_2_mk(s) {
+function kodu_Stage__C85045_v5_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85031,7 +84968,7 @@ function kodu_Stage__C468688_v5_2_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v6_4_mk(s) {
+function kodu_Stage__C85045_v6_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85048,7 +84985,7 @@ function kodu_Stage__C468688_v6_4_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v7_1_mk(s) {
+function kodu_Stage__C85045_v7_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85216,7 +85153,7 @@ function if_magnitude_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v0_2_mk(s) {
+function kodu_Stage__C85045_v0_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85302,7 +85239,7 @@ function if_chars_1_mk(s) {
 } }
 
 
-function kodu_Component__C345109_v2_3_mk(s) {
+function kodu_Component__C84895_v2_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85402,7 +85339,7 @@ function if_modifiers_1_mk(s) {
 } }
 
 
-function kodu_Button__C522425_v0_1_mk(s) {
+function kodu_Button__C84856_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85502,7 +85439,7 @@ function if_name_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v1_2_mk(s) {
+function kodu_Stage__C85045_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85517,7 +85454,7 @@ function kodu_Stage__C468688_v1_2_mk(s) {
 } }
 
 
-function kodu_Component__C345109_v1_2_mk(s) {
+function kodu_Component__C84895_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85672,7 +85609,7 @@ function if_priority_1_mk(s) {
 } }
 
 
-function kodu_Menu__C518584_v0_1_mk(s) {
+function kodu_Menu__C85036_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85784,7 +85721,7 @@ function if_disallow_1_mk(s) {
 } }
 
 
-function kodu_RuleUI__C509774_v0_1_mk(s) {
+function kodu_RuleUI__C94747_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85798,7 +85735,7 @@ function kodu_RuleUI__C509774_v0_1_mk(s) {
 } }
 
 
-function kodu_Stage__C468688_v9_1_mk(s) {
+function kodu_Stage__C85045_v9_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85812,7 +85749,7 @@ function kodu_Stage__C468688_v9_1_mk(s) {
 } }
 
 
-function kodu_Component__C345109_v0_1_mk(s) {
+function kodu_Component__C84895_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -85826,7 +85763,7 @@ function kodu_Component__C345109_v0_1_mk(s) {
 } }
 
 
-function kodu_Button__C522425_v1_2_mk(s) {
+function kodu_Button__C84856_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -86041,14 +85978,14 @@ function if_M_1_mk(s) {
   arg0: undefined,
 } }
 
-const controller_Button__C108400_VT = mkVTable({
+const controller_Button__C83176_VT = mkVTable({
   name: "Button",
   numFields: 7,
   classNo: 16,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "isPressed": controller_Button_isPressed__P108409,
+    "isPressed": controller_Button_isPressed__P83185,
   },
   iface: {
     "_owner": null,
@@ -86065,26 +86002,26 @@ const controller_Button__C108400_VT = mkVTable({
     "set/_pressedElasped": null,
     "_repeatCount": null,
     "set/_repeatCount": null,
-    "toString": controller_Button_toString__P108405,
-    "raiseButtonUp": controller_Button_raiseButtonUp__P110707,
-    "raiseButtonDown": controller_Button_raiseButtonDown__P110708,
-    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P110709,
-    "onEvent": controller_Button_onEvent__P108407,
-    "isPressed": controller_Button_isPressed__P108409,
-    "pressureLevel": controller_Button_pressureLevel__P108410,
-    "setPressed": controller_Button_setPressed__P108411,
-    "__update": controller_Button___update__P108412,
+    "toString": controller_Button_toString__P83181,
+    "raiseButtonUp": controller_Button_raiseButtonUp__P85533,
+    "raiseButtonDown": controller_Button_raiseButtonDown__P85534,
+    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P85535,
+    "onEvent": controller_Button_onEvent__P83183,
+    "isPressed": controller_Button_isPressed__P83185,
+    "pressureLevel": controller_Button_pressureLevel__P83186,
+    "setPressed": controller_Button_setPressed__P83187,
+    "__update": controller_Button___update__P83188,
   },
-  toStringMethod: controller_Button_toString__P108405,
+  toStringMethod: controller_Button_toString__P83181,
 });
-const controller_AnyButton__C110710_VT = mkVTable({
+const controller_AnyButton__C85536_VT = mkVTable({
   name: "AnyButton",
   numFields: 7,
   classNo: 17,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "isPressed": controller_AnyButton_isPressed__P110712,
+    "isPressed": controller_AnyButton_isPressed__P85538,
   },
   iface: {
     "_owner": null,
@@ -86101,18 +86038,18 @@ const controller_AnyButton__C110710_VT = mkVTable({
     "set/_pressedElasped": null,
     "_repeatCount": null,
     "set/_repeatCount": null,
-    "isPressed": controller_AnyButton_isPressed__P110712,
-    "toString": controller_Button_toString__P108405,
-    "raiseButtonUp": controller_Button_raiseButtonUp__P110707,
-    "raiseButtonDown": controller_Button_raiseButtonDown__P110708,
-    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P110709,
-    "onEvent": controller_Button_onEvent__P108407,
-    "pressureLevel": controller_Button_pressureLevel__P108410,
-    "setPressed": controller_Button_setPressed__P108411,
-    "__update": controller_Button___update__P108412,
+    "isPressed": controller_AnyButton_isPressed__P85538,
+    "toString": controller_Button_toString__P83181,
+    "raiseButtonUp": controller_Button_raiseButtonUp__P85533,
+    "raiseButtonDown": controller_Button_raiseButtonDown__P85534,
+    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P85535,
+    "onEvent": controller_Button_onEvent__P83183,
+    "pressureLevel": controller_Button_pressureLevel__P83186,
+    "setPressed": controller_Button_setPressed__P83187,
+    "__update": controller_Button___update__P83188,
   },
 });
-const Math_FastRandom__C109083_VT = mkVTable({
+const Math_FastRandom__C83862_VT = mkVTable({
   name: "FastRandom",
   numFields: 2,
   classNo: 18,
@@ -86125,12 +86062,12 @@ const Math_FastRandom__C109083_VT = mkVTable({
     "set/lfsr": null,
     "seed": null,
     "set/seed": null,
-    "next": Math_FastRandom_next__P109086,
-    "randomRange": Math_FastRandom_randomRange__P109087,
-    "pickRandom": Math_FastRandom_pickRandom__P109088,
+    "next": Math_FastRandom_next__P83865,
+    "randomRange": Math_FastRandom_randomRange__P83866,
+    "pickRandom": Math_FastRandom_pickRandom__P83867,
   },
 });
-const texteffects_TextEffect__C109328_VT = mkVTable({
+const texteffects_TextEffect__C84107_VT = mkVTable({
   name: "TextEffect",
   numFields: 1,
   classNo: 19,
@@ -86143,7 +86080,7 @@ const texteffects_TextEffect__C109328_VT = mkVTable({
     "set/getState": null,
   },
 });
-const kodu_Rule__C136623_VT = mkVTable({
+const kodu_Rule__C85174_VT = mkVTable({
   name: "Rule",
   numFields: 10,
   classNo: 20,
@@ -86172,45 +86109,45 @@ const kodu_Rule__C136623_VT = mkVTable({
     "set/page": null,
     "defn": null,
     "set/defn": null,
-    "prog": kodu_Rule_prog__P136624,
-    "destroy": kodu_Rule_destroy__P136625,
-    "execute": kodu_Rule_execute__P136626,
-    "reset": kodu_Rule_reset__P136627,
-    "evalRuleCondition": kodu_Rule_evalRuleCondition__P136628,
-    "queueDefaultMovement": kodu_Rule_queueDefaultMovement__P136629,
+    "prog": kodu_Rule_prog__P85183,
+    "destroy": kodu_Rule_destroy__P85185,
+    "execute": kodu_Rule_execute__P85186,
+    "reset": kodu_Rule_reset__P85187,
+    "evalRuleCondition": kodu_Rule_evalRuleCondition__P91966,
+    "queueDefaultMovement": kodu_Rule_queueDefaultMovement__P91967,
   },
 });
-const kodu_Component__C345109_VT = mkVTable({
+const kodu_Component__C84895_VT = mkVTable({
   name: "Component",
   numFields: 2,
   classNo: 21,
   lastSubtypeNo: 31,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
     "set/stage": null,
     "kind": null,
     "set/kind": null,
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
 });
-const kodu_ActorComponent__C345173_VT = mkVTable({
+const kodu_ActorComponent__C84900_VT = mkVTable({
   name: "ActorComponent",
   numFields: 5,
   classNo: 22,
   lastSubtypeNo: 23,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
@@ -86223,32 +86160,32 @@ const kodu_ActorComponent__C345173_VT = mkVTable({
     "set/y": null,
     "pos": null,
     "set/pos": null,
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
 });
-const kodu_Character__C538168_VT = mkVTable({
+const kodu_Character__C85005_VT = mkVTable({
   name: "Character",
   numFields: 14,
   classNo: 23,
   lastSubtypeNo: 23,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Character_destroy__P538174,
-    "update": kodu_Character_update__P538182,
-    "notify": kodu_Character_notify__P538187,
+    "destroy": kodu_Character_destroy__P85021,
+    "update": kodu_Character_update__P85029,
+    "notify": kodu_Character_notify__P85034,
   },
   iface: {
     "stage": null,
     "set/stage": null,
     "kind": null,
     "set/kind": null,
-    "x": kodu_Character_x__P538093,
-    "set/x": kodu_Character_x__P538170,
-    "y": kodu_Character_y__P538094,
-    "set/y": kodu_Character_y__P538171,
-    "pos": kodu_Character_pos__P538172,
+    "x": kodu_Character_x__P85014,
+    "set/x": kodu_Character_x__P85015,
+    "y": kodu_Character_y__P85016,
+    "set/y": kodu_Character_y__P85017,
+    "pos": kodu_Character_pos__P85018,
     "kelpie": null,
     "set/kelpie": null,
     "feeling": null,
@@ -86267,21 +86204,21 @@ const kodu_Character__C538168_VT = mkVTable({
     "set/bumps": null,
     "defn": null,
     "set/defn": null,
-    "destroy": kodu_Character_destroy__P538174,
-    "showFeeling": kodu_Character_showFeeling__P538175,
-    "queueImpulse": kodu_Character_queueImpulse__P538177,
-    "addBump": kodu_Character_addBump__P538178,
-    "nextDirection": kodu_Character_nextDirection__P538179,
-    "getPhysics": kodu_Character_getPhysics__P538181,
-    "update": kodu_Character_update__P538182,
-    "think": kodu_Character_think__P538183,
-    "computeImpulses": kodu_Character_computeImpulses__P538184,
-    "applyImpulses": kodu_Character_applyImpulses__P538185,
-    "kelpieUpdate": kodu_Character_kelpieUpdate__P538186,
-    "notify": kodu_Character_notify__P538187,
+    "destroy": kodu_Character_destroy__P85021,
+    "showFeeling": kodu_Character_showFeeling__P85022,
+    "queueImpulse": kodu_Character_queueImpulse__P85024,
+    "addBump": kodu_Character_addBump__P85025,
+    "nextDirection": kodu_Character_nextDirection__P85026,
+    "getPhysics": kodu_Character_getPhysics__P85028,
+    "update": kodu_Character_update__P85029,
+    "think": kodu_Character_think__P85030,
+    "computeImpulses": kodu_Character_computeImpulses__P85031,
+    "applyImpulses": kodu_Character_applyImpulses__P85032,
+    "kelpieUpdate": kodu_Character_kelpieUpdate__P85033,
+    "notify": kodu_Character_notify__P85034,
   },
 });
-const kodu_Program__C136367_VT = mkVTable({
+const kodu_Program__C85160_VT = mkVTable({
   name: "Program",
   numFields: 8,
   classNo: 32,
@@ -86306,15 +86243,15 @@ const kodu_Program__C136367_VT = mkVTable({
     "set/executing": null,
     "char": null,
     "set/char": null,
-    "destroy": kodu_Program_destroy__P136368,
-    "execute": kodu_Program_execute__P136369,
-    "switchPage": kodu_Program_switchPage__P136370,
-    "cameraFollow": kodu_Program_cameraFollow__P136371,
-    "feel": kodu_Program_feel__P136372,
-    "updateExpression": kodu_Program_updateExpression__P136373,
+    "destroy": kodu_Program_destroy__P85169,
+    "execute": kodu_Program_execute__P85170,
+    "switchPage": kodu_Program_switchPage__P85171,
+    "cameraFollow": kodu_Program_cameraFollow__P85172,
+    "feel": kodu_Program_feel__P85173,
+    "updateExpression": kodu_Program_updateExpression__P89487,
   },
 });
-const kodu_App__C110406_VT = mkVTable({
+const kodu_App__C85189_VT = mkVTable({
   name: "App",
   numFields: 2,
   classNo: 33,
@@ -86327,12 +86264,12 @@ const kodu_App__C110406_VT = mkVTable({
     "set/stageManager": null,
     "worldStage": null,
     "set/worldStage": null,
-    "saveProject": kodu_App_saveProject__P110410,
-    "pushStage": kodu_App_pushStage__P110411,
-    "popStage": kodu_App_popStage__P110412,
+    "saveProject": kodu_App_saveProject__P85193,
+    "pushStage": kodu_App_pushStage__P85194,
+    "popStage": kodu_App_popStage__P85195,
   },
 });
-const kodu_StageManager__C468989_VT = mkVTable({
+const kodu_StageManager__C85066_VT = mkVTable({
   name: "StageManager",
   numFields: 1,
   classNo: 34,
@@ -86343,28 +86280,28 @@ const kodu_StageManager__C468989_VT = mkVTable({
   iface: {
     "stack": null,
     "set/stack": null,
-    "push": kodu_StageManager_push__P468990,
-    "pop": kodu_StageManager_pop__P468991,
+    "push": kodu_StageManager_push__P85069,
+    "pop": kodu_StageManager_pop__P85070,
   },
 });
-const kodu_Stage__C468688_VT = mkVTable({
+const kodu_Stage__C85045_VT = mkVTable({
   name: "Stage",
   numFields: 6,
   classNo: 35,
   lastSubtypeNo: 37,
   maxBgInstances: null,
   methods: {
-    "get": kodu_Stage_get__P468689,
-    "update": kodu_Stage_update__P468691,
-    "handleBPressed": kodu_Stage_handleBPressed__P468695,
-    "handleMenuPressed": kodu_Stage_handleMenuPressed__P468696,
-    "handleCursorCanvasClick": kodu_Stage_handleCursorCanvasClick__P468697,
-    "handleCursorButtonClick": kodu_Stage_handleCursorButtonClick__P468698,
-    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P468699,
-    "handleCursorCancel": kodu_Stage_handleCursorCancel__P468700,
-    "initScene": kodu_Stage_initScene__P468701,
-    "shutdownScene": kodu_Stage_shutdownScene__P468703,
-    "notify": kodu_Stage_notify__P468704,
+    "get": kodu_Stage_get__P85051,
+    "update": kodu_Stage_update__P85053,
+    "handleBPressed": kodu_Stage_handleBPressed__P85057,
+    "handleMenuPressed": kodu_Stage_handleMenuPressed__P85058,
+    "handleCursorCanvasClick": kodu_Stage_handleCursorCanvasClick__P85059,
+    "handleCursorButtonClick": kodu_Stage_handleCursorButtonClick__P85060,
+    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P85061,
+    "handleCursorCancel": kodu_Stage_handleCursorCancel__P85062,
+    "initScene": kodu_Stage_initScene__P85063,
+    "shutdownScene": kodu_Stage_shutdownScene__P85064,
+    "notify": kodu_Stage_notify__P85065,
   },
   iface: {
     "components": null,
@@ -86379,41 +86316,41 @@ const kodu_Stage__C468688_VT = mkVTable({
     "set/app": null,
     "name": null,
     "set/name": null,
-    "get": kodu_Stage_get__P468689,
-    "update": kodu_Stage_update__P468691,
-    "remove": kodu_Stage_remove__P468692,
-    "add": kodu_Stage_add__P468693,
-    "handleAPressed": kodu_Stage_handleAPressed__P468694,
-    "handleBPressed": kodu_Stage_handleBPressed__P468695,
-    "handleMenuPressed": kodu_Stage_handleMenuPressed__P468696,
-    "handleCursorCanvasClick": kodu_Stage_handleCursorCanvasClick__P468697,
-    "handleCursorButtonClick": kodu_Stage_handleCursorButtonClick__P468698,
-    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P468699,
-    "handleCursorCancel": kodu_Stage_handleCursorCancel__P468700,
-    "initScene": kodu_Stage_initScene__P468701,
-    "start": kodu_Stage_start__P468702,
-    "shutdownScene": kodu_Stage_shutdownScene__P468703,
-    "notify": kodu_Stage_notify__P468704,
+    "get": kodu_Stage_get__P85051,
+    "update": kodu_Stage_update__P85053,
+    "remove": kodu_Stage_remove__P85054,
+    "add": kodu_Stage_add__P85055,
+    "handleAPressed": kodu_Stage_handleAPressed__P85056,
+    "handleBPressed": kodu_Stage_handleBPressed__P85057,
+    "handleMenuPressed": kodu_Stage_handleMenuPressed__P85058,
+    "handleCursorCanvasClick": kodu_Stage_handleCursorCanvasClick__P85059,
+    "handleCursorButtonClick": kodu_Stage_handleCursorButtonClick__P85060,
+    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P85061,
+    "handleCursorCancel": kodu_Stage_handleCursorCancel__P85062,
+    "initScene": kodu_Stage_initScene__P85063,
+    "start": kodu_Stage_start__P88124,
+    "shutdownScene": kodu_Stage_shutdownScene__P85064,
+    "notify": kodu_Stage_notify__P85065,
   },
 });
-const kodu_WorldStage__C565268_VT = mkVTable({
+const kodu_WorldStage__C85217_VT = mkVTable({
   name: "WorldStage",
   numFields: 14,
   classNo: 36,
   lastSubtypeNo: 36,
   maxBgInstances: null,
   methods: {
-    "get": kodu_WorldStage_get__P565293,
-    "update": kodu_WorldStage_update__P565291,
-    "handleBPressed": kodu_Stage_handleBPressed__P468695,
-    "handleMenuPressed": kodu_WorldStage_handleMenuPressed__P565271,
-    "handleCursorCanvasClick": kodu_WorldStage_handleCursorCanvasClick__P565279,
-    "handleCursorButtonClick": kodu_WorldStage_handleCursorButtonClick__P565285,
-    "handleCursorCharacterClick": kodu_WorldStage_handleCursorCharacterClick__P565283,
-    "handleCursorCancel": kodu_WorldStage_handleCursorCancel__P565286,
-    "initScene": kodu_WorldStage_initScene__P565270,
-    "shutdownScene": kodu_Stage_shutdownScene__P468703,
-    "notify": kodu_WorldStage_notify__P565294,
+    "get": kodu_WorldStage_get__P85242,
+    "update": kodu_WorldStage_update__P85240,
+    "handleBPressed": kodu_Stage_handleBPressed__P85057,
+    "handleMenuPressed": kodu_WorldStage_handleMenuPressed__P85229,
+    "handleCursorCanvasClick": kodu_WorldStage_handleCursorCanvasClick__P85231,
+    "handleCursorButtonClick": kodu_WorldStage_handleCursorButtonClick__P85234,
+    "handleCursorCharacterClick": kodu_WorldStage_handleCursorCharacterClick__P85233,
+    "handleCursorCancel": kodu_WorldStage_handleCursorCancel__P85235,
+    "initScene": kodu_WorldStage_initScene__P85228,
+    "shutdownScene": kodu_Stage_shutdownScene__P85064,
+    "notify": kodu_WorldStage_notify__P85243,
   },
   iface: {
     "components": null,
@@ -86444,49 +86381,49 @@ const kodu_WorldStage__C565268_VT = mkVTable({
     "set/carryTarget": null,
     "physics": null,
     "set/physics": null,
-    "initScene": kodu_WorldStage_initScene__P565270,
-    "handleMenuPressed": kodu_WorldStage_handleMenuPressed__P565271,
-    "toggleGameMode": kodu_WorldStage_toggleGameMode__P565272,
-    "handlePlayClicked": kodu_WorldStage_handlePlayClicked__P565273,
-    "handleStopClicked": kodu_WorldStage_handleStopClicked__P565274,
-    "handleNewFileClicked": kodu_WorldStage_handleNewFileClicked__P565275,
-    "setGameMode": kodu_WorldStage_setGameMode__P565276,
-    "save": kodu_WorldStage_save__P565277,
-    "load": kodu_WorldStage_load__P565278,
-    "handleCursorCanvasClick": kodu_WorldStage_handleCursorCanvasClick__P565279,
-    "editModeHandleCanvasClick": kodu_WorldStage_editModeHandleCanvasClick__P565280,
-    "handleCreateMenuSelection": kodu_WorldStage_handleCreateMenuSelection__P565281,
-    "spawnCharacter": kodu_WorldStage_spawnCharacter__P565282,
-    "handleCursorCharacterClick": kodu_WorldStage_handleCursorCharacterClick__P565283,
-    "handleCharacterMenuSelection": kodu_WorldStage_handleCharacterMenuSelection__P565284,
-    "handleCursorButtonClick": kodu_WorldStage_handleCursorButtonClick__P565285,
-    "handleCursorCancel": kodu_WorldStage_handleCursorCancel__P565286,
-    "closeMenus": kodu_WorldStage_closeMenus__P565287,
-    "cursorPickUp": kodu_WorldStage_cursorPickUp__P565288,
-    "cursorDrop": kodu_WorldStage_cursorDrop__P565289,
-    "duplicate": kodu_WorldStage_duplicate__P565290,
-    "update": kodu_WorldStage_update__P565291,
-    "updateHover": kodu_WorldStage_updateHover__P565292,
-    "get": kodu_WorldStage_get__P565293,
-    "notify": kodu_WorldStage_notify__P565294,
-    "remove": kodu_Stage_remove__P468692,
-    "add": kodu_Stage_add__P468693,
-    "handleAPressed": kodu_Stage_handleAPressed__P468694,
-    "handleBPressed": kodu_Stage_handleBPressed__P468695,
-    "start": kodu_Stage_start__P468702,
-    "shutdownScene": kodu_Stage_shutdownScene__P468703,
+    "initScene": kodu_WorldStage_initScene__P85228,
+    "handleMenuPressed": kodu_WorldStage_handleMenuPressed__P85229,
+    "toggleGameMode": kodu_WorldStage_toggleGameMode__P93831,
+    "handlePlayClicked": kodu_WorldStage_handlePlayClicked__P93832,
+    "handleStopClicked": kodu_WorldStage_handleStopClicked__P93833,
+    "handleNewFileClicked": kodu_WorldStage_handleNewFileClicked__P93834,
+    "setGameMode": kodu_WorldStage_setGameMode__P93835,
+    "save": kodu_WorldStage_save__P85230,
+    "load": kodu_WorldStage_load__P93836,
+    "handleCursorCanvasClick": kodu_WorldStage_handleCursorCanvasClick__P85231,
+    "editModeHandleCanvasClick": kodu_WorldStage_editModeHandleCanvasClick__P93837,
+    "handleCreateMenuSelection": kodu_WorldStage_handleCreateMenuSelection__P93838,
+    "spawnCharacter": kodu_WorldStage_spawnCharacter__P85232,
+    "handleCursorCharacterClick": kodu_WorldStage_handleCursorCharacterClick__P85233,
+    "handleCharacterMenuSelection": kodu_WorldStage_handleCharacterMenuSelection__P93839,
+    "handleCursorButtonClick": kodu_WorldStage_handleCursorButtonClick__P85234,
+    "handleCursorCancel": kodu_WorldStage_handleCursorCancel__P85235,
+    "closeMenus": kodu_WorldStage_closeMenus__P85236,
+    "cursorPickUp": kodu_WorldStage_cursorPickUp__P85237,
+    "cursorDrop": kodu_WorldStage_cursorDrop__P85238,
+    "duplicate": kodu_WorldStage_duplicate__P85239,
+    "update": kodu_WorldStage_update__P85240,
+    "updateHover": kodu_WorldStage_updateHover__P85241,
+    "get": kodu_WorldStage_get__P85242,
+    "notify": kodu_WorldStage_notify__P85243,
+    "remove": kodu_Stage_remove__P85054,
+    "add": kodu_Stage_add__P85055,
+    "handleAPressed": kodu_Stage_handleAPressed__P85056,
+    "handleBPressed": kodu_Stage_handleBPressed__P85057,
+    "start": kodu_Stage_start__P88124,
+    "shutdownScene": kodu_Stage_shutdownScene__P85064,
   },
 });
-const kodu_Camera__C530755_VT = mkVTable({
+const kodu_Camera__C84878_VT = mkVTable({
   name: "Camera",
   numFields: 7,
   classNo: 24,
   lastSubtypeNo: 24,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Camera_update__P530762,
-    "notify": kodu_Camera_notify__P530764,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Camera_update__P84891,
+    "notify": kodu_Camera_notify__P84893,
   },
   iface: {
     "stage": null,
@@ -86503,25 +86440,25 @@ const kodu_Camera__C530755_VT = mkVTable({
     "set/y": null,
     "following": null,
     "set/following": null,
-    "setScreenRelativePosition": kodu_Camera_setScreenRelativePosition__P530754,
-    "moveTo": kodu_Camera_moveTo__P530759,
-    "follow": kodu_Camera_follow__P530760,
-    "update": kodu_Camera_update__P530762,
-    "keepInFrame": kodu_Camera_keepInFrame__P530763,
-    "notify": kodu_Camera_notify__P530764,
-    "destroy": kodu_Component_destroy__P345110,
+    "setScreenRelativePosition": kodu_Camera_setScreenRelativePosition__P84887,
+    "moveTo": kodu_Camera_moveTo__P84888,
+    "follow": kodu_Camera_follow__P84889,
+    "update": kodu_Camera_update__P84891,
+    "keepInFrame": kodu_Camera_keepInFrame__P84892,
+    "notify": kodu_Camera_notify__P84893,
+    "destroy": kodu_Component_destroy__P84897,
   },
 });
-const kodu_Cursor__C549528_VT = mkVTable({
+const kodu_Cursor__C84979_VT = mkVTable({
   name: "Cursor",
   numFields: 8,
   classNo: 25,
   lastSubtypeNo: 25,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Cursor_update__P549539,
-    "notify": kodu_Cursor_notify__P549540,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Cursor_update__P84998,
+    "notify": kodu_Cursor_notify__P84999,
   },
   iface: {
     "stage": null,
@@ -86540,58 +86477,58 @@ const kodu_Cursor__C549528_VT = mkVTable({
     "set/moveStartMs": null,
     "cursorSpeed": null,
     "set/cursorSpeed": null,
-    "x": kodu_Cursor_x__P549461,
-    "set/x": kodu_Cursor_x__P549530,
-    "y": kodu_Cursor_y__P549462,
-    "set/y": kodu_Cursor_y__P549531,
-    "setCursorMode": kodu_Cursor_setCursorMode__P549532,
-    "moveTo": kodu_Cursor_moveTo__P549533,
-    "disable": kodu_Cursor_disable__P549534,
-    "enable": kodu_Cursor_enable__P549535,
-    "getAllOverlapping": kodu_Cursor_getAllOverlapping__P549536,
-    "handleAPressed": kodu_Cursor_handleAPressed__P549537,
-    "handleBPressed": kodu_Cursor_handleBPressed__P549538,
-    "update": kodu_Cursor_update__P549539,
-    "notify": kodu_Cursor_notify__P549540,
-    "destroy": kodu_Component_destroy__P345110,
+    "x": kodu_Cursor_x__P84986,
+    "set/x": kodu_Cursor_x__P84988,
+    "y": kodu_Cursor_y__P84987,
+    "set/y": kodu_Cursor_y__P84989,
+    "setCursorMode": kodu_Cursor_setCursorMode__P84991,
+    "moveTo": kodu_Cursor_moveTo__P84992,
+    "disable": kodu_Cursor_disable__P84993,
+    "enable": kodu_Cursor_enable__P84994,
+    "getAllOverlapping": kodu_Cursor_getAllOverlapping__P84995,
+    "handleAPressed": kodu_Cursor_handleAPressed__P84996,
+    "handleBPressed": kodu_Cursor_handleBPressed__P84997,
+    "update": kodu_Cursor_update__P84998,
+    "notify": kodu_Cursor_notify__P84999,
+    "destroy": kodu_Component_destroy__P84897,
   },
 });
-const sprites_BaseSprite__C108355_VT = mkVTable({
+const sprites_BaseSprite__C83131_VT = mkVTable({
   name: "BaseSprite",
   numFields: 2,
   classNo: 38,
   lastSubtypeNo: 43,
   maxBgInstances: null,
   methods: {
-    "__visible": sprites_BaseSprite___visible__P108358,
-    "__draw": sprites_BaseSprite___draw__P108361,
-    "__drawCore": sprites_BaseSprite___drawCore__P108362,
-    "__update": sprites_BaseSprite___update__P108363,
+    "__visible": sprites_BaseSprite___visible__P83134,
+    "__draw": sprites_BaseSprite___draw__P83137,
+    "__drawCore": sprites_BaseSprite___drawCore__P83138,
+    "__update": sprites_BaseSprite___update__P83139,
   },
   iface: {
     "_z": null,
     "set/_z": null,
     "id": null,
     "set/id": null,
-    "__visible": sprites_BaseSprite___visible__P108358,
-    "z": sprites_BaseSprite_z__P108359,
-    "set/z": sprites_BaseSprite_z__P108360,
-    "__draw": sprites_BaseSprite___draw__P108361,
-    "__drawCore": sprites_BaseSprite___drawCore__P108362,
-    "__update": sprites_BaseSprite___update__P108363,
+    "__visible": sprites_BaseSprite___visible__P83134,
+    "z": sprites_BaseSprite_z__P83135,
+    "set/z": sprites_BaseSprite_z__P83136,
+    "__draw": sprites_BaseSprite___draw__P83137,
+    "__drawCore": sprites_BaseSprite___drawCore__P83138,
+    "__update": sprites_BaseSprite___update__P83139,
   },
 });
-const kodu_Kelpie__C110487_VT = mkVTable({
+const kodu_Kelpie__C85270_VT = mkVTable({
   name: "Kelpie",
   numFields: 8,
   classNo: 39,
   lastSubtypeNo: 39,
   maxBgInstances: null,
   methods: {
-    "__visible": kodu_Kelpie___visible__P110512,
-    "__draw": sprites_BaseSprite___draw__P108361,
-    "__drawCore": kodu_Kelpie___drawCore__P110513,
-    "__update": kodu_Kelpie___update__P110514,
+    "__visible": kodu_Kelpie___visible__P85295,
+    "__draw": sprites_BaseSprite___draw__P83137,
+    "__drawCore": kodu_Kelpie___drawCore__P85296,
+    "__update": kodu_Kelpie___update__P85297,
   },
   iface: {
     "_z": null,
@@ -86610,45 +86547,45 @@ const kodu_Kelpie__C110487_VT = mkVTable({
     "set/_flags": null,
     "onUpdate": null,
     "set/onUpdate": null,
-    "x": kodu_Kelpie_x__P110489,
-    "set/x": kodu_Kelpie_x__P110490,
-    "y": kodu_Kelpie_y__P110491,
-    "set/y": kodu_Kelpie_y__P110492,
-    "width": kodu_Kelpie_width__P110493,
-    "height": kodu_Kelpie_height__P110494,
-    "left": kodu_Kelpie_left__P110495,
-    "set/left": kodu_Kelpie_left__P110496,
-    "right": kodu_Kelpie_right__P110497,
-    "top": kodu_Kelpie_top__P110498,
-    "set/top": kodu_Kelpie_top__P110499,
-    "bottom": kodu_Kelpie_bottom__P110500,
-    "data": kodu_Kelpie_data__P110501,
-    "set/data": kodu_Kelpie_data__P110502,
-    "image": kodu_Kelpie_image__P110503,
-    "setImage": kodu_Kelpie_setImage__P110504,
-    "hud": kodu_Kelpie_hud__P110505,
-    "invisible": kodu_Kelpie_invisible__P110507,
-    "set/invisible": kodu_Kelpie_invisible__P110508,
-    "destroy": kodu_Kelpie_destroy__P110510,
-    "isOutOfScreen": kodu_Kelpie_isOutOfScreen__P110511,
-    "__visible": kodu_Kelpie___visible__P110512,
-    "__drawCore": kodu_Kelpie___drawCore__P110513,
-    "__update": kodu_Kelpie___update__P110514,
-    "z": sprites_BaseSprite_z__P108359,
-    "set/z": sprites_BaseSprite_z__P108360,
-    "__draw": sprites_BaseSprite___draw__P108361,
+    "x": kodu_Kelpie_x__P85272,
+    "set/x": kodu_Kelpie_x__P85273,
+    "y": kodu_Kelpie_y__P85274,
+    "set/y": kodu_Kelpie_y__P85275,
+    "width": kodu_Kelpie_width__P85276,
+    "height": kodu_Kelpie_height__P85277,
+    "left": kodu_Kelpie_left__P85278,
+    "set/left": kodu_Kelpie_left__P85279,
+    "right": kodu_Kelpie_right__P85280,
+    "top": kodu_Kelpie_top__P85281,
+    "set/top": kodu_Kelpie_top__P85282,
+    "bottom": kodu_Kelpie_bottom__P85283,
+    "data": kodu_Kelpie_data__P85284,
+    "set/data": kodu_Kelpie_data__P85285,
+    "image": kodu_Kelpie_image__P85286,
+    "setImage": kodu_Kelpie_setImage__P85287,
+    "hud": kodu_Kelpie_hud__P85288,
+    "invisible": kodu_Kelpie_invisible__P85290,
+    "set/invisible": kodu_Kelpie_invisible__P85291,
+    "destroy": kodu_Kelpie_destroy__P85293,
+    "isOutOfScreen": kodu_Kelpie_isOutOfScreen__P85294,
+    "__visible": kodu_Kelpie___visible__P85295,
+    "__drawCore": kodu_Kelpie___drawCore__P85296,
+    "__update": kodu_Kelpie___update__P85297,
+    "z": sprites_BaseSprite_z__P83135,
+    "set/z": sprites_BaseSprite_z__P83136,
+    "__draw": sprites_BaseSprite___draw__P83137,
   },
 });
-const kodu_Button__C522425_VT = mkVTable({
+const kodu_Button__C84856_VT = mkVTable({
   name: "Button",
   numFields: 12,
   classNo: 26,
   lastSubtypeNo: 26,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Button_destroy__P522433,
-    "update": kodu_Button_update__P522441,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_Button_destroy__P84867,
+    "update": kodu_Button_update__P84874,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
@@ -86675,27 +86612,27 @@ const kodu_Button__C522425_VT = mkVTable({
     "set/hud": null,
     "onClick": null,
     "set/onClick": null,
-    "id": kodu_Button_id__P522427,
-    "width": kodu_Button_width__P522428,
-    "height": kodu_Button_height__P522429,
-    "z": kodu_Button_z__P522430,
-    "set/z": kodu_Button_z__P522431,
-    "data": kodu_Button_data__P522432,
-    "destroy": kodu_Button_destroy__P522433,
-    "setIcon": kodu_Button_setIcon__P522434,
-    "buildSprite": kodu_Button_buildSprite__P522435,
-    "setVisible": kodu_Button_setVisible__P522436,
-    "clickable": kodu_Button_clickable__P522437,
-    "click": kodu_Button_click__P522438,
-    "moveTo": kodu_Button_moveTo__P522439,
-    "hover": kodu_Button_hover__P522440,
-    "update": kodu_Button_update__P522441,
-    "updateAbsolute": kodu_Button_updateAbsolute__P522442,
-    "updateScreenRelative": kodu_Button_updateScreenRelative__P522443,
-    "notify": kodu_Component_notify__P345112,
+    "id": kodu_Button_id__P84860,
+    "width": kodu_Button_width__P84861,
+    "height": kodu_Button_height__P84862,
+    "z": kodu_Button_z__P84863,
+    "set/z": kodu_Button_z__P84864,
+    "data": kodu_Button_data__P84865,
+    "destroy": kodu_Button_destroy__P84867,
+    "setIcon": kodu_Button_setIcon__P84868,
+    "buildSprite": kodu_Button_buildSprite__P87793,
+    "setVisible": kodu_Button_setVisible__P84869,
+    "clickable": kodu_Button_clickable__P84870,
+    "click": kodu_Button_click__P84871,
+    "moveTo": kodu_Button_moveTo__P84872,
+    "hover": kodu_Button_hover__P84873,
+    "update": kodu_Button_update__P84874,
+    "updateAbsolute": kodu_Button_updateAbsolute__P84875,
+    "updateScreenRelative": kodu_Button_updateScreenRelative__P84876,
+    "notify": kodu_Component_notify__P84899,
   },
 });
-const util_HitboxBounds__C110089_VT = mkVTable({
+const util_HitboxBounds__C84841_VT = mkVTable({
   name: "HitboxBounds",
   numFields: 4,
   classNo: 44,
@@ -86712,13 +86649,13 @@ const util_HitboxBounds__C110089_VT = mkVTable({
     "set/right": null,
     "bottom": null,
     "set/bottom": null,
-    "width": util_HitboxBounds_width__P110094,
-    "height": util_HitboxBounds_height__P110095,
-    "center": util_HitboxBounds_center__P110096,
-    "Intersects": util_HitboxBounds_Intersects__P110098,
+    "width": util_HitboxBounds_width__P84846,
+    "height": util_HitboxBounds_height__P84847,
+    "center": util_HitboxBounds_center__P84848,
+    "Intersects": util_HitboxBounds_Intersects__P84850,
   },
 });
-const util_Hitbox__C110087_VT = mkVTable({
+const util_Hitbox__C84839_VT = mkVTable({
   name: "Hitbox",
   numFields: 4,
   classNo: 45,
@@ -86737,7 +86674,7 @@ const util_Hitbox__C110087_VT = mkVTable({
     "set/minY": null,
   },
 });
-const control_EventContext__C106993_VT = mkVTable({
+const control_EventContext__C81657_VT = mkVTable({
   name: "EventContext",
   numFields: 9,
   classNo: 46,
@@ -86764,16 +86701,16 @@ const control_EventContext__C106993_VT = mkVTable({
     "set/idleCallbacks": null,
     "runningCallbacks": null,
     "set/runningCallbacks": null,
-    "deltaTime": control_EventContext_deltaTime__P106998,
-    "runCallbacks": control_EventContext_runCallbacks__P110594,
-    "registerFrameCallbacks": control_EventContext_registerFrameCallbacks__P110595,
-    "register": control_EventContext_register__P106999,
-    "unregister": control_EventContext_unregister__P107000,
-    "registerFrameHandler": control_EventContext_registerFrameHandler__P107001,
-    "registerHandler": control_EventContext_registerHandler__P107003,
+    "deltaTime": control_EventContext_deltaTime__P81662,
+    "runCallbacks": control_EventContext_runCallbacks__P85378,
+    "registerFrameCallbacks": control_EventContext_registerFrameCallbacks__P85379,
+    "register": control_EventContext_register__P81663,
+    "unregister": control_EventContext_unregister__P81664,
+    "registerFrameHandler": control_EventContext_registerFrameHandler__P81665,
+    "registerHandler": control_EventContext_registerHandler__P81667,
   },
 });
-const control_EventHandler__C110589_VT = mkVTable({
+const control_EventHandler__C85373_VT = mkVTable({
   name: "EventHandler",
   numFields: 4,
   classNo: 47,
@@ -86790,11 +86727,11 @@ const control_EventHandler__C110589_VT = mkVTable({
     "set/handler": null,
     "flags": null,
     "set/flags": null,
-    "register": control_EventHandler_register__P110590,
-    "unregister": control_EventHandler_unregister__P110591,
+    "register": control_EventHandler_register__P85374,
+    "unregister": control_EventHandler_unregister__P85375,
   },
 });
-const scene_Scene__C108916_VT = mkVTable({
+const scene_Scene__C83695_VT = mkVTable({
   name: "Scene",
   numFields: 23,
   classNo: 48,
@@ -86849,14 +86786,14 @@ const scene_Scene__C108916_VT = mkVTable({
     "set/_data": null,
     "previousScene": null,
     "set/previousScene": null,
-    "init": scene_Scene_init__P108938,
-    "data": scene_Scene_data__P108939,
-    "millis": scene_Scene_millis__P108940,
-    "addSprite": scene_Scene_addSprite__P108941,
-    "render": scene_Scene_render__P108943,
+    "init": scene_Scene_init__P83717,
+    "data": scene_Scene_data__P83718,
+    "millis": scene_Scene_millis__P83719,
+    "addSprite": scene_Scene_addSprite__P83720,
+    "render": scene_Scene_render__P83722,
   },
 });
-const scene_Camera__C108857_VT = mkVTable({
+const scene_Camera__C83636_VT = mkVTable({
   name: "Camera",
   numFields: 8,
   classNo: 49,
@@ -86881,41 +86818,24 @@ const scene_Camera__C108857_VT = mkVTable({
     "set/shakeDuration": null,
     "shakeAmplitude": null,
     "set/shakeAmplitude": null,
-    "offsetX": scene_Camera_offsetX__P108862,
-    "set/offsetX": scene_Camera_offsetX__P108863,
-    "offsetY": scene_Camera_offsetY__P108864,
-    "set/offsetY": scene_Camera_offsetY__P108865,
-    "x": scene_Camera_x__P108866,
-    "y": scene_Camera_y__P108867,
-    "left": scene_Camera_left__P108868,
-    "right": scene_Camera_right__P108869,
-    "top": scene_Camera_top__P108870,
-    "bottom": scene_Camera_bottom__P108871,
-    "update": scene_Camera_update__P108873,
+    "offsetX": scene_Camera_offsetX__P83641,
+    "set/offsetX": scene_Camera_offsetX__P83642,
+    "offsetY": scene_Camera_offsetY__P83643,
+    "set/offsetY": scene_Camera_offsetY__P83644,
+    "x": scene_Camera_x__P83645,
+    "y": scene_Camera_y__P83646,
+    "left": scene_Camera_left__P83647,
+    "right": scene_Camera_right__P83648,
+    "top": scene_Camera_top__P83649,
+    "bottom": scene_Camera_bottom__P83650,
+    "update": scene_Camera_update__P83652,
   },
 });
-const music_Melody__C109356_VT = mkVTable({
-  name: "Melody",
-  numFields: 2,
-  classNo: 50,
-  lastSubtypeNo: 50,
-  maxBgInstances: null,
-  methods: {
-  },
-  iface: {
-    "_text": null,
-    "set/_text": null,
-    "_player": null,
-    "set/_player": null,
-    "toString": music_Melody_toString__P109365,
-  },
-  toStringMethod: music_Melody_toString__P109365,
-});
-const effects_ImageEffect__C109313_VT = mkVTable({
+const effects_ImageEffect__C84092_VT = mkVTable({
   name: "ImageEffect",
   numFields: 4,
-  classNo: 51,
-  lastSubtypeNo: 51,
+  classNo: 50,
+  lastSubtypeNo: 50,
   maxBgInstances: null,
   methods: {
   },
@@ -86928,15 +86848,15 @@ const effects_ImageEffect__C109313_VT = mkVTable({
     "set/fastRandom": null,
     "times": null,
     "set/times": null,
-    "applyTo": effects_ImageEffect_applyTo__P109315,
-    "change": effects_ImageEffect_change__P109316,
+    "applyTo": effects_ImageEffect_applyTo__P84094,
+    "change": effects_ImageEffect_change__P84095,
   },
 });
-const effects_ParticleEffect__C109286_VT = mkVTable({
+const effects_ParticleEffect__C84065_VT = mkVTable({
   name: "ParticleEffect",
   numFields: 3,
-  classNo: 52,
-  lastSubtypeNo: 53,
+  classNo: 51,
+  lastSubtypeNo: 52,
   maxBgInstances: null,
   methods: {
   },
@@ -86947,15 +86867,15 @@ const effects_ParticleEffect__C109286_VT = mkVTable({
     "set/defaultRate": null,
     "defaultLifespan": null,
     "set/defaultLifespan": null,
-    "start": effects_ParticleEffect_start__P109288,
-    "destroy": effects_ParticleEffect_destroy__P109289,
+    "start": effects_ParticleEffect_start__P84067,
+    "destroy": effects_ParticleEffect_destroy__P84068,
   },
 });
-const effects_ScreenEffect__C109290_VT = mkVTable({
+const effects_ScreenEffect__C84069_VT = mkVTable({
   name: "ScreenEffect",
   numFields: 5,
-  classNo: 53,
-  lastSubtypeNo: 53,
+  classNo: 52,
+  lastSubtypeNo: 52,
   maxBgInstances: null,
   methods: {
   },
@@ -86970,34 +86890,34 @@ const effects_ScreenEffect__C109290_VT = mkVTable({
     "set/source": null,
     "sceneDefaultRate": null,
     "set/sceneDefaultRate": null,
-    "start": effects_ParticleEffect_start__P109288,
-    "destroy": effects_ParticleEffect_destroy__P109289,
+    "start": effects_ParticleEffect_start__P84067,
+    "destroy": effects_ParticleEffect_destroy__P84068,
   },
 });
-const particles_ParticleFactory__C109211_VT = mkVTable({
+const particles_ParticleFactory__C83990_VT = mkVTable({
   name: "ParticleFactory",
   numFields: 0,
-  classNo: 54,
-  lastSubtypeNo: 58,
+  classNo: 53,
+  lastSubtypeNo: 57,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ParticleFactory_createParticle__P109213,
-    "drawParticle": particles_ParticleFactory_drawParticle__P109214,
+    "createParticle": particles_ParticleFactory_createParticle__P83992,
+    "drawParticle": particles_ParticleFactory_drawParticle__P83993,
   },
   iface: {
-    "createParticle": particles_ParticleFactory_createParticle__P109213,
-    "drawParticle": particles_ParticleFactory_drawParticle__P109214,
+    "createParticle": particles_ParticleFactory_createParticle__P83992,
+    "drawParticle": particles_ParticleFactory_drawParticle__P83993,
   },
 });
-const particles_SprayFactory__C109215_VT = mkVTable({
+const particles_SprayFactory__C83994_VT = mkVTable({
   name: "SprayFactory",
   numFields: 3,
-  classNo: 55,
-  lastSubtypeNo: 58,
+  classNo: 54,
+  lastSubtypeNo: 57,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_SprayFactory_createParticle__P109217,
-    "drawParticle": particles_SprayFactory_drawParticle__P109218,
+    "createParticle": particles_SprayFactory_createParticle__P83996,
+    "drawParticle": particles_SprayFactory_drawParticle__P83997,
   },
   iface: {
     "speed": null,
@@ -87006,21 +86926,21 @@ const particles_SprayFactory__C109215_VT = mkVTable({
     "set/minAngle": null,
     "spread": null,
     "set/spread": null,
-    "createParticle": particles_SprayFactory_createParticle__P109217,
-    "drawParticle": particles_SprayFactory_drawParticle__P109218,
-    "setSpeed": particles_SprayFactory_setSpeed__P109219,
-    "setDirection": particles_SprayFactory_setDirection__P109220,
+    "createParticle": particles_SprayFactory_createParticle__P83996,
+    "drawParticle": particles_SprayFactory_drawParticle__P83997,
+    "setSpeed": particles_SprayFactory_setSpeed__P83998,
+    "setDirection": particles_SprayFactory_setDirection__P83999,
   },
 });
-const particles_AreaFactory__C109221_VT = mkVTable({
+const particles_AreaFactory__C84000_VT = mkVTable({
   name: "AreaFactory",
   numFields: 8,
-  classNo: 56,
-  lastSubtypeNo: 58,
+  classNo: 55,
+  lastSubtypeNo: 57,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_AreaFactory_createParticle__P109227,
-    "drawParticle": particles_AreaFactory_drawParticle__P109228,
+    "createParticle": particles_AreaFactory_createParticle__P84006,
+    "drawParticle": particles_AreaFactory_drawParticle__P84007,
   },
   iface: {
     "speed": null,
@@ -87039,21 +86959,21 @@ const particles_AreaFactory__C109221_VT = mkVTable({
     "set/maxLifespan": null,
     "galois": null,
     "set/galois": null,
-    "createParticle": particles_AreaFactory_createParticle__P109227,
-    "drawParticle": particles_AreaFactory_drawParticle__P109228,
-    "setSpeed": particles_SprayFactory_setSpeed__P109219,
-    "setDirection": particles_SprayFactory_setDirection__P109220,
+    "createParticle": particles_AreaFactory_createParticle__P84006,
+    "drawParticle": particles_AreaFactory_drawParticle__P84007,
+    "setSpeed": particles_SprayFactory_setSpeed__P83998,
+    "setDirection": particles_SprayFactory_setDirection__P83999,
   },
 });
-const particles_ShapeFactory__C109237_VT = mkVTable({
+const particles_ShapeFactory__C84016_VT = mkVTable({
   name: "ShapeFactory",
   numFields: 11,
-  classNo: 57,
-  lastSubtypeNo: 58,
+  classNo: 56,
+  lastSubtypeNo: 57,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ShapeFactory_createParticle__P109241,
-    "drawParticle": particles_ShapeFactory_drawParticle__P109240,
+    "createParticle": particles_ShapeFactory_createParticle__P84020,
+    "drawParticle": particles_ShapeFactory_drawParticle__P84019,
   },
   iface: {
     "speed": null,
@@ -87078,22 +86998,22 @@ const particles_ShapeFactory__C109237_VT = mkVTable({
     "set/ox": null,
     "oy": null,
     "set/oy": null,
-    "addShape": particles_ShapeFactory_addShape__P109239,
-    "drawParticle": particles_ShapeFactory_drawParticle__P109240,
-    "createParticle": particles_ShapeFactory_createParticle__P109241,
-    "setSpeed": particles_SprayFactory_setSpeed__P109219,
-    "setDirection": particles_SprayFactory_setDirection__P109220,
+    "addShape": particles_ShapeFactory_addShape__P84018,
+    "drawParticle": particles_ShapeFactory_drawParticle__P84019,
+    "createParticle": particles_ShapeFactory_createParticle__P84020,
+    "setSpeed": particles_SprayFactory_setSpeed__P83998,
+    "setDirection": particles_SprayFactory_setDirection__P83999,
   },
 });
-const particles_ConfettiFactory__C109242_VT = mkVTable({
+const particles_ConfettiFactory__C84021_VT = mkVTable({
   name: "ConfettiFactory",
   numFields: 11,
-  classNo: 58,
-  lastSubtypeNo: 58,
+  classNo: 57,
+  lastSubtypeNo: 57,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ShapeFactory_createParticle__P109241,
-    "drawParticle": particles_ShapeFactory_drawParticle__P109240,
+    "createParticle": particles_ShapeFactory_createParticle__P84020,
+    "drawParticle": particles_ShapeFactory_drawParticle__P84019,
   },
   iface: {
     "speed": null,
@@ -87118,25 +87038,25 @@ const particles_ConfettiFactory__C109242_VT = mkVTable({
     "set/ox": null,
     "oy": null,
     "set/oy": null,
-    "addShape": particles_ShapeFactory_addShape__P109239,
-    "drawParticle": particles_ShapeFactory_drawParticle__P109240,
-    "createParticle": particles_ShapeFactory_createParticle__P109241,
-    "setSpeed": particles_SprayFactory_setSpeed__P109219,
-    "setDirection": particles_SprayFactory_setDirection__P109220,
+    "addShape": particles_ShapeFactory_addShape__P84018,
+    "drawParticle": particles_ShapeFactory_drawParticle__P84019,
+    "createParticle": particles_ShapeFactory_createParticle__P84020,
+    "setSpeed": particles_SprayFactory_setSpeed__P83998,
+    "setDirection": particles_SprayFactory_setDirection__P83999,
   },
 });
-const particles_ParticleSource__C109175_VT = mkVTable({
+const particles_ParticleSource__C83954_VT = mkVTable({
   name: "ParticleSource",
   numFields: 13,
   classNo: 40,
   lastSubtypeNo: 40,
   maxBgInstances: null,
   methods: {
-    "__visible": sprites_BaseSprite___visible__P108358,
-    "__draw": particles_ParticleSource___draw__P109181,
-    "__drawCore": sprites_BaseSprite___drawCore__P108362,
-    "__update": sprites_BaseSprite___update__P108363,
-    "updateParticle": particles_ParticleSource_updateParticle__P111226,
+    "__visible": sprites_BaseSprite___visible__P83134,
+    "__draw": particles_ParticleSource___draw__P83960,
+    "__drawCore": sprites_BaseSprite___drawCore__P83138,
+    "__update": sprites_BaseSprite___update__P83139,
+    "updateParticle": particles_ParticleSource_updateParticle__P86065,
   },
   iface: {
     "_z": null,
@@ -87165,32 +87085,32 @@ const particles_ParticleSource__C109175_VT = mkVTable({
     "set/ax": null,
     "ay": null,
     "set/ay": null,
-    "__draw": particles_ParticleSource___draw__P109181,
-    "_update": particles_ParticleSource__update__P109182,
-    "_prune": particles_ParticleSource__prune__P109183,
-    "setAcceleration": particles_ParticleSource_setAcceleration__P109184,
-    "setRelativeToCamera": particles_ParticleSource_setRelativeToCamera__P109186,
-    "enabled": particles_ParticleSource_enabled__P109187,
-    "set/enabled": particles_ParticleSource_enabled__P109188,
-    "destroy": particles_ParticleSource_destroy__P109189,
-    "clear": particles_ParticleSource_clear__P109190,
-    "setAnchor": particles_ParticleSource_setAnchor__P109191,
-    "setRate": particles_ParticleSource_setRate__P109192,
-    "setFactory": particles_ParticleSource_setFactory__P109194,
-    "updateParticle": particles_ParticleSource_updateParticle__P111226,
-    "drawParticle": particles_ParticleSource_drawParticle__P111227,
-    "__visible": sprites_BaseSprite___visible__P108358,
-    "z": sprites_BaseSprite_z__P108359,
-    "set/z": sprites_BaseSprite_z__P108360,
-    "__drawCore": sprites_BaseSprite___drawCore__P108362,
-    "__update": sprites_BaseSprite___update__P108363,
+    "__draw": particles_ParticleSource___draw__P83960,
+    "_update": particles_ParticleSource__update__P83961,
+    "_prune": particles_ParticleSource__prune__P83962,
+    "setAcceleration": particles_ParticleSource_setAcceleration__P83963,
+    "setRelativeToCamera": particles_ParticleSource_setRelativeToCamera__P83965,
+    "enabled": particles_ParticleSource_enabled__P83966,
+    "set/enabled": particles_ParticleSource_enabled__P83967,
+    "destroy": particles_ParticleSource_destroy__P83968,
+    "clear": particles_ParticleSource_clear__P83969,
+    "setAnchor": particles_ParticleSource_setAnchor__P83970,
+    "setRate": particles_ParticleSource_setRate__P83971,
+    "setFactory": particles_ParticleSource_setFactory__P83973,
+    "updateParticle": particles_ParticleSource_updateParticle__P86065,
+    "drawParticle": particles_ParticleSource_drawParticle__P86066,
+    "__visible": sprites_BaseSprite___visible__P83134,
+    "z": sprites_BaseSprite_z__P83135,
+    "set/z": sprites_BaseSprite_z__P83136,
+    "__drawCore": sprites_BaseSprite___drawCore__P83138,
+    "__update": sprites_BaseSprite___update__P83139,
   },
 });
-const particles_Particle__C109156_VT = mkVTable({
+const particles_Particle__C83935_VT = mkVTable({
   name: "Particle",
   numFields: 8,
-  classNo: 59,
-  lastSubtypeNo: 59,
+  classNo: 58,
+  lastSubtypeNo: 58,
   maxBgInstances: 200,
   methods: {
   },
@@ -87213,11 +87133,11 @@ const particles_Particle__C109156_VT = mkVTable({
     "set/color": null,
   },
 });
-const control_FrameCallback__C106990_VT = mkVTable({
+const control_FrameCallback__C81654_VT = mkVTable({
   name: "FrameCallback",
   numFields: 2,
-  classNo: 60,
-  lastSubtypeNo: 60,
+  classNo: 59,
+  lastSubtypeNo: 59,
   maxBgInstances: null,
   methods: {
   },
@@ -87228,11 +87148,11 @@ const control_FrameCallback__C106990_VT = mkVTable({
     "set/handler": null,
   },
 });
-const control_PollEvent__C110568_VT = mkVTable({
+const control_PollEvent__C85352_VT = mkVTable({
   name: "PollEvent",
   numFields: 6,
-  classNo: 61,
-  lastSubtypeNo: 61,
+  classNo: 60,
+  lastSubtypeNo: 60,
   maxBgInstances: null,
   methods: {
   },
@@ -87251,32 +87171,32 @@ const control_PollEvent__C110568_VT = mkVTable({
     "set/once": null,
   },
 });
-const PhysicsEngine__C108656_VT = mkVTable({
+const PhysicsEngine__C83440_VT = mkVTable({
   name: "PhysicsEngine",
   numFields: 0,
-  classNo: 62,
-  lastSubtypeNo: 63,
+  classNo: 61,
+  lastSubtypeNo: 62,
   maxBgInstances: null,
   methods: {
-    "addSprite": PhysicsEngine_addSprite__P108658,
-    "removeSprite": PhysicsEngine_removeSprite__P108659,
-    "moveSprite": PhysicsEngine_moveSprite__P108660,
-    "draw": PhysicsEngine_draw__P108661,
-    "move": PhysicsEngine_move__P108662,
+    "addSprite": PhysicsEngine_addSprite__P83442,
+    "removeSprite": PhysicsEngine_removeSprite__P83443,
+    "moveSprite": PhysicsEngine_moveSprite__P83444,
+    "draw": PhysicsEngine_draw__P83445,
+    "move": PhysicsEngine_move__P83446,
   },
   iface: {
-    "addSprite": PhysicsEngine_addSprite__P108658,
-    "removeSprite": PhysicsEngine_removeSprite__P108659,
-    "moveSprite": PhysicsEngine_moveSprite__P108660,
-    "draw": PhysicsEngine_draw__P108661,
-    "move": PhysicsEngine_move__P108662,
+    "addSprite": PhysicsEngine_addSprite__P83442,
+    "removeSprite": PhysicsEngine_removeSprite__P83443,
+    "moveSprite": PhysicsEngine_moveSprite__P83444,
+    "draw": PhysicsEngine_draw__P83445,
+    "move": PhysicsEngine_move__P83446,
   },
 });
-const scene_Background__C108762_VT = mkVTable({
+const scene_Background__C83548_VT = mkVTable({
   name: "Background",
   numFields: 4,
-  classNo: 64,
-  lastSubtypeNo: 64,
+  classNo: 63,
+  lastSubtypeNo: 63,
   maxBgInstances: null,
   methods: {
   },
@@ -87289,14 +87209,14 @@ const scene_Background__C108762_VT = mkVTable({
     "set/camera": null,
     "_layers": null,
     "set/_layers": null,
-    "draw": scene_Background_draw__P108771,
+    "draw": scene_Background_draw__P83557,
   },
 });
-const scene_BackgroundLayer__C108772_VT = mkVTable({
+const scene_BackgroundLayer__C83558_VT = mkVTable({
   name: "BackgroundLayer",
   numFields: 6,
-  classNo: 65,
-  lastSubtypeNo: 65,
+  classNo: 64,
+  lastSubtypeNo: 64,
   maxBgInstances: null,
   methods: {
   },
@@ -87313,20 +87233,20 @@ const scene_BackgroundLayer__C108772_VT = mkVTable({
     "set/alignX": null,
     "alignY": null,
     "set/alignY": null,
-    "draw": scene_BackgroundLayer_draw__P108780,
+    "draw": scene_BackgroundLayer_draw__P83566,
   },
 });
-const Sprite__C108513_VT = mkVTable({
+const Sprite__C83295_VT = mkVTable({
   name: "Sprite",
   numFields: 26,
   classNo: 41,
   lastSubtypeNo: 42,
   maxBgInstances: null,
   methods: {
-    "__visible": Sprite___visible__P108556,
-    "__draw": sprites_BaseSprite___draw__P108361,
-    "__drawCore": Sprite___drawCore__P108574,
-    "__update": Sprite___update__P108575,
+    "__visible": Sprite___visible__P83338,
+    "__draw": sprites_BaseSprite___draw__P83137,
+    "__drawCore": Sprite___drawCore__P83356,
+    "__update": Sprite___update__P83357,
   },
   iface: {
     "_z": null,
@@ -87381,62 +87301,62 @@ const Sprite__C108513_VT = mkVTable({
     "set/flags": null,
     "destroyHandler": null,
     "set/destroyHandler": null,
-    "x": Sprite_x__P108522,
-    "set/x": Sprite_x__P108523,
-    "y": Sprite_y__P108524,
-    "set/y": Sprite_y__P108525,
-    "vx": Sprite_vx__P108526,
-    "set/vx": Sprite_vx__P108527,
-    "vy": Sprite_vy__P108528,
-    "set/vy": Sprite_vy__P108529,
-    "ax": Sprite_ax__P108530,
-    "set/ax": Sprite_ax__P108531,
-    "ay": Sprite_ay__P108532,
-    "set/ay": Sprite_ay__P108533,
-    "fx": Sprite_fx__P108534,
-    "set/fx": Sprite_fx__P108535,
-    "fy": Sprite_fy__P108536,
-    "set/fy": Sprite_fy__P108537,
-    "data": Sprite_data__P108538,
-    "set/data": Sprite_data__P108539,
-    "image": Sprite_image__P108552,
-    "setImage": Sprite_setImage__P108553,
-    "setHitbox": Sprite_setHitbox__P108554,
-    "isStatic": Sprite_isStatic__P108555,
-    "__visible": Sprite___visible__P108556,
-    "width": Sprite_width__P108557,
-    "height": Sprite_height__P108558,
-    "left": Sprite_left__P108559,
-    "set/left": Sprite_left__P108560,
-    "right": Sprite_right__P108561,
-    "set/right": Sprite_right__P108562,
-    "top": Sprite_top__P108563,
-    "set/top": Sprite_top__P108564,
-    "bottom": Sprite_bottom__P108565,
-    "set/bottom": Sprite_bottom__P108566,
-    "kind": Sprite_kind__P108567,
-    "setKind": Sprite_setKind__P108568,
-    "isOutOfScreen": Sprite_isOutOfScreen__P108573,
-    "__drawCore": Sprite___drawCore__P108574,
-    "__update": Sprite___update__P108575,
-    "setFlag": Sprite_setFlag__P108576,
-    "overlapsWith": Sprite_overlapsWith__P108577,
-    "clearObstacles": Sprite_clearObstacles__P108581,
-    "registerObstacle": Sprite_registerObstacle__P108582,
-    "destroy": Sprite_destroy__P108584,
-    "_destroyCore": Sprite__destroyCore__P108585,
-    "toString": Sprite_toString__P108587,
-    "z": sprites_BaseSprite_z__P108359,
-    "set/z": sprites_BaseSprite_z__P108360,
-    "__draw": sprites_BaseSprite___draw__P108361,
+    "x": Sprite_x__P83304,
+    "set/x": Sprite_x__P83305,
+    "y": Sprite_y__P83306,
+    "set/y": Sprite_y__P83307,
+    "vx": Sprite_vx__P83308,
+    "set/vx": Sprite_vx__P83309,
+    "vy": Sprite_vy__P83310,
+    "set/vy": Sprite_vy__P83311,
+    "ax": Sprite_ax__P83312,
+    "set/ax": Sprite_ax__P83313,
+    "ay": Sprite_ay__P83314,
+    "set/ay": Sprite_ay__P83315,
+    "fx": Sprite_fx__P83316,
+    "set/fx": Sprite_fx__P83317,
+    "fy": Sprite_fy__P83318,
+    "set/fy": Sprite_fy__P83319,
+    "data": Sprite_data__P83320,
+    "set/data": Sprite_data__P83321,
+    "image": Sprite_image__P83334,
+    "setImage": Sprite_setImage__P83335,
+    "setHitbox": Sprite_setHitbox__P83336,
+    "isStatic": Sprite_isStatic__P83337,
+    "__visible": Sprite___visible__P83338,
+    "width": Sprite_width__P83339,
+    "height": Sprite_height__P83340,
+    "left": Sprite_left__P83341,
+    "set/left": Sprite_left__P83342,
+    "right": Sprite_right__P83343,
+    "set/right": Sprite_right__P83344,
+    "top": Sprite_top__P83345,
+    "set/top": Sprite_top__P83346,
+    "bottom": Sprite_bottom__P83347,
+    "set/bottom": Sprite_bottom__P83348,
+    "kind": Sprite_kind__P83349,
+    "setKind": Sprite_setKind__P83350,
+    "isOutOfScreen": Sprite_isOutOfScreen__P83355,
+    "__drawCore": Sprite___drawCore__P83356,
+    "__update": Sprite___update__P83357,
+    "setFlag": Sprite_setFlag__P83360,
+    "overlapsWith": Sprite_overlapsWith__P83361,
+    "clearObstacles": Sprite_clearObstacles__P83365,
+    "registerObstacle": Sprite_registerObstacle__P83366,
+    "destroy": Sprite_destroy__P83368,
+    "_destroyCore": Sprite__destroyCore__P83369,
+    "toString": Sprite_toString__P83371,
+    "z": sprites_BaseSprite_z__P83135,
+    "set/z": sprites_BaseSprite_z__P83136,
+    "__draw": sprites_BaseSprite___draw__P83137,
   },
-  toStringMethod: Sprite_toString__P108587,
+  toStringMethod: Sprite_toString__P83371,
 });
-const tiles_TileMap__C108814_VT = mkVTable({
+const tiles_TileMap__C83600_VT = mkVTable({
   name: "TileMap",
   numFields: 3,
-  classNo: 66,
-  lastSubtypeNo: 66,
+  classNo: 65,
+  lastSubtypeNo: 65,
   maxBgInstances: null,
   methods: {
   },
@@ -87447,29 +87367,29 @@ const tiles_TileMap__C108814_VT = mkVTable({
     "set/_layer": null,
     "_map": null,
     "set/_map": null,
-    "scale": tiles_TileMap_scale__P108816,
-    "set/scale": tiles_TileMap_scale__P108817,
-    "data": tiles_TileMap_data__P110815,
-    "offsetX": tiles_TileMap_offsetX__P108818,
-    "offsetY": tiles_TileMap_offsetY__P108819,
-    "areaWidth": tiles_TileMap_areaWidth__P108820,
-    "areaHeight": tiles_TileMap_areaHeight__P108821,
-    "layer": tiles_TileMap_layer__P108822,
-    "enabled": tiles_TileMap_enabled__P108824,
-    "getTile": tiles_TileMap_getTile__P108826,
-    "getTileIndex": tiles_TileMap_getTileIndex__P108827,
-    "draw": tiles_TileMap_draw__P110817,
-    "isObstacle": tiles_TileMap_isObstacle__P108833,
-    "getObstacle": tiles_TileMap_getObstacle__P108834,
-    "isOnWall": tiles_TileMap_isOnWall__P108835,
-    "getTileImage": tiles_TileMap_getTileImage__P108836,
+    "scale": tiles_TileMap_scale__P83602,
+    "set/scale": tiles_TileMap_scale__P83603,
+    "data": tiles_TileMap_data__P85655,
+    "offsetX": tiles_TileMap_offsetX__P83604,
+    "offsetY": tiles_TileMap_offsetY__P83605,
+    "areaWidth": tiles_TileMap_areaWidth__P83606,
+    "areaHeight": tiles_TileMap_areaHeight__P83607,
+    "layer": tiles_TileMap_layer__P83608,
+    "enabled": tiles_TileMap_enabled__P83610,
+    "getTile": tiles_TileMap_getTile__P83612,
+    "getTileIndex": tiles_TileMap_getTileIndex__P83613,
+    "draw": tiles_TileMap_draw__P85657,
+    "isObstacle": tiles_TileMap_isObstacle__P83619,
+    "getObstacle": tiles_TileMap_getObstacle__P83620,
+    "isOnWall": tiles_TileMap_isOnWall__P83621,
+    "getTileImage": tiles_TileMap_getTileImage__P83622,
   },
 });
-const tiles_TileMapData__C108801_VT = mkVTable({
+const tiles_TileMapData__C83587_VT = mkVTable({
   name: "TileMapData",
   numFields: 7,
-  classNo: 67,
-  lastSubtypeNo: 67,
+  classNo: 66,
+  lastSubtypeNo: 66,
   maxBgInstances: null,
   methods: {
   },
@@ -87488,21 +87408,21 @@ const tiles_TileMapData__C108801_VT = mkVTable({
     "set/_width": null,
     "_height": null,
     "set/_height": null,
-    "width": tiles_TileMapData_width__P108803,
-    "height": tiles_TileMapData_height__P108804,
-    "scale": tiles_TileMapData_scale__P108805,
-    "set/scale": tiles_TileMapData_scale__P108806,
-    "getTile": tiles_TileMapData_getTile__P108807,
-    "getTileImage": tiles_TileMapData_getTileImage__P108810,
-    "isWall": tiles_TileMapData_isWall__P108812,
-    "isOutsideMap": tiles_TileMapData_isOutsideMap__P108813,
+    "width": tiles_TileMapData_width__P83589,
+    "height": tiles_TileMapData_height__P83590,
+    "scale": tiles_TileMapData_scale__P83591,
+    "set/scale": tiles_TileMapData_scale__P83592,
+    "getTile": tiles_TileMapData_getTile__P83593,
+    "getTileImage": tiles_TileMapData_getTileImage__P83596,
+    "isWall": tiles_TileMapData_isWall__P83598,
+    "isOutsideMap": tiles_TileMapData_isOutsideMap__P83599,
   },
 });
-const controller_Controller__C108420_VT = mkVTable({
+const controller_Controller__C83196_VT = mkVTable({
   name: "Controller",
   numFields: 5,
-  classNo: 68,
-  lastSubtypeNo: 68,
+  classNo: 67,
+  lastSubtypeNo: 67,
   maxBgInstances: null,
   methods: {
   },
@@ -87517,33 +87437,33 @@ const controller_Controller__C108420_VT = mkVTable({
     "set/_id": null,
     "_connected": null,
     "set/_connected": null,
-    "_controlledSprites": controller_Controller__controlledSprites__P108425,
-    "set/_controlledSprites": controller_Controller__controlledSprites__P108426,
-    "id": controller_Controller_id__P108427,
-    "left": controller_Controller_left__P108429,
-    "right": controller_Controller_right__P108430,
-    "up": controller_Controller_up__P108431,
-    "down": controller_Controller_down__P108432,
-    "A": controller_Controller_A__P108433,
-    "button": controller_Controller_button__P110715,
-    "connected": controller_Controller_connected__P108439,
-    "set/connected": controller_Controller_connected__P108440,
-    "__preUpdate": controller_Controller___preUpdate__P108444,
-    "__update": controller_Controller___update__P108445,
+    "_controlledSprites": controller_Controller__controlledSprites__P83201,
+    "set/_controlledSprites": controller_Controller__controlledSprites__P83202,
+    "id": controller_Controller_id__P83203,
+    "left": controller_Controller_left__P83205,
+    "right": controller_Controller_right__P83206,
+    "up": controller_Controller_up__P83207,
+    "down": controller_Controller_down__P83208,
+    "A": controller_Controller_A__P83209,
+    "button": controller_Controller_button__P85541,
+    "connected": controller_Controller_connected__P83215,
+    "set/connected": controller_Controller_connected__P83216,
+    "__preUpdate": controller_Controller___preUpdate__P83220,
+    "__update": controller_Controller___update__P83221,
   },
 });
-const ArcadePhysicsEngine__C108670_VT = mkVTable({
+const ArcadePhysicsEngine__C83456_VT = mkVTable({
   name: "ArcadePhysicsEngine",
   numFields: 6,
-  classNo: 63,
-  lastSubtypeNo: 63,
+  classNo: 62,
+  lastSubtypeNo: 62,
   maxBgInstances: null,
   methods: {
-    "addSprite": ArcadePhysicsEngine_addSprite__P108679,
-    "removeSprite": ArcadePhysicsEngine_removeSprite__P108680,
-    "moveSprite": ArcadePhysicsEngine_moveSprite__P108684,
-    "draw": ArcadePhysicsEngine_draw__P108681,
-    "move": ArcadePhysicsEngine_move__P108682,
+    "addSprite": ArcadePhysicsEngine_addSprite__P83465,
+    "removeSprite": ArcadePhysicsEngine_removeSprite__P83466,
+    "moveSprite": ArcadePhysicsEngine_moveSprite__P83470,
+    "draw": ArcadePhysicsEngine_draw__P83467,
+    "move": ArcadePhysicsEngine_move__P83468,
   },
   iface: {
     "sprites": null,
@@ -87558,30 +87478,30 @@ const ArcadePhysicsEngine__C108670_VT = mkVTable({
     "set/minSingleStep": null,
     "maxSingleStep": null,
     "set/maxSingleStep": null,
-    "maxSpeed": ArcadePhysicsEngine_maxSpeed__P108672,
-    "set/maxSpeed": ArcadePhysicsEngine_maxSpeed__P108673,
-    "minStep": ArcadePhysicsEngine_minStep__P108674,
-    "set/minStep": ArcadePhysicsEngine_minStep__P108675,
-    "maxStep": ArcadePhysicsEngine_maxStep__P108676,
-    "set/maxStep": ArcadePhysicsEngine_maxStep__P108677,
-    "addSprite": ArcadePhysicsEngine_addSprite__P108679,
-    "removeSprite": ArcadePhysicsEngine_removeSprite__P108680,
-    "draw": ArcadePhysicsEngine_draw__P108681,
-    "move": ArcadePhysicsEngine_move__P108682,
-    "createMovingSprite": ArcadePhysicsEngine_createMovingSprite__P110744,
-    "spriteCollisions": ArcadePhysicsEngine_spriteCollisions__P110745,
-    "tilemapCollisions": ArcadePhysicsEngine_tilemapCollisions__P110746,
-    "tilemapOverlaps": ArcadePhysicsEngine_tilemapOverlaps__P110747,
-    "moveSprite": ArcadePhysicsEngine_moveSprite__P108684,
-    "canResolveClipping": ArcadePhysicsEngine_canResolveClipping__P110748,
-    "constrain": ArcadePhysicsEngine_constrain__P110749,
+    "maxSpeed": ArcadePhysicsEngine_maxSpeed__P83458,
+    "set/maxSpeed": ArcadePhysicsEngine_maxSpeed__P83459,
+    "minStep": ArcadePhysicsEngine_minStep__P83460,
+    "set/minStep": ArcadePhysicsEngine_minStep__P83461,
+    "maxStep": ArcadePhysicsEngine_maxStep__P83462,
+    "set/maxStep": ArcadePhysicsEngine_maxStep__P83463,
+    "addSprite": ArcadePhysicsEngine_addSprite__P83465,
+    "removeSprite": ArcadePhysicsEngine_removeSprite__P83466,
+    "draw": ArcadePhysicsEngine_draw__P83467,
+    "move": ArcadePhysicsEngine_move__P83468,
+    "createMovingSprite": ArcadePhysicsEngine_createMovingSprite__P85584,
+    "spriteCollisions": ArcadePhysicsEngine_spriteCollisions__P85585,
+    "tilemapCollisions": ArcadePhysicsEngine_tilemapCollisions__P85586,
+    "tilemapOverlaps": ArcadePhysicsEngine_tilemapOverlaps__P85587,
+    "moveSprite": ArcadePhysicsEngine_moveSprite__P83470,
+    "canResolveClipping": ArcadePhysicsEngine_canResolveClipping__P85588,
+    "constrain": ArcadePhysicsEngine_constrain__P85589,
   },
 });
-const sprites_SpriteMap__C108591_VT = mkVTable({
+const sprites_SpriteMap__C83375_VT = mkVTable({
   name: "SpriteMap",
   numFields: 5,
-  classNo: 69,
-  lastSubtypeNo: 69,
+  classNo: 68,
+  lastSubtypeNo: 68,
   maxBgInstances: null,
   methods: {
   },
@@ -87596,20 +87516,37 @@ const sprites_SpriteMap__C108591_VT = mkVTable({
     "set/columnCount": null,
     "buckets": null,
     "set/buckets": null,
-    "neighbors": sprites_SpriteMap_neighbors__P108593,
-    "overlaps": sprites_SpriteMap_overlaps__P108594,
-    "draw": sprites_SpriteMap_draw__P108595,
-    "resizeBuckets": sprites_SpriteMap_resizeBuckets__P108596,
-    "clear": sprites_SpriteMap_clear__P108597,
-    "key": sprites_SpriteMap_key__P110721,
-    "insertAtKey": sprites_SpriteMap_insertAtKey__P110722,
-    "insertAABB": sprites_SpriteMap_insertAABB__P108598,
-    "mergeAtKey": sprites_SpriteMap_mergeAtKey__P110723,
-    "toString": sprites_SpriteMap_toString__P108599,
+    "neighbors": sprites_SpriteMap_neighbors__P83377,
+    "overlaps": sprites_SpriteMap_overlaps__P83378,
+    "draw": sprites_SpriteMap_draw__P83379,
+    "resizeBuckets": sprites_SpriteMap_resizeBuckets__P83380,
+    "clear": sprites_SpriteMap_clear__P83381,
+    "key": sprites_SpriteMap_key__P85547,
+    "insertAtKey": sprites_SpriteMap_insertAtKey__P85548,
+    "insertAABB": sprites_SpriteMap_insertAABB__P83382,
+    "mergeAtKey": sprites_SpriteMap_mergeAtKey__P85549,
+    "toString": sprites_SpriteMap_toString__P83383,
+  },
+  toStringMethod: sprites_SpriteMap_toString__P83383,
+});
+const music_Melody__C82871_VT = mkVTable({
+  name: "Melody",
+  numFields: 2,
+  classNo: 69,
+  lastSubtypeNo: 69,
+  maxBgInstances: null,
+  methods: {
+  },
+  iface: {
+    "_text": null,
+    "set/_text": null,
+    "_player": null,
+    "set/_player": null,
+    "toString": music_Melody_toString__P82880,
   },
-  toStringMethod: sprites_SpriteMap_toString__P108599,
+  toStringMethod: music_Melody_toString__P82880,
 });
-const control_Interval__C110563_VT = mkVTable({
+const control_Interval__C85347_VT = mkVTable({
   name: "Interval",
   numFields: 4,
   classNo: 70,
@@ -87626,11 +87563,11 @@ const control_Interval__C110563_VT = mkVTable({
     "set/delay": null,
     "mode": null,
     "set/mode": null,
-    "work": control_Interval_work__P110564,
-    "cancel": control_Interval_cancel__P110565,
+    "work": control_Interval_work__P85348,
+    "cancel": control_Interval_cancel__P85349,
   },
 });
-const kodu_Vec2__C110414_VT = mkVTable({
+const kodu_Vec2__C85197_VT = mkVTable({
   name: "Vec2",
   numFields: 2,
   classNo: 71,
@@ -87643,26 +87580,26 @@ const kodu_Vec2__C110414_VT = mkVTable({
     "set/x": null,
     "y": null,
     "set/y": null,
-    "Add": kodu_Vec2_Add__P110416,
-    "Sub": kodu_Vec2_Sub__P110417,
-    "Mul": kodu_Vec2_Mul__P110418,
-    "Transpose": kodu_Vec2_Transpose__P110421,
-    "Normal": kodu_Vec2_Normal__P110423,
-    "Scale": kodu_Vec2_Scale__P110424,
-    "MagnitudeSq": kodu_Vec2_MagnitudeSq__P110426,
-    "Dot": kodu_Vec2_Dot__P110427,
+    "Add": kodu_Vec2_Add__P85199,
+    "Sub": kodu_Vec2_Sub__P85200,
+    "Mul": kodu_Vec2_Mul__P85201,
+    "Transpose": kodu_Vec2_Transpose__P85204,
+    "Normal": kodu_Vec2_Normal__P85206,
+    "Scale": kodu_Vec2_Scale__P85207,
+    "MagnitudeSq": kodu_Vec2_MagnitudeSq__P85209,
+    "Dot": kodu_Vec2_Dot__P85210,
   },
 });
-const kodu_Physics__C110391_VT = mkVTable({
+const kodu_Physics__C85144_VT = mkVTable({
   name: "Physics",
   numFields: 4,
   classNo: 27,
   lastSubtypeNo: 27,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
@@ -87673,16 +87610,16 @@ const kodu_Physics__C110391_VT = mkVTable({
     "set/bodies": null,
     "deadBodies": null,
     "set/deadBodies": null,
-    "addBody": kodu_Physics_addBody__P110395,
-    "removeBody": kodu_Physics_removeBody__P110396,
-    "simulate": kodu_Physics_simulate__P110397,
-    "checkCollision": kodu_Physics_checkCollision__P116769,
-    "destroy": kodu_Component_destroy__P345110,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "addBody": kodu_Physics_addBody__P85148,
+    "removeBody": kodu_Physics_removeBody__P85149,
+    "simulate": kodu_Physics_simulate__P85150,
+    "checkCollision": kodu_Physics_checkCollision__P91658,
+    "destroy": kodu_Component_destroy__P84897,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
 });
-const kodu_Page__C136770_VT = mkVTable({
+const kodu_Page__C93239_VT = mkVTable({
   name: "Page",
   numFields: 4,
   classNo: 72,
@@ -87699,12 +87636,12 @@ const kodu_Page__C136770_VT = mkVTable({
     "set/defn": null,
     "index": null,
     "set/index": null,
-    "destroy": kodu_Page_destroy__P136772,
-    "execute": kodu_Page_execute__P136773,
-    "reset": kodu_Page_reset__P136774,
+    "destroy": kodu_Page_destroy__P93241,
+    "execute": kodu_Page_execute__P93242,
+    "reset": kodu_Page_reset__P93243,
   },
 });
-const scene_systemMenu_PauseMenu__C109119_VT = mkVTable({
+const scene_systemMenu_PauseMenu__C83898_VT = mkVTable({
   name: "PauseMenu",
   numFields: 7,
   classNo: 73,
@@ -87727,15 +87664,15 @@ const scene_systemMenu_PauseMenu__C109119_VT = mkVTable({
     "set/scrollOffset": null,
     "generator": null,
     "set/generator": null,
-    "show": scene_systemMenu_PauseMenu_show__P109121,
-    "onUpdate": scene_systemMenu_PauseMenu_onUpdate__P109122,
-    "setSelection": scene_systemMenu_PauseMenu_setSelection__P109123,
-    "drawText": scene_systemMenu_PauseMenu_drawText__P109124,
-    "dispose": scene_systemMenu_PauseMenu_dispose__P109125,
-    "updateScrollTarget": scene_systemMenu_PauseMenu_updateScrollTarget__P111126,
+    "show": scene_systemMenu_PauseMenu_show__P83900,
+    "onUpdate": scene_systemMenu_PauseMenu_onUpdate__P83901,
+    "setSelection": scene_systemMenu_PauseMenu_setSelection__P83902,
+    "drawText": scene_systemMenu_PauseMenu_drawText__P83903,
+    "dispose": scene_systemMenu_PauseMenu_dispose__P83904,
+    "updateScrollTarget": scene_systemMenu_PauseMenu_updateScrollTarget__P85965,
   },
 });
-const scene_systemMenu_MenuOption__C109111_VT = mkVTable({
+const scene_systemMenu_MenuOption__C83890_VT = mkVTable({
   name: "MenuOption",
   numFields: 8,
   classNo: 74,
@@ -87760,16 +87697,16 @@ const scene_systemMenu_MenuOption__C109111_VT = mkVTable({
     "set/getText": null,
     "action": null,
     "set/action": null,
-    "show": scene_systemMenu_MenuOption_show__P109113,
-    "position": scene_systemMenu_MenuOption_position__P109114,
-    "setOffset": scene_systemMenu_MenuOption_setOffset__P109115,
-    "setTheme": scene_systemMenu_MenuOption_setTheme__P109116,
-    "setState": scene_systemMenu_MenuOption_setState__P109117,
-    "dispose": scene_systemMenu_MenuOption_dispose__P109118,
-    "updateCard": scene_systemMenu_MenuOption_updateCard__P111125,
+    "show": scene_systemMenu_MenuOption_show__P83892,
+    "position": scene_systemMenu_MenuOption_position__P83893,
+    "setOffset": scene_systemMenu_MenuOption_setOffset__P83894,
+    "setTheme": scene_systemMenu_MenuOption_setTheme__P83895,
+    "setState": scene_systemMenu_MenuOption_setState__P83896,
+    "dispose": scene_systemMenu_MenuOption_dispose__P83897,
+    "updateCard": scene_systemMenu_MenuOption_updateCard__P85964,
   },
 });
-const game_Hitbox__C108456_VT = mkVTable({
+const game_Hitbox__C83232_VT = mkVTable({
   name: "Hitbox",
   numFields: 5,
   classNo: 75,
@@ -87788,13 +87725,13 @@ const game_Hitbox__C108456_VT = mkVTable({
     "set/width": null,
     "height": null,
     "set/height": null,
-    "left": game_Hitbox_left__P108463,
-    "top": game_Hitbox_top__P108464,
-    "right": game_Hitbox_right__P108465,
-    "bottom": game_Hitbox_bottom__P108466,
+    "left": game_Hitbox_left__P83239,
+    "top": game_Hitbox_top__P83240,
+    "right": game_Hitbox_right__P83241,
+    "bottom": game_Hitbox_bottom__P83242,
   },
 });
-const sprites_SpriteSet__C108608_VT = mkVTable({
+const sprites_SpriteSet__C83392_VT = mkVTable({
   name: "SpriteSet",
   numFields: 1,
   classNo: 76,
@@ -87805,25 +87742,25 @@ const sprites_SpriteSet__C108608_VT = mkVTable({
   iface: {
     "_sprites": null,
     "set/_sprites": null,
-    "length": sprites_SpriteSet_length__P108611,
-    "add": sprites_SpriteSet_add__P108613,
-    "remove": sprites_SpriteSet_remove__P108615,
-    "contains": sprites_SpriteSet_contains__P108616,
-    "toString": sprites_SpriteSet_toString__P108619,
+    "length": sprites_SpriteSet_length__P83395,
+    "add": sprites_SpriteSet_add__P83397,
+    "remove": sprites_SpriteSet_remove__P83399,
+    "contains": sprites_SpriteSet_contains__P83400,
+    "toString": sprites_SpriteSet_toString__P83403,
   },
-  toStringMethod: sprites_SpriteSet_toString__P108619,
+  toStringMethod: sprites_SpriteSet_toString__P83403,
 });
-const scene_Renderable__C108875_VT = mkVTable({
+const scene_Renderable__C83654_VT = mkVTable({
   name: "Renderable",
   numFields: 4,
   classNo: 43,
   lastSubtypeNo: 43,
   maxBgInstances: null,
   methods: {
-    "__visible": scene_Renderable___visible__P108877,
-    "__draw": sprites_BaseSprite___draw__P108361,
-    "__drawCore": scene_Renderable___drawCore__P108878,
-    "__update": sprites_BaseSprite___update__P108363,
+    "__visible": scene_Renderable___visible__P83656,
+    "__draw": sprites_BaseSprite___draw__P83137,
+    "__drawCore": scene_Renderable___drawCore__P83657,
+    "__update": sprites_BaseSprite___update__P83139,
   },
   iface: {
     "_z": null,
@@ -87834,15 +87771,15 @@ const scene_Renderable__C108875_VT = mkVTable({
     "set/handler": null,
     "shouldBeVisible": null,
     "set/shouldBeVisible": null,
-    "__visible": scene_Renderable___visible__P108877,
-    "__drawCore": scene_Renderable___drawCore__P108878,
-    "z": sprites_BaseSprite_z__P108359,
-    "set/z": sprites_BaseSprite_z__P108360,
-    "__draw": sprites_BaseSprite___draw__P108361,
-    "__update": sprites_BaseSprite___update__P108363,
+    "__visible": scene_Renderable___visible__P83656,
+    "__drawCore": scene_Renderable___drawCore__P83657,
+    "z": sprites_BaseSprite_z__P83135,
+    "set/z": sprites_BaseSprite_z__P83136,
+    "__draw": sprites_BaseSprite___draw__P83137,
+    "__update": sprites_BaseSprite___update__P83139,
   },
 });
-const MovingSprite__C108668_VT = mkVTable({
+const MovingSprite__C83454_VT = mkVTable({
   name: "MovingSprite",
   numFields: 7,
   classNo: 77,
@@ -87867,7 +87804,7 @@ const MovingSprite__C108668_VT = mkVTable({
     "set/yStep": null,
   },
 });
-const tiles_Location__C108786_VT = mkVTable({
+const tiles_Location__C83572_VT = mkVTable({
   name: "Location",
   numFields: 3,
   classNo: 78,
@@ -87882,14 +87819,14 @@ const tiles_Location__C108786_VT = mkVTable({
     "set/_col": null,
     "tileMap": null,
     "set/tileMap": null,
-    "col": tiles_Location_col__P108787,
-    "row": tiles_Location_row__P108788,
-    "x": tiles_Location_x__P108790,
-    "y": tiles_Location_y__P108791,
-    "tileSet": tiles_Location_tileSet__P108792,
+    "col": tiles_Location_col__P83573,
+    "row": tiles_Location_row__P83574,
+    "x": tiles_Location_x__P83576,
+    "y": tiles_Location_y__P83577,
+    "tileSet": tiles_Location_tileSet__P83578,
   },
 });
-const sprites_StaticObstacle__C108643_VT = mkVTable({
+const sprites_StaticObstacle__C83427_VT = mkVTable({
   name: "StaticObstacle",
   numFields: 5,
   classNo: 79,
@@ -87908,13 +87845,13 @@ const sprites_StaticObstacle__C108643_VT = mkVTable({
     "set/top": null,
     "left": null,
     "set/left": null,
-    "x": sprites_StaticObstacle_x__P108650,
-    "y": sprites_StaticObstacle_y__P108651,
-    "height": sprites_StaticObstacle_height__P108652,
-    "width": sprites_StaticObstacle_width__P108653,
+    "x": sprites_StaticObstacle_x__P83434,
+    "y": sprites_StaticObstacle_y__P83435,
+    "height": sprites_StaticObstacle_height__P83436,
+    "width": sprites_StaticObstacle_width__P83437,
   },
 });
-const kodu_BrainDefn__C110359_VT = mkVTable({
+const kodu_BrainDefn__C85112_VT = mkVTable({
   name: "BrainDefn",
   numFields: 1,
   classNo: 80,
@@ -87925,12 +87862,12 @@ const kodu_BrainDefn__C110359_VT = mkVTable({
   iface: {
     "pages": null,
     "set/pages": null,
-    "clone": kodu_BrainDefn_clone__P110362,
-    "toObj": kodu_BrainDefn_toObj__P110364,
-    "FromObj": kodu_BrainDefn_FromObj__P110365,
+    "clone": kodu_BrainDefn_clone__P85115,
+    "toObj": kodu_BrainDefn_toObj__P85117,
+    "FromObj": kodu_BrainDefn_FromObj__P85118,
   },
 });
-const kodu_PageDefn__C110350_VT = mkVTable({
+const kodu_PageDefn__C85103_VT = mkVTable({
   name: "PageDefn",
   numFields: 1,
   classNo: 81,
@@ -87941,14 +87878,14 @@ const kodu_PageDefn__C110350_VT = mkVTable({
   iface: {
     "rules": null,
     "set/rules": null,
-    "clone": kodu_PageDefn_clone__P110353,
-    "deleteRuleAt": kodu_PageDefn_deleteRuleAt__P110355,
-    "insertRuleAt": kodu_PageDefn_insertRuleAt__P110356,
-    "toObj": kodu_PageDefn_toObj__P110357,
-    "FromObj": kodu_PageDefn_FromObj__P110358,
+    "clone": kodu_PageDefn_clone__P85106,
+    "deleteRuleAt": kodu_PageDefn_deleteRuleAt__P85108,
+    "insertRuleAt": kodu_PageDefn_insertRuleAt__P85109,
+    "toObj": kodu_PageDefn_toObj__P85110,
+    "FromObj": kodu_PageDefn_FromObj__P85111,
   },
 });
-const kodu_RuleDefn__C110339_VT = mkVTable({
+const kodu_RuleDefn__C85092_VT = mkVTable({
   name: "RuleDefn",
   numFields: 5,
   classNo: 82,
@@ -87967,12 +87904,12 @@ const kodu_RuleDefn__C110339_VT = mkVTable({
     "set/actuator": null,
     "modifiers": null,
     "set/modifiers": null,
-    "clone": kodu_RuleDefn_clone__P110346,
-    "toObj": kodu_RuleDefn_toObj__P110348,
-    "FromObj": kodu_RuleDefn_FromObj__P110349,
+    "clone": kodu_RuleDefn_clone__P85099,
+    "toObj": kodu_RuleDefn_toObj__P85101,
+    "FromObj": kodu_RuleDefn_FromObj__P85102,
   },
 });
-const JSON_Parser__C110576_VT = mkVTable({
+const JSON_Parser__C85360_VT = mkVTable({
   name: "Parser",
   numFields: 3,
   classNo: 83,
@@ -87987,18 +87924,18 @@ const JSON_Parser__C110576_VT = mkVTable({
     "set/s": null,
     "errorMsg": null,
     "set/errorMsg": null,
-    "error": JSON_Parser_error__P110577,
-    "skipWS": JSON_Parser_skipWS__P110578,
-    "nextChar": JSON_Parser_nextChar__P110579,
-    "doString": JSON_Parser_doString__P110580,
-    "doArray": JSON_Parser_doArray__P110581,
-    "doObject": JSON_Parser_doObject__P110582,
-    "doNumber": JSON_Parser_doNumber__P110583,
-    "checkKw": JSON_Parser_checkKw__P110584,
-    "value": JSON_Parser_value__P110585,
+    "error": JSON_Parser_error__P85361,
+    "skipWS": JSON_Parser_skipWS__P85362,
+    "nextChar": JSON_Parser_nextChar__P85363,
+    "doString": JSON_Parser_doString__P85364,
+    "doArray": JSON_Parser_doArray__P85365,
+    "doObject": JSON_Parser_doObject__P85366,
+    "doNumber": JSON_Parser_doNumber__P85367,
+    "checkKw": JSON_Parser_checkKw__P85368,
+    "value": JSON_Parser_value__P85369,
   },
 });
-const JSON_Stringifier__C110586_VT = mkVTable({
+const JSON_Stringifier__C85370_VT = mkVTable({
   name: "Stringifier",
   numFields: 3,
   classNo: 84,
@@ -88013,21 +87950,21 @@ const JSON_Stringifier__C110586_VT = mkVTable({
     "set/indentStep": null,
     "indent": null,
     "set/indent": null,
-    "doString": JSON_Stringifier_doString__P110587,
-    "go": JSON_Stringifier_go__P110588,
+    "doString": JSON_Stringifier_doString__P85371,
+    "go": JSON_Stringifier_go__P85372,
   },
 });
-const TextSprite__C110066_VT = mkVTable({
+const TextSprite__C84818_VT = mkVTable({
   name: "TextSprite",
   numFields: 36,
   classNo: 42,
   lastSubtypeNo: 42,
   maxBgInstances: null,
   methods: {
-    "__visible": Sprite___visible__P108556,
-    "__draw": sprites_BaseSprite___draw__P108361,
-    "__drawCore": Sprite___drawCore__P108574,
-    "__update": Sprite___update__P108575,
+    "__visible": Sprite___visible__P83338,
+    "__draw": sprites_BaseSprite___draw__P83137,
+    "__drawCore": Sprite___drawCore__P83356,
+    "__update": Sprite___update__P83357,
   },
   iface: {
     "_z": null,
@@ -88102,68 +88039,68 @@ const TextSprite__C110066_VT = mkVTable({
     "set/outlineColor": null,
     "icon": null,
     "set/icon": null,
-    "update": TextSprite_update__P110068,
-    "setBorder": TextSprite_setBorder__P110072,
-    "x": Sprite_x__P108522,
-    "set/x": Sprite_x__P108523,
-    "y": Sprite_y__P108524,
-    "set/y": Sprite_y__P108525,
-    "vx": Sprite_vx__P108526,
-    "set/vx": Sprite_vx__P108527,
-    "vy": Sprite_vy__P108528,
-    "set/vy": Sprite_vy__P108529,
-    "ax": Sprite_ax__P108530,
-    "set/ax": Sprite_ax__P108531,
-    "ay": Sprite_ay__P108532,
-    "set/ay": Sprite_ay__P108533,
-    "fx": Sprite_fx__P108534,
-    "set/fx": Sprite_fx__P108535,
-    "fy": Sprite_fy__P108536,
-    "set/fy": Sprite_fy__P108537,
-    "data": Sprite_data__P108538,
-    "set/data": Sprite_data__P108539,
-    "image": Sprite_image__P108552,
-    "setImage": Sprite_setImage__P108553,
-    "setHitbox": Sprite_setHitbox__P108554,
-    "isStatic": Sprite_isStatic__P108555,
-    "__visible": Sprite___visible__P108556,
-    "width": Sprite_width__P108557,
-    "height": Sprite_height__P108558,
-    "left": Sprite_left__P108559,
-    "set/left": Sprite_left__P108560,
-    "right": Sprite_right__P108561,
-    "set/right": Sprite_right__P108562,
-    "top": Sprite_top__P108563,
-    "set/top": Sprite_top__P108564,
-    "bottom": Sprite_bottom__P108565,
-    "set/bottom": Sprite_bottom__P108566,
-    "kind": Sprite_kind__P108567,
-    "setKind": Sprite_setKind__P108568,
-    "isOutOfScreen": Sprite_isOutOfScreen__P108573,
-    "__drawCore": Sprite___drawCore__P108574,
-    "__update": Sprite___update__P108575,
-    "setFlag": Sprite_setFlag__P108576,
-    "overlapsWith": Sprite_overlapsWith__P108577,
-    "clearObstacles": Sprite_clearObstacles__P108581,
-    "registerObstacle": Sprite_registerObstacle__P108582,
-    "destroy": Sprite_destroy__P108584,
-    "_destroyCore": Sprite__destroyCore__P108585,
-    "toString": Sprite_toString__P108587,
-    "z": sprites_BaseSprite_z__P108359,
-    "set/z": sprites_BaseSprite_z__P108360,
-    "__draw": sprites_BaseSprite___draw__P108361,
+    "update": TextSprite_update__P84820,
+    "setBorder": TextSprite_setBorder__P84824,
+    "x": Sprite_x__P83304,
+    "set/x": Sprite_x__P83305,
+    "y": Sprite_y__P83306,
+    "set/y": Sprite_y__P83307,
+    "vx": Sprite_vx__P83308,
+    "set/vx": Sprite_vx__P83309,
+    "vy": Sprite_vy__P83310,
+    "set/vy": Sprite_vy__P83311,
+    "ax": Sprite_ax__P83312,
+    "set/ax": Sprite_ax__P83313,
+    "ay": Sprite_ay__P83314,
+    "set/ay": Sprite_ay__P83315,
+    "fx": Sprite_fx__P83316,
+    "set/fx": Sprite_fx__P83317,
+    "fy": Sprite_fy__P83318,
+    "set/fy": Sprite_fy__P83319,
+    "data": Sprite_data__P83320,
+    "set/data": Sprite_data__P83321,
+    "image": Sprite_image__P83334,
+    "setImage": Sprite_setImage__P83335,
+    "setHitbox": Sprite_setHitbox__P83336,
+    "isStatic": Sprite_isStatic__P83337,
+    "__visible": Sprite___visible__P83338,
+    "width": Sprite_width__P83339,
+    "height": Sprite_height__P83340,
+    "left": Sprite_left__P83341,
+    "set/left": Sprite_left__P83342,
+    "right": Sprite_right__P83343,
+    "set/right": Sprite_right__P83344,
+    "top": Sprite_top__P83345,
+    "set/top": Sprite_top__P83346,
+    "bottom": Sprite_bottom__P83347,
+    "set/bottom": Sprite_bottom__P83348,
+    "kind": Sprite_kind__P83349,
+    "setKind": Sprite_setKind__P83350,
+    "isOutOfScreen": Sprite_isOutOfScreen__P83355,
+    "__drawCore": Sprite___drawCore__P83356,
+    "__update": Sprite___update__P83357,
+    "setFlag": Sprite_setFlag__P83360,
+    "overlapsWith": Sprite_overlapsWith__P83361,
+    "clearObstacles": Sprite_clearObstacles__P83365,
+    "registerObstacle": Sprite_registerObstacle__P83366,
+    "destroy": Sprite_destroy__P83368,
+    "_destroyCore": Sprite__destroyCore__P83369,
+    "toString": Sprite_toString__P83371,
+    "z": sprites_BaseSprite_z__P83135,
+    "set/z": sprites_BaseSprite_z__P83136,
+    "__draw": sprites_BaseSprite___draw__P83137,
   },
 });
-const kodu_Menu__C518584_VT = mkVTable({
+const kodu_Menu__C85036_VT = mkVTable({
   name: "Menu",
   numFields: 6,
   classNo: 28,
   lastSubtypeNo: 28,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_Menu_destroy__P518588,
-    "update": kodu_Menu_update__P518590,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_Menu_destroy__P85041,
+    "update": kodu_Menu_update__P85043,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
@@ -88178,32 +88115,32 @@ const kodu_Menu__C518584_VT = mkVTable({
     "set/hud": null,
     "wrap": null,
     "set/wrap": null,
-    "show": kodu_Menu_show__P518586,
-    "hide": kodu_Menu_hide__P518587,
-    "destroy": kodu_Menu_destroy__P518588,
-    "isVisible": kodu_Menu_isVisible__P518589,
-    "update": kodu_Menu_update__P518590,
-    "notify": kodu_Component_notify__P345112,
+    "show": kodu_Menu_show__P85039,
+    "hide": kodu_Menu_hide__P85040,
+    "destroy": kodu_Menu_destroy__P85041,
+    "isVisible": kodu_Menu_isVisible__P85042,
+    "update": kodu_Menu_update__P85043,
+    "notify": kodu_Component_notify__P84899,
   },
 });
-const kodu_KodeStage__C509651_VT = mkVTable({
+const kodu_KodeStage__C85245_VT = mkVTable({
   name: "KodeStage",
   numFields: 12,
   classNo: 37,
   lastSubtypeNo: 37,
   maxBgInstances: null,
   methods: {
-    "get": kodu_Stage_get__P468689,
-    "update": kodu_Stage_update__P468691,
-    "handleBPressed": kodu_KodeStage_handleBPressed__P509655,
-    "handleMenuPressed": kodu_KodeStage_handleMenuPressed__P509656,
-    "handleCursorCanvasClick": kodu_KodeStage_handleCursorCanvasClick__P509659,
-    "handleCursorButtonClick": kodu_KodeStage_handleCursorButtonClick__P509660,
-    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P468699,
-    "handleCursorCancel": kodu_Stage_handleCursorCancel__P468700,
-    "initScene": kodu_KodeStage_initScene__P509663,
-    "shutdownScene": kodu_KodeStage_shutdownScene__P509664,
-    "notify": kodu_KodeStage_notify__P509665,
+    "get": kodu_Stage_get__P85051,
+    "update": kodu_Stage_update__P85053,
+    "handleBPressed": kodu_KodeStage_handleBPressed__P85255,
+    "handleMenuPressed": kodu_KodeStage_handleMenuPressed__P85256,
+    "handleCursorCanvasClick": kodu_KodeStage_handleCursorCanvasClick__P85259,
+    "handleCursorButtonClick": kodu_KodeStage_handleCursorButtonClick__P85260,
+    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P85061,
+    "handleCursorCancel": kodu_Stage_handleCursorCancel__P85062,
+    "initScene": kodu_KodeStage_initScene__P85263,
+    "shutdownScene": kodu_KodeStage_shutdownScene__P85264,
+    "notify": kodu_KodeStage_notify__P85265,
   },
   iface: {
     "components": null,
@@ -88230,30 +88167,30 @@ const kodu_KodeStage__C509651_VT = mkVTable({
     "set/menu": null,
     "char": null,
     "set/char": null,
-    "showMenu": kodu_KodeStage_showMenu__P509653,
-    "hideMenu": kodu_KodeStage_hideMenu__P509654,
-    "handleBPressed": kodu_KodeStage_handleBPressed__P509655,
-    "handleMenuPressed": kodu_KodeStage_handleMenuPressed__P509656,
-    "handleCancelBtnClicked": kodu_KodeStage_handleCancelBtnClicked__P509657,
-    "handleOkBtnClicked": kodu_KodeStage_handleOkBtnClicked__P509658,
-    "handleCursorCanvasClick": kodu_KodeStage_handleCursorCanvasClick__P509659,
-    "handleCursorButtonClick": kodu_KodeStage_handleCursorButtonClick__P509660,
-    "handleCharBtnClick": kodu_KodeStage_handleCharBtnClick__P509661,
-    "updateHover": kodu_KodeStage_updateHover__P509662,
-    "initScene": kodu_KodeStage_initScene__P509663,
-    "shutdownScene": kodu_KodeStage_shutdownScene__P509664,
-    "notify": kodu_KodeStage_notify__P509665,
-    "get": kodu_Stage_get__P468689,
-    "update": kodu_Stage_update__P468691,
-    "remove": kodu_Stage_remove__P468692,
-    "add": kodu_Stage_add__P468693,
-    "handleAPressed": kodu_Stage_handleAPressed__P468694,
-    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P468699,
-    "handleCursorCancel": kodu_Stage_handleCursorCancel__P468700,
-    "start": kodu_Stage_start__P468702,
+    "showMenu": kodu_KodeStage_showMenu__P85253,
+    "hideMenu": kodu_KodeStage_hideMenu__P85254,
+    "handleBPressed": kodu_KodeStage_handleBPressed__P85255,
+    "handleMenuPressed": kodu_KodeStage_handleMenuPressed__P85256,
+    "handleCancelBtnClicked": kodu_KodeStage_handleCancelBtnClicked__P85257,
+    "handleOkBtnClicked": kodu_KodeStage_handleOkBtnClicked__P85258,
+    "handleCursorCanvasClick": kodu_KodeStage_handleCursorCanvasClick__P85259,
+    "handleCursorButtonClick": kodu_KodeStage_handleCursorButtonClick__P85260,
+    "handleCharBtnClick": kodu_KodeStage_handleCharBtnClick__P85261,
+    "updateHover": kodu_KodeStage_updateHover__P85262,
+    "initScene": kodu_KodeStage_initScene__P85263,
+    "shutdownScene": kodu_KodeStage_shutdownScene__P85264,
+    "notify": kodu_KodeStage_notify__P85265,
+    "get": kodu_Stage_get__P85051,
+    "update": kodu_Stage_update__P85053,
+    "remove": kodu_Stage_remove__P85054,
+    "add": kodu_Stage_add__P85055,
+    "handleAPressed": kodu_Stage_handleAPressed__P85056,
+    "handleCursorCharacterClick": kodu_Stage_handleCursorCharacterClick__P85061,
+    "handleCursorCancel": kodu_Stage_handleCursorCancel__P85062,
+    "start": kodu_Stage_start__P88124,
   },
 });
-const kodu_Wander__C136748_VT = mkVTable({
+const kodu_Wander__C93218_VT = mkVTable({
   name: "Wander",
   numFields: 5,
   classNo: 85,
@@ -88272,15 +88209,15 @@ const kodu_Wander__C136748_VT = mkVTable({
     "set/prog": null,
     "margin": null,
     "set/margin": null,
-    "prepare": kodu_Wander_prepare__P136750,
-    "update": kodu_Wander_update__P136751,
-    "direction": kodu_Wander_direction__P136752,
-    "timerCallback": kodu_Wander_timerCallback__P136753,
-    "setTimer": kodu_Wander_setTimer__P136754,
-    "pickDest": kodu_Wander_pickDest__P136755,
+    "prepare": kodu_Wander_prepare__P93220,
+    "update": kodu_Wander_update__P93221,
+    "direction": kodu_Wander_direction__P93222,
+    "timerCallback": kodu_Wander_timerCallback__P93223,
+    "setTimer": kodu_Wander_setTimer__P93224,
+    "pickDest": kodu_Wander_pickDest__P93225,
   },
 });
-const kodu_Body__C110375_VT = mkVTable({
+const kodu_Body__C85128_VT = mkVTable({
   name: "Body",
   numFields: 9,
   classNo: 86,
@@ -88307,24 +88244,24 @@ const kodu_Body__C110375_VT = mkVTable({
     "set/bumpCanMove": null,
     "kelpie": null,
     "set/kelpie": null,
-    "x": kodu_Body_x__P110384,
-    "set/x": kodu_Body_x__P110386,
-    "y": kodu_Body_y__P110385,
-    "set/y": kodu_Body_y__P110387,
-    "applyFriction": kodu_Body_applyFriction__P110389,
-    "applyVelocity": kodu_Body_applyVelocity__P110390,
+    "x": kodu_Body_x__P85137,
+    "set/x": kodu_Body_x__P85139,
+    "y": kodu_Body_y__P85138,
+    "set/y": kodu_Body_y__P85140,
+    "applyFriction": kodu_Body_applyFriction__P85142,
+    "applyVelocity": kodu_Body_applyVelocity__P85143,
   },
 });
-const kodu_BrainUI__C509681_VT = mkVTable({
+const kodu_BrainUI__C94654_VT = mkVTable({
   name: "BrainUI",
   numFields: 6,
   classNo: 29,
   lastSubtypeNo: 29,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_BrainUI_destroy__P509684,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_BrainUI_destroy__P94657,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
@@ -88339,23 +88276,23 @@ const kodu_BrainUI__C509681_VT = mkVTable({
     "set/left": null,
     "top": null,
     "set/top": null,
-    "layout": kodu_BrainUI_layout__P509683,
-    "destroy": kodu_BrainUI_destroy__P509684,
-    "toDefn": kodu_BrainUI_toDefn__P509685,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "layout": kodu_BrainUI_layout__P94656,
+    "destroy": kodu_BrainUI_destroy__P94657,
+    "toDefn": kodu_BrainUI_toDefn__P94658,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
 });
-const kodu_PageUI__C509704_VT = mkVTable({
+const kodu_PageUI__C94677_VT = mkVTable({
   name: "PageUI",
   numFields: 9,
   classNo: 30,
   lastSubtypeNo: 30,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_PageUI_destroy__P509708,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_PageUI_destroy__P94681,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
@@ -88376,27 +88313,27 @@ const kodu_PageUI__C509704_VT = mkVTable({
     "set/kstage": null,
     "defn": null,
     "set/defn": null,
-    "layout": kodu_PageUI_layout__P509707,
-    "destroy": kodu_PageUI_destroy__P509708,
-    "trim": kodu_PageUI_trim__P509709,
-    "ensureFinalEmptyRule": kodu_PageUI_ensureFinalEmptyRule__P509710,
-    "deleteRuleAt": kodu_PageUI_deleteRuleAt__P509711,
-    "insertRuleAt": kodu_PageUI_insertRuleAt__P509712,
-    "toDefn": kodu_PageUI_toDefn__P509713,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "layout": kodu_PageUI_layout__P94680,
+    "destroy": kodu_PageUI_destroy__P94681,
+    "trim": kodu_PageUI_trim__P94682,
+    "ensureFinalEmptyRule": kodu_PageUI_ensureFinalEmptyRule__P94683,
+    "deleteRuleAt": kodu_PageUI_deleteRuleAt__P94684,
+    "insertRuleAt": kodu_PageUI_insertRuleAt__P94685,
+    "toDefn": kodu_PageUI_toDefn__P94686,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
 });
-const kodu_RuleUI__C509774_VT = mkVTable({
+const kodu_RuleUI__C94747_VT = mkVTable({
   name: "RuleUI",
   numFields: 18,
   classNo: 31,
   lastSubtypeNo: 31,
   maxBgInstances: null,
   methods: {
-    "destroy": kodu_RuleUI_destroy__P509778,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "destroy": kodu_RuleUI_destroy__P94751,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
   iface: {
     "stage": null,
@@ -88435,29 +88372,29 @@ const kodu_RuleUI__C509774_VT = mkVTable({
     "set/defn": null,
     "index": null,
     "set/index": null,
-    "layout": kodu_RuleUI_layout__P509777,
-    "destroy": kodu_RuleUI_destroy__P509778,
-    "destroyTiles": kodu_RuleUI_destroyTiles__P509779,
-    "isEmpty": kodu_RuleUI_isEmpty__P509780,
-    "toDefn": kodu_RuleUI_toDefn__P509781,
-    "instantiateTiles": kodu_RuleUI_instantiateTiles__P509782,
-    "handleSensorClick": kodu_RuleUI_handleSensorClick__P509783,
-    "handleActuatorClick": kodu_RuleUI_handleActuatorClick__P509784,
-    "handleFilterClick": kodu_RuleUI_handleFilterClick__P509785,
-    "handleModifierClick": kodu_RuleUI_handleModifierClick__P509786,
-    "handleWhenInsertClick": kodu_RuleUI_handleWhenInsertClick__P509787,
-    "handleDoInsertClick": kodu_RuleUI_handleDoInsertClick__P509788,
-    "handleRuleHandleClick": kodu_RuleUI_handleRuleHandleClick__P509789,
-    "createSensorBtn": kodu_RuleUI_createSensorBtn__P509790,
-    "createActuatorBtn": kodu_RuleUI_createActuatorBtn__P509791,
-    "createFilterBtn": kodu_RuleUI_createFilterBtn__P509792,
-    "createModifierBtn": kodu_RuleUI_createModifierBtn__P509793,
-    "update": kodu_Component_update__P345111,
-    "notify": kodu_Component_notify__P345112,
+    "layout": kodu_RuleUI_layout__P94750,
+    "destroy": kodu_RuleUI_destroy__P94751,
+    "destroyTiles": kodu_RuleUI_destroyTiles__P94752,
+    "isEmpty": kodu_RuleUI_isEmpty__P94753,
+    "toDefn": kodu_RuleUI_toDefn__P94754,
+    "instantiateTiles": kodu_RuleUI_instantiateTiles__P94755,
+    "handleSensorClick": kodu_RuleUI_handleSensorClick__P94756,
+    "handleActuatorClick": kodu_RuleUI_handleActuatorClick__P94757,
+    "handleFilterClick": kodu_RuleUI_handleFilterClick__P94758,
+    "handleModifierClick": kodu_RuleUI_handleModifierClick__P94759,
+    "handleWhenInsertClick": kodu_RuleUI_handleWhenInsertClick__P94760,
+    "handleDoInsertClick": kodu_RuleUI_handleDoInsertClick__P94761,
+    "handleRuleHandleClick": kodu_RuleUI_handleRuleHandleClick__P94762,
+    "createSensorBtn": kodu_RuleUI_createSensorBtn__P94763,
+    "createActuatorBtn": kodu_RuleUI_createActuatorBtn__P94764,
+    "createFilterBtn": kodu_RuleUI_createFilterBtn__P94765,
+    "createModifierBtn": kodu_RuleUI_createModifierBtn__P94766,
+    "update": kodu_Component_update__P84898,
+    "notify": kodu_Component_notify__P84899,
   },
 });
 
-const breakpoints = setupDebugger(1, ["kodu_icons_reg___110154","MISSING___110158","ui_cursor___110159","ui_when___110160","ui_do___110161","btn_play___110162","btn_stop___110163","btn_object_mode___110164","btn_terrain_mode___110165","btn_focus___110166","btn_underline___110167","btn_edit___110168","btn_move___110169","btn_duplicate___110170","btn_delete___110171","btn_carry___110172","btn_cancel___110173","btn_ok___110174","btn_plus___110175","btn_new_file___110176","btn_insertion_point___110177","btn_bknd_white___110178","btn_bknd_beige___110179","btn_bknd_clear___110180","btn_bknd_danger___110181","char_kodu___110182","char_apple___110183","char_tree___110184","tile_see___110185","tile_dpad___110186","tile_button_a___110187","tile_button_b___110188","tile_bump___110189","tile_timer___110190","tile_page_1___110191","tile_page_2___110192","tile_page_3___110193","tile_page_4___110194","tile_page_5___110195","tile_express_none___110196","tile_express_happy___110197","tile_express_angry___110198","tile_express_sad___110199","tile_express_heart___110200","tile_me___110201","tile_it___110202","tile_faraway___110203","tile_nearby___110204","tile_timespan_short___110205","tile_timespan_long___110206","tile_move___110207","tile_switch_page___110208","tile_camera_follow___110209","tile_vanish___110210","tile_express___110211","tile_toward___110212","tile_away___110213","tile_avoid___110214","tile_quickly___110215","tile_slowly___110216","rc_default___110217","rc_high___110218","rc_low___110219","rc_low_to_high___110220","rc_high_to_low___110221","emo_happy___110222","emo_angry___110223","emo_heart___110224","emo_sad___110225","RuleCondition___110338","tid___110372","tiles___110373","chardb___110401","librarydb___117059","Feeling___136331","kodu_WorldStage_ID___565307","STAGE_ID___565304","kodu_KodeStage_ID___511065","STAGE_ID___511062","app___110079","SAVEGAME___565300"])
+const breakpoints = setupDebugger(1, ["kodu_icons_reg___84906","MISSING___84910","ui_cursor___84911","ui_when___84912","ui_do___84913","btn_play___84914","btn_stop___84915","btn_object_mode___84916","btn_terrain_mode___84917","btn_focus___84918","btn_underline___84919","btn_edit___84920","btn_move___84921","btn_duplicate___84922","btn_delete___84923","btn_carry___84924","btn_cancel___84925","btn_ok___84926","btn_plus___84927","btn_new_file___84928","btn_insertion_point___84929","btn_bknd_white___84930","btn_bknd_beige___84931","btn_bknd_clear___84932","btn_bknd_danger___84933","char_kodu___84934","char_apple___84935","char_tree___84936","tile_see___84937","tile_dpad___84938","tile_button_a___84939","tile_button_b___84940","tile_bump___84941","tile_timer___84942","tile_page_1___84943","tile_page_2___84944","tile_page_3___84945","tile_page_4___84946","tile_page_5___84947","tile_express_none___84948","tile_express_happy___84949","tile_express_angry___84950","tile_express_sad___84951","tile_express_heart___84952","tile_me___84953","tile_it___84954","tile_faraway___84955","tile_nearby___84956","tile_timespan_short___84957","tile_timespan_long___84958","tile_move___84959","tile_switch_page___84960","tile_camera_follow___84961","tile_vanish___84962","tile_express___84963","tile_toward___84964","tile_away___84965","tile_avoid___84966","tile_quickly___84967","tile_slowly___84968","rc_default___84969","rc_high___84970","rc_low___84971","rc_low_to_high___84972","rc_high_to_low___84973","emo_happy___84974","emo_angry___84975","emo_heart___84976","emo_sad___84977","RuleCondition___85091","tid___85125","tiles___85126","chardb___85154","librarydb___91948","Feeling___85159","kodu_WorldStage_ID___85218","STAGE_ID___94049","kodu_KodeStage_ID___85246","STAGE_ID___96035","app___84831","SAVEGAME___94045"])
 
-return _main___P579321
+return _main___P109939
 })
diff --git a/assets/version.txt b/assets/version.txt
index c5d4220..eb1591a 100644
--- a/assets/version.txt
+++ b/assets/version.txt
@@ -1 +1 @@
-0.0.19
\ No newline at end of file
+0.0.20
\ No newline at end of file
diff --git a/pxt.json b/pxt.json
index 03973a0..e881b53 100644
--- a/pxt.json
+++ b/pxt.json
@@ -1,6 +1,6 @@
 {
     "name": "makekodu",
-    "version": "0.0.19",
+    "version": "0.0.20",
     "description": "",
     "dependencies": {
         "device": "*",