From aa071fe1ae01f5d495f81379eed55501c75e9717 Mon Sep 17 00:00:00 2001
From: Ckyiu <38868705+UnsignedArduino@users.noreply.github.com>
Date: Tue, 24 Nov 2020 21:48:08 -0500
Subject: [PATCH] 1.2.7

---
 assets/js/binary.js | 36485 +++++++++++++++++++++---------------------
 assets/version.txt  |     2 +-
 pxt.json            |     2 +-
 3 files changed, 18254 insertions(+), 18235 deletions(-)

diff --git a/assets/js/binary.js b/assets/js/binary.js
index 1114f58..7a0799d 100644
--- a/assets/js/binary.js
+++ b/assets/js/binary.js
@@ -1,5 +1,5 @@
-// meta={"simUrl":"https://trg-arcade.userpxt.io/v1.2.10/---simulator","cdnUrl":"https://pxt.azureedge.net","version":"1.2.6","target":"arcade","targetVersion":"1.2.10","repo":"unsignedarduino/fishy-fishy-cross-my-ocean"}
-// total=2276923 new=11.03% cached=84.41% other=4.55%
+// meta={"simUrl":"https://trg-arcade.userpxt.io/v1.2.10/---simulator","cdnUrl":"https://pxt.azureedge.net","version":"1.2.7","target":"arcade","targetVersion":"1.2.10","repo":"unsignedarduino/fishy-fishy-cross-my-ocean"}
+// total=2256453 new=11.13% cached=84.33% other=4.54%
 (function (ectx) {
 'use strict';
 const runtime = ectx.runtime;
@@ -604,7 +604,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P427962(s) {
+function _main___P90087(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -614,232 +614,232 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___189213 = (undefined);
-    globals._pollEventQueue___189222 = (undefined);
-    globals.minPriority___185581 = (1);
+    globals._intervals___3997 = (undefined);
+    globals._pollEventQueue___4006 = (undefined);
+    globals.minPriority___364 = (1);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, inline__P189225);
-    globals.listeners___189226 = (s.tmp_0);
-    globals.freqs___189275 = (_hex189274);
-    globals.globalVolume___189279 = (null);
-    globals.playToneID___189286 = (0);
-    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C186815_VT);
+    r0 = pxsim_Array__push(s.tmp_0, inline__P4009);
+    globals.listeners___4010 = (s.tmp_0);
+    globals.freqs___4059 = (_hex4058);
+    globals.globalVolume___4063 = (null);
+    globals.playToneID___4070 = (0);
+    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C1598_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = music_Melody_constructor__P186818_mk(s);
+    s.tmp_1 = music_Melody_constructor__P1601_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = "~15 e3:3 r:1 d#:3 r:1 d:4 r:1 c#:8";
-    s.callLocIdx = 0; s.pc = 25; return s.tmp_1;
-  case 25:
+    s.callLocIdx = 0; s.pc = 29; return s.tmp_1;
+  case 29:
     r0 = s.retval;
-    globals.wawawawaa___186832 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C186815_VT);
+    globals.wawawawaa___1615 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(music_Melody__C1598_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = music_Melody_constructor__P186818_mk(s);
+    s.tmp_1 = music_Melody_constructor__P1601_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = "g4:1 c5 e g:2 e:1 g:3";
-    s.callLocIdx = 1; s.pc = 26; return s.tmp_1;
-  case 26:
+    s.callLocIdx = 1; s.pc = 30; return s.tmp_1;
+  case 30:
     r0 = s.retval;
-    globals.powerUp___186835 = (s.tmp_0);
-    globals.brightness___186941 = (100);
+    globals.powerUp___1618 = (s.tmp_0);
+    globals.brightness___1724 = (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", _hex193923);
-    globals.font8___186962 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex8814);
+    globals.font8___1745 = (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", _hex193921);
-    globals.font12___186963 = (s.tmp_0);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex9157);
+    globals.font12___1746 = (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", _hex206834);
-    globals.font5___186967 = (s.tmp_0);
-    globals.__updated___189323 = (false);
-    r0 = pxsim.control.runInParallel(inline__P189326);
-    r0 = pxsim_pxtcore.setPalette(_hex189337);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "data", _hex21778);
+    globals.font5___1750 = (s.tmp_0);
+    globals.__updated___4107 = (false);
+    r0 = pxsim.control.runInParallel(inline__P4110);
+    r0 = pxsim_pxtcore.setPalette(_hex4121);
     r0 = pxsim.image.create(160, 120);
-    globals.screen___187019 = (r0);
-    s.tmp_0 = control___screen_setupUpdate__P186981_mk(s);
-    s.tmp_0.arg0 = inline__P189344;
-    s.callLocIdx = 4; s.pc = 27; return s.tmp_0;
-  case 27:
+    globals.screen___1802 = (r0);
+    s.tmp_0 = control___screen_setupUpdate__P1764_mk(s);
+    s.tmp_0.arg0 = inline__P4128;
+    s.callLocIdx = 4; s.pc = 31; return s.tmp_0;
+  case 31:
     r0 = s.retval;
-    globals.control_EventContext_onStats___185604 = (inline__P189349);
-    globals.RUN_KEY___189354 = ("#run");
-    globals.SCOPE_KEY___189355 = ("#scope");
-    s.tmp_0 = settings_initScopes__P189366_mk(s);
-    s.callLocIdx = 5; s.pc = 28; return s.tmp_0;
-  case 28:
+    globals.control_EventContext_onStats___387 = (inline__P4133);
+    globals.RUN_KEY___4138 = ("#run");
+    globals.SCOPE_KEY___4139 = ("#scope");
+    s.tmp_0 = settings_initScopes__P4150_mk(s);
+    s.callLocIdx = 5; s.pc = 32; return s.tmp_0;
+  case 32:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 5;
     s.tmp_1.arg2 = 4;
-    s.callLocIdx = 6; s.pc = 29; return s.tmp_1;
-  case 29:
+    s.callLocIdx = 6; s.pc = 33; return s.tmp_1;
+  case 33:
     r0 = s.retval;
-    globals.A___187094 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    globals.A___1877 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 6;
     s.tmp_1.arg2 = 5;
-    s.callLocIdx = 7; s.pc = 30; return s.tmp_1;
-  case 30:
+    s.callLocIdx = 7; s.pc = 34; return s.tmp_1;
+  case 34:
     r0 = s.retval;
-    globals.B___187095 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    globals.B___1878 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.tmp_1.arg2 = 47;
-    s.callLocIdx = 8; s.pc = 31; return s.tmp_1;
-  case 31:
+    s.callLocIdx = 8; s.pc = 35; return s.tmp_1;
+  case 35:
     r0 = s.retval;
-    globals.left___187096 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    globals.left___1879 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 2;
     s.tmp_1.arg2 = 49;
-    s.callLocIdx = 9; s.pc = 32; return s.tmp_1;
-  case 32:
+    s.callLocIdx = 9; s.pc = 36; return s.tmp_1;
+  case 36:
     r0 = s.retval;
-    globals.up___187097 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    globals.up___1880 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 3;
     s.tmp_1.arg2 = 48;
-    s.callLocIdx = 10; s.pc = 33; return s.tmp_1;
-  case 33:
+    s.callLocIdx = 10; s.pc = 37; return s.tmp_1;
+  case 37:
     r0 = s.retval;
-    globals.right___187098 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    globals.right___1881 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 4;
     s.tmp_1.arg2 = 50;
-    s.callLocIdx = 11; s.pc = 34; return s.tmp_1;
-  case 34:
+    s.callLocIdx = 11; s.pc = 38; return s.tmp_1;
+  case 38:
     r0 = s.retval;
-    globals.down___187099 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    globals.down___1882 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 7;
     s.tmp_1.arg2 = 51;
-    s.callLocIdx = 12; s.pc = 35; return s.tmp_1;
-  case 35:
+    s.callLocIdx = 12; s.pc = 39; return s.tmp_1;
+  case 39:
     r0 = s.retval;
-    globals.menu___187100 = (s.tmp_0);
-    globals._userEventsEnabled___189393 = (true);
-    globals.defaultRepeatDelay___189395 = (500);
-    globals.defaultRepeatInterval___189397 = (30);
-    r0 = pxsim_pxtcore_mkClassInstance(controller_AnyButton__C189403_VT);
+    globals.menu___1883 = (s.tmp_0);
+    globals._userEventsEnabled___4177 = (true);
+    globals.defaultRepeatDelay___4179 = (500);
+    globals.defaultRepeatInterval___4181 = (30);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_AnyButton__C4187_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_1 = controller_Button_constructor__P1909_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 0;
     s.tmp_1.arg2 = -1;
-    s.callLocIdx = 13; s.pc = 36; return s.tmp_1;
-  case 36:
+    s.callLocIdx = 13; s.pc = 40; return s.tmp_1;
+  case 40:
     r0 = s.retval;
-    globals.anyButton___187174 = (s.tmp_0);
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 14; s.pc = 37; return s.tmp_0;
-  case 37:
+    globals.anyButton___1957 = (s.tmp_0);
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 14; s.pc = 41; return s.tmp_0;
+  case 41:
     r0 = s.retval;
-    globals.Player___187345 = (r0);
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 15; s.pc = 38; return s.tmp_0;
-  case 38:
+    globals.Player___2128 = (r0);
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 15; s.pc = 42; return s.tmp_0;
+  case 42:
     r0 = s.retval;
-    globals.Food___187347 = (r0);
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 16; s.pc = 39; return s.tmp_0;
-  case 39:
+    globals.Food___2130 = (r0);
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 16; s.pc = 43; return s.tmp_0;
+  case 43:
     r0 = s.retval;
-    globals.Enemy___187348 = (r0);
+    globals.Enemy___2131 = (r0);
     r0 = (100 * 256);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    globals.MAX_TIME_STEP___187385 = (r0);
+    globals.MAX_TIME_STEP___2168 = (r0);
     r0 = (0.1 * 256);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    globals.MIN_MOVE_GAP___187387 = (r0);
-    globals.infoState___189446 = (undefined);
-    s.tmp_0 = game_addScenePushHandler__P187766_mk(s);
-    s.tmp_0.arg0 = inline__P189450;
-    s.callLocIdx = 19; s.pc = 40; return s.tmp_0;
-  case 40:
+    globals.MIN_MOVE_GAP___2170 = (r0);
+    globals.infoState___4230 = (undefined);
+    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
+    s.tmp_0.arg0 = inline__P4234;
+    s.callLocIdx = 19; s.pc = 44; return s.tmp_0;
+  case 44:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P187768_mk(s);
-    s.tmp_0.arg0 = inline__P189465;
-    s.callLocIdx = 23; s.pc = 41; return s.tmp_0;
-  case 41:
+    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
+    s.tmp_0.arg0 = inline__P4249;
+    s.callLocIdx = 23; s.pc = 45; return s.tmp_0;
+  case 45:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerInfo__C187443_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerInfo__C2226_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = info_PlayerInfo_constructor__P187455_mk(s);
+    s.tmp_1 = info_PlayerInfo_constructor__P2238_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
-    s.callLocIdx = 24; s.pc = 42; return s.tmp_1;
-  case 42:
+    s.callLocIdx = 24; s.pc = 46; return s.tmp_1;
+  case 46:
     r0 = s.retval;
-    globals.player1___187474 = (s.tmp_0);
+    globals.player1___2257 = (s.tmp_0);
     r0 = pxsim_Array__mk();
-    globals.scene_Scene_initializers___187656 = (r0);
-    globals.debug___187745 = (false);
-    globals.stats___187746 = (false);
-    globals.winEffect___187747 = (undefined);
-    globals.loseEffect___187748 = (undefined);
-    globals.loseSound___189561 = (undefined);
-    globals.winSound___189563 = (undefined);
-    globals.__isOver___189571 = (false);
-    globals.foreverRunning___189575 = (false);
-    globals.font___189699 = (globals.font8___186962);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    globals.scene_Scene_initializers___2439 = (r0);
+    globals.debug___2528 = (false);
+    globals.stats___2529 = (false);
+    globals.winEffect___2530 = (undefined);
+    globals.loseEffect___2531 = (undefined);
+    globals.loseSound___4345 = (undefined);
+    globals.winSound___4347 = (undefined);
+    globals.__isOver___4355 = (false);
+    globals.foreverRunning___4359 = (false);
+    globals.font___4483 = (globals.font8___1745);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 80);
-    globals.CONTENT_WIDTH___189719 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    globals.CONTENT_WIDTH___4503 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 8);
-    globals.CONTENT_HEIGHT___189722 = (r0);
-    r0 = (globals.CONTENT_HEIGHT___189722 / 8);
+    globals.CONTENT_HEIGHT___4506 = (r0);
+    r0 = (globals.CONTENT_HEIGHT___4506 / 8);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    globals.CELL_HEIGHT___189728 = (r0);
-    globals.CELL_WIDTH___189730 = (globals.CELL_HEIGHT___189728);
-    s.tmp_2 = r0 = globals.CELL_WIDTH___189730;
+    globals.CELL_HEIGHT___4512 = (r0);
+    globals.CELL_WIDTH___4514 = (globals.CELL_HEIGHT___4512);
+    s.tmp_2 = r0 = globals.CELL_WIDTH___4514;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.font___189699;
+    s.tmp_4.arg0 = globals.font___4483;
     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 = 43; return s.tmp_4; }
+     else { s.callLocIdx = 25; s.pc = 47; return s.tmp_4; }
     }
-  case 43:
+  case 47:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
@@ -847,19 +847,19 @@ switch (step) {
     r0 = (s.tmp_1 / 2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    globals.LETTER_OFFSET_X___189734 = (r0);
-    s.tmp_2 = r0 = globals.CELL_HEIGHT___189728;
+    globals.LETTER_OFFSET_X___4518 = (r0);
+    s.tmp_2 = r0 = globals.CELL_HEIGHT___4512;
     s.tmp_4 = if_charHeight_1_mk(s);
-    s.tmp_4.arg0 = globals.font___189699;
+    s.tmp_4.arg0 = globals.font___4483;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charHeight");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charHeight"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charHeight"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 26; s.pc = 44; return s.tmp_4; }
+     else { s.callLocIdx = 26; s.pc = 48; return s.tmp_4; }
     }
-  case 44:
+  case 48:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
@@ -867,13 +867,13 @@ switch (step) {
     r0 = (s.tmp_1 / 2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    globals.LETTER_OFFSET_Y___189738 = (r0);
-    r0 = (globals.CELL_WIDTH___189730 / 2);
+    globals.LETTER_OFFSET_Y___4522 = (r0);
+    r0 = (globals.CELL_WIDTH___4514 / 2);
     s.tmp_1 = r0;
     r0 = (40 + s.tmp_1);
     s.tmp_0 = r0;
-    s.tmp_5 = r0 = globals.CONTENT_WIDTH___189719;
-    r0 = (globals.CELL_WIDTH___189730 * 3);
+    s.tmp_5 = r0 = globals.CONTENT_WIDTH___4503;
+    r0 = (globals.CELL_WIDTH___4514 * 3);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 - s.tmp_6);
     s.tmp_4 = r0;
@@ -882,60 +882,60 @@ switch (step) {
     r0 = pxsim.Math_.floor(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_0 + s.tmp_2);
-    globals.ROW_LEFT___189746 = (r0);
-    r0 = (8 + globals.CELL_HEIGHT___189728);
-    globals.BOTTOM_BAR_HEIGHT___189754 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    globals.ROW_LEFT___4530 = (r0);
+    r0 = (8 + globals.CELL_HEIGHT___4512);
+    globals.BOTTOM_BAR_HEIGHT___4538 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___189754);
-    globals.BOTTOM_BAR_TOP___189757 = (r0);
+    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___4538);
+    globals.BOTTOM_BAR_TOP___4541 = (r0);
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = globals.font___189699;
+    s.tmp_2.arg0 = globals.font___4483;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 27; s.pc = 45; return s.tmp_2; }
+     else { s.callLocIdx = 27; s.pc = 49; return s.tmp_2; }
     }
-  case 45:
+  case 49:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 3);
     s.tmp_0 = r0;
     r0 = (80 + s.tmp_0);
-    globals.BOTTOM_BAR_BUTTON_WIDTH___189764 = (r0);
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_HEIGHT___189754;
+    globals.BOTTOM_BAR_BUTTON_WIDTH___4548 = (r0);
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_HEIGHT___4538;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = globals.font___189699;
+    s.tmp_3.arg0 = globals.font___4483;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 28; s.pc = 46; return s.tmp_3; }
+     else { s.callLocIdx = 28; s.pc = 50; return s.tmp_3; }
     }
-  case 46:
+  case 50:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    globals.BOTTOM_BAR_TEXT_Y___189767 = (r0);
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_BUTTON_WIDTH___189764;
+    globals.BOTTOM_BAR_TEXT_Y___4551 = (r0);
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_BUTTON_WIDTH___4548;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.font___189699;
+    s.tmp_4.arg0 = globals.font___4483;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charWidth");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 29; s.pc = 47; return s.tmp_4; }
+     else { s.callLocIdx = 29; s.pc = 51; return s.tmp_4; }
     }
-  case 47:
+  case 51:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_3 * 2);
@@ -943,75 +943,75 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    globals.BOTTOM_BAR_CONFIRM_X___189770 = (r0);
-    r0 = (4 * globals.CELL_HEIGHT___189728);
-    globals.NUMPAD_HEIGHT___189774 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    globals.BOTTOM_BAR_CONFIRM_X___4554 = (r0);
+    r0 = (4 * globals.CELL_HEIGHT___4512);
+    globals.NUMPAD_HEIGHT___4558 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - globals.NUMPAD_HEIGHT___189774);
+    r0 = (s.tmp_1 - globals.NUMPAD_HEIGHT___4558);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___189754);
-    globals.NUMPAD_TOP___189778 = (r0);
-    r0 = (1 * globals.CELL_HEIGHT___189728);
-    globals.INPUT_HEIGHT___189784 = (r0);
-    r0 = (globals.NUMPAD_TOP___189778 - globals.INPUT_HEIGHT___189784);
+    r0 = (s.tmp_0 - globals.BOTTOM_BAR_HEIGHT___4538);
+    globals.NUMPAD_TOP___4562 = (r0);
+    r0 = (1 * globals.CELL_HEIGHT___4512);
+    globals.INPUT_HEIGHT___4568 = (r0);
+    r0 = (globals.NUMPAD_TOP___4562 - globals.INPUT_HEIGHT___4568);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    globals.INPUT_TOP___189788 = (r0);
-    r0 = (globals.INPUT_TOP___189788 - 4);
-    globals.PROMPT_HEIGHT___189793 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    globals.INPUT_TOP___4572 = (r0);
+    r0 = (globals.INPUT_TOP___4572 - 4);
+    globals.PROMPT_HEIGHT___4577 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 6);
-    globals.PROMPT_WIDTH___189796 = (r0);
-    globals.confirmText___189797 = ("OK");
-    s.tmp_0 = scene_systemMenu_initVolume__P189830_mk(s);
-    s.callLocIdx = 30; s.pc = 48; return s.tmp_0;
-  case 48:
+    globals.PROMPT_WIDTH___4580 = (r0);
+    globals.confirmText___4581 = ("OK");
+    s.tmp_0 = scene_systemMenu_initVolume__P4614_mk(s);
+    s.callLocIdx = 30; s.pc = 52; return s.tmp_0;
+  case 52:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_initScreen__P189831_mk(s);
-    s.callLocIdx = 31; s.pc = 49; return s.tmp_0;
-  case 49:
+    s.tmp_0 = scene_systemMenu_initScreen__P4615_mk(s);
+    s.callLocIdx = 31; s.pc = 53; return s.tmp_0;
+  case 53:
     r0 = s.retval;
-    r0 = pxsim_Array__push(globals.scene_Scene_initializers___187656, scene_systemMenu_register__P187850);
-    r0 = pxsim.image.ofBuffer(_hex189838);
-    globals.CARD_NORMAL___187855 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189840);
-    globals.CARD_SELECTED___187856 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189842);
-    globals.CARD_ACTIVE___187857 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189844);
-    globals.VOLUME_UP_ICON___187858 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189846);
-    globals.BRIGHTNESS_DOWN_ICON___187859 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189848);
-    globals.CLOSE_MENU_ICON___187860 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189850);
-    globals.VOLUME_DOWN_ICON___187861 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189852);
-    globals.SLEEP_ICON___187862 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189854);
-    globals.CONSOLE_ICON___187863 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189856);
-    globals.BRIGHTNESS_UP_ICON___187864 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex189858);
-    globals.STATS_ICON___187865 = (r0);
-    globals.consoleColor___189861 = (1);
-    globals.tabSize___189864 = (8);
-    globals.consoleFont___189870 = (globals.font5___186967);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_Array__push(globals.scene_Scene_initializers___2439, scene_systemMenu_register__P2633);
+    r0 = pxsim.image.ofBuffer(_hex4622);
+    globals.CARD_NORMAL___2638 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4624);
+    globals.CARD_SELECTED___2639 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4626);
+    globals.CARD_ACTIVE___2640 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4628);
+    globals.VOLUME_UP_ICON___2641 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4630);
+    globals.BRIGHTNESS_DOWN_ICON___2642 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4632);
+    globals.CLOSE_MENU_ICON___2643 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4634);
+    globals.VOLUME_DOWN_ICON___2644 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4636);
+    globals.SLEEP_ICON___2645 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4638);
+    globals.CONSOLE_ICON___2646 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4640);
+    globals.BRIGHTNESS_UP_ICON___2647 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex4642);
+    globals.STATS_ICON___2648 = (r0);
+    globals.consoleColor___4645 = (1);
+    globals.tabSize___4648 = (8);
+    globals.consoleFont___4654 = (globals.font5___1750);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_2 = r0;
     s.tmp_5 = if_charHeight_1_mk(s);
-    s.tmp_5.arg0 = globals.consoleFont___189870;
+    s.tmp_5.arg0 = globals.consoleFont___4654;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "charHeight");
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 32; s.pc = 50; return s.tmp_5; }
+     else { s.callLocIdx = 32; s.pc = 54; return s.tmp_5; }
     }
-  case 50:
+  case 54:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 2);
@@ -1021,413 +1021,413 @@ switch (step) {
     r0 = pxsim.Math_.floor(s.tmp_1);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    globals.consoleLines___189875 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    globals.consoleLines___4659 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     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___189870;
+    s.tmp_4.arg0 = globals.consoleFont___4654;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charWidth");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charWidth"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charWidth"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 33; s.pc = 51; return s.tmp_4; }
+     else { s.callLocIdx = 33; s.pc = 55; return s.tmp_4; }
     }
-  case 51:
+  case 55:
     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___189885 = (r0);
-    s.tmp_0 = console_addListener__P185589_mk(s);
-    s.tmp_0.arg0 = game_consoleOverlay_listener__P189897;
-    s.callLocIdx = 34; s.pc = 52; return s.tmp_0;
-  case 52:
+    globals.consoleColumns___4669 = (r0);
+    s.tmp_0 = console_addListener__P372_mk(s);
+    s.tmp_0.arg0 = game_consoleOverlay_listener__P4681;
+    s.callLocIdx = 34; s.pc = 56; return s.tmp_0;
+  case 56:
     r0 = s.retval;
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = inline__P189901;
+    s.tmp_0.argL = inline__P4685;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 36; s.pc = 53; return s.tmp_0;
-  case 53:
+    s.callLocIdx = 36; s.pc = 57; return s.tmp_0;
+  case 57:
     r0 = s.retval;
-    globals.MAX_SOURCES___189899 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C187935_VT);
+    globals.MAX_SOURCES___4683 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C2718_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_SprayFactory_constructor__P187936_mk(s);
+    s.tmp_1 = particles_SprayFactory_constructor__P2719_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 20;
     s.tmp_1.arg2 = 0;
     s.tmp_1.arg3 = 60;
-    s.callLocIdx = 37; s.pc = 54; return s.tmp_1;
-  case 54:
+    s.callLocIdx = 37; s.pc = 58; return s.tmp_1;
+  case 58:
     r0 = s.retval;
-    globals.defaultFactory___187915 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C187803_VT);
+    globals.defaultFactory___2698 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C2586_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P187805_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P2588_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 38; s.pc = 55; return s.tmp_1;
-  case 55:
+    s.callLocIdx = 38; s.pc = 59; return s.tmp_1;
+  case 59:
     r0 = s.retval;
-    globals.galois___189934 = (s.tmp_0);
-    globals.angleSlice___189942 = (0.06283185307179587);
-    s.tmp_0 = effects_createEffect__P189969_mk(s);
+    globals.galois___4718 = (s.tmp_0);
+    globals.angleSlice___4726 = (0.06283185307179587);
+    s.tmp_0 = effects_createEffect__P4753_mk(s);
     s.tmp_0.arg0 = 20;
     s.tmp_0.arg1 = 2000;
-    s.tmp_0.arg2 = inline__P202119;
-    s.callLocIdx = 40; s.pc = 56; return s.tmp_0;
-  case 56:
+    s.tmp_0.arg2 = inline__P17175;
+    s.callLocIdx = 40; s.pc = 60; return s.tmp_0;
+  case 60:
     r0 = s.retval;
-    globals.spray___188015 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ScreenEffect__C188010_VT);
+    globals.spray___2798 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ScreenEffect__C2793_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_ScreenEffect_constructor__P188011_mk(s);
+    s.tmp_1 = effects_ScreenEffect_constructor__P2794_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__P195436;
-    s.callLocIdx = 46; s.pc = 57; return s.tmp_1;
-  case 57:
+    s.tmp_1.arg4 = inline__P9319;
+    s.callLocIdx = 46; s.pc = 61; return s.tmp_1;
+  case 61:
     r0 = s.retval;
-    globals.confetti___188018 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C188033_VT);
+    globals.confetti___2801 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C2816_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_ImageEffect_constructor__P188034_mk(s);
+    s.tmp_1 = effects_ImageEffect_constructor__P2817_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 100;
-    s.tmp_1.arg2 = inline__P202259;
-    s.callLocIdx = 52; s.pc = 58; return s.tmp_1;
-  case 58:
+    s.tmp_1.arg2 = inline__P17315;
+    s.callLocIdx = 52; s.pc = 62; return s.tmp_1;
+  case 62:
     r0 = s.retval;
-    globals.dissolve___188038 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C188033_VT);
+    globals.dissolve___2821 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ImageEffect__C2816_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_ImageEffect_constructor__P188034_mk(s);
+    s.tmp_1 = effects_ImageEffect_constructor__P2817_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 125;
-    s.tmp_1.arg2 = inline__P195328;
-    s.callLocIdx = 55; s.pc = 59; return s.tmp_1;
-  case 59:
+    s.tmp_1.arg2 = inline__P9211;
+    s.callLocIdx = 55; s.pc = 63; return s.tmp_1;
+  case 63:
     r0 = s.retval;
-    globals.melt___188039 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C188048_VT);
+    globals.melt___2822 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C2831_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = texteffects_TextEffect_constructor__P188050_mk(s);
+    s.tmp_1 = texteffects_TextEffect_constructor__P2833_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = inline__P189993;
-    s.callLocIdx = 56; s.pc = 60; return s.tmp_1;
-  case 60:
+    s.tmp_1.arg1 = inline__P4777;
+    s.callLocIdx = 56; s.pc = 64; return s.tmp_1;
+  case 64:
     r0 = s.retval;
-    globals.shake___188051 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C188048_VT);
+    globals.shake___2834 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(texteffects_TextEffect__C2831_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = texteffects_TextEffect_constructor__P188050_mk(s);
+    s.tmp_1 = texteffects_TextEffect_constructor__P2833_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = inline__P190006;
-    s.callLocIdx = 66; s.pc = 61; return s.tmp_1;
-  case 61:
-    r0 = s.retval;
-    globals.wave___188052 = (s.tmp_0);
-    r0 = pxsim.image.ofBuffer(_hex190393);
-    globals.coral0___188265 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex190395);
-    globals.coral1___188266 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex190397);
-    globals.coral2___188267 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex190401);
-    globals.coral4___188269 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex190403);
-    globals.coral5___188270 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex190709);
-    globals.oceanSand6___188423 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191039);
-    globals.hazardWater___188592 = (r0);
-    s.tmp_0 = game_setWaitAnyButton__P187750_mk(s);
-    s.tmp_0.arg0 = controller_pauseUntilAnyButtonIsPressed__P187170;
-    s.callLocIdx = 67; s.pc = 62; return s.tmp_0;
-  case 62:
-    r0 = s.retval;
-    s.tmp_0 = game_eventContext__P187752_mk(s);
-    s.callLocIdx = 68; s.pc = 63; return s.tmp_0;
-  case 63:
-    r0 = s.retval;
-    s.tmp_0 = game_addScenePushHandler__P187766_mk(s);
-    s.tmp_0.arg0 = inline__P191203;
-    s.callLocIdx = 70; s.pc = 64; return s.tmp_0;
-  case 64:
-    r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P187768_mk(s);
-    s.tmp_0.arg0 = inline__P191221;
-    s.callLocIdx = 72; s.pc = 65; return s.tmp_0;
+    s.tmp_1.arg1 = inline__P4790;
+    s.callLocIdx = 66; s.pc = 65; return s.tmp_1;
   case 65:
     r0 = s.retval;
-    s.tmp_0 = color_bufferToPalette__P188761_mk(s);
-    s.tmp_0.arg0 = _hex191255;
-    s.callLocIdx = 73; s.pc = 66; return s.tmp_0;
+    globals.wave___2835 = (s.tmp_0);
+    r0 = pxsim.image.ofBuffer(_hex5177);
+    globals.coral0___3048 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex5179);
+    globals.coral1___3049 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex5181);
+    globals.coral2___3050 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex5185);
+    globals.coral4___3052 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex5187);
+    globals.coral5___3053 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex5493);
+    globals.oceanSand6___3206 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex5823);
+    globals.hazardWater___3375 = (r0);
+    s.tmp_0 = game_setWaitAnyButton__P2533_mk(s);
+    s.tmp_0.arg0 = controller_pauseUntilAnyButtonIsPressed__P1953;
+    s.callLocIdx = 67; s.pc = 66; return s.tmp_0;
   case 66:
     r0 = s.retval;
-    globals.originalPalette___188791 = (r0);
-    s.tmp_0 = color_bufferToPalette__P188761_mk(s);
-    s.tmp_0.arg0 = _hex191277;
-    s.callLocIdx = 74; s.pc = 67; return s.tmp_0;
+    s.tmp_0 = game_eventContext__P2535_mk(s);
+    s.callLocIdx = 68; s.pc = 67; return s.tmp_0;
   case 67:
     r0 = s.retval;
-    globals.Black___188802 = (r0);
-    r0 = pxsim_pxtrt.mkMap();
-    globals.decounceTimeouts___191286 = (r0);
-    r0 = pxsim_pxtrt.mkMap();
-    globals.throttleTimeouts___191288 = (r0);
-    globals.PATH_FOLLOW_KEY___191304 = ("A_STAR_PATH_FOLLOW");
-    globals.PATH_COMPLETION_KEY___191305 = ("A_STAR_PATH_COMPLETION_HANDLER");
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 75; s.pc = 68; return s.tmp_0;
+    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
+    s.tmp_0.arg0 = inline__P5987;
+    s.callLocIdx = 70; s.pc = 68; return s.tmp_0;
   case 68:
     r0 = s.retval;
-    globals._TileSprite___188977 = (r0);
-    s.tmp_0 = ConnectionKind_create__P189019_mk(s);
-    s.callLocIdx = 76; s.pc = 69; return s.tmp_0;
+    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
+    s.tmp_0.arg0 = inline__P6005;
+    s.callLocIdx = 72; s.pc = 69; return s.tmp_0;
   case 69:
     r0 = s.retval;
-    globals.Door1___189020 = (r0);
-    s.tmp_0 = ConnectionKind_create__P189019_mk(s);
-    s.callLocIdx = 77; s.pc = 70; return s.tmp_0;
+    s.tmp_0 = color_bufferToPalette__P3544_mk(s);
+    s.tmp_0.arg0 = _hex6039;
+    s.callLocIdx = 73; s.pc = 70; return s.tmp_0;
   case 70:
     r0 = s.retval;
-    globals.Door2___189021 = (r0);
-    s.tmp_0 = ConnectionKind_create__P189019_mk(s);
-    s.callLocIdx = 78; s.pc = 71; return s.tmp_0;
+    globals.originalPalette___3574 = (r0);
+    s.tmp_0 = color_bufferToPalette__P3544_mk(s);
+    s.tmp_0.arg0 = _hex6061;
+    s.callLocIdx = 74; s.pc = 71; return s.tmp_0;
   case 71:
     r0 = s.retval;
-    globals.Ladder1___189022 = (r0);
-    s.tmp_0 = ConnectionKind_create__P189019_mk(s);
-    s.callLocIdx = 79; s.pc = 72; return s.tmp_0;
+    globals.Black___3585 = (r0);
+    r0 = pxsim_pxtrt.mkMap();
+    globals.decounceTimeouts___6070 = (r0);
+    r0 = pxsim_pxtrt.mkMap();
+    globals.throttleTimeouts___6072 = (r0);
+    globals.PATH_FOLLOW_KEY___6088 = ("A_STAR_PATH_FOLLOW");
+    globals.PATH_COMPLETION_KEY___6089 = ("A_STAR_PATH_COMPLETION_HANDLER");
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 75; s.pc = 72; return s.tmp_0;
   case 72:
     r0 = s.retval;
-    globals.Pipe1___189023 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191494);
-    globals.transparency16___189149 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191498);
-    globals.tile1___189150 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191502);
-    globals.tile2___189151 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191506);
-    globals.tile3___189152 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191510);
-    globals.tile4___189153 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191514);
-    globals.tile5___189154 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191518);
-    globals.tile6___189155 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191522);
-    globals.tile7___189156 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191526);
-    globals.tile8___189157 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191530);
-    globals.tile9___189158 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191534);
-    globals.tile10___189159 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191538);
-    globals.tile11___189160 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191542);
-    globals.tile12___189161 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191546);
-    globals.tile14___189162 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191550);
-    globals.tile13___189163 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191554);
-    globals.tile15___189164 = (r0);
-    r0 = pxsim.image.ofBuffer(_hex191558);
-    globals.tile16___189165 = (r0);
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 80; s.pc = 73; return s.tmp_0;
+    globals._TileSprite___3760 = (r0);
+    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    s.callLocIdx = 76; s.pc = 73; return s.tmp_0;
   case 73:
     r0 = s.retval;
-    globals.NPC___426659 = (r0);
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 81; s.pc = 74; return s.tmp_0;
+    globals.Door1___3803 = (r0);
+    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    s.callLocIdx = 77; s.pc = 74; return s.tmp_0;
   case 74:
     r0 = s.retval;
-    globals.Map___426662 = (r0);
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 82; s.pc = 75; return s.tmp_0;
+    globals.Door2___3804 = (r0);
+    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    s.callLocIdx = 78; s.pc = 75; return s.tmp_0;
   case 75:
     r0 = s.retval;
-    globals.SurvivedPlayer___426665 = (r0);
-    s.tmp_0 = SpriteKind_create__P187344_mk(s);
-    s.callLocIdx = 83; s.pc = 76; return s.tmp_0;
+    globals.Ladder1___3805 = (r0);
+    s.tmp_0 = ConnectionKind_create__P3802_mk(s);
+    s.callLocIdx = 79; s.pc = 76; return s.tmp_0;
   case 76:
     r0 = s.retval;
-    globals.SurvivedNPC___426668 = (r0);
-    s.tmp_0 = spriteutils_createRenderable__P188855_mk(s);
-    s.tmp_0.arg0 = 200;
-    s.tmp_0.arg1 = inline__P426785;
-    s.callLocIdx = 115; s.pc = 77; return s.tmp_0;
+    globals.Pipe1___3806 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6278);
+    globals.transparency16___3933 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6282);
+    globals.tile1___3934 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6286);
+    globals.tile2___3935 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6290);
+    globals.tile3___3936 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6294);
+    globals.tile4___3937 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6298);
+    globals.tile5___3938 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6302);
+    globals.tile6___3939 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6306);
+    globals.tile7___3940 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6310);
+    globals.tile8___3941 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6314);
+    globals.tile9___3942 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6318);
+    globals.tile10___3943 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6322);
+    globals.tile11___3944 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6326);
+    globals.tile12___3945 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6330);
+    globals.tile14___3946 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6334);
+    globals.tile13___3947 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6338);
+    globals.tile15___3948 = (r0);
+    r0 = pxsim.image.ofBuffer(_hex6342);
+    globals.tile16___3949 = (r0);
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 80; s.pc = 77; return s.tmp_0;
   case 77:
     r0 = s.retval;
-    s.tmp_0 = scene_onOverlapTile__P187325_mk(s);
-    s.tmp_0.arg0 = globals.NPC___426659;
-    s.tmp_0.arg1 = globals.tile12___189161;
-    s.tmp_0.arg2 = inline__P426827;
-    s.callLocIdx = 120; s.pc = 78; return s.tmp_0;
+    globals.NPC___88584 = (r0);
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 81; s.pc = 78; return s.tmp_0;
   case 78:
     r0 = s.retval;
-    s.tmp_0 = info_onCountdownEnd__P187432_mk(s);
-    s.tmp_0.arg0 = inline__P426859;
-    s.callLocIdx = 133; s.pc = 79; return s.tmp_0;
+    globals.Map___88587 = (r0);
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 82; s.pc = 79; return s.tmp_0;
   case 79:
     r0 = s.retval;
-    s.tmp_0 = scene_onOverlapTile__P187325_mk(s);
-    s.tmp_0.arg0 = globals.Player___187345;
-    s.tmp_0.arg1 = globals.tile12___189161;
-    s.tmp_0.arg2 = inline__P426907;
-    s.callLocIdx = 143; s.pc = 80; return s.tmp_0;
+    globals.SurvivedPlayer___88590 = (r0);
+    s.tmp_0 = SpriteKind_create__P2127_mk(s);
+    s.callLocIdx = 83; s.pc = 80; return s.tmp_0;
   case 80:
     r0 = s.retval;
-    s.tmp_0 = sprites_onOverlap__P187323_mk(s);
-    s.tmp_0.arg0 = globals.NPC___426659;
-    s.tmp_0.arg1 = globals.Enemy___187348;
-    s.tmp_0.arg2 = inline__P426935;
-    s.callLocIdx = 155; s.pc = 81; return s.tmp_0;
+    globals.SurvivedNPC___88593 = (r0);
+    s.tmp_0 = spriteutils_createRenderable__P3638_mk(s);
+    s.tmp_0.arg0 = 200;
+    s.tmp_0.arg1 = inline__P88725;
+    s.callLocIdx = 115; s.pc = 81; return s.tmp_0;
   case 81:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_onMenuOptionSelected__P188904_mk(s);
-    s.tmp_0.arg0 = inline__P427251;
-    s.callLocIdx = 202; s.pc = 82; return s.tmp_0;
+    s.tmp_0 = scene_onOverlapTile__P2108_mk(s);
+    s.tmp_0.arg0 = globals.NPC___88584;
+    s.tmp_0.arg1 = globals.tile12___3945;
+    s.tmp_0.arg2 = inline__P88767;
+    s.callLocIdx = 120; s.pc = 82; return s.tmp_0;
   case 82:
     r0 = s.retval;
-    s.tmp_0 = sprites_onOverlap__P187323_mk(s);
-    s.tmp_0.arg0 = globals.Player___187345;
-    s.tmp_0.arg1 = globals.Enemy___187348;
-    s.tmp_0.arg2 = inline__P427258;
-    s.callLocIdx = 217; s.pc = 83; return s.tmp_0;
+    s.tmp_0 = info_onCountdownEnd__P2215_mk(s);
+    s.tmp_0.arg0 = inline__P88799;
+    s.callLocIdx = 133; s.pc = 83; return s.tmp_0;
   case 83:
     r0 = s.retval;
-    globals.sprite_closest_sprite___427300 = (null);
-    globals.shortest_distance___427302 = (0);
-    globals.last_score_time___427304 = (0);
-    globals.sprite_map___427230 = (null);
-    globals.sprite_shark___427184 = (null);
-    globals.map___427146 = (null);
-    globals.sprite_player_fish___427125 = (null);
-    globals.selected_option___426850 = (false);
-    globals.location___426744 = (null);
-    globals.sprite_fish___426697 = (null);
-    globals.local_choice___426692 = (0);
+    s.tmp_0 = scene_onOverlapTile__P2108_mk(s);
+    s.tmp_0.arg0 = globals.Player___2128;
+    s.tmp_0.arg1 = globals.tile12___3945;
+    s.tmp_0.arg2 = inline__P88847;
+    s.callLocIdx = 141; s.pc = 84; return s.tmp_0;
+  case 84:
+    r0 = s.retval;
+    s.tmp_0 = sprites_onOverlap__P2106_mk(s);
+    s.tmp_0.arg0 = globals.NPC___88584;
+    s.tmp_0.arg1 = globals.Enemy___2131;
+    s.tmp_0.arg2 = inline__P88866;
+    s.callLocIdx = 153; s.pc = 85; return s.tmp_0;
+  case 85:
+    r0 = s.retval;
+    s.tmp_0 = blockMenu_onMenuOptionSelected__P3687_mk(s);
+    s.tmp_0.arg0 = inline__P89182;
+    s.callLocIdx = 200; s.pc = 86; return s.tmp_0;
+  case 86:
+    r0 = s.retval;
+    s.tmp_0 = sprites_onOverlap__P2106_mk(s);
+    s.tmp_0.arg0 = globals.Player___2128;
+    s.tmp_0.arg1 = globals.Enemy___2131;
+    s.tmp_0.arg2 = inline__P89189;
+    s.callLocIdx = 216; s.pc = 87; return s.tmp_0;
+  case 87:
+    r0 = s.retval;
+    globals.sprite_closest_sprite___89233 = (null);
+    globals.shortest_distance___89235 = (0);
+    globals.last_score_time___89237 = (0);
+    globals.sprite_map___89161 = (null);
+    globals.sprite_shark___89115 = (null);
+    globals.map___89077 = (null);
+    globals.sprite_player_fish___89056 = (null);
+    globals.selected_option___88790 = (false);
+    globals.location___88684 = (null);
+    globals.sprite_fish___88637 = (null);
+    globals.local_choice___88629 = (0);
     r0 = pxsim_Array__mk();
-    globals.right_fish_animations___426683 = (r0);
+    globals.right_fish_animations___88614 = (r0);
     r0 = pxsim_Array__mk();
-    globals.left_fish_animations___426674 = (r0);
+    globals.left_fish_animations___88599 = (r0);
     r0 = pxsim_String_.mkEmpty();
-    globals.message___426820 = (r0);
-    globals.loading___426789 = (0);
+    globals.message___88760 = (r0);
+    globals.loading___88729 = (0);
     r0 = pxsim_Array__mk();
-    globals.paths___426761 = (r0);
-    globals.last_15___426836 = (false);
-    globals.player_made_it___426897 = (false);
-    globals.in_game___426863 = (false);
-    globals.user_shark_count___427011 = (0);
-    globals.user_fish_count___427054 = (0);
-    s.tmp_1 = blockSettings_exists__P188973_mk(s);
+    globals.paths___88701 = (r0);
+    globals.last_15___88776 = (false);
+    globals.player_made_it___88837 = (false);
+    globals.in_game___88803 = (false);
+    globals.user_shark_count___88942 = (0);
+    globals.user_fish_count___88985 = (0);
+    s.tmp_1 = blockSettings_exists__P3756_mk(s);
     s.tmp_1.arg0 = "fish_count";
-    s.callLocIdx = 218; s.pc = 84; return s.tmp_1;
-  case 84:
+    s.callLocIdx = 217; s.pc = 88; return s.tmp_1;
+  case 88:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = blockSettings_readNumber__P188967_mk(s);
+    s.tmp_2 = blockSettings_readNumber__P3750_mk(s);
     s.tmp_2.arg0 = "fish_count";
-    s.callLocIdx = 219; s.pc = 85; return s.tmp_2;
-  case 85:
+    s.callLocIdx = 218; s.pc = 89; return s.tmp_2;
+  case 89:
     r0 = s.retval;
-    globals.user_fish_count___427054 = (r0);
+    globals.user_fish_count___88985 = (r0);
     { step = 2; continue; }
   case 1:
-    globals.user_fish_count___427054 = (31);
+    globals.user_fish_count___88985 = (31);
   case 2:
-    s.tmp_1 = blockSettings_exists__P188973_mk(s);
+    s.tmp_1 = blockSettings_exists__P3756_mk(s);
     s.tmp_1.arg0 = "shark_count";
-    s.callLocIdx = 220; s.pc = 86; return s.tmp_1;
-  case 86:
+    s.callLocIdx = 219; s.pc = 90; return s.tmp_1;
+  case 90:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = blockSettings_readNumber__P188967_mk(s);
+    s.tmp_2 = blockSettings_readNumber__P3750_mk(s);
     s.tmp_2.arg0 = "shark_count";
-    s.callLocIdx = 221; s.pc = 87; return s.tmp_2;
-  case 87:
+    s.callLocIdx = 220; s.pc = 91; return s.tmp_2;
+  case 91:
     r0 = s.retval;
-    globals.user_shark_count___427011 = (r0);
+    globals.user_shark_count___88942 = (r0);
     { step = 4; continue; }
   case 3:
-    globals.user_shark_count___427011 = (31);
+    globals.user_shark_count___88942 = (31);
   case 4:
-    globals.in_game___426863 = (false);
-    globals.player_made_it___426897 = (false);
-    globals.last_15___426836 = (false);
-    globals.in_menu___427320 = (true);
+    globals.in_game___88803 = (false);
+    globals.player_made_it___88837 = (false);
+    globals.last_15___88776 = (false);
+    globals.in_menu___89253 = (true);
     r0 = pxsim_Array__mk();
-    globals.paths___426761 = (r0);
-    globals.loading___426789 = (-1);
+    globals.paths___88701 = (r0);
+    globals.loading___88729 = (-1);
     r0 = pxsim_String_.mkEmpty();
-    globals.message___426820 = (r0);
-    s.tmp_0 = scene_setBackgroundColor__P187674_mk(s);
+    globals.message___88760 = (r0);
+    s.tmp_0 = scene_setBackgroundColor__P2457_mk(s);
     s.tmp_0.arg0 = 9;
-    s.callLocIdx = 222; s.pc = 88; return s.tmp_0;
-  case 88:
+    s.callLocIdx = 221; s.pc = 92; return s.tmp_0;
+  case 92:
     r0 = s.retval;
-    s.tmp_0 = scene_setBackgroundImage__P187676_mk(s);
-    r0 = pxsim.image.ofBuffer(_hex427330);
+    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
+    r0 = pxsim.image.ofBuffer(_hex89263);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 223; s.pc = 89; return s.tmp_0;
-  case 89:
+    s.callLocIdx = 222; s.pc = 93; return s.tmp_0;
+  case 93:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___189149);
-    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___188423);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___188265);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___188267);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___188266);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___189151);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___189152);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___189153);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___189157);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___189158);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___189160);
-    s.tmp_1 = tiles_setTilemap__P187558_mk(s);
-    s.tmp_2 = tiles_createTilemap__P187557_mk(s);
-    s.tmp_2.arg0 = _hex427334;
-    r0 = pxsim.image.ofBuffer(_hex427336);
+    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___3933);
+    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___3206);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___3048);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___3050);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___3049);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___3935);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___3936);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___3937);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___3941);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___3942);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___3944);
+    s.tmp_1 = tiles_setTilemap__P2341_mk(s);
+    s.tmp_2 = tiles_createTilemap__P2340_mk(s);
+    s.tmp_2.arg0 = _hex89267;
+    r0 = pxsim.image.ofBuffer(_hex89269);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = s.tmp_0;
     s.tmp_2.arg3 = 4;
-    s.callLocIdx = 224; s.pc = 91; return s.tmp_2;
-  case 91:
+    s.callLocIdx = 223; s.pc = 95; return s.tmp_2;
+  case 95:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 225; s.pc = 90; return s.tmp_1;
-  case 90:
+    s.callLocIdx = 224; s.pc = 94; return s.tmp_1;
+  case 94:
     r0 = s.retval;
-    s.tmp_0 = fade_out__P426843_mk(s);
-    s.callLocIdx = 226; s.pc = 92; return s.tmp_0;
-  case 92:
+    s.tmp_0 = fade_out__P88783_mk(s);
+    s.callLocIdx = 225; s.pc = 96; return s.tmp_0;
+  case 96:
     r0 = s.retval;
   case 5:
-    r0 = pxsim_numops_toBoolDecr(globals.in_menu___427320);
-    if (!r0) { step = 24; continue; }
-    s.tmp_0 = blockMenu_setColors__P188900_mk(s);
+    r0 = pxsim_numops_toBoolDecr(globals.in_menu___89253);
+    if (!r0) { step = 28; continue; }
+    s.tmp_0 = blockMenu_setColors__P3683_mk(s);
     s.tmp_0.arg0 = 9;
     s.tmp_0.arg1 = 8;
-    s.callLocIdx = 227; s.pc = 93; return s.tmp_0;
-  case 93:
+    s.callLocIdx = 226; s.pc = 97; return s.tmp_0;
+  case 97:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
@@ -1436,145 +1436,145 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_0, "Set fish count");
     r0 = pxsim_Array__push(s.tmp_0, "Set shark count");
     r0 = pxsim_Array__push(s.tmp_0, "Default options");
-    s.tmp_1 = blockMenu_showMenu__P188898_mk(s);
+    s.tmp_1 = blockMenu_showMenu__P3681_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 1;
     s.tmp_1.arg2 = 4;
-    s.callLocIdx = 228; s.pc = 94; return s.tmp_1;
-  case 94:
+    s.callLocIdx = 227; s.pc = 98; return s.tmp_1;
+  case 98:
     r0 = s.retval;
-    s.tmp_0 = wait_for_select_and_close__P426848_mk(s);
-    s.callLocIdx = 229; s.pc = 95; return s.tmp_0;
-  case 95:
+    s.tmp_0 = wait_for_select_and_close__P88788_mk(s);
+    s.callLocIdx = 228; s.pc = 99; return s.tmp_0;
+  case 99:
     r0 = s.retval;
-    s.tmp_2 = blockMenu_selectedMenuIndex__P188902_mk(s);
-    s.callLocIdx = 230; s.pc = 96; return s.tmp_2;
-  case 96:
+    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
+    s.callLocIdx = 229; s.pc = 100; return s.tmp_2;
+  case 100:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_3 = game_showLongText__P187738_mk(s);
-    if ((globals.user_fish_count___427054) && (globals.user_fish_count___427054).vtable) {
-    setupResume(s, 98);
-    pxsim_String__stringConv(globals.user_fish_count___427054);
+    s.tmp_3 = game_showLongText__P2521_mk(s);
+    if ((globals.user_fish_count___88985) && (globals.user_fish_count___88985).vtable) {
+    setupResume(s, 102);
+    pxsim_String__stringConv(globals.user_fish_count___88985);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_fish_count___427054) + ""; }
-  case 98:
+    } else { s.retval = (globals.user_fish_count___88985) + ""; }
+  case 102:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = pxsim_String__concat("Selected options:\\n", s.tmp_10);
     s.tmp_9 = r0;
     if ((s.tmp_9) && (s.tmp_9).vtable) {
-    setupResume(s, 99);
+    setupResume(s, 103);
     pxsim_String__stringConv(s.tmp_9);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_9) + ""; }
-  case 99:
+  case 103:
     r0 = s.retval;
     s.tmp_8 = r0;
     r0 = pxsim_String__concat(s.tmp_8, " fish\\n");
     s.tmp_7 = r0;
     if ((s.tmp_7) && (s.tmp_7).vtable) {
-    setupResume(s, 100);
+    setupResume(s, 104);
     pxsim_String__stringConv(s.tmp_7);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_7) + ""; }
-  case 100:
+  case 104:
     r0 = s.retval;
     s.tmp_6 = r0;
-    if ((globals.user_shark_count___427011) && (globals.user_shark_count___427011).vtable) {
-    setupResume(s, 101);
-    pxsim_String__stringConv(globals.user_shark_count___427011);
+    if ((globals.user_shark_count___88942) && (globals.user_shark_count___88942).vtable) {
+    setupResume(s, 105);
+    pxsim_String__stringConv(globals.user_shark_count___88942);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_shark_count___427011) + ""; }
-  case 101:
+    } else { s.retval = (globals.user_shark_count___88942) + ""; }
+  case 105:
     r0 = s.retval;
     s.tmp_11 = r0;
     r0 = pxsim_String__concat(s.tmp_6, s.tmp_11);
     s.tmp_5 = r0;
     if ((s.tmp_5) && (s.tmp_5).vtable) {
-    setupResume(s, 102);
+    setupResume(s, 106);
     pxsim_String__stringConv(s.tmp_5);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_5) + ""; }
-  case 102:
+  case 106:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_4, " shark(s)\\n");
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 0;
-    s.callLocIdx = 231; s.pc = 97; return s.tmp_3;
-  case 97:
+    s.callLocIdx = 230; s.pc = 101; return s.tmp_3;
+  case 101:
     r0 = s.retval;
-    s.tmp_1 = game_ask__P187799_mk(s);
+    s.tmp_1 = game_ask__P2582_mk(s);
     s.tmp_1.arg0 = "Continue with these";
     s.tmp_1.arg1 = "options?";
-    s.callLocIdx = 232; s.pc = 103; return s.tmp_1;
-  case 103:
+    s.callLocIdx = 231; s.pc = 107; return s.tmp_1;
+  case 107:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    globals.in_menu___427320 = (false);
+    globals.in_menu___89253 = (false);
   case 6:
   case 7:
-    { step = 23; continue; }
+    { step = 27; continue; }
   case 8:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P188902_mk(s);
-    s.callLocIdx = 233; s.pc = 104; return s.tmp_2;
-  case 104:
+    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
+    s.callLocIdx = 232; s.pc = 108; return s.tmp_2;
+  case 108:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_3 = game_showLongText__P187738_mk(s);
+    s.tmp_3 = game_showLongText__P2521_mk(s);
     s.tmp_3.arg0 = "Hello there! Welcome to Fishy Fishy Cross My Ocean!";
     s.tmp_3.arg1 = 0;
-    s.callLocIdx = 234; s.pc = 105; return s.tmp_3;
-  case 105:
+    s.callLocIdx = 233; s.pc = 109; return s.tmp_3;
+  case 109:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P187738_mk(s);
+    s.tmp_0 = game_showLongText__P2521_mk(s);
     r0 = pxsim_String__concat("In this game, all you have to do is guide your fish ", "(Using the arrow keys or W, A, S, and D - If you figured ");
     s.tmp_6 = r0;
     if ((s.tmp_6) && (s.tmp_6).vtable) {
-    setupResume(s, 107);
+    setupResume(s, 111);
     pxsim_String__stringConv(s.tmp_6);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_6) + ""; }
-  case 107:
+  case 111:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = pxsim_String__concat(s.tmp_5, "out how to run this on hardware whilst also being playable ");
     s.tmp_4 = r0;
     if ((s.tmp_4) && (s.tmp_4).vtable) {
-    setupResume(s, 108);
+    setupResume(s, 112);
     pxsim_String__stringConv(s.tmp_4);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_4) + ""; }
-  case 108:
+  case 112:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_String__concat(s.tmp_3, "please tell me) to the other end! Simple, right?");
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
-    setupResume(s, 109);
+    setupResume(s, 113);
     pxsim_String__stringConv(s.tmp_2);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_2) + ""; }
-  case 109:
+  case 113:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String_.mkEmpty();
@@ -1582,30 +1582,30 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_7);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 235; s.pc = 106; return s.tmp_0;
-  case 106:
+    s.callLocIdx = 234; s.pc = 110; return s.tmp_0;
+  case 110:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P187738_mk(s);
+    s.tmp_0 = game_showLongText__P2521_mk(s);
     r0 = pxsim_String__concat("Unfortunately for you, no.\\n", "There will be some sharks patrolling the waters. And they ");
     s.tmp_6 = r0;
     if ((s.tmp_6) && (s.tmp_6).vtable) {
-    setupResume(s, 111);
+    setupResume(s, 115);
     pxsim_String__stringConv(s.tmp_6);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_6) + ""; }
-  case 111:
+  case 115:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = pxsim_String__concat(s.tmp_5, "are hungry! (As you can see in figure A. - the picture above)");
     s.tmp_4 = r0;
     if ((s.tmp_4) && (s.tmp_4).vtable) {
-    setupResume(s, 112);
+    setupResume(s, 116);
     pxsim_String__stringConv(s.tmp_4);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_4) + ""; }
-  case 112:
+  case 116:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_String_.mkEmpty();
@@ -1613,12 +1613,12 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_7);
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
-    setupResume(s, 113);
+    setupResume(s, 117);
     pxsim_String__stringConv(s.tmp_2);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_2) + ""; }
-  case 113:
+  case 117:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String_.mkEmpty();
@@ -1626,334 +1626,362 @@ switch (step) {
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_8);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 236; s.pc = 110; return s.tmp_0;
-  case 110:
+    s.callLocIdx = 235; s.pc = 114; return s.tmp_0;
+  case 114:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P187738_mk(s);
+    s.tmp_0 = game_showLongText__P2521_mk(s);
     r0 = pxsim_String__concat("Just try to swim around them. You might have to sacrifice a couple ", "AI fish to get around them, because in this game, the sharks are ");
     s.tmp_6 = r0;
     if ((s.tmp_6) && (s.tmp_6).vtable) {
-    setupResume(s, 115);
+    setupResume(s, 119);
     pxsim_String__stringConv(s.tmp_6);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_6) + ""; }
-  case 115:
+  case 119:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = pxsim_String__concat(s.tmp_5, "pretty dumb. They go for the nearest fish. That's what their ");
     s.tmp_4 = r0;
     if ((s.tmp_4) && (s.tmp_4).vtable) {
-    setupResume(s, 116);
+    setupResume(s, 120);
     pxsim_String__stringConv(s.tmp_4);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_4) + ""; }
-  case 116:
+  case 120:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_String__concat(s.tmp_3, "two brain cells do in this game. (And eat them) Just don't do ");
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
-    setupResume(s, 117);
+    setupResume(s, 121);
     pxsim_String__stringConv(s.tmp_2);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_2) + ""; }
-  case 117:
+  case 121:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, "this in real life, and you'll be fine.");
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 237; s.pc = 114; return s.tmp_0;
-  case 114:
+    s.callLocIdx = 236; s.pc = 118; return s.tmp_0;
+  case 118:
     r0 = s.retval;
-    s.tmp_0 = game_showLongText__P187738_mk(s);
+    s.tmp_0 = game_showLongText__P2521_mk(s);
     s.tmp_0.arg0 = "Good luck, and hope you don't become a shark's breakfast!";
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 238; s.pc = 118; return s.tmp_0;
-  case 118:
+    s.callLocIdx = 237; s.pc = 122; return s.tmp_0;
+  case 122:
     r0 = s.retval;
-    { step = 22; continue; }
+    { step = 26; continue; }
   case 9:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P188902_mk(s);
-    s.callLocIdx = 239; s.pc = 119; return s.tmp_2;
-  case 119:
+    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
+    s.callLocIdx = 238; s.pc = 123; return s.tmp_2;
+  case 123:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 14; continue; }
-    s.tmp_3 = game_askForNumber__P187790_mk(s);
+    if (!r0) { step = 16; continue; }
+    s.tmp_3 = game_askForNumber__P2573_mk(s);
     s.tmp_3.arg0 = "Please input the amount of fish you want:";
     s.tmp_3.arg1 = 2;
-    s.callLocIdx = 240; s.pc = 120; return s.tmp_3;
-  case 120:
+    s.callLocIdx = 239; s.pc = 124; return s.tmp_3;
+  case 124:
     r0 = s.retval;
-    globals.user_fish_count___427054 = (r0);
-    r0 = (globals.user_fish_count___427054 > 31);
+    globals.user_fish_count___88985 = (r0);
+    r0 = (globals.user_fish_count___88985 > 31);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.tmp_1 = game_showLongText__P187738_mk(s);
+    s.tmp_1 = game_showLongText__P2521_mk(s);
     s.tmp_1.arg0 = "31 is the maximum amount of fish! (Fish count is now 31)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 241; s.pc = 121; return s.tmp_1;
-  case 121:
+    s.callLocIdx = 240; s.pc = 125; return s.tmp_1;
+  case 125:
     r0 = s.retval;
-    globals.user_fish_count___427054 = (31);
-    { step = 13; continue; }
+    globals.user_fish_count___88985 = (31);
+    { step = 15; continue; }
   case 10:
-    r0 = (globals.user_fish_count___427054 < 1);
+    r0 = (globals.user_fish_count___88985 < 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = game_showLongText__P187738_mk(s);
+    s.tmp_1 = game_showLongText__P2521_mk(s);
     s.tmp_1.arg0 = "1 is the minimum amount of fish! (Fish count is now 1)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 242; s.pc = 122; return s.tmp_1;
-  case 122:
+    s.callLocIdx = 241; s.pc = 126; return s.tmp_1;
+  case 126:
     r0 = s.retval;
-    globals.user_fish_count___427054 = (1);
-    { step = 12; continue; }
+    globals.user_fish_count___88985 = (1);
+    { step = 14; continue; }
   case 11:
-    s.tmp_0 = game_showLongText__P187738_mk(s);
-    if ((globals.user_fish_count___427054) && (globals.user_fish_count___427054).vtable) {
-    setupResume(s, 124);
-    pxsim_String__stringConv(globals.user_fish_count___427054);
+    r0 = (globals.user_fish_count___88985 != globals.user_fish_count___88985);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 12; continue; }
+    s.tmp_1 = game_showLongText__P2521_mk(s);
+    s.tmp_1.arg0 = "That's not a number! (Fish count is now 31)";
+    s.tmp_1.arg1 = 0;
+    s.callLocIdx = 242; s.pc = 127; return s.tmp_1;
+  case 127:
+    r0 = s.retval;
+    globals.user_fish_count___88985 = (31);
+    { step = 13; continue; }
+  case 12:
+    s.tmp_0 = game_showLongText__P2521_mk(s);
+    if ((globals.user_fish_count___88985) && (globals.user_fish_count___88985).vtable) {
+    setupResume(s, 129);
+    pxsim_String__stringConv(globals.user_fish_count___88985);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_fish_count___427054) + ""; }
-  case 124:
+    } else { s.retval = (globals.user_fish_count___88985) + ""; }
+  case 129:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_String__concat("Fish count is now ", s.tmp_3);
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
-    setupResume(s, 125);
+    setupResume(s, 130);
     pxsim_String__stringConv(s.tmp_2);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_2) + ""; }
-  case 125:
+  case 130:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, "!");
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 243; s.pc = 123; return s.tmp_0;
-  case 123:
+    s.callLocIdx = 243; s.pc = 128; return s.tmp_0;
+  case 128:
     r0 = s.retval;
-  case 12:
   case 13:
-    { step = 21; continue; }
   case 14:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P188902_mk(s);
-    s.callLocIdx = 244; s.pc = 126; return s.tmp_2;
-  case 126:
+  case 15:
+    { step = 25; continue; }
+  case 16:
+    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
+    s.callLocIdx = 244; s.pc = 131; return s.tmp_2;
+  case 131:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 3);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 17; continue; }
-    s.tmp_3 = game_askForNumber__P187790_mk(s);
+    if (!r0) { step = 21; continue; }
+    s.tmp_3 = game_askForNumber__P2573_mk(s);
     s.tmp_3.arg0 = "Please input the amount of sharks you want:";
     s.tmp_3.arg1 = 1;
-    s.callLocIdx = 245; s.pc = 127; return s.tmp_3;
-  case 127:
+    s.callLocIdx = 245; s.pc = 132; return s.tmp_3;
+  case 132:
     r0 = s.retval;
-    globals.user_shark_count___427011 = (r0);
-    r0 = (globals.user_shark_count___427011 < 1);
+    globals.user_shark_count___88942 = (r0);
+    r0 = (globals.user_shark_count___88942 < 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 15; continue; }
-    s.tmp_1 = game_showLongText__P187738_mk(s);
+    if (!r0) { step = 17; continue; }
+    s.tmp_1 = game_showLongText__P2521_mk(s);
     s.tmp_1.arg0 = "1 is the minimum amount of sharks! (Shark count is now 1)";
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 246; s.pc = 128; return s.tmp_1;
-  case 128:
+    s.callLocIdx = 246; s.pc = 133; return s.tmp_1;
+  case 133:
     r0 = s.retval;
-    globals.user_shark_count___427011 = (1);
-    { step = 16; continue; }
-  case 15:
-    s.tmp_0 = game_showLongText__P187738_mk(s);
-    if ((globals.user_shark_count___427011) && (globals.user_shark_count___427011).vtable) {
-    setupResume(s, 130);
-    pxsim_String__stringConv(globals.user_shark_count___427011);
+    globals.user_shark_count___88942 = (1);
+    { step = 20; continue; }
+  case 17:
+    r0 = (globals.user_shark_count___88942 != globals.user_shark_count___88942);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 18; continue; }
+    s.tmp_1 = game_showLongText__P2521_mk(s);
+    s.tmp_1.arg0 = "That's not a number! (Shark count is now 2)";
+    s.tmp_1.arg1 = 0;
+    s.callLocIdx = 247; s.pc = 134; return s.tmp_1;
+  case 134:
+    r0 = s.retval;
+    globals.user_shark_count___88942 = (2);
+    { step = 19; continue; }
+  case 18:
+    s.tmp_0 = game_showLongText__P2521_mk(s);
+    if ((globals.user_shark_count___88942) && (globals.user_shark_count___88942).vtable) {
+    setupResume(s, 136);
+    pxsim_String__stringConv(globals.user_shark_count___88942);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_shark_count___427011) + ""; }
-  case 130:
+    } else { s.retval = (globals.user_shark_count___88942) + ""; }
+  case 136:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_String__concat("Shark count is now ", s.tmp_3);
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
-    setupResume(s, 131);
+    setupResume(s, 137);
     pxsim_String__stringConv(s.tmp_2);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_2) + ""; }
-  case 131:
+  case 137:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, "!");
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 247; s.pc = 129; return s.tmp_0;
-  case 129:
+    s.callLocIdx = 248; s.pc = 135; return s.tmp_0;
+  case 135:
     r0 = s.retval;
-  case 16:
-    { step = 20; continue; }
-  case 17:
-    s.tmp_2 = blockMenu_selectedMenuIndex__P188902_mk(s);
-    s.callLocIdx = 248; s.pc = 132; return s.tmp_2;
-  case 132:
+  case 19:
+  case 20:
+    { step = 24; continue; }
+  case 21:
+    s.tmp_2 = blockMenu_selectedMenuIndex__P3685_mk(s);
+    s.callLocIdx = 249; s.pc = 138; return s.tmp_2;
+  case 138:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 4);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 18; continue; }
-    s.tmp_3 = game_showLongText__P187738_mk(s);
+    if (!r0) { step = 22; continue; }
+    s.tmp_3 = game_showLongText__P2521_mk(s);
     s.tmp_3.arg0 = "Default options set!";
     s.tmp_3.arg1 = 0;
-    s.callLocIdx = 249; s.pc = 133; return s.tmp_3;
-  case 133:
+    s.callLocIdx = 250; s.pc = 139; return s.tmp_3;
+  case 139:
     r0 = s.retval;
-    globals.user_fish_count___427054 = (31);
-    globals.user_shark_count___427011 = (2);
-  case 18:
-  case 19:
-  case 20:
-  case 21:
+    globals.user_fish_count___88985 = (31);
+    globals.user_shark_count___88942 = (2);
   case 22:
   case 23:
-    { step = 5; continue; }
   case 24:
-    s.tmp_0 = fade_in__P426899_mk(s);
-    s.callLocIdx = 250; s.pc = 134; return s.tmp_0;
-  case 134:
+  case 25:
+  case 26:
+  case 27:
+    { step = 5; continue; }
+  case 28:
+    s.tmp_0 = fade_in__P88839_mk(s);
+    s.callLocIdx = 251; s.pc = 140; return s.tmp_0;
+  case 140:
     r0 = s.retval;
-    s.tmp_0 = scene_setBackgroundImage__P187676_mk(s);
-    r0 = pxsim.image.ofBuffer(_hex427504);
+    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
+    r0 = pxsim.image.ofBuffer(_hex89449);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 251; s.pc = 135; return s.tmp_0;
-  case 135:
+    s.callLocIdx = 252; s.pc = 141; return s.tmp_0;
+  case 141:
     r0 = s.retval;
-    globals.loading___426789 = (0);
-    s.tmp_0 = blockSettings_writeNumber__P188966_mk(s);
+    globals.loading___88729 = (0);
+    s.tmp_0 = blockSettings_writeNumber__P3749_mk(s);
     s.tmp_0.arg0 = "fish_count";
-    s.tmp_0.arg1 = globals.user_fish_count___427054;
-    s.callLocIdx = 252; s.pc = 136; return s.tmp_0;
-  case 136:
+    s.tmp_0.arg1 = globals.user_fish_count___88985;
+    s.callLocIdx = 253; s.pc = 142; return s.tmp_0;
+  case 142:
     r0 = s.retval;
-    s.tmp_0 = blockSettings_writeNumber__P188966_mk(s);
+    s.tmp_0 = blockSettings_writeNumber__P3749_mk(s);
     s.tmp_0.arg0 = "shark_count";
-    s.tmp_0.arg1 = globals.user_shark_count___427011;
-    s.callLocIdx = 253; s.pc = 137; return s.tmp_0;
-  case 137:
+    s.tmp_0.arg1 = globals.user_shark_count___88942;
+    s.callLocIdx = 254; s.pc = 143; return s.tmp_0;
+  case 143:
     r0 = s.retval;
-    s.tmp_0 = fade_out__P426843_mk(s);
-    s.callLocIdx = 254; s.pc = 138; return s.tmp_0;
-  case 138:
+    s.tmp_0 = fade_out__P88783_mk(s);
+    s.callLocIdx = 255; s.pc = 144; return s.tmp_0;
+  case 144:
     r0 = s.retval;
-    s.tmp_0 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 255; s.pc = 139; return s.tmp_0;
-  case 139:
+    s.tmp_0 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 256; s.pc = 145; return s.tmp_0;
+  case 145:
     r0 = s.retval;
-    globals.loading_start_time___427512 = (r0);
-    s.tmp_0 = initilize_map__P426972_mk(s);
-    s.callLocIdx = 256; s.pc = 140; return s.tmp_0;
-  case 140:
+    globals.loading_start_time___89457 = (r0);
+    s.tmp_0 = initilize_map__P88903_mk(s);
+    s.callLocIdx = 257; s.pc = 146; return s.tmp_0;
+  case 146:
     r0 = s.retval;
-    s.tmp_6 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 257; s.pc = 141; return s.tmp_6;
-  case 141:
+    s.tmp_6 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 258; s.pc = 147; return s.tmp_6;
+  case 147:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - globals.loading_start_time___427512);
+    r0 = (s.tmp_5 - globals.loading_start_time___89457);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 / 1000);
     s.tmp_3 = r0;
     if ((s.tmp_3) && (s.tmp_3).vtable) {
-    setupResume(s, 142);
+    setupResume(s, 148);
     pxsim_String__stringConv(s.tmp_3);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_3) + ""; }
-  case 142:
+  case 148:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_String__concat("Took ", s.tmp_2);
     s.tmp_1 = r0;
     if ((s.tmp_1) && (s.tmp_1).vtable) {
-    setupResume(s, 143);
+    setupResume(s, 149);
     pxsim_String__stringConv(s.tmp_1);
     checkResumeConsumed();
     return;
     } else { s.retval = (s.tmp_1) + ""; }
-  case 143:
+  case 149:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, " seconds");
-    globals.message___426820 = (r0);
-    s.tmp_0 = fade_in__P426899_mk(s);
-    s.callLocIdx = 258; s.pc = 144; return s.tmp_0;
-  case 144:
+    globals.message___88760 = (r0);
+    s.tmp_0 = fade_in__P88839_mk(s);
+    s.callLocIdx = 259; s.pc = 150; return s.tmp_0;
+  case 150:
     r0 = s.retval;
-    globals.loading___426789 = (-1);
-    s.tmp_0 = create_minimap__P427228_mk(s);
-    s.callLocIdx = 259; s.pc = 145; return s.tmp_0;
-  case 145:
+    globals.loading___88729 = (-1);
+    s.tmp_0 = create_minimap__P89159_mk(s);
+    s.callLocIdx = 260; s.pc = 151; return s.tmp_0;
+  case 151:
     r0 = s.retval;
-    s.tmp_0 = start_game__P426970_mk(s);
-    s.callLocIdx = 260; s.pc = 146; return s.tmp_0;
-  case 146:
+    s.tmp_0 = start_game__P88901_mk(s);
+    s.callLocIdx = 261; s.pc = 152; return s.tmp_0;
+  case 152:
     r0 = s.retval;
-    s.tmp_0 = fade_out__P426843_mk(s);
-    s.callLocIdx = 261; s.pc = 147; return s.tmp_0;
-  case 147:
+    s.tmp_0 = fade_out__P88783_mk(s);
+    s.callLocIdx = 262; s.pc = 153; return s.tmp_0;
+  case 153:
     r0 = s.retval;
-    s.tmp_0 = forever__P187064_mk(s);
-    s.tmp_0.arg0 = inline__P427538;
-    s.callLocIdx = 267; s.pc = 148; return s.tmp_0;
-  case 148:
+    s.tmp_0 = forever__P1847_mk(s);
+    s.tmp_0.arg0 = inline__P89483;
+    s.callLocIdx = 268; s.pc = 154; return s.tmp_0;
+  case 154:
     r0 = s.retval;
-    s.tmp_0 = forever__P187064_mk(s);
-    s.tmp_0.arg0 = inline__P427550;
-    s.callLocIdx = 270; s.pc = 149; return s.tmp_0;
-  case 149:
+    s.tmp_0 = forever__P1847_mk(s);
+    s.tmp_0.arg0 = inline__P89495;
+    s.callLocIdx = 271; s.pc = 155; return s.tmp_0;
+  case 155:
     r0 = s.retval;
-    s.tmp_0 = forever__P187064_mk(s);
-    s.tmp_0.arg0 = inline__P427555;
-    s.callLocIdx = 276; s.pc = 150; return s.tmp_0;
-  case 150:
+    s.tmp_0 = forever__P1847_mk(s);
+    s.tmp_0.arg0 = inline__P89500;
+    s.callLocIdx = 277; s.pc = 156; return s.tmp_0;
+  case 156:
     r0 = s.retval;
-    s.tmp_0 = forever__P187064_mk(s);
-    s.tmp_0.arg0 = inline__P427566;
-    s.callLocIdx = 289; s.pc = 151; return s.tmp_0;
-  case 151:
+    s.tmp_0 = forever__P1847_mk(s);
+    s.tmp_0.arg0 = inline__P89511;
+    s.callLocIdx = 296; s.pc = 157; return s.tmp_0;
+  case 157:
     r0 = s.retval;
-    s.tmp_0 = forever__P187064_mk(s);
-    s.tmp_0.arg0 = inline__P427631;
-    s.callLocIdx = 308; s.pc = 152; return s.tmp_0;
-  case 152:
+    s.tmp_0 = forever__P1847_mk(s);
+    s.tmp_0.arg0 = inline__P89564;
+    s.callLocIdx = 309; s.pc = 158; return s.tmp_0;
+  case 158:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P427962.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/Timers/main.ts","functionName":"<main>","argumentNames":[]}
-_main___P427962.continuations = [ 98,99,100,101,102,107,108,109,111,112,113,115,116,117,124,125,130,131,142,143 ]
+_main___P90087.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"pxt_modules/Timers/main.ts","functionName":"<main>","argumentNames":[]}
+_main___P90087.continuations = [ 102,103,104,105,106,111,112,113,115,116,117,119,120,121,129,130,136,137,148,149 ]
 
-function _main___P427962_mk(s) {
+function _main___P90087_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P427962, depth: s.depth + 1,
+        parent: s, fn: _main___P90087, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -1969,57 +1997,57 @@ function _main___P427962_mk(s) {
   tmp_11: undefined,
 } }
 
-const _hex189274 = pxsim.BufferMethods.createBufferFromHex("1f00210023002500270029002c002e003100340037003a003e004100450049004e00520057005c00620068006e0075007b0083008b0093009c00a500af00b900c400d000dc00e900f70006011501260137014a015d01720188019f01b801d201ee010b022a024b026e029302ba02e40210033f037003a403dc03170455049704dd0427057505c80520067d06e0064907b8072d08a9082d09b9094d0aea0a900b400cfa0cc00d910e6f0f5a1053115b1272139a14d41520178018f519801b231dde1e")
-const _hex193923 = pxsim.BufferMethods.createBufferFromHex("2000000000000000210000005e0000002200000e000e0000230028fe28fe280024004c92ff926400250002651248a64026006c92926ca000270000000e000000280000007c82000029000000827c00002a005438103854002b0010107c1010002c000000907000002d001010101010002e000000606000002f000060100806003000003c42423c00310000447e4000003200004462524c00330000424a4e320034003028247e20003500004e4a4a32003600003c4a4a30003700000262120e00380000344a4a34003900000c52523c003a0000006c6c00003b000000967600003c001028284444003d002828282828003e004444282810003f0000025909060040003c425a560800410078141214780042007e4a4a4a34004300003c424224004400007e42423c004500007e4a4a42004600007e0a0a02004700003c425234004800007e08087e00490000427e4200004a002040423e02004b00007e081462004c00007e404040004d007e0418047e004e00007e04087e004f003c4242423c005000007e12120c005100003c5262bc005200007e12126c00530000244a522400540002027e0202005500003e40403e005600001e70701e0057007e2018207e00580042241824420059000608700806005a000062524a46005b00007e424200005c000006081060005d000042427e00005e000804020408005f00808080808000600000000204000061000030484878006200007e4848300063000030484848006400003048487e006500003068585000660000107c12040067000018a4a478006800007e08087000690000487a4000006a000040847d00006b00007e102840006c0000427e4000006d007808300870006e000078080870006f00003048483000700000fc24241800710000182424fc0072000078100810007300005058682800740000083e48200075000038404078007600001860601800770038403040380078000048303048007900005ca0a07c007a000048685848007b000008364100007c000000fe0000007d000041360800007e00000804080400a000000000000000a10000007a000000a200003048fc4800a30090fc92928400a400542844285400a5002a2c782c2a00a6000000ee000000a7000094aaaa5200a800000200020000a9003e414955413eaa0000242a2e0000ab00102854284400ac00001010107000ad00001010101000ae003e415d45413eaf00000202020200b000000814140800b1008888be888800b2000024322c0000b30000222a140000b400000004020000b50000f840207800b6000c1e7e027e00b700000010000000b800000080400000b90000243e200000ba0000242a240000bb00442854281000bc00025f70f84000bd00021f90c8b000be0011557af84000bf000030484d2000c000601916186000c100601816196000c200601a151a6000c300601a151a6100c400601914196000c500601a151a6000c6007c0a7e4a4200c700001ea1611200c800007c55564400c900007c56554400ca00007c56554600cb00007c55544500cc0000457e440000cd0000447e450000ce0000467d460000cf0000457c450000d000087e4a423c00d100007e09127d00d200003845463800d300003846453800d400003846453a00d500003a45463900d600003845443900d700442810284400d80000fc724e3f00d900003c41423c00da00003c42413c00db00003c42413e00dc00003c41403d00dd00040872090400de00007e24241800df00007c025a2400e0000030494a7800e10000304a497800e20000304a497a00e3000032494a7900e40000304a487a00e50000304a4d7a00e600304878685000e7000018a4642400e8000030695a5000e90000306a595000ea0000306a595200eb0000306a585200ec0000497a400000ed0000487a410000ee00004a79420000ef00004a78420000f00000304a4b3d00f100007a090a7100f2000030494a3000f30000304a493000f40000304a493200f5000032494a3100f60000304a483200f700101054101000f800007068583800f900003841427800fa00003842417800fb00003842417a00fc00003842407a00fd0000b84241f800fe0000ff24241800ff00005ca1a07d000001601915196000010100304a4a7a000201611a16196000030100314a4a790004013c0a094abc00050100182464bc000601003846452800070100304a4948000801003846452a00090100304a494a000a010038444528000b010030484a48000c010038454629000d010030494a49000e01007c454639000f0100314a497e001001087e4a423c00110130484c7e04001201007d55554500130100326a5a52001401007d56564500150100316a5a51001601007c55544400170100306a5850001801003f65a521001901001874ac28001a01007c555645001b010030695a51001c010038465536001d0100304a49f2001e010039465635001f0100314a4af100200100384455340021010018a4a578002201001ea1691a0023010018a6a578002401007812117a0025017e080a7102002601047e147e04002701047e0c08700028010002457e450029010002497a41002a0100457d4500002b01004a7a4200002c0100014a7a49002d0100014a7a41002e0100217fa100002f0100247da00000300100447d440000310100487840000032017e0022423e0033013d0040847d0034012040463d0600350100800af90200360100bf440a3100370100bf4814200038010078102848003901007c404241003a0100467d4000003b01003fa06020003c0100a17f2000003d01007c414241003e0100457e4100003f01007e40484000400100427e4008004101107e48404000420100527e4800004301007c0a117c00440100780a097000450100bf42043f00460100bc440438004701007c09127d00480100790a09700049010a06780870004a01003f02847f004b01003c048478004c013945454539004d0100324a4a32004e013946464639004f0100314a4a310050013a4544463900510132494832010052013c427e4a420053013048306850005401007c163548005501007812091000560100bf49093600570100bc480408005801007d1635480059010079120910005a010048565524005b0100505a6928005c010048565526005d0100505a692a005e010012a56912005f010028ac741400600100485556250061010050596a290062010101bf410100630100049f641000640104057e050400650100083d4a2100660102127e120200670100183e5820006801003a414239006901003a414279006a01003d41413d006b01003a42427a006c010039424239006d010039424279006e01003a45453a006f01003a45457a0070013a41403a010071013a41407a01007201001f60a01f007301001c60a03c00740178221122780075013842314238007601081261120800770100b84241fa00780104097009040079010064564d44007a0100486a5948007b010064544d44007c010048685a48007d010064554e45007e010048695a49007f0100087c0204008f01003452523c00920100887e090200a0013c42423c0806a101003048483008af01003e403e0806b001003840781008b501006a5a4a4e00b601005878585800d101003845463900d2010030494a3100e601003845563500e7010030494af100fa0100742a750000fb0100304c4a7d00fc0178147e554400fd0130487a695000fe010078744e3d00ff0100706a59380018020012a569120019020028ac7414001a020101bf4101001b0200049f641000bb0200000c0a0000bc0200000a060000bd020000060a0000c602000201020000c702000102010000c902000202020000d802000102020100d902000002000000da02000205020000db02000040800000dc02000201020100dd02020100020100740300000201000075030000804000007a030000c08000007e03000096760000840300000300000085030200030002008603037c12127c008703000010000000880303007e4a4200890303007e087e008a030300427e42008c03033c42423c008e0303000e700e008f03035c62625c00900302003b400200910378141214780092037e4a4a4a34009303007e0202020094036058465860009503007e4a4a420096030062524a46009703007e08087e0098033c4a4a4a3c00990300427e4200009a03007e081462009b036018061860009c037e0418047e009d03007e04087e009e0300424a4a42009f033c4242423c00a003007e02027e00a103007e12120c00a30300665a424200a40302027e020200a503060870080600a60318247e241800a703422418244200a8030e107e100e00a9035c6202625c00aa0300457c450000ab03040970090400ac030030484a7900ad030030685a5100ae0378100a09f000af03003a41200000b0033a4043403a00b103003048487800b20300fe25251a00b3030c30c0300c00b403344a4a4a3000b503003068585000b603021aa6a24200b7033c080404f800b803003c4a4a3c00b903003840200000ba03007820504800bb03641212227c00bc03fc2020103c00bd03182040201800be03112d2ba94100bf03003048483000c003087808780800c103f82424241800c2031824a4a44800c303304848582800c403000838482800c503384040403800c6031c20f8241800c703c4281028c400c8031c20fc201c00c903304820483000ca03000238422000cb03384240423800cc0330484a493000cd03384042413800ce03304822493000d0033c52525c2000d10310344a3c0800d203067804020400d303120a7c020400d4030d7009040800d5031824ff241800d603384828483800d70348302221d800da031c2221a14200db031824a4a44200dc037e1212020200dd0300fc24240400de033e2010087c00df030c0ac9281800e003700c621c7000e10301092516f800e2039ea0bea07e00e30398a0b8a07800e4030c1214107e00e503001028207800e603be9088887000e70348544e443800e803245252524c00e903285454544800ea0364524c526400eb03086458640800ec03385454542200ed03306848682400ee03184a7e4a1800ef031848ff0a0800f003483020205800f10378a4a4a49800f203304848485000f303006080847d00f4033c4a4a4a3c00f5030030585848000004007c555644000104007c55544500020401013f8579000304007c0605040004043c4a4a422400050400244a522400060400427e420000070400457c45000008042040423e020009047c027e4830000a047e087e4830000b0402027e0a72000c04007c102a45000d047c2112087c000e040c5152523d000f043f20e0203f00100478141214780011047e4a4a4a300012047e4a4a4a34001304007e020202001404c07c427ec0001504007e4a4a4200160476087e087600170424424a4a34001804007e08047e001904007d120a7d001a04007e081462001b04403c02027e001c047e0418047e001d04007e08087e001e043c4242423c001f047e0202027e002004007e12120c002104003c42422400220402027e02020023040e5050503e00240418247e241800250442241824420026043f2020bf600027040e1010107e0028047e407e407e0029043f203fa07f002a04027e484830002b047e4848307e002c04007e484830002d0424424a4a3c002e047e183c423c002f04006c12127e0030043048487840003104003c4a4a3100320400786850200033040078080808003404c0704878c000350430686850000036044830783048003704004058683000380478402010780039047942221279003a040078203048003b044030080878003c047810201078003d047810101078003e043048484830003f047808080878004004fc24242418004104304848485000420408087808080043041ca0a0a07c0044041824ff241800450400483030480046043c2020bc60004704182020207800480478407840780049043c203ca07c004a040878505020004b047850502078004c040078505020004d044858683000004e047830304830004f0450282878000050040030696a500051040032686a50005204023f0a887000530400780a09080054040030685848005504005058682800560400487a4000005704004a784200005804004080847d0059047008785020005a047810785020005b04047e141060005c040078223148005d047841221078005e0418a1a2a279005f043c20e0203c006204027f4a4830006304087e5850200070040e107e100e00710418207820180072043c4a4a4a3c0073043068586830007404001e70180c0075040018603010009004007e020203009104007808080c009204087e0a0a0200930420782808080096043b043f043be0970424183c1824c09a04003f040a31c09b04003c101824c0ae04060870080600af040c10e0100c00b004161870181600b1042c30e0302c00b20421120c1221c0b3040024181824c0ba047e0808087000bb04007e08087000d804003452523c00d904002868583000e20400457d450000e304004a7a420000e8043c4a4a4a3c00e904003058583000ee04003d41413d00ef04003a42427a00d005681020285000d105484848784000d205004830600000d305080808780800d405680808087800d505000008780000d605080818680800d705087808087800d805784050487800d905000008180000da0504040404fc00db05484848483800dc050e4848281800dd05087848487800de05582010487000df05000004fc0000e005004040487800e105000878483800e205487840281800e305041c0404fc00e405485848483800e50504f820140800e605485060685000e705f40424241c00e805080808087000e905785058403800ea05487808087800f005087800087800f105081800087800f205081800081800f305000010080000f405100800100800021e7c5455542800031e007e484930000a1e007c454438000b1e003049487e001e1e007c151404001f1e001079140800401e7e0419047e00411e780832087000561e007c15140800571e00fc25241800601e004854552400611e0050586a28006a1e04047d0404006b1e00083d482000801e7c2112207c00811e384132403800821e7c2012217c00831e384032413800841e7c2110217c00851e384230423800f21e040972080400f31e00b84142f800a3207e0a7a120a00a420a8fcaa828400a720087e2a1c0800ab200098a4a6bf02ac20183c5a5a4200af20627f224438009021103854101000912108047e0408009221101054381000932110207e201000942110381010381095212844fe442800")
-const _hex193921 = pxsim.BufferMethods.createBufferFromHex("20000000000000000000000000000000000000000000000000002100000000000006fc0000000000000000000000000000000000220000001c00000000001c0000000000000000000000000000002300a000f807a000f807a00000000000000000000000000000002400000018022404460c8803000000000000000000000000000025003802c4017800200390040803000000000000000000000000260080037804a4041803800340040000000000000000000000002700000000001c00000000000000000000000000000000000000280000000000f8010606010800000000000000000000000000002900000001080606f801000000000000000000000000000000002a00040014000e001400040000000000000000000000000000002b0040004000f8034000400000000000000000000000000000002c000000000000090006000000000000000000000000000000002d000000800080008000000000000000000000000000000000002e000000000000060000000000000000000000000000000000002f00000c800360001c000300000000000000000000000000000030000000f80304040404f80300000000000000000000000000003100000004040404fc07000400040000000000000000000000003200000008060405c4043804000000000000000000000000000033000000080244044404b803000000000000000000000000000034000000800170010801fc070001000000000000000000000000350000023c0424042404c403000000000000000000000000000036000000f0034804440488030000000000000000000000000000370000000400c40734000c00000000000000000000000000000038000000b80344044404b803000000000000000000000000000039000000780284048802f00100000000000000000000000000003a000000000030060000000000000000000000000000000000003b000000000018090006000000000000000000000000000000003c004000a000a000a000100100000000000000000000000000003d002001200120012001200100000000000000000000000000003e0000001001a000a000a00040000000000000000000000000003f000000080084066400180000000000000000000000000000004000f0030c04c20822092409f80900000000000000000000000041000007f8008400f8000007000000000000000000000000000042000000fc0744044404b803000000000000000000000000000043000000f001080204040404080200000000000000000000000044000000fc0704040802f001000000000000000000000000000045000000fc07440444044404000000000000000000000000000046000000fc07440044004400000000000000000000000000000047000000f00108024404c803000000000000000000000000000048000000fc0740004000fc070000000000000000000000000000490000000404fc070404040400000000000000000000000000004a000000000200040004fc0300000000000000000000000000004b000000fc074000f0000c0304040000000000000000000000004c000000fc0700040004000400000000000000000000000000004d000000fc0738007000fc0700000000000000000000000000004e000000fc073800c003fc0700000000000000000000000000004f000000f80304040404f803000000000000000000000000000050000000fc07840084004400780000000000000000000000000051000000fc0102020206fc09000000000000000000000000000052000000fc074400c4013806000000000000000000000000000053000000180224044404880300000000000000000000000000005400000004000400fc070400040000000000000000000000000055000000fc0300040004fc03000000000000000000000000000056000c00f0030004f0030c00000000000000000000000000000057007c008007e001f0010007fc0000000000000000000000000058000404b8034000b80304040000000000000000000000000000590004003800c00730000c0000000000000000000000000000005a0004040407e4041c04040400000000000000000000000000005b0000000000ff0f0108010800000000000000000000000000005c0003001c0060008003000c00000000000000000000000000005d00000001080108ff0f000000000000000000000000000000005e004000380004003800400000000000000000000000000000005f00000800080008000800080000000000000000000000000000600000000000020004000000000000000000000000000000000061000000200390049004e007000000000000000000000000000062000000fc0710041004e003000000000000000000000000000063000000c001200210043004000200000000000000000000000064000000e00310041004fc07000000000000000000000000000065000000e00390049004e0040000000000000000000000000000660000001000f80714001400000000000000000000000000000067000000b806440944093c09040600000000000000000000000068000000fc0710001000e0070000000000000000000000000000690000000000f4070000000000000000000000000000000000006a00000800080008fd07000000000000000000000000000000006b000000fe078000e001100610040000000000000000000000006c0000000000fc030004000400000000000000000000000000006d00f00710001000e0071000e0070000000000000000000000006e000000f00710001000e00700000000000000000000000000006f000000e00310041004e003000000000000000000000000000070000000fc0f04010401f800000000000000000000000000000071000000f80004010401fc0f000000000000000000000000000072000000f00720001000100000000000000000000000000000007300000060029004900420030000000000000000000000000000740000001000fc0310041004000000000000000000000000000075000000f00300040004f007000000000000000000000000000076003000c0030004c003300000000000000000000000000000007700f0000007e003c0010007f000000000000000000000000000780010046003800060031004000000000000000000000000000079000c0870088007f0000c0000000000000000000000000000007a000000000410079004700410040000000000000000000000007b0000004000be070108010800000000000000000000000000007c0000000000ff0f0000000000000000000000000000000000007d00000001080108be07400000000000000000000000000000007e00800040004000800080004000000000000000000000000000")
-const _hex206834 = pxsim.BufferMethods.createBufferFromHex("20000000000000002100001700000000220000030003000023000a1f0a1f0a0024000a17151d0a00250013090412190026000a15150a100027000003000000002800000e11000000290000110e0000002a00000a040a00002b0000040e0400002c000010080000002d000004040400002e000008000000002f0010080402010030000e11110e0000310000121f100000320019151512000033000911150b000034000c0a091f080035001715151509003600081416150800370011090503010038000a1515150a00390002150d0502003a00000a000000003b0000100a0000003c0000040a1100003d00000a0a0a00003e0000110a0400003f0002011505020040000e1115090e0041001e05051e000042001f15150a000043000e111111000044001f11110e000045001f151511000046001f050501000047000e1111150c0048001f04041f00004900111f110000004a000911110f01004b001f040a1100004c001f10101000004d001f0204021f004e001f0204081f004f000e11110e000050001f0505020000510006091916000052001f05050a10005300121515090000540001011f01010055000f10100f0000560007081008070057001f0804081f0058001b04041b0000590001021c0201005a001915131100005b00001f111100005c000102040810005d000011111f00005e000002010200005f00101010101000600000010200000061000c12121e100062001f141408000063000c121212000064000814141f000065000e15151200006600041e0501000067000215150f000068001f04041800006900001d000000006a000010100d00006b001f040a1000006c00000f101000006d001e0204021e006e001e02021c00006f000c12120c000070001e0a0a0400007100040a0a1e000072001c0202020000730010140a0200007400000f1414100075000e10101e1000760006081008060077001e1008101e007800120c0c12000079001214080402007a00121a161200007b0000041f1100007c00001f000000007d00111f040000007e00000404080800d3000c1213130c00f3000c12130d000004010e05051e100005010609191f080006010c121313120007010c121313000018010f0b1b19000019010e151d1a000041011f14121000004201100f1412000043011f0205081f0044011e03031c00005a0110140b0302005b0110140b0300007901121a171300007a01121a171300007b01121b171200007c01121b17120000")
-const _hex189337 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
-const _hex189838 = pxsim.BufferMethods.createBufferFromHex("8704240024000000001111111111111111111111111111111100000010313333333333333333333333333333130100001113111111111111111111111111111131110000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000111311111111111111111111111111113111000010313333333333333333333333333333130100000011111111111111111111111111111111000000")
-const _hex189840 = pxsim.BufferMethods.createBufferFromHex("8704240024000000002222222222222222222222222222222200000020323333333333333333333333333333230200002223222222222222222222222222222232220000322211111111111111111111111111112223000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003222111111111111111111111111111122230000222322222222222222222222222222223222000020323333333333333333333333333333230200000022222222222222222222222222222222000000")
-const _hex189842 = pxsim.BufferMethods.createBufferFromHex("8704240024000000004444444444444444444444444444444400000040343333333333333333333333333333430400004443444444444444444444444444444434440000344411111111111111111111111111114443000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003444111111111111111111111111111144430000444344444444444444444444444444443444000040343333333333333333333333333333430400000044444444444444444444444444444444000000")
-const _hex189844 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d00000000000000000000000070666607000000000000000000000000006776000000000000000000000000660700007066000000000000000000006766777766760000000000000000000060666666660600000000000000000066006766667600660000000000000000667600000000676600000000000000006766767777676676000000000000000060666666666666060000000000000000006766666666760000000000000000000000676666760000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex189846 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0bb000000000000000000000000b000404500b0000000000000000000005b0b000400540b0000000000000000b0550400000054b5000000000000000000440040bb0040040000000000000000000040d4ddbb0000000000000000000000004055ddbd000000000000000000004b005455d5dd0b400b000000000000005b045411d5dd0b540b000000000000004b005411d5dd0b400b0000000000000000004055ddbd00000000000000000000000040d4ddbb0000000000000000000000440040bb0040040000000000000000b0550400000054b50000000000000000005b04000400540b000000000000000000b000404500b0000000000000000000000000b0bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex189848 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020020000000000002002000000000000202200000000000022020000000000000022020000000020220000000000000000202200000000220200000000000000000022020000202200000000000000000000202200002202000000000000000000000022022022000000000000000000000000202222020000000000000000000000000022220000000000000000000000000000222200000000000000000000000000202222020000000000000000000000002202202200000000000000000000002022000022020000000000000000000022020000202200000000000000000020220000000022020000000000000000220200000000202200000000000000202200000000000022020000000000002002000000000000200200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex189850 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d0000000000000000000000007066660700000000000000000000000000677600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex189852 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0cbcc0c0000000000000000000000b0db55d5cd0c00000000000000000000db555555ddcd000000000000000000b055555555d59d0b0000000000000000db55555555d59db900000000000000005b55555555d5ddb900000000000000b05db5cccc5bdddd990b000000000000b055ccccccccdddd9d0b000000000000b0b5ccccccccdbdd9d0b000000000000b0c5ccccccccdcdd9d0b000000000000b0c5ccdccbccdcdd9d0c000000000000b0cdcc5b55ccdcdd9d0c00000000000000ccdc55b5ccdcddc90000000000000000cccc5b55ccdbddc90000000000000000c0ccdccbccdd9d0c000000000000000000ccccccdbddcd00000000000000000000c0dcddddcd0c0000000000000000000000c0cccc0c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex189854 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc00000000000000b0bbbbbbbbcb00c0cd000000000000001bddddddddbd0c1ccd000000000000b011cbccccccbc0c1ccd000000000000b01d6c666666bc0cbccd000000000000b01d6c616661bc0c1ccd000000000000b01d6c161666bccc1bcd000000000000b01d6c666166bcccbbcd000000000000b01d6c666666bccc1bcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666661bcccbbcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666666bc0c1ccd000000000000b01dcbccccccbc0cbccd000000000000c0b1bbbbbbbbbb0cdccb000000000000c0bbbbbbbbbbcb00dc0c00000000000000cccccccccc0c00cc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex189856 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004004000000000000000000000000000054450000000000000000000000440b00bbbb00b0440000000000000040550b00000000b0550400000000000040b5000044bb00005b04000000000000b00b0044ddddbb00b00b0000000000000000405d55d5dd0b00000000000000000000d4555555ddbd0000000000000000000054555555d5bd0000000000000000b44055555555d5dd0b4b000000000040b54055555555d5dd0b5b040000000040b54055555555d5dd0b5b040000000000b44055115555d5dd0b4b000000000000000054115555d5bd00000000000000000000d4555555ddbd00000000000000000000405d55d5dd0b0000000000000000b00b0044ddddbb00b00b00000000000040b5000044bb00005b0400000000000040550b00000000b0550400000000000000440b00bbbb00b0440000000000000000000000544500000000000000000000000000004004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex189858 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bbbb00000000000000000000000000b055bb00bbbbbb000000000000000000b0b5bdbcbbbbddcb0000000000000000b0dbcb5b5555bbdd0c00000000000000b0cbdcbdbb5b55dbcd0000000000000000c0dddb11d15bb5bd0c00000000000000bbbd111111b155bb0c00000000000000db1b111111115bb5cb00000000000000db1bb11d1199b9d5cb00000000000000db1b11bb9199b955cb000000000000005b1b11b19b99995bcb000000000000005b1d1111bb99995ccb00000000000000b0b511bbbb99995ccb00000000000000b0d51d919999d95b0b00000000000000005bdb919999c9d50b0000000000000000b0d51b99d9bcb5000000000000000000005bd5bbbc550b00000000000000000000b05b5555bd000000000000000000000000b0bbbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex190393 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
-const _hex190395 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
-const _hex190397 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
-const _hex190401 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
-const _hex190403 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
-const _hex190709 = pxsim.BufferMethods.createBufferFromHex("8704100010000000d3dd1ddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dd1d3d3dd3bdbbd3dddddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dddd3d3dd3bdbb")
-const _hex191039 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c689696999999998c689696999999998c886696999999998c866696999999998c866699999999998c666699999999998c686699999999998c689696999999998c689696999999998c669696999999998c669699999999998c866699999999998c866699999999998c886699999999998c889699999999998c68969999999999")
-const _hex191255 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
-const _hex191277 = pxsim.BufferMethods.createBufferFromHex("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex191494 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex191498 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999bbcccc99999999bbddddbbcc9999b9ddddddbdcb9999dbddbbddbdcb99b9dbbd33ddddbb99b9ddbd33ddddbb993cb33b33dbbdbb993c3333333b33bb99bc3d33333333bc99bcd3333333cbbb99bc3b3333c3bbbb99c9333333bcbbcb99c933d333bcbbcc993933cc3db3cbcc9999c9bb3bb3ddcb999999ccccdbddbd")
-const _hex191502 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999c9ddddbd99999999c9ddddbd99999999b9ddddbc9999999999dbcdbb9999999999ccbccb9999999999c9bccc999999999999cccc999999999999c9cc99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
-const _hex191506 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999c9cccc99999999ccbccccc999999ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb9dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb9ccccdcddcdcdcc9999ccccddcbcbcc999999c9cccccccc")
-const _hex191510 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999996688889988999969557777986898995667667687898688675777677699686676658877679989765588686688999969866666869999999999888898999999999999999999999999999999999999999999999999999999999999999999")
-const _hex191514 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999998888889999999988577577889999897777556677989978778888776687896688999988776689869999999968666898999999998988689899999999687788999999998977679999999999788668999999998987989999999999899899999999999999999999")
-const _hex191518 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988889999999999887777889999998966666677989999688688767687998966989968676799898899888867769999998988887666989999688888787786888886886886766866668886668888676866667887668876658868777686996757757766779899787566667787999989567577879899999969868898999999")
-const _hex191522 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988c8cccc99999988ccbccccc999989ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb8dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb8ccccdcddcdcdcc8956ccccddcbcbcc996986c8cccccccc")
-const _hex191526 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999889999999999999968989999999999998986999999999999996888999999896899896688888868779999886666767777999999886666668699999999888888989999999999999999999999999999999999999999999999999999999999999999")
-const _hex191530 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999898888999999996868666699999968778688889999897786686676996976666666888899566577868899996655768798999988776655969999887766556699998977667766999999786667669999998867679899999988688698999999999999999999999999999999999999999999999999999999999999999999")
-const _hex191534 = pxsim.BufferMethods.createBufferFromHex("87041000100000008888999999999999777786989999999968667787989999997767667786999999687767667798999988687766768799997766787766779899666686766776879987886668776677889899688878676677899689888877676689679988786677879978665567886686998977668866669899997857756688999999896866889999")
-const _hex191538 = pxsim.BufferMethods.createBufferFromHex("870410001000000088889999bbcccc99777786bbddddbbcc6866b7ddddddbdcb7767dbddbbddbdcb68b7dbbd33ddddbb88b8ddbd33ddddbb773cb33b33dbbdbb663c3333333b33bb87bc3d33333333bc08bcd3333333cbbb89bc3b3333c3bbbb89c7333333bcbbcb99c833d333bcbbcc993933cc3db3cbcc9999c8bb3bb3ddcb999989ccccdbddbd")
-const _hex191542 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff11111111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
-const _hex191546 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c68f6f61111ffff8c68f6f61111ffff8c8866f61111ffff8c8666f61111ffff8c866611ffff11118c666611ffff11118c686611ffff11118c681616ffff11118c68f6f61111ffff8c66f6f61111ffff8c66f6ff1111ffff8c8666ff1111ffff8c866611ffff11118c886611ffff11118c881611ffff11118c681611ffff1111")
-const _hex191550 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999889898888999989898989899999998999989998889999999999999999999989999989999999998988888988889999899999899999999999999999999999999988889999999999898999999999999999888899999999999999999999999999999999999999999999999999999999999999999999999999")
-const _hex191554 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
-const _hex191558 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff818888ff1111ffff81818fff1111ffff81818fff1111ffffffff1111ffff11118f888811ffff1111fff81111ffff1111ff8f1111ffff1111818888ff1111ffff1111ffff1111ffff818888ff1111ffff81118fff1111ffffff881811ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
-const _hex427330 = pxsim.BufferMethods.createBufferFromHex("8704a00078000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600666666666666660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868866666666868800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808800808800000000808800000000808800808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000660600000000660600666666666666660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868866666666868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868800000000868800000000868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868800000000868800000000868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800808866666600868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888086088888800868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888086088888800868800000000868800000000000000000000000000000000000000000000000000000000000000000000808800000000808800808888080088888800808800000000808800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666660600660600666666666666660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800868800868800868800000000868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868800868800868800000000868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868800868800868866666666868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868888888800868888888888888800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868888888800868888888888888800868800868800868800000000000000000000000000000000000000000000000000000000000000000000808800808888888800808888888888888800808800808800808800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600666666660600660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808888888888888800868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000000000666666868866660600868800868800868800868866868866660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808888888888888800808800808888888800808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666660600000000666666660600660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888800000000868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888800000000868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808888888866660600868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868800868800006088080000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868800868800006088080000000000000000000000000000000000000000000000000000000000000000000000000000666666868888888800868800868800868800000088686600000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000868800868888888800000000868800000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000868800868888888800000000868800000000000000000000000000000000000000000000000000000000000000000000000000808888888800000000808800808888888800666666868866660600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600666666666666660600666666660600660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888800868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888800868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800808888888888888800808888888800808800000000000000000000000000000000000000000000000000000000000000000000868800868800000000006088080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000006088080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000000088686600000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000000000868800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000000000868800000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000808800808800000000006066868800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006088080000000000808088000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006088080000000000808080000000000000000000000000000000000000000000000000000000000000000000000000000000660600000000660600666688686666660600808880000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800000080000000000000000000000000000000000000000000000000000000000000000000000000000000868866666666868800808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000808080000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800666666660600000000808088000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808800000000808800808888888866660600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666660600660600666666868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800808888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800868800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800868800000000000000000000cc000000ff00000000000000000000000000000000000000000000000000000000000000000000000000868800868800868800000000000000000000bc0c00fffb00000000000000000000000000000000000000000000000000000000000000000000000000868800868888888800000000000000000000bcccffbcfb00000000000000000000000000000000000000000000000000000000000000000000000000868800868888888800000000000000000000dccbccbb0f00000000000000000000000000000000000000000000000000000000000000000000000000808800808888888800000000000000000000dcbdccfb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0bdfb0f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0cccf000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600000000000000000000cfccbc0c00000000000000000000000000000000000000000000000000000000000000000000000000008688888888888888000000000000000000f0ccccbccd00000000000000000000000000000000000000000000000000000000000000000000000000008688888888888888000000000000000000cfccccccdd0c00000000000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000ff00cfccccccdd0c00000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000000000000000bfffccbbcbccddff00000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000000000000000bffbbbccbbccfdfb00000000000000000000000000000000000000000000000000000000000000000000000000666666868866660600000000000000bcbfcbbbbbcbbffb00000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000bcbfbbccbbbbbbfd00000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000c0bbcbbbbbbbdbfb00000000000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000f0bbbbbbbbbbbb0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0fbbfbb1bc1fc0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bffb1f111111110f00000000000000000000000000000000000000000000000000000000000000000000000000666666660600000000000000000000bf1bc1c3cc1c110c00000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000bf111c3333c1110c00000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000bf11cc333333110c00000000000000000000000000000000000000000000000000000000000000000000000000808888888866660600000000000000bf111c3c3313c10000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000bf1bccccccccc10000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000bfbbf10f00cc0c0000000000000000000000000000000000000000000000000000000000000000000000000000666666868888888800000000000000f0ffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fcffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c44f40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccfff40fc00c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0ddcc1111fdbfcd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0dd1c4d44d4dccd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4d444444c4cd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4444ff4f440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc44444cc4440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc4444c4c4440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c044111141440f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fc000000000000c01c444414f40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dc0f0000000000004c444444fd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0dc0f0000000000004c444f440f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccddf1000000000000c04444f4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc11dd1d110f0000000000004c440f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bc111111110f000000000000f0ff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b511c11111f10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b51b111111510f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b5bbbb1b115b0f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005cb5111111bb5b0f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005cb51b11bbbb550f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c551b1111b1550f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c55ccbcb5ffff0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc550cbbb500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0ccc055c5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cccc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex427334 = pxsim.BufferMethods.createBufferFromHex("0a00080000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000090000000000000000020a0500070004030601010101010101010101")
-const _hex427336 = pxsim.BufferMethods.createBufferFromHex("87040a000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex427504 = pxsim.BufferMethods.createBufferFromHex("8704a00078000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4058 = pxsim.BufferMethods.createBufferFromHex("1f00210023002500270029002c002e003100340037003a003e004100450049004e00520057005c00620068006e0075007b0083008b0093009c00a500af00b900c400d000dc00e900f70006011501260137014a015d01720188019f01b801d201ee010b022a024b026e029302ba02e40210033f037003a403dc03170455049704dd0427057505c80520067d06e0064907b8072d08a9082d09b9094d0aea0a900b400cfa0cc00d910e6f0f5a1053115b1272139a14d41520178018f519801b231dde1e")
+const _hex8814 = pxsim.BufferMethods.createBufferFromHex("2000000000000000210000005e0000002200000e000e0000230028fe28fe280024004c92ff926400250002651248a64026006c92926ca000270000000e000000280000007c82000029000000827c00002a005438103854002b0010107c1010002c000000907000002d001010101010002e000000606000002f000060100806003000003c42423c00310000447e4000003200004462524c00330000424a4e320034003028247e20003500004e4a4a32003600003c4a4a30003700000262120e00380000344a4a34003900000c52523c003a0000006c6c00003b000000967600003c001028284444003d002828282828003e004444282810003f0000025909060040003c425a560800410078141214780042007e4a4a4a34004300003c424224004400007e42423c004500007e4a4a42004600007e0a0a02004700003c425234004800007e08087e00490000427e4200004a002040423e02004b00007e081462004c00007e404040004d007e0418047e004e00007e04087e004f003c4242423c005000007e12120c005100003c5262bc005200007e12126c00530000244a522400540002027e0202005500003e40403e005600001e70701e0057007e2018207e00580042241824420059000608700806005a000062524a46005b00007e424200005c000006081060005d000042427e00005e000804020408005f00808080808000600000000204000061000030484878006200007e4848300063000030484848006400003048487e006500003068585000660000107c12040067000018a4a478006800007e08087000690000487a4000006a000040847d00006b00007e102840006c0000427e4000006d007808300870006e000078080870006f00003048483000700000fc24241800710000182424fc0072000078100810007300005058682800740000083e48200075000038404078007600001860601800770038403040380078000048303048007900005ca0a07c007a000048685848007b000008364100007c000000fe0000007d000041360800007e00000804080400a000000000000000a10000007a000000a200003048fc4800a30090fc92928400a400542844285400a5002a2c782c2a00a6000000ee000000a7000094aaaa5200a800000200020000a9003e414955413eaa0000242a2e0000ab00102854284400ac00001010107000ad00001010101000ae003e415d45413eaf00000202020200b000000814140800b1008888be888800b2000024322c0000b30000222a140000b400000004020000b50000f840207800b6000c1e7e027e00b700000010000000b800000080400000b90000243e200000ba0000242a240000bb00442854281000bc00025f70f84000bd00021f90c8b000be0011557af84000bf000030484d2000c000601916186000c100601816196000c200601a151a6000c300601a151a6100c400601914196000c500601a151a6000c6007c0a7e4a4200c700001ea1611200c800007c55564400c900007c56554400ca00007c56554600cb00007c55544500cc0000457e440000cd0000447e450000ce0000467d460000cf0000457c450000d000087e4a423c00d100007e09127d00d200003845463800d300003846453800d400003846453a00d500003a45463900d600003845443900d700442810284400d80000fc724e3f00d900003c41423c00da00003c42413c00db00003c42413e00dc00003c41403d00dd00040872090400de00007e24241800df00007c025a2400e0000030494a7800e10000304a497800e20000304a497a00e3000032494a7900e40000304a487a00e50000304a4d7a00e600304878685000e7000018a4642400e8000030695a5000e90000306a595000ea0000306a595200eb0000306a585200ec0000497a400000ed0000487a410000ee00004a79420000ef00004a78420000f00000304a4b3d00f100007a090a7100f2000030494a3000f30000304a493000f40000304a493200f5000032494a3100f60000304a483200f700101054101000f800007068583800f900003841427800fa00003842417800fb00003842417a00fc00003842407a00fd0000b84241f800fe0000ff24241800ff00005ca1a07d000001601915196000010100304a4a7a000201611a16196000030100314a4a790004013c0a094abc00050100182464bc000601003846452800070100304a4948000801003846452a00090100304a494a000a010038444528000b010030484a48000c010038454629000d010030494a49000e01007c454639000f0100314a497e001001087e4a423c00110130484c7e04001201007d55554500130100326a5a52001401007d56564500150100316a5a51001601007c55544400170100306a5850001801003f65a521001901001874ac28001a01007c555645001b010030695a51001c010038465536001d0100304a49f2001e010039465635001f0100314a4af100200100384455340021010018a4a578002201001ea1691a0023010018a6a578002401007812117a0025017e080a7102002601047e147e04002701047e0c08700028010002457e450029010002497a41002a0100457d4500002b01004a7a4200002c0100014a7a49002d0100014a7a41002e0100217fa100002f0100247da00000300100447d440000310100487840000032017e0022423e0033013d0040847d0034012040463d0600350100800af90200360100bf440a3100370100bf4814200038010078102848003901007c404241003a0100467d4000003b01003fa06020003c0100a17f2000003d01007c414241003e0100457e4100003f01007e40484000400100427e4008004101107e48404000420100527e4800004301007c0a117c00440100780a097000450100bf42043f00460100bc440438004701007c09127d00480100790a09700049010a06780870004a01003f02847f004b01003c048478004c013945454539004d0100324a4a32004e013946464639004f0100314a4a310050013a4544463900510132494832010052013c427e4a420053013048306850005401007c163548005501007812091000560100bf49093600570100bc480408005801007d1635480059010079120910005a010048565524005b0100505a6928005c010048565526005d0100505a692a005e010012a56912005f010028ac741400600100485556250061010050596a290062010101bf410100630100049f641000640104057e050400650100083d4a2100660102127e120200670100183e5820006801003a414239006901003a414279006a01003d41413d006b01003a42427a006c010039424239006d010039424279006e01003a45453a006f01003a45457a0070013a41403a010071013a41407a01007201001f60a01f007301001c60a03c00740178221122780075013842314238007601081261120800770100b84241fa00780104097009040079010064564d44007a0100486a5948007b010064544d44007c010048685a48007d010064554e45007e010048695a49007f0100087c0204008f01003452523c00920100887e090200a0013c42423c0806a101003048483008af01003e403e0806b001003840781008b501006a5a4a4e00b601005878585800d101003845463900d2010030494a3100e601003845563500e7010030494af100fa0100742a750000fb0100304c4a7d00fc0178147e554400fd0130487a695000fe010078744e3d00ff0100706a59380018020012a569120019020028ac7414001a020101bf4101001b0200049f641000bb0200000c0a0000bc0200000a060000bd020000060a0000c602000201020000c702000102010000c902000202020000d802000102020100d902000002000000da02000205020000db02000040800000dc02000201020100dd02020100020100740300000201000075030000804000007a030000c08000007e03000096760000840300000300000085030200030002008603037c12127c008703000010000000880303007e4a4200890303007e087e008a030300427e42008c03033c42423c008e0303000e700e008f03035c62625c00900302003b400200910378141214780092037e4a4a4a34009303007e0202020094036058465860009503007e4a4a420096030062524a46009703007e08087e0098033c4a4a4a3c00990300427e4200009a03007e081462009b036018061860009c037e0418047e009d03007e04087e009e0300424a4a42009f033c4242423c00a003007e02027e00a103007e12120c00a30300665a424200a40302027e020200a503060870080600a60318247e241800a703422418244200a8030e107e100e00a9035c6202625c00aa0300457c450000ab03040970090400ac030030484a7900ad030030685a5100ae0378100a09f000af03003a41200000b0033a4043403a00b103003048487800b20300fe25251a00b3030c30c0300c00b403344a4a4a3000b503003068585000b603021aa6a24200b7033c080404f800b803003c4a4a3c00b903003840200000ba03007820504800bb03641212227c00bc03fc2020103c00bd03182040201800be03112d2ba94100bf03003048483000c003087808780800c103f82424241800c2031824a4a44800c303304848582800c403000838482800c503384040403800c6031c20f8241800c703c4281028c400c8031c20fc201c00c903304820483000ca03000238422000cb03384240423800cc0330484a493000cd03384042413800ce03304822493000d0033c52525c2000d10310344a3c0800d203067804020400d303120a7c020400d4030d7009040800d5031824ff241800d603384828483800d70348302221d800da031c2221a14200db031824a4a44200dc037e1212020200dd0300fc24240400de033e2010087c00df030c0ac9281800e003700c621c7000e10301092516f800e2039ea0bea07e00e30398a0b8a07800e4030c1214107e00e503001028207800e603be9088887000e70348544e443800e803245252524c00e903285454544800ea0364524c526400eb03086458640800ec03385454542200ed03306848682400ee03184a7e4a1800ef031848ff0a0800f003483020205800f10378a4a4a49800f203304848485000f303006080847d00f4033c4a4a4a3c00f5030030585848000004007c555644000104007c55544500020401013f8579000304007c0605040004043c4a4a422400050400244a522400060400427e420000070400457c45000008042040423e020009047c027e4830000a047e087e4830000b0402027e0a72000c04007c102a45000d047c2112087c000e040c5152523d000f043f20e0203f00100478141214780011047e4a4a4a300012047e4a4a4a34001304007e020202001404c07c427ec0001504007e4a4a4200160476087e087600170424424a4a34001804007e08047e001904007d120a7d001a04007e081462001b04403c02027e001c047e0418047e001d04007e08087e001e043c4242423c001f047e0202027e002004007e12120c002104003c42422400220402027e02020023040e5050503e00240418247e241800250442241824420026043f2020bf600027040e1010107e0028047e407e407e0029043f203fa07f002a04027e484830002b047e4848307e002c04007e484830002d0424424a4a3c002e047e183c423c002f04006c12127e0030043048487840003104003c4a4a3100320400786850200033040078080808003404c0704878c000350430686850000036044830783048003704004058683000380478402010780039047942221279003a040078203048003b044030080878003c047810201078003d047810101078003e043048484830003f047808080878004004fc24242418004104304848485000420408087808080043041ca0a0a07c0044041824ff241800450400483030480046043c2020bc60004704182020207800480478407840780049043c203ca07c004a040878505020004b047850502078004c040078505020004d044858683000004e047830304830004f0450282878000050040030696a500051040032686a50005204023f0a887000530400780a09080054040030685848005504005058682800560400487a4000005704004a784200005804004080847d0059047008785020005a047810785020005b04047e141060005c040078223148005d047841221078005e0418a1a2a279005f043c20e0203c006204027f4a4830006304087e5850200070040e107e100e00710418207820180072043c4a4a4a3c0073043068586830007404001e70180c0075040018603010009004007e020203009104007808080c009204087e0a0a0200930420782808080096043b043f043be0970424183c1824c09a04003f040a31c09b04003c101824c0ae04060870080600af040c10e0100c00b004161870181600b1042c30e0302c00b20421120c1221c0b3040024181824c0ba047e0808087000bb04007e08087000d804003452523c00d904002868583000e20400457d450000e304004a7a420000e8043c4a4a4a3c00e904003058583000ee04003d41413d00ef04003a42427a00d005681020285000d105484848784000d205004830600000d305080808780800d405680808087800d505000008780000d605080818680800d705087808087800d805784050487800d905000008180000da0504040404fc00db05484848483800dc050e4848281800dd05087848487800de05582010487000df05000004fc0000e005004040487800e105000878483800e205487840281800e305041c0404fc00e405485848483800e50504f820140800e605485060685000e705f40424241c00e805080808087000e905785058403800ea05487808087800f005087800087800f105081800087800f205081800081800f305000010080000f405100800100800021e7c5455542800031e007e484930000a1e007c454438000b1e003049487e001e1e007c151404001f1e001079140800401e7e0419047e00411e780832087000561e007c15140800571e00fc25241800601e004854552400611e0050586a28006a1e04047d0404006b1e00083d482000801e7c2112207c00811e384132403800821e7c2012217c00831e384032413800841e7c2110217c00851e384230423800f21e040972080400f31e00b84142f800a3207e0a7a120a00a420a8fcaa828400a720087e2a1c0800ab200098a4a6bf02ac20183c5a5a4200af20627f224438009021103854101000912108047e0408009221101054381000932110207e201000942110381010381095212844fe442800")
+const _hex9157 = pxsim.BufferMethods.createBufferFromHex("20000000000000000000000000000000000000000000000000002100000000000006fc0000000000000000000000000000000000220000001c00000000001c0000000000000000000000000000002300a000f807a000f807a00000000000000000000000000000002400000018022404460c8803000000000000000000000000000025003802c4017800200390040803000000000000000000000000260080037804a4041803800340040000000000000000000000002700000000001c00000000000000000000000000000000000000280000000000f8010606010800000000000000000000000000002900000001080606f801000000000000000000000000000000002a00040014000e001400040000000000000000000000000000002b0040004000f8034000400000000000000000000000000000002c000000000000090006000000000000000000000000000000002d000000800080008000000000000000000000000000000000002e000000000000060000000000000000000000000000000000002f00000c800360001c000300000000000000000000000000000030000000f80304040404f80300000000000000000000000000003100000004040404fc07000400040000000000000000000000003200000008060405c4043804000000000000000000000000000033000000080244044404b803000000000000000000000000000034000000800170010801fc070001000000000000000000000000350000023c0424042404c403000000000000000000000000000036000000f0034804440488030000000000000000000000000000370000000400c40734000c00000000000000000000000000000038000000b80344044404b803000000000000000000000000000039000000780284048802f00100000000000000000000000000003a000000000030060000000000000000000000000000000000003b000000000018090006000000000000000000000000000000003c004000a000a000a000100100000000000000000000000000003d002001200120012001200100000000000000000000000000003e0000001001a000a000a00040000000000000000000000000003f000000080084066400180000000000000000000000000000004000f0030c04c20822092409f80900000000000000000000000041000007f8008400f8000007000000000000000000000000000042000000fc0744044404b803000000000000000000000000000043000000f001080204040404080200000000000000000000000044000000fc0704040802f001000000000000000000000000000045000000fc07440444044404000000000000000000000000000046000000fc07440044004400000000000000000000000000000047000000f00108024404c803000000000000000000000000000048000000fc0740004000fc070000000000000000000000000000490000000404fc070404040400000000000000000000000000004a000000000200040004fc0300000000000000000000000000004b000000fc074000f0000c0304040000000000000000000000004c000000fc0700040004000400000000000000000000000000004d000000fc0738007000fc0700000000000000000000000000004e000000fc073800c003fc0700000000000000000000000000004f000000f80304040404f803000000000000000000000000000050000000fc07840084004400780000000000000000000000000051000000fc0102020206fc09000000000000000000000000000052000000fc074400c4013806000000000000000000000000000053000000180224044404880300000000000000000000000000005400000004000400fc070400040000000000000000000000000055000000fc0300040004fc03000000000000000000000000000056000c00f0030004f0030c00000000000000000000000000000057007c008007e001f0010007fc0000000000000000000000000058000404b8034000b80304040000000000000000000000000000590004003800c00730000c0000000000000000000000000000005a0004040407e4041c04040400000000000000000000000000005b0000000000ff0f0108010800000000000000000000000000005c0003001c0060008003000c00000000000000000000000000005d00000001080108ff0f000000000000000000000000000000005e004000380004003800400000000000000000000000000000005f00000800080008000800080000000000000000000000000000600000000000020004000000000000000000000000000000000061000000200390049004e007000000000000000000000000000062000000fc0710041004e003000000000000000000000000000063000000c001200210043004000200000000000000000000000064000000e00310041004fc07000000000000000000000000000065000000e00390049004e0040000000000000000000000000000660000001000f80714001400000000000000000000000000000067000000b806440944093c09040600000000000000000000000068000000fc0710001000e0070000000000000000000000000000690000000000f4070000000000000000000000000000000000006a00000800080008fd07000000000000000000000000000000006b000000fe078000e001100610040000000000000000000000006c0000000000fc030004000400000000000000000000000000006d00f00710001000e0071000e0070000000000000000000000006e000000f00710001000e00700000000000000000000000000006f000000e00310041004e003000000000000000000000000000070000000fc0f04010401f800000000000000000000000000000071000000f80004010401fc0f000000000000000000000000000072000000f00720001000100000000000000000000000000000007300000060029004900420030000000000000000000000000000740000001000fc0310041004000000000000000000000000000075000000f00300040004f007000000000000000000000000000076003000c0030004c003300000000000000000000000000000007700f0000007e003c0010007f000000000000000000000000000780010046003800060031004000000000000000000000000000079000c0870088007f0000c0000000000000000000000000000007a000000000410079004700410040000000000000000000000007b0000004000be070108010800000000000000000000000000007c0000000000ff0f0000000000000000000000000000000000007d00000001080108be07400000000000000000000000000000007e00800040004000800080004000000000000000000000000000")
+const _hex21778 = pxsim.BufferMethods.createBufferFromHex("20000000000000002100001700000000220000030003000023000a1f0a1f0a0024000a17151d0a00250013090412190026000a15150a100027000003000000002800000e11000000290000110e0000002a00000a040a00002b0000040e0400002c000010080000002d000004040400002e000008000000002f0010080402010030000e11110e0000310000121f100000320019151512000033000911150b000034000c0a091f080035001715151509003600081416150800370011090503010038000a1515150a00390002150d0502003a00000a000000003b0000100a0000003c0000040a1100003d00000a0a0a00003e0000110a0400003f0002011505020040000e1115090e0041001e05051e000042001f15150a000043000e111111000044001f11110e000045001f151511000046001f050501000047000e1111150c0048001f04041f00004900111f110000004a000911110f01004b001f040a1100004c001f10101000004d001f0204021f004e001f0204081f004f000e11110e000050001f0505020000510006091916000052001f05050a10005300121515090000540001011f01010055000f10100f0000560007081008070057001f0804081f0058001b04041b0000590001021c0201005a001915131100005b00001f111100005c000102040810005d000011111f00005e000002010200005f00101010101000600000010200000061000c12121e100062001f141408000063000c121212000064000814141f000065000e15151200006600041e0501000067000215150f000068001f04041800006900001d000000006a000010100d00006b001f040a1000006c00000f101000006d001e0204021e006e001e02021c00006f000c12120c000070001e0a0a0400007100040a0a1e000072001c0202020000730010140a0200007400000f1414100075000e10101e1000760006081008060077001e1008101e007800120c0c12000079001214080402007a00121a161200007b0000041f1100007c00001f000000007d00111f040000007e00000404080800d3000c1213130c00f3000c12130d000004010e05051e100005010609191f080006010c121313120007010c121313000018010f0b1b19000019010e151d1a000041011f14121000004201100f1412000043011f0205081f0044011e03031c00005a0110140b0302005b0110140b0300007901121a171300007a01121a171300007b01121b171200007c01121b17120000")
+const _hex4121 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
+const _hex4622 = pxsim.BufferMethods.createBufferFromHex("8704240024000000001111111111111111111111111111111100000010313333333333333333333333333333130100001113111111111111111111111111111131110000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000311111111111111111111111111111111113000031111111111111111111111111111111111300003111111111111111111111111111111111130000111311111111111111111111111111113111000010313333333333333333333333333333130100000011111111111111111111111111111111000000")
+const _hex4624 = pxsim.BufferMethods.createBufferFromHex("8704240024000000002222222222222222222222222222222200000020323333333333333333333333333333230200002223222222222222222222222222222232220000322211111111111111111111111111112223000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003212111111111111111111111111111121230000321211111111111111111111111111112123000032121111111111111111111111111111212300003222111111111111111111111111111122230000222322222222222222222222222222223222000020323333333333333333333333333333230200000022222222222222222222222222222222000000")
+const _hex4626 = pxsim.BufferMethods.createBufferFromHex("8704240024000000004444444444444444444444444444444400000040343333333333333333333333333333430400004443444444444444444444444444444434440000344411111111111111111111111111114443000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003414111111111111111111111111111141430000341411111111111111111111111111114143000034141111111111111111111111111111414300003444111111111111111111111111111144430000444344444444444444444444444444443444000040343333333333333333333333333333430400000044444444444444444444444444444444000000")
+const _hex4628 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d00000000000000000000000070666607000000000000000000000000006776000000000000000000000000660700007066000000000000000000006766777766760000000000000000000060666666660600000000000000000066006766667600660000000000000000667600000000676600000000000000006766767777676676000000000000000060666666666666060000000000000000006766666666760000000000000000000000676666760000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4630 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0bb000000000000000000000000b000404500b0000000000000000000005b0b000400540b0000000000000000b0550400000054b5000000000000000000440040bb0040040000000000000000000040d4ddbb0000000000000000000000004055ddbd000000000000000000004b005455d5dd0b400b000000000000005b045411d5dd0b540b000000000000004b005411d5dd0b400b0000000000000000004055ddbd00000000000000000000000040d4ddbb0000000000000000000000440040bb0040040000000000000000b0550400000054b50000000000000000005b04000400540b000000000000000000b000404500b0000000000000000000000000b0bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4632 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020020000000000002002000000000000202200000000000022020000000000000022020000000020220000000000000000202200000000220200000000000000000022020000202200000000000000000000202200002202000000000000000000000022022022000000000000000000000000202222020000000000000000000000000022220000000000000000000000000000222200000000000000000000000000202222020000000000000000000000002202202200000000000000000000002022000022020000000000000000000022020000202200000000000000000020220000000022020000000000000000220200000000202200000000000000202200000000000022020000000000002002000000000000200200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4634 = pxsim.BufferMethods.createBufferFromHex("8704200020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0fcff0f000000000000000000000000bcddddfb000000000000000000000000dcbbbbfd000000000000000000000000ccbbbbfc0000000000000000000000c0bcd1bdfb0f00000000000000000000c01b11ddbb0f00000000000000000000c0bcbbbbcb0f00000000000000000000bc11d1ddddcb000000000000000000c01d11ddddddd10c0000000000000000bcd1cbbcfbcf1dcb00000000000000001ccdccddbdffdfc100000000000000001cccccdbcbffcfc10000000000000000dbcbccccfcffbfcd0000000000000000bbbdccccffcfdbbb0000000000000000b0dbbdbbbbdbbd0b000000000000000000b0cbccccbc0b000000000000000000000000000000000000000000000000000000d007700d0000000000000000000000007066660700000000000000000000000000677600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4636 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b0cbcc0c0000000000000000000000b0db55d5cd0c00000000000000000000db555555ddcd000000000000000000b055555555d59d0b0000000000000000db55555555d59db900000000000000005b55555555d5ddb900000000000000b05db5cccc5bdddd990b000000000000b055ccccccccdddd9d0b000000000000b0b5ccccccccdbdd9d0b000000000000b0c5ccccccccdcdd9d0b000000000000b0c5ccdccbccdcdd9d0c000000000000b0cdcc5b55ccdcdd9d0c00000000000000ccdc55b5ccdcddc90000000000000000cccc5b55ccdbddc90000000000000000c0ccdccbccdd9d0c000000000000000000ccccccdbddcd00000000000000000000c0dcddddcd0c0000000000000000000000c0cccc0c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4638 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc00000000000000b0bbbbbbbbcb00c0cd000000000000001bddddddddbd0c1ccd000000000000b011cbccccccbc0c1ccd000000000000b01d6c666666bc0cbccd000000000000b01d6c616661bc0c1ccd000000000000b01d6c161666bccc1bcd000000000000b01d6c666166bcccbbcd000000000000b01d6c666666bccc1bcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666661bcccbbcd000000000000b01d6c666661bccc1bcd000000000000b01d6c666666bc0c1ccd000000000000b01dcbccccccbc0cbccd000000000000c0b1bbbbbbbbbb0cdccb000000000000c0bbbbbbbbbbcb00dc0c00000000000000cccccccccc0c00cc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4640 = pxsim.BufferMethods.createBufferFromHex("87042000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004004000000000000000000000000000054450000000000000000000000440b00bbbb00b0440000000000000040550b00000000b0550400000000000040b5000044bb00005b04000000000000b00b0044ddddbb00b00b0000000000000000405d55d5dd0b00000000000000000000d4555555ddbd0000000000000000000054555555d5bd0000000000000000b44055555555d5dd0b4b000000000040b54055555555d5dd0b5b040000000040b54055555555d5dd0b5b040000000000b44055115555d5dd0b4b000000000000000054115555d5bd00000000000000000000d4555555ddbd00000000000000000000405d55d5dd0b0000000000000000b00b0044ddddbb00b00b00000000000040b5000044bb00005b0400000000000040550b00000000b0550400000000000000440b00bbbb00b0440000000000000000000000544500000000000000000000000000004004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex4642 = pxsim.BufferMethods.createBufferFromHex("870420002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bbbb00000000000000000000000000b055bb00bbbbbb000000000000000000b0b5bdbcbbbbddcb0000000000000000b0dbcb5b5555bbdd0c00000000000000b0cbdcbdbb5b55dbcd0000000000000000c0dddb11d15bb5bd0c00000000000000bbbd111111b155bb0c00000000000000db1b111111115bb5cb00000000000000db1bb11d1199b9d5cb00000000000000db1b11bb9199b955cb000000000000005b1b11b19b99995bcb000000000000005b1d1111bb99995ccb00000000000000b0b511bbbb99995ccb00000000000000b0d51d919999d95b0b00000000000000005bdb919999c9d50b0000000000000000b0d51b99d9bcb5000000000000000000005bd5bbbc550b00000000000000000000b05b5555bd000000000000000000000000b0bbbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex5177 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
+const _hex5179 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cc00cc00000000c0330c3c0c00cc00003cc33c0cc0330cc06c3336c6c036c63c33333366003cc33366cc3633cc3366cc36c3cc363c6366c66c33cc66c0cccccc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
+const _hex5181 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
+const _hex5185 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333cc66c3c03363cccc36cccc006c333cc33cc366cc36336633c663663c33cccc6c3333c6c0cccc6c3363cccc")
+const _hex5187 = pxsim.BufferMethods.createBufferFromHex("870410001000000000003c36c36cc6ccc0cc3c63cc3c63ccc033cc33c6cc33c6003cc63c3366366600cc636c33336666cc33663cc36c36cc3c63c6333cc3c3ccc0cc6cc66c33cc660000c0cc3336c66c00006cc33c333366c0cccc3333666663c033633cc6cc3633006c33c6cc3c33c6cc363366c633360c3c33cccccc633c0cc0cc0000c00ccc00")
+const _hex5493 = pxsim.BufferMethods.createBufferFromHex("8704100010000000d3dd1ddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dd1d3d3dd3bdbbd3dddddd3333bbbbd3dddd3d3dc3bbbbd3dddd3d33c3bbbbdbdddd3d3bc3bbbbdbdddddd333dbcbb3bddddd33d33c3bb3bddddddbdd3cdbb33dddd3d3dd3bdbb")
+const _hex5823 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c689696999999998c689696999999998c886696999999998c866696999999998c866699999999998c666699999999998c686699999999998c689696999999998c689696999999998c669696999999998c669699999999998c866699999999998c866699999999998c886699999999998c889699999999998c68969999999999")
+const _hex6039 = pxsim.BufferMethods.createBufferFromHex("000000ffffffff2121ff93c4ff8135fff609249ca378dc52003fad87f2ff8e2ec4a4839f5c406ce5cdc491463d000000")
+const _hex6061 = pxsim.BufferMethods.createBufferFromHex("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex6278 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex6282 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999bbcccc99999999bbddddbbcc9999b9ddddddbdcb9999dbddbbddbdcb99b9dbbd33ddddbb99b9ddbd33ddddbb993cb33b33dbbdbb993c3333333b33bb99bc3d33333333bc99bcd3333333cbbb99bc3b3333c3bbbb99c9333333bcbbcb99c933d333bcbbcc993933cc3db3cbcc9999c9bb3bb3ddcb999999ccccdbddbd")
+const _hex6286 = pxsim.BufferMethods.createBufferFromHex("870410001000000099999999c9ddddbd99999999c9ddddbd99999999b9ddddbc9999999999dbcdbb9999999999ccbccb9999999999c9bccc999999999999cccc999999999999c9cc99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
+const _hex6290 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999c9cccc99999999ccbccccc999999ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb9dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb9ccccdcddcdcdcc9999ccccddcbcbcc999999c9cccccccc")
+const _hex6294 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999996688889988999969557777986898995667667687898688675777677699686676658877679989765588686688999969866666869999999999888898999999999999999999999999999999999999999999999999999999999999999999")
+const _hex6298 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999998888889999999988577577889999897777556677989978778888776687896688999988776689869999999968666898999999998988689899999999687788999999998977679999999999788668999999998987989999999999899899999999999999999999")
+const _hex6302 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988889999999999887777889999998966666677989999688688767687998966989968676799898899888867769999998988887666989999688888787786888886886886766866668886668888676866667887668876658868777686996757757766779899787566667787999989567577879899999969868898999999")
+const _hex6306 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999988c8cccc99999988ccbccccc999989ccbdbccbcc9999ccccdbcbcbcc99c9bbcddccbcccc99dbbddbbccbccccb9dddddbbbcbbcccb8dddddbbbccbccbdbdddddcccbbbcbbdbddddccccbcbdbbdbddbdccddbbbdbbdbddcddcddbdcdbbbbddcbdcddbdcdbcb8ccccdcddcdcdcc8956ccccddcbcbcc996986c8cccccccc")
+const _hex6310 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999889999999999999968989999999999998986999999999999996888999999896899896688888868779999886666767777999999886666668699999999888888989999999999999999999999999999999999999999999999999999999999999999")
+const _hex6314 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999898888999999996868666699999968778688889999897786686676996976666666888899566577868899996655768798999988776655969999887766556699998977667766999999786667669999998867679899999988688698999999999999999999999999999999999999999999999999999999999999999999")
+const _hex6318 = pxsim.BufferMethods.createBufferFromHex("87041000100000008888999999999999777786989999999968667787989999997767667786999999687767667798999988687766768799997766787766779899666686766776879987886668776677889899688878676677899689888877676689679988786677879978665567886686998977668866669899997857756688999999896866889999")
+const _hex6322 = pxsim.BufferMethods.createBufferFromHex("870410001000000088889999bbcccc99777786bbddddbbcc6866b7ddddddbdcb7767dbddbbddbdcb68b7dbbd33ddddbb88b8ddbd33ddddbb773cb33b33dbbdbb663c3333333b33bb87bc3d33333333bc08bcd3333333cbbb89bc3b3333c3bbbb89c7333333bcbbcb99c833d333bcbbcc993933cc3db3cbcc9999c8bb3bb3ddcb999989ccccdbddbd")
+const _hex6326 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff11111111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffffffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
+const _hex6330 = pxsim.BufferMethods.createBufferFromHex("87041000100000008c68f6f61111ffff8c68f6f61111ffff8c8866f61111ffff8c8666f61111ffff8c866611ffff11118c666611ffff11118c686611ffff11118c681616ffff11118c68f6f61111ffff8c66f6f61111ffff8c66f6ff1111ffff8c8666ff1111ffff8c866611ffff11118c886611ffff11118c881611ffff11118c681611ffff1111")
+const _hex6334 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999889898888999989898989899999998999989998889999999999999999999989999989999999998988888988889999899999899999999999999999999999999988889999999999898999999999999999888899999999999999999999999999999999999999999999999999999999999999999999999999")
+const _hex6338 = pxsim.BufferMethods.createBufferFromHex("87041000100000009999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999")
+const _hex6342 = pxsim.BufferMethods.createBufferFromHex("87041000100000001111ffff1111ffff818888ff1111ffff81818fff1111ffff81818fff1111ffffffff1111ffff11118f888811ffff1111fff81111ffff1111ff8f1111ffff1111818888ff1111ffff1111ffff1111ffff818888ff1111ffff81118fff1111ffffff881811ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111ffff1111")
+const _hex89263 = pxsim.BufferMethods.createBufferFromHex("8704a00078000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600666666666666660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868866666666868800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800868800000000868800000000868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808800808800000000808800000000808800808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000660600000000660600666666666666660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868866666666868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868800000000868800000000868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868800000000868800000000868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800808866666600868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888086088888800868800000000868800000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888086088888800868800000000868800000000000000000000000000000000000000000000000000000000000000000000808800000000808800808888080088888800808800000000808800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666660600660600666666666666660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868800868800868800868800000000868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868800868800868800000000868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868800868800868866666666868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868888888800868888888888888800868800868800868800000000000000000000000000000000000000000000000000000000000000000000868800868888888800868888888888888800868800868800868800000000000000000000000000000000000000000000000000000000000000000000808800808888888800808888888888888800808800808800808800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600666666660600660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808888888888888800868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868800868800868800868800000000000000000000000000000000000000000000000000000000000000000000000000666666868866660600868800868800868800868866868866660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868800868888888800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808888888888888800808800808888888800808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666660600000000666666660600660600666666666666660600000000000000000000000000000000000000000000000000000000000000000000868888888800000000868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000868888888800000000868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000808888888866660600868888888800868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868800868800006088080000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868800868800006088080000000000000000000000000000000000000000000000000000000000000000000000000000666666868888888800868800868800868800000088686600000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000868800868888888800000000868800000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000868800868888888800000000868800000000000000000000000000000000000000000000000000000000000000000000000000808888888800000000808800808888888800666666868866660600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600666666666666660600666666660600660600000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888800868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800868888888888888800868888888800868800000000000000000000000000000000000000000000000000000000000000000000868888888888888800808888888888888800808888888800808800000000000000000000000000000000000000000000000000000000000000000000868800868800000000006088080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000006088080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000000088686600000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000000000868800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800000000000000868800000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000808800808800000000006066868800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006088080000000000808088000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006088080000000000808080000000000000000000000000000000000000000000000000000000000000000000000000000000660600000000660600666688686666660600808880000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888888888800000080000000000000000000000000000000000000000000000000000000000000000000000000000000868866666666868800808888888888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800666666660600000000808888000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808800000000808800808888888866660600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000666666660600660600666666868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800868800808888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800868800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868800868800868800000000000000000000cc000000ff00000000000000000000000000000000000000000000000000000000000000000000000000868800868800868800000000000000000000bc0c00fffb00000000000000000000000000000000000000000000000000000000000000000000000000868800868888888800000000000000000000bcccffbcfb00000000000000000000000000000000000000000000000000000000000000000000000000868800868888888800000000000000000000dccbccbb0f00000000000000000000000000000000000000000000000000000000000000000000000000808800808888888800000000000000000000dcbdccfb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0bdfb0f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0cccf000000000000000000000000000000000000000000000000000000000000000000000000000000666666666666660600000000000000000000cfccbc0c00000000000000000000000000000000000000000000000000000000000000000000000000008688888888888888000000000000000000f0ccccbccd00000000000000000000000000000000000000000000000000000000000000000000000000008688888888888888000000000000000000cfccccccdd0c00000000000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000ff00cfccccccdd0c00000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000000000000000bfffccbbcbccddff00000000000000000000000000000000000000000000000000000000000000000000000000000000868800000000000000000000bffbbbccbbccfdfb00000000000000000000000000000000000000000000000000000000000000000000000000666666868866660600000000000000bcbfcbbbbbcbbffb00000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000bcbfbbccbbbbbbfd00000000000000000000000000000000000000000000000000000000000000000000000000868888888888888800000000000000c0bbcbbbbbbbdbfb00000000000000000000000000000000000000000000000000000000000000000000000000808888888888888800000000000000f0bbbbbbbbbbbb0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f0fbbfbb1bc1fc0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bffb1f111111110f00000000000000000000000000000000000000000000000000000000000000000000000000666666660600000000000000000000bf1bc1c3cc1c110c00000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000bf111c3333c1110c00000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000bf11cc333333110c00000000000000000000000000000000000000000000000000000000000000000000000000808888888866660600000000000000bf111c3c3313c10000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000bf1bccccccccc10000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000bfbbf10f00cc0c0000000000000000000000000000000000000000000000000000000000000000000000000000666666868888888800000000000000f0ffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000868888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fcffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c44f40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccfff40fc00c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0ddcc1111fdbfcd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0dd1c4d44d4dccd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4d444444c4cd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cd4444ff4f440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc44444cc4440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc4444c4c4440f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c044111141440f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fc000000000000c01c444414f40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dc0f0000000000004c444444fd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0dc0f0000000000004c444f440f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ccccddf1000000000000c04444f4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc11dd1d110f0000000000004c440f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bc111111110f000000000000f0ff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b511c11111f10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b51b111111510f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0b5bbbb1b115b0f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005cb5111111bb5b0f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005cb51b11bbbb550f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c551b1111b1550f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c55ccbcb5ffff0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc550cbbb500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0ccc055c5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0cccc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex89267 = pxsim.BufferMethods.createBufferFromHex("0a00080000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000090000000000000000020a0500070004030601010101010101010101")
+const _hex89269 = pxsim.BufferMethods.createBufferFromHex("87040a000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex89449 = pxsim.BufferMethods.createBufferFromHex("8704a00078000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
 
 
 
 
-function inline__P189326(s) {
+function inline__P4110(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2032,23 +2060,23 @@ switch (step) {
   case 1:
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 4; continue; }
-    globals.__updated___189323 = (false);
-    s.tmp_0 = pause__P185619_mk(s);
+    globals.__updated___4107 = (false);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 200;
     s.callLocIdx = 2; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.__updated___189323);
+    r0 = pxsim_numops_toBoolDecr(globals.__updated___4107);
     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__P186980_mk(s);
+    s.tmp_2 = control___screen_update__P1763_mk(s);
     s.callLocIdx = 3; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
-    globals.__updated___189323 = (true);
+    globals.__updated___4107 = (true);
   case 2:
   case 3:
     { step = 1; continue; }
@@ -2057,12 +2085,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189326.info = {"start":396,"length":211,"line":17,"column":26,"endLine":26,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"inline","argumentNames":[]}
+inline__P4110.info = {"start":396,"length":211,"line":17,"column":26,"endLine":26,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P189326_mk(s) {
+function inline__P4110_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189326, depth: s.depth + 1,
+        parent: s, fn: inline__P4110, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2073,7 +2101,7 @@ function inline__P189326_mk(s) {
 
 
 
-function inline__P189344(s) {
+function inline__P4128(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2083,17 +2111,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_pxtcore.updateScreen(globals.screen___187019);
+    r0 = pxsim_pxtcore.updateScreen(globals.screen___1802);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189344.info = {"start":753,"length":26,"line":22,"column":33,"endLine":22,"endColumn":59,"fileName":"pxt_modules/screen/targetoverrides.ts","functionName":"inline","argumentNames":[]}
+inline__P4128.info = {"start":753,"length":26,"line":22,"column":33,"endLine":22,"endColumn":59,"fileName":"pxt_modules/screen/targetoverrides.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P189344_mk(s) {
+function inline__P4128_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189344, depth: s.depth + 1,
+        parent: s, fn: inline__P4128, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -2101,7 +2129,7 @@ function inline__P189344_mk(s) {
 
 
 
-function inline__P189349(s) {
+function inline__P4133(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2120,12 +2148,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189349.info = {"start":816,"length":56,"line":23,"column":35,"endLine":25,"endColumn":5,"fileName":"pxt_modules/screen/targetoverrides.ts","functionName":"inline","argumentNames":["msg"]}
+inline__P4133.info = {"start":816,"length":56,"line":23,"column":35,"endLine":25,"endColumn":5,"fileName":"pxt_modules/screen/targetoverrides.ts","functionName":"inline","argumentNames":["msg"]}
 
-function inline__P189349_mk(s) {
+function inline__P4133_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189349, depth: s.depth + 1,
+        parent: s, fn: inline__P4133, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -2134,7 +2162,7 @@ function inline__P189349_mk(s) {
 
 
 
-function inline__P189450(s) {
+function inline__P4234(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2148,36 +2176,36 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals.infoState___189446);
+    r0 = pxsim_numops_toBoolDecr(globals.infoState___4230);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_numops_toBoolDecr(globals.infoStateStack___189448);
+    r0 = pxsim_numops_toBoolDecr(globals.infoStateStack___4232);
     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___189448 = (r0);
+    globals.infoStateStack___4232 = (r0);
   case 1:
   case 2:
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "state", globals.infoState___189446);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "state", globals.infoState___4230);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "scene", s.arg0);
-    r0 = pxsim_Array__push(globals.infoStateStack___189448, s.tmp_0);
-    globals.infoState___189446 = (undefined);
+    r0 = pxsim_Array__push(globals.infoStateStack___4232, s.tmp_0);
+    globals.infoState___4230 = (undefined);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189450.info = {"start":1920,"length":259,"line":73,"column":29,"endLine":82,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P4234.info = {"start":1920,"length":259,"line":73,"column":29,"endLine":82,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P189450_mk(s) {
+function inline__P4234_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189450, depth: s.depth + 1,
+        parent: s, fn: inline__P4234, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2188,7 +2216,7 @@ function inline__P189450_mk(s) {
 
 
 
-function inline__P189465(s) {
+function inline__P4249(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2198,30 +2226,30 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___189466 = undefined;
-    s.nextState___189475 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.scene___4250 = undefined;
+    s.nextState___4259 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 20; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.scene___189466 = (r0);
-    globals.infoState___189446 = (undefined);
-    s.tmp_0 = r0 = globals.infoStateStack___189448;
+    s.scene___4250 = (r0);
+    globals.infoState___4230 = (undefined);
+    s.tmp_0 = r0 = globals.infoStateStack___4232;
     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___189448);
+    r0 = pxsim_Array__length(globals.infoStateStack___4232);
   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___189448);
-    s.nextState___189475 = (r0);
+    r0 = pxsim_Array_.pop(globals.infoStateStack___4232);
+    s.nextState___4259 = (r0);
     s.tmp_2 = if_scene_1_mk(s);
-    s.tmp_2.arg0 = s.nextState___189475;
+    s.tmp_2.arg0 = s.nextState___4259;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "scene");
     } else {
@@ -2233,12 +2261,12 @@ switch (step) {
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.scene___189466);
+    r0 = (s.tmp_1 == s.scene___4250);
     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___189475;
+    s.tmp_3.arg0 = s.nextState___4259;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "state");
     } else {
@@ -2249,10 +2277,10 @@ switch (step) {
     }
   case 9:
     r0 = s.retval;
-    globals.infoState___189446 = (r0);
+    globals.infoState___4230 = (r0);
     { step = 4; continue; }
   case 3:
-    r0 = pxsim_Array__push(globals.infoStateStack___189448, s.nextState___189475);
+    r0 = pxsim_Array__push(globals.infoStateStack___4232, s.nextState___4259);
   case 4:
   case 5:
   case 6:
@@ -2260,26 +2288,26 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189465.info = {"start":2211,"length":376,"line":84,"column":28,"endLine":95,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":[]}
+inline__P4249.info = {"start":2211,"length":376,"line":84,"column":28,"endLine":95,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P189465_mk(s) {
+function inline__P4249_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189465, depth: s.depth + 1,
+        parent: s, fn: inline__P4249, 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___189466: undefined,
-  nextState___189475: undefined,
+  scene___4250: undefined,
+  nextState___4259: undefined,
 } }
 
 
 
 
 
-function inline__P189901(s) {
+function inline__P4685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2289,13 +2317,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sz___189902 = undefined;
-    s.tmp_0 = control_ramSize__P185552_mk(s);
+    s.sz___4686 = undefined;
+    s.tmp_0 = control_ramSize__P335_mk(s);
     s.callLocIdx = 35; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.sz___189902 = (r0);
-    r0 = (s.sz___189902 <= 102400);
+    s.sz___4686 = (r0);
+    r0 = (s.sz___4686 <= 102400);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -2303,7 +2331,7 @@ switch (step) {
     { step = 5; continue; }
     { step = 4; continue; }
   case 1:
-    r0 = (s.sz___189902 <= 204800);
+    r0 = (s.sz___4686 <= 204800);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 2; continue; }
@@ -2320,23 +2348,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189901.info = {"start":223,"length":217,"line":8,"column":25,"endLine":17,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":[]}
+inline__P4685.info = {"start":223,"length":217,"line":8,"column":25,"endLine":17,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P189901_mk(s) {
+function inline__P4685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189901, depth: s.depth + 1,
+        parent: s, fn: inline__P4685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  sz___189902: undefined,
+  sz___4686: undefined,
 } }
 
 
 
 
 
-function inline__P189993(s) {
+function inline__P4777(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2366,12 +2394,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189993.info = {"start":860,"length":117,"line":31,"column":40,"endLine":34,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":[]}
+inline__P4777.info = {"start":860,"length":117,"line":31,"column":40,"endLine":34,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P189993_mk(s) {
+function inline__P4777_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189993, depth: s.depth + 1,
+        parent: s, fn: inline__P4777, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2386,7 +2414,7 @@ function inline__P189993_mk(s) {
 
 
 
-function inline__P190006(s) {
+function inline__P4790(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2415,7 +2443,7 @@ 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__P185341_mk(s);
+    s.tmp_7 = Math_sign__P124_mk(s);
     r0 = pxsim.Math_.sin(s.arg0);
     s.tmp_7.arg0 = r0;
     s.callLocIdx = 57; s.pc = 7; return s.tmp_7;
@@ -2480,7 +2508,7 @@ switch (step) {
     }
   case 9:
     r0 = s.retval;
-    s.tmp_2 = Math_abs__P185340_mk(s);
+    s.tmp_2 = Math_abs__P123_mk(s);
     s.tmp_3 = if_yOffset_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -2552,12 +2580,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P190006.info = {"start":1127,"length":417,"line":42,"column":39,"endLine":55,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["index","state"]}
+inline__P4790.info = {"start":1127,"length":417,"line":42,"column":39,"endLine":55,"endColumn":5,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["index","state"]}
 
-function inline__P190006_mk(s) {
+function inline__P4790_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P190006, depth: s.depth + 1,
+        parent: s, fn: inline__P4790, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2577,7 +2605,7 @@ function inline__P190006_mk(s) {
 
 
 
-function inline__P191203(s) {
+function inline__P5987(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2587,42 +2615,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.currentScene___191200);
+    r0 = pxsim_numops_toBoolDecr(globals.currentScene___5984);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_numops_toBoolDecr(globals.FadeStack___191201);
+    r0 = pxsim_numops_toBoolDecr(globals.FadeStack___5985);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals.FadeStack___191201 = (r0);
+    globals.FadeStack___5985 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(color_FadeState__C191197_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_FadeState__C5981_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_FadeState_constructor__P191198_mk(s);
+    s.tmp_1 = color_FadeState_constructor__P5982_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.activeFade___191199;
-    s.tmp_1.arg2 = globals.currentScene___191200;
+    s.tmp_1.arg1 = globals.activeFade___5983;
+    s.tmp_1.arg2 = globals.currentScene___5984;
     s.callLocIdx = 69; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_Array__push(globals.FadeStack___191201, s.tmp_0);
-    globals.activeFade___191199 = (undefined);
-    globals.currentScene___191200 = (undefined);
+    r0 = pxsim_Array__push(globals.FadeStack___5985, s.tmp_0);
+    globals.activeFade___5983 = (undefined);
+    globals.currentScene___5984 = (undefined);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P191203.info = {"start":5238,"length":328,"line":184,"column":29,"endLine":198,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P5987.info = {"start":5238,"length":328,"line":184,"column":29,"endLine":198,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P191203_mk(s) {
+function inline__P5987_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P191203, depth: s.depth + 1,
+        parent: s, fn: inline__P5987, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2632,7 +2660,7 @@ function inline__P191203_mk(s) {
 
 
 
-function inline__P191221(s) {
+function inline__P6005(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2642,42 +2670,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___191222 = undefined;
-    s.nextState___191233 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.scene___6006 = undefined;
+    s.nextState___6017 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 71; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.scene___191222 = (r0);
-    globals.currentScene___191200 = (undefined);
-    globals.activeFade___191199 = (undefined);
-    s.tmp_0 = r0 = globals.FadeStack___191201;
+    s.scene___6006 = (r0);
+    globals.currentScene___5984 = (undefined);
+    globals.activeFade___5983 = (undefined);
+    s.tmp_0 = r0 = globals.FadeStack___5985;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__length(globals.FadeStack___191201);
+    r0 = pxsim_Array__length(globals.FadeStack___5985);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array_.pop(globals.FadeStack___191201);
-    s.nextState___191233 = (r0);
-    r0 = s.nextState___191233.fields["scene"];
+    r0 = pxsim_Array_.pop(globals.FadeStack___5985);
+    s.nextState___6017 = (r0);
+    r0 = s.nextState___6017.fields["scene"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 === s.scene___191222);
+    r0 = (s.tmp_1 === s.scene___6006);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = s.nextState___191233.fields["state"];
-    globals.activeFade___191199 = (r0);
-    r0 = s.nextState___191233.fields["scene"];
-    globals.currentScene___191200 = (r0);
+    r0 = s.nextState___6017.fields["state"];
+    globals.activeFade___5983 = (r0);
+    r0 = s.nextState___6017.fields["scene"];
+    globals.currentScene___5984 = (r0);
     { step = 4; continue; }
   case 3:
-    r0 = pxsim_Array__push(globals.FadeStack___191201, s.nextState___191233);
+    r0 = pxsim_Array__push(globals.FadeStack___5985, s.nextState___6017);
   case 4:
   case 5:
   case 6:
@@ -2685,24 +2713,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P191221.info = {"start":5598,"length":442,"line":200,"column":28,"endLine":214,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P6005.info = {"start":5598,"length":442,"line":200,"column":28,"endLine":214,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P191221_mk(s) {
+function inline__P6005_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P191221, depth: s.depth + 1,
+        parent: s, fn: inline__P6005, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  scene___191222: undefined,
-  nextState___191233: undefined,
+  scene___6006: undefined,
+  nextState___6017: undefined,
 } }
 
 
 
 
 
-function inline__P426785(s) {
+function inline__P88725(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2716,20 +2744,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = (globals.loading___426789 >= 0);
+    r0 = (globals.loading___88729 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_ImageMethods.fill(s.arg0, 15);
-    s.tmp_0 = helpers_imageDrawRect__P186948_mk(s);
+    s.tmp_0 = helpers_imageDrawRect__P1731_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 50);
     s.tmp_0.arg1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 / 2);
     s.tmp_3 = r0;
@@ -2741,22 +2769,22 @@ switch (step) {
     s.callLocIdx = 108; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 48);
     s.tmp_0.arg1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 / 2);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_5 = Math_map__P185488_mk(s);
-    r0 = (globals.loading___426789 * 100);
+    s.tmp_5 = Math_map__P271_mk(s);
+    r0 = (globals.loading___88729 * 100);
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = 0;
     s.tmp_5.arg2 = 100;
@@ -2771,10 +2799,10 @@ switch (step) {
     s.callLocIdx = 112; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = images_printCenter__P188862_mk(s);
+    s.tmp_0 = images_printCenter__P3645_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.message___426820;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    s.tmp_0.arg1 = globals.message___88760;
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 0.55);
     s.tmp_0.arg2 = r0;
@@ -2788,12 +2816,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426785.info = {"start":4427,"length":381,"line":109,"column":34,"endLine":116,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["screen2"]}
+inline__P88725.info = {"start":7153,"length":381,"line":177,"column":34,"endLine":184,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["screen2"]}
 
-function inline__P426785_mk(s) {
+function inline__P88725_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426785, depth: s.depth + 1,
+        parent: s, fn: inline__P88725, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2808,7 +2836,7 @@ function inline__P426785_mk(s) {
 
 
 
-function inline__P426827(s) {
+function inline__P88767(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2823,26 +2851,26 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Sprite_setKind__P187288_mk(s);
+    s.tmp_0 = Sprite_setKind__P2071_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.SurvivedNPC___426668;
+    s.tmp_0.arg1 = globals.SurvivedNPC___88593;
     s.callLocIdx = 116; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.last_15___426836);
+    r0 = pxsim_numops_toBoolDecr(globals.last_15___88776);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.last_15___426836 = (true);
-    s.tmp_0 = info_stopCountdown__P187431_mk(s);
+    globals.last_15___88776 = (true);
+    s.tmp_0 = info_stopCountdown__P2214_mk(s);
     s.callLocIdx = 117; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = timer_after__P188811_mk(s);
+    s.tmp_0 = timer_after__P3594_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P426841;
+    s.tmp_0.arg1 = inline__P88781;
     s.callLocIdx = 119; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
@@ -2852,12 +2880,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426827.info = {"start":4862,"length":240,"line":117,"column":52,"endLine":126,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
+inline__P88767.info = {"start":7588,"length":240,"line":185,"column":52,"endLine":194,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
 
-function inline__P426827_mk(s) {
+function inline__P88767_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426827, depth: s.depth + 1,
+        parent: s, fn: inline__P88767, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -2869,7 +2897,7 @@ function inline__P426827_mk(s) {
 
 
 
-function inline__P426841(s) {
+function inline__P88781(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2879,7 +2907,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P187430_mk(s);
+    s.tmp_0 = info_startCountdown__P2213_mk(s);
     s.tmp_0.arg0 = 15;
     s.callLocIdx = 118; s.pc = 1; return s.tmp_0;
   case 1:
@@ -2888,12 +2916,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426841.info = {"start":5034,"length":59,"line":122,"column":25,"endLine":124,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P88781.info = {"start":7760,"length":59,"line":190,"column":25,"endLine":192,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P426841_mk(s) {
+function inline__P88781_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426841, depth: s.depth + 1,
+        parent: s, fn: inline__P88781, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -2902,7 +2930,7 @@ function inline__P426841_mk(s) {
 
 
 
-function inline__P426859(s) {
+function inline__P88799(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -2912,26 +2940,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___426865 = undefined;
-    s.sprite___426877 = undefined;
-    s.unnamed20876___U2 = undefined;
-    s.unnamed20877___U3 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___426863);
+    s.index___88805 = undefined;
+    s.sprite___88817 = undefined;
+    s.unnamed3900___U2 = undefined;
+    s.unnamed3901___U3 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___88803);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.index___426865 = (0);
+    s.index___88805 = (0);
   case 1:
-    r0 = (s.index___426865 <= 9);
+    r0 = (s.index___88805 <= 9);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = tiles_setWallAt__P187560_mk(s);
-    s.tmp_2 = tiles_getTileLocation__P187561_mk(s);
+    s.tmp_1 = tiles_setWallAt__P2343_mk(s);
+    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
     s.tmp_2.arg0 = 3;
-    r0 = (s.index___426865 + 1);
+    r0 = (s.index___88805 + 1);
     s.tmp_2.arg1 = r0;
     s.callLocIdx = 125; s.pc = 8; return s.tmp_2;
   case 8:
@@ -2941,31 +2969,31 @@ switch (step) {
     s.callLocIdx = 126; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = (s.index___426865 + 1);
-    s.index___426865 = (r0);
+    r0 = (s.index___88805 + 1);
+    s.index___88805 = (r0);
     { step = 1; continue; }
   case 2:
-    s.sprite___426877 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.NPC___426659;
+    s.sprite___88817 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.NPC___88584;
     s.callLocIdx = 127; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.unnamed20876___U2 = (r0);
-    s.unnamed20877___U3 = (0);
+    s.unnamed3900___U2 = (r0);
+    s.unnamed3901___U3 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed20877___U3;
-    r0 = pxsim_Array__length(s.unnamed20876___U2);
+    s.tmp_0 = r0 = s.unnamed3901___U3;
+    r0 = pxsim_Array__length(s.unnamed3900___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20876___U2, s.unnamed20877___U3);
-    s.sprite___426877 = (r0);
-    s.tmp_2 = scene_followPath__P188876_mk(s);
-    s.tmp_2.arg0 = s.sprite___426877;
-    s.tmp_3 = r0 = globals.paths___426761;
-    s.tmp_5 = sprites_readDataNumber__P188838_mk(s);
-    s.tmp_5.arg0 = s.sprite___426877;
+    r0 = pxsim_Array__getAt(s.unnamed3900___U2, s.unnamed3901___U3);
+    s.sprite___88817 = (r0);
+    s.tmp_2 = scene_followPath__P3659_mk(s);
+    s.tmp_2.arg0 = s.sprite___88817;
+    s.tmp_3 = r0 = globals.paths___88701;
+    s.tmp_5 = sprites_readDataNumber__P3621_mk(s);
+    s.tmp_5.arg0 = s.sprite___88817;
     s.tmp_5.arg1 = "path_index";
     s.callLocIdx = 128; s.pc = 11; return s.tmp_5;
   case 11:
@@ -2978,23 +3006,23 @@ switch (step) {
     s.callLocIdx = 129; s.pc = 10; return s.tmp_2;
   case 10:
     r0 = s.retval;
-    r0 = (s.unnamed20877___U3 + 1);
-    s.unnamed20877___U3 = (r0);
+    r0 = (s.unnamed3901___U3 + 1);
+    s.unnamed3901___U3 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed20876___U2 = (undefined);
-    globals.in_game___426863 = (true);
-    s.tmp_0 = timer_after__P188811_mk(s);
+    s.unnamed3900___U2 = (undefined);
+    globals.in_game___88803 = (true);
+    s.tmp_0 = timer_after__P3594_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P426891;
+    s.tmp_0.arg1 = inline__P88831;
     s.callLocIdx = 131; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    globals.in_game___426863 = (false);
-    s.tmp_0 = game_over__P187759_mk(s);
-    s.tmp_0.arg0 = globals.player_made_it___426897;
+    globals.in_game___88803 = (false);
+    s.tmp_0 = game_over__P2542_mk(s);
+    s.tmp_0.arg0 = globals.player_made_it___88837;
     s.tmp_0.arg1 = undefined;
     s.callLocIdx = 132; s.pc = 13; return s.tmp_0;
   case 13:
@@ -3004,12 +3032,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426859.info = {"start":5396,"length":537,"line":138,"column":20,"endLine":154,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P88799.info = {"start":8122,"length":537,"line":206,"column":20,"endLine":222,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P426859_mk(s) {
+function inline__P88799_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426859, depth: s.depth + 1,
+        parent: s, fn: inline__P88799, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3017,17 +3045,17 @@ function inline__P426859_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  index___426865: undefined,
-  sprite___426877: undefined,
-  unnamed20876___U2: undefined,
-  unnamed20877___U3: undefined,
+  index___88805: undefined,
+  sprite___88817: undefined,
+  unnamed3900___U2: undefined,
+  unnamed3901___U3: undefined,
 } }
 
 
 
 
 
-function inline__P426891(s) {
+function inline__P88831(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3037,7 +3065,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P187430_mk(s);
+    s.tmp_0 = info_startCountdown__P2213_mk(s);
     s.tmp_0.arg0 = 60;
     s.callLocIdx = 130; s.pc = 1; return s.tmp_0;
   case 1:
@@ -3046,12 +3074,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426891.info = {"start":5794,"length":59,"line":147,"column":25,"endLine":149,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P88831.info = {"start":8520,"length":59,"line":215,"column":25,"endLine":217,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P426891_mk(s) {
+function inline__P88831_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426891, depth: s.depth + 1,
+        parent: s, fn: inline__P88831, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3060,7 +3088,7 @@ function inline__P426891_mk(s) {
 
 
 
-function inline__P426907(s) {
+function inline__P88847(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3075,33 +3103,33 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    globals.player_made_it___426897 = (true);
-    s.tmp_0 = Sprite_setKind__P187288_mk(s);
+    globals.player_made_it___88837 = (true);
+    s.tmp_0 = Sprite_setKind__P2071_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.SurvivedPlayer___426665;
+    s.tmp_0.arg1 = globals.SurvivedPlayer___88590;
     s.callLocIdx = 136; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.last_15___426836);
+    r0 = pxsim_numops_toBoolDecr(globals.last_15___88776);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.last_15___426836 = (true);
-    s.tmp_0 = info_stopCountdown__P187431_mk(s);
+    globals.last_15___88776 = (true);
+    s.tmp_0 = info_stopCountdown__P2214_mk(s);
     s.callLocIdx = 137; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = timer_after__P188811_mk(s);
+    s.tmp_0 = timer_after__P3594_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P426920;
+    s.tmp_0.arg1 = inline__P88860;
     s.callLocIdx = 139; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = timer_background__P188812_mk(s);
-    s.tmp_0.arg0 = inline__P426923;
-    s.callLocIdx = 142; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = info_changeScoreBy__P2207_mk(s);
+    s.tmp_0.arg0 = 10000;
+    s.callLocIdx = 140; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 1:
@@ -3110,12 +3138,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426907.info = {"start":6107,"length":456,"line":159,"column":55,"endLine":175,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
+inline__P88847.info = {"start":8833,"length":303,"line":227,"column":55,"endLine":238,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","location"]}
 
-function inline__P426907_mk(s) {
+function inline__P88847_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426907, depth: s.depth + 1,
+        parent: s, fn: inline__P88847, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3127,7 +3155,7 @@ function inline__P426907_mk(s) {
 
 
 
-function inline__P426920(s) {
+function inline__P88860(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3137,7 +3165,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P187430_mk(s);
+    s.tmp_0 = info_startCountdown__P2213_mk(s);
     s.tmp_0.arg0 = 15;
     s.callLocIdx = 138; s.pc = 1; return s.tmp_0;
   case 1:
@@ -3146,12 +3174,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426920.info = {"start":6308,"length":59,"line":165,"column":25,"endLine":167,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P88860.info = {"start":9034,"length":59,"line":233,"column":25,"endLine":235,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P426920_mk(s) {
+function inline__P88860_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426920, depth: s.depth + 1,
+        parent: s, fn: inline__P88860, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3160,58 +3188,7 @@ function inline__P426920_mk(s) {
 
 
 
-function inline__P426923(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.index___426924 = undefined;
-    s.index___426924 = (0);
-  case 1:
-    r0 = (s.index___426924 < 100);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 2; continue; }
-    s.tmp_1 = info_changeScoreBy__P187424_mk(s);
-    s.tmp_1.arg0 = 1000;
-    s.callLocIdx = 140; s.pc = 3; return s.tmp_1;
-  case 3:
-    r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
-    s.tmp_0.arg0 = 10;
-    s.callLocIdx = 141; s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-    r0 = (s.index___426924 + 1);
-    s.index___426924 = (r0);
-    { step = 1; continue; }
-  case 2:
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P426923.info = {"start":6394,"length":160,"line":168,"column":25,"endLine":173,"endColumn":9,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P426923_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P426923, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  index___426924: undefined,
-} }
-
-
-
-
-
-function inline__P426935(s) {
+function inline__P88866(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3226,84 +3203,84 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Sprite_destroy__P187304_mk(s);
+    s.tmp_0 = Sprite_destroy__P2087_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.spray___188015;
+    s.tmp_0.arg1 = globals.spray___2798;
     s.tmp_0.arg2 = 100;
-    s.callLocIdx = 144; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 142; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = sprites_changeDataNumberBy__P188837_mk(s);
+    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = -16;
-    s.callLocIdx = 145; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 143; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P426946);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P88877);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P188811_mk(s);
+    s.tmp_1 = timer_after__P3594_mk(s);
     s.tmp_1.arg0 = 500;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 147; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 145; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P188959_mk(s);
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 148; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 146; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = s.arg1.fields["_image"];
     s.tmp_1 = r0;
-    r0 = pxsim.image.ofBuffer(_hex426956);
+    r0 = pxsim.image.ofBuffer(_hex88887);
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.equals(s.tmp_1, s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = Sprite_setImage__P187273_mk(s);
+    s.tmp_3 = Sprite_setImage__P2056_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex426960);
+    r0 = pxsim.image.ofBuffer(_hex88891);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 150; s.pc = 7; return s.tmp_3;
+    s.callLocIdx = 148; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex426964);
+    r0 = pxsim.image.ofBuffer(_hex88895);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 151; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 149; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 2:
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 5;
-    s.callLocIdx = 152; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 150; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P426967);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P88898);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P188811_mk(s);
+    s.tmp_1 = timer_after__P3594_mk(s);
     s.tmp_1.arg0 = 100;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 154; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 152; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426935.info = {"start":6617,"length":2821,"line":176,"column":52,"endLine":243,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
+inline__P88866.info = {"start":9190,"length":2821,"line":239,"column":52,"endLine":306,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
 
-function inline__P426935_mk(s) {
+function inline__P88866_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426935, depth: s.depth + 1,
+        parent: s, fn: inline__P88866, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3313,14 +3290,14 @@ function inline__P426935_mk(s) {
   arg1: undefined,
 } }
 
-const _hex426956 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex426960 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex426964 = pxsim.BufferMethods.createBufferFromHex("87042400100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110cbf111c3c3313c100bf1bccccccccc100bfbbf10f00cc0c00f0ffff0000000000")
+const _hex88887 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex88891 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex88895 = pxsim.BufferMethods.createBufferFromHex("87042400100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110cbf111c3c3313c100bf1bccccccccc100bfbbf10f00cc0c00f0ffff0000000000")
 
 
 
 
-function inline__P426946(s) {
+function inline__P88877(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3330,23 +3307,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = sprites_changeDataNumberBy__P188837_mk(s);
+    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = 18;
-    s.callLocIdx = 146; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 144; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426946.info = {"start":6772,"length":84,"line":179,"column":21,"endLine":181,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P88877.info = {"start":9345,"length":84,"line":242,"column":21,"endLine":244,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P426946_mk(s) {
+function inline__P88877_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426946, depth: s.depth + 1,
+        parent: s, fn: inline__P88877, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3355,7 +3332,7 @@ function inline__P426946_mk(s) {
 
 
 
-function inline__P426967(s) {
+function inline__P88898(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3365,22 +3342,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P188959_mk(s);
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 153; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 151; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426967.info = {"start":9349,"length":86,"line":240,"column":21,"endLine":242,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P88898.info = {"start":11922,"length":86,"line":303,"column":21,"endLine":305,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P426967_mk(s) {
+function inline__P88898_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426967, depth: s.depth + 1,
+        parent: s, fn: inline__P88898, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3389,7 +3366,7 @@ function inline__P426967_mk(s) {
 
 
 
-function inline__P427251(s) {
+function inline__P89182(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3404,17 +3381,17 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    globals.selected_option___426850 = (true);
+    globals.selected_option___88790 = (true);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427251.info = {"start":19819,"length":55,"line":396,"column":31,"endLine":398,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["option","index"]}
+inline__P89182.info = {"start":22392,"length":55,"line":459,"column":31,"endLine":461,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["option","index"]}
 
-function inline__P427251_mk(s) {
+function inline__P89182_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427251, depth: s.depth + 1,
+        parent: s, fn: inline__P89182, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -3424,7 +3401,7 @@ function inline__P427251_mk(s) {
 
 
 
-function inline__P427258(s) {
+function inline__P89189(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3441,97 +3418,97 @@ switch (step) {
     }
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = Sprite_destroy__P187304_mk(s);
+    s.tmp_0 = Sprite_destroy__P2087_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.spray___188015;
+    s.tmp_0.arg1 = globals.spray___2798;
     s.tmp_0.arg2 = 100;
-    s.callLocIdx = 203; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 201; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
   case 2:
-    s.tmp_0 = sprites_changeDataNumberBy__P188837_mk(s);
+    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = -16;
-    s.callLocIdx = 204; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 202; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P427269);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89200);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P188811_mk(s);
+    s.tmp_1 = timer_after__P3594_mk(s);
     s.tmp_1.arg0 = 500;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 206; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 204; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P188959_mk(s);
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 207; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 205; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
     r0 = s.arg1.fields["_image"];
     s.tmp_1 = r0;
-    r0 = pxsim.image.ofBuffer(_hex427279);
+    r0 = pxsim.image.ofBuffer(_hex89210);
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.equals(s.tmp_1, s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = Sprite_setImage__P187273_mk(s);
+    s.tmp_3 = Sprite_setImage__P2056_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex427283);
+    r0 = pxsim.image.ofBuffer(_hex89214);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 209; s.pc = 9; return s.tmp_3;
+    s.callLocIdx = 207; s.pc = 9; return s.tmp_3;
   case 9:
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    r0 = pxsim.image.ofBuffer(_hex427287);
+    r0 = pxsim.image.ofBuffer(_hex89218);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 210; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 208; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 4:
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 5;
-    s.callLocIdx = 211; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 209; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P427290);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89221);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = timer_after__P188811_mk(s);
+    s.tmp_1 = timer_after__P3594_mk(s);
     s.tmp_1.arg0 = 100;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 213; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 211; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = scene_cameraFollowSprite__P187681_mk(s);
+    s.tmp_0 = scene_cameraFollowSprite__P2464_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 214; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 212; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = timer_after__P188811_mk(s);
-    s.tmp_0.arg0 = 5000;
-    s.tmp_0.arg1 = inline__P427296;
-    s.callLocIdx = 216; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = timer_after__P3594_mk(s);
+    s.tmp_0.arg0 = 4500;
+    s.tmp_0.arg1 = inline__P89227;
+    s.callLocIdx = 215; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427258.info = {"start":19931,"length":2893,"line":399,"column":55,"endLine":472,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
+inline__P89189.info = {"start":22504,"length":2936,"line":462,"column":55,"endLine":537,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":["sprite","otherSprite"]}
 
-function inline__P427258_mk(s) {
+function inline__P89189_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427258, 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,
@@ -3541,14 +3518,14 @@ function inline__P427258_mk(s) {
   arg1: undefined,
 } }
 
-const _hex427279 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex427283 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
-const _hex427287 = pxsim.BufferMethods.createBufferFromHex("87042000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110c")
+const _hex89210 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex89214 = pxsim.BufferMethods.createBufferFromHex("8704240010000000f0ffff0000000000bfbbf10f00cc0c00bf1bccccccccc100bf111c3c3313c100bf11cc333333110cbf111c3333c1110cbf1bc1c3cc1c110cbffb1f111111110ff0fbbfbb1bc1fc0ff0bbbbbbbbbbbb0fc0bbcbbbbbbbdbfbbcbfbbccbbbbbbfdbcbfcbbbbbcbbffbbffbbbccbbccfdfbbfffccbbcbccddffff00cfccccccdd0c0000cfccccccdd0c0000f0ccccbccd00000000cfccbc0c00000000f0cccf0000000000c0bdfb0f00000000dcbdccfb00000000dccbccbb0f000000bcccffbcfb000000bc0c00fffb000000cc000000ff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+const _hex89218 = pxsim.BufferMethods.createBufferFromHex("87042000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cc000000ff000000bc0c00fffb000000bcccffbcfb000000dccbccbb0f000000dcbdccfb00000000c0bdfb0f00000000f0cccf0000000000cfccbc0c000000f0ccccbccd000000cfccccccdd0cff00cfccccccdd0cbfffccbbcbccddffbffbbbccbbccfdfbbcbfcbbbbbcbbffbbcbfbbccbbbbbbfdc0bbcbbbbbbbdbfbf0bbbbbbbbbbbb0ff0fbbfbb1bc1fc0fbffb1f111111110fbf1bc1c3cc1c110cbf111c3333c1110cbf11cc333333110c")
 
 
 
 
-function inline__P427269(s) {
+function inline__P89200(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3558,23 +3535,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = sprites_changeDataNumberBy__P188837_mk(s);
+    s.tmp_0 = sprites_changeDataNumberBy__P3620_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = 18;
-    s.callLocIdx = 205; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 203; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427269.info = {"start":20112,"length":84,"line":404,"column":21,"endLine":406,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89200.info = {"start":22685,"length":84,"line":467,"column":21,"endLine":469,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427269_mk(s) {
+function inline__P89200_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427269, depth: s.depth + 1,
+        parent: s, fn: inline__P89200, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3583,7 +3560,7 @@ function inline__P427269_mk(s) {
 
 
 
-function inline__P427290(s) {
+function inline__P89221(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3593,22 +3570,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = character_setCharacterAnimationsEnabled__P188959_mk(s);
+    s.tmp_0 = character_setCharacterAnimationsEnabled__P3742_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 212; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 210; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427290.info = {"start":22625,"length":86,"line":465,"column":21,"endLine":467,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89221.info = {"start":25198,"length":86,"line":528,"column":21,"endLine":530,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427290_mk(s) {
+function inline__P89221_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427290, depth: s.depth + 1,
+        parent: s, fn: inline__P89221, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3617,7 +3594,7 @@ function inline__P427290_mk(s) {
 
 
 
-function inline__P427296(s) {
+function inline__P89227(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3627,22 +3604,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_over__P187759_mk(s);
+    globals.in_game___88803 = (false);
+    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0.arg0 = 500;
+    s.callLocIdx = 213; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    s.tmp_0 = game_over__P2542_mk(s);
     s.tmp_0.arg0 = false;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 215; s.pc = 1; return s.tmp_0;
-  case 1:
+    s.callLocIdx = 214; s.pc = 2; return s.tmp_0;
+  case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427296.info = {"start":22777,"length":44,"line":469,"column":22,"endLine":471,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89227.info = {"start":25350,"length":87,"line":532,"column":22,"endLine":536,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427296_mk(s) {
+function inline__P89227_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427296, depth: s.depth + 1,
+        parent: s, fn: inline__P89227, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -3651,7 +3634,7 @@ function inline__P427296_mk(s) {
 
 
 
-function inline__P427538(s) {
+function inline__P89483(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3661,9 +3644,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_3.arg0 = globals.NPC___426659;
-    s.callLocIdx = 262; s.pc = 5; return s.tmp_3;
+    s.tmp_3 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_3.arg0 = globals.NPC___88584;
+    s.callLocIdx = 263; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -3676,43 +3659,43 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.player_made_it___426897;
+    r0 = globals.player_made_it___88837;
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    s.tmp_5 = info_stopCountdown__P187431_mk(s);
-    s.callLocIdx = 263; s.pc = 6; return s.tmp_5;
+    s.tmp_5 = info_stopCountdown__P2214_mk(s);
+    s.callLocIdx = 264; s.pc = 6; return s.tmp_5;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 1000;
-    s.callLocIdx = 264; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 265; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = info_startCountdown__P187430_mk(s);
+    s.tmp_0 = info_startCountdown__P2213_mk(s);
     s.tmp_0.arg0 = 0;
-    s.callLocIdx = 265; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 266; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 3:
   case 4:
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 266; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 267; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427538.info = {"start":67529,"length":191,"line":824,"column":8,"endLine":831,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89483.info = {"start":70523,"length":191,"line":895,"column":8,"endLine":902,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427538_mk(s) {
+function inline__P89483_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427538, depth: s.depth + 1,
+        parent: s, fn: inline__P89483, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3726,7 +3709,7 @@ function inline__P427538_mk(s) {
 
 
 
-function inline__P427550(s) {
+function inline__P89495(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3736,26 +3719,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___427230;
-    s.tmp_1 = update_minimap__P427144_mk(s);
-    s.callLocIdx = 268; s.pc = 2; return s.tmp_1;
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___89161;
+    s.tmp_1 = update_minimap__P89075_mk(s);
+    s.callLocIdx = 269; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 269; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 270; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427550.info = {"start":67730,"length":57,"line":832,"column":8,"endLine":834,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89495.info = {"start":70724,"length":57,"line":903,"column":8,"endLine":905,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427550_mk(s) {
+function inline__P89495_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427550, depth: s.depth + 1,
+        parent: s, fn: inline__P89495, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -3765,7 +3748,7 @@ function inline__P427550_mk(s) {
 
 
 
-function inline__P427555(s) {
+function inline__P89500(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -3775,35 +3758,35 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___426863);
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___88803);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 271; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 272; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.last_score_time___427304 = (r0);
-    s.tmp_0 = pause__P185619_mk(s);
+    globals.last_score_time___89237 = (r0);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 272; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 273; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = info_changeScoreBy__P187424_mk(s);
-    s.tmp_1 = r0 = globals.last_score_time___427304;
-    s.tmp_3 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 273; s.pc = 6; return s.tmp_3;
+    s.tmp_0 = info_changeScoreBy__P2207_mk(s);
+    s.tmp_1 = r0 = globals.last_score_time___89237;
+    s.tmp_3 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 274; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 274; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 275; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 275; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 276; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 2:
@@ -3811,230 +3794,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427555.info = {"start":67797,"length":193,"line":835,"column":8,"endLine":843,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P427555_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P427555, 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,
-} }
-
-
-
-
-
-function inline__P427566(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.sprite_shark___427569 = undefined;
-    s.unnamed20886___U1 = undefined;
-    s.unnamed20887___U2 = undefined;
-    s.sprite___427575 = undefined;
-    s.unnamed20888___U4 = undefined;
-    s.unnamed20889___U5 = undefined;
-    s.sprite___427592 = undefined;
-    s.unnamed20890___U7 = undefined;
-    s.unnamed20891___U8 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___426863);
-    if (!r0) { step = 15; continue; }
-    s.sprite_shark___427569 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.Enemy___187348;
-    s.callLocIdx = 277; s.pc = 17; return s.tmp_0;
-  case 17:
-    r0 = s.retval;
-    s.unnamed20886___U1 = (r0);
-    s.unnamed20887___U2 = (0);
-  case 1:
-    s.tmp_0 = r0 = s.unnamed20887___U2;
-    r0 = pxsim_Array__length(s.unnamed20886___U1);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0 < s.tmp_1);
-    if (!r0) { step = 14; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20886___U1, s.unnamed20887___U2);
-    s.sprite_shark___427569 = (r0);
-    globals.shortest_distance___427302 = (9999999999);
-    s.sprite___427575 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.NPC___426659;
-    s.callLocIdx = 278; s.pc = 18; return s.tmp_0;
-  case 18:
-    r0 = s.retval;
-    s.unnamed20888___U4 = (r0);
-    s.unnamed20889___U5 = (0);
-  case 2:
-    s.tmp_0 = r0 = s.unnamed20889___U5;
-    r0 = pxsim_Array__length(s.unnamed20888___U4);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0 < s.tmp_1);
-    if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20888___U4, s.unnamed20889___U5);
-    s.sprite___427575 = (r0);
-    s.tmp_4 = spriteutils_distanceBetween__P188849_mk(s);
-    s.tmp_4.arg0 = s.sprite_shark___427569;
-    s.tmp_4.arg1 = s.sprite___427575;
-    s.callLocIdx = 279; s.pc = 19; return s.tmp_4;
-  case 19:
-    r0 = s.retval;
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 < globals.shortest_distance___427302);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    if (!r0) { step = 3; continue; }
-    s.tmp_5 = spriteutils_distanceBetween__P188849_mk(s);
-    s.tmp_5.arg0 = s.sprite_shark___427569;
-    s.tmp_5.arg1 = s.sprite___427575;
-    s.callLocIdx = 280; s.pc = 20; return s.tmp_5;
-  case 20:
-    r0 = s.retval;
-    globals.shortest_distance___427302 = (r0);
-    globals.sprite_closest_sprite___427300 = (s.sprite___427575);
-  case 3:
-  case 4:
-    r0 = (s.unnamed20889___U5 + 1);
-    s.unnamed20889___U5 = (r0);
-    { step = 2; continue; }
-  case 5:
-    s.unnamed20888___U4 = (undefined);
-    s.sprite___427592 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.Player___187345;
-    s.callLocIdx = 281; s.pc = 21; return s.tmp_0;
-  case 21:
-    r0 = s.retval;
-    s.unnamed20890___U7 = (r0);
-    s.unnamed20891___U8 = (0);
-  case 6:
-    s.tmp_0 = r0 = s.unnamed20891___U8;
-    r0 = pxsim_Array__length(s.unnamed20890___U7);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0 < s.tmp_1);
-    if (!r0) { step = 9; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20890___U7, s.unnamed20891___U8);
-    s.sprite___427592 = (r0);
-    s.tmp_4 = spriteutils_distanceBetween__P188849_mk(s);
-    s.tmp_4.arg0 = s.sprite_shark___427569;
-    s.tmp_4.arg1 = s.sprite___427592;
-    s.callLocIdx = 282; s.pc = 22; return s.tmp_4;
-  case 22:
-    r0 = s.retval;
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 < globals.shortest_distance___427302);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    if (!r0) { step = 7; continue; }
-    s.tmp_5 = spriteutils_distanceBetween__P188849_mk(s);
-    s.tmp_5.arg0 = s.sprite_shark___427569;
-    s.tmp_5.arg1 = s.sprite___427592;
-    s.callLocIdx = 283; s.pc = 23; return s.tmp_5;
-  case 23:
-    r0 = s.retval;
-    globals.shortest_distance___427302 = (r0);
-    globals.sprite_closest_sprite___427300 = (s.sprite___427592);
-  case 7:
-  case 8:
-    r0 = (s.unnamed20891___U8 + 1);
-    s.unnamed20891___U8 = (r0);
-    { step = 6; continue; }
-  case 9:
-    s.unnamed20890___U7 = (undefined);
-    r0 = globals.sprite_closest_sprite___427300.fields["_kind"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 == globals.NPC___426659);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 10; continue; }
-    r0 = s.tmp_0;
-    { step = 11; continue; }
-  case 10:
-    r0 = globals.sprite_closest_sprite___427300.fields["_kind"];
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 == globals.Player___187345);
-  case 11:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 12; continue; }
-    s.tmp_4 = Sprite_follow__P187306_mk(s);
-    s.tmp_4.arg0 = s.sprite_shark___427569;
-    s.tmp_4.arg1 = globals.sprite_closest_sprite___427300;
-    s.tmp_6 = sprites_readDataNumber__P188838_mk(s);
-    s.tmp_6.arg0 = s.sprite_shark___427569;
-    s.tmp_6.arg1 = "speed_dif";
-    s.callLocIdx = 286; s.pc = 25; return s.tmp_6;
-  case 25:
-    r0 = s.retval;
-    s.tmp_5 = r0;
-    r0 = (48 + s.tmp_5);
-    s.tmp_4.arg2 = r0;
-    s.tmp_4.arg3 = 400;
-    s.callLocIdx = 287; s.pc = 24; return s.tmp_4;
-  case 24:
-    r0 = s.retval;
-    { step = 13; continue; }
-  case 12:
-    s.tmp_0 = Sprite_follow__P187306_mk(s);
-    s.tmp_0.arg0 = s.sprite_shark___427569;
-    s.tmp_0.arg1 = globals.sprite_closest_sprite___427300;
-    s.tmp_0.arg2 = 0;
-    s.tmp_0.arg3 = 400;
-    s.callLocIdx = 288; s.pc = 26; return s.tmp_0;
-  case 26:
-    r0 = s.retval;
-  case 13:
-    r0 = (s.unnamed20887___U2 + 1);
-    s.unnamed20887___U2 = (r0);
-    { step = 1; continue; }
-  case 14:
-    s.unnamed20886___U1 = (undefined);
-  case 15:
-  case 16:
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P427566.info = {"start":68000,"length":1167,"line":844,"column":8,"endLine":867,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89500.info = {"start":70791,"length":193,"line":906,"column":8,"endLine":914,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427566_mk(s) {
+function inline__P89500_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427566, depth: s.depth + 1,
+        parent: s, fn: inline__P89500, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  sprite_shark___427569: undefined,
-  unnamed20886___U1: undefined,
-  unnamed20887___U2: undefined,
-  sprite___427575: undefined,
-  unnamed20888___U4: undefined,
-  unnamed20889___U5: undefined,
-  sprite___427592: undefined,
-  unnamed20890___U7: undefined,
-  unnamed20891___U8: undefined,
 } }
 
 
 
 
 
-function inline__P427631(s) {
+function inline__P89511(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4044,50 +3821,50 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sprite_fish___427634 = undefined;
-    s.unnamed20892___U1 = undefined;
-    s.unnamed20893___U2 = undefined;
-    s.sprite_shark___427639 = undefined;
-    s.unnamed20894___U4 = undefined;
-    s.unnamed20895___U5 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.in_game___426863);
+    s.sprite_fish___89514 = undefined;
+    s.unnamed3910___U1 = undefined;
+    s.unnamed3911___U2 = undefined;
+    s.sprite_shark___89519 = undefined;
+    s.unnamed3912___U4 = undefined;
+    s.unnamed3913___U5 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___88803);
     if (!r0) { step = 11; continue; }
-    s.sprite_fish___427634 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.NPC___426659;
-    s.callLocIdx = 290; s.pc = 13; return s.tmp_0;
+    s.sprite_fish___89514 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.NPC___88584;
+    s.callLocIdx = 278; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.unnamed20892___U1 = (r0);
-    s.unnamed20893___U2 = (0);
+    s.unnamed3910___U1 = (r0);
+    s.unnamed3911___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed20893___U2;
-    r0 = pxsim_Array__length(s.unnamed20892___U1);
+    s.tmp_0 = r0 = s.unnamed3911___U2;
+    r0 = pxsim_Array__length(s.unnamed3910___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20892___U1, s.unnamed20893___U2);
-    s.sprite_fish___427634 = (r0);
-    s.sprite_shark___427639 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.Enemy___187348;
-    s.callLocIdx = 291; s.pc = 14; return s.tmp_0;
+    r0 = pxsim_Array__getAt(s.unnamed3910___U1, s.unnamed3911___U2);
+    s.sprite_fish___89514 = (r0);
+    s.sprite_shark___89519 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.Enemy___2131;
+    s.callLocIdx = 279; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.unnamed20894___U4 = (r0);
-    s.unnamed20895___U5 = (0);
+    s.unnamed3912___U4 = (r0);
+    s.unnamed3913___U5 = (0);
   case 2:
-    s.tmp_0 = r0 = s.unnamed20895___U5;
-    r0 = pxsim_Array__length(s.unnamed20894___U4);
+    s.tmp_0 = r0 = s.unnamed3913___U5;
+    r0 = pxsim_Array__length(s.unnamed3912___U4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20894___U4, s.unnamed20895___U5);
-    s.sprite_shark___427639 = (r0);
-    s.tmp_4 = spriteutils_distanceBetween__P188849_mk(s);
-    s.tmp_4.arg0 = s.sprite_fish___427634;
-    s.tmp_4.arg1 = s.sprite_shark___427639;
-    s.callLocIdx = 292; s.pc = 15; return s.tmp_4;
+    r0 = pxsim_Array__getAt(s.unnamed3912___U4, s.unnamed3913___U5);
+    s.sprite_shark___89519 = (r0);
+    s.tmp_4 = spriteutils_distanceBetween__P3632_mk(s);
+    s.tmp_4.arg0 = s.sprite_fish___89514;
+    s.tmp_4.arg1 = s.sprite_shark___89519;
+    s.callLocIdx = 280; s.pc = 15; return s.tmp_4;
   case 15:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -4098,10 +3875,10 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 4; continue; }
   case 3:
-    s.tmp_7 = sprites_readDataBoolean__P188842_mk(s);
-    s.tmp_7.arg0 = s.sprite_fish___427634;
+    s.tmp_7 = sprites_readDataBoolean__P3625_mk(s);
+    s.tmp_7.arg0 = s.sprite_fish___89514;
     s.tmp_7.arg1 = "running_away";
-    s.callLocIdx = 293; s.pc = 16; return s.tmp_7;
+    s.callLocIdx = 281; s.pc = 16; return s.tmp_7;
   case 16:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -4113,84 +3890,84 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 7; continue; }
-    s.tmp_9 = scene_followPath__P188876_mk(s);
-    s.tmp_9.arg0 = s.sprite_fish___427634;
-    s.tmp_10 = r0 = globals.paths___426761;
-    s.tmp_12 = sprites_readDataNumber__P188838_mk(s);
-    s.tmp_12.arg0 = s.sprite_fish___427634;
+    s.tmp_9 = scene_followPath__P3659_mk(s);
+    s.tmp_9.arg0 = s.sprite_fish___89514;
+    s.tmp_10 = r0 = globals.paths___88701;
+    s.tmp_12 = sprites_readDataNumber__P3621_mk(s);
+    s.tmp_12.arg0 = s.sprite_fish___89514;
     s.tmp_12.arg1 = "path_index";
-    s.callLocIdx = 294; s.pc = 18; return s.tmp_12;
+    s.callLocIdx = 282; s.pc = 18; return s.tmp_12;
   case 18:
     r0 = s.retval;
     s.tmp_11 = r0;
     r0 = pxsim_Array__getAt(s.tmp_10, s.tmp_11);
     s.tmp_9.arg1 = r0;
     s.tmp_9.arg2 = 0;
-    s.callLocIdx = 295; s.pc = 17; return s.tmp_9;
+    s.callLocIdx = 283; s.pc = 17; return s.tmp_9;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = spriteutils_setVelocityAtAngle__P188852_mk(s);
-    s.tmp_0.arg0 = s.sprite_fish___427634;
-    s.tmp_1 = spriteutils_angleFrom__P188850_mk(s);
-    s.tmp_1.arg0 = s.sprite_shark___427639;
-    s.tmp_1.arg1 = s.sprite_fish___427634;
-    s.callLocIdx = 296; s.pc = 20; return s.tmp_1;
+    s.tmp_0 = spriteutils_setVelocityAtAngle__P3635_mk(s);
+    s.tmp_0.arg0 = s.sprite_fish___89514;
+    s.tmp_1 = spriteutils_angleFrom__P3633_mk(s);
+    s.tmp_1.arg0 = s.sprite_shark___89519;
+    s.tmp_1.arg1 = s.sprite_fish___89514;
+    s.callLocIdx = 284; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 70;
-    s.callLocIdx = 297; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 285; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataBoolean__P188841_mk(s);
-    s.tmp_0.arg0 = s.sprite_fish___427634;
+    s.tmp_0 = sprites_setDataBoolean__P3624_mk(s);
+    s.tmp_0.arg0 = s.sprite_fish___89514;
     s.tmp_0.arg1 = "running_away";
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 298; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 286; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P427667);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P89547);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite_fish___427634);
-    s.tmp_1 = timer_after__P188811_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite_fish___89514);
+    s.tmp_1 = timer_after__P3594_mk(s);
     s.tmp_1.arg0 = 500;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 306; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 294; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
   case 5:
   case 6:
   case 7:
   case 8:
-    r0 = (s.unnamed20895___U5 + 1);
-    s.unnamed20895___U5 = (r0);
+    r0 = (s.unnamed3913___U5 + 1);
+    s.unnamed3913___U5 = (r0);
     { step = 2; continue; }
   case 9:
-    s.unnamed20894___U4 = (undefined);
-    s.tmp_0 = pause__P185619_mk(s);
+    s.unnamed3912___U4 = (undefined);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 50;
-    s.callLocIdx = 307; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 295; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    r0 = (s.unnamed20893___U2 + 1);
-    s.unnamed20893___U2 = (r0);
+    r0 = (s.unnamed3911___U2 + 1);
+    s.unnamed3911___U2 = (r0);
     { step = 1; continue; }
   case 10:
-    s.unnamed20892___U1 = (undefined);
+    s.unnamed3910___U1 = (undefined);
   case 11:
   case 12:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427631.info = {"start":69177,"length":1171,"line":868,"column":8,"endLine":887,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89511.info = {"start":70994,"length":1171,"line":915,"column":8,"endLine":934,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427631_mk(s) {
+function inline__P89511_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427631, depth: s.depth + 1,
+        parent: s, fn: inline__P89511, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4205,19 +3982,19 @@ function inline__P427631_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  sprite_fish___427634: undefined,
-  unnamed20892___U1: undefined,
-  unnamed20893___U2: undefined,
-  sprite_shark___427639: undefined,
-  unnamed20894___U4: undefined,
-  unnamed20895___U5: undefined,
+  sprite_fish___89514: undefined,
+  unnamed3910___U1: undefined,
+  unnamed3911___U2: undefined,
+  sprite_shark___89519: undefined,
+  unnamed3912___U4: undefined,
+  unnamed3913___U5: undefined,
 } }
 
 
 
 
 
-function inline__P427667(s) {
+function inline__P89547(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4227,61 +4004,61 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_followPath__P188876_mk(s);
+    s.tmp_0 = scene_followPath__P3659_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = scene_aStar__P188872_mk(s);
-    s.tmp_2 = tiles_locationOfSprite__P188992_mk(s);
+    s.tmp_1 = scene_aStar__P3655_mk(s);
+    s.tmp_2 = tiles_locationOfSprite__P3775_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 299; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 287; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.tmp_3 = tiles_getTileLocation__P187561_mk(s);
-    s.tmp_4 = sprites_readDataNumber__P188838_mk(s);
+    s.tmp_3 = tiles_getTileLocation__P2344_mk(s);
+    s.tmp_4 = sprites_readDataNumber__P3621_mk(s);
     s.tmp_4.arg0 = s.caps[0];
     s.tmp_4.arg1 = "target_col";
-    s.callLocIdx = 300; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 288; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3.arg0 = r0;
-    s.tmp_5 = sprites_readDataNumber__P188838_mk(s);
+    s.tmp_5 = sprites_readDataNumber__P3621_mk(s);
     s.tmp_5.arg0 = s.caps[0];
     s.tmp_5.arg1 = "target_row";
-    s.callLocIdx = 301; s.pc = 6; return s.tmp_5;
+    s.callLocIdx = 289; s.pc = 6; return s.tmp_5;
   case 6:
     r0 = s.retval;
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 302; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 290; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = null;
-    s.callLocIdx = 303; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 291; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
     r0 = pxsim.Math_.randomRange(40, 80);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 304; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 292; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataBoolean__P188841_mk(s);
+    s.tmp_0 = sprites_setDataBoolean__P3624_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = "running_away";
     s.tmp_0.arg2 = false;
-    s.callLocIdx = 305; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 293; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P427667.info = {"start":69877,"length":376,"line":877,"column":41,"endLine":880,"endColumn":25,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P89547.info = {"start":71694,"length":376,"line":924,"column":41,"endLine":927,"endColumn":25,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P427667_mk(s) {
+function inline__P89547_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P427667, depth: s.depth + 1,
+        parent: s, fn: inline__P89547, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4295,7 +4072,7 @@ function inline__P427667_mk(s) {
 
 
 
-function tiles_locationOfSprite__P188992(s) {
+function inline__P89564(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4305,59 +4082,203 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = tiles_getTileLocation__P187561_mk(s);
-    s.tmp_1 = tiles_screenCoordinateToTile__P189014_mk(s);
-    s.tmp_2 = Sprite_x__P187242_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 2087; s.pc = 3; return s.tmp_2;
-  case 3:
+    s.sprite_shark___89567 = undefined;
+    s.unnamed3914___U1 = undefined;
+    s.unnamed3915___U2 = undefined;
+    s.sprite___89573 = undefined;
+    s.unnamed3916___U4 = undefined;
+    s.unnamed3917___U5 = undefined;
+    s.sprite___89590 = undefined;
+    s.unnamed3918___U7 = undefined;
+    s.unnamed3919___U8 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.in_game___88803);
+    if (!r0) { step = 15; continue; }
+    s.sprite_shark___89567 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.Enemy___2131;
+    s.callLocIdx = 297; s.pc = 17; return s.tmp_0;
+  case 17:
     r0 = s.retval;
-    s.tmp_1.arg0 = r0;
-    s.callLocIdx = 2088; s.pc = 2; return s.tmp_1;
+    s.unnamed3914___U1 = (r0);
+    s.unnamed3915___U2 = (0);
+  case 1:
+    s.tmp_0 = r0 = s.unnamed3915___U2;
+    r0 = pxsim_Array__length(s.unnamed3914___U1);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 < s.tmp_1);
+    if (!r0) { step = 14; continue; }
+    r0 = pxsim_Array__getAt(s.unnamed3914___U1, s.unnamed3915___U2);
+    s.sprite_shark___89567 = (r0);
+    globals.shortest_distance___89235 = (9999999999);
+    s.sprite___89573 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.NPC___88584;
+    s.callLocIdx = 298; s.pc = 18; return s.tmp_0;
+  case 18:
+    r0 = s.retval;
+    s.unnamed3916___U4 = (r0);
+    s.unnamed3917___U5 = (0);
   case 2:
+    s.tmp_0 = r0 = s.unnamed3917___U5;
+    r0 = pxsim_Array__length(s.unnamed3916___U4);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 < s.tmp_1);
+    if (!r0) { step = 5; continue; }
+    r0 = pxsim_Array__getAt(s.unnamed3916___U4, s.unnamed3917___U5);
+    s.sprite___89573 = (r0);
+    s.tmp_4 = spriteutils_distanceBetween__P3632_mk(s);
+    s.tmp_4.arg0 = s.sprite_shark___89567;
+    s.tmp_4.arg1 = s.sprite___89573;
+    s.callLocIdx = 299; s.pc = 19; return s.tmp_4;
+  case 19:
     r0 = s.retval;
-    s.tmp_0.arg0 = r0;
-    s.tmp_3 = tiles_screenCoordinateToTile__P189014_mk(s);
-    s.tmp_4 = Sprite_y__P187244_mk(s);
-    s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 2089; s.pc = 5; return s.tmp_4;
-  case 5:
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 < globals.shortest_distance___89235);
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 3; continue; }
+    s.tmp_5 = spriteutils_distanceBetween__P3632_mk(s);
+    s.tmp_5.arg0 = s.sprite_shark___89567;
+    s.tmp_5.arg1 = s.sprite___89573;
+    s.callLocIdx = 300; s.pc = 20; return s.tmp_5;
+  case 20:
     r0 = s.retval;
-    s.tmp_3.arg0 = r0;
-    s.callLocIdx = 2090; s.pc = 4; return s.tmp_3;
+    globals.shortest_distance___89235 = (r0);
+    globals.sprite_closest_sprite___89233 = (s.sprite___89573);
+  case 3:
   case 4:
+    r0 = (s.unnamed3917___U5 + 1);
+    s.unnamed3917___U5 = (r0);
+    { step = 2; continue; }
+  case 5:
+    s.unnamed3916___U4 = (undefined);
+    s.sprite___89590 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.Player___2128;
+    s.callLocIdx = 301; s.pc = 21; return s.tmp_0;
+  case 21:
     r0 = s.retval;
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2091; s.pc = 1; return s.tmp_0;
-  case 1:
+    s.unnamed3918___U7 = (r0);
+    s.unnamed3919___U8 = (0);
+  case 6:
+    s.tmp_0 = r0 = s.unnamed3919___U8;
+    r0 = pxsim_Array__length(s.unnamed3918___U7);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 < s.tmp_1);
+    if (!r0) { step = 9; continue; }
+    r0 = pxsim_Array__getAt(s.unnamed3918___U7, s.unnamed3919___U8);
+    s.sprite___89590 = (r0);
+    s.tmp_4 = spriteutils_distanceBetween__P3632_mk(s);
+    s.tmp_4.arg0 = s.sprite_shark___89567;
+    s.tmp_4.arg1 = s.sprite___89590;
+    s.callLocIdx = 302; s.pc = 22; return s.tmp_4;
+  case 22:
+    r0 = s.retval;
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 < globals.shortest_distance___89235);
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 7; continue; }
+    s.tmp_5 = spriteutils_distanceBetween__P3632_mk(s);
+    s.tmp_5.arg0 = s.sprite_shark___89567;
+    s.tmp_5.arg1 = s.sprite___89590;
+    s.callLocIdx = 303; s.pc = 23; return s.tmp_5;
+  case 23:
+    r0 = s.retval;
+    globals.shortest_distance___89235 = (r0);
+    globals.sprite_closest_sprite___89233 = (s.sprite___89590);
+  case 7:
+  case 8:
+    r0 = (s.unnamed3919___U8 + 1);
+    s.unnamed3919___U8 = (r0);
+    { step = 6; continue; }
+  case 9:
+    s.unnamed3918___U7 = (undefined);
+    r0 = globals.sprite_closest_sprite___89233.fields["_kind"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 == globals.NPC___88584);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 10; continue; }
+    r0 = s.tmp_0;
+    { step = 11; continue; }
+  case 10:
+    r0 = globals.sprite_closest_sprite___89233.fields["_kind"];
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 == globals.Player___2128);
+  case 11:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 12; continue; }
+    s.tmp_4 = Sprite_follow__P2089_mk(s);
+    s.tmp_4.arg0 = s.sprite_shark___89567;
+    s.tmp_4.arg1 = globals.sprite_closest_sprite___89233;
+    s.tmp_6 = sprites_readDataNumber__P3621_mk(s);
+    s.tmp_6.arg0 = s.sprite_shark___89567;
+    s.tmp_6.arg1 = "speed_dif";
+    s.callLocIdx = 306; s.pc = 25; return s.tmp_6;
+  case 25:
+    r0 = s.retval;
+    s.tmp_5 = r0;
+    r0 = (48 + s.tmp_5);
+    s.tmp_4.arg2 = r0;
+    s.tmp_4.arg3 = 400;
+    s.callLocIdx = 307; s.pc = 24; return s.tmp_4;
+  case 24:
+    r0 = s.retval;
+    { step = 13; continue; }
+  case 12:
+    s.tmp_0 = Sprite_follow__P2089_mk(s);
+    s.tmp_0.arg0 = s.sprite_shark___89567;
+    s.tmp_0.arg1 = globals.sprite_closest_sprite___89233;
+    s.tmp_0.arg2 = 0;
+    s.tmp_0.arg3 = 400;
+    s.callLocIdx = 308; s.pc = 26; return s.tmp_0;
+  case 26:
     r0 = s.retval;
+  case 13:
+    r0 = (s.unnamed3915___U2 + 1);
+    s.unnamed3915___U2 = (r0);
+    { step = 1; continue; }
+  case 14:
+    s.unnamed3914___U1 = (undefined);
+  case 15:
+  case 16:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_locationOfSprite__P188992.info = {"start":9471,"length":165,"line":260,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationOfSprite","argumentNames":["s"]}
+inline__P89564.info = {"start":72175,"length":1167,"line":935,"column":8,"endLine":958,"endColumn":1,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function tiles_locationOfSprite__P188992_mk(s) {
+function inline__P89564_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_locationOfSprite__P188992, depth: s.depth + 1,
+        parent: s, fn: inline__P89564, 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,
-  arg0: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  sprite_shark___89567: undefined,
+  unnamed3914___U1: undefined,
+  unnamed3915___U2: undefined,
+  sprite___89573: undefined,
+  unnamed3916___U4: undefined,
+  unnamed3917___U5: undefined,
+  sprite___89590: undefined,
+  unnamed3918___U7: undefined,
+  unnamed3919___U8: undefined,
 } }
 
 
 
 
 
-function tiles_screenCoordinateToTile__P189014(s) {
+function Sprite_follow__P2089(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4367,172 +4288,172 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___205923 = undefined;
+    s.sc___7444 = undefined;
+    s.lastTime___7453 = undefined;
+    s.fs___7596 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 2108; s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-    r0 = r0.fields["tileMap"];
-    s.tm___205923 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___205923);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    r0 = (s.arg1 === s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = (s.arg0 >> 4);
-    { step = 3; continue; }
+    { step = 13; continue; }
   case 1:
   case 2:
-    s.tmp_2 = r0 = s.arg0;
-    r0 = s.tm___205923.fields["_scale"];
-    s.tmp_3 = r0;
-    r0 = (s.tmp_2 >> s.tmp_3);
-  case 3:
-    return leave(s, r0)
-  default: oops()
-} } }
-tiles_screenCoordinateToTile__P189014.info = {"start":14355,"length":380,"line":413,"column":4,"endLine":420,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
-
-function tiles_screenCoordinateToTile__P189014_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: tiles_screenCoordinateToTile__P189014, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tm___205923: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function tiles_TileMap_scale__P187536(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, tiles_TileMap__C187534_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_scale"];
-    return leaveAccessor(s, r0)
-  default: oops()
-} } }
-tiles_TileMap_scale__P187536.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__P187536.isGetter = true;
-
-function tiles_TileMap_scale__P187536_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: tiles_TileMap_scale__P187536, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function Sprite_y__P187244(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_y"];
+    s.tmp_1 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 443; s.pc = 14; return s.tmp_1;
+  case 14:
+    r0 = s.retval;
+    s.sc___7444 = (r0);
+    r0 = s.sc___7444.fields["followingSprites"];
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 / 256);
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = s.arg0.fields["_image"];
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 3; continue; }
+    s.tmp_3 = r0 = s.sc___7444;
+    r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
-    r0 = pxsim_ImageMethods.height(s.tmp_4);
+    r0 = (s.tmp_3).fields["followingSprites"] = (s.tmp_4);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.lastTime___7453 = (r0);
+    s.tmp_0 = r0 = s.lastTime___7453;
+    s.tmp_2 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 444; s.pc = 15; return s.tmp_2;
+  case 15:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P7459);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.lastTime___7453);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.sc___7444);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
+    r0 = s.sc___7444.fields["eventContext"];
+    s.tmp_1.arg0 = r0;
+    s.tmp_1.arg1 = 14;
+    s.tmp_1.arg2 = s.tmp_0;
+    s.callLocIdx = 470; s.pc = 16; return s.tmp_1;
+  case 16:
+    r0 = s.retval;
+  case 3:
+  case 4:
+    r0 = pxsim_pxtcore_mkAction(1, inline__P7598);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
+    s.tmp_1 = helpers_arrayFind__P109_mk(s);
+    r0 = s.sc___7444.fields["followingSprites"];
+    s.tmp_1.arg0 = r0;
+    s.tmp_1.arg1 = s.tmp_0;
+    s.callLocIdx = 471; s.pc = 17; return s.tmp_1;
+  case 17:
+    r0 = s.retval;
+    s.fs___7596 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 5; continue; }
+    r0 = s.tmp_0;
+    { step = 6; continue; }
+  case 5:
+    r0 = pxsim_numops_toBoolDecr(s.arg2);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+  case 6:
+    // jmp value (already in r0)
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / 2);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 9; continue; }
+    r0 = pxsim_numops_toBoolDecr(s.fs___7596);
+    if (!r0) { step = 7; continue; }
+    r0 = s.sc___7444.fields["followingSprites"];
+    s.tmp_4 = r0;
+    r0 = pxsim_Array_.removeElement(s.tmp_4, s.fs___7596);
+    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = 0;
+    s.callLocIdx = 472; s.pc = 18; return s.tmp_0;
+  case 18:
+    r0 = s.retval;
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = 0;
+    s.callLocIdx = 473; s.pc = 19; return s.tmp_0;
+  case 19:
+    r0 = s.retval;
+  case 7:
+  case 8:
+    { step = 12; continue; }
+  case 9:
+    r0 = pxsim_numops_toBoolDecr(s.fs___7596);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 10; continue; }
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_FollowingSprite__C1972_VT);
     s.tmp_2 = r0;
-    r0 = (s.tmp_0 + s.tmp_2);
-    return leaveAccessor(s, r0)
+    s.tmp_3 = sprites_FollowingSprite_constructor__P1973_mk(s);
+    s.tmp_3.arg0 = s.tmp_2;
+    s.tmp_3.arg1 = s.arg0;
+    s.tmp_3.arg2 = s.arg1;
+    s.tmp_3.arg3 = s.arg2;
+    s.tmp_3.arg4 = s.arg3;
+    s.callLocIdx = 474; s.pc = 20; return s.tmp_3;
+  case 20:
+    r0 = s.retval;
+    r0 = s.sc___7444.fields["followingSprites"];
+    s.tmp_4 = r0;
+    r0 = pxsim_Array__push(s.tmp_4, s.tmp_2);
+    { step = 11; continue; }
+  case 10:
+    r0 = (s.fs___7596).fields["target"] = (s.arg1);
+    r0 = (s.fs___7596).fields["rate"] = (s.arg2);
+    r0 = (s.fs___7596).fields["turnRate"] = (s.arg3);
+  case 11:
+  case 12:
+  case 13:
+    r0 = undefined;
+    return leave(s, r0)
   default: oops()
 } } }
-Sprite_y__P187244.info = {"start":1849,"length":85,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this"]}
-Sprite_y__P187244.isGetter = true;
+Sprite_follow__P2089.info = {"start":30060,"length":3128,"line":899,"column":4,"endLine":978,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"follow","argumentNames":["this","target","speed","turnRate"]}
 
-function Sprite_y__P187244_mk(s) {
+function Sprite_follow__P2089_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_y__P187244, depth: s.depth + 1,
+        parent: s, fn: Sprite_follow__P2089, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
+  sc___7444: undefined,
+  lastTime___7453: undefined,
+  fs___7596: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
 } }
 
 
 
 
 
-function Fx_toFloat__P185383(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 / 256);
-    return leave(s, r0)
-  default: oops()
-} } }
-Fx_toFloat__P185383.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__P185383_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: Fx_toFloat__P185383, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function Sprite_x__P187242(s) {
+function inline__P7459(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4542,47 +4463,77 @@ 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;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_x"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 / 256);
+    s.currTime___7460 = undefined;
+    s.timeDiff___7463 = undefined;
+    s.destroyedSprites___7469 = undefined;
+    s.tmp_0 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 445; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+    s.currTime___7460 = (r0);
+    s.tmp_1 = r0 = s.currTime___7460;
+    r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
-    r0 = s.arg0.fields["_image"];
-    s.tmp_4 = r0;
-    r0 = pxsim_ImageMethods.width(s.tmp_4);
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 / 2);
+    r0 = (s.tmp_0 / 1000);
+    s.timeDiff___7463 = (r0);
+    r0 = pxsim_pxtrt.mklocRef();
+    s.destroyedSprites___7469 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.destroyedSprites___7469, false);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P7473);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.destroyedSprites___7469);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.timeDiff___7463);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    r0 = s.caps[1].fields["followingSprites"];
+    s.tmp_1.arg0 = r0;
+    s.tmp_1.arg1 = s.tmp_0;
+    s.callLocIdx = 468; s.pc = 4; return s.tmp_1;
+  case 4:
+    r0 = s.retval;
+    r0 = pxsim_pxtrt_stlocRef(s.caps[0], s.currTime___7460);
+    r0 = pxsim_pxtrt_ldlocRef(s.destroyedSprites___7469);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_1 = r0 = s.caps[1];
+    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
+    r0 = s.caps[1].fields["followingSprites"];
+    s.tmp_3.arg0 = r0;
+    s.tmp_3.arg1 = inline__P7580;
+    s.callLocIdx = 469; s.pc = 5; return s.tmp_3;
+  case 5:
+    r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = (s.tmp_0 + s.tmp_2);
-    return leaveAccessor(s, r0)
+    r0 = (s.tmp_1).fields["followingSprites"] = (s.tmp_2);
+  case 1:
+  case 2:
+    r0 = undefined;
+    return leave(s, r0)
   default: oops()
 } } }
-Sprite_x__P187242.info = {"start":1501,"length":84,"line":70,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this"]}
-Sprite_x__P187242.isGetter = true;
+inline__P7459.info = {"start":30389,"length":2197,"line":907,"column":79,"endLine":955,"endColumn":13,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":[]}
 
-function Sprite_x__P187242_mk(s) {
+function inline__P7459_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_x__P187242, depth: s.depth + 1,
+        parent: s, fn: inline__P7459, 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,
-  arg0: undefined,
+  currTime___7460: undefined,
+  timeDiff___7463: undefined,
+  destroyedSprites___7469: undefined,
 } }
 
 
 
 
 
-function scene_aStar__P188872(s) {
+function inline__P7473(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4592,62 +4543,260 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___205953 = undefined;
+    s.target___7476 = undefined;
+    s.self___7477 = undefined;
+    s.turnRate___7478 = undefined;
+    s.rate___7479 = undefined;
+    s.dx___7493 = undefined;
+    s.dy___7499 = undefined;
+    s.maxMomentumDiff___7518 = undefined;
+    s.angleToTarget___7525 = undefined;
+    s.targetTrajectoryVx___7530 = undefined;
+    s.targetTrajectoryVy___7536 = undefined;
+    s.diffVx___7542 = undefined;
+    s.diffVy___7547 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1790; s.pc = 4; return s.tmp_0;
-  case 4:
+    s.tmp_0 = if_target_1_mk(s);
+    s.tmp_1 = r0 = s.arg0;
+    s.tmp_0.arg0 = r0;
+    if (!s.tmp_0.arg0.vtable.iface) {
+      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "target");
+    } else {
+      s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["target"];
+      if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["target"]; }
+      else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
+     else { s.callLocIdx = 446; s.pc = 8; return s.tmp_0; }
+    }
+  case 8:
     r0 = s.retval;
-    r0 = r0.fields["tileMap"];
-    s.tm___205953 = (r0);
-    s.tmp_3 = scene_isWalkable__P191303_mk(s);
-    s.tmp_3.arg0 = s.arg1;
-    s.tmp_3.arg1 = s.arg2;
-    s.tmp_3.arg2 = s.tm___205953;
-    s.callLocIdx = 1791; s.pc = 5; return s.tmp_3;
-  case 5:
+    s.target___7476 = (r0);
+    s.tmp_2 = if_self_1_mk(s);
+    s.tmp_2.arg0 = s.tmp_1;
+    if (!s.tmp_2.arg0.vtable.iface) {
+      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "self");
+    } else {
+      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["self"];
+      if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["self"]; }
+      else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
+     else { s.callLocIdx = 447; s.pc = 9; return s.tmp_2; }
+    }
+  case 9:
     r0 = s.retval;
+    s.self___7477 = (r0);
+    s.tmp_3 = if_turnRate_1_mk(s);
+    s.tmp_3.arg0 = s.tmp_1;
+    if (!s.tmp_3.arg0.vtable.iface) {
+      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "turnRate");
+    } else {
+      s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["turnRate"];
+      if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["turnRate"]; }
+      else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
+     else { s.callLocIdx = 448; s.pc = 10; return s.tmp_3; }
+    }
+  case 10:
+    r0 = s.retval;
+    s.turnRate___7478 = (r0);
+    s.tmp_4 = if_rate_1_mk(s);
+    s.tmp_4.arg0 = s.tmp_1;
+    if (!s.tmp_4.arg0.vtable.iface) {
+      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "rate");
+    } else {
+      s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["rate"];
+      if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["rate"]; }
+      else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
+     else { s.callLocIdx = 449; s.pc = 11; return s.tmp_4; }
+    }
+  case 11:
+    r0 = s.retval;
+    s.rate___7479 = (r0);
+    r0 = s.self___7477.fields["flags"];
     s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    r0 = s.target___7476.fields["flags"];
+    s.tmp_3 = r0;
+    r0 = (s.tmp_2 | s.tmp_3);
     s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = (s.tmp_1 & 2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = undefined;
-    { step = 3; continue; }
+    s.tmp_4 = Sprite_vx__P2030_mk(s);
+    s.tmp_4.arg0 = s.self___7477;
+    s.tmp_4.arg1 = 0;
+    s.callLocIdx = 450; s.pc = 12; return s.tmp_4;
+  case 12:
+    r0 = s.retval;
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0.arg0 = s.self___7477;
+    s.tmp_0.arg1 = 0;
+    s.callLocIdx = 451; s.pc = 13; return s.tmp_0;
+  case 13:
+    r0 = s.retval;
+    r0 = pxsim_pxtrt_stlocRef(s.caps[0], true);
+    { step = 7; continue; }
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P205968);
-    s.tmp_4 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.arg1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P205973);
+    s.tmp_1 = Sprite_x__P2025_mk(s);
+    s.tmp_1.arg0 = s.target___7476;
+    s.callLocIdx = 452; s.pc = 14; return s.tmp_1;
+  case 14:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    s.tmp_3 = Sprite_x__P2025_mk(s);
+    s.tmp_3.arg0 = s.self___7477;
+    s.callLocIdx = 453; s.pc = 15; return s.tmp_3;
+  case 15:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 - s.tmp_2);
+    s.dx___7493 = (r0);
+    s.tmp_1 = Sprite_y__P2027_mk(s);
+    s.tmp_1.arg0 = s.target___7476;
+    s.callLocIdx = 454; s.pc = 16; return s.tmp_1;
+  case 16:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    s.tmp_3 = Sprite_y__P2027_mk(s);
+    s.tmp_3.arg0 = s.self___7477;
+    s.callLocIdx = 455; s.pc = 17; return s.tmp_3;
+  case 17:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 - s.tmp_2);
+    s.dy___7499 = (r0);
+    s.tmp_2 = Math_abs__P123_mk(s);
+    s.tmp_2.arg0 = s.dx___7493;
+    s.callLocIdx = 456; s.pc = 18; return s.tmp_2;
+  case 18:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 < 2);
+    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_4 = Math_abs__P123_mk(s);
+    s.tmp_4.arg0 = s.dy___7499;
+    s.callLocIdx = 457; s.pc = 19; return s.tmp_4;
+  case 19:
+    r0 = s.retval;
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 < 2);
+  case 4:
+    // jmp value (already in r0)
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.arg1);
-    s.tmp_6 = scene_generalAStar__P188874_mk(s);
-    s.tmp_6.arg0 = s.tm___205953;
-    s.tmp_6.arg1 = s.arg0;
-    s.tmp_6.arg2 = s.arg2;
-    s.tmp_6.arg3 = s.tmp_4;
-    s.tmp_6.arg4 = s.tmp_5;
-    s.callLocIdx = 1797; s.pc = 6; return s.tmp_6;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_5);
+    if (!r0) { step = 5; continue; }
+    s.tmp_6 = Sprite_vx__P2030_mk(s);
+    s.tmp_6.arg0 = s.self___7477;
+    s.tmp_6.arg1 = 0;
+    s.callLocIdx = 458; s.pc = 20; return s.tmp_6;
+  case 20:
+    r0 = s.retval;
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0.arg0 = s.self___7477;
+    s.tmp_0.arg1 = 0;
+    s.callLocIdx = 459; s.pc = 21; return s.tmp_0;
+  case 21:
+    r0 = s.retval;
+    { step = 7; continue; }
+  case 5:
   case 6:
+    r0 = (s.caps[1] * s.turnRate___7478);
+    s.tmp_0 = r0;
+    r0 = (s.rate___7479 / 50);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 * s.tmp_1);
+    s.maxMomentumDiff___7518 = (r0);
+    r0 = pxsim.Math_.atan2(s.dy___7499, s.dx___7493);
+    s.angleToTarget___7525 = (r0);
+    r0 = pxsim.Math_.cos(s.angleToTarget___7525);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 * s.rate___7479);
+    s.targetTrajectoryVx___7530 = (r0);
+    r0 = pxsim.Math_.sin(s.angleToTarget___7525);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 * s.rate___7479);
+    s.targetTrajectoryVy___7536 = (r0);
+    s.tmp_0 = r0 = s.targetTrajectoryVx___7530;
+    s.tmp_2 = Sprite_vx__P2029_mk(s);
+    s.tmp_2.arg0 = s.self___7477;
+    s.callLocIdx = 460; s.pc = 22; return s.tmp_2;
+  case 22:
     r0 = s.retval;
-  case 3:
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 - s.tmp_1);
+    s.diffVx___7542 = (r0);
+    s.tmp_0 = r0 = s.targetTrajectoryVy___7536;
+    s.tmp_2 = Sprite_vy__P2031_mk(s);
+    s.tmp_2.arg0 = s.self___7477;
+    s.callLocIdx = 461; s.pc = 23; return s.tmp_2;
+  case 23:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 - s.tmp_1);
+    s.diffVy___7547 = (r0);
+    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    s.tmp_1 = r0 = s.self___7477;
+    s.tmp_0.arg0 = r0;
+    s.tmp_3 = Sprite_vx__P2029_mk(s);
+    s.tmp_3.arg0 = s.tmp_1;
+    s.callLocIdx = 463; s.pc = 25; return s.tmp_3;
+  case 25:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    s.tmp_5 = Math_clamp__P122_mk(s);
+    r0 = (0 - s.maxMomentumDiff___7518);
+    s.tmp_5.arg0 = r0;
+    s.tmp_5.arg1 = s.maxMomentumDiff___7518;
+    s.tmp_5.arg2 = s.diffVx___7542;
+    s.callLocIdx = 462; s.pc = 26; return s.tmp_5;
+  case 26:
+    r0 = s.retval;
+    s.tmp_4 = r0;
+    r0 = (s.tmp_2 + s.tmp_4);
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 464; s.pc = 24; return s.tmp_0;
+  case 24:
+    r0 = s.retval;
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_1 = r0 = s.self___7477;
+    s.tmp_0.arg0 = r0;
+    s.tmp_3 = Sprite_vy__P2031_mk(s);
+    s.tmp_3.arg0 = s.tmp_1;
+    s.callLocIdx = 466; s.pc = 28; return s.tmp_3;
+  case 28:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    s.tmp_5 = Math_clamp__P122_mk(s);
+    r0 = (0 - s.maxMomentumDiff___7518);
+    s.tmp_5.arg0 = r0;
+    s.tmp_5.arg1 = s.maxMomentumDiff___7518;
+    s.tmp_5.arg2 = s.diffVy___7547;
+    s.callLocIdx = 465; s.pc = 29; return s.tmp_5;
+  case 29:
+    r0 = s.retval;
+    s.tmp_4 = r0;
+    r0 = (s.tmp_2 + s.tmp_4);
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 467; s.pc = 27; return s.tmp_0;
+  case 27:
+    r0 = s.retval;
+  case 7:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_aStar__P188872.info = {"start":937,"length":377,"line":31,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"aStar","argumentNames":["start","end","onTilesOf"]}
+inline__P7473.info = {"start":30600,"length":1635,"line":912,"column":44,"endLine":946,"endColumn":17,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
 
-function scene_aStar__P188872_mk(s) {
+function inline__P7473_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_aStar__P188872, depth: s.depth + 1,
+        parent: s, fn: inline__P7473, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -4656,47 +4805,18 @@ function scene_aStar__P188872_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  tm___205953: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-} }
-
-
-
-
-
-function inline__P205968(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = scene_tileLocationHeuristic__P191299_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.caps[0];
-    s.callLocIdx = 1792; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P205968.info = {"start":1221,"length":34,"line":37,"column":12,"endLine":37,"endColumn":46,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["t"]}
-
-function inline__P205968_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P205968, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
+  target___7476: undefined,
+  self___7477: undefined,
+  turnRate___7478: undefined,
+  rate___7479: undefined,
+  dx___7493: undefined,
+  dy___7499: undefined,
+  maxMomentumDiff___7518: undefined,
+  angleToTarget___7525: undefined,
+  targetTrajectoryVx___7530: undefined,
+  targetTrajectoryVy___7536: undefined,
+  diffVx___7542: undefined,
+  diffVy___7547: undefined,
   arg0: undefined,
 } }
 
@@ -4704,7 +4824,7 @@ function inline__P205968_mk(s) {
 
 
 
-function inline__P205973(s) {
+function inline__P7580(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4718,62 +4838,34 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = tiles_Location_x__P187510_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1793; s.pc = 3; return s.tmp_2;
-  case 3:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    s.tmp_4 = tiles_Location_x__P187510_mk(s);
-    s.tmp_4.arg0 = s.caps[0];
-    s.callLocIdx = 1794; s.pc = 4; return s.tmp_4;
-  case 4:
-    r0 = s.retval;
+    r0 = s.arg0.fields["self"];
+    r0 = r0.fields["flags"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_1 === s.tmp_3);
+    r0 = s.arg0.fields["target"];
+    r0 = r0.fields["flags"];
+    s.tmp_4 = r0;
+    r0 = (s.tmp_3 | s.tmp_4);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 & 2);
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(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:
-    s.tmp_6 = tiles_Location_y__P187511_mk(s);
-    s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 1795; s.pc = 5; return s.tmp_6;
-  case 5:
-    r0 = s.retval;
-    s.tmp_5 = r0;
-    s.tmp_8 = tiles_Location_y__P187511_mk(s);
-    s.tmp_8.arg0 = s.caps[0];
-    s.callLocIdx = 1796; s.pc = 6; return s.tmp_8;
-  case 6:
-    r0 = s.retval;
-    s.tmp_7 = r0;
-    r0 = (s.tmp_5 === s.tmp_7);
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_9 = r0;
-    r0 = s.tmp_9;
+    r0 = pxsim_Boolean__bang(s.tmp_0);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P205973.info = {"start":1270,"length":35,"line":38,"column":12,"endLine":38,"endColumn":47,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["l"]}
+inline__P7580.info = {"start":32485,"length":67,"line":953,"column":32,"endLine":953,"endColumn":99,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
 
-function inline__P205973_mk(s) {
+function inline__P7580_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P205973, depth: s.depth + 1,
+        parent: s, fn: inline__P7580, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
-  tmp_8: undefined,
-  tmp_9: undefined,
   arg0: undefined,
 } }
 
@@ -4781,7 +4873,7 @@ function inline__P205973_mk(s) {
 
 
 
-function scene_isWalkable__P191303(s) {
+function inline__P7598(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4791,81 +4883,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.img___204488 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = scene_isWall__P191302_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.arg2;
-    s.callLocIdx = 1843; s.pc = 6; return s.tmp_1;
-  case 6:
-    r0 = s.retval;
+    r0 = s.arg0.fields["self"];
+    r0 = r0.fields["id"];
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = false;
-    { step = 5; continue; }
-  case 1:
-  case 2:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    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 = 3; continue; }
-    r0 = true;
-    { step = 5; continue; }
-  case 3:
-  case 4:
-    s.tmp_4 = tiles_TileMap_getTileImage__P187556_mk(s);
-    s.tmp_4.arg0 = s.arg2;
-    s.tmp_5 = tiles_TileMap_getTileIndex__P187547_mk(s);
-    s.tmp_5.arg0 = s.arg2;
-    r0 = s.arg0.fields["_col"];
-    s.tmp_5.arg1 = r0;
-    r0 = s.arg0.fields["_row"];
-    s.tmp_5.arg2 = r0;
-    s.callLocIdx = 1846; s.pc = 8; return s.tmp_5;
-  case 8:
-    r0 = s.retval;
-    s.tmp_4.arg1 = r0;
-    s.callLocIdx = 1847; s.pc = 7; return s.tmp_4;
-  case 7:
-    r0 = s.retval;
-    s.img___204488 = (r0);
-    r0 = pxsim_ImageMethods.equals(s.img___204488, s.arg1);
-  case 5:
+    r0 = s.caps[0].fields["id"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 == s.tmp_1);
     return leave(s, r0)
   default: oops()
 } } }
-scene_isWalkable__P191303.info = {"start":7750,"length":280,"line":226,"column":4,"endLine":231,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWalkable","argumentNames":["l","onTilesOf","tm"]}
+inline__P7598.info = {"start":32644,"length":27,"line":958,"column":44,"endLine":958,"endColumn":71,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
 
-function scene_isWalkable__P191303_mk(s) {
+function inline__P7598_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_isWalkable__P191303, depth: s.depth + 1,
+        parent: s, fn: inline__P7598, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  img___204488: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function scene_isWall__P191302(s) {
+function Sprite_vy__P2032(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4875,45 +4922,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___204267 = undefined;
-    s.c___204271 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationRow__P191300_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1840; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    s.r___204267 = (r0);
-    s.tmp_0 = scene_locationCol__P191301_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1841; s.pc = 2; return s.tmp_0;
-  case 2:
-    r0 = s.retval;
-    s.c___204271 = (r0);
-    s.tmp_0 = tiles_TileMap_isObstacle__P187553_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.c___204271;
-    s.tmp_0.arg2 = s.r___204267;
-    s.callLocIdx = 1842; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg1 * 256);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 | 0);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_isWall__P191302.info = {"start":7573,"length":169,"line":220,"column":4,"endLine":224,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWall","argumentNames":["l","tm"]}
+Sprite_vy__P2032.info = {"start":2705,"length":51,"line":108,"column":4,"endLine":110,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this","v"]}
 
-function scene_isWall__P191302_mk(s) {
+function Sprite_vy__P2032_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_isWall__P191302, depth: s.depth + 1,
+        parent: s, fn: Sprite_vy__P2032, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  r___204267: undefined,
-  c___204271: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -4922,7 +4957,7 @@ function scene_isWall__P191302_mk(s) {
 
 
 
-function scene_locationCol__P191301(s) {
+function Sprite_vy__P2031(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4936,25 +4971,23 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = tiles_Location_x__P187510_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1839; s.pc = 1; return s.tmp_1;
-  case 1:
-    r0 = s.retval;
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_vy"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 >> 4);
-    return leave(s, r0)
+    r0 = (s.tmp_0 / 256);
+    return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_locationCol__P191301.info = {"start":7483,"length":82,"line":216,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationCol","argumentNames":["l"]}
+Sprite_vy__P2031.info = {"start":2543,"length":60,"line":103,"column":4,"endLine":105,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this"]}
+Sprite_vy__P2031.isGetter = true;
 
-function scene_locationCol__P191301_mk(s) {
+function Sprite_vy__P2031_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_locationCol__P191301, depth: s.depth + 1,
+        parent: s, fn: Sprite_vy__P2031, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
   arg0: undefined,
 } }
 
@@ -4962,7 +4995,7 @@ function scene_locationCol__P191301_mk(s) {
 
 
 
-function scene_locationRow__P191300(s) {
+function Fx_toFloat__P166(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -4976,25 +5009,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = tiles_Location_y__P187511_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1838; s.pc = 1; return s.tmp_1;
-  case 1:
-    r0 = s.retval;
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 >> 4);
+    r0 = (s.arg0 / 256);
     return leave(s, r0)
   default: oops()
 } } }
-scene_locationRow__P191300.info = {"start":7393,"length":82,"line":212,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationRow","argumentNames":["l"]}
+Fx_toFloat__P166.info = {"start":2235,"length":81,"line":71,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toFloat","argumentNames":["v"]}
 
-function scene_locationRow__P191300_mk(s) {
+function Fx_toFloat__P166_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_locationRow__P191300, depth: s.depth + 1,
+        parent: s, fn: Fx_toFloat__P166, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
   arg0: undefined,
 } }
 
@@ -5002,7 +5027,7 @@ function scene_locationRow__P191300_mk(s) {
 
 
 
-function tiles_TileMap_isObstacle__P187553(s) {
+function Sprite_vx__P2030(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5015,86 +5040,39 @@ switch (step) {
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_map"];
-    s.tmp_6 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_6);
-    s.tmp_5 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_5);
-    s.tmp_4 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
-    s.tmp_3 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_3);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    r0 = (s.tmp_2 | 0);
     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 = false;
-    { step = 5; continue; }
-  case 1:
-  case 2:
-    s.tmp_8 = tiles_TileMapData_isOutsideMap__P187533_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 = 944; s.pc = 6; return s.tmp_8;
-  case 6:
-    r0 = s.retval;
-    s.tmp_7 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_7);
-    if (!r0) { step = 3; continue; }
-    r0 = true;
-    { step = 5; continue; }
-  case 3:
-  case 4:
-    r0 = s.arg0.fields["_map"];
-    s.tmp_9 = r0;
-    r0 = s.tmp_9.fields["layers"];
-    s.tmp_11 = r0;
-    r0 = pxsim_ImageMethods.getPixel(s.tmp_11, s.arg1, s.arg2);
-    s.tmp_10 = r0;
-    r0 = (s.tmp_10 === 2);
-  case 5:
+    r0 = (s.tmp_0).fields["_vx"] = (s.tmp_1);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isObstacle__P187553.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"]}
+Sprite_vx__P2030.info = {"start":2374,"length":51,"line":97,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this","v"]}
 
-function tiles_TileMap_isObstacle__P187553_mk(s) {
+function Sprite_vx__P2030_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isObstacle__P187553, depth: s.depth + 1,
+        parent: s, fn: Sprite_vx__P2030, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
-  tmp_8: undefined,
-  tmp_9: undefined,
-  tmp_10: undefined,
-  tmp_11: undefined,
   arg0: undefined,
   arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function tiles_TileMap_enabled__P187544(s) {
+function Sprite_vx__P2029(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5109,31 +5087,22 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_map"];
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_vx"];
     s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
+    r0 = (s.tmp_0 / 256);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_enabled__P187544.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__P187544.isGetter = true;
+Sprite_vx__P2029.info = {"start":2212,"length":60,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this"]}
+Sprite_vx__P2029.isGetter = true;
 
-function tiles_TileMap_enabled__P187544_mk(s) {
+function Sprite_vx__P2029_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_enabled__P187544, depth: s.depth + 1,
+        parent: s, fn: Sprite_vx__P2029, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
   arg0: undefined,
 } }
 
@@ -5141,7 +5110,7 @@ function tiles_TileMap_enabled__P187544_mk(s) {
 
 
 
-function tiles_TileMapData_isOutsideMap__P187533(s) {
+function Sprite_y__P2027(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5153,76 +5122,45 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
-    r0 = (s.arg1 < 0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_y"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 / 256);
     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_1 = r0 = s.arg1;
-    r0 = s.arg0.fields["_width"];
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 >= s.tmp_2);
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    r0 = s.tmp_3;
-    { step = 4; continue; }
-  case 3:
-    r0 = (s.arg2 < 0);
-  case 4:
-    // jmp value (already in r0)
+    r0 = s.arg0.fields["_image"];
     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:
-    s.tmp_5 = r0 = s.arg2;
-    r0 = s.arg0.fields["_height"];
-    s.tmp_6 = r0;
-    r0 = (s.tmp_5 >= s.tmp_6);
-  case 6:
-    // jmp value (already in r0)
-    s.tmp_7 = r0;
-    r0 = s.tmp_7;
-    return leave(s, r0)
+    r0 = pxsim_ImageMethods.height(s.tmp_4);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 / 2);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 + s.tmp_2);
+    return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_isOutsideMap__P187533.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"]}
+Sprite_y__P2027.info = {"start":1849,"length":85,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this"]}
+Sprite_y__P2027.isGetter = true;
 
-function tiles_TileMapData_isOutsideMap__P187533_mk(s) {
+function Sprite_y__P2027_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_isOutsideMap__P187533, depth: s.depth + 1,
+        parent: s, fn: Sprite_y__P2027, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function tiles_TileMapData_height__P187524(s) {
+function Sprite_x__P2025(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5237,19 +5175,34 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_height"];
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_x"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 / 256);
+    s.tmp_0 = r0;
+    r0 = s.arg0.fields["_image"];
+    s.tmp_4 = r0;
+    r0 = pxsim_ImageMethods.width(s.tmp_4);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 / 2);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 + s.tmp_2);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_height__P187524.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__P187524.isGetter = true;
+Sprite_x__P2025.info = {"start":1501,"length":84,"line":70,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this"]}
+Sprite_x__P2025.isGetter = true;
 
-function tiles_TileMapData_height__P187524_mk(s) {
+function Sprite_x__P2025_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_height__P187524, depth: s.depth + 1,
+        parent: s, fn: Sprite_x__P2025, 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,
   arg0: undefined,
 } }
 
@@ -5257,7 +5210,7 @@ function tiles_TileMapData_height__P187524_mk(s) {
 
 
 
-function tiles_TileMapData_width__P187523(s) {
+function sprites_FollowingSprite_constructor__P1973(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5269,30 +5222,41 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
+      s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_width"];
-    return leaveAccessor(s, r0)
+    if (!checkSubtype(r0, sprites_FollowingSprite__C1972_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["self"] = (s.arg1);
+    r0 = (s.arg0).fields["target"] = (s.arg2);
+    r0 = (s.arg0).fields["rate"] = (s.arg3);
+    r0 = (s.arg0).fields["turnRate"] = (s.arg4);
+    r0 = undefined;
+    return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_width__P187523.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__P187523.isGetter = true;
+sprites_FollowingSprite_constructor__P1973.info = {"start":401,"length":163,"line":18,"column":8,"endLine":23,"endColumn":13,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["this","self","target","rate","turnRate"]}
 
-function tiles_TileMapData_width__P187523_mk(s) {
+function sprites_FollowingSprite_constructor__P1973_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_width__P187523, depth: s.depth + 1,
+        parent: s, fn: sprites_FollowingSprite_constructor__P1973, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
+  arg4: undefined,
 } }
 
 
 
 
 
-function tiles_TileMapData_isWall__P187532(s) {
+function control_EventContext_registerFrameHandler__P392(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5302,6 +5266,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.fn___7742 = undefined;
+    s.i___7751 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -5309,24 +5275,86 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
-    r0 = s.arg0.fields["layers"];
+    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    r0 = s.arg0.fields["frameCallbacks"];
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.getPixel(s.tmp_1, s.arg1, s.arg2);
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 === 2);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_3 = r0 = s.arg0;
+    r0 = pxsim_Array__mk();
+    s.tmp_4 = r0;
+    r0 = (s.tmp_3).fields["frameCallbacks"] = (s.tmp_4);
+    s.tmp_0 = control_EventContext_registerFrameCallbacks__P4030_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 59; s.pc = 8; return s.tmp_0;
+  case 8:
+    r0 = s.retval;
+  case 1:
+  case 2:
+    r0 = pxsim_pxtcore_mkClassInstance(control_FrameCallback__C381_VT);
+    s.fn___7742 = (r0);
+    r0 = (s.fn___7742).fields["order"] = (s.arg1);
+    r0 = (s.fn___7742).fields["handler"] = (s.arg2);
+    s.i___7751 = (0);
+  case 3:
+    s.tmp_1 = r0 = s.i___7751;
+    r0 = s.arg0.fields["frameCallbacks"];
+    s.tmp_3 = r0;
+    r0 = pxsim_Array__length(s.tmp_3);
+    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; }
+    r0 = s.arg0.fields["frameCallbacks"];
+    s.tmp_6 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_6, s.i___7751);
+    r0 = r0.fields["order"];
+    s.tmp_5 = r0;
+    r0 = (s.tmp_5 > s.arg1);
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
+    if (!r0) { step = 4; continue; }
+    r0 = s.arg0.fields["frameCallbacks"];
+    s.tmp_7 = r0;
+    r0 = pxsim_Array_.insertAt(s.tmp_7, s.i___7751, s.fn___7742);
+    r0 = s.fn___7742;
+    { step = 7; continue; }
+  case 4:
+  case 5:
+    r0 = (s.i___7751 + 1);
+    s.i___7751 = (r0);
+    { step = 3; continue; }
+  case 6:
+    r0 = s.arg0.fields["frameCallbacks"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array__push(s.tmp_0, s.fn___7742);
+    r0 = s.fn___7742;
+  case 7:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_isWall__P187532.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"]}
+control_EventContext_registerFrameHandler__P392.info = {"start":4675,"length":643,"line":143,"column":8,"endLine":160,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameHandler","argumentNames":["this","order","handler"]}
 
-function tiles_TileMapData_isWall__P187532_mk(s) {
+function control_EventContext_registerFrameHandler__P392_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_isWall__P187532, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerFrameHandler__P392, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  fn___7742: undefined,
+  i___7751: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -5336,7 +5364,7 @@ function tiles_TileMapData_isWall__P187532_mk(s) {
 
 
 
-function tiles_TileMap_getTileImage__P187556(s) {
+function control_EventContext_registerFrameCallbacks__P4030(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5346,67 +5374,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.worker___7785 = 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__C187534_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P187530_mk(s);
-    r0 = s.arg0.fields["_map"];
-    s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 967; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
+    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    r0 = s.arg0.fields["frameCallbacks"];
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    { step = 3; continue; }
+  case 1:
+  case 2:
+    r0 = s.arg0.fields["frameWorker"];
+    s.worker___7785 = (r0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P7791);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.worker___7785);
+    r0 = pxsim.control.runInParallel(s.tmp_0);
+  case 3:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTileImage__P187556.info = {"start":13699,"length":96,"line":442,"column":8,"endLine":444,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
+control_EventContext_registerFrameCallbacks__P4030.info = {"start":3481,"length":895,"line":105,"column":8,"endLine":129,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerFrameCallbacks","argumentNames":["this"]}
 
-function tiles_TileMap_getTileImage__P187556_mk(s) {
+function control_EventContext_registerFrameCallbacks__P4030_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTileImage__P187556, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerFrameCallbacks__P4030, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function tiles_TileMap_data__P189508(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, tiles_TileMap__C187534_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_map"];
-    return leaveAccessor(s, r0)
-  default: oops()
-} } }
-tiles_TileMap_data__P189508.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__P189508.isGetter = true;
-
-function tiles_TileMap_data__P189508_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: tiles_TileMap_data__P189508, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  worker___7785: undefined,
   arg0: undefined,
 } }
 
@@ -5414,7 +5422,7 @@ function tiles_TileMap_data__P189508_mk(s) {
 
 
 
-function tiles_TileMapData_getTileImage__P187530(s) {
+function inline__P7791(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5424,129 +5432,73 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.size___200693 = undefined;
-    s.cachedImage___200697 = undefined;
-    s.originalImage___200704 = 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__C187521_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_scale"];
-    s.tmp_0 = r0;
-    r0 = (1 << s.tmp_0);
-    s.size___200693 = (r0);
-    r0 = s.arg0.fields["cachedTileView"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.arg1);
-    s.cachedImage___200697 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.cachedImage___200697);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.delay___7821 = undefined;
+    r0 = s.caps[0].fields["runningCallbacks"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 7; continue; }
-    r0 = s.arg0.fields["tileset"];
-    s.tmp_2 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_2, s.arg1);
-    s.originalImage___200704 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.originalImage___200704);
-    if (!r0) { step = 5; continue; }
-    r0 = pxsim_ImageMethods.width(s.originalImage___200704);
+    if (!r0) { step = 1; continue; }
+    r0 = pxsim_pxtcore_mkAction(1, inline__P7797);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.size___200693);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
+    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.caps[0]);
+    s.tmp_2 = pauseUntil__P356_mk(s);
+    s.tmp_2.arg0 = s.tmp_1;
+    s.tmp_2.arg1 = undefined;
+    s.callLocIdx = 53; s.pc = 5; return s.tmp_2;
+  case 5:
+    r0 = s.retval;
   case 1:
-    r0 = pxsim_ImageMethods.height(s.originalImage___200704);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 <= s.size___200693);
   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___200697 = (s.originalImage___200704);
-    { step = 4; continue; }
+    r0 = (s.caps[0]).fields["runningCallbacks"] = (true);
+    r0 = (s.caps[0]).fields["framesInSample"] = (0);
+    r0 = (s.caps[0]).fields["timeInSample"] = (0);
+    r0 = (s.caps[0]).fields["deltaTimeMillis"] = (0);
+    s.tmp_0 = r0 = s.caps[0];
+    r0 = pxsim.control.millis();
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["prevTimeMillis"] = (s.tmp_1);
   case 3:
-    r0 = pxsim.image.create(s.size___200693, s.size___200693);
-    s.cachedImage___200697 = (r0);
-    r0 = pxsim_ImageMethods.drawImage(s.cachedImage___200697, s.originalImage___200704, 0, 0);
-  case 4:
-    r0 = s.arg0.fields["cachedTileView"];
+    r0 = s.caps[0].fields["frameWorker"];
+    s.tmp_1 = r0;
+    r0 = (s.caps[1] == s.tmp_1);
     s.tmp_0 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_0, s.arg1, s.cachedImage___200697);
-  case 5:
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 4; continue; }
+    s.tmp_2 = control_EventContext_runCallbacks__P4029_mk(s);
+    s.tmp_2.arg0 = s.caps[0];
+    s.callLocIdx = 54; s.pc = 6; return s.tmp_2;
   case 6:
+    r0 = s.retval;
+    s.delay___7821 = (r0);
+    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0.arg0 = s.delay___7821;
+    s.callLocIdx = 55; s.pc = 7; return s.tmp_0;
   case 7:
-  case 8:
-    r0 = s.cachedImage___200697;
+    r0 = s.retval;
+    { step = 3; continue; }
+  case 4:
+    r0 = (s.caps[0]).fields["runningCallbacks"] = (false);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTileImage__P187530.info = {"start":4599,"length":717,"line":172,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
+inline__P7791.info = {"start":3642,"length":723,"line":109,"column":34,"endLine":128,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function tiles_TileMapData_getTileImage__P187530_mk(s) {
+function inline__P7791_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTileImage__P187530, depth: s.depth + 1,
+        parent: s, fn: inline__P7791, 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___200693: undefined,
-  cachedImage___200697: undefined,
-  originalImage___200704: undefined,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function tiles_TileMapData_scale__P187525(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, tiles_TileMapData__C187521_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_scale"];
-    return leaveAccessor(s, r0)
-  default: oops()
-} } }
-tiles_TileMapData_scale__P187525.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__P187525.isGetter = true;
-
-function tiles_TileMapData_scale__P187525_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: tiles_TileMapData_scale__P187525, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
+  delay___7821: undefined,
 } }
 
 
 
 
 
-function tiles_TileMap_getTileIndex__P187547(s) {
+function inline__P7797(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5556,43 +5508,30 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMapData_getTile__P187527_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 = 902; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
+    r0 = s.caps[0].fields["runningCallbacks"];
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_0);
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTileIndex__P187547.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"]}
+inline__P7797.info = {"start":3873,"length":28,"line":113,"column":31,"endLine":113,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function tiles_TileMap_getTileIndex__P187547_mk(s) {
+function inline__P7797_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTileIndex__P187547, depth: s.depth + 1,
+        parent: s, fn: inline__P7797, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
+  tmp_1: undefined,
 } }
 
 
 
 
 
-function tiles_TileMapData_getTile__P187527(s) {
+function control_EventContext_runCallbacks__P4029(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5602,53 +5541,234 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.loopStart___7830 = undefined;
+    s.f___7843 = undefined;
+    s.unnamed88___U2 = undefined;
+    s.unnamed89___U3 = undefined;
+    s.runtime___7848 = undefined;
+    s.fps___7868 = undefined;
+    s.delay___7930 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P187533_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.arg1;
-    s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 879; s.pc = 4; return s.tmp_1;
+    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    r0 = pxsim.control.millis();
+    s.loopStart___7830 = (r0);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = s.arg0.fields["prevTimeMillis"];
+    s.tmp_2 = r0;
+    r0 = (s.loopStart___7830 - s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["deltaTimeMillis"] = (s.tmp_1);
+    r0 = (s.arg0).fields["prevTimeMillis"] = (s.loopStart___7830);
+    s.f___7843 = (undefined);
+    r0 = s.arg0.fields["frameCallbacks"];
+    s.unnamed88___U2 = (r0);
+    s.unnamed89___U3 = (0);
+  case 1:
+    s.tmp_0 = r0 = s.unnamed89___U3;
+    r0 = pxsim_Array__length(s.unnamed88___U2);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 < s.tmp_1);
+    if (!r0) { step = 2; continue; }
+    r0 = pxsim_Array__getAt(s.unnamed88___U2, s.unnamed89___U3);
+    s.f___7843 = (r0);
+    s.tmp_2 = if_handler_1_mk(s);
+    s.tmp_2.arg0 = s.f___7843;
+    if (!s.tmp_2.arg0.vtable.iface) {
+      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "handler"), 1);
+      s.callLocIdx = 50; s.pc = 13; return s.tmp_2;
+    } else {
+      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["handler"];
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["handler"], 1); s.callLocIdx = 50; s.pc = 13; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 50; s.pc = 13; return s.tmp_2;; }
+     else { s.callLocIdx = 50; s.pc = 13; return s.tmp_2; }
+    }
+  case 13:
+    r0 = s.retval;
+    r0 = (s.unnamed89___U3 + 1);
+    s.unnamed89___U3 = (r0);
+    { step = 1; continue; }
+  case 2:
+    s.unnamed88___U2 = (undefined);
+    r0 = pxsim.control.millis();
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 - s.loopStart___7830);
+    s.runtime___7848 = (r0);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = s.tmp_0.fields["timeInSample"];
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 + s.runtime___7848);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["timeInSample"] = (s.tmp_1);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = s.tmp_0.fields["framesInSample"];
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 + 1);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["framesInSample"] = (s.tmp_1);
+    r0 = s.arg0.fields["timeInSample"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 > 1000);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 3; continue; }
+    r0 = s.tmp_0;
+    { step = 4; continue; }
+  case 3:
+    r0 = s.arg0.fields["framesInSample"];
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 > 30);
   case 4:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 11; continue; }
+    r0 = s.arg0.fields["framesInSample"];
+    s.tmp_4 = r0;
+    r0 = s.arg0.fields["timeInSample"];
+    s.tmp_6 = r0;
+    r0 = (s.tmp_6 / 1000);
+    s.tmp_5 = r0;
+    r0 = (s.tmp_4 / s.tmp_5);
+    s.fps___7868 = (r0);
+    r0 = pxsim.Math_.round(s.fps___7868);
+    s.tmp_1 = r0;
+    if ((s.tmp_1) && (s.tmp_1).vtable) {
+    setupResume(s, 14);
+    pxsim_String__stringConv(s.tmp_1);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (s.tmp_1) + ""; }
+  case 14:
     r0 = s.retval;
     s.tmp_0 = r0;
+    r0 = pxsim_String__concat("fps:", s.tmp_0);
+    globals.control_EventContext_lastStats___386 = (r0);
+    r0 = (s.fps___7868 < 99);
+    s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = 0;
-    { step = 3; continue; }
-  case 1:
-  case 2:
-    r0 = s.arg0.fields["data"];
-    s.tmp_2 = r0;
-    r0 = (s.arg1 | 0);
+    if (!r0) { step = 5; continue; }
+    if ((globals.control_EventContext_lastStats___386) && (globals.control_EventContext_lastStats___386).vtable) {
+    setupResume(s, 15);
+    pxsim_String__stringConv(globals.control_EventContext_lastStats___386);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (globals.control_EventContext_lastStats___386) + ""; }
+  case 15:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.fps___7868 * 10);
+    s.tmp_7 = r0;
+    r0 = pxsim.Math_.round(s.tmp_7);
+    s.tmp_6 = r0;
+    r0 = (s.tmp_6 % 10);
     s.tmp_5 = r0;
-    r0 = (4 + s.tmp_5);
+    if ((s.tmp_5) && (s.tmp_5).vtable) {
+    setupResume(s, 16);
+    pxsim_String__stringConv(s.tmp_5);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (s.tmp_5) + ""; }
+  case 16:
+    r0 = s.retval;
     s.tmp_4 = r0;
-    r0 = (s.arg2 | 0);
-    s.tmp_7 = r0;
-    r0 = s.arg0.fields["_width"];
+    r0 = pxsim_String__concat(".", s.tmp_4);
+    s.tmp_3 = r0;
+    if ((s.tmp_3) && (s.tmp_3).vtable) {
+    setupResume(s, 17);
+    pxsim_String__stringConv(s.tmp_3);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (s.tmp_3) + ""; }
+  case 17:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = pxsim_String__concat(s.tmp_1, s.tmp_2);
+    globals.control_EventContext_lastStats___386 = (r0);
+  case 5:
+  case 6:
+    s.tmp_2 = control_ramSize__P335_mk(s);
+    s.callLocIdx = 51; s.pc = 18; return s.tmp_2;
+  case 18:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 > 2000000);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 7; continue; }
+    r0 = s.tmp_0;
+    { step = 8; continue; }
+  case 7:
+    r0 = pxsim.control.profilingEnabled();
+  case 8:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 9; continue; }
+    r0 = pxsim_String_.mkEmpty();
     s.tmp_8 = r0;
-    r0 = (s.tmp_7 * s.tmp_8);
+    r0 = (s.fps___7868 * 100);
+    s.tmp_11 = r0;
+    r0 = (s.tmp_11 | 0);
+    s.tmp_10 = r0;
+    if ((s.tmp_10) && (s.tmp_10).vtable) {
+    setupResume(s, 19);
+    pxsim_String__stringConv(s.tmp_10);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (s.tmp_10) + ""; }
+  case 19:
+    r0 = s.retval;
+    s.tmp_9 = r0;
+    r0 = pxsim_String__concat(s.tmp_8, s.tmp_9);
+    s.tmp_7 = r0;
+    r0 = pxsim_String__concat(s.tmp_7, "/100 fps - ");
     s.tmp_6 = r0;
-    r0 = (s.tmp_4 + s.tmp_6);
-    s.tmp_3 = r0;
-    r0 = pxsim.BufferMethods.getUint8(s.tmp_2, s.tmp_3);
-  case 3:
+    r0 = s.arg0.fields["framesInSample"];
+    s.tmp_13 = r0;
+    if ((s.tmp_13) && (s.tmp_13).vtable) {
+    setupResume(s, 20);
+    pxsim_String__stringConv(s.tmp_13);
+    checkResumeConsumed();
+    return;
+    } else { s.retval = (s.tmp_13) + ""; }
+  case 20:
+    r0 = s.retval;
+    s.tmp_12 = r0;
+    r0 = pxsim_String__concat(s.tmp_6, s.tmp_12);
+    s.tmp_5 = r0;
+    r0 = pxsim_String__concat(s.tmp_5, " frames");
+    s.tmp_4 = r0;
+    r0 = pxsim.control.dmesg(s.tmp_4);
+    r0 = pxsim.control.gc();
+    r0 = pxsim_pxtcore.dumpPerfCounters();
+  case 9:
+  case 10:
+    r0 = (s.arg0).fields["timeInSample"] = (0);
+    r0 = (s.arg0).fields["framesInSample"] = (0);
+  case 11:
+  case 12:
+    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0.arg0 = 1;
+    r0 = (20 - s.runtime___7848);
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 52; s.pc = 21; return s.tmp_0;
+  case 21:
+    r0 = s.retval;
+    s.delay___7930 = (r0);
+    r0 = s.delay___7930;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTile__P187527.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"]}
+control_EventContext_runCallbacks__P4029.info = {"start":2182,"length":1246,"line":74,"column":8,"endLine":102,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
 
-function tiles_TileMapData_getTile__P187527_mk(s) {
+function control_EventContext_runCallbacks__P4029_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTile__P187527, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_runCallbacks__P4029, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -5659,16 +5779,26 @@ function tiles_TileMapData_getTile__P187527_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
+  tmp_9: undefined,
+  tmp_10: undefined,
+  tmp_11: undefined,
+  tmp_12: undefined,
+  tmp_13: undefined,
+  loopStart___7830: undefined,
+  f___7843: undefined,
+  unnamed88___U2: undefined,
+  unnamed89___U3: undefined,
+  runtime___7848: undefined,
+  fps___7868: undefined,
+  delay___7930: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function tiles_Location_row__P187508(s) {
+function Math_max__P125(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5680,30 +5810,39 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
+    r0 = (s.arg0 >= s.arg1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C187506_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_row"];
-    return leaveAccessor(s, r0)
+    { step = 3; continue; }
+  case 1:
+  case 2:
+    r0 = s.arg1;
+  case 3:
+    return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_row__P187508.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__P187508.isGetter = true;
+Math_max__P125.info = {"start":15575,"length":105,"line":529,"column":4,"endLine":532,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"max","argumentNames":["a","b"]}
 
-function tiles_Location_row__P187508_mk(s) {
+function Math_max__P125_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_row__P187508, depth: s.depth + 1,
+        parent: s, fn: Math_max__P125, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
   arg0: undefined,
+  arg1: undefined,
 } }
 
 
 
 
 
-function tiles_Location_col__P187507(s) {
+function pauseUntil__P356(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5715,30 +5854,75 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C187506_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_col"];
-    return leaveAccessor(s, r0)
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = s.tmp_0;
+    { step = 2; continue; }
+  case 1:
+    s.tmp_2 = lambda_1_mk(s);
+    s.tmp_2.argL = s.arg0;
+    setupLambda(s.tmp_2, s.tmp_2.argL);
+    s.callLocIdx = 37; s.pc = 8; return s.tmp_2;
+  case 8:
+    r0 = s.retval;
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    { step = 7; continue; }
+  case 3:
+  case 4:
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_5 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_5);
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
+    if (!r0) { step = 5; continue; }
+    s.arg1 = (0);
+  case 5:
+  case 6:
+    s.tmp_0 = control___queuePollEvent__P355_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.tmp_0.arg1 = s.arg0;
+    s.tmp_0.arg2 = undefined;
+    s.callLocIdx = 38; s.pc = 9; return s.tmp_0;
+  case 9:
+    r0 = s.retval;
+  case 7:
+    r0 = undefined;
+    return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_col__P187507.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__P187507.isGetter = true;
+pauseUntil__P356.info = {"start":2205,"length":227,"line":73,"column":0,"endLine":77,"endColumn":1,"fileName":"pxt_modules/base/poll.ts","functionName":"pauseUntil","argumentNames":["condition","timeOut"]}
 
-function tiles_Location_col__P187507_mk(s) {
+function pauseUntil__P356_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_col__P187507, depth: s.depth + 1,
+        parent: s, fn: pauseUntil__P356, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
   arg0: undefined,
+  arg1: undefined,
 } }
 
 
 
 
 
-function scene_tileLocationHeuristic__P191299(s) {
+function control___queuePollEvent__P355(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5748,75 +5932,97 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.startCol___205988 = undefined;
-    s.startRow___205992 = undefined;
-    s.endCol___205996 = undefined;
-    s.endRow___206000 = undefined;
+    s.ev___7952 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationCol__P191301_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1834; s.pc = 1; return s.tmp_0;
-  case 1:
+    r0 = pxsim_pxtcore_mkClassInstance(control_PollEvent__C4003_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = control_PollEvent_constructor__P4004_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    r0 = pxsim.control.allocateNotifyEvent();
+    s.tmp_1.arg1 = r0;
+    s.tmp_1.arg2 = 1;
+    r0 = pxsim.control.millis();
+    s.tmp_1.arg3 = r0;
+    s.tmp_1.arg4 = s.arg0;
+    s.tmp_1.arg5 = s.arg1;
+    r0 = pxsim_numops_toBoolDecr(s.arg2);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+    s.tmp_1.arg6 = r0;
+    s.callLocIdx = 35; s.pc = 5; return s.tmp_1;
+  case 5:
     r0 = s.retval;
-    s.startCol___205988 = (r0);
-    s.tmp_0 = scene_locationRow__P191300_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1835; s.pc = 2; return s.tmp_0;
+    s.ev___7952 = (s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(globals._pollEventQueue___4006);
+    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();
+    s.tmp_2 = r0;
+    r0 = pxsim_Array__push(s.tmp_2, s.ev___7952);
+    globals._pollEventQueue___4006 = (s.tmp_2);
+    r0 = pxsim.control.runInParallel(control_pollEvents__P4007);
+    { step = 2; continue; }
+  case 1:
+    r0 = pxsim_Array__push(globals._pollEventQueue___4006, s.ev___7952);
   case 2:
+    r0 = pxsim_numops_toBoolDecr(s.arg2);
+    if (!r0) { step = 3; continue; }
+    s.tmp_0 = control_onEvent__P380_mk(s);
+    r0 = s.ev___7952.fields["eid"];
+    s.tmp_0.arg0 = r0;
+    r0 = s.ev___7952.fields["vid"];
+    s.tmp_0.arg1 = r0;
+    s.tmp_0.arg2 = s.arg2;
+    s.tmp_0.arg3 = 16;
+    s.callLocIdx = 36; s.pc = 6; return s.tmp_0;
+  case 6:
     r0 = s.retval;
-    s.startRow___205992 = (r0);
-    s.tmp_0 = scene_locationCol__P191301_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 1836; s.pc = 3; return s.tmp_0;
+    { step = 4; continue; }
   case 3:
+    r0 = s.ev___7952.fields["eid"];
+    s.tmp_0 = r0;
+    r0 = s.ev___7952.fields["vid"];
+    s.tmp_1 = r0;
+    setupResume(s, 7);
+    pxsim.control.waitForEvent(s.tmp_0, s.tmp_1);
+    checkResumeConsumed();
+    return;
+  case 7:
     r0 = s.retval;
-    s.endCol___205996 = (r0);
-    s.tmp_0 = scene_locationRow__P191300_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.callLocIdx = 1837; s.pc = 4; return s.tmp_0;
   case 4:
-    r0 = s.retval;
-    s.endRow___206000 = (r0);
-    r0 = (s.startCol___205988 - s.endCol___205996);
-    s.tmp_1 = r0;
-    r0 = pxsim.Math_.pow(s.tmp_1, 2);
-    s.tmp_0 = r0;
-    r0 = (s.startRow___205992 - s.endRow___206000);
-    s.tmp_3 = r0;
-    r0 = pxsim.Math_.pow(s.tmp_3, 2);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_0 + s.tmp_2);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_tileLocationHeuristic__P191299.info = {"start":6929,"length":350,"line":200,"column":4,"endLine":208,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"tileLocationHeuristic","argumentNames":["tile","target"]}
+control___queuePollEvent__P355.info = {"start":1262,"length":739,"line":39,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"__queuePollEvent","argumentNames":["timeOut","condition","handler"]}
 
-function scene_tileLocationHeuristic__P191299_mk(s) {
+function control___queuePollEvent__P355_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_tileLocationHeuristic__P191299, depth: s.depth + 1,
+        parent: s, fn: control___queuePollEvent__P355, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tmp_3: undefined,
-  startCol___205988: undefined,
-  startRow___205992: undefined,
-  endCol___205996: undefined,
-  endRow___206000: undefined,
+  ev___7952: undefined,
   arg0: undefined,
   arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function scene_generalAStar__P188874(s) {
+function control_pollEvents__P4007(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -5826,659 +6032,117 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.consideredTiles___203902 = undefined;
-    s.encountedLocations___203924 = undefined;
-    s.updateOrFillLocation___203927 = undefined;
-    s.end___203997 = undefined;
-    s.currLocation___204003 = undefined;
-    s.row___204014 = undefined;
-    s.col___204019 = undefined;
-    s.dataForCurrLocation___204024 = undefined;
-    s.neighbors___204036 = undefined;
-    s.corners___204038 = undefined;
-    s.left___204040 = undefined;
-    s.right___204046 = undefined;
-    s.top___204053 = undefined;
-    s.bottom___204059 = undefined;
-    s.leftIsWall___204066 = undefined;
-    s.rightIsWall___204073 = undefined;
-    s.topIsWall___204080 = undefined;
-    s.bottomIsWall___204087 = undefined;
-    s.topLeft___204102 = undefined;
-    s.bottomLeft___204120 = undefined;
-    s.topRight___204145 = undefined;
-    s.bottomRight___204164 = undefined;
-    s.neighborCost___204194 = undefined;
-    s.node___204200 = undefined;
-    s.unnamed8928___U24 = undefined;
-    s.unnamed8929___U25 = undefined;
-    s.cornerCost___204210 = undefined;
-    s.corner___204216 = undefined;
-    s.unnamed8930___U28 = undefined;
-    s.unnamed8931___U29 = undefined;
-    s.endCol___204222 = undefined;
-    s.endDataNode___204229 = undefined;
-    s.curr___204242 = undefined;
-    s.output___204244 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
-      s.arg4 = (s.lambdaArgs[4]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_3 = scene_isWalkable__P191303_mk(s);
-    s.tmp_3.arg0 = s.arg1;
-    s.tmp_3.arg1 = s.arg2;
-    s.tmp_3.arg2 = s.arg0;
-    s.callLocIdx = 1798; s.pc = 52; return s.tmp_3;
-  case 52:
-    r0 = s.retval;
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    s.now___8078 = undefined;
+    s.i___8081 = undefined;
+    s.ev___8087 = undefined;
+  case 1:
+    r0 = pxsim_Array__length(globals._pollEventQueue___4006);
     s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = (s.tmp_1 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = undefined;
-    { step = 51; continue; }
-  case 1:
+    if (!r0) { step = 12; continue; }
+    r0 = pxsim.control.millis();
+    s.now___8078 = (r0);
+    s.i___8081 = (0);
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(Heap__C188863_VT);
-    s.tmp_4 = r0;
-    s.tmp_5 = Heap_constructor__P188864_mk(s);
-    s.tmp_5.arg0 = s.tmp_4;
-    s.tmp_5.arg1 = inline__P203905;
-    s.callLocIdx = 1799; s.pc = 53; return s.tmp_5;
-  case 53:
-    r0 = s.retval;
-    s.consideredTiles___203902 = (s.tmp_4);
-    r0 = pxsim_Array__mk();
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__mk();
-    s.tmp_1 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.encountedLocations___203924 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(4, updateOrFillLocation__P203927);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.encountedLocations___203924);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg3);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.consideredTiles___203902);
-    s.updateOrFillLocation___203927 = (s.tmp_0);
-    s.tmp_1 = lambda_4_mk(s);
-    s.tmp_1.argL = s.updateOrFillLocation___203927;
-    s.tmp_1.arg0 = s.arg1;
-    s.tmp_1.arg1 = null;
-    s.tmp_1.arg2 = 0;
-    setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 1807; s.pc = 54; return s.tmp_1;
-  case 54:
-    r0 = s.retval;
-    s.end___203997 = (null);
-  case 3:
-    r0 = s.consideredTiles___203902.fields["store"];
+    s.tmp_1 = r0 = s.i___8081;
+    r0 = pxsim_Array__length(globals._pollEventQueue___4006);
     s.tmp_2 = r0;
-    r0 = pxsim_Array__length(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 !== 0);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 40; continue; }
-    s.tmp_3 = Heap_pop__P188866_mk(s);
-    s.tmp_3.arg0 = s.consideredTiles___203902;
-    s.callLocIdx = 1809; s.pc = 55; return s.tmp_3;
-  case 55:
-    r0 = s.retval;
-    s.currLocation___204003 = (r0);
-    s.tmp_1 = lambda_2_mk(s);
-    s.tmp_1.argL = s.arg4;
-    r0 = s.currLocation___204003.fields["loc"];
-    s.tmp_1.arg0 = r0;
-    setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 1810; s.pc = 56; return s.tmp_1;
-  case 56:
-    r0 = s.retval;
+    r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    r0 = s.currLocation___204003.fields["loc"];
-    s.end___203997 = (r0);
-    { step = 40; continue; }
-  case 4:
-  case 5:
-    s.tmp_0 = scene_locationRow__P191300_mk(s);
-    r0 = s.currLocation___204003.fields["loc"];
-    s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1811; s.pc = 57; return s.tmp_0;
-  case 57:
-    r0 = s.retval;
-    s.row___204014 = (r0);
-    s.tmp_0 = scene_locationCol__P191301_mk(s);
-    r0 = s.currLocation___204003.fields["loc"];
-    s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1812; s.pc = 58; return s.tmp_0;
-  case 58:
+    if (!r0) { step = 11; continue; }
+    r0 = pxsim_Array__getAt(globals._pollEventQueue___4006, s.i___8081);
+    s.ev___8087 = (r0);
+    s.tmp_1 = if_condition_1_mk(s);
+    s.tmp_1.arg0 = s.ev___8087;
+    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;
+    } else {
+      s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["condition"];
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["condition"], 1); s.callLocIdx = 32; s.pc = 13; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 32; s.pc = 13; return s.tmp_1;; }
+     else { s.callLocIdx = 32; s.pc = 13; return s.tmp_1; }
+    }
+  case 13:
     r0 = s.retval;
-    s.col___204019 = (r0);
-    r0 = pxsim_Array__getAt(s.encountedLocations___203924, s.col___204019);
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.row___204014);
-    s.dataForCurrLocation___204024 = (r0);
-    s.tmp_0 = r0 = s.dataForCurrLocation___204024;
     r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 6; continue; }
+    if (!r0) { step = 3; continue; }
     r0 = s.tmp_0;
-    { step = 7; continue; }
+    { step = 6; continue; }
+  case 3:
+    r0 = s.ev___8087.fields["timeOut"];
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 > 0);
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_2);
+    if (r0) { step = 4; continue; }
+    r0 = s.tmp_2;
+    { step = 5; continue; }
+  case 4:
+    r0 = s.ev___8087.fields["start"];
+    s.tmp_5 = r0;
+    r0 = (s.now___8078 - s.tmp_5);
+    s.tmp_4 = r0;
+    r0 = s.ev___8087.fields["timeOut"];
+    s.tmp_6 = r0;
+    r0 = (s.tmp_4 > s.tmp_6);
+  case 5:
+    // jmp value (already in r0)
+    s.tmp_7 = r0;
+    r0 = s.tmp_7;
   case 6:
-    r0 = s.dataForCurrLocation___204024.fields["visited"];
-  case 7:
     // jmp value (already in r0)
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    if (!r0) { step = 8; continue; }
-    { step = 3; continue; }
-  case 8:
-  case 9:
-    r0 = (s.dataForCurrLocation___204024).fields["visited"] = (true);
-    r0 = pxsim_Array__mk();
-    s.neighbors___204036 = (r0);
-    r0 = pxsim_Array__mk();
-    s.corners___204038 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P187561_mk(s);
-    r0 = (s.col___204019 - 1);
-    s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.row___204014;
-    s.callLocIdx = 1813; s.pc = 59; return s.tmp_0;
-  case 59:
-    r0 = s.retval;
-    s.left___204040 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P187561_mk(s);
-    r0 = (s.col___204019 + 1);
-    s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.row___204014;
-    s.callLocIdx = 1814; s.pc = 60; return s.tmp_0;
-  case 60:
-    r0 = s.retval;
-    s.right___204046 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P187561_mk(s);
-    s.tmp_0.arg0 = s.col___204019;
-    r0 = (s.row___204014 - 1);
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1815; s.pc = 61; return s.tmp_0;
-  case 61:
-    r0 = s.retval;
-    s.top___204053 = (r0);
-    s.tmp_0 = tiles_getTileLocation__P187561_mk(s);
-    s.tmp_0.arg0 = s.col___204019;
-    r0 = (s.row___204014 + 1);
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1816; s.pc = 62; return s.tmp_0;
-  case 62:
-    r0 = s.retval;
-    s.bottom___204059 = (r0);
-    s.tmp_2 = scene_isWalkable__P191303_mk(s);
-    s.tmp_2.arg0 = s.left___204040;
-    s.tmp_2.arg1 = s.arg2;
-    s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1817; s.pc = 63; return s.tmp_2;
-  case 63:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.leftIsWall___204066 = (r0);
-    s.tmp_2 = scene_isWalkable__P191303_mk(s);
-    s.tmp_2.arg0 = s.right___204046;
-    s.tmp_2.arg1 = s.arg2;
-    s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1818; s.pc = 64; return s.tmp_2;
-  case 64:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.rightIsWall___204073 = (r0);
-    s.tmp_2 = scene_isWalkable__P191303_mk(s);
-    s.tmp_2.arg0 = s.top___204053;
-    s.tmp_2.arg1 = s.arg2;
-    s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1819; s.pc = 65; return s.tmp_2;
-  case 65:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.topIsWall___204080 = (r0);
-    s.tmp_2 = scene_isWalkable__P191303_mk(s);
-    s.tmp_2.arg0 = s.bottom___204059;
-    s.tmp_2.arg1 = s.arg2;
-    s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1820; s.pc = 66; return s.tmp_2;
-  case 66:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
-    s.bottomIsWall___204087 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.leftIsWall___204066);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 18; continue; }
-    r0 = pxsim_Array__push(s.neighbors___204036, s.left___204040);
-    r0 = pxsim_numops_toBoolDecr(s.topIsWall___204080);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_8 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_8);
+    if (!r0) { step = 9; continue; }
+    r0 = s.ev___8087.fields["eid"];
+    s.tmp_9 = r0;
+    r0 = s.ev___8087.fields["vid"];
+    s.tmp_10 = r0;
+    r0 = pxsim.control.raiseEvent(s.tmp_9, s.tmp_10);
+    r0 = s.ev___8087.fields["once"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 12; continue; }
-    s.tmp_2 = tiles_getTileLocation__P187561_mk(s);
-    r0 = (s.col___204019 - 1);
-    s.tmp_2.arg0 = r0;
-    r0 = (s.row___204014 - 1);
-    s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1821; s.pc = 67; return s.tmp_2;
-  case 67:
-    r0 = s.retval;
-    s.topLeft___204102 = (r0);
-    s.tmp_3 = scene_isWall__P191302_mk(s);
-    s.tmp_3.arg0 = s.topLeft___204102;
-    s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1822; s.pc = 68; return s.tmp_3;
-  case 68:
+    if (!r0) { step = 7; continue; }
+    s.tmp_1 = helpers_arraySplice__P98_mk(s);
+    s.tmp_1.arg0 = globals._pollEventQueue___4006;
+    s.tmp_1.arg1 = s.i___8081;
+    s.tmp_1.arg2 = 1;
+    s.callLocIdx = 33; s.pc = 14; return s.tmp_1;
+  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);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__push(s.corners___204038, s.topLeft___204102);
+    r0 = (s.i___8081 - 1);
+    s.i___8081 = (r0);
+  case 7:
+  case 8:
+  case 9:
   case 10:
+    r0 = (s.i___8081 + 1);
+    s.i___8081 = (r0);
+    { step = 2; continue; }
   case 11:
-  case 12:
-  case 13:
-    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___204087);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 16; continue; }
-    s.tmp_2 = tiles_getTileLocation__P187561_mk(s);
-    r0 = (s.col___204019 - 1);
-    s.tmp_2.arg0 = r0;
-    r0 = (s.row___204014 + 1);
-    s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1823; s.pc = 69; return s.tmp_2;
-  case 69:
-    r0 = s.retval;
-    s.bottomLeft___204120 = (r0);
-    s.tmp_3 = scene_isWall__P191302_mk(s);
-    s.tmp_3.arg0 = s.bottomLeft___204120;
-    s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1824; s.pc = 70; return s.tmp_3;
-  case 70:
-    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 = 14; continue; }
-    r0 = pxsim_Array__push(s.corners___204038, s.bottomLeft___204120);
-  case 14:
+    s.tmp_0 = pause__P402_mk(s);
+    s.tmp_0.arg0 = 50;
+    s.callLocIdx = 34; s.pc = 15; return s.tmp_0;
   case 15:
-  case 16:
-  case 17:
-  case 18:
-  case 19:
-    r0 = pxsim_numops_toBoolDecr(s.rightIsWall___204073);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 28; continue; }
-    r0 = pxsim_Array__push(s.neighbors___204036, s.right___204046);
-    r0 = pxsim_numops_toBoolDecr(s.topIsWall___204080);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 22; continue; }
-    s.tmp_2 = tiles_getTileLocation__P187561_mk(s);
-    r0 = (s.col___204019 + 1);
-    s.tmp_2.arg0 = r0;
-    r0 = (s.row___204014 - 1);
-    s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1825; s.pc = 71; return s.tmp_2;
-  case 71:
-    r0 = s.retval;
-    s.topRight___204145 = (r0);
-    s.tmp_3 = scene_isWall__P191302_mk(s);
-    s.tmp_3.arg0 = s.topRight___204145;
-    s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1826; s.pc = 72; return s.tmp_3;
-  case 72:
-    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 = 20; continue; }
-    r0 = pxsim_Array__push(s.corners___204038, s.topRight___204145);
-  case 20:
-  case 21:
-  case 22:
-  case 23:
-    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___204087);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 26; continue; }
-    s.tmp_2 = tiles_getTileLocation__P187561_mk(s);
-    r0 = (s.col___204019 + 1);
-    s.tmp_2.arg0 = r0;
-    r0 = (s.row___204014 + 1);
-    s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1827; s.pc = 73; return s.tmp_2;
-  case 73:
-    r0 = s.retval;
-    s.bottomRight___204164 = (r0);
-    s.tmp_3 = scene_isWall__P191302_mk(s);
-    s.tmp_3.arg0 = s.bottomRight___204164;
-    s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1828; s.pc = 74; return s.tmp_3;
-  case 74:
-    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 = 24; continue; }
-    r0 = pxsim_Array__push(s.corners___204038, s.bottomRight___204164);
-  case 24:
-  case 25:
-  case 26:
-  case 27:
-  case 28:
-  case 29:
-    r0 = pxsim_numops_toBoolDecr(s.topIsWall___204080);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 30; continue; }
-    r0 = pxsim_Array__push(s.neighbors___204036, s.top___204053);
-  case 30:
-  case 31:
-    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___204087);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 32; continue; }
-    r0 = pxsim_Array__push(s.neighbors___204036, s.bottom___204059);
-  case 32:
-  case 33:
-    r0 = s.currLocation___204003.fields["cost"];
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 + 1);
-    s.neighborCost___204194 = (r0);
-    s.node___204200 = (undefined);
-    s.unnamed8928___U24 = (s.neighbors___204036);
-    s.unnamed8929___U25 = (0);
-  case 34:
-    s.tmp_0 = r0 = s.unnamed8929___U25;
-    r0 = pxsim_Array__length(s.unnamed8928___U24);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0 < s.tmp_1);
-    if (!r0) { step = 35; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8928___U24, s.unnamed8929___U25);
-    s.node___204200 = (r0);
-    s.tmp_2 = lambda_4_mk(s);
-    s.tmp_2.argL = s.updateOrFillLocation___203927;
-    s.tmp_2.arg0 = s.node___204200;
-    s.tmp_2.arg1 = s.dataForCurrLocation___204024;
-    s.tmp_2.arg2 = s.neighborCost___204194;
-    setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1829; s.pc = 75; return s.tmp_2;
-  case 75:
-    r0 = s.retval;
-    r0 = (s.unnamed8929___U25 + 1);
-    s.unnamed8929___U25 = (r0);
-    { step = 34; continue; }
-  case 35:
-    s.unnamed8928___U24 = (undefined);
-    r0 = pxsim_Array__length(s.corners___204038);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 38; continue; }
-    r0 = s.currLocation___204003.fields["cost"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 + 1.414213562373095);
-    s.cornerCost___204210 = (r0);
-    s.corner___204216 = (undefined);
-    s.unnamed8930___U28 = (s.corners___204038);
-    s.unnamed8931___U29 = (0);
-  case 36:
-    s.tmp_0 = r0 = s.unnamed8931___U29;
-    r0 = pxsim_Array__length(s.unnamed8930___U28);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0 < s.tmp_1);
-    if (!r0) { step = 37; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8930___U28, s.unnamed8931___U29);
-    s.corner___204216 = (r0);
-    s.tmp_2 = lambda_4_mk(s);
-    s.tmp_2.argL = s.updateOrFillLocation___203927;
-    s.tmp_2.arg0 = s.corner___204216;
-    s.tmp_2.arg1 = s.dataForCurrLocation___204024;
-    s.tmp_2.arg2 = s.cornerCost___204210;
-    setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1830; s.pc = 76; return s.tmp_2;
-  case 76:
-    r0 = s.retval;
-    r0 = (s.unnamed8931___U29 + 1);
-    s.unnamed8931___U29 = (r0);
-    { step = 36; continue; }
-  case 37:
-    s.unnamed8930___U28 = (undefined);
-  case 38:
-  case 39:
-    { step = 3; continue; }
-  case 40:
-    s.tmp_0 = r0 = s.end___203997;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 41; continue; }
-    r0 = s.tmp_0;
-    { step = 42; continue; }
-  case 41:
-    s.tmp_1 = r0 = s.encountedLocations___203924;
-    s.tmp_3 = scene_locationCol__P191301_mk(s);
-    s.tmp_3.arg0 = s.end___203997;
-    s.callLocIdx = 1831; s.pc = 77; return s.tmp_3;
-  case 77:
-    r0 = s.retval;
-    s.tmp_2 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
-  case 42:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    s.endCol___204222 = (s.tmp_4);
-    s.tmp_0 = r0 = s.endCol___204222;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 43; continue; }
-    r0 = s.tmp_0;
-    { step = 44; continue; }
-  case 43:
-    s.tmp_1 = r0 = s.endCol___204222;
-    s.tmp_3 = scene_locationRow__P191300_mk(s);
-    s.tmp_3.arg0 = s.end___203997;
-    s.callLocIdx = 1832; s.pc = 78; return s.tmp_3;
-  case 78:
     r0 = s.retval;
-    s.tmp_2 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
-  case 44:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    s.endDataNode___204229 = (s.tmp_4);
-    r0 = pxsim_numops_toBoolDecr(s.end___203997);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 45; continue; }
-    r0 = s.tmp_0;
-    { step = 46; continue; }
-  case 45:
-    r0 = pxsim_numops_toBoolDecr(s.endDataNode___204229);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-  case 46:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 47; continue; }
+    { step = 1; continue; }
+  case 12:
+    globals._pollEventQueue___4006 = (undefined);
     r0 = undefined;
-    { step = 51; continue; }
-  case 47:
-  case 48:
-    s.curr___204242 = (s.endDataNode___204229);
-    r0 = pxsim_Array__mk();
-    s.output___204244 = (r0);
-  case 49:
-    r0 = pxsim_numops_toBoolDecr(s.curr___204242);
-    if (!r0) { step = 50; continue; }
-    s.tmp_0 = helpers_arrayUnshift__P185319_mk(s);
-    s.tmp_0.arg0 = s.output___204244;
-    r0 = s.curr___204242.fields["l"];
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1833; s.pc = 79; return s.tmp_0;
-  case 79:
-    r0 = s.retval;
-    r0 = s.curr___204242.fields["parent"];
-    s.curr___204242 = (r0);
-    { step = 49; continue; }
-  case 50:
-    r0 = s.output___204244;
-  case 51:
-    return leave(s, r0)
-  default: oops()
-} } }
-scene_generalAStar__P188874.info = {"start":1723,"length":5198,"line":53,"column":4,"endLine":198,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"generalAStar","argumentNames":["tm","start","onTilesOf","heuristic","isEnd"]}
-
-function scene_generalAStar__P188874_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: scene_generalAStar__P188874, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  consideredTiles___203902: undefined,
-  encountedLocations___203924: undefined,
-  updateOrFillLocation___203927: undefined,
-  end___203997: undefined,
-  currLocation___204003: undefined,
-  row___204014: undefined,
-  col___204019: undefined,
-  dataForCurrLocation___204024: undefined,
-  neighbors___204036: undefined,
-  corners___204038: undefined,
-  left___204040: undefined,
-  right___204046: undefined,
-  top___204053: undefined,
-  bottom___204059: undefined,
-  leftIsWall___204066: undefined,
-  rightIsWall___204073: undefined,
-  topIsWall___204080: undefined,
-  bottomIsWall___204087: undefined,
-  topLeft___204102: undefined,
-  bottomLeft___204120: undefined,
-  topRight___204145: undefined,
-  bottomRight___204164: undefined,
-  neighborCost___204194: undefined,
-  node___204200: undefined,
-  unnamed8928___U24: undefined,
-  unnamed8929___U25: undefined,
-  cornerCost___204210: undefined,
-  corner___204216: undefined,
-  unnamed8930___U28: undefined,
-  unnamed8931___U29: undefined,
-  endCol___204222: undefined,
-  endDataNode___204229: undefined,
-  curr___204242: undefined,
-  output___204244: undefined,
-  arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
-  arg4: undefined,
-} }
-
-
-
-
-
-function inline__P203905(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.fields["cost"];
-    s.tmp_2 = r0;
-    r0 = pxsim.Math_.pow(s.tmp_2, 2);
-    s.tmp_1 = r0;
-    r0 = s.arg0.fields["extraCost"];
-    s.tmp_3 = r0;
-    r0 = (s.tmp_1 + s.tmp_3);
-    s.tmp_0 = r0;
-    r0 = s.arg1.fields["cost"];
-    s.tmp_6 = r0;
-    r0 = pxsim.Math_.pow(s.tmp_6, 2);
-    s.tmp_5 = r0;
-    r0 = s.arg1.fields["extraCost"];
-    s.tmp_7 = r0;
-    r0 = (s.tmp_5 + s.tmp_7);
-    s.tmp_4 = r0;
-    r0 = (s.tmp_0 - s.tmp_4);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P203905.info = {"start":2110,"length":67,"line":62,"column":12,"endLine":62,"endColumn":79,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["a","b"]}
+control_pollEvents__P4007.info = {"start":618,"length":638,"line":20,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"pollEvents","argumentNames":[]}
 
-function inline__P203905_mk(s) {
+function control_pollEvents__P4007_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P203905, depth: s.depth + 1,
+        parent: s, fn: control_pollEvents__P4007, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -6488,15 +6152,19 @@ function inline__P203905_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  arg0: undefined,
-  arg1: undefined,
+  tmp_8: undefined,
+  tmp_9: undefined,
+  tmp_10: undefined,
+  now___8078: undefined,
+  i___8081: undefined,
+  ev___8087: undefined,
 } }
 
 
 
 
 
-function updateOrFillLocation__P203927(s) {
+function helpers_arraySplice__P98(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6506,154 +6174,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.row___203931 = undefined;
-    s.col___203935 = undefined;
-    s.colData___203943 = undefined;
-    s.lData___203953 = undefined;
-    s.h___203984 = undefined;
+    s.i___8135 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationRow__P191300_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1800; s.pc = 12; return s.tmp_0;
-  case 12:
-    r0 = s.retval;
-    s.row___203931 = (r0);
-    s.tmp_0 = scene_locationCol__P191301_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1801; s.pc = 13; return s.tmp_0;
-  case 13:
-    r0 = s.retval;
-    s.col___203935 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P187553_mk(s);
-    s.tmp_1.arg0 = s.caps[0];
-    s.tmp_1.arg1 = s.col___203935;
-    s.tmp_1.arg2 = s.row___203931;
-    s.callLocIdx = 1802; s.pc = 14; return s.tmp_1;
-  case 14:
-    r0 = s.retval;
+    r0 = (s.arg1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    { step = 11; continue; }
+    { step = 5; continue; }
   case 1:
   case 2:
-    r0 = pxsim_Array__getAt(s.caps[1], s.col___203935);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_2);
-    if (!r0) { step = 3; continue; }
-    r0 = s.tmp_2;
-    { step = 4; continue; }
+    s.i___8135 = (0);
   case 3:
-    s.tmp_3 = r0 = s.caps[1];
-    s.tmp_4 = r0 = s.col___203935;
-    r0 = pxsim_Array__mk();
-    s.tmp_5 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_3, s.tmp_4, s.tmp_5);
-    r0 = s.tmp_5;
-  case 4:
-    // jmp value (already in r0)
-    s.tmp_6 = r0;
-    s.colData___203943 = (s.tmp_6);
-    r0 = pxsim_Array__getAt(s.colData___203943, s.row___203931);
-    s.lData___203953 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.lData___203953);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = (s.i___8135 < s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(scene_LocationNode__C191297_VT);
-    s.tmp_2 = r0;
-    s.tmp_3 = scene_LocationNode_constructor__P191298_mk(s);
-    s.tmp_3.arg0 = s.tmp_2;
-    s.tmp_3.arg1 = s.arg0;
-    s.tmp_3.arg2 = s.arg1;
-    s.tmp_3.arg3 = s.arg2;
-    s.callLocIdx = 1803; s.pc = 15; return s.tmp_3;
-  case 15:
-    r0 = s.retval;
-    r0 = pxsim_Array_.setAt(s.colData___203943, s.row___203931, s.tmp_2);
-    { step = 10; continue; }
+    if (!r0) { step = 4; continue; }
+    r0 = pxsim_Array_.removeAt(s.arg0, s.arg1);
+    r0 = (s.i___8135 + 1);
+    s.i___8135 = (r0);
+    { step = 3; continue; }
+  case 4:
   case 5:
-    r0 = s.lData___203953.fields["visited"];
-    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_toBool(s.tmp_0);
-    if (r0) { step = 6; continue; }
-    r0 = s.tmp_0;
-    { step = 7; continue; }
-  case 6:
-    r0 = s.lData___203953.fields["lastCost"];
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 > s.arg2);
-  case 7:
-    // jmp value (already in r0)
-    s.tmp_4 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
-    if (!r0) { step = 8; continue; }
-    r0 = (s.lData___203953).fields["lastCost"] = (s.arg2);
-    r0 = (s.lData___203953).fields["parent"] = (s.arg1);
-    { step = 9; continue; }
-  case 8:
-    { step = 11; continue; }
-  case 9:
-  case 10:
-    s.tmp_0 = lambda_2_mk(s);
-    s.tmp_0.argL = s.caps[2];
-    s.tmp_0.arg0 = s.arg0;
-    setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1804; s.pc = 16; return s.tmp_0;
-  case 16:
-    r0 = s.retval;
-    s.h___203984 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_PrioritizedLocation__C191295_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = scene_PrioritizedLocation_constructor__P191296_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.arg0;
-    s.tmp_1.arg2 = s.arg2;
-    s.tmp_1.arg3 = s.h___203984;
-    s.callLocIdx = 1805; s.pc = 17; return s.tmp_1;
-  case 17:
-    r0 = s.retval;
-    s.tmp_2 = Heap_push__P188865_mk(s);
-    s.tmp_2.arg0 = s.caps[3];
-    s.tmp_2.arg1 = s.tmp_0;
-    s.callLocIdx = 1806; s.pc = 18; return s.tmp_2;
-  case 18:
-    r0 = s.retval;
-  case 11:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-updateOrFillLocation__P203927.info = {"start":2261,"length":1162,"line":66,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"updateOrFillLocation","argumentNames":["l","parent","cost"]}
+helpers_arraySplice__P98.info = {"start":3642,"length":213,"line":137,"column":4,"endLine":144,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySplice","argumentNames":["arr","start","len"]}
 
-function updateOrFillLocation__P203927_mk(s) {
+function helpers_arraySplice__P98_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: updateOrFillLocation__P203927, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySplice__P98, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  row___203931: undefined,
-  col___203935: undefined,
-  colData___203943: undefined,
-  lData___203953: undefined,
-  h___203984: undefined,
+  i___8135: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -6663,7 +6222,7 @@ function updateOrFillLocation__P203927_mk(s) {
 
 
 
-function scene_LocationNode_constructor__P191298(s) {
+function control_PollEvent_constructor__P4004(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6678,36 +6237,44 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.arg3 = (s.lambdaArgs[3]);
+      s.arg4 = (s.lambdaArgs[4]);
+      s.arg5 = (s.lambdaArgs[5]);
+      s.arg6 = (s.lambdaArgs[6]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_LocationNode__C191297_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["l"] = (s.arg1);
-    r0 = (s.arg0).fields["parent"] = (s.arg2);
-    r0 = (s.arg0).fields["lastCost"] = (s.arg3);
-    r0 = (s.arg0).fields["visited"] = (false);
+    if (!checkSubtype(r0, control_PollEvent__C4003_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["eid"] = (s.arg1);
+    r0 = (s.arg0).fields["vid"] = (s.arg2);
+    r0 = (s.arg0).fields["start"] = (s.arg3);
+    r0 = (s.arg0).fields["timeOut"] = (s.arg4);
+    r0 = (s.arg0).fields["condition"] = (s.arg5);
+    r0 = (s.arg0).fields["once"] = (s.arg6);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_LocationNode_constructor__P191298.info = {"start":317,"length":189,"line":13,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","l","parent","lastCost"]}
+control_PollEvent_constructor__P4004.info = {"start":239,"length":316,"line":8,"column":8,"endLine":15,"endColumn":9,"fileName":"pxt_modules/base/poll.ts","functionName":"inline","argumentNames":["this","eid","vid","start","timeOut","condition","once"]}
 
-function scene_LocationNode_constructor__P191298_mk(s) {
+function control_PollEvent_constructor__P4004_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_LocationNode_constructor__P191298, depth: s.depth + 1,
+        parent: s, fn: control_PollEvent_constructor__P4004, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
   arg3: undefined,
+  arg4: undefined,
+  arg5: undefined,
+  arg6: undefined,
 } }
 
 
 
 
 
-function scene_PrioritizedLocation_constructor__P191296(s) {
+function control_onEvent__P380(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6717,6 +6284,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.ctx___7994 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -6724,22 +6292,44 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, scene_PrioritizedLocation__C191295_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["loc"] = (s.arg1);
-    r0 = (s.arg0).fields["cost"] = (s.arg2);
-    r0 = (s.arg0).fields["extraCost"] = (s.arg3);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-scene_PrioritizedLocation_constructor__P191296.info = {"start":60,"length":176,"line":2,"column":8,"endLine":7,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","loc","cost","extraCost"]}
-
-function scene_PrioritizedLocation_constructor__P191296_mk(s) {
+    s.tmp_0 = control_eventContext__P397_mk(s);
+    s.callLocIdx = 47; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+    s.ctx___7994 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___7994);
+    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.control.internalOnEvent(s.arg0, s.arg1, s.arg2, s.arg3);
+    { step = 2; continue; }
+  case 1:
+    s.tmp_0 = control_EventContext_registerHandler__P394_mk(s);
+    s.tmp_0.arg0 = s.ctx___7994;
+    s.tmp_0.arg1 = s.arg0;
+    s.tmp_0.arg2 = s.arg1;
+    s.tmp_0.arg3 = s.arg2;
+    s.tmp_0.arg4 = s.arg3;
+    s.callLocIdx = 48; s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+  case 2:
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+control_onEvent__P380.info = {"start":336,"length":325,"line":9,"column":4,"endLine":15,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"onEvent","argumentNames":["src","value","handler","flags"]}
+
+function control_onEvent__P380_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_PrioritizedLocation_constructor__P191296, depth: s.depth + 1,
+        parent: s, fn: control_onEvent__P380, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  ctx___7994: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -6750,7 +6340,7 @@ function scene_PrioritizedLocation_constructor__P191296_mk(s) {
 
 
 
-function Heap_length__P188868(s) {
+function control_eventContext__P397(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6760,35 +6350,42 @@ 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;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.tmp_0);
-    return leaveAccessor(s, r0)
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___4032);
+    if (!r0) { step = 1; continue; }
+    s.tmp_0 = r0 = globals.eventContexts___4032;
+    r0 = pxsim_Array__length(globals.eventContexts___4032);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 - 1);
+    s.tmp_1 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
+    { step = 2; continue; }
+  case 1:
+    r0 = undefined;
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = s.tmp_3;
+    return leave(s, r0)
   default: oops()
 } } }
-Heap_length__P188868.info = {"start":1832,"length":54,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"length","argumentNames":["this"]}
-Heap_length__P188868.isGetter = true;
+control_eventContext__P397.info = {"start":6907,"length":136,"line":209,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
 
-function Heap_length__P188868_mk(s) {
+function control_eventContext__P397_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_length__P188868, depth: s.depth + 1,
+        parent: s, fn: control_eventContext__P397, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  arg0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
 } }
 
 
 
 
 
-function Heap_pop__P188866(s) {
+function control_EventContext_registerHandler__P394(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6798,66 +6395,113 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.output___204280 = undefined;
-    s.nextRoot___204285 = undefined;
+    s.h___8017 = undefined;
+    s.unnamed94___U1 = undefined;
+    s.unnamed95___U2 = undefined;
+    s.hn___8040 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
+      s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, 0);
-    s.output___204280 = (r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array_.pop(s.tmp_0);
-    s.nextRoot___204285 = (r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_2 = r0;
-    r0 = pxsim_Array__length(s.tmp_2);
+    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    s.h___8017 = (undefined);
+    r0 = s.arg0.fields["handlers"];
+    s.unnamed94___U1 = (r0);
+    s.unnamed95___U2 = (0);
+  case 1:
+    s.tmp_0 = r0 = s.unnamed95___U2;
+    r0 = pxsim_Array__length(s.unnamed94___U1);
     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; }
-    r0 = s.arg0.fields["store"];
+    r0 = (s.tmp_0 < s.tmp_1);
+    if (!r0) { step = 6; continue; }
+    r0 = pxsim_Array__getAt(s.unnamed94___U1, s.unnamed95___U2);
+    s.h___8017 = (r0);
+    r0 = s.h___8017.fields["src"];
     s.tmp_3 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_3, 0, s.nextRoot___204285);
-    s.tmp_0 = Heap_percolateDown__P191290_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1789; s.pc = 3; return s.tmp_0;
+    r0 = (s.tmp_3 == s.arg1);
+    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.h___8017.fields["value"];
+    s.tmp_4 = r0;
+    r0 = (s.tmp_4 == s.arg2);
   case 3:
+    // jmp value (already in r0)
+    s.tmp_5 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_5);
+    if (!r0) { step = 4; continue; }
+    r0 = (s.h___8017).fields["flags"] = (s.arg4);
+    r0 = (s.h___8017).fields["handler"] = (s.arg3);
+    { step = 7; continue; }
+  case 4:
+  case 5:
+    r0 = (s.unnamed95___U2 + 1);
+    s.unnamed95___U2 = (r0);
+    { step = 1; continue; }
+  case 6:
+    s.unnamed94___U1 = (undefined);
+    r0 = pxsim_pxtcore_mkClassInstance(control_EventHandler__C4024_VT);
+    s.tmp_0 = r0;
+    s.tmp_1 = control_EventHandler_constructor__P4027_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.arg3;
+    s.tmp_1.arg4 = s.arg4;
+    s.callLocIdx = 60; s.pc = 8; return s.tmp_1;
+  case 8:
     r0 = s.retval;
-  case 1:
-  case 2:
-    r0 = s.output___204280;
+    s.hn___8040 = (s.tmp_0);
+    r0 = s.arg0.fields["handlers"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array__push(s.tmp_0, s.hn___8040);
+    s.tmp_0 = control_EventHandler_register__P4025_mk(s);
+    s.tmp_0.arg0 = s.hn___8040;
+    s.callLocIdx = 61; s.pc = 9; return s.tmp_0;
+  case 9:
+    r0 = s.retval;
+  case 7:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_pop__P188866.info = {"start":1536,"length":236,"line":61,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"pop","argumentNames":["this"]}
+control_EventContext_registerHandler__P394.info = {"start":5573,"length":525,"line":169,"column":8,"endLine":182,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"registerHandler","argumentNames":["this","src","value","handler","flags"]}
 
-function Heap_pop__P188866_mk(s) {
+function control_EventContext_registerHandler__P394_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_pop__P188866, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_registerHandler__P394, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  output___204280: undefined,
-  nextRoot___204285: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  h___8017: undefined,
+  unnamed94___U1: undefined,
+  unnamed95___U2: undefined,
+  hn___8040: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
+  arg4: undefined,
 } }
 
 
 
 
 
-function Heap_percolateDown__P191290(s) {
+function control_EventHandler_constructor__P4027(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -6867,151 +6511,43 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.data___204300 = undefined;
-    s.max___204303 = undefined;
-    s.left___204311 = undefined;
-    s.right___204315 = undefined;
-    s.curr___204319 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
+      s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = s.arg0.fields["store"];
-    s.data___204300 = (r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__length(s.tmp_0);
-    s.max___204303 = (r0);
-  case 1:
-    r0 = (s.arg1 < s.max___204303);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 12; continue; }
-    r0 = (s.arg1 << 1);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 + 1);
-    s.left___204311 = (r0);
-    r0 = (s.arg1 << 1);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 + 2);
-    s.right___204315 = (r0);
-    s.curr___204319 = (s.arg1);
-    r0 = (s.left___204311 < s.max___204303);
-    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:
-    s.tmp_2 = if_comparator_3_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.data___204300, s.curr___204319);
-    s.tmp_2.arg1 = r0;
-    r0 = pxsim_Array__getAt(s.data___204300, s.left___204311);
-    s.tmp_2.arg2 = r0;
-    if (!s.tmp_2.arg0.vtable.iface) {
-      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
-      s.callLocIdx = 1783; s.pc = 13; return s.tmp_2;
-    } else {
-      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1783; s.pc = 13; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1783; s.pc = 13; return s.tmp_2;; }
-     else { s.callLocIdx = 1783; s.pc = 13; return s.tmp_2; }
-    }
-  case 13:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 > 0);
-  case 3:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 4; continue; }
-    s.curr___204319 = (s.left___204311);
-  case 4:
-  case 5:
-    r0 = (s.right___204315 < s.max___204303);
-    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:
-    s.tmp_2 = if_comparator_3_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.data___204300, s.curr___204319);
-    s.tmp_2.arg1 = r0;
-    r0 = pxsim_Array__getAt(s.data___204300, s.right___204315);
-    s.tmp_2.arg2 = r0;
-    if (!s.tmp_2.arg0.vtable.iface) {
-      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
-      s.callLocIdx = 1784; s.pc = 14; return s.tmp_2;
-    } else {
-      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1784; s.pc = 14; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1784; s.pc = 14; return s.tmp_2;; }
-     else { s.callLocIdx = 1784; s.pc = 14; return s.tmp_2; }
-    }
-  case 14:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 > 0);
-  case 7:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 8; continue; }
-    s.curr___204319 = (s.right___204315);
-  case 8:
-  case 9:
-    r0 = (s.curr___204319 == s.arg1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 10; continue; }
-    { step = 12; continue; }
-  case 10:
-  case 11:
-    r0 = pxsim_Array__getAt(s.data___204300, s.arg1);
-    s.tmp_1 = r0;
-    r0 = pxsim_Array__getAt(s.data___204300, s.curr___204319);
-    s.tmp_2 = r0;
-    r0 = pxsim_Array_.setAt(s.data___204300, s.curr___204319, s.tmp_1);
-    r0 = pxsim_Array_.setAt(s.data___204300, s.arg1, s.tmp_2);
-    s.arg1 = (s.curr___204319);
-    { step = 1; continue; }
-  case 12:
+    if (!checkSubtype(r0, control_EventHandler__C4024_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["src"] = (s.arg1);
+    r0 = (s.arg0).fields["value"] = (s.arg2);
+    r0 = (s.arg0).fields["handler"] = (s.arg3);
+    r0 = (s.arg0).fields["flags"] = (s.arg4);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_percolateDown__P191290.info = {"start":367,"length":645,"line":13,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateDown","argumentNames":["this","i"]}
+control_EventHandler_constructor__P4027.info = {"start":786,"length":165,"line":23,"column":8,"endLine":28,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":["this","src","value","handler","flags"]}
 
-function Heap_percolateDown__P191290_mk(s) {
+function control_EventHandler_constructor__P4027_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_percolateDown__P191290, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_constructor__P4027, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  data___204300: undefined,
-  max___204303: undefined,
-  left___204311: undefined,
-  right___204315: undefined,
-  curr___204319: undefined,
   arg0: undefined,
   arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
+  arg4: undefined,
 } }
 
 
 
 
 
-function Heap_rightChild__P191294(s) {
+function control_EventHandler_register__P4025(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7023,34 +6559,43 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = (s.arg1 << 1);
+    if (!checkSubtype(r0, control_EventHandler__C4024_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8061);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + 2);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
+    r0 = s.arg0.fields["src"];
+    s.tmp_1 = r0;
+    r0 = s.arg0.fields["value"];
+    s.tmp_2 = r0;
+    r0 = s.arg0.fields["flags"];
+    s.tmp_3 = r0;
+    r0 = pxsim.control.internalOnEvent(s.tmp_1, s.tmp_2, s.tmp_0, s.tmp_3);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_rightChild__P191294.info = {"start":2435,"length":68,"line":110,"column":4,"endLine":112,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"rightChild","argumentNames":["this","i"]}
+control_EventHandler_register__P4025.info = {"start":961,"length":165,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
 
-function Heap_rightChild__P191294_mk(s) {
+function control_EventHandler_register__P4025_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_rightChild__P191294, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_register__P4025, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
   arg0: undefined,
-  arg1: undefined,
 } }
 
 
 
 
 
-function Heap_leftChild__P191293(s) {
+function inline__P8061(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7060,36 +6605,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = (s.arg1 << 1);
+    r0 = s.caps[0].fields["handler"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + 1);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_1 = if_handler_1_mk(s);
+    s.tmp_1.arg0 = s.caps[0];
+    if (!s.tmp_1.arg0.vtable.iface) {
+      setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "handler"), 1);
+      s.callLocIdx = 49; s.pc = 3; return s.tmp_1;
+    } else {
+      s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["handler"];
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["handler"], 1); s.callLocIdx = 49; s.pc = 3; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 49; s.pc = 3; return s.tmp_1;; }
+     else { s.callLocIdx = 49; s.pc = 3; return s.tmp_1; }
+    }
+  case 3:
+    r0 = s.retval;
+  case 1:
+  case 2:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_leftChild__P191293.info = {"start":2362,"length":67,"line":106,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"leftChild","argumentNames":["this","i"]}
+inline__P8061.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
 
-function Heap_leftChild__P191293_mk(s) {
+function inline__P8061_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_leftChild__P191293, depth: s.depth + 1,
+        parent: s, fn: inline__P8061, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  arg0: undefined,
-  arg1: undefined,
+  tmp_1: undefined,
 } }
 
 
 
 
 
-function Heap_push__P188865(s) {
+function Math_clamp__P122(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7102,39 +6656,43 @@ switch (step) {
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.arg1);
-    s.tmp_0 = Heap_percolateUp__P191291_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1787; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = Math_min__P126_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.tmp_1 = Math_max__P125_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.tmp_1.arg1 = s.arg2;
+    s.callLocIdx = 16; s.pc = 2; return s.tmp_1;
+  case 2:
+    r0 = s.retval;
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 17; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_push__P188865.info = {"start":1456,"length":74,"line":56,"column":4,"endLine":59,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"push","argumentNames":["this","v"]}
+Math_clamp__P122.info = {"start":14654,"length":130,"line":501,"column":4,"endLine":503,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"clamp","argumentNames":["min","max","value"]}
 
-function Heap_push__P188865_mk(s) {
+function Math_clamp__P122_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_push__P188865, depth: s.depth + 1,
+        parent: s, fn: Math_clamp__P122, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
   arg0: undefined,
   arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function Heap_percolateUp__P191291(s) {
+function Math_min__P126(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7144,98 +6702,41 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___204394 = undefined;
-    s.curr___204402 = undefined;
-    s.parentIndex___204407 = undefined;
-    s.parent___204411 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_1 = r0;
-    r0 = pxsim_Array__length(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 - 1);
-    s.i___204394 = (r0);
-  case 1:
-    r0 = (s.i___204394 > 0);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    r0 = s.arg0.fields["store"];
-    s.tmp_1 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_1, s.i___204394);
-    s.curr___204402 = (r0);
-    r0 = (s.i___204394 - 1);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 >> 1);
-    s.parentIndex___204407 = (r0);
-    r0 = s.arg0.fields["store"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.parentIndex___204407);
-    s.parent___204411 = (r0);
-    s.tmp_2 = if_comparator_3_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.parent___204411;
-    s.tmp_2.arg2 = s.curr___204402;
-    if (!s.tmp_2.arg0.vtable.iface) {
-      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
-      s.callLocIdx = 1786; s.pc = 5; return s.tmp_2;
-    } else {
-      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1786; s.pc = 5; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1786; s.pc = 5; return s.tmp_2;; }
-     else { s.callLocIdx = 1786; s.pc = 5; return s.tmp_2; }
-    }
-  case 5:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= 0);
+    r0 = (s.arg0 <= s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 2; continue; }
-    { step = 4; continue; }
+    if (!r0) { step = 1; continue; }
+    r0 = s.arg0;
+    { step = 3; continue; }
+  case 1:
   case 2:
+    r0 = s.arg1;
   case 3:
-    r0 = s.arg0.fields["store"];
-    s.tmp_3 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_3, s.i___204394, s.parent___204411);
-    r0 = s.arg0.fields["store"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array_.setAt(s.tmp_0, s.parentIndex___204407, s.curr___204402);
-    s.i___204394 = (s.parentIndex___204407);
-    { step = 1; continue; }
-  case 4:
-    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_percolateUp__P191291.info = {"start":1018,"length":432,"line":38,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateUp","argumentNames":["this"]}
+Math_min__P126.info = {"start":15790,"length":105,"line":538,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"min","argumentNames":["a","b"]}
 
-function Heap_percolateUp__P191291_mk(s) {
+function Math_min__P126_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_percolateUp__P191291, depth: s.depth + 1,
+        parent: s, fn: Math_min__P126, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  i___204394: undefined,
-  curr___204402: undefined,
-  parentIndex___204407: undefined,
-  parent___204411: undefined,
   arg0: undefined,
+  arg1: undefined,
 } }
 
 
 
 
 
-function Heap_parent__P191292(s) {
+function helpers_arrayFind__P109(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7245,27 +6746,60 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.len___7647 = undefined;
+    s.i___7650 = undefined;
+    s.v___7655 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = (s.arg1 - 1);
+    r0 = pxsim_Array__length(s.arg0);
+    s.len___7647 = (r0);
+    s.i___7650 = (0);
+  case 1:
+    r0 = (s.i___7650 < s.len___7647);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 >> 1);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 4; continue; }
+    r0 = pxsim_Array__getAt(s.arg0, s.i___7650);
+    s.v___7655 = (r0);
+    s.tmp_1 = lambda_3_mk(s);
+    s.tmp_1.argL = s.arg1;
+    s.tmp_1.arg0 = s.v___7655;
+    s.tmp_1.arg1 = s.i___7650;
+    setupLambda(s.tmp_1, s.tmp_1.argL);
+    s.callLocIdx = 8; s.pc = 6; return s.tmp_1;
+  case 6:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    r0 = s.v___7655;
+    { step = 5; continue; }
+  case 2:
+  case 3:
+    r0 = (s.i___7650 + 1);
+    s.i___7650 = (r0);
+    { step = 1; continue; }
+  case 4:
+    r0 = undefined;
+  case 5:
     return leave(s, r0)
   default: oops()
 } } }
-Heap_parent__P191292.info = {"start":2292,"length":64,"line":102,"column":4,"endLine":104,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"parent","argumentNames":["this","i"]}
+helpers_arrayFind__P109.info = {"start":8018,"length":292,"line":271,"column":4,"endLine":278,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayFind","argumentNames":["arr","callbackfn"]}
 
-function Heap_parent__P191292_mk(s) {
+function helpers_arrayFind__P109_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_parent__P191292, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayFind__P109, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
+  len___7647: undefined,
+  i___7650: undefined,
+  v___7655: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -7274,7 +6808,7 @@ function Heap_parent__P191292_mk(s) {
 
 
 
-function Heap_constructor__P188864(s) {
+function helpers_arrayFilter__P108(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7284,31 +6818,62 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.res___7668 = undefined;
+    s.len___7670 = undefined;
+    s.i___7673 = undefined;
+    s.v___7678 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Heap__C188863_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["comparator"] = (s.arg1);
-    s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["store"] = (s.tmp_1);
-    r0 = undefined;
+    s.res___7668 = (r0);
+    r0 = pxsim_Array__length(s.arg0);
+    s.len___7670 = (r0);
+    s.i___7673 = (0);
+  case 1:
+    r0 = (s.i___7673 < s.len___7670);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 4; continue; }
+    r0 = pxsim_Array__getAt(s.arg0, s.i___7673);
+    s.v___7678 = (r0);
+    s.tmp_1 = lambda_3_mk(s);
+    s.tmp_1.argL = s.arg1;
+    s.tmp_1.arg0 = s.v___7678;
+    s.tmp_1.arg1 = s.i___7673;
+    setupLambda(s.tmp_1, s.tmp_1.argL);
+    s.callLocIdx = 7; s.pc = 5; return s.tmp_1;
+  case 5:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    r0 = pxsim_Array__push(s.res___7668, s.v___7678);
+  case 2:
+  case 3:
+    r0 = (s.i___7673 + 1);
+    s.i___7673 = (r0);
+    { step = 1; continue; }
+  case 4:
+    r0 = s.res___7668;
     return leave(s, r0)
   default: oops()
 } } }
-Heap_constructor__P188864.info = {"start":257,"length":104,"line":7,"column":4,"endLine":11,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"inline","argumentNames":["this","comparator"]}
+helpers_arrayFilter__P108.info = {"start":7695,"length":317,"line":261,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayFilter","argumentNames":["arr","callbackfn"]}
 
-function Heap_constructor__P188864_mk(s) {
+function helpers_arrayFilter__P108_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Heap_constructor__P188864, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayFilter__P108, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
+  res___7668: undefined,
+  len___7670: undefined,
+  i___7673: undefined,
+  v___7678: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -7317,7 +6882,7 @@ function Heap_constructor__P188864_mk(s) {
 
 
 
-function helpers_arrayUnshift__P185319(s) {
+function helpers_arrayForEach__P107(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7327,23 +6892,49 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.len___7716 = undefined;
+    s.i___7719 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array_.insertAt(s.arg0, 0, s.arg1);
     r0 = pxsim_Array__length(s.arg0);
+    s.len___7716 = (r0);
+    s.i___7719 = (0);
+  case 1:
+    r0 = (s.i___7719 < s.len___7716);
+    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___7719);
+    s.tmp_1.arg0 = r0;
+    s.tmp_1.arg1 = s.i___7719;
+    setupLambda(s.tmp_1, s.tmp_1.argL);
+    s.callLocIdx = 6; s.pc = 3; return s.tmp_1;
+  case 3:
+    r0 = s.retval;
+    r0 = (s.i___7719 + 1);
+    s.i___7719 = (r0);
+    { step = 1; continue; }
+  case 2:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayUnshift__P185319.info = {"start":4898,"length":126,"line":180,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayUnshift","argumentNames":["arr","value"]}
+helpers_arrayForEach__P107.info = {"start":7439,"length":250,"line":254,"column":4,"endLine":259,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayForEach","argumentNames":["arr","callbackfn"]}
 
-function helpers_arrayUnshift__P185319_mk(s) {
+function helpers_arrayForEach__P107_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayUnshift__P185319, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayForEach__P107, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  len___7716: undefined,
+  i___7719: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -7352,7 +6943,7 @@ function helpers_arrayUnshift__P185319_mk(s) {
 
 
 
-function tiles_Location_y__P187511(s) {
+function Sprite_kind__P2070(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7362,42 +6953,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___204864 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C187506_VT)) failedCast(r0);
-    r0 = s.arg0.fields["tileMap"];
-    s.tmp_0 = r0;
-    r0 = s.tmp_0.fields["_scale"];
-    s.scale___204864 = (r0);
-    r0 = s.arg0.fields["_row"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 << s.scale___204864);
-    s.tmp_0 = r0;
-    r0 = (s.scale___204864 - 1);
-    s.tmp_3 = r0;
-    r0 = (1 << s.tmp_3);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_0 + s.tmp_2);
-    return leaveAccessor(s, r0)
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_kind"];
+    return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_y__P187511.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__P187511.isGetter = true;
+Sprite_kind__P2070.info = {"start":10604,"length":41,"line":387,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"kind","argumentNames":["this"]}
 
-function tiles_Location_y__P187511_mk(s) {
+function Sprite_kind__P2070_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_y__P187511, depth: s.depth + 1,
+        parent: s, fn: Sprite_kind__P2070, 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___204864: undefined,
   arg0: undefined,
 } }
 
@@ -7405,7 +6977,7 @@ function tiles_Location_y__P187511_mk(s) {
 
 
 
-function tiles_Location_x__P187510(s) {
+function tiles_locationOfSprite__P3775(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7415,42 +6987,51 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___204882 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C187506_VT)) failedCast(r0);
-    r0 = s.arg0.fields["tileMap"];
-    s.tmp_0 = r0;
-    r0 = s.tmp_0.fields["_scale"];
-    s.scale___204882 = (r0);
-    r0 = s.arg0.fields["_col"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 << s.scale___204882);
-    s.tmp_0 = r0;
-    r0 = (s.scale___204882 - 1);
-    s.tmp_3 = r0;
-    r0 = (1 << s.tmp_3);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_0 + s.tmp_2);
-    return leaveAccessor(s, r0)
+    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
+    s.tmp_1 = tiles_screenCoordinateToTile__P3797_mk(s);
+    s.tmp_2 = Sprite_x__P2025_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    s.callLocIdx = 2097; s.pc = 3; return s.tmp_2;
+  case 3:
+    r0 = s.retval;
+    s.tmp_1.arg0 = r0;
+    s.callLocIdx = 2098; s.pc = 2; return s.tmp_1;
+  case 2:
+    r0 = s.retval;
+    s.tmp_0.arg0 = r0;
+    s.tmp_3 = tiles_screenCoordinateToTile__P3797_mk(s);
+    s.tmp_4 = Sprite_y__P2027_mk(s);
+    s.tmp_4.arg0 = s.arg0;
+    s.callLocIdx = 2099; s.pc = 5; return s.tmp_4;
+  case 5:
+    r0 = s.retval;
+    s.tmp_3.arg0 = r0;
+    s.callLocIdx = 2100; s.pc = 4; return s.tmp_3;
+  case 4:
+    r0 = s.retval;
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 2101; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_x__P187510.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__P187510.isGetter = true;
+tiles_locationOfSprite__P3775.info = {"start":9471,"length":165,"line":260,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationOfSprite","argumentNames":["s"]}
 
-function tiles_Location_x__P187510_mk(s) {
+function tiles_locationOfSprite__P3775_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_x__P187510, depth: s.depth + 1,
+        parent: s, fn: tiles_locationOfSprite__P3775, 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___204882: undefined,
+  tmp_4: undefined,
   arg0: undefined,
 } }
 
@@ -7458,7 +7039,7 @@ function tiles_Location_x__P187510_mk(s) {
 
 
 
-function sprites_setDataBoolean__P188841(s) {
+function tiles_screenCoordinateToTile__P3797(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7468,79 +7049,55 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___205852 = undefined;
+    s.tm___20867 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 2118; s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+    r0 = r0.fields["tileMap"];
+    s.tm___20867 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___20867);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
+    r0 = (s.arg0 >> 4);
+    { step = 3; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
   case 2:
-    // jmp value (already in r0)
+    s.tmp_2 = r0 = s.arg0;
+    r0 = s.tm___20867.fields["_scale"];
     s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    { step = 5; continue; }
+    r0 = (s.tmp_2 >> s.tmp_3);
   case 3:
-  case 4:
-    s.tmp_4 = Sprite_data__P187258_mk(s);
-    s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1768; s.pc = 6; return s.tmp_4;
-  case 6:
-    r0 = s.retval;
-    s.d___205852 = (r0);
-    s.tmp_0 = r0 = s.d___205852;
-    s.tmp_1 = r0 = s.arg1;
-    r0 = pxsim_numops_toBoolDecr(s.arg2);
-    s.tmp_5 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_5);
-    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_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_2);
-  case 5:
-    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_setDataBoolean__P188841.info = {"start":2275,"length":180,"line":73,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataBoolean","argumentNames":["sprite","name","value"]}
+tiles_screenCoordinateToTile__P3797.info = {"start":14355,"length":380,"line":413,"column":4,"endLine":420,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
 
-function sprites_setDataBoolean__P188841_mk(s) {
+function tiles_screenCoordinateToTile__P3797_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_setDataBoolean__P188841, depth: s.depth + 1,
+        parent: s, fn: tiles_screenCoordinateToTile__P3797, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  d___205852: undefined,
+  tm___20867: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function Sprite_data__P187258(s) {
+function tiles_TileMap_scale__P2319(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7555,38 +7112,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_data"];
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    s.tmp_3 = r0 = s.arg0;
-    r0 = pxsim_pxtrt.mkMap();
-    s.tmp_4 = r0;
-    r0 = (s.tmp_3).fields["_data"] = (s.tmp_4);
-  case 1:
-  case 2:
-    r0 = s.arg0.fields["_data"];
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_scale"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_data__P187258.info = {"start":4194,"length":92,"line":160,"column":4,"endLine":163,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this"]}
-Sprite_data__P187258.isGetter = true;
+tiles_TileMap_scale__P2319.info = {"start":6125,"length":55,"line":220,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this"]}
+tiles_TileMap_scale__P2319.isGetter = true;
 
-function Sprite_data__P187258_mk(s) {
+function tiles_TileMap_scale__P2319_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_data__P187258, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_scale__P2319, 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,
   arg0: undefined,
 } }
 
@@ -7594,7 +7132,7 @@ function Sprite_data__P187258_mk(s) {
 
 
 
-function spriteutils_angleFrom__P188850(s) {
+function scene_aStar__P3655(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7604,71 +7142,177 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.tm___20897 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1797; s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+    r0 = r0.fields["tileMap"];
+    s.tm___20897 = (r0);
+    s.tmp_3 = scene_isWalkable__P6087_mk(s);
+    s.tmp_3.arg0 = s.arg1;
+    s.tmp_3.arg1 = s.arg2;
+    s.tmp_3.arg2 = s.tm___20897;
+    s.callLocIdx = 1798; s.pc = 5; return s.tmp_3;
+  case 5:
+    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_toBool(s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
+    r0 = undefined;
+    { step = 3; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
   case 2:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    r0 = 0;
-    { step = 5; continue; }
+    r0 = pxsim_pxtcore_mkAction(1, inline__P20912);
+    s.tmp_4 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.arg1);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P20917);
+    s.tmp_5 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.arg1);
+    s.tmp_6 = scene_generalAStar__P3657_mk(s);
+    s.tmp_6.arg0 = s.tm___20897;
+    s.tmp_6.arg1 = s.arg0;
+    s.tmp_6.arg2 = s.arg2;
+    s.tmp_6.arg3 = s.tmp_4;
+    s.tmp_6.arg4 = s.tmp_5;
+    s.callLocIdx = 1804; s.pc = 6; return s.tmp_6;
+  case 6:
+    r0 = s.retval;
+  case 3:
+    return leave(s, r0)
+  default: oops()
+} } }
+scene_aStar__P3655.info = {"start":937,"length":377,"line":31,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"aStar","argumentNames":["start","end","onTilesOf"]}
+
+function scene_aStar__P3655_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: scene_aStar__P3655, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tm___20897: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+} }
+
+
+
+
+
+function inline__P20912(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_0 = scene_tileLocationHeuristic__P6083_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = s.caps[0];
+    s.callLocIdx = 1799; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P20912.info = {"start":1221,"length":34,"line":37,"column":12,"endLine":37,"endColumn":46,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["t"]}
+
+function inline__P20912_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P20912, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function inline__P20917(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_2 = tiles_Location_x__P2293_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    s.callLocIdx = 1800; s.pc = 3; return s.tmp_2;
   case 3:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    s.tmp_4 = tiles_Location_x__P2293_mk(s);
+    s.tmp_4.arg0 = s.caps[0];
+    s.callLocIdx = 1801; s.pc = 4; return s.tmp_4;
   case 4:
-    s.tmp_6 = Sprite_y__P187244_mk(s);
-    s.tmp_6.arg0 = s.arg1;
-    s.callLocIdx = 1774; s.pc = 6; return s.tmp_6;
-  case 6:
+    r0 = s.retval;
+    s.tmp_3 = r0;
+    r0 = (s.tmp_1 === s.tmp_3);
+    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_6 = tiles_Location_y__P2294_mk(s);
+    s.tmp_6.arg0 = s.arg0;
+    s.callLocIdx = 1802; s.pc = 5; return s.tmp_6;
+  case 5:
     r0 = s.retval;
     s.tmp_5 = r0;
-    s.tmp_8 = Sprite_y__P187244_mk(s);
-    s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1775; s.pc = 7; return s.tmp_8;
-  case 7:
+    s.tmp_8 = tiles_Location_y__P2294_mk(s);
+    s.tmp_8.arg0 = s.caps[0];
+    s.callLocIdx = 1803; s.pc = 6; return s.tmp_8;
+  case 6:
     r0 = s.retval;
     s.tmp_7 = r0;
-    r0 = (s.tmp_5 - s.tmp_7);
-    s.tmp_4 = r0;
-    s.tmp_11 = Sprite_x__P187242_mk(s);
-    s.tmp_11.arg0 = s.arg1;
-    s.callLocIdx = 1776; s.pc = 8; return s.tmp_11;
-  case 8:
-    r0 = s.retval;
-    s.tmp_10 = r0;
-    s.tmp_13 = Sprite_x__P187242_mk(s);
-    s.tmp_13.arg0 = s.arg0;
-    s.callLocIdx = 1777; s.pc = 9; return s.tmp_13;
-  case 9:
-    r0 = s.retval;
-    s.tmp_12 = r0;
-    r0 = (s.tmp_10 - s.tmp_12);
+    r0 = (s.tmp_5 === s.tmp_7);
+  case 2:
+    // jmp value (already in r0)
     s.tmp_9 = r0;
-    r0 = pxsim.Math_.atan2(s.tmp_4, s.tmp_9);
-  case 5:
+    r0 = s.tmp_9;
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_angleFrom__P188850.info = {"start":1673,"length":178,"line":54,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"angleFrom","argumentNames":["a","b"]}
+inline__P20917.info = {"start":1270,"length":35,"line":38,"column":12,"endLine":38,"endColumn":47,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["l"]}
 
-function spriteutils_angleFrom__P188850_mk(s) {
+function inline__P20917_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_angleFrom__P188850, depth: s.depth + 1,
+        parent: s, fn: inline__P20917, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -7680,19 +7324,14 @@ function spriteutils_angleFrom__P188850_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  tmp_10: undefined,
-  tmp_11: undefined,
-  tmp_12: undefined,
-  tmp_13: undefined,
   arg0: undefined,
-  arg1: undefined,
 } }
 
 
 
 
 
-function spriteutils_setVelocityAtAngle__P188852(s) {
+function scene_isWalkable__P6087(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7702,51 +7341,71 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.img___19326 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_1 = scene_isWall__P6086_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.tmp_1.arg1 = s.arg2;
+    s.callLocIdx = 1850; s.pc = 6; return s.tmp_1;
+  case 6:
+    r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    { step = 3; continue; }
+    r0 = false;
+    { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_2 = Sprite_setVelocity__P187290_mk(s);
-    s.tmp_2.arg0 = s.arg0;
-    r0 = pxsim.Math_.cos(s.arg1);
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 * s.arg2);
-    s.tmp_2.arg1 = r0;
-    r0 = pxsim.Math_.sin(s.arg1);
-    s.tmp_4 = r0;
-    r0 = (s.tmp_4 * s.arg2);
-    s.tmp_2.arg2 = r0;
-    s.callLocIdx = 1778; s.pc = 4; return s.tmp_2;
+    r0 = pxsim_Boolean__bang(s.tmp_3);
+    s.tmp_2 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    if (!r0) { step = 3; continue; }
+    r0 = true;
+    { step = 5; continue; }
+  case 3:
   case 4:
+    s.tmp_4 = tiles_TileMap_getTileImage__P2339_mk(s);
+    s.tmp_4.arg0 = s.arg2;
+    s.tmp_5 = tiles_TileMap_getTileIndex__P2330_mk(s);
+    s.tmp_5.arg0 = s.arg2;
+    r0 = s.arg0.fields["_col"];
+    s.tmp_5.arg1 = r0;
+    r0 = s.arg0.fields["_row"];
+    s.tmp_5.arg2 = r0;
+    s.callLocIdx = 1853; s.pc = 8; return s.tmp_5;
+  case 8:
     r0 = s.retval;
-  case 3:
-    r0 = undefined;
+    s.tmp_4.arg1 = r0;
+    s.callLocIdx = 1854; s.pc = 7; return s.tmp_4;
+  case 7:
+    r0 = s.retval;
+    s.img___19326 = (r0);
+    r0 = pxsim_ImageMethods.equals(s.img___19326, s.arg1);
+  case 5:
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_setVelocityAtAngle__P188852.info = {"start":3148,"length":270,"line":95,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"setVelocityAtAngle","argumentNames":["target","angleInRadians","speed"]}
+scene_isWalkable__P6087.info = {"start":7750,"length":280,"line":226,"column":4,"endLine":231,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWalkable","argumentNames":["l","onTilesOf","tm"]}
 
-function spriteutils_setVelocityAtAngle__P188852_mk(s) {
+function scene_isWalkable__P6087_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_setVelocityAtAngle__P188852, depth: s.depth + 1,
+        parent: s, fn: scene_isWalkable__P6087, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
+  tmp_5: undefined,
+  img___19326: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -7756,7 +7415,7 @@ function spriteutils_setVelocityAtAngle__P188852_mk(s) {
 
 
 
-function Sprite_setVelocity__P187290(s) {
+function scene_isWall__P6086(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7766,48 +7425,54 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.r___19105 = undefined;
+    s.c___19109 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_vx__P187247_mk(s);
+    s.tmp_0 = scene_locationRow__P6084_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 346; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1847; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
+    s.r___19105 = (r0);
+    s.tmp_0 = scene_locationCol__P6085_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 347; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1848; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    r0 = undefined;
+    s.c___19109 = (r0);
+    s.tmp_0 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.tmp_0.arg1 = s.c___19109;
+    s.tmp_0.arg2 = s.r___19105;
+    s.callLocIdx = 1849; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setVelocity__P187290.info = {"start":12526,"length":93,"line":450,"column":4,"endLine":453,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setVelocity","argumentNames":["this","vx","vy"]}
+scene_isWall__P6086.info = {"start":7573,"length":169,"line":220,"column":4,"endLine":224,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"isWall","argumentNames":["l","tm"]}
 
-function Sprite_setVelocity__P187290_mk(s) {
+function scene_isWall__P6086_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setVelocity__P187290, depth: s.depth + 1,
+        parent: s, fn: scene_isWall__P6086, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  r___19105: undefined,
+  c___19109: undefined,
   arg0: undefined,
   arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function Sprite_vy__P187249(s) {
+function scene_locationCol__P6085(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7819,40 +7484,35 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 * 256);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 | 0);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
-    r0 = undefined;
+    s.tmp_1 = tiles_Location_x__P2293_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.callLocIdx = 1846; s.pc = 1; return s.tmp_1;
+  case 1:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 >> 4);
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_vy__P187249.info = {"start":2705,"length":51,"line":108,"column":4,"endLine":110,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this","v"]}
+scene_locationCol__P6085.info = {"start":7483,"length":82,"line":216,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationCol","argumentNames":["l"]}
 
-function Sprite_vy__P187249_mk(s) {
+function scene_locationCol__P6085_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vy__P187249, depth: s.depth + 1,
+        parent: s, fn: scene_locationCol__P6085, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  tmp_2: undefined,
   arg0: undefined,
-  arg1: undefined,
 } }
 
 
 
 
 
-function Sprite_vy__P187248(s) {
+function scene_locationRow__P6084(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7866,23 +7526,25 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_vy"];
+    s.tmp_1 = tiles_Location_y__P2294_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.callLocIdx = 1845; s.pc = 1; return s.tmp_1;
+  case 1:
+    r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 / 256);
-    return leaveAccessor(s, r0)
+    r0 = (s.tmp_0 >> 4);
+    return leave(s, r0)
   default: oops()
 } } }
-Sprite_vy__P187248.info = {"start":2543,"length":60,"line":103,"column":4,"endLine":105,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vy","argumentNames":["this"]}
-Sprite_vy__P187248.isGetter = true;
+scene_locationRow__P6084.info = {"start":7393,"length":82,"line":212,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"locationRow","argumentNames":["l"]}
 
-function Sprite_vy__P187248_mk(s) {
+function scene_locationRow__P6084_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vy__P187248, depth: s.depth + 1,
+        parent: s, fn: scene_locationRow__P6084, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
   arg0: undefined,
 } }
 
@@ -7890,7 +7552,7 @@ function Sprite_vy__P187248_mk(s) {
 
 
 
-function Sprite_vx__P187247(s) {
+function tiles_TileMap_isObstacle__P2336(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7903,39 +7565,86 @@ switch (step) {
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = (s.arg1 * 256);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_map"];
+    s.tmp_6 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_6);
+    s.tmp_5 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_5);
+    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 = (s.tmp_2 | 0);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["_vx"] = (s.tmp_1);
-    r0 = undefined;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = false;
+    { step = 5; continue; }
+  case 1:
+  case 2:
+    s.tmp_8 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    r0 = s.arg0.fields["_map"];
+    s.tmp_8.arg0 = r0;
+    s.tmp_8.arg1 = s.arg1;
+    s.tmp_8.arg2 = s.arg2;
+    s.callLocIdx = 951; s.pc = 6; return s.tmp_8;
+  case 6:
+    r0 = s.retval;
+    s.tmp_7 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_7);
+    if (!r0) { step = 3; continue; }
+    r0 = true;
+    { step = 5; continue; }
+  case 3:
+  case 4:
+    r0 = s.arg0.fields["_map"];
+    s.tmp_9 = r0;
+    r0 = s.tmp_9.fields["layers"];
+    s.tmp_11 = r0;
+    r0 = pxsim_ImageMethods.getPixel(s.tmp_11, s.arg1, s.arg2);
+    s.tmp_10 = r0;
+    r0 = (s.tmp_10 === 2);
+  case 5:
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_vx__P187247.info = {"start":2374,"length":51,"line":97,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this","v"]}
+tiles_TileMap_isObstacle__P2336.info = {"start":12421,"length":211,"line":404,"column":8,"endLine":409,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isObstacle","argumentNames":["this","col","row"]}
 
-function Sprite_vx__P187247_mk(s) {
+function tiles_TileMap_isObstacle__P2336_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vx__P187247, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isObstacle__P2336, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  tmp_8: undefined,
+  tmp_9: undefined,
+  tmp_10: undefined,
+  tmp_11: undefined,
   arg0: undefined,
   arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function Sprite_vx__P187246(s) {
+function tiles_TileMap_enabled__P2327(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7950,22 +7659,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_vx"];
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_map"];
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 / 256);
+    r0 = pxsim_Boolean__bang(s.tmp_0);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_vx__P187246.info = {"start":2212,"length":60,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"vx","argumentNames":["this"]}
-Sprite_vx__P187246.isGetter = true;
+tiles_TileMap_enabled__P2327.info = {"start":7107,"length":66,"line":261,"column":8,"endLine":263,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"enabled","argumentNames":["this"]}
+tiles_TileMap_enabled__P2327.isGetter = true;
 
-function Sprite_vx__P187246_mk(s) {
+function tiles_TileMap_enabled__P2327_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_vx__P187246, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_enabled__P2327, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
   arg0: undefined,
 } }
 
@@ -7973,7 +7691,7 @@ function Sprite_vx__P187246_mk(s) {
 
 
 
-function sprites_readDataBoolean__P188842(s) {
+function tiles_TileMapData_isOutsideMap__P2316(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -7983,74 +7701,78 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___192519 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    r0 = (s.arg1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_1 = r0 = s.arg1;
+    r0 = s.arg0.fields["_width"];
     s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
+    r0 = (s.tmp_1 >= s.tmp_2);
   case 2:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    r0 = pxsim_numops_toBool(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    r0 = false;
-    { step = 5; continue; }
+    r0 = s.tmp_3;
+    { step = 4; continue; }
   case 3:
+    r0 = (s.arg2 < 0);
   case 4:
-    s.tmp_4 = Sprite_data__P187258_mk(s);
-    s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1769; s.pc = 6; return s.tmp_4;
-  case 6:
-    r0 = s.retval;
-    s.d___192519 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.d___192519, s.arg1);
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
+    // jmp value (already in r0)
+    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:
+    s.tmp_5 = r0 = s.arg2;
+    r0 = s.arg0.fields["_height"];
+    s.tmp_6 = r0;
+    r0 = (s.tmp_5 >= s.tmp_6);
+  case 6:
+    // jmp value (already in r0)
+    s.tmp_7 = r0;
+    r0 = s.tmp_7;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_readDataBoolean__P188842.info = {"start":2670,"length":179,"line":86,"column":4,"endLine":90,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataBoolean","argumentNames":["sprite","name"]}
+tiles_TileMapData_isOutsideMap__P2316.info = {"start":5580,"length":132,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isOutsideMap","argumentNames":["this","col","row"]}
 
-function sprites_readDataBoolean__P188842_mk(s) {
+function tiles_TileMapData_isOutsideMap__P2316_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_readDataBoolean__P188842, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_isOutsideMap__P2316, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___192519: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
   arg0: undefined,
   arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function Sprite_follow__P187306(s) {
+function tiles_TileMapData_height__P2307(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8060,172 +7782,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sc___192542 = undefined;
-    s.lastTime___192551 = undefined;
-    s.fs___192694 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    r0 = (s.arg1 === s.arg0);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    { step = 13; continue; }
-  case 1:
-  case 2:
-    s.tmp_1 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 443; s.pc = 14; return s.tmp_1;
-  case 14:
-    r0 = s.retval;
-    s.sc___192542 = (r0);
-    r0 = s.sc___192542.fields["followingSprites"];
-    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 = 3; continue; }
-    s.tmp_3 = r0 = s.sc___192542;
-    r0 = pxsim_Array__mk();
-    s.tmp_4 = r0;
-    r0 = (s.tmp_3).fields["followingSprites"] = (s.tmp_4);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.lastTime___192551 = (r0);
-    s.tmp_0 = r0 = s.lastTime___192551;
-    s.tmp_2 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 444; s.pc = 15; return s.tmp_2;
-  case 15:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P192557);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.lastTime___192551);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.sc___192542);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P185609_mk(s);
-    r0 = s.sc___192542.fields["eventContext"];
-    s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = 14;
-    s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 470; s.pc = 16; return s.tmp_1;
-  case 16:
-    r0 = s.retval;
-  case 3:
-  case 4:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P192696);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFind__P185326_mk(s);
-    r0 = s.sc___192542.fields["followingSprites"];
-    s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 471; s.pc = 17; return s.tmp_1;
-  case 17:
-    r0 = s.retval;
-    s.fs___192694 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    r0 = s.tmp_0;
-    { step = 6; continue; }
-  case 5:
-    r0 = pxsim_numops_toBoolDecr(s.arg2);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-  case 6:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 9; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.fs___192694);
-    if (!r0) { step = 7; continue; }
-    r0 = s.sc___192542.fields["followingSprites"];
-    s.tmp_4 = r0;
-    r0 = pxsim_Array_.removeElement(s.tmp_4, s.fs___192694);
-    s.tmp_0 = Sprite_vx__P187247_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = 0;
-    s.callLocIdx = 472; s.pc = 18; return s.tmp_0;
-  case 18:
-    r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = 0;
-    s.callLocIdx = 473; s.pc = 19; return s.tmp_0;
-  case 19:
-    r0 = s.retval;
-  case 7:
-  case 8:
-    { step = 12; continue; }
-  case 9:
-    r0 = pxsim_numops_toBoolDecr(s.fs___192694);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 10; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_FollowingSprite__C187189_VT);
-    s.tmp_2 = r0;
-    s.tmp_3 = sprites_FollowingSprite_constructor__P187190_mk(s);
-    s.tmp_3.arg0 = s.tmp_2;
-    s.tmp_3.arg1 = s.arg0;
-    s.tmp_3.arg2 = s.arg1;
-    s.tmp_3.arg3 = s.arg2;
-    s.tmp_3.arg4 = s.arg3;
-    s.callLocIdx = 474; s.pc = 20; return s.tmp_3;
-  case 20:
-    r0 = s.retval;
-    r0 = s.sc___192542.fields["followingSprites"];
-    s.tmp_4 = r0;
-    r0 = pxsim_Array__push(s.tmp_4, s.tmp_2);
-    { step = 11; continue; }
-  case 10:
-    r0 = (s.fs___192694).fields["target"] = (s.arg1);
-    r0 = (s.fs___192694).fields["rate"] = (s.arg2);
-    r0 = (s.fs___192694).fields["turnRate"] = (s.arg3);
-  case 11:
-  case 12:
-  case 13:
-    r0 = undefined;
-    return leave(s, r0)
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_height"];
+    return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_follow__P187306.info = {"start":30060,"length":3128,"line":899,"column":4,"endLine":978,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"follow","argumentNames":["this","target","speed","turnRate"]}
+tiles_TileMapData_height__P2307.info = {"start":3734,"length":65,"line":139,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"height","argumentNames":["this"]}
+tiles_TileMapData_height__P2307.isGetter = true;
 
-function Sprite_follow__P187306_mk(s) {
+function tiles_TileMapData_height__P2307_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_follow__P187306, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_height__P2307, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  sc___192542: undefined,
-  lastTime___192551: undefined,
-  fs___192694: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
 } }
 
 
 
 
 
-function inline__P192557(s) {
+function tiles_TileMapData_width__P2306(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8235,77 +7817,76 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currTime___192558 = undefined;
-    s.timeDiff___192561 = undefined;
-    s.destroyedSprites___192567 = undefined;
-    s.tmp_0 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 445; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    s.currTime___192558 = (r0);
-    s.tmp_1 = r0 = s.currTime___192558;
-    r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 - s.tmp_2);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 / 1000);
-    s.timeDiff___192561 = (r0);
-    r0 = pxsim_pxtrt.mklocRef();
-    s.destroyedSprites___192567 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.destroyedSprites___192567, false);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P192571);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.destroyedSprites___192567);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.timeDiff___192561);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    r0 = s.caps[1].fields["followingSprites"];
-    s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 468; s.pc = 4; return s.tmp_1;
-  case 4:
-    r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.caps[0], s.currTime___192558);
-    r0 = pxsim_pxtrt_ldlocRef(s.destroyedSprites___192567);
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_width"];
+    return leaveAccessor(s, r0)
+  default: oops()
+} } }
+tiles_TileMapData_width__P2306.info = {"start":3661,"length":63,"line":135,"column":8,"endLine":137,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"width","argumentNames":["this"]}
+tiles_TileMapData_width__P2306.isGetter = true;
+
+function tiles_TileMapData_width__P2306_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_TileMapData_width__P2306, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function tiles_TileMapData_isWall__P2315(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    r0 = s.arg0.fields["layers"];
+    s.tmp_1 = r0;
+    r0 = pxsim_ImageMethods.getPixel(s.tmp_1, s.arg1, s.arg2);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    s.tmp_1 = r0 = s.caps[1];
-    s.tmp_3 = helpers_arrayFilter__P185325_mk(s);
-    r0 = s.caps[1].fields["followingSprites"];
-    s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = inline__P192678;
-    s.callLocIdx = 469; s.pc = 5; return s.tmp_3;
-  case 5:
-    r0 = s.retval;
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1).fields["followingSprites"] = (s.tmp_2);
-  case 1:
-  case 2:
-    r0 = undefined;
+    r0 = (s.tmp_0 === 2);
     return leave(s, r0)
   default: oops()
 } } }
-inline__P192557.info = {"start":30389,"length":2197,"line":907,"column":79,"endLine":955,"endColumn":13,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":[]}
+tiles_TileMapData_isWall__P2315.info = {"start":5463,"length":107,"line":195,"column":8,"endLine":197,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isWall","argumentNames":["this","col","row"]}
 
-function inline__P192557_mk(s) {
+function tiles_TileMapData_isWall__P2315_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P192557, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_isWall__P2315, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  currTime___192558: undefined,
-  timeDiff___192561: undefined,
-  destroyedSprites___192567: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function inline__P192571(s) {
+function tiles_TileMap_getTileImage__P2339(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8315,260 +7896,1046 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.target___192574 = undefined;
-    s.self___192575 = undefined;
-    s.turnRate___192576 = undefined;
-    s.rate___192577 = undefined;
-    s.dx___192591 = undefined;
-    s.dy___192597 = undefined;
-    s.maxMomentumDiff___192616 = undefined;
-    s.angleToTarget___192623 = undefined;
-    s.targetTrajectoryVx___192628 = undefined;
-    s.targetTrajectoryVy___192634 = undefined;
-    s.diffVx___192640 = undefined;
-    s.diffVy___192645 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = if_target_1_mk(s);
-    s.tmp_1 = r0 = s.arg0;
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P2313_mk(s);
+    r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
-    if (!s.tmp_0.arg0.vtable.iface) {
-      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "target");
-    } else {
-      s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["target"];
-      if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["target"]; }
-      else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 446; s.pc = 8; return s.tmp_0; }
+    s.tmp_0.arg1 = s.arg1;
+    s.callLocIdx = 974; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    return leave(s, r0)
+  default: oops()
+} } }
+tiles_TileMap_getTileImage__P2339.info = {"start":13699,"length":96,"line":442,"column":8,"endLine":444,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
+
+function tiles_TileMap_getTileImage__P2339_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_TileMap_getTileImage__P2339, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function tiles_TileMap_data__P4292(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, tiles_TileMap__C2317_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_map"];
+    return leaveAccessor(s, r0)
+  default: oops()
+} } }
+tiles_TileMap_data__P4292.info = {"start":6344,"length":75,"line":231,"column":8,"endLine":233,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"data","argumentNames":["this"]}
+tiles_TileMap_data__P4292.isGetter = true;
+
+function tiles_TileMap_data__P4292_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_TileMap_data__P4292, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function tiles_TileMapData_getTileImage__P2313(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.size___14706 = undefined;
+    s.cachedImage___14710 = undefined;
+    s.originalImage___14717 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_scale"];
+    s.tmp_0 = r0;
+    r0 = (1 << s.tmp_0);
+    s.size___14706 = (r0);
+    r0 = s.arg0.fields["cachedTileView"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.arg1);
+    s.cachedImage___14710 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.cachedImage___14710);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 7; continue; }
+    r0 = s.arg0.fields["tileset"];
+    s.tmp_2 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_2, s.arg1);
+    s.originalImage___14717 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.originalImage___14717);
+    if (!r0) { step = 5; continue; }
+    r0 = pxsim_ImageMethods.width(s.originalImage___14717);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 <= s.size___14706);
+    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___14717);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_2 <= s.size___14706);
+  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___14710 = (s.originalImage___14717);
+    { step = 4; continue; }
+  case 3:
+    r0 = pxsim.image.create(s.size___14706, s.size___14706);
+    s.cachedImage___14710 = (r0);
+    r0 = pxsim_ImageMethods.drawImage(s.cachedImage___14710, s.originalImage___14717, 0, 0);
+  case 4:
+    r0 = s.arg0.fields["cachedTileView"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array_.setAt(s.tmp_0, s.arg1, s.cachedImage___14710);
+  case 5:
+  case 6:
+  case 7:
   case 8:
+    r0 = s.cachedImage___14710;
+    return leave(s, r0)
+  default: oops()
+} } }
+tiles_TileMapData_getTileImage__P2313.info = {"start":4599,"length":717,"line":172,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["this","index"]}
+
+function tiles_TileMapData_getTileImage__P2313_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_TileMapData_getTileImage__P2313, 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___14706: undefined,
+  cachedImage___14710: undefined,
+  originalImage___14717: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function tiles_TileMapData_scale__P2308(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, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_scale"];
+    return leaveAccessor(s, r0)
+  default: oops()
+} } }
+tiles_TileMapData_scale__P2308.info = {"start":3809,"length":66,"line":143,"column":8,"endLine":145,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this"]}
+tiles_TileMapData_scale__P2308.isGetter = true;
+
+function tiles_TileMapData_scale__P2308_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_TileMapData_scale__P2308, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function tiles_TileMap_getTileIndex__P2330(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMapData_getTile__P2310_mk(s);
+    r0 = s.arg0.fields["_map"];
+    s.tmp_0.arg0 = r0;
+    s.tmp_0.arg1 = s.arg1;
+    s.tmp_0.arg2 = s.arg2;
+    s.callLocIdx = 909; s.pc = 1; return s.tmp_0;
+  case 1:
     r0 = s.retval;
-    s.target___192574 = (r0);
-    s.tmp_2 = if_self_1_mk(s);
-    s.tmp_2.arg0 = s.tmp_1;
-    if (!s.tmp_2.arg0.vtable.iface) {
-      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "self");
-    } else {
-      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["self"];
-      if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["self"]; }
-      else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 447; s.pc = 9; return s.tmp_2; }
+    return leave(s, r0)
+  default: oops()
+} } }
+tiles_TileMap_getTileIndex__P2330.info = {"start":7380,"length":105,"line":273,"column":8,"endLine":275,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileIndex","argumentNames":["this","col","row"]}
+
+function tiles_TileMap_getTileIndex__P2330_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_TileMap_getTileIndex__P2330, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+} }
+
+
+
+
+
+function tiles_TileMapData_getTile__P2310(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.lambdaArgs = null;
     }
-  case 9:
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
+    s.tmp_1.arg0 = s.arg0;
+    s.tmp_1.arg1 = s.arg1;
+    s.tmp_1.arg2 = s.arg2;
+    s.callLocIdx = 886; s.pc = 4; return s.tmp_1;
+  case 4:
     r0 = s.retval;
-    s.self___192575 = (r0);
-    s.tmp_3 = if_turnRate_1_mk(s);
-    s.tmp_3.arg0 = s.tmp_1;
-    if (!s.tmp_3.arg0.vtable.iface) {
-      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "turnRate");
-    } else {
-      s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["turnRate"];
-      if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["turnRate"]; }
-      else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 448; s.pc = 10; return s.tmp_3; }
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = 0;
+    { step = 3; continue; }
+  case 1:
+  case 2:
+    r0 = s.arg0.fields["data"];
+    s.tmp_2 = r0;
+    r0 = (s.arg1 | 0);
+    s.tmp_5 = r0;
+    r0 = (4 + s.tmp_5);
+    s.tmp_4 = r0;
+    r0 = (s.arg2 | 0);
+    s.tmp_7 = r0;
+    r0 = s.arg0.fields["_width"];
+    s.tmp_8 = r0;
+    r0 = (s.tmp_7 * s.tmp_8);
+    s.tmp_6 = r0;
+    r0 = (s.tmp_4 + s.tmp_6);
+    s.tmp_3 = r0;
+    r0 = pxsim.BufferMethods.getUint8(s.tmp_2, s.tmp_3);
+  case 3:
+    return leave(s, r0)
+  default: oops()
+} } }
+tiles_TileMapData_getTile__P2310.info = {"start":3997,"length":200,"line":152,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTile","argumentNames":["this","col","row"]}
+
+function tiles_TileMapData_getTile__P2310_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_TileMapData_getTile__P2310, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  tmp_8: undefined,
+  arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+} }
+
+
+
+
+
+function tiles_Location_row__P2291(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;
     }
-  case 10:
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_row"];
+    return leaveAccessor(s, r0)
+  default: oops()
+} } }
+tiles_Location_row__P2291.info = {"start":467,"length":51,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"row","argumentNames":["this"]}
+tiles_Location_row__P2291.isGetter = true;
+
+function tiles_Location_row__P2291_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_Location_row__P2291, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function tiles_Location_col__P2290(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, tiles_Location__C2289_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_col"];
+    return leaveAccessor(s, r0)
+  default: oops()
+} } }
+tiles_Location_col__P2290.info = {"start":406,"length":51,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"col","argumentNames":["this"]}
+tiles_Location_col__P2290.isGetter = true;
+
+function tiles_Location_col__P2290_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: tiles_Location_col__P2290, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function scene_tileLocationHeuristic__P6083(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.startCol___20932 = undefined;
+    s.startRow___20936 = undefined;
+    s.endCol___20940 = undefined;
+    s.endRow___20944 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1841; s.pc = 1; return s.tmp_0;
+  case 1:
     r0 = s.retval;
-    s.turnRate___192576 = (r0);
-    s.tmp_4 = if_rate_1_mk(s);
-    s.tmp_4.arg0 = s.tmp_1;
-    if (!s.tmp_4.arg0.vtable.iface) {
-      s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "rate");
-    } else {
-      s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["rate"];
-      if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["rate"]; }
-      else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 449; s.pc = 11; return s.tmp_4; }
+    s.startCol___20932 = (r0);
+    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1842; s.pc = 2; return s.tmp_0;
+  case 2:
+    r0 = s.retval;
+    s.startRow___20936 = (r0);
+    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.callLocIdx = 1843; s.pc = 3; return s.tmp_0;
+  case 3:
+    r0 = s.retval;
+    s.endCol___20940 = (r0);
+    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    s.tmp_0.arg0 = s.arg1;
+    s.callLocIdx = 1844; s.pc = 4; return s.tmp_0;
+  case 4:
+    r0 = s.retval;
+    s.endRow___20944 = (r0);
+    r0 = (s.startCol___20932 - s.endCol___20940);
+    s.tmp_1 = r0;
+    r0 = pxsim.Math_.pow(s.tmp_1, 2);
+    s.tmp_0 = r0;
+    r0 = (s.startRow___20936 - s.endRow___20944);
+    s.tmp_3 = r0;
+    r0 = pxsim.Math_.pow(s.tmp_3, 2);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 + s.tmp_2);
+    return leave(s, r0)
+  default: oops()
+} } }
+scene_tileLocationHeuristic__P6083.info = {"start":6929,"length":350,"line":200,"column":4,"endLine":208,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"tileLocationHeuristic","argumentNames":["tile","target"]}
+
+function scene_tileLocationHeuristic__P6083_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: scene_tileLocationHeuristic__P6083, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  startCol___20932: undefined,
+  startRow___20936: undefined,
+  endCol___20940: undefined,
+  endRow___20944: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function scene_generalAStar__P3657(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.consideredTiles___18740 = undefined;
+    s.encountedLocations___18762 = undefined;
+    s.updateOrFillLocation___18765 = undefined;
+    s.end___18835 = undefined;
+    s.currLocation___18841 = undefined;
+    s.row___18852 = undefined;
+    s.col___18857 = undefined;
+    s.dataForCurrLocation___18862 = undefined;
+    s.neighbors___18874 = undefined;
+    s.corners___18876 = undefined;
+    s.left___18878 = undefined;
+    s.right___18884 = undefined;
+    s.top___18891 = undefined;
+    s.bottom___18897 = undefined;
+    s.leftIsWall___18904 = undefined;
+    s.rightIsWall___18911 = undefined;
+    s.topIsWall___18918 = undefined;
+    s.bottomIsWall___18925 = undefined;
+    s.topLeft___18940 = undefined;
+    s.bottomLeft___18958 = undefined;
+    s.topRight___18983 = undefined;
+    s.bottomRight___19002 = undefined;
+    s.neighborCost___19032 = undefined;
+    s.node___19038 = undefined;
+    s.unnamed120___U24 = undefined;
+    s.unnamed121___U25 = undefined;
+    s.cornerCost___19048 = undefined;
+    s.corner___19054 = undefined;
+    s.unnamed122___U28 = undefined;
+    s.unnamed123___U29 = undefined;
+    s.endCol___19060 = undefined;
+    s.endDataNode___19067 = undefined;
+    s.curr___19080 = undefined;
+    s.output___19082 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
+      s.arg4 = (s.lambdaArgs[4]);
+      s.lambdaArgs = null;
     }
-  case 11:
+    s.tmp_3 = scene_isWalkable__P6087_mk(s);
+    s.tmp_3.arg0 = s.arg1;
+    s.tmp_3.arg1 = s.arg2;
+    s.tmp_3.arg2 = s.arg0;
+    s.callLocIdx = 1805; s.pc = 52; return s.tmp_3;
+  case 52:
     r0 = s.retval;
-    s.rate___192577 = (r0);
-    r0 = s.self___192575.fields["flags"];
     s.tmp_2 = r0;
-    r0 = s.target___192574.fields["flags"];
-    s.tmp_3 = r0;
-    r0 = (s.tmp_2 | s.tmp_3);
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 & 2);
+    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_4 = Sprite_vx__P187247_mk(s);
-    s.tmp_4.arg0 = s.self___192575;
-    s.tmp_4.arg1 = 0;
-    s.callLocIdx = 450; s.pc = 12; return s.tmp_4;
-  case 12:
-    r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
-    s.tmp_0.arg0 = s.self___192575;
-    s.tmp_0.arg1 = 0;
-    s.callLocIdx = 451; s.pc = 13; return s.tmp_0;
-  case 13:
-    r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.caps[0], true);
-    { step = 7; continue; }
+    r0 = undefined;
+    { step = 51; continue; }
   case 1:
   case 2:
-    s.tmp_1 = Sprite_x__P187242_mk(s);
-    s.tmp_1.arg0 = s.target___192574;
-    s.callLocIdx = 452; s.pc = 14; return s.tmp_1;
-  case 14:
+    r0 = pxsim_pxtcore_mkClassInstance(Heap__C3646_VT);
+    s.tmp_4 = r0;
+    s.tmp_5 = Heap_constructor__P3647_mk(s);
+    s.tmp_5.arg0 = s.tmp_4;
+    s.tmp_5.arg1 = inline__P18743;
+    s.callLocIdx = 1806; s.pc = 53; return s.tmp_5;
+  case 53:
     r0 = s.retval;
+    s.consideredTiles___18740 = (s.tmp_4);
+    r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_x__P187242_mk(s);
-    s.tmp_3.arg0 = s.self___192575;
-    s.callLocIdx = 453; s.pc = 15; return s.tmp_3;
-  case 15:
+    r0 = pxsim_Array__mk();
+    s.tmp_1 = r0;
+    r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
+    s.encountedLocations___18762 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(4, updateOrFillLocation__P18765);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.encountedLocations___18762);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg3);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.consideredTiles___18740);
+    s.updateOrFillLocation___18765 = (s.tmp_0);
+    s.tmp_1 = lambda_4_mk(s);
+    s.tmp_1.argL = s.updateOrFillLocation___18765;
+    s.tmp_1.arg0 = s.arg1;
+    s.tmp_1.arg1 = null;
+    s.tmp_1.arg2 = 0;
+    setupLambda(s.tmp_1, s.tmp_1.argL);
+    s.callLocIdx = 1814; s.pc = 54; return s.tmp_1;
+  case 54:
     r0 = s.retval;
+    s.end___18835 = (null);
+  case 3:
+    r0 = s.consideredTiles___18740.fields["store"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_0 - s.tmp_2);
-    s.dx___192591 = (r0);
-    s.tmp_1 = Sprite_y__P187244_mk(s);
-    s.tmp_1.arg0 = s.target___192574;
-    s.callLocIdx = 454; s.pc = 16; return s.tmp_1;
-  case 16:
+    r0 = pxsim_Array__length(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 !== 0);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 40; continue; }
+    s.tmp_3 = Heap_pop__P3649_mk(s);
+    s.tmp_3.arg0 = s.consideredTiles___18740;
+    s.callLocIdx = 1816; s.pc = 55; return s.tmp_3;
+  case 55:
+    r0 = s.retval;
+    s.currLocation___18841 = (r0);
+    s.tmp_1 = lambda_2_mk(s);
+    s.tmp_1.argL = s.arg4;
+    r0 = s.currLocation___18841.fields["loc"];
+    s.tmp_1.arg0 = r0;
+    setupLambda(s.tmp_1, s.tmp_1.argL);
+    s.callLocIdx = 1817; s.pc = 56; return s.tmp_1;
+  case 56:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_y__P187244_mk(s);
-    s.tmp_3.arg0 = s.self___192575;
-    s.callLocIdx = 455; s.pc = 17; return s.tmp_3;
-  case 17:
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 4; continue; }
+    r0 = s.currLocation___18841.fields["loc"];
+    s.end___18835 = (r0);
+    { step = 40; continue; }
+  case 4:
+  case 5:
+    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    r0 = s.currLocation___18841.fields["loc"];
+    s.tmp_0.arg0 = r0;
+    s.callLocIdx = 1818; s.pc = 57; return s.tmp_0;
+  case 57:
     r0 = s.retval;
-    s.tmp_2 = r0;
-    r0 = (s.tmp_0 - s.tmp_2);
-    s.dy___192597 = (r0);
-    s.tmp_2 = Math_abs__P185340_mk(s);
-    s.tmp_2.arg0 = s.dx___192591;
-    s.callLocIdx = 456; s.pc = 18; return s.tmp_2;
-  case 18:
+    s.row___18852 = (r0);
+    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    r0 = s.currLocation___18841.fields["loc"];
+    s.tmp_0.arg0 = r0;
+    s.callLocIdx = 1819; s.pc = 58; return s.tmp_0;
+  case 58:
     r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 < 2);
+    s.col___18857 = (r0);
+    r0 = pxsim_Array__getAt(s.encountedLocations___18762, s.col___18857);
     s.tmp_0 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.row___18852);
+    s.dataForCurrLocation___18862 = (r0);
+    s.tmp_0 = r0 = s.dataForCurrLocation___18862;
     r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 3; continue; }
+    if (r0) { step = 6; continue; }
     r0 = s.tmp_0;
-    { step = 4; continue; }
-  case 3:
-    s.tmp_4 = Math_abs__P185340_mk(s);
-    s.tmp_4.arg0 = s.dy___192597;
-    s.callLocIdx = 457; s.pc = 19; return s.tmp_4;
-  case 19:
-    r0 = s.retval;
-    s.tmp_3 = r0;
-    r0 = (s.tmp_3 < 2);
-  case 4:
+    { step = 7; continue; }
+  case 6:
+    r0 = s.dataForCurrLocation___18862.fields["visited"];
+  case 7:
     // jmp value (already in r0)
-    s.tmp_5 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_5);
-    if (!r0) { step = 5; continue; }
-    s.tmp_6 = Sprite_vx__P187247_mk(s);
-    s.tmp_6.arg0 = s.self___192575;
-    s.tmp_6.arg1 = 0;
-    s.callLocIdx = 458; s.pc = 20; return s.tmp_6;
-  case 20:
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    if (!r0) { step = 8; continue; }
+    { step = 3; continue; }
+  case 8:
+  case 9:
+    r0 = (s.dataForCurrLocation___18862).fields["visited"] = (true);
+    r0 = pxsim_Array__mk();
+    s.neighbors___18874 = (r0);
+    r0 = pxsim_Array__mk();
+    s.corners___18876 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
+    r0 = (s.col___18857 - 1);
+    s.tmp_0.arg0 = r0;
+    s.tmp_0.arg1 = s.row___18852;
+    s.callLocIdx = 1820; s.pc = 59; return s.tmp_0;
+  case 59:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
-    s.tmp_0.arg0 = s.self___192575;
-    s.tmp_0.arg1 = 0;
-    s.callLocIdx = 459; s.pc = 21; return s.tmp_0;
-  case 21:
+    s.left___18878 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
+    r0 = (s.col___18857 + 1);
+    s.tmp_0.arg0 = r0;
+    s.tmp_0.arg1 = s.row___18852;
+    s.callLocIdx = 1821; s.pc = 60; return s.tmp_0;
+  case 60:
     r0 = s.retval;
-    { step = 7; continue; }
-  case 5:
-  case 6:
-    r0 = (s.caps[1] * s.turnRate___192576);
+    s.right___18884 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
+    s.tmp_0.arg0 = s.col___18857;
+    r0 = (s.row___18852 - 1);
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 1822; s.pc = 61; return s.tmp_0;
+  case 61:
+    r0 = s.retval;
+    s.top___18891 = (r0);
+    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
+    s.tmp_0.arg0 = s.col___18857;
+    r0 = (s.row___18852 + 1);
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 1823; s.pc = 62; return s.tmp_0;
+  case 62:
+    r0 = s.retval;
+    s.bottom___18897 = (r0);
+    s.tmp_2 = scene_isWalkable__P6087_mk(s);
+    s.tmp_2.arg0 = s.left___18878;
+    s.tmp_2.arg1 = s.arg2;
+    s.tmp_2.arg2 = s.arg0;
+    s.callLocIdx = 1824; s.pc = 63; return s.tmp_2;
+  case 63:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = (s.rate___192577 / 50);
+    r0 = pxsim_Boolean__bang(s.tmp_0);
+    s.leftIsWall___18904 = (r0);
+    s.tmp_2 = scene_isWalkable__P6087_mk(s);
+    s.tmp_2.arg0 = s.right___18884;
+    s.tmp_2.arg1 = s.arg2;
+    s.tmp_2.arg2 = s.arg0;
+    s.callLocIdx = 1825; s.pc = 64; return s.tmp_2;
+  case 64:
+    r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_0 * s.tmp_1);
-    s.maxMomentumDiff___192616 = (r0);
-    r0 = pxsim.Math_.atan2(s.dy___192597, s.dx___192591);
-    s.angleToTarget___192623 = (r0);
-    r0 = pxsim.Math_.cos(s.angleToTarget___192623);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.rate___192577);
-    s.targetTrajectoryVx___192628 = (r0);
-    r0 = pxsim.Math_.sin(s.angleToTarget___192623);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.rate___192577);
-    s.targetTrajectoryVy___192634 = (r0);
-    s.tmp_0 = r0 = s.targetTrajectoryVx___192628;
-    s.tmp_2 = Sprite_vx__P187246_mk(s);
-    s.tmp_2.arg0 = s.self___192575;
-    s.callLocIdx = 460; s.pc = 22; return s.tmp_2;
-  case 22:
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_0);
+    s.rightIsWall___18911 = (r0);
+    s.tmp_2 = scene_isWalkable__P6087_mk(s);
+    s.tmp_2.arg0 = s.top___18891;
+    s.tmp_2.arg1 = s.arg2;
+    s.tmp_2.arg2 = s.arg0;
+    s.callLocIdx = 1826; s.pc = 65; return s.tmp_2;
+  case 65:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_0 - s.tmp_1);
-    s.diffVx___192640 = (r0);
-    s.tmp_0 = r0 = s.targetTrajectoryVy___192634;
-    s.tmp_2 = Sprite_vy__P187248_mk(s);
-    s.tmp_2.arg0 = s.self___192575;
-    s.callLocIdx = 461; s.pc = 23; return s.tmp_2;
-  case 23:
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_0);
+    s.topIsWall___18918 = (r0);
+    s.tmp_2 = scene_isWalkable__P6087_mk(s);
+    s.tmp_2.arg0 = s.bottom___18897;
+    s.tmp_2.arg1 = s.arg2;
+    s.tmp_2.arg2 = s.arg0;
+    s.callLocIdx = 1827; s.pc = 66; return s.tmp_2;
+  case 66:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_0 - s.tmp_1);
-    s.diffVy___192645 = (r0);
-    s.tmp_0 = Sprite_vx__P187247_mk(s);
-    s.tmp_1 = r0 = s.self___192575;
-    s.tmp_0.arg0 = r0;
-    s.tmp_3 = Sprite_vx__P187246_mk(s);
-    s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 463; s.pc = 25; return s.tmp_3;
-  case 25:
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_0);
+    s.bottomIsWall___18925 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.leftIsWall___18904);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 18; continue; }
+    r0 = pxsim_Array__push(s.neighbors___18874, s.left___18878);
+    r0 = pxsim_numops_toBoolDecr(s.topIsWall___18918);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 12; continue; }
+    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
+    r0 = (s.col___18857 - 1);
+    s.tmp_2.arg0 = r0;
+    r0 = (s.row___18852 - 1);
+    s.tmp_2.arg1 = r0;
+    s.callLocIdx = 1828; s.pc = 67; return s.tmp_2;
+  case 67:
+    r0 = s.retval;
+    s.topLeft___18940 = (r0);
+    s.tmp_3 = scene_isWall__P6086_mk(s);
+    s.tmp_3.arg0 = s.topLeft___18940;
+    s.tmp_3.arg1 = s.arg0;
+    s.callLocIdx = 1829; s.pc = 68; return s.tmp_3;
+  case 68:
     r0 = s.retval;
     s.tmp_2 = r0;
-    s.tmp_5 = Math_clamp__P185339_mk(s);
-    r0 = (0 - s.maxMomentumDiff___192616);
-    s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = s.maxMomentumDiff___192616;
-    s.tmp_5.arg2 = s.diffVx___192640;
-    s.callLocIdx = 462; s.pc = 26; return s.tmp_5;
-  case 26:
+    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 = 10; continue; }
+    r0 = pxsim_Array__push(s.corners___18876, s.topLeft___18940);
+  case 10:
+  case 11:
+  case 12:
+  case 13:
+    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___18925);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 16; continue; }
+    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
+    r0 = (s.col___18857 - 1);
+    s.tmp_2.arg0 = r0;
+    r0 = (s.row___18852 + 1);
+    s.tmp_2.arg1 = r0;
+    s.callLocIdx = 1830; s.pc = 69; return s.tmp_2;
+  case 69:
     r0 = s.retval;
-    s.tmp_4 = r0;
-    r0 = (s.tmp_2 + s.tmp_4);
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 464; s.pc = 24; return s.tmp_0;
-  case 24:
+    s.bottomLeft___18958 = (r0);
+    s.tmp_3 = scene_isWall__P6086_mk(s);
+    s.tmp_3.arg0 = s.bottomLeft___18958;
+    s.tmp_3.arg1 = s.arg0;
+    s.callLocIdx = 1831; s.pc = 70; return s.tmp_3;
+  case 70:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
-    s.tmp_1 = r0 = s.self___192575;
-    s.tmp_0.arg0 = r0;
-    s.tmp_3 = Sprite_vy__P187248_mk(s);
-    s.tmp_3.arg0 = s.tmp_1;
-    s.callLocIdx = 466; s.pc = 28; return s.tmp_3;
-  case 28:
+    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 = 14; continue; }
+    r0 = pxsim_Array__push(s.corners___18876, s.bottomLeft___18958);
+  case 14:
+  case 15:
+  case 16:
+  case 17:
+  case 18:
+  case 19:
+    r0 = pxsim_numops_toBoolDecr(s.rightIsWall___18911);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 28; continue; }
+    r0 = pxsim_Array__push(s.neighbors___18874, s.right___18884);
+    r0 = pxsim_numops_toBoolDecr(s.topIsWall___18918);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 22; continue; }
+    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
+    r0 = (s.col___18857 + 1);
+    s.tmp_2.arg0 = r0;
+    r0 = (s.row___18852 - 1);
+    s.tmp_2.arg1 = r0;
+    s.callLocIdx = 1832; s.pc = 71; return s.tmp_2;
+  case 71:
+    r0 = s.retval;
+    s.topRight___18983 = (r0);
+    s.tmp_3 = scene_isWall__P6086_mk(s);
+    s.tmp_3.arg0 = s.topRight___18983;
+    s.tmp_3.arg1 = s.arg0;
+    s.callLocIdx = 1833; s.pc = 72; return s.tmp_3;
+  case 72:
     r0 = s.retval;
     s.tmp_2 = r0;
-    s.tmp_5 = Math_clamp__P185339_mk(s);
-    r0 = (0 - s.maxMomentumDiff___192616);
-    s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = s.maxMomentumDiff___192616;
-    s.tmp_5.arg2 = s.diffVy___192645;
-    s.callLocIdx = 465; s.pc = 29; return s.tmp_5;
+    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 = 20; continue; }
+    r0 = pxsim_Array__push(s.corners___18876, s.topRight___18983);
+  case 20:
+  case 21:
+  case 22:
+  case 23:
+    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___18925);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 26; continue; }
+    s.tmp_2 = tiles_getTileLocation__P2344_mk(s);
+    r0 = (s.col___18857 + 1);
+    s.tmp_2.arg0 = r0;
+    r0 = (s.row___18852 + 1);
+    s.tmp_2.arg1 = r0;
+    s.callLocIdx = 1834; s.pc = 73; return s.tmp_2;
+  case 73:
+    r0 = s.retval;
+    s.bottomRight___19002 = (r0);
+    s.tmp_3 = scene_isWall__P6086_mk(s);
+    s.tmp_3.arg0 = s.bottomRight___19002;
+    s.tmp_3.arg1 = s.arg0;
+    s.callLocIdx = 1835; s.pc = 74; return s.tmp_3;
+  case 74:
+    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 = 24; continue; }
+    r0 = pxsim_Array__push(s.corners___18876, s.bottomRight___19002);
+  case 24:
+  case 25:
+  case 26:
+  case 27:
+  case 28:
   case 29:
+    r0 = pxsim_numops_toBoolDecr(s.topIsWall___18918);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 30; continue; }
+    r0 = pxsim_Array__push(s.neighbors___18874, s.top___18891);
+  case 30:
+  case 31:
+    r0 = pxsim_numops_toBoolDecr(s.bottomIsWall___18925);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 32; continue; }
+    r0 = pxsim_Array__push(s.neighbors___18874, s.bottom___18897);
+  case 32:
+  case 33:
+    r0 = s.currLocation___18841.fields["cost"];
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + 1);
+    s.neighborCost___19032 = (r0);
+    s.node___19038 = (undefined);
+    s.unnamed120___U24 = (s.neighbors___18874);
+    s.unnamed121___U25 = (0);
+  case 34:
+    s.tmp_0 = r0 = s.unnamed121___U25;
+    r0 = pxsim_Array__length(s.unnamed120___U24);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 < s.tmp_1);
+    if (!r0) { step = 35; continue; }
+    r0 = pxsim_Array__getAt(s.unnamed120___U24, s.unnamed121___U25);
+    s.node___19038 = (r0);
+    s.tmp_2 = lambda_4_mk(s);
+    s.tmp_2.argL = s.updateOrFillLocation___18765;
+    s.tmp_2.arg0 = s.node___19038;
+    s.tmp_2.arg1 = s.dataForCurrLocation___18862;
+    s.tmp_2.arg2 = s.neighborCost___19032;
+    setupLambda(s.tmp_2, s.tmp_2.argL);
+    s.callLocIdx = 1836; s.pc = 75; return s.tmp_2;
+  case 75:
     r0 = s.retval;
+    r0 = (s.unnamed121___U25 + 1);
+    s.unnamed121___U25 = (r0);
+    { step = 34; continue; }
+  case 35:
+    s.unnamed120___U24 = (undefined);
+    r0 = pxsim_Array__length(s.corners___18876);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 38; continue; }
+    r0 = s.currLocation___18841.fields["cost"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 + 1.414213562373095);
+    s.cornerCost___19048 = (r0);
+    s.corner___19054 = (undefined);
+    s.unnamed122___U28 = (s.corners___18876);
+    s.unnamed123___U29 = (0);
+  case 36:
+    s.tmp_0 = r0 = s.unnamed123___U29;
+    r0 = pxsim_Array__length(s.unnamed122___U28);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0 < s.tmp_1);
+    if (!r0) { step = 37; continue; }
+    r0 = pxsim_Array__getAt(s.unnamed122___U28, s.unnamed123___U29);
+    s.corner___19054 = (r0);
+    s.tmp_2 = lambda_4_mk(s);
+    s.tmp_2.argL = s.updateOrFillLocation___18765;
+    s.tmp_2.arg0 = s.corner___19054;
+    s.tmp_2.arg1 = s.dataForCurrLocation___18862;
+    s.tmp_2.arg2 = s.cornerCost___19048;
+    setupLambda(s.tmp_2, s.tmp_2.argL);
+    s.callLocIdx = 1837; s.pc = 76; return s.tmp_2;
+  case 76:
+    r0 = s.retval;
+    r0 = (s.unnamed123___U29 + 1);
+    s.unnamed123___U29 = (r0);
+    { step = 36; continue; }
+  case 37:
+    s.unnamed122___U28 = (undefined);
+  case 38:
+  case 39:
+    { step = 3; continue; }
+  case 40:
+    s.tmp_0 = r0 = s.end___18835;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 41; continue; }
+    r0 = s.tmp_0;
+    { step = 42; continue; }
+  case 41:
+    s.tmp_1 = r0 = s.encountedLocations___18762;
+    s.tmp_3 = scene_locationCol__P6085_mk(s);
+    s.tmp_3.arg0 = s.end___18835;
+    s.callLocIdx = 1838; s.pc = 77; return s.tmp_3;
+  case 77:
+    r0 = s.retval;
+    s.tmp_2 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
+  case 42:
+    // jmp value (already in r0)
     s.tmp_4 = r0;
-    r0 = (s.tmp_2 + s.tmp_4);
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 467; s.pc = 27; return s.tmp_0;
-  case 27:
+    s.endCol___19060 = (s.tmp_4);
+    s.tmp_0 = r0 = s.endCol___19060;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (r0) { step = 43; continue; }
+    r0 = s.tmp_0;
+    { step = 44; continue; }
+  case 43:
+    s.tmp_1 = r0 = s.endCol___19060;
+    s.tmp_3 = scene_locationRow__P6084_mk(s);
+    s.tmp_3.arg0 = s.end___18835;
+    s.callLocIdx = 1839; s.pc = 78; return s.tmp_3;
+  case 78:
     r0 = s.retval;
-  case 7:
+    s.tmp_2 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
+  case 44:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    s.endDataNode___19067 = (s.tmp_4);
+    r0 = pxsim_numops_toBoolDecr(s.end___18835);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 45; continue; }
+    r0 = s.tmp_0;
+    { step = 46; continue; }
+  case 45:
+    r0 = pxsim_numops_toBoolDecr(s.endDataNode___19067);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+  case 46:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 47; continue; }
     r0 = undefined;
+    { step = 51; continue; }
+  case 47:
+  case 48:
+    s.curr___19080 = (s.endDataNode___19067);
+    r0 = pxsim_Array__mk();
+    s.output___19082 = (r0);
+  case 49:
+    r0 = pxsim_numops_toBoolDecr(s.curr___19080);
+    if (!r0) { step = 50; continue; }
+    s.tmp_0 = helpers_arrayUnshift__P102_mk(s);
+    s.tmp_0.arg0 = s.output___19082;
+    r0 = s.curr___19080.fields["l"];
+    s.tmp_0.arg1 = r0;
+    s.callLocIdx = 1840; s.pc = 79; return s.tmp_0;
+  case 79:
+    r0 = s.retval;
+    r0 = s.curr___19080.fields["parent"];
+    s.curr___19080 = (r0);
+    { step = 49; continue; }
+  case 50:
+    r0 = s.output___19082;
+  case 51:
     return leave(s, r0)
   default: oops()
 } } }
-inline__P192571.info = {"start":30600,"length":1635,"line":912,"column":44,"endLine":946,"endColumn":17,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
+scene_generalAStar__P3657.info = {"start":1723,"length":5198,"line":53,"column":4,"endLine":198,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"generalAStar","argumentNames":["tm","start","onTilesOf","heuristic","isEnd"]}
 
-function inline__P192571_mk(s) {
+function scene_generalAStar__P3657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P192571, depth: s.depth + 1,
+        parent: s, fn: scene_generalAStar__P3657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -8576,27 +8943,52 @@ function inline__P192571_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  tmp_6: undefined,
-  target___192574: undefined,
-  self___192575: undefined,
-  turnRate___192576: undefined,
-  rate___192577: undefined,
-  dx___192591: undefined,
-  dy___192597: undefined,
-  maxMomentumDiff___192616: undefined,
-  angleToTarget___192623: undefined,
-  targetTrajectoryVx___192628: undefined,
-  targetTrajectoryVy___192634: undefined,
-  diffVx___192640: undefined,
-  diffVy___192645: undefined,
+  consideredTiles___18740: undefined,
+  encountedLocations___18762: undefined,
+  updateOrFillLocation___18765: undefined,
+  end___18835: undefined,
+  currLocation___18841: undefined,
+  row___18852: undefined,
+  col___18857: undefined,
+  dataForCurrLocation___18862: undefined,
+  neighbors___18874: undefined,
+  corners___18876: undefined,
+  left___18878: undefined,
+  right___18884: undefined,
+  top___18891: undefined,
+  bottom___18897: undefined,
+  leftIsWall___18904: undefined,
+  rightIsWall___18911: undefined,
+  topIsWall___18918: undefined,
+  bottomIsWall___18925: undefined,
+  topLeft___18940: undefined,
+  bottomLeft___18958: undefined,
+  topRight___18983: undefined,
+  bottomRight___19002: undefined,
+  neighborCost___19032: undefined,
+  node___19038: undefined,
+  unnamed120___U24: undefined,
+  unnamed121___U25: undefined,
+  cornerCost___19048: undefined,
+  corner___19054: undefined,
+  unnamed122___U28: undefined,
+  unnamed123___U29: undefined,
+  endCol___19060: undefined,
+  endDataNode___19067: undefined,
+  curr___19080: undefined,
+  output___19082: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
+  arg4: undefined,
 } }
 
 
 
 
 
-function inline__P192678(s) {
+function inline__P18743(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8608,44 +9000,220 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0.fields["self"];
-    r0 = r0.fields["flags"];
+    r0 = s.arg0.fields["cost"];
+    s.tmp_2 = r0;
+    r0 = pxsim.Math_.pow(s.tmp_2, 2);
+    s.tmp_1 = r0;
+    r0 = s.arg0.fields["extraCost"];
     s.tmp_3 = r0;
-    r0 = s.arg0.fields["target"];
-    r0 = r0.fields["flags"];
+    r0 = (s.tmp_1 + s.tmp_3);
+    s.tmp_0 = r0;
+    r0 = s.arg1.fields["cost"];
+    s.tmp_6 = r0;
+    r0 = pxsim.Math_.pow(s.tmp_6, 2);
+    s.tmp_5 = r0;
+    r0 = s.arg1.fields["extraCost"];
+    s.tmp_7 = r0;
+    r0 = (s.tmp_5 + s.tmp_7);
     s.tmp_4 = r0;
-    r0 = (s.tmp_3 | s.tmp_4);
+    r0 = (s.tmp_0 - s.tmp_4);
+    return leave(s, r0)
+  default: oops()
+} } }
+inline__P18743.info = {"start":2110,"length":67,"line":62,"column":12,"endLine":62,"endColumn":79,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["a","b"]}
+
+function inline__P18743_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: inline__P18743, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  arg0: undefined,
+  arg1: undefined,
+} }
+
+
+
+
+
+function updateOrFillLocation__P18765(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.row___18769 = undefined;
+    s.col___18773 = undefined;
+    s.colData___18781 = undefined;
+    s.lData___18791 = undefined;
+    s.h___18822 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_0 = scene_locationRow__P6084_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1807; s.pc = 12; return s.tmp_0;
+  case 12:
+    r0 = s.retval;
+    s.row___18769 = (r0);
+    s.tmp_0 = scene_locationCol__P6085_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1808; s.pc = 13; return s.tmp_0;
+  case 13:
+    r0 = s.retval;
+    s.col___18773 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P2336_mk(s);
+    s.tmp_1.arg0 = s.caps[0];
+    s.tmp_1.arg1 = s.col___18773;
+    s.tmp_1.arg2 = s.row___18769;
+    s.callLocIdx = 1809; s.pc = 14; return s.tmp_1;
+  case 14:
+    r0 = s.retval;
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    { step = 11; continue; }
+  case 1:
+  case 2:
+    r0 = pxsim_Array__getAt(s.caps[1], s.col___18773);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 & 2);
+    r0 = pxsim_numops_toBool(s.tmp_2);
+    if (!r0) { step = 3; continue; }
+    r0 = s.tmp_2;
+    { step = 4; continue; }
+  case 3:
+    s.tmp_3 = r0 = s.caps[1];
+    s.tmp_4 = r0 = s.col___18773;
+    r0 = pxsim_Array__mk();
+    s.tmp_5 = r0;
+    r0 = pxsim_Array_.setAt(s.tmp_3, s.tmp_4, s.tmp_5);
+    r0 = s.tmp_5;
+  case 4:
+    // jmp value (already in r0)
+    s.tmp_6 = r0;
+    s.colData___18781 = (s.tmp_6);
+    r0 = pxsim_Array__getAt(s.colData___18781, s.row___18769);
+    s.lData___18791 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.lData___18791);
     s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 5; continue; }
+    r0 = pxsim_pxtcore_mkClassInstance(scene_LocationNode__C6081_VT);
+    s.tmp_2 = r0;
+    s.tmp_3 = scene_LocationNode_constructor__P6082_mk(s);
+    s.tmp_3.arg0 = s.tmp_2;
+    s.tmp_3.arg1 = s.arg0;
+    s.tmp_3.arg2 = s.arg1;
+    s.tmp_3.arg3 = s.arg2;
+    s.callLocIdx = 1810; s.pc = 15; return s.tmp_3;
+  case 15:
+    r0 = s.retval;
+    r0 = pxsim_Array_.setAt(s.colData___18781, s.row___18769, s.tmp_2);
+    { step = 10; continue; }
+  case 5:
+    r0 = s.lData___18791.fields["visited"];
+    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_toBool(s.tmp_0);
+    if (r0) { step = 6; continue; }
+    r0 = s.tmp_0;
+    { step = 7; continue; }
+  case 6:
+    r0 = s.lData___18791.fields["lastCost"];
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 > s.arg2);
+  case 7:
+    // jmp value (already in r0)
+    s.tmp_4 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
+    if (!r0) { step = 8; continue; }
+    r0 = (s.lData___18791).fields["lastCost"] = (s.arg2);
+    r0 = (s.lData___18791).fields["parent"] = (s.arg1);
+    { step = 9; continue; }
+  case 8:
+    { step = 11; continue; }
+  case 9:
+  case 10:
+    s.tmp_0 = lambda_2_mk(s);
+    s.tmp_0.argL = s.caps[2];
+    s.tmp_0.arg0 = s.arg0;
+    setupLambda(s.tmp_0, s.tmp_0.argL);
+    s.callLocIdx = 1811; s.pc = 16; return s.tmp_0;
+  case 16:
+    r0 = s.retval;
+    s.h___18822 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_PrioritizedLocation__C6079_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
+    s.tmp_1 = scene_PrioritizedLocation_constructor__P6080_mk(s);
+    s.tmp_1.arg0 = s.tmp_0;
+    s.tmp_1.arg1 = s.arg0;
+    s.tmp_1.arg2 = s.arg2;
+    s.tmp_1.arg3 = s.h___18822;
+    s.callLocIdx = 1812; s.pc = 17; return s.tmp_1;
+  case 17:
+    r0 = s.retval;
+    s.tmp_2 = Heap_push__P3648_mk(s);
+    s.tmp_2.arg0 = s.caps[3];
+    s.tmp_2.arg1 = s.tmp_0;
+    s.callLocIdx = 1813; s.pc = 18; return s.tmp_2;
+  case 18:
+    r0 = s.retval;
+  case 11:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P192678.info = {"start":32485,"length":67,"line":953,"column":32,"endLine":953,"endColumn":99,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
+updateOrFillLocation__P18765.info = {"start":2261,"length":1162,"line":66,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"updateOrFillLocation","argumentNames":["l","parent","cost"]}
 
-function inline__P192678_mk(s) {
+function updateOrFillLocation__P18765_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P192678, depth: s.depth + 1,
+        parent: s, fn: updateOrFillLocation__P18765, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  row___18769: undefined,
+  col___18773: undefined,
+  colData___18781: undefined,
+  lData___18791: undefined,
+  h___18822: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function inline__P192696(s) {
+function scene_LocationNode_constructor__P6082(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8657,34 +9225,39 @@ switch (step) {
 
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
+      s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0.fields["self"];
-    r0 = r0.fields["id"];
-    s.tmp_0 = r0;
-    r0 = s.caps[0].fields["id"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0 == s.tmp_1);
+    r0 = s.arg0;
+    if (!checkSubtype(r0, scene_LocationNode__C6081_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["l"] = (s.arg1);
+    r0 = (s.arg0).fields["parent"] = (s.arg2);
+    r0 = (s.arg0).fields["lastCost"] = (s.arg3);
+    r0 = (s.arg0).fields["visited"] = (false);
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P192696.info = {"start":32644,"length":27,"line":958,"column":44,"endLine":958,"endColumn":71,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["fs"]}
+scene_LocationNode_constructor__P6082.info = {"start":317,"length":189,"line":13,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","l","parent","lastCost"]}
 
-function inline__P192696_mk(s) {
+function scene_LocationNode_constructor__P6082_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P192696, depth: s.depth + 1,
+        parent: s, fn: scene_LocationNode_constructor__P6082, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
 } }
 
 
 
 
 
-function sprites_FollowingSprite_constructor__P187190(s) {
+function scene_PrioritizedLocation_constructor__P6080(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8699,38 +9272,35 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.arg3 = (s.lambdaArgs[3]);
-      s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_FollowingSprite__C187189_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["self"] = (s.arg1);
-    r0 = (s.arg0).fields["target"] = (s.arg2);
-    r0 = (s.arg0).fields["rate"] = (s.arg3);
-    r0 = (s.arg0).fields["turnRate"] = (s.arg4);
+    if (!checkSubtype(r0, scene_PrioritizedLocation__C6079_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["loc"] = (s.arg1);
+    r0 = (s.arg0).fields["cost"] = (s.arg2);
+    r0 = (s.arg0).fields["extraCost"] = (s.arg3);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_FollowingSprite_constructor__P187190.info = {"start":401,"length":163,"line":18,"column":8,"endLine":23,"endColumn":13,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["this","self","target","rate","turnRate"]}
+scene_PrioritizedLocation_constructor__P6080.info = {"start":60,"length":176,"line":2,"column":8,"endLine":7,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/a-star.ts","functionName":"inline","argumentNames":["this","loc","cost","extraCost"]}
 
-function sprites_FollowingSprite_constructor__P187190_mk(s) {
+function scene_PrioritizedLocation_constructor__P6080_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_FollowingSprite_constructor__P187190, depth: s.depth + 1,
+        parent: s, fn: scene_PrioritizedLocation_constructor__P6080, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
   arg3: undefined,
-  arg4: undefined,
 } }
 
 
 
 
 
-function control_EventContext_registerFrameHandler__P185609(s) {
+function Heap_length__P3651(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8740,105 +9310,35 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fn___192840 = undefined;
-    s.i___192849 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
-    r0 = s.arg0.fields["frameCallbacks"];
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    s.tmp_3 = r0 = s.arg0;
-    r0 = pxsim_Array__mk();
-    s.tmp_4 = r0;
-    r0 = (s.tmp_3).fields["frameCallbacks"] = (s.tmp_4);
-    s.tmp_0 = control_EventContext_registerFrameCallbacks__P189246_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 59; s.pc = 8; return s.tmp_0;
-  case 8:
-    r0 = s.retval;
-  case 1:
-  case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(control_FrameCallback__C185598_VT);
-    s.fn___192840 = (r0);
-    r0 = (s.fn___192840).fields["order"] = (s.arg1);
-    r0 = (s.fn___192840).fields["handler"] = (s.arg2);
-    s.i___192849 = (0);
-  case 3:
-    s.tmp_1 = r0 = s.i___192849;
-    r0 = s.arg0.fields["frameCallbacks"];
-    s.tmp_3 = r0;
-    r0 = pxsim_Array__length(s.tmp_3);
-    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; }
-    r0 = s.arg0.fields["frameCallbacks"];
-    s.tmp_6 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_6, s.i___192849);
-    r0 = r0.fields["order"];
-    s.tmp_5 = r0;
-    r0 = (s.tmp_5 > s.arg1);
-    s.tmp_4 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
-    if (!r0) { step = 4; continue; }
-    r0 = s.arg0.fields["frameCallbacks"];
-    s.tmp_7 = r0;
-    r0 = pxsim_Array_.insertAt(s.tmp_7, s.i___192849, s.fn___192840);
-    r0 = s.fn___192840;
-    { step = 7; continue; }
-  case 4:
-  case 5:
-    r0 = (s.i___192849 + 1);
-    s.i___192849 = (r0);
-    { step = 3; continue; }
-  case 6:
-    r0 = s.arg0.fields["frameCallbacks"];
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.fn___192840);
-    r0 = s.fn___192840;
-  case 7:
-    return leave(s, r0)
+    r0 = pxsim_Array__length(s.tmp_0);
+    return leaveAccessor(s, r0)
   default: oops()
 } } }
-control_EventContext_registerFrameHandler__P185609.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"]}
+Heap_length__P3651.info = {"start":1832,"length":54,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"length","argumentNames":["this"]}
+Heap_length__P3651.isGetter = true;
 
-function control_EventContext_registerFrameHandler__P185609_mk(s) {
+function Heap_length__P3651_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerFrameHandler__P185609, depth: s.depth + 1,
+        parent: s, fn: Heap_length__P3651, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
-  fn___192840: undefined,
-  i___192849: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function control_EventContext_registerFrameCallbacks__P189246(s) {
+function Heap_pop__P3649(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -8848,164 +9348,66 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.worker___192883 = undefined;
+    s.output___19118 = undefined;
+    s.nextRoot___19123 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
-    r0 = s.arg0.fields["frameCallbacks"];
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = s.arg0.fields["store"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_0, 0);
+    s.output___19118 = (r0);
+    r0 = s.arg0.fields["store"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array_.pop(s.tmp_0);
+    s.nextRoot___19123 = (r0);
+    r0 = s.arg0.fields["store"];
     s.tmp_2 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    r0 = pxsim_Array__length(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = (s.tmp_1 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    { step = 3; continue; }
-  case 1:
-  case 2:
-    r0 = s.arg0.fields["frameWorker"];
-    s.worker___192883 = (r0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P192889);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.worker___192883);
-    r0 = pxsim.control.runInParallel(s.tmp_0);
+    r0 = s.arg0.fields["store"];
+    s.tmp_3 = r0;
+    r0 = pxsim_Array_.setAt(s.tmp_3, 0, s.nextRoot___19123);
+    s.tmp_0 = Heap_percolateDown__P6074_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = 0;
+    s.callLocIdx = 1796; s.pc = 3; return s.tmp_0;
   case 3:
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-control_EventContext_registerFrameCallbacks__P189246.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__P189246_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: control_EventContext_registerFrameCallbacks__P189246, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  worker___192883: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function inline__P192889(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.delay___192919 = 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__P192895);
-    s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.caps[0]);
-    s.tmp_2 = pauseUntil__P185573_mk(s);
-    s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = undefined;
-    s.callLocIdx = 53; s.pc = 5; return s.tmp_2;
-  case 5:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = (s.caps[0]).fields["runningCallbacks"] = (true);
-    r0 = (s.caps[0]).fields["framesInSample"] = (0);
-    r0 = (s.caps[0]).fields["timeInSample"] = (0);
-    r0 = (s.caps[0]).fields["deltaTimeMillis"] = (0);
-    s.tmp_0 = r0 = s.caps[0];
-    r0 = pxsim.control.millis();
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["prevTimeMillis"] = (s.tmp_1);
-  case 3:
-    r0 = s.caps[0].fields["frameWorker"];
-    s.tmp_1 = r0;
-    r0 = (s.caps[1] == s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    s.tmp_2 = control_EventContext_runCallbacks__P189245_mk(s);
-    s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 54; s.pc = 6; return s.tmp_2;
-  case 6:
-    r0 = s.retval;
-    s.delay___192919 = (r0);
-    s.tmp_0 = pause__P185619_mk(s);
-    s.tmp_0.arg0 = s.delay___192919;
-    s.callLocIdx = 55; s.pc = 7; return s.tmp_0;
-  case 7:
-    r0 = s.retval;
-    { step = 3; continue; }
-  case 4:
-    r0 = (s.caps[0]).fields["runningCallbacks"] = (false);
-    r0 = undefined;
+    r0 = s.output___19118;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P192889.info = {"start":3642,"length":723,"line":109,"column":34,"endLine":128,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+Heap_pop__P3649.info = {"start":1536,"length":236,"line":61,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"pop","argumentNames":["this"]}
 
-function inline__P192889_mk(s) {
+function Heap_pop__P3649_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P192889, depth: s.depth + 1,
+        parent: s, fn: Heap_pop__P3649, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  delay___192919: undefined,
-} }
-
-
-
-
-
-function inline__P192895(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 = s.caps[0].fields["runningCallbacks"];
-    s.tmp_1 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_0);
-    return leave(s, r0)
-  default: oops()
-} } }
-inline__P192895.info = {"start":3873,"length":28,"line":113,"column":31,"endLine":113,"endColumn":59,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
-
-function inline__P192895_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: inline__P192895, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
+  tmp_3: undefined,
+  output___19118: undefined,
+  nextRoot___19123: undefined,
+  arg0: undefined,
 } }
 
 
 
 
 
-function control_EventContext_runCallbacks__P189245(s) {
+function Heap_percolateDown__P6074(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9015,264 +9417,151 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.loopStart___192928 = undefined;
-    s.f___192941 = undefined;
-    s.unnamed8896___U2 = undefined;
-    s.unnamed8897___U3 = undefined;
-    s.runtime___192946 = undefined;
-    s.fps___192966 = undefined;
-    s.delay___193028 = undefined;
+    s.data___19138 = undefined;
+    s.max___19141 = undefined;
+    s.left___19149 = undefined;
+    s.right___19153 = undefined;
+    s.curr___19157 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
-    r0 = pxsim.control.millis();
-    s.loopStart___192928 = (r0);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = s.arg0.fields["prevTimeMillis"];
-    s.tmp_2 = r0;
-    r0 = (s.loopStart___192928 - s.tmp_2);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["deltaTimeMillis"] = (s.tmp_1);
-    r0 = (s.arg0).fields["prevTimeMillis"] = (s.loopStart___192928);
-    s.f___192941 = (undefined);
-    r0 = s.arg0.fields["frameCallbacks"];
-    s.unnamed8896___U2 = (r0);
-    s.unnamed8897___U3 = (0);
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = s.arg0.fields["store"];
+    s.data___19138 = (r0);
+    r0 = s.arg0.fields["store"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array__length(s.tmp_0);
+    s.max___19141 = (r0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8897___U3;
-    r0 = pxsim_Array__length(s.unnamed8896___U2);
+    r0 = (s.arg1 < s.max___19141);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 12; continue; }
+    r0 = (s.arg1 << 1);
     s.tmp_1 = r0;
-    r0 = (s.tmp_0 < s.tmp_1);
-    if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8896___U2, s.unnamed8897___U3);
-    s.f___192941 = (r0);
-    s.tmp_2 = if_handler_1_mk(s);
-    s.tmp_2.arg0 = s.f___192941;
+    r0 = (s.tmp_1 + 1);
+    s.left___19149 = (r0);
+    r0 = (s.arg1 << 1);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + 2);
+    s.right___19153 = (r0);
+    s.curr___19157 = (s.arg1);
+    r0 = (s.left___19149 < s.max___19141);
+    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:
+    s.tmp_2 = if_comparator_3_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    r0 = pxsim_Array__getAt(s.data___19138, s.curr___19157);
+    s.tmp_2.arg1 = r0;
+    r0 = pxsim_Array__getAt(s.data___19138, s.left___19149);
+    s.tmp_2.arg2 = r0;
     if (!s.tmp_2.arg0.vtable.iface) {
-      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "handler"), 1);
-      s.callLocIdx = 50; s.pc = 13; return s.tmp_2;
+      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
+      s.callLocIdx = 1790; s.pc = 13; return s.tmp_2;
     } else {
-      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["handler"];
-      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["handler"], 1); s.callLocIdx = 50; s.pc = 13; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 50; s.pc = 13; return s.tmp_2;; }
-     else { s.callLocIdx = 50; s.pc = 13; return s.tmp_2; }
+      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1790; s.pc = 13; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1790; s.pc = 13; return s.tmp_2;; }
+     else { s.callLocIdx = 1790; s.pc = 13; return s.tmp_2; }
     }
   case 13:
     r0 = s.retval;
-    r0 = (s.unnamed8897___U3 + 1);
-    s.unnamed8897___U3 = (r0);
-    { step = 1; continue; }
-  case 2:
-    s.unnamed8896___U2 = (undefined);
-    r0 = pxsim.control.millis();
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.loopStart___192928);
-    s.runtime___192946 = (r0);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = s.tmp_0.fields["timeInSample"];
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.runtime___192946);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["timeInSample"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.arg0;
-    r0 = s.tmp_0.fields["framesInSample"];
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 + 1);
-    s.tmp_1 = r0;
-    r0 = (s.tmp_0).fields["framesInSample"] = (s.tmp_1);
-    r0 = s.arg0.fields["timeInSample"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > 1000);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 3; continue; }
-    r0 = s.tmp_0;
-    { step = 4; continue; }
+    r0 = (s.tmp_1 > 0);
   case 3:
-    r0 = s.arg0.fields["framesInSample"];
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 > 30);
-  case 4:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 11; continue; }
-    r0 = s.arg0.fields["framesInSample"];
-    s.tmp_4 = r0;
-    r0 = s.arg0.fields["timeInSample"];
-    s.tmp_6 = r0;
-    r0 = (s.tmp_6 / 1000);
-    s.tmp_5 = r0;
-    r0 = (s.tmp_4 / s.tmp_5);
-    s.fps___192966 = (r0);
-    r0 = pxsim.Math_.round(s.fps___192966);
-    s.tmp_1 = r0;
-    if ((s.tmp_1) && (s.tmp_1).vtable) {
-    setupResume(s, 14);
-    pxsim_String__stringConv(s.tmp_1);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (s.tmp_1) + ""; }
-  case 14:
-    r0 = s.retval;
-    s.tmp_0 = r0;
-    r0 = pxsim_String__concat("fps:", s.tmp_0);
-    globals.control_EventContext_lastStats___185603 = (r0);
-    r0 = (s.fps___192966 < 99);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    if ((globals.control_EventContext_lastStats___185603) && (globals.control_EventContext_lastStats___185603).vtable) {
-    setupResume(s, 15);
-    pxsim_String__stringConv(globals.control_EventContext_lastStats___185603);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (globals.control_EventContext_lastStats___185603) + ""; }
-  case 15:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = (s.fps___192966 * 10);
-    s.tmp_7 = r0;
-    r0 = pxsim.Math_.round(s.tmp_7);
-    s.tmp_6 = r0;
-    r0 = (s.tmp_6 % 10);
-    s.tmp_5 = r0;
-    if ((s.tmp_5) && (s.tmp_5).vtable) {
-    setupResume(s, 16);
-    pxsim_String__stringConv(s.tmp_5);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (s.tmp_5) + ""; }
-  case 16:
-    r0 = s.retval;
-    s.tmp_4 = r0;
-    r0 = pxsim_String__concat(".", s.tmp_4);
-    s.tmp_3 = r0;
-    if ((s.tmp_3) && (s.tmp_3).vtable) {
-    setupResume(s, 17);
-    pxsim_String__stringConv(s.tmp_3);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (s.tmp_3) + ""; }
-  case 17:
-    r0 = s.retval;
-    s.tmp_2 = r0;
-    r0 = pxsim_String__concat(s.tmp_1, s.tmp_2);
-    globals.control_EventContext_lastStats___185603 = (r0);
+    if (!r0) { step = 4; continue; }
+    s.curr___19157 = (s.left___19149);
+  case 4:
   case 5:
-  case 6:
-    s.tmp_2 = control_ramSize__P185552_mk(s);
-    s.callLocIdx = 51; s.pc = 18; return s.tmp_2;
-  case 18:
-    r0 = s.retval;
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 > 2000000);
+    r0 = (s.right___19153 < s.max___19141);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
-    if (r0) { step = 7; continue; }
+    if (r0) { step = 6; continue; }
     r0 = s.tmp_0;
-    { step = 8; continue; }
+    { step = 7; continue; }
+  case 6:
+    s.tmp_2 = if_comparator_3_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    r0 = pxsim_Array__getAt(s.data___19138, s.curr___19157);
+    s.tmp_2.arg1 = r0;
+    r0 = pxsim_Array__getAt(s.data___19138, s.right___19153);
+    s.tmp_2.arg2 = r0;
+    if (!s.tmp_2.arg0.vtable.iface) {
+      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
+      s.callLocIdx = 1791; s.pc = 14; return s.tmp_2;
+    } else {
+      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1791; s.pc = 14; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1791; s.pc = 14; return s.tmp_2;; }
+     else { s.callLocIdx = 1791; s.pc = 14; return s.tmp_2; }
+    }
+  case 14:
+    r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 > 0);
   case 7:
-    r0 = pxsim.control.profilingEnabled();
-  case 8:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 9; continue; }
-    r0 = pxsim_String_.mkEmpty();
-    s.tmp_8 = r0;
-    r0 = (s.fps___192966 * 100);
-    s.tmp_11 = r0;
-    r0 = (s.tmp_11 | 0);
-    s.tmp_10 = r0;
-    if ((s.tmp_10) && (s.tmp_10).vtable) {
-    setupResume(s, 19);
-    pxsim_String__stringConv(s.tmp_10);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (s.tmp_10) + ""; }
-  case 19:
-    r0 = s.retval;
-    s.tmp_9 = r0;
-    r0 = pxsim_String__concat(s.tmp_8, s.tmp_9);
-    s.tmp_7 = r0;
-    r0 = pxsim_String__concat(s.tmp_7, "/100 fps - ");
-    s.tmp_6 = r0;
-    r0 = s.arg0.fields["framesInSample"];
-    s.tmp_13 = r0;
-    if ((s.tmp_13) && (s.tmp_13).vtable) {
-    setupResume(s, 20);
-    pxsim_String__stringConv(s.tmp_13);
-    checkResumeConsumed();
-    return;
-    } else { s.retval = (s.tmp_13) + ""; }
-  case 20:
-    r0 = s.retval;
-    s.tmp_12 = r0;
-    r0 = pxsim_String__concat(s.tmp_6, s.tmp_12);
-    s.tmp_5 = r0;
-    r0 = pxsim_String__concat(s.tmp_5, " frames");
-    s.tmp_4 = r0;
-    r0 = pxsim.control.dmesg(s.tmp_4);
-    r0 = pxsim.control.gc();
-    r0 = pxsim_pxtcore.dumpPerfCounters();
+    if (!r0) { step = 8; continue; }
+    s.curr___19157 = (s.right___19153);
+  case 8:
   case 9:
+    r0 = (s.curr___19157 == s.arg1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 10; continue; }
+    { step = 12; continue; }
   case 10:
-    r0 = (s.arg0).fields["timeInSample"] = (0);
-    r0 = (s.arg0).fields["framesInSample"] = (0);
   case 11:
+    r0 = pxsim_Array__getAt(s.data___19138, s.arg1);
+    s.tmp_1 = r0;
+    r0 = pxsim_Array__getAt(s.data___19138, s.curr___19157);
+    s.tmp_2 = r0;
+    r0 = pxsim_Array_.setAt(s.data___19138, s.curr___19157, s.tmp_1);
+    r0 = pxsim_Array_.setAt(s.data___19138, s.arg1, s.tmp_2);
+    s.arg1 = (s.curr___19157);
+    { step = 1; continue; }
   case 12:
-    s.tmp_0 = Math_max__P185342_mk(s);
-    s.tmp_0.arg0 = 1;
-    r0 = (20 - s.runtime___192946);
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 52; s.pc = 21; return s.tmp_0;
-  case 21:
-    r0 = s.retval;
-    s.delay___193028 = (r0);
-    r0 = s.delay___193028;
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_runCallbacks__P189245.info = {"start":2182,"length":1246,"line":74,"column":8,"endLine":102,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"runCallbacks","argumentNames":["this"]}
+Heap_percolateDown__P6074.info = {"start":367,"length":645,"line":13,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateDown","argumentNames":["this","i"]}
 
-function control_EventContext_runCallbacks__P189245_mk(s) {
+function Heap_percolateDown__P6074_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_runCallbacks__P189245, depth: s.depth + 1,
+        parent: s, fn: Heap_percolateDown__P6074, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
-  tmp_8: undefined,
-  tmp_9: undefined,
-  tmp_10: undefined,
-  tmp_11: undefined,
-  tmp_12: undefined,
-  tmp_13: undefined,
-  loopStart___192928: undefined,
-  f___192941: undefined,
-  unnamed8896___U2: undefined,
-  unnamed8897___U3: undefined,
-  runtime___192946: undefined,
-  fps___192966: undefined,
-  delay___193028: undefined,
+  data___19138: undefined,
+  max___19141: undefined,
+  left___19149: undefined,
+  right___19153: undefined,
+  curr___19157: undefined,
   arg0: undefined,
+  arg1: undefined,
 } }
 
 
 
 
 
-function Math_max__P185342(s) {
+function Heap_rightChild__P6078(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9287,25 +9576,20 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg0 >= s.arg1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
     r0 = s.arg0;
-    { step = 3; continue; }
-  case 1:
-  case 2:
-    r0 = s.arg1;
-  case 3:
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = (s.arg1 << 1);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + 2);
     return leave(s, r0)
   default: oops()
 } } }
-Math_max__P185342.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"]}
+Heap_rightChild__P6078.info = {"start":2435,"length":68,"line":110,"column":4,"endLine":112,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"rightChild","argumentNames":["this","i"]}
 
-function Math_max__P185342_mk(s) {
+function Heap_rightChild__P6078_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_max__P185342, depth: s.depth + 1,
+        parent: s, fn: Heap_rightChild__P6078, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -9313,81 +9597,40 @@ function Math_max__P185342_mk(s) {
 } }
 
 
-
-
-
-function pauseUntil__P185573(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.lambdaArgs = null;
-    }
-    r0 = pxsim_numops_toBoolDecr(s.arg0);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = s.tmp_0;
-    { step = 2; continue; }
-  case 1:
-    s.tmp_2 = lambda_1_mk(s);
-    s.tmp_2.argL = s.arg0;
-    setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 37; s.pc = 8; return s.tmp_2;
-  case 8:
-    r0 = s.retval;
-  case 2:
-    // jmp value (already in r0)
-    s.tmp_3 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
-    if (!r0) { step = 3; continue; }
-    { step = 7; continue; }
-  case 3:
-  case 4:
-    r0 = pxsim_numops_toBoolDecr(s.arg1);
-    s.tmp_5 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_5);
-    s.tmp_4 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_4);
-    if (!r0) { step = 5; continue; }
-    s.arg1 = (0);
-  case 5:
-  case 6:
-    s.tmp_0 = control___queuePollEvent__P185572_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.arg0;
-    s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 38; s.pc = 9; return s.tmp_0;
-  case 9:
-    r0 = s.retval;
-  case 7:
-    r0 = undefined;
+
+
+
+function Heap_leftChild__P6077(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, Heap__C3646_VT)) failedCast(r0);
+    r0 = (s.arg1 << 1);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 + 1);
     return leave(s, r0)
   default: oops()
 } } }
-pauseUntil__P185573.info = {"start":2205,"length":227,"line":73,"column":0,"endLine":77,"endColumn":1,"fileName":"pxt_modules/base/poll.ts","functionName":"pauseUntil","argumentNames":["condition","timeOut"]}
+Heap_leftChild__P6077.info = {"start":2362,"length":67,"line":106,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"leftChild","argumentNames":["this","i"]}
 
-function pauseUntil__P185573_mk(s) {
+function Heap_leftChild__P6077_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pauseUntil__P185573, depth: s.depth + 1,
+        parent: s, fn: Heap_leftChild__P6077, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -9396,7 +9639,7 @@ function pauseUntil__P185573_mk(s) {
 
 
 
-function control___queuePollEvent__P185572(s) {
+function Heap_push__P3648(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9406,97 +9649,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ev___193050 = 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__C189219_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = control_PollEvent_constructor__P189220_mk(s);
-    s.tmp_1.arg0 = s.tmp_0;
-    r0 = pxsim.control.allocateNotifyEvent();
-    s.tmp_1.arg1 = r0;
-    s.tmp_1.arg2 = 1;
-    r0 = pxsim.control.millis();
-    s.tmp_1.arg3 = r0;
-    s.tmp_1.arg4 = s.arg0;
-    s.tmp_1.arg5 = s.arg1;
-    r0 = pxsim_numops_toBoolDecr(s.arg2);
-    s.tmp_2 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_2);
-    s.tmp_1.arg6 = r0;
-    s.callLocIdx = 35; s.pc = 5; return s.tmp_1;
-  case 5:
-    r0 = s.retval;
-    s.ev___193050 = (s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(globals._pollEventQueue___189222);
-    s.tmp_1 = r0;
-    r0 = pxsim_Boolean__bang(s.tmp_1);
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = pxsim_Array__mk();
-    s.tmp_2 = r0;
-    r0 = pxsim_Array__push(s.tmp_2, s.ev___193050);
-    globals._pollEventQueue___189222 = (s.tmp_2);
-    r0 = pxsim.control.runInParallel(control_pollEvents__P189223);
-    { step = 2; continue; }
+    r0 = pxsim_Array__push(s.tmp_0, s.arg1);
+    s.tmp_0 = Heap_percolateUp__P6075_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1794; s.pc = 1; return s.tmp_0;
   case 1:
-    r0 = pxsim_Array__push(globals._pollEventQueue___189222, s.ev___193050);
-  case 2:
-    r0 = pxsim_numops_toBoolDecr(s.arg2);
-    if (!r0) { step = 3; continue; }
-    s.tmp_0 = control_onEvent__P185597_mk(s);
-    r0 = s.ev___193050.fields["eid"];
-    s.tmp_0.arg0 = r0;
-    r0 = s.ev___193050.fields["vid"];
-    s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.arg2;
-    s.tmp_0.arg3 = 16;
-    s.callLocIdx = 36; s.pc = 6; return s.tmp_0;
-  case 6:
-    r0 = s.retval;
-    { step = 4; continue; }
-  case 3:
-    r0 = s.ev___193050.fields["eid"];
-    s.tmp_0 = r0;
-    r0 = s.ev___193050.fields["vid"];
-    s.tmp_1 = r0;
-    setupResume(s, 7);
-    pxsim.control.waitForEvent(s.tmp_0, s.tmp_1);
-    checkResumeConsumed();
-    return;
-  case 7:
     r0 = s.retval;
-  case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control___queuePollEvent__P185572.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"]}
+Heap_push__P3648.info = {"start":1456,"length":74,"line":56,"column":4,"endLine":59,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"push","argumentNames":["this","v"]}
 
-function control___queuePollEvent__P185572_mk(s) {
+function Heap_push__P3648_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control___queuePollEvent__P185572, depth: s.depth + 1,
+        parent: s, fn: Heap_push__P3648, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  tmp_2: undefined,
-  ev___193050: undefined,
   arg0: undefined,
   arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function control_pollEvents__P189223(s) {
+function Heap_percolateUp__P6075(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9506,139 +9694,98 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.now___193176 = undefined;
-    s.i___193179 = undefined;
-    s.ev___193185 = undefined;
-  case 1:
-    r0 = pxsim_Array__length(globals._pollEventQueue___189222);
+    s.i___19232 = undefined;
+    s.curr___19240 = undefined;
+    s.parentIndex___19245 = undefined;
+    s.parent___19249 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = s.arg0.fields["store"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > 0);
+    r0 = pxsim_Array__length(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 12; continue; }
-    r0 = pxsim.control.millis();
-    s.now___193176 = (r0);
-    s.i___193179 = (0);
-  case 2:
-    s.tmp_1 = r0 = s.i___193179;
-    r0 = pxsim_Array__length(globals._pollEventQueue___189222);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_1 < s.tmp_2);
+    r0 = (s.tmp_0 - 1);
+    s.i___19232 = (r0);
+  case 1:
+    r0 = (s.i___19232 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 11; continue; }
-    r0 = pxsim_Array__getAt(globals._pollEventQueue___189222, s.i___193179);
-    s.ev___193185 = (r0);
-    s.tmp_1 = if_condition_1_mk(s);
-    s.tmp_1.arg0 = s.ev___193185;
-    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;
+    if (!r0) { step = 4; continue; }
+    r0 = s.arg0.fields["store"];
+    s.tmp_1 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_1, s.i___19232);
+    s.curr___19240 = (r0);
+    r0 = (s.i___19232 - 1);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 >> 1);
+    s.parentIndex___19245 = (r0);
+    r0 = s.arg0.fields["store"];
+    s.tmp_0 = r0;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.parentIndex___19245);
+    s.parent___19249 = (r0);
+    s.tmp_2 = if_comparator_3_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    s.tmp_2.arg1 = s.parent___19249;
+    s.tmp_2.arg2 = s.curr___19240;
+    if (!s.tmp_2.arg0.vtable.iface) {
+      setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "comparator"), 3);
+      s.callLocIdx = 1793; s.pc = 5; return s.tmp_2;
     } else {
-      s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["condition"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["condition"], 1); s.callLocIdx = 32; s.pc = 13; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 32; s.pc = 13; return s.tmp_1;; }
-     else { s.callLocIdx = 32; s.pc = 13; return s.tmp_1; }
+      s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["comparator"];
+      if (s.tmp_2.fn == null) { setupLambda(s.tmp_2, s.tmp_2.arg0.fields["comparator"], 3); s.callLocIdx = 1793; s.pc = 5; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1793; s.pc = 5; return s.tmp_2;; }
+     else { s.callLocIdx = 1793; s.pc = 5; return s.tmp_2; }
     }
-  case 13:
+  case 5:
     r0 = s.retval;
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 <= 0);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_0);
-    if (!r0) { step = 3; continue; }
-    r0 = s.tmp_0;
-    { step = 6; continue; }
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 2; continue; }
+    { step = 4; continue; }
+  case 2:
   case 3:
-    r0 = s.ev___193185.fields["timeOut"];
+    r0 = s.arg0.fields["store"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 > 0);
-    s.tmp_2 = r0;
-    r0 = pxsim_numops_toBool(s.tmp_2);
-    if (r0) { step = 4; continue; }
-    r0 = s.tmp_2;
-    { step = 5; continue; }
-  case 4:
-    r0 = s.ev___193185.fields["start"];
-    s.tmp_5 = r0;
-    r0 = (s.now___193176 - s.tmp_5);
-    s.tmp_4 = r0;
-    r0 = s.ev___193185.fields["timeOut"];
-    s.tmp_6 = r0;
-    r0 = (s.tmp_4 > s.tmp_6);
-  case 5:
-    // jmp value (already in r0)
-    s.tmp_7 = r0;
-    r0 = s.tmp_7;
-  case 6:
-    // jmp value (already in r0)
-    s.tmp_8 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_8);
-    if (!r0) { step = 9; continue; }
-    r0 = s.ev___193185.fields["eid"];
-    s.tmp_9 = r0;
-    r0 = s.ev___193185.fields["vid"];
-    s.tmp_10 = r0;
-    r0 = pxsim.control.raiseEvent(s.tmp_9, s.tmp_10);
-    r0 = s.ev___193185.fields["once"];
+    r0 = pxsim_Array_.setAt(s.tmp_3, s.i___19232, s.parent___19249);
+    r0 = s.arg0.fields["store"];
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 7; continue; }
-    s.tmp_1 = helpers_arraySplice__P185315_mk(s);
-    s.tmp_1.arg0 = globals._pollEventQueue___189222;
-    s.tmp_1.arg1 = s.i___193179;
-    s.tmp_1.arg2 = 1;
-    s.callLocIdx = 33; s.pc = 14; return s.tmp_1;
-  case 14:
-    r0 = s.retval;
-    r0 = (s.i___193179 - 1);
-    s.i___193179 = (r0);
-  case 7:
-  case 8:
-  case 9:
-  case 10:
-    r0 = (s.i___193179 + 1);
-    s.i___193179 = (r0);
-    { step = 2; continue; }
-  case 11:
-    s.tmp_0 = pause__P185619_mk(s);
-    s.tmp_0.arg0 = 50;
-    s.callLocIdx = 34; s.pc = 15; return s.tmp_0;
-  case 15:
-    r0 = s.retval;
+    r0 = pxsim_Array_.setAt(s.tmp_0, s.parentIndex___19245, s.curr___19240);
+    s.i___19232 = (s.parentIndex___19245);
     { step = 1; continue; }
-  case 12:
-    globals._pollEventQueue___189222 = (undefined);
+  case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_pollEvents__P189223.info = {"start":618,"length":638,"line":20,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/poll.ts","functionName":"pollEvents","argumentNames":[]}
+Heap_percolateUp__P6075.info = {"start":1018,"length":432,"line":38,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"percolateUp","argumentNames":["this"]}
 
-function control_pollEvents__P189223_mk(s) {
+function Heap_percolateUp__P6075_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_pollEvents__P189223, depth: s.depth + 1,
+        parent: s, fn: Heap_percolateUp__P6075, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  tmp_6: undefined,
-  tmp_7: undefined,
-  tmp_8: undefined,
-  tmp_9: undefined,
-  tmp_10: undefined,
-  now___193176: undefined,
-  i___193179: undefined,
-  ev___193185: undefined,
+  i___19232: undefined,
+  curr___19240: undefined,
+  parentIndex___19245: undefined,
+  parent___19249: undefined,
+  arg0: undefined,
 } }
 
 
 
 
 
-function helpers_arraySplice__P185315(s) {
+function Heap_parent__P6076(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9648,55 +9795,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___193233 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg1 < 0);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    { step = 5; continue; }
-  case 1:
-  case 2:
-    s.i___193233 = (0);
-  case 3:
-    r0 = (s.i___193233 < s.arg2);
+    r0 = s.arg0;
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = (s.arg1 - 1);
     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___193233 + 1);
-    s.i___193233 = (r0);
-    { step = 3; continue; }
-  case 4:
-  case 5:
-    r0 = undefined;
+    r0 = (s.tmp_0 >> 1);
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySplice__P185315.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"]}
+Heap_parent__P6076.info = {"start":2292,"length":64,"line":102,"column":4,"endLine":104,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"parent","argumentNames":["this","i"]}
 
-function helpers_arraySplice__P185315_mk(s) {
+function Heap_parent__P6076_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySplice__P185315, depth: s.depth + 1,
+        parent: s, fn: Heap_parent__P6076, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  i___193233: undefined,
   arg0: undefined,
   arg1: undefined,
-  arg2: undefined,
 } }
 
 
 
 
 
-function control_PollEvent_constructor__P189220(s) {
+function Heap_constructor__P3647(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9709,46 +9837,37 @@ switch (step) {
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
-      s.arg4 = (s.lambdaArgs[4]);
-      s.arg5 = (s.lambdaArgs[5]);
-      s.arg6 = (s.lambdaArgs[6]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_PollEvent__C189219_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["eid"] = (s.arg1);
-    r0 = (s.arg0).fields["vid"] = (s.arg2);
-    r0 = (s.arg0).fields["start"] = (s.arg3);
-    r0 = (s.arg0).fields["timeOut"] = (s.arg4);
-    r0 = (s.arg0).fields["condition"] = (s.arg5);
-    r0 = (s.arg0).fields["once"] = (s.arg6);
+    if (!checkSubtype(r0, Heap__C3646_VT)) failedCast(r0);
+    r0 = (s.arg0).fields["comparator"] = (s.arg1);
+    s.tmp_0 = r0 = s.arg0;
+    r0 = pxsim_Array__mk();
+    s.tmp_1 = r0;
+    r0 = (s.tmp_0).fields["store"] = (s.tmp_1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_PollEvent_constructor__P189220.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"]}
+Heap_constructor__P3647.info = {"start":257,"length":104,"line":7,"column":4,"endLine":11,"endColumn":5,"fileName":"pxt_modules/pxt-heap/heap.ts","functionName":"inline","argumentNames":["this","comparator"]}
 
-function control_PollEvent_constructor__P189220_mk(s) {
+function Heap_constructor__P3647_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_PollEvent_constructor__P189220, depth: s.depth + 1,
+        parent: s, fn: Heap_constructor__P3647, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
   arg0: undefined,
   arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
-  arg4: undefined,
-  arg5: undefined,
-  arg6: undefined,
 } }
 
 
 
 
 
-function control_onEvent__P185597(s) {
+function helpers_arrayUnshift__P102(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9758,63 +9877,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___193092 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = control_eventContext__P185614_mk(s);
-    s.callLocIdx = 47; s.pc = 3; return s.tmp_0;
-  case 3:
-    r0 = s.retval;
-    s.ctx___193092 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___193092);
-    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.control.internalOnEvent(s.arg0, s.arg1, s.arg2, s.arg3);
-    { step = 2; continue; }
-  case 1:
-    s.tmp_0 = control_EventContext_registerHandler__P185611_mk(s);
-    s.tmp_0.arg0 = s.ctx___193092;
-    s.tmp_0.arg1 = s.arg0;
-    s.tmp_0.arg2 = s.arg1;
-    s.tmp_0.arg3 = s.arg2;
-    s.tmp_0.arg4 = s.arg3;
-    s.callLocIdx = 48; s.pc = 4; return s.tmp_0;
-  case 4:
-    r0 = s.retval;
-  case 2:
-    r0 = undefined;
+    r0 = pxsim_Array_.insertAt(s.arg0, 0, s.arg1);
+    r0 = pxsim_Array__length(s.arg0);
     return leave(s, r0)
   default: oops()
 } } }
-control_onEvent__P185597.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"]}
+helpers_arrayUnshift__P102.info = {"start":4898,"length":126,"line":180,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayUnshift","argumentNames":["arr","value"]}
 
-function control_onEvent__P185597_mk(s) {
+function helpers_arrayUnshift__P102_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_onEvent__P185597, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayUnshift__P102, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  ctx___193092: undefined,
   arg0: undefined,
   arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
 } }
 
 
 
 
 
-function control_eventContext__P185614(s) {
+function tiles_Location_y__P2294(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9824,42 +9912,50 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___189248);
-    if (!r0) { step = 1; continue; }
-    s.tmp_0 = r0 = globals.eventContexts___189248;
-    r0 = pxsim_Array__length(globals.eventContexts___189248);
-    s.tmp_2 = r0;
-    r0 = (s.tmp_2 - 1);
+    s.scale___19702 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    r0 = s.arg0.fields["tileMap"];
+    s.tmp_0 = r0;
+    r0 = s.tmp_0.fields["_scale"];
+    s.scale___19702 = (r0);
+    r0 = s.arg0.fields["_row"];
     s.tmp_1 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    { step = 2; continue; }
-  case 1:
-    r0 = undefined;
-  case 2:
-    // jmp value (already in r0)
+    r0 = (s.tmp_1 << s.scale___19702);
+    s.tmp_0 = r0;
+    r0 = (s.scale___19702 - 1);
     s.tmp_3 = r0;
-    r0 = s.tmp_3;
-    return leave(s, r0)
+    r0 = (1 << s.tmp_3);
+    s.tmp_2 = r0;
+    r0 = (s.tmp_0 + s.tmp_2);
+    return leaveAccessor(s, r0)
   default: oops()
 } } }
-control_eventContext__P185614.info = {"start":6907,"length":136,"line":209,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"eventContext","argumentNames":[]}
+tiles_Location_y__P2294.info = {"start":836,"length":135,"line":38,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"y","argumentNames":["this"]}
+tiles_Location_y__P2294.isGetter = true;
 
-function control_eventContext__P185614_mk(s) {
+function tiles_Location_y__P2294_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_eventContext__P185614, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_y__P2294, 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___19702: undefined,
+  arg0: undefined,
 } }
 
 
 
 
 
-function control_EventContext_registerHandler__P185611(s) {
+function tiles_Location_x__P2293(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9869,113 +9965,50 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___193115 = undefined;
-    s.unnamed8902___U1 = undefined;
-    s.unnamed8903___U2 = undefined;
-    s.hn___193138 = undefined;
+    s.scale___19720 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
-      s.arg1 = (s.lambdaArgs[1]);
-      s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
-      s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
-    s.h___193115 = (undefined);
-    r0 = s.arg0.fields["handlers"];
-    s.unnamed8902___U1 = (r0);
-    s.unnamed8903___U2 = (0);
-  case 1:
-    s.tmp_0 = r0 = s.unnamed8903___U2;
-    r0 = pxsim_Array__length(s.unnamed8902___U1);
+    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    r0 = s.arg0.fields["tileMap"];
+    s.tmp_0 = r0;
+    r0 = s.tmp_0.fields["_scale"];
+    s.scale___19720 = (r0);
+    r0 = s.arg0.fields["_col"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_0 < s.tmp_1);
-    if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8902___U1, s.unnamed8903___U2);
-    s.h___193115 = (r0);
-    r0 = s.h___193115.fields["src"];
+    r0 = (s.tmp_1 << s.scale___19720);
+    s.tmp_0 = r0;
+    r0 = (s.scale___19720 - 1);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 == s.arg1);
+    r0 = (1 << s.tmp_3);
     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.h___193115.fields["value"];
-    s.tmp_4 = r0;
-    r0 = (s.tmp_4 == s.arg2);
-  case 3:
-    // jmp value (already in r0)
-    s.tmp_5 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_5);
-    if (!r0) { step = 4; continue; }
-    r0 = (s.h___193115).fields["flags"] = (s.arg4);
-    r0 = (s.h___193115).fields["handler"] = (s.arg3);
-    { step = 7; continue; }
-  case 4:
-  case 5:
-    r0 = (s.unnamed8903___U2 + 1);
-    s.unnamed8903___U2 = (r0);
-    { step = 1; continue; }
-  case 6:
-    s.unnamed8902___U1 = (undefined);
-    r0 = pxsim_pxtcore_mkClassInstance(control_EventHandler__C189240_VT);
-    s.tmp_0 = r0;
-    s.tmp_1 = control_EventHandler_constructor__P189243_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.arg3;
-    s.tmp_1.arg4 = s.arg4;
-    s.callLocIdx = 60; s.pc = 8; return s.tmp_1;
-  case 8:
-    r0 = s.retval;
-    s.hn___193138 = (s.tmp_0);
-    r0 = s.arg0.fields["handlers"];
-    s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.hn___193138);
-    s.tmp_0 = control_EventHandler_register__P189241_mk(s);
-    s.tmp_0.arg0 = s.hn___193138;
-    s.callLocIdx = 61; s.pc = 9; return s.tmp_0;
-  case 9:
-    r0 = s.retval;
-  case 7:
-    r0 = undefined;
-    return leave(s, r0)
+    r0 = (s.tmp_0 + s.tmp_2);
+    return leaveAccessor(s, r0)
   default: oops()
 } } }
-control_EventContext_registerHandler__P185611.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"]}
+tiles_Location_x__P2293.info = {"start":691,"length":135,"line":33,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"x","argumentNames":["this"]}
+tiles_Location_x__P2293.isGetter = true;
 
-function control_EventContext_registerHandler__P185611_mk(s) {
+function tiles_Location_x__P2293_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_registerHandler__P185611, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_x__P2293, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tmp_4: undefined,
-  tmp_5: undefined,
-  h___193115: undefined,
-  unnamed8902___U1: undefined,
-  unnamed8903___U2: undefined,
-  hn___193138: undefined,
+  scale___19720: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
-  arg4: undefined,
 } }
 
 
 
 
 
-function control_EventHandler_constructor__P189243(s) {
+function sprites_setDataBoolean__P3624(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -9985,43 +10018,79 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
+    s.d___20796 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
-      s.arg3 = (s.lambdaArgs[3]);
-      s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C189240_VT)) failedCast(r0);
-    r0 = (s.arg0).fields["src"] = (s.arg1);
-    r0 = (s.arg0).fields["value"] = (s.arg2);
-    r0 = (s.arg0).fields["handler"] = (s.arg3);
-    r0 = (s.arg0).fields["flags"] = (s.arg4);
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = s.tmp_0;
+    { step = 2; continue; }
+  case 1:
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+  case 2:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    { step = 5; continue; }
+  case 3:
+  case 4:
+    s.tmp_4 = Sprite_data__P2041_mk(s);
+    s.tmp_4.arg0 = s.arg0;
+    s.callLocIdx = 1775; s.pc = 6; return s.tmp_4;
+  case 6:
+    r0 = s.retval;
+    s.d___20796 = (r0);
+    s.tmp_0 = r0 = s.d___20796;
+    s.tmp_1 = r0 = s.arg1;
+    r0 = pxsim_numops_toBoolDecr(s.arg2);
+    s.tmp_5 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_5);
+    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_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_1, s.tmp_2);
+  case 5:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_constructor__P189243.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"]}
+sprites_setDataBoolean__P3624.info = {"start":2275,"length":180,"line":73,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataBoolean","argumentNames":["sprite","name","value"]}
 
-function control_EventHandler_constructor__P189243_mk(s) {
+function sprites_setDataBoolean__P3624_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_constructor__P189243, depth: s.depth + 1,
+        parent: s, fn: sprites_setDataBoolean__P3624, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  d___20796: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
-  arg3: undefined,
-  arg4: undefined,
 } }
 
 
 
 
 
-function control_EventHandler_register__P189241(s) {
+function Sprite_data__P2041(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10036,32 +10105,38 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C189240_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P193159);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = s.arg0.fields["src"];
-    s.tmp_1 = r0;
-    r0 = s.arg0.fields["value"];
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    r0 = s.arg0.fields["_data"];
     s.tmp_2 = r0;
-    r0 = s.arg0.fields["flags"];
-    s.tmp_3 = r0;
-    r0 = pxsim.control.internalOnEvent(s.tmp_1, s.tmp_2, s.tmp_0, s.tmp_3);
-    r0 = undefined;
-    return leave(s, r0)
+    r0 = pxsim_numops_toBoolDecr(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    s.tmp_3 = r0 = s.arg0;
+    r0 = pxsim_pxtrt.mkMap();
+    s.tmp_4 = r0;
+    r0 = (s.tmp_3).fields["_data"] = (s.tmp_4);
+  case 1:
+  case 2:
+    r0 = s.arg0.fields["_data"];
+    return leaveAccessor(s, r0)
   default: oops()
 } } }
-control_EventHandler_register__P189241.info = {"start":961,"length":165,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"register","argumentNames":["this"]}
+Sprite_data__P2041.info = {"start":4194,"length":92,"line":160,"column":4,"endLine":163,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this"]}
+Sprite_data__P2041.isGetter = true;
 
-function control_EventHandler_register__P189241_mk(s) {
+function Sprite_data__P2041_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_register__P189241, depth: s.depth + 1,
+        parent: s, fn: Sprite_data__P2041, 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,
   arg0: undefined,
 } }
 
@@ -10069,7 +10144,7 @@ function control_EventHandler_register__P189241_mk(s) {
 
 
 
-function inline__P193159(s) {
+function spriteutils_angleFrom__P3633(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10079,45 +10154,95 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = s.caps[0].fields["handler"];
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.arg1 = (s.lambdaArgs[1]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = if_handler_1_mk(s);
-    s.tmp_1.arg0 = s.caps[0];
-    if (!s.tmp_1.arg0.vtable.iface) {
-      setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "handler"), 1);
-      s.callLocIdx = 49; s.pc = 3; return s.tmp_1;
-    } else {
-      s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["handler"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["handler"], 1); s.callLocIdx = 49; s.pc = 3; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 49; s.pc = 3; return s.tmp_1;; }
-     else { s.callLocIdx = 49; s.pc = 3; return s.tmp_1; }
-    }
-  case 3:
-    r0 = s.retval;
+    r0 = s.tmp_0;
+    { step = 2; continue; }
   case 1:
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
   case 2:
-    r0 = undefined;
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    r0 = 0;
+    { step = 5; continue; }
+  case 3:
+  case 4:
+    s.tmp_6 = Sprite_y__P2027_mk(s);
+    s.tmp_6.arg0 = s.arg1;
+    s.callLocIdx = 1781; s.pc = 6; return s.tmp_6;
+  case 6:
+    r0 = s.retval;
+    s.tmp_5 = r0;
+    s.tmp_8 = Sprite_y__P2027_mk(s);
+    s.tmp_8.arg0 = s.arg0;
+    s.callLocIdx = 1782; s.pc = 7; return s.tmp_8;
+  case 7:
+    r0 = s.retval;
+    s.tmp_7 = r0;
+    r0 = (s.tmp_5 - s.tmp_7);
+    s.tmp_4 = r0;
+    s.tmp_11 = Sprite_x__P2025_mk(s);
+    s.tmp_11.arg0 = s.arg1;
+    s.callLocIdx = 1783; s.pc = 8; return s.tmp_11;
+  case 8:
+    r0 = s.retval;
+    s.tmp_10 = r0;
+    s.tmp_13 = Sprite_x__P2025_mk(s);
+    s.tmp_13.arg0 = s.arg0;
+    s.callLocIdx = 1784; s.pc = 9; return s.tmp_13;
+  case 9:
+    r0 = s.retval;
+    s.tmp_12 = r0;
+    r0 = (s.tmp_10 - s.tmp_12);
+    s.tmp_9 = r0;
+    r0 = pxsim.Math_.atan2(s.tmp_4, s.tmp_9);
+  case 5:
     return leave(s, r0)
   default: oops()
 } } }
-inline__P193159.info = {"start":1032,"length":71,"line":31,"column":58,"endLine":33,"endColumn":13,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"inline","argumentNames":[]}
+spriteutils_angleFrom__P3633.info = {"start":1673,"length":178,"line":54,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"angleFrom","argumentNames":["a","b"]}
 
-function inline__P193159_mk(s) {
+function spriteutils_angleFrom__P3633_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P193159, depth: s.depth + 1,
+        parent: s, fn: spriteutils_angleFrom__P3633, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  tmp_8: undefined,
+  tmp_9: undefined,
+  tmp_10: undefined,
+  tmp_11: undefined,
+  tmp_12: undefined,
+  tmp_13: undefined,
+  arg0: undefined,
+  arg1: undefined,
 } }
 
 
 
 
 
-function Math_clamp__P185339(s) {
+function spriteutils_setVelocityAtAngle__P3635(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10133,30 +10258,45 @@ switch (step) {
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_min__P185343_mk(s);
-    s.tmp_0.arg0 = s.arg1;
-    s.tmp_1 = Math_max__P185342_mk(s);
-    s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.arg2;
-    s.callLocIdx = 16; s.pc = 2; return s.tmp_1;
-  case 2:
-    r0 = s.retval;
-    s.tmp_0.arg1 = r0;
-    s.callLocIdx = 17; s.pc = 1; return s.tmp_0;
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    { step = 3; continue; }
   case 1:
+  case 2:
+    s.tmp_2 = Sprite_setVelocity__P2073_mk(s);
+    s.tmp_2.arg0 = s.arg0;
+    r0 = pxsim.Math_.cos(s.arg1);
+    s.tmp_3 = r0;
+    r0 = (s.tmp_3 * s.arg2);
+    s.tmp_2.arg1 = r0;
+    r0 = pxsim.Math_.sin(s.arg1);
+    s.tmp_4 = r0;
+    r0 = (s.tmp_4 * s.arg2);
+    s.tmp_2.arg2 = r0;
+    s.callLocIdx = 1785; s.pc = 4; return s.tmp_2;
+  case 4:
     r0 = s.retval;
+  case 3:
+    r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Math_clamp__P185339.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"]}
+spriteutils_setVelocityAtAngle__P3635.info = {"start":3148,"length":270,"line":95,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"setVelocityAtAngle","argumentNames":["target","angleInRadians","speed"]}
 
-function Math_clamp__P185339_mk(s) {
+function spriteutils_setVelocityAtAngle__P3635_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_clamp__P185339, depth: s.depth + 1,
+        parent: s, fn: spriteutils_setVelocityAtAngle__P3635, 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,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -10166,7 +10306,7 @@ function Math_clamp__P185339_mk(s) {
 
 
 
-function Math_min__P185343(s) {
+function Sprite_setVelocity__P2073(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10179,110 +10319,45 @@ switch (step) {
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
+      s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg0 <= s.arg1);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
     r0 = s.arg0;
-    { step = 3; continue; }
-  case 1:
-  case 2:
-    r0 = s.arg1;
-  case 3:
-    return leave(s, r0)
-  default: oops()
-} } }
-Math_min__P185343.info = {"start":15790,"length":105,"line":538,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"min","argumentNames":["a","b"]}
-
-function Math_min__P185343_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: Math_min__P185343, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function helpers_arrayFind__P185326(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.len___192745 = undefined;
-    s.i___192748 = undefined;
-    s.v___192753 = 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___192745 = (r0);
-    s.i___192748 = (0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_vx__P2030_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = s.arg1;
+    s.callLocIdx = 346; s.pc = 1; return s.tmp_0;
   case 1:
-    r0 = (s.i___192748 < s.len___192745);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.arg0, s.i___192748);
-    s.v___192753 = (r0);
-    s.tmp_1 = lambda_3_mk(s);
-    s.tmp_1.argL = s.arg1;
-    s.tmp_1.arg0 = s.v___192753;
-    s.tmp_1.arg1 = s.i___192748;
-    setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 8; s.pc = 6; return s.tmp_1;
-  case 6:
     r0 = s.retval;
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 2; continue; }
-    r0 = s.v___192753;
-    { step = 5; continue; }
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.tmp_0.arg1 = s.arg2;
+    s.callLocIdx = 347; s.pc = 2; return s.tmp_0;
   case 2:
-  case 3:
-    r0 = (s.i___192748 + 1);
-    s.i___192748 = (r0);
-    { step = 1; continue; }
-  case 4:
+    r0 = s.retval;
     r0 = undefined;
-  case 5:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayFind__P185326.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"]}
+Sprite_setVelocity__P2073.info = {"start":12526,"length":93,"line":450,"column":4,"endLine":453,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setVelocity","argumentNames":["this","vx","vy"]}
 
-function helpers_arrayFind__P185326_mk(s) {
+function Sprite_setVelocity__P2073_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayFind__P185326, depth: s.depth + 1,
+        parent: s, fn: Sprite_setVelocity__P2073, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  tmp_1: undefined,
-  len___192745: undefined,
-  i___192748: undefined,
-  v___192753: undefined,
   arg0: undefined,
   arg1: undefined,
+  arg2: undefined,
 } }
 
 
 
 
 
-function helpers_arrayFilter__P185325(s) {
+function sprites_readDataBoolean__P3625(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10292,123 +10367,65 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___192766 = undefined;
-    s.len___192768 = undefined;
-    s.i___192771 = undefined;
-    s.v___192776 = undefined;
+    s.d___7421 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array__mk();
-    s.res___192766 = (r0);
-    r0 = pxsim_Array__length(s.arg0);
-    s.len___192768 = (r0);
-    s.i___192771 = (0);
-  case 1:
-    r0 = (s.i___192771 < s.len___192768);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.arg0, s.i___192771);
-    s.v___192776 = (r0);
-    s.tmp_1 = lambda_3_mk(s);
-    s.tmp_1.argL = s.arg1;
-    s.tmp_1.arg0 = s.v___192776;
-    s.tmp_1.arg1 = s.i___192771;
-    setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 7; s.pc = 5; return s.tmp_1;
-  case 5:
-    r0 = s.retval;
+    r0 = pxsim_numops_toBoolDecr(s.arg0);
+    s.tmp_1 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__push(s.res___192766, s.v___192776);
+    r0 = pxsim_numops_toBool(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = s.tmp_0;
+    { step = 2; continue; }
+  case 1:
+    r0 = pxsim_numops_toBoolDecr(s.arg1);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
   case 2:
+    // jmp value (already in r0)
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    if (!r0) { step = 3; continue; }
+    r0 = false;
+    { step = 5; continue; }
   case 3:
-    r0 = (s.i___192771 + 1);
-    s.i___192771 = (r0);
-    { step = 1; continue; }
   case 4:
-    r0 = s.res___192766;
-    return leave(s, r0)
-  default: oops()
-} } }
-helpers_arrayFilter__P185325.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__P185325_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: helpers_arrayFilter__P185325, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  res___192766: undefined,
-  len___192768: undefined,
-  i___192771: undefined,
-  v___192776: undefined,
-  arg0: undefined,
-  arg1: undefined,
-} }
-
-
-
-
-
-function helpers_arrayForEach__P185324(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.len___192814 = undefined;
-    s.i___192817 = 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___192814 = (r0);
-    s.i___192817 = (0);
-  case 1:
-    r0 = (s.i___192817 < s.len___192814);
-    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___192817);
-    s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.i___192817;
-    setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 6; s.pc = 3; return s.tmp_1;
-  case 3:
+    s.tmp_4 = Sprite_data__P2041_mk(s);
+    s.tmp_4.arg0 = s.arg0;
+    s.callLocIdx = 1776; s.pc = 6; return s.tmp_4;
+  case 6:
     r0 = s.retval;
-    r0 = (s.i___192817 + 1);
-    s.i___192817 = (r0);
-    { step = 1; continue; }
-  case 2:
-    r0 = undefined;
+    s.d___7421 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.d___7421, s.arg1);
+    s.tmp_3 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_3);
+    s.tmp_2 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_2);
+    s.tmp_1 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_1);
+    s.tmp_0 = r0;
+    r0 = pxsim_Boolean__bang(s.tmp_0);
+  case 5:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayForEach__P185324.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"]}
+sprites_readDataBoolean__P3625.info = {"start":2670,"length":179,"line":86,"column":4,"endLine":90,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataBoolean","argumentNames":["sprite","name"]}
 
-function helpers_arrayForEach__P185324_mk(s) {
+function sprites_readDataBoolean__P3625_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayForEach__P185324, depth: s.depth + 1,
+        parent: s, fn: sprites_readDataBoolean__P3625, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___192814: undefined,
-  i___192817: undefined,
+  tmp_2: undefined,
+  tmp_3: undefined,
+  tmp_4: undefined,
+  d___7421: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -10417,41 +10434,7 @@ function helpers_arrayForEach__P185324_mk(s) {
 
 
 
-function Sprite_kind__P187287(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    r0 = s.arg0.fields["_kind"];
-    return leave(s, r0)
-  default: oops()
-} } }
-Sprite_kind__P187287.info = {"start":10604,"length":41,"line":387,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"kind","argumentNames":["this"]}
-
-function Sprite_kind__P187287_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: Sprite_kind__P187287, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function spriteutils_distanceBetween__P188849(s) {
+function spriteutils_distanceBetween__P3632(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10487,15 +10470,15 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = Sprite_x__P187242_mk(s);
+    s.tmp_8 = Sprite_x__P2025_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1770; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 1777; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     s.tmp_7 = r0;
-    s.tmp_10 = Sprite_x__P187242_mk(s);
+    s.tmp_10 = Sprite_x__P2025_mk(s);
     s.tmp_10.arg0 = s.arg1;
-    s.callLocIdx = 1771; s.pc = 7; return s.tmp_10;
+    s.callLocIdx = 1778; s.pc = 7; return s.tmp_10;
   case 7:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -10503,15 +10486,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim.Math_.pow(s.tmp_6, 2);
     s.tmp_5 = r0;
-    s.tmp_14 = Sprite_y__P187244_mk(s);
+    s.tmp_14 = Sprite_y__P2027_mk(s);
     s.tmp_14.arg0 = s.arg0;
-    s.callLocIdx = 1772; s.pc = 8; return s.tmp_14;
+    s.callLocIdx = 1779; s.pc = 8; return s.tmp_14;
   case 8:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_16 = Sprite_y__P187244_mk(s);
+    s.tmp_16 = Sprite_y__P2027_mk(s);
     s.tmp_16.arg0 = s.arg1;
-    s.callLocIdx = 1773; s.pc = 9; return s.tmp_16;
+    s.callLocIdx = 1780; s.pc = 9; return s.tmp_16;
   case 9:
     r0 = s.retval;
     s.tmp_15 = r0;
@@ -10526,12 +10509,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_distanceBetween__P188849.info = {"start":1088,"length":168,"line":36,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"distanceBetween","argumentNames":["a","b"]}
+spriteutils_distanceBetween__P3632.info = {"start":1088,"length":168,"line":36,"column":4,"endLine":39,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"distanceBetween","argumentNames":["a","b"]}
 
-function spriteutils_distanceBetween__P188849_mk(s) {
+function spriteutils_distanceBetween__P3632_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_distanceBetween__P188849, depth: s.depth + 1,
+        parent: s, fn: spriteutils_distanceBetween__P3632, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10558,7 +10541,7 @@ function spriteutils_distanceBetween__P188849_mk(s) {
 
 
 
-function update_minimap__P427144(s) {
+function update_minimap__P89075(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10568,148 +10551,148 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sprite___427151 = undefined;
-    s.unnamed20880___U1 = undefined;
-    s.unnamed20881___U2 = undefined;
-    s.sprite___427160 = undefined;
-    s.unnamed20882___U4 = undefined;
-    s.unnamed20883___U5 = undefined;
-    s.sprite___427169 = undefined;
-    s.unnamed20884___U7 = undefined;
-    s.unnamed20885___U8 = undefined;
-    s.tmp_0 = minimap_minimap__P188832_mk(s);
+    s.sprite___89082 = undefined;
+    s.unnamed3904___U1 = undefined;
+    s.unnamed3905___U2 = undefined;
+    s.sprite___89091 = undefined;
+    s.unnamed3906___U4 = undefined;
+    s.unnamed3907___U5 = undefined;
+    s.sprite___89100 = undefined;
+    s.unnamed3908___U7 = undefined;
+    s.unnamed3909___U8 = undefined;
+    s.tmp_0 = minimap_minimap__P3615_mk(s);
     s.tmp_0.arg0 = 3;
     s.tmp_0.arg1 = 2;
     s.tmp_0.arg2 = 11;
-    s.callLocIdx = 175; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 173; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    globals.map___427146 = (r0);
-    s.sprite___427151 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.NPC___426659;
-    s.callLocIdx = 176; s.pc = 8; return s.tmp_0;
+    globals.map___89077 = (r0);
+    s.sprite___89082 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.NPC___88584;
+    s.callLocIdx = 174; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.unnamed20880___U1 = (r0);
-    s.unnamed20881___U2 = (0);
+    s.unnamed3904___U1 = (r0);
+    s.unnamed3905___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed20881___U2;
-    r0 = pxsim_Array__length(s.unnamed20880___U1);
+    s.tmp_0 = r0 = s.unnamed3905___U2;
+    r0 = pxsim_Array__length(s.unnamed3904___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20880___U1, s.unnamed20881___U2);
-    s.sprite___427151 = (r0);
-    s.tmp_2 = minimap_includeSprite__P188834_mk(s);
-    s.tmp_2.arg0 = globals.map___427146;
-    s.tmp_2.arg1 = s.sprite___427151;
+    r0 = pxsim_Array__getAt(s.unnamed3904___U1, s.unnamed3905___U2);
+    s.sprite___89082 = (r0);
+    s.tmp_2 = minimap_includeSprite__P3617_mk(s);
+    s.tmp_2.arg0 = globals.map___89077;
+    s.tmp_2.arg1 = s.sprite___89082;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 177; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 175; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
-    r0 = (s.unnamed20881___U2 + 1);
-    s.unnamed20881___U2 = (r0);
+    r0 = (s.unnamed3905___U2 + 1);
+    s.unnamed3905___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed20880___U1 = (undefined);
-    s.sprite___427160 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.SurvivedNPC___426668;
-    s.callLocIdx = 178; s.pc = 10; return s.tmp_0;
+    s.unnamed3904___U1 = (undefined);
+    s.sprite___89091 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.SurvivedNPC___88593;
+    s.callLocIdx = 176; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.unnamed20882___U4 = (r0);
-    s.unnamed20883___U5 = (0);
+    s.unnamed3906___U4 = (r0);
+    s.unnamed3907___U5 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed20883___U5;
-    r0 = pxsim_Array__length(s.unnamed20882___U4);
+    s.tmp_0 = r0 = s.unnamed3907___U5;
+    r0 = pxsim_Array__length(s.unnamed3906___U4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20882___U4, s.unnamed20883___U5);
-    s.sprite___427160 = (r0);
-    s.tmp_2 = minimap_includeSprite__P188834_mk(s);
-    s.tmp_2.arg0 = globals.map___427146;
-    s.tmp_2.arg1 = s.sprite___427160;
+    r0 = pxsim_Array__getAt(s.unnamed3906___U4, s.unnamed3907___U5);
+    s.sprite___89091 = (r0);
+    s.tmp_2 = minimap_includeSprite__P3617_mk(s);
+    s.tmp_2.arg0 = globals.map___89077;
+    s.tmp_2.arg1 = s.sprite___89091;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 179; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 177; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
-    r0 = (s.unnamed20883___U5 + 1);
-    s.unnamed20883___U5 = (r0);
+    r0 = (s.unnamed3907___U5 + 1);
+    s.unnamed3907___U5 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed20882___U4 = (undefined);
-    s.sprite___427169 = (undefined);
-    s.tmp_0 = sprites_allOfKind__P187192_mk(s);
-    s.tmp_0.arg0 = globals.Enemy___187348;
-    s.callLocIdx = 180; s.pc = 12; return s.tmp_0;
+    s.unnamed3906___U4 = (undefined);
+    s.sprite___89100 = (undefined);
+    s.tmp_0 = sprites_allOfKind__P1975_mk(s);
+    s.tmp_0.arg0 = globals.Enemy___2131;
+    s.callLocIdx = 178; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.unnamed20884___U7 = (r0);
-    s.unnamed20885___U8 = (0);
+    s.unnamed3908___U7 = (r0);
+    s.unnamed3909___U8 = (0);
   case 5:
-    s.tmp_0 = r0 = s.unnamed20885___U8;
-    r0 = pxsim_Array__length(s.unnamed20884___U7);
+    s.tmp_0 = r0 = s.unnamed3909___U8;
+    r0 = pxsim_Array__length(s.unnamed3908___U7);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20884___U7, s.unnamed20885___U8);
-    s.sprite___427169 = (r0);
-    s.tmp_2 = minimap_includeSprite__P188834_mk(s);
-    s.tmp_2.arg0 = globals.map___427146;
-    s.tmp_2.arg1 = s.sprite___427169;
+    r0 = pxsim_Array__getAt(s.unnamed3908___U7, s.unnamed3909___U8);
+    s.sprite___89100 = (r0);
+    s.tmp_2 = minimap_includeSprite__P3617_mk(s);
+    s.tmp_2.arg0 = globals.map___89077;
+    s.tmp_2.arg1 = s.sprite___89100;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 181; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 179; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
-    r0 = (s.unnamed20885___U8 + 1);
-    s.unnamed20885___U8 = (r0);
+    r0 = (s.unnamed3909___U8 + 1);
+    s.unnamed3909___U8 = (r0);
     { step = 5; continue; }
   case 6:
-    s.unnamed20884___U7 = (undefined);
-    s.tmp_0 = minimap_includeSprite__P188834_mk(s);
-    s.tmp_0.arg0 = globals.map___427146;
-    s.tmp_0.arg1 = globals.sprite_player_fish___427125;
+    s.unnamed3908___U7 = (undefined);
+    s.tmp_0 = minimap_includeSprite__P3617_mk(s);
+    s.tmp_0.arg0 = globals.map___89077;
+    s.tmp_0.arg1 = globals.sprite_player_fish___89056;
     s.tmp_0.arg2 = 0;
-    s.callLocIdx = 182; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 180; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = minimap_getImage__P188833_mk(s);
-    s.tmp_0.arg0 = globals.map___427146;
-    s.callLocIdx = 183; s.pc = 15; return s.tmp_0;
+    s.tmp_0 = minimap_getImage__P3616_mk(s);
+    s.tmp_0.arg0 = globals.map___89077;
+    s.callLocIdx = 181; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-update_minimap__P427144.info = {"start":16274,"length":637,"line":303,"column":0,"endLine":316,"endColumn":1,"fileName":"main.ts","functionName":"update_minimap","argumentNames":[]}
+update_minimap__P89075.info = {"start":18847,"length":637,"line":366,"column":0,"endLine":379,"endColumn":1,"fileName":"main.ts","functionName":"update_minimap","argumentNames":[]}
 
-function update_minimap__P427144_mk(s) {
+function update_minimap__P89075_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: update_minimap__P427144, depth: s.depth + 1,
+        parent: s, fn: update_minimap__P89075, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  sprite___427151: undefined,
-  unnamed20880___U1: undefined,
-  unnamed20881___U2: undefined,
-  sprite___427160: undefined,
-  unnamed20882___U4: undefined,
-  unnamed20883___U5: undefined,
-  sprite___427169: undefined,
-  unnamed20884___U7: undefined,
-  unnamed20885___U8: undefined,
+  sprite___89082: undefined,
+  unnamed3904___U1: undefined,
+  unnamed3905___U2: undefined,
+  sprite___89091: undefined,
+  unnamed3906___U4: undefined,
+  unnamed3907___U5: undefined,
+  sprite___89100: undefined,
+  unnamed3908___U7: undefined,
+  unnamed3909___U8: undefined,
 } }
 
 
 
 
 
-function minimap_getImage__P188833(s) {
+function minimap_getImage__P3616(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10731,19 +10714,19 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["image"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["image"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 1751; s.pc = 1; return s.tmp_0; }
+     else { s.callLocIdx = 1758; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-minimap_getImage__P188833.info = {"start":2905,"length":86,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"getImage","argumentNames":["minimap"]}
+minimap_getImage__P3616.info = {"start":2905,"length":86,"line":92,"column":4,"endLine":94,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"getImage","argumentNames":["minimap"]}
 
-function minimap_getImage__P188833_mk(s) {
+function minimap_getImage__P3616_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_getImage__P188833, depth: s.depth + 1,
+        parent: s, fn: minimap_getImage__P3616, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -10753,7 +10736,7 @@ function minimap_getImage__P188833_mk(s) {
 
 
 
-function minimap_includeSprite__P188834(s) {
+function minimap_includeSprite__P3617(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10763,16 +10746,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scale___200466 = undefined;
-    s.x___200473 = undefined;
-    s.y___200490 = undefined;
+    s.scale___14479 = undefined;
+    s.x___14486 = undefined;
+    s.y___14503 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_max__P185342_mk(s);
+    s.tmp_0 = Math_max__P125_mk(s);
     s.tmp_2 = if_scale_1_mk(s);
     s.tmp_2.arg0 = s.arg0;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -10781,7 +10764,7 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["scale"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["scale"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1752; s.pc = 2; return s.tmp_2; }
+     else { s.callLocIdx = 1759; s.pc = 2; return s.tmp_2; }
     }
   case 2:
     r0 = s.retval;
@@ -10789,13 +10772,13 @@ switch (step) {
     r0 = (s.tmp_1 - s.arg2);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1753; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1760; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scale___200466 = (r0);
-    s.tmp_3 = Sprite_x__P187242_mk(s);
+    s.scale___14479 = (r0);
+    s.tmp_3 = Sprite_x__P2025_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 1754; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1761; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -10807,7 +10790,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["scale"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["scale"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1755; s.pc = 4; return s.tmp_5; }
+     else { s.callLocIdx = 1762; s.pc = 4; return s.tmp_5; }
     }
   case 4:
     r0 = s.retval;
@@ -10820,7 +10803,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 / 2);
     s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> s.scale___200466);
+    r0 = (s.tmp_7 >> s.scale___14479);
     s.tmp_6 = r0;
     r0 = (s.tmp_1 - s.tmp_6);
     s.tmp_0 = r0;
@@ -10832,16 +10815,16 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["borderWidth"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["borderWidth"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 1757; s.pc = 5; return s.tmp_11; }
+     else { s.callLocIdx = 1764; s.pc = 5; return s.tmp_11; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = (s.tmp_0 + s.tmp_10);
-    s.x___200473 = (r0);
-    s.tmp_3 = Sprite_y__P187244_mk(s);
+    s.x___14486 = (r0);
+    s.tmp_3 = Sprite_y__P2027_mk(s);
     s.tmp_3.arg0 = s.arg1;
-    s.callLocIdx = 1758; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1765; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -10853,7 +10836,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["scale"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["scale"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1759; s.pc = 7; return s.tmp_5; }
+     else { s.callLocIdx = 1766; s.pc = 7; return s.tmp_5; }
     }
   case 7:
     r0 = s.retval;
@@ -10866,7 +10849,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 / 2);
     s.tmp_7 = r0;
-    r0 = (s.tmp_7 >> s.scale___200466);
+    r0 = (s.tmp_7 >> s.scale___14479);
     s.tmp_6 = r0;
     r0 = (s.tmp_1 - s.tmp_6);
     s.tmp_0 = r0;
@@ -10878,14 +10861,14 @@ switch (step) {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["borderWidth"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["borderWidth"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 1761; s.pc = 8; return s.tmp_11; }
+     else { s.callLocIdx = 1768; s.pc = 8; return s.tmp_11; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = (s.tmp_0 + s.tmp_10);
-    s.y___200490 = (r0);
-    s.tmp_0 = minimap_renderScaledImage__P191289_mk(s);
+    s.y___14503 = (r0);
+    s.tmp_0 = minimap_renderScaledImage__P6073_mk(s);
     r0 = s.arg1.fields["_image"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_image_1_mk(s);
@@ -10896,27 +10879,27 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["image"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["image"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1763; s.pc = 10; return s.tmp_1; }
+     else { s.callLocIdx = 1770; s.pc = 10; return s.tmp_1; }
     }
   case 10:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.x___200473;
-    s.tmp_0.arg3 = s.y___200490;
-    s.tmp_0.arg4 = s.scale___200466;
-    s.callLocIdx = 1764; s.pc = 9; return s.tmp_0;
+    s.tmp_0.arg2 = s.x___14486;
+    s.tmp_0.arg3 = s.y___14503;
+    s.tmp_0.arg4 = s.scale___14479;
+    s.callLocIdx = 1771; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-minimap_includeSprite__P188834.info = {"start":3241,"length":451,"line":102,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"includeSprite","argumentNames":["minimap","sprite","spriteScale"]}
+minimap_includeSprite__P3617.info = {"start":3241,"length":451,"line":102,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"includeSprite","argumentNames":["minimap","sprite","spriteScale"]}
 
-function minimap_includeSprite__P188834_mk(s) {
+function minimap_includeSprite__P3617_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_includeSprite__P188834, depth: s.depth + 1,
+        parent: s, fn: minimap_includeSprite__P3617, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -10930,9 +10913,9 @@ function minimap_includeSprite__P188834_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  scale___200466: undefined,
-  x___200473: undefined,
-  y___200490: undefined,
+  scale___14479: undefined,
+  x___14486: undefined,
+  y___14503: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -10942,7 +10925,7 @@ function minimap_includeSprite__P188834_mk(s) {
 
 
 
-function minimap_renderScaledImage__P191289(s) {
+function minimap_renderScaledImage__P6073(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -10952,9 +10935,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tile___200520 = undefined;
-    s.i___200522 = undefined;
-    s.j___200528 = undefined;
+    s.tile___14533 = undefined;
+    s.i___14535 = undefined;
+    s.j___14541 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -10963,26 +10946,26 @@ switch (step) {
       s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
-    s.tile___200520 = (s.arg0);
-    s.i___200522 = (0);
+    s.tile___14533 = (s.arg0);
+    s.i___14535 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___200522;
+    s.tmp_1 = r0 = s.i___14535;
     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___200528 = (0);
+    s.j___14541 = (0);
   case 2:
-    s.tmp_1 = r0 = s.j___200528;
+    s.tmp_1 = r0 = s.j___14541;
     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___200522, s.j___200528);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___14535, s.j___14541);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 != 0);
     s.tmp_3 = r0;
@@ -10990,44 +10973,44 @@ switch (step) {
     if (!r0) { step = 3; continue; }
     s.tmp_5 = r0 = s.arg1;
     s.tmp_7 = r0 = s.arg2;
-    r0 = (s.i___200522 >> s.arg4);
+    r0 = (s.i___14535 >> s.arg4);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6 = r0;
     s.tmp_10 = r0 = s.arg3;
-    r0 = (s.j___200528 >> s.arg4);
+    r0 = (s.j___14541 >> s.arg4);
     s.tmp_11 = r0;
     r0 = (s.tmp_10 + s.tmp_11);
     s.tmp_9 = r0;
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___200522, s.j___200528);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.i___14535, s.j___14541);
     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___200528;
+    s.tmp_0 = r0 = s.j___14541;
     r0 = (1 << s.arg4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.j___200528 = (r0);
+    s.j___14541 = (r0);
     { step = 2; continue; }
   case 5:
-    s.tmp_0 = r0 = s.i___200522;
+    s.tmp_0 = r0 = s.i___14535;
     r0 = (1 << s.arg4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.i___200522 = (r0);
+    s.i___14535 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-minimap_renderScaledImage__P191289.info = {"start":544,"length":459,"line":26,"column":4,"endLine":35,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"renderScaledImage","argumentNames":["source","destination","x","y","scale"]}
+minimap_renderScaledImage__P6073.info = {"start":544,"length":459,"line":26,"column":4,"endLine":35,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"renderScaledImage","argumentNames":["source","destination","x","y","scale"]}
 
-function minimap_renderScaledImage__P191289_mk(s) {
+function minimap_renderScaledImage__P6073_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_renderScaledImage__P191289, depth: s.depth + 1,
+        parent: s, fn: minimap_renderScaledImage__P6073, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11042,9 +11025,9 @@ function minimap_renderScaledImage__P191289_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  tile___200520: undefined,
-  i___200522: undefined,
-  j___200528: undefined,
+  tile___14533: undefined,
+  i___14535: undefined,
+  j___14541: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -11056,7 +11039,7 @@ function minimap_renderScaledImage__P191289_mk(s) {
 
 
 
-function Sprite_height__P187278(s) {
+function Sprite_height__P2061(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11071,20 +11054,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187278.info = {"start":8639,"length":54,"line":314,"column":4,"endLine":316,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"height","argumentNames":["this"]}
-Sprite_height__P187278.isGetter = true;
+Sprite_height__P2061.info = {"start":8639,"length":54,"line":314,"column":4,"endLine":316,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"height","argumentNames":["this"]}
+Sprite_height__P2061.isGetter = true;
 
-function Sprite_height__P187278_mk(s) {
+function Sprite_height__P2061_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_height__P187278, depth: s.depth + 1,
+        parent: s, fn: Sprite_height__P2061, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11094,7 +11077,7 @@ function Sprite_height__P187278_mk(s) {
 
 
 
-function Sprite_width__P187277(s) {
+function Sprite_width__P2060(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11109,20 +11092,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187277.info = {"start":8494,"length":52,"line":309,"column":4,"endLine":311,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"width","argumentNames":["this"]}
-Sprite_width__P187277.isGetter = true;
+Sprite_width__P2060.info = {"start":8494,"length":52,"line":309,"column":4,"endLine":311,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"width","argumentNames":["this"]}
+Sprite_width__P2060.isGetter = true;
 
-function Sprite_width__P187277_mk(s) {
+function Sprite_width__P2060_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_width__P187277, depth: s.depth + 1,
+        parent: s, fn: Sprite_width__P2060, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11132,7 +11115,7 @@ function Sprite_width__P187277_mk(s) {
 
 
 
-function minimap_minimap__P188832(s) {
+function minimap_minimap__P3615(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11142,30 +11125,30 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tilemap___200575 = undefined;
-    s.numRows___200586 = undefined;
-    s.numCols___200593 = undefined;
-    s.tileWidth___200600 = undefined;
-    s.minimap___200605 = undefined;
-    s.r___200632 = undefined;
-    s.c___200637 = undefined;
-    s.idx___200642 = undefined;
-    s.tile___200648 = undefined;
-    s.nx___200653 = undefined;
-    s.ny___200662 = undefined;
+    s.tilemap___14588 = undefined;
+    s.numRows___14599 = undefined;
+    s.numCols___14606 = undefined;
+    s.tileWidth___14613 = undefined;
+    s.minimap___14618 = undefined;
+    s.r___14645 = undefined;
+    s.c___14650 = undefined;
+    s.idx___14655 = undefined;
+    s.tile___14661 = undefined;
+    s.nx___14666 = undefined;
+    s.ny___14675 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1742; s.pc = 10; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1749; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tilemap___200575 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tilemap___200575);
+    s.tilemap___14588 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tilemap___14588);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -11183,31 +11166,31 @@ switch (step) {
     { step = 9; continue; }
   case 1:
   case 2:
-    s.tmp_5 = tiles_TileMap_areaHeight__P187541_mk(s);
-    s.tmp_5.arg0 = s.tilemap___200575;
-    s.callLocIdx = 1743; s.pc = 11; return s.tmp_5;
+    s.tmp_5 = tiles_TileMap_areaHeight__P2324_mk(s);
+    s.tmp_5.arg0 = s.tilemap___14588;
+    s.callLocIdx = 1750; s.pc = 11; return s.tmp_5;
   case 11:
     r0 = s.retval;
     s.tmp_4 = r0;
-    r0 = s.tilemap___200575.fields["_scale"];
+    r0 = s.tilemap___14588.fields["_scale"];
     s.tmp_6 = r0;
     r0 = (s.tmp_4 >> s.tmp_6);
-    s.numRows___200586 = (r0);
-    s.tmp_1 = tiles_TileMap_areaWidth__P187540_mk(s);
-    s.tmp_1.arg0 = s.tilemap___200575;
-    s.callLocIdx = 1745; s.pc = 12; return s.tmp_1;
+    s.numRows___14599 = (r0);
+    s.tmp_1 = tiles_TileMap_areaWidth__P2323_mk(s);
+    s.tmp_1.arg0 = s.tilemap___14588;
+    s.callLocIdx = 1752; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = s.tilemap___200575.fields["_scale"];
+    r0 = s.tilemap___14588.fields["_scale"];
     s.tmp_2 = r0;
     r0 = (s.tmp_0 >> s.tmp_2);
-    s.numCols___200593 = (r0);
-    r0 = s.tilemap___200575.fields["_scale"];
+    s.numCols___14606 = (r0);
+    r0 = s.tilemap___14588.fields["_scale"];
     s.tmp_0 = r0;
     r0 = (1 << s.tmp_0);
-    s.tileWidth___200600 = (r0);
-    r0 = (s.numCols___200593 * s.tileWidth___200600);
+    s.tileWidth___14613 = (r0);
+    r0 = (s.numCols___14606 * s.tileWidth___14613);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> s.arg0);
     s.tmp_1 = r0;
@@ -11215,7 +11198,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_1 + s.tmp_3);
     s.tmp_0 = r0;
-    r0 = (s.numRows___200586 * s.tileWidth___200600);
+    r0 = (s.numRows___14599 * s.tileWidth___14613);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 >> s.arg0);
     s.tmp_5 = r0;
@@ -11224,73 +11207,73 @@ switch (step) {
     r0 = (s.tmp_5 + s.tmp_7);
     s.tmp_4 = r0;
     r0 = pxsim.image.create(s.tmp_0, s.tmp_4);
-    s.minimap___200605 = (r0);
+    s.minimap___14618 = (r0);
     r0 = (s.arg1 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_ImageMethods.fill(s.minimap___200605, s.arg2);
+    r0 = pxsim_ImageMethods.fill(s.minimap___14618, s.arg2);
   case 3:
   case 4:
-    s.r___200632 = (0);
+    s.r___14645 = (0);
   case 5:
-    r0 = (s.r___200632 < s.numRows___200586);
+    r0 = (s.r___14645 < s.numRows___14599);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.c___200637 = (0);
+    s.c___14650 = (0);
   case 6:
-    r0 = (s.c___200637 < s.numCols___200593);
+    r0 = (s.c___14650 < s.numCols___14606);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = tiles_TileMap_getTileIndex__P187547_mk(s);
-    s.tmp_1.arg0 = s.tilemap___200575;
-    s.tmp_1.arg1 = s.c___200637;
-    s.tmp_1.arg2 = s.r___200632;
-    s.callLocIdx = 1748; s.pc = 13; return s.tmp_1;
+    s.tmp_1 = tiles_TileMap_getTileIndex__P2330_mk(s);
+    s.tmp_1.arg0 = s.tilemap___14588;
+    s.tmp_1.arg1 = s.c___14650;
+    s.tmp_1.arg2 = s.r___14645;
+    s.callLocIdx = 1755; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    s.idx___200642 = (r0);
-    s.tmp_0 = tiles_TileMap_getTileImage__P187556_mk(s);
-    s.tmp_0.arg0 = s.tilemap___200575;
-    s.tmp_0.arg1 = s.idx___200642;
-    s.callLocIdx = 1749; s.pc = 14; return s.tmp_0;
+    s.idx___14655 = (r0);
+    s.tmp_0 = tiles_TileMap_getTileImage__P2339_mk(s);
+    s.tmp_0.arg0 = s.tilemap___14588;
+    s.tmp_0.arg1 = s.idx___14655;
+    s.callLocIdx = 1756; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tile___200648 = (r0);
-    r0 = (s.c___200637 * s.tileWidth___200600);
+    s.tile___14661 = (r0);
+    r0 = (s.c___14650 * s.tileWidth___14613);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >> s.arg0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + s.arg1);
-    s.nx___200653 = (r0);
-    r0 = (s.r___200632 * s.tileWidth___200600);
+    s.nx___14666 = (r0);
+    r0 = (s.r___14645 * s.tileWidth___14613);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >> s.arg0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + s.arg1);
-    s.ny___200662 = (r0);
-    s.tmp_0 = minimap_renderScaledImage__P191289_mk(s);
-    s.tmp_0.arg0 = s.tile___200648;
-    s.tmp_0.arg1 = s.minimap___200605;
-    s.tmp_0.arg2 = s.nx___200653;
-    s.tmp_0.arg3 = s.ny___200662;
+    s.ny___14675 = (r0);
+    s.tmp_0 = minimap_renderScaledImage__P6073_mk(s);
+    s.tmp_0.arg0 = s.tile___14661;
+    s.tmp_0.arg1 = s.minimap___14618;
+    s.tmp_0.arg2 = s.nx___14666;
+    s.tmp_0.arg3 = s.ny___14675;
     s.tmp_0.arg4 = s.arg0;
-    s.callLocIdx = 1750; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1757; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = (s.c___200637 + 1);
-    s.c___200637 = (r0);
+    r0 = (s.c___14650 + 1);
+    s.c___14650 = (r0);
     { step = 6; continue; }
   case 7:
-    r0 = (s.r___200632 + 1);
-    s.r___200632 = (r0);
+    r0 = (s.r___14645 + 1);
+    s.r___14645 = (r0);
     { step = 5; continue; }
   case 8:
     r0 = pxsim_pxtrt.mkMap();
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "image", s.minimap___200605);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "image", s.minimap___14618);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "scale", s.arg0);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "borderWidth", s.arg1);
     r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "borderColor", s.arg2);
@@ -11299,12 +11282,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-minimap_minimap__P188832.info = {"start":1349,"length":1436,"line":45,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"minimap","argumentNames":["scale","borderWidth","borderColor"]}
+minimap_minimap__P3615.info = {"start":1349,"length":1436,"line":45,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/arcade-minimap/minimap.ts","functionName":"minimap","argumentNames":["scale","borderWidth","borderColor"]}
 
-function minimap_minimap__P188832_mk(s) {
+function minimap_minimap__P3615_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: minimap_minimap__P188832, depth: s.depth + 1,
+        parent: s, fn: minimap_minimap__P3615, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11314,17 +11297,17 @@ function minimap_minimap__P188832_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  tilemap___200575: undefined,
-  numRows___200586: undefined,
-  numCols___200593: undefined,
-  tileWidth___200600: undefined,
-  minimap___200605: undefined,
-  r___200632: undefined,
-  c___200637: undefined,
-  idx___200642: undefined,
-  tile___200648: undefined,
-  nx___200653: undefined,
-  ny___200662: undefined,
+  tilemap___14588: undefined,
+  numRows___14599: undefined,
+  numCols___14606: undefined,
+  tileWidth___14613: undefined,
+  minimap___14618: undefined,
+  r___14645: undefined,
+  c___14650: undefined,
+  idx___14655: undefined,
+  tile___14661: undefined,
+  nx___14666: undefined,
+  ny___14675: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -11334,7 +11317,7 @@ function minimap_minimap__P188832_mk(s) {
 
 
 
-function tiles_TileMap_areaHeight__P187541(s) {
+function tiles_TileMap_areaHeight__P2324(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11349,7 +11332,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -11371,12 +11354,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_areaHeight__P187541.info = {"start":6794,"length":93,"line":247,"column":8,"endLine":249,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"areaHeight","argumentNames":["this"]}
+tiles_TileMap_areaHeight__P2324.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__P187541_mk(s) {
+function tiles_TileMap_areaHeight__P2324_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_areaHeight__P187541, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_areaHeight__P2324, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11390,7 +11373,7 @@ function tiles_TileMap_areaHeight__P187541_mk(s) {
 
 
 
-function tiles_TileMap_areaWidth__P187540(s) {
+function tiles_TileMap_areaWidth__P2323(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11405,7 +11388,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -11427,12 +11410,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_areaWidth__P187540.info = {"start":6693,"length":91,"line":243,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"areaWidth","argumentNames":["this"]}
+tiles_TileMap_areaWidth__P2323.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__P187540_mk(s) {
+function tiles_TileMap_areaWidth__P2323_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_areaWidth__P187540, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_areaWidth__P2323, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11446,7 +11429,7 @@ function tiles_TileMap_areaWidth__P187540_mk(s) {
 
 
 
-function forever__P187064(s) {
+function forever__P1847(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11460,7 +11443,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_forever__P187762_mk(s);
+    s.tmp_0 = game_forever__P2545_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 169; s.pc = 1; return s.tmp_0;
   case 1:
@@ -11469,12 +11452,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-forever__P187064.info = {"start":264,"length":62,"line":6,"column":0,"endLine":8,"endColumn":1,"fileName":"pxt_modules/game/gameoverrides.ts","functionName":"forever","argumentNames":["a"]}
+forever__P1847.info = {"start":264,"length":62,"line":6,"column":0,"endLine":8,"endColumn":1,"fileName":"pxt_modules/game/gameoverrides.ts","functionName":"forever","argumentNames":["a"]}
 
-function forever__P187064_mk(s) {
+function forever__P1847_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: forever__P187064, depth: s.depth + 1,
+        parent: s, fn: forever__P1847, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -11484,7 +11467,7 @@ function forever__P187064_mk(s) {
 
 
 
-function game_forever__P187762(s) {
+function game_forever__P2545(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11498,26 +11481,26 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals.foreverRunning___189575);
+    r0 = pxsim_numops_toBoolDecr(globals.foreverRunning___4359);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.foreverRunning___189575 = (true);
-    r0 = pxsim.control.runInParallel(inline__P194818);
+    globals.foreverRunning___4359 = (true);
+    r0 = pxsim.control.runInParallel(inline__P8210);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_GameForeverHandler__C187615_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_GameForeverHandler__C2398_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_GameForeverHandler_constructor__P187617_mk(s);
+    s.tmp_1 = scene_GameForeverHandler_constructor__P2400_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.callLocIdx = 1215; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1222; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.tmp_3 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1214; s.pc = 4; return s.tmp_3;
+    s.tmp_3 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1221; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["gameForeverHandlers"];
@@ -11527,12 +11510,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_forever__P187762.info = {"start":8610,"length":820,"line":277,"column":4,"endLine":300,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"forever","argumentNames":["action"]}
+game_forever__P2545.info = {"start":8610,"length":820,"line":277,"column":4,"endLine":300,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"forever","argumentNames":["action"]}
 
-function game_forever__P187762_mk(s) {
+function game_forever__P2545_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_forever__P187762, depth: s.depth + 1,
+        parent: s, fn: game_forever__P2545, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11545,7 +11528,7 @@ function game_forever__P187762_mk(s) {
 
 
 
-function inline__P194818(s) {
+function inline__P8210(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11555,25 +11538,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.handlers___194820 = undefined;
+    s.handlers___8212 = undefined;
   case 1:
     r0 = pxsim_numops_toBoolDecr(1);
     if (!r0) { step = 2; continue; }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1210; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1217; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = r0.fields["gameForeverHandlers"];
-    s.handlers___194820 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_0.arg0 = s.handlers___194820;
-    s.tmp_0.arg1 = inline__P194826;
-    s.callLocIdx = 1212; s.pc = 4; return s.tmp_0;
+    s.handlers___8212 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_0.arg0 = s.handlers___8212;
+    s.tmp_0.arg1 = inline__P8218;
+    s.callLocIdx = 1219; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 20;
-    s.callLocIdx = 1213; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1220; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     { step = 1; continue; }
@@ -11582,22 +11565,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194818.info = {"start":8762,"length":535,"line":280,"column":34,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
+inline__P8210.info = {"start":8762,"length":535,"line":280,"column":34,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P194818_mk(s) {
+function inline__P8210_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194818, depth: s.depth + 1,
+        parent: s, fn: inline__P8210, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  handlers___194820: undefined,
+  handlers___8212: undefined,
 } }
 
 
 
 
 
-function inline__P194826(s) {
+function inline__P8218(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11620,7 +11603,7 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["lock"] = (true);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P194835);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8227);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim.control.runInParallel(s.tmp_0);
@@ -11630,12 +11613,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194826.info = {"start":8913,"length":319,"line":283,"column":37,"endLine":291,"endColumn":21,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["h"]}
+inline__P8218.info = {"start":8913,"length":319,"line":283,"column":37,"endLine":291,"endColumn":21,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P194826_mk(s) {
+function inline__P8218_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194826, depth: s.depth + 1,
+        parent: s, fn: inline__P8218, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11647,7 +11630,7 @@ function inline__P194826_mk(s) {
 
 
 
-function inline__P194835(s) {
+function inline__P8227(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11661,12 +11644,12 @@ switch (step) {
     s.tmp_0.arg0 = s.caps[0];
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "handler"), 1);
-      s.callLocIdx = 1211; 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["handler"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 1); s.callLocIdx = 1211; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1211; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1211; s.pc = 1; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["handler"], 1); s.callLocIdx = 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;
@@ -11675,12 +11658,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194835.info = {"start":9052,"length":130,"line":286,"column":50,"endLine":289,"endColumn":29,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
+inline__P8227.info = {"start":9052,"length":130,"line":286,"column":50,"endLine":289,"endColumn":29,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P194835_mk(s) {
+function inline__P8227_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194835, depth: s.depth + 1,
+        parent: s, fn: inline__P8227, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -11689,7 +11672,7 @@ function inline__P194835_mk(s) {
 
 
 
-function scene_GameForeverHandler_constructor__P187617(s) {
+function scene_GameForeverHandler_constructor__P2400(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11705,18 +11688,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_GameForeverHandler__C187615_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_GameForeverHandler__C2398_VT)) failedCast(r0);
     r0 = (s.arg0).fields["handler"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_GameForeverHandler_constructor__P187617.info = {"start":1340,"length":65,"line":47,"column":8,"endLine":49,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","handler"]}
+scene_GameForeverHandler_constructor__P2400.info = {"start":1340,"length":65,"line":47,"column":8,"endLine":49,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","handler"]}
 
-function scene_GameForeverHandler_constructor__P187617_mk(s) {
+function scene_GameForeverHandler_constructor__P2400_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_GameForeverHandler_constructor__P187617, depth: s.depth + 1,
+        parent: s, fn: scene_GameForeverHandler_constructor__P2400, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -11726,7 +11709,7 @@ function scene_GameForeverHandler_constructor__P187617_mk(s) {
 
 
 
-function start_game__P426970(s) {
+function start_game__P88901(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11736,21 +11719,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_startCountdown__P187430_mk(s);
+    s.tmp_0 = info_startCountdown__P2213_mk(s);
     s.tmp_0.arg0 = 5;
-    s.callLocIdx = 156; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 154; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-start_game__P426970.info = {"start":9440,"length":53,"line":244,"column":0,"endLine":246,"endColumn":1,"fileName":"main.ts","functionName":"start_game","argumentNames":[]}
+start_game__P88901.info = {"start":12013,"length":53,"line":307,"column":0,"endLine":309,"endColumn":1,"fileName":"main.ts","functionName":"start_game","argumentNames":[]}
 
-function start_game__P426970_mk(s) {
+function start_game__P88901_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: start_game__P426970, depth: s.depth + 1,
+        parent: s, fn: start_game__P88901, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -11759,7 +11742,7 @@ function start_game__P426970_mk(s) {
 
 
 
-function create_minimap__P427228(s) {
+function create_minimap__P89159(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11769,37 +11752,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    s.tmp_1 = update_minimap__P427144_mk(s);
-    s.callLocIdx = 194; s.pc = 2; return s.tmp_1;
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    s.tmp_1 = update_minimap__P89075_mk(s);
+    s.callLocIdx = 192; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.Map___426662;
-    s.callLocIdx = 195; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = globals.Map___88587;
+    s.callLocIdx = 193; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    globals.sprite_map___427230 = (r0);
-    s.tmp_0 = Sprite_bottom__P187286_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___427230;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    globals.sprite_map___89161 = (r0);
+    s.tmp_0 = Sprite_bottom__P2069_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___89161;
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 197; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 195; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_x__P187243_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___427230;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_0 = Sprite_x__P2026_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___89161;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 199; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 197; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     s.tmp_0 = if_z_2_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___427230;
+    s.tmp_0.arg0 = globals.sprite_map___89161;
     s.tmp_0.arg1 = 50;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapSetByString(s.tmp_0.arg0, "z", s.tmp_0.arg1);
@@ -11807,27 +11790,27 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 200; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 198; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setFlag__P187296_mk(s);
-    s.tmp_0.arg0 = globals.sprite_map___427230;
+    s.tmp_0 = Sprite_setFlag__P2079_mk(s);
+    s.tmp_0.arg0 = globals.sprite_map___89161;
     s.tmp_0.arg1 = 512;
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 201; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 199; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-create_minimap__P427228.info = {"start":19519,"length":268,"line":389,"column":0,"endLine":395,"endColumn":1,"fileName":"main.ts","functionName":"create_minimap","argumentNames":[]}
+create_minimap__P89159.info = {"start":22092,"length":268,"line":452,"column":0,"endLine":458,"endColumn":1,"fileName":"main.ts","functionName":"create_minimap","argumentNames":[]}
 
-function create_minimap__P427228_mk(s) {
+function create_minimap__P89159_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: create_minimap__P427228, depth: s.depth + 1,
+        parent: s, fn: create_minimap__P89159, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11837,7 +11820,7 @@ function create_minimap__P427228_mk(s) {
 
 
 
-function Sprite_setFlag__P187296(s) {
+function Sprite_setFlag__P2079(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11854,7 +11837,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -11889,7 +11872,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = Sprite_setFlag__P187296_mk(s);
+    s.tmp_2 = Sprite_setFlag__P2079_mk(s);
     r0 = s.arg0.fields["sayBubbleSprite"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 512;
@@ -11903,12 +11886,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setFlag__P187296.info = {"start":23896,"length":292,"line":731,"column":4,"endLine":738,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setFlag","argumentNames":["this","flag","on"]}
+Sprite_setFlag__P2079.info = {"start":23896,"length":292,"line":731,"column":4,"endLine":738,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setFlag","argumentNames":["this","flag","on"]}
 
-function Sprite_setFlag__P187296_mk(s) {
+function Sprite_setFlag__P2079_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setFlag__P187296, depth: s.depth + 1,
+        parent: s, fn: Sprite_setFlag__P2079, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11924,7 +11907,7 @@ function Sprite_setFlag__P187296_mk(s) {
 
 
 
-function Sprite_x__P187243(s) {
+function Sprite_x__P2026(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11940,8 +11923,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P187280_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P2063_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -11959,12 +11942,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_x__P187243.info = {"start":1673,"length":72,"line":75,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this","v"]}
+Sprite_x__P2026.info = {"start":1673,"length":72,"line":75,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"x","argumentNames":["this","v"]}
 
-function Sprite_x__P187243_mk(s) {
+function Sprite_x__P2026_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_x__P187243, depth: s.depth + 1,
+        parent: s, fn: Sprite_x__P2026, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -11979,7 +11962,7 @@ function Sprite_x__P187243_mk(s) {
 
 
 
-function Sprite_left__P187280(s) {
+function Sprite_left__P2063(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -11989,22 +11972,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___198127 = undefined;
+    s.physics___12048 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 321; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___198127 = (r0);
-    s.tmp_0 = PhysicsEngine__C187376_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___198127;
+    s.physics___12048 = (r0);
+    s.tmp_0 = PhysicsEngine__C2159_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___12048;
     s.tmp_0.arg1 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -12015,7 +11998,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__C187376_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_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:
@@ -12024,18 +12007,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_left__P187280.info = {"start":8929,"length":257,"line":325,"column":4,"endLine":335,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this","value"]}
+Sprite_left__P2063.info = {"start":8929,"length":257,"line":325,"column":4,"endLine":335,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this","value"]}
 
-function Sprite_left__P187280_mk(s) {
+function Sprite_left__P2063_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_left__P187280, depth: s.depth + 1,
+        parent: s, fn: Sprite_left__P2063, 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___198127: undefined,
+  physics___12048: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -12044,7 +12027,7 @@ function Sprite_left__P187280_mk(s) {
 
 
 
-function PhysicsEngine_moveSprite__P187380(s) {
+function PhysicsEngine_moveSprite__P2163(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12062,17 +12045,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C187376_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_moveSprite__P187380.info = {"start":230,"length":43,"line":13,"column":4,"endLine":13,"endColumn":47,"fileName":"pxt_modules/game/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
+PhysicsEngine_moveSprite__P2163.info = {"start":230,"length":43,"line":13,"column":4,"endLine":13,"endColumn":47,"fileName":"pxt_modules/game/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
 
-function PhysicsEngine_moveSprite__P187380_mk(s) {
+function PhysicsEngine_moveSprite__P2163_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_moveSprite__P187380, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_moveSprite__P2163, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12084,7 +12067,7 @@ function PhysicsEngine_moveSprite__P187380_mk(s) {
 
 
 
-function Fx_sub__P185371(s) {
+function Fx_sub__P154(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12103,12 +12086,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_sub__P185371.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__P154.info = {"start":749,"length":118,"line":26,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"sub","argumentNames":["a","b"]}
 
-function Fx_sub__P185371_mk(s) {
+function Fx_sub__P154_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_sub__P185371, depth: s.depth + 1,
+        parent: s, fn: Fx_sub__P154, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12118,7 +12101,7 @@ function Fx_sub__P185371_mk(s) {
 
 
 
-function Sprite_left__P187279(s) {
+function Sprite_left__P2062(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12133,20 +12116,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187279.info = {"start":8785,"length":53,"line":320,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this"]}
-Sprite_left__P187279.isGetter = true;
+Sprite_left__P2062.info = {"start":8785,"length":53,"line":320,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"left","argumentNames":["this"]}
+Sprite_left__P2062.isGetter = true;
 
-function Sprite_left__P187279_mk(s) {
+function Sprite_left__P2062_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_left__P187279, depth: s.depth + 1,
+        parent: s, fn: Sprite_left__P2062, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12156,7 +12139,7 @@ function Sprite_left__P187279_mk(s) {
 
 
 
-function Sprite_bottom__P187286(s) {
+function Sprite_bottom__P2069(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12172,8 +12155,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P187284_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P2067_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -12189,12 +12172,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_bottom__P187286.info = {"start":10235,"length":73,"line":374,"column":4,"endLine":376,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this","value"]}
+Sprite_bottom__P2069.info = {"start":10235,"length":73,"line":374,"column":4,"endLine":376,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this","value"]}
 
-function Sprite_bottom__P187286_mk(s) {
+function Sprite_bottom__P2069_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_bottom__P187286, depth: s.depth + 1,
+        parent: s, fn: Sprite_bottom__P2069, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12208,7 +12191,7 @@ function Sprite_bottom__P187286_mk(s) {
 
 
 
-function Sprite_top__P187284(s) {
+function Sprite_top__P2067(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12218,22 +12201,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___197923 = undefined;
+    s.physics___11844 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 329; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___197923 = (r0);
-    s.tmp_0 = PhysicsEngine__C187376_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___197923;
+    s.physics___11844 = (r0);
+    s.tmp_0 = PhysicsEngine__C2159_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___11844;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = 0;
     r0 = (s.arg1 * 256);
@@ -12244,7 +12227,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__C187376_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_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:
@@ -12253,18 +12236,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_top__P187284.info = {"start":9733,"length":256,"line":355,"column":4,"endLine":365,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this","value"]}
+Sprite_top__P2067.info = {"start":9733,"length":256,"line":355,"column":4,"endLine":365,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this","value"]}
 
-function Sprite_top__P187284_mk(s) {
+function Sprite_top__P2067_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_top__P187284, depth: s.depth + 1,
+        parent: s, fn: Sprite_top__P2067, 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___197923: undefined,
+  physics___11844: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -12273,7 +12256,7 @@ function Sprite_top__P187284_mk(s) {
 
 
 
-function Sprite_top__P187283(s) {
+function Sprite_top__P2066(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12288,20 +12271,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187283.info = {"start":9590,"length":53,"line":350,"column":4,"endLine":352,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this"]}
-Sprite_top__P187283.isGetter = true;
+Sprite_top__P2066.info = {"start":9590,"length":53,"line":350,"column":4,"endLine":352,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"top","argumentNames":["this"]}
+Sprite_top__P2066.isGetter = true;
 
-function Sprite_top__P187283_mk(s) {
+function Sprite_top__P2066_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_top__P187283, depth: s.depth + 1,
+        parent: s, fn: Sprite_top__P2066, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12311,7 +12294,7 @@ function Sprite_top__P187283_mk(s) {
 
 
 
-function Sprite_bottom__P187285(s) {
+function Sprite_bottom__P2068(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12326,8 +12309,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_top__P187283_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_top__P2066_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 332; s.pc = 1; return s.tmp_1;
   case 1:
@@ -12341,13 +12324,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_bottom__P187285.info = {"start":10083,"length":59,"line":369,"column":4,"endLine":371,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this"]}
-Sprite_bottom__P187285.isGetter = true;
+Sprite_bottom__P2068.info = {"start":10083,"length":59,"line":369,"column":4,"endLine":371,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"bottom","argumentNames":["this"]}
+Sprite_bottom__P2068.isGetter = true;
 
-function Sprite_bottom__P187285_mk(s) {
+function Sprite_bottom__P2068_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_bottom__P187285, depth: s.depth + 1,
+        parent: s, fn: Sprite_bottom__P2068, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12360,7 +12343,7 @@ function Sprite_bottom__P187285_mk(s) {
 
 
 
-function sprites_create__P187191(s) {
+function sprites_create__P1974(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12370,51 +12353,51 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___206575 = undefined;
-    s.sprite___206578 = undefined;
+    s.scene___21519 = undefined;
+    s.sprite___21522 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 265; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___206575 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(Sprite__C187233_VT);
+    s.scene___21519 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(Sprite__C2016_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Sprite_constructor__P187270_mk(s);
+    s.tmp_1 = Sprite_constructor__P2053_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.callLocIdx = 266; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    s.sprite___206578 = (s.tmp_0);
-    s.tmp_0 = Sprite_setKind__P187288_mk(s);
-    s.tmp_0.arg0 = s.sprite___206578;
+    s.sprite___21522 = (s.tmp_0);
+    s.tmp_0 = Sprite_setKind__P2071_mk(s);
+    s.tmp_0.arg0 = s.sprite___21522;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 267; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = PhysicsEngine__C187376_v0_2_mk(s);
-    r0 = s.scene___206575.fields["physicsEngine"];
+    s.tmp_0 = PhysicsEngine__C2159_v0_2_mk(s);
+    r0 = s.scene___21519.fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.sprite___206578;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C187376_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.sprite___21522;
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_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__P206593);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21537);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P206599);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21543);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.sprite___206578);
-    s.tmp_2 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P185325_mk(s);
-    r0 = s.scene___206575.fields["createdHandlers"];
+    r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.sprite___21522);
+    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
+    r0 = s.scene___21519.fields["createdHandlers"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
     s.callLocIdx = 268; s.pc = 6; return s.tmp_3;
@@ -12425,23 +12408,23 @@ switch (step) {
     s.callLocIdx = 270; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    r0 = s.sprite___206578;
+    r0 = s.sprite___21522;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_create__P187191.info = {"start":890,"length":400,"line":35,"column":4,"endLine":47,"endColumn":5,"fileName":"pxt_modules/game/sprites.ts","functionName":"create","argumentNames":["img","kind"]}
+sprites_create__P1974.info = {"start":890,"length":400,"line":35,"column":4,"endLine":47,"endColumn":5,"fileName":"pxt_modules/game/sprites.ts","functionName":"create","argumentNames":["img","kind"]}
 
-function sprites_create__P187191_mk(s) {
+function sprites_create__P1974_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_create__P187191, depth: s.depth + 1,
+        parent: s, fn: sprites_create__P1974, 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___206575: undefined,
-  sprite___206578: undefined,
+  scene___21519: undefined,
+  sprite___21522: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -12450,7 +12433,7 @@ function sprites_create__P187191_mk(s) {
 
 
 
-function inline__P206593(s) {
+function inline__P21537(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12470,12 +12453,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206593.info = {"start":1195,"length":19,"line":43,"column":20,"endLine":43,"endColumn":39,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["h"]}
+inline__P21537.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__P206593_mk(s) {
+function inline__P21537_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206593, depth: s.depth + 1,
+        parent: s, fn: inline__P21537, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12485,7 +12468,7 @@ function inline__P206593_mk(s) {
 
 
 
-function inline__P206599(s) {
+function inline__P21543(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12517,12 +12500,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206599.info = {"start":1237,"length":22,"line":44,"column":21,"endLine":44,"endColumn":43,"fileName":"pxt_modules/game/sprites.ts","functionName":"inline","argumentNames":["h"]}
+inline__P21543.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__P206599_mk(s) {
+function inline__P21543_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206599, depth: s.depth + 1,
+        parent: s, fn: inline__P21543, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12532,7 +12515,7 @@ function inline__P206599_mk(s) {
 
 
 
-function PhysicsEngine_addSprite__P187378(s) {
+function PhysicsEngine_addSprite__P2161(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12548,17 +12531,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C187376_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_addSprite__P187378.info = {"start":124,"length":29,"line":8,"column":4,"endLine":8,"endColumn":33,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
+PhysicsEngine_addSprite__P2161.info = {"start":124,"length":29,"line":8,"column":4,"endLine":8,"endColumn":33,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function PhysicsEngine_addSprite__P187378_mk(s) {
+function PhysicsEngine_addSprite__P2161_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_addSprite__P187378, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_addSprite__P2161, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -12568,7 +12551,7 @@ function PhysicsEngine_addSprite__P187378_mk(s) {
 
 
 
-function Sprite_constructor__P187270(s) {
+function Sprite_constructor__P2053(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12584,15 +12567,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P187077_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 291; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.arg1);
     s.tmp_5 = r0;
@@ -12606,7 +12589,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___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.height(s.arg1);
     s.tmp_5 = r0;
@@ -12625,50 +12608,50 @@ switch (step) {
     r0 = s.arg0.fields["_y"];
     s.tmp_0 = r0;
     r0 = (s.arg0).fields["_lastY"] = (s.tmp_0);
-    s.tmp_0 = Sprite_vx__P187247_mk(s);
+    s.tmp_0 = Sprite_vx__P2030_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 294; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 295; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_ax__P187251_mk(s);
+    s.tmp_0 = Sprite_ax__P2034_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 296; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = Sprite_ay__P187253_mk(s);
+    s.tmp_0 = Sprite_ay__P2036_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 297; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = Sprite_fx__P187255_mk(s);
+    s.tmp_0 = Sprite_fx__P2038_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 298; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_fy__P187257_mk(s);
+    s.tmp_0 = Sprite_fy__P2040_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.callLocIdx = 299; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = (s.arg0).fields["flags"] = (0);
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 300; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setKind__P187288_mk(s);
+    s.tmp_0 = Sprite_setKind__P2071_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = -1;
     s.callLocIdx = 301; s.pc = 9; return s.tmp_0;
@@ -12688,12 +12671,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_constructor__P187270.info = {"start":5178,"length":618,"line":202,"column":4,"endLine":222,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["this","img"]}
+Sprite_constructor__P2053.info = {"start":5178,"length":618,"line":202,"column":4,"endLine":222,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["this","img"]}
 
-function Sprite_constructor__P187270_mk(s) {
+function Sprite_constructor__P2053_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_constructor__P187270, depth: s.depth + 1,
+        parent: s, fn: Sprite_constructor__P2053, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12710,7 +12693,7 @@ function Sprite_constructor__P187270_mk(s) {
 
 
 
-function Sprite_fy__P187257(s) {
+function Sprite_fy__P2040(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12726,9 +12709,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = Math_max__P185342_mk(s);
+    s.tmp_3 = Math_max__P125_mk(s);
     s.tmp_3.arg0 = 0;
     s.tmp_3.arg1 = s.arg1;
     s.callLocIdx = 289; s.pc = 1; return s.tmp_3;
@@ -12744,12 +12727,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_fy__P187257.info = {"start":4057,"length":64,"line":151,"column":4,"endLine":153,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this","v"]}
+Sprite_fy__P2040.info = {"start":4057,"length":64,"line":151,"column":4,"endLine":153,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this","v"]}
 
-function Sprite_fy__P187257_mk(s) {
+function Sprite_fy__P2040_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fy__P187257, depth: s.depth + 1,
+        parent: s, fn: Sprite_fy__P2040, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12764,7 +12747,7 @@ function Sprite_fy__P187257_mk(s) {
 
 
 
-function Sprite_fy__P187256(s) {
+function Sprite_fy__P2039(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12779,20 +12762,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187256.info = {"start":3895,"length":60,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this"]}
-Sprite_fy__P187256.isGetter = true;
+Sprite_fy__P2039.info = {"start":3895,"length":60,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fy","argumentNames":["this"]}
+Sprite_fy__P2039.isGetter = true;
 
-function Sprite_fy__P187256_mk(s) {
+function Sprite_fy__P2039_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fy__P187256, depth: s.depth + 1,
+        parent: s, fn: Sprite_fy__P2039, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12802,7 +12785,7 @@ function Sprite_fy__P187256_mk(s) {
 
 
 
-function Sprite_fx__P187255(s) {
+function Sprite_fx__P2038(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12818,9 +12801,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_3 = Math_max__P185342_mk(s);
+    s.tmp_3 = Math_max__P125_mk(s);
     s.tmp_3.arg0 = 0;
     s.tmp_3.arg1 = s.arg1;
     s.callLocIdx = 286; s.pc = 1; return s.tmp_3;
@@ -12836,12 +12819,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_fx__P187255.info = {"start":3714,"length":64,"line":141,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this","v"]}
+Sprite_fx__P2038.info = {"start":3714,"length":64,"line":141,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this","v"]}
 
-function Sprite_fx__P187255_mk(s) {
+function Sprite_fx__P2038_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fx__P187255, depth: s.depth + 1,
+        parent: s, fn: Sprite_fx__P2038, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12856,7 +12839,7 @@ function Sprite_fx__P187255_mk(s) {
 
 
 
-function Sprite_fx__P187254(s) {
+function Sprite_fx__P2037(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12871,20 +12854,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187254.info = {"start":3552,"length":60,"line":136,"column":4,"endLine":138,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this"]}
-Sprite_fx__P187254.isGetter = true;
+Sprite_fx__P2037.info = {"start":3552,"length":60,"line":136,"column":4,"endLine":138,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"fx","argumentNames":["this"]}
+Sprite_fx__P2037.isGetter = true;
 
-function Sprite_fx__P187254_mk(s) {
+function Sprite_fx__P2037_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_fx__P187254, depth: s.depth + 1,
+        parent: s, fn: Sprite_fx__P2037, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12894,7 +12877,7 @@ function Sprite_fx__P187254_mk(s) {
 
 
 
-function Sprite_ay__P187253(s) {
+function Sprite_ay__P2036(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12910,7 +12893,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -12921,12 +12904,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_ay__P187253.info = {"start":3383,"length":51,"line":130,"column":4,"endLine":132,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this","v"]}
+Sprite_ay__P2036.info = {"start":3383,"length":51,"line":130,"column":4,"endLine":132,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this","v"]}
 
-function Sprite_ay__P187253_mk(s) {
+function Sprite_ay__P2036_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ay__P187253, depth: s.depth + 1,
+        parent: s, fn: Sprite_ay__P2036, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -12939,7 +12922,7 @@ function Sprite_ay__P187253_mk(s) {
 
 
 
-function Sprite_ay__P187252(s) {
+function Sprite_ay__P2035(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12954,20 +12937,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187252.info = {"start":3217,"length":60,"line":125,"column":4,"endLine":127,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this"]}
-Sprite_ay__P187252.isGetter = true;
+Sprite_ay__P2035.info = {"start":3217,"length":60,"line":125,"column":4,"endLine":127,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ay","argumentNames":["this"]}
+Sprite_ay__P2035.isGetter = true;
 
-function Sprite_ay__P187252_mk(s) {
+function Sprite_ay__P2035_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ay__P187252, depth: s.depth + 1,
+        parent: s, fn: Sprite_ay__P2035, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -12977,7 +12960,7 @@ function Sprite_ay__P187252_mk(s) {
 
 
 
-function Sprite_ax__P187251(s) {
+function Sprite_ax__P2034(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -12993,7 +12976,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -13004,12 +12987,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_ax__P187251.info = {"start":3044,"length":51,"line":119,"column":4,"endLine":121,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this","v"]}
+Sprite_ax__P2034.info = {"start":3044,"length":51,"line":119,"column":4,"endLine":121,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this","v"]}
 
-function Sprite_ax__P187251_mk(s) {
+function Sprite_ax__P2034_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ax__P187251, depth: s.depth + 1,
+        parent: s, fn: Sprite_ax__P2034, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13022,7 +13005,7 @@ function Sprite_ax__P187251_mk(s) {
 
 
 
-function Sprite_ax__P187250(s) {
+function Sprite_ax__P2033(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13037,20 +13020,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187250.info = {"start":2878,"length":60,"line":114,"column":4,"endLine":116,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this"]}
-Sprite_ax__P187250.isGetter = true;
+Sprite_ax__P2033.info = {"start":2878,"length":60,"line":114,"column":4,"endLine":116,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"ax","argumentNames":["this"]}
+Sprite_ax__P2033.isGetter = true;
 
-function Sprite_ax__P187250_mk(s) {
+function Sprite_ax__P2033_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_ax__P187250, depth: s.depth + 1,
+        parent: s, fn: Sprite_ax__P2033, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -13060,7 +13043,7 @@ function Sprite_ax__P187250_mk(s) {
 
 
 
-function sprites_BaseSprite_constructor__P187077(s) {
+function sprites_BaseSprite_constructor__P1860(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13076,15 +13059,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C187075_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_z__P187080_mk(s);
+    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_z__P1863_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 170; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = scene_Scene_addSprite__P187661_mk(s);
-    s.tmp_1 = game_currentScene__P187749_mk(s);
+    s.tmp_0 = scene_Scene_addSprite__P2444_mk(s);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 171; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
@@ -13097,12 +13080,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_constructor__P187077.info = {"start":344,"length":170,"line":15,"column":8,"endLine":20,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"inline","argumentNames":["this","z"]}
+sprites_BaseSprite_constructor__P1860.info = {"start":344,"length":170,"line":15,"column":8,"endLine":20,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"inline","argumentNames":["this","z"]}
 
-function sprites_BaseSprite_constructor__P187077_mk(s) {
+function sprites_BaseSprite_constructor__P1860_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_constructor__P187077, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_constructor__P1860, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13114,7 +13097,7 @@ function sprites_BaseSprite_constructor__P187077_mk(s) {
 
 
 
-function scene_Scene_addSprite__P187661(s) {
+function scene_Scene_addSprite__P2444(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13130,7 +13113,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C187636_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
@@ -13149,7 +13132,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 = 1039; s.pc = 1; return s.tmp_3; }
+     else { s.callLocIdx = 1046; s.pc = 1; return s.tmp_3; }
     }
   case 1:
     r0 = s.retval;
@@ -13157,12 +13140,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_addSprite__P187661.info = {"start":6859,"length":128,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
+scene_Scene_addSprite__P2444.info = {"start":6859,"length":128,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function scene_Scene_addSprite__P187661_mk(s) {
+function scene_Scene_addSprite__P2444_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_addSprite__P187661, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_addSprite__P2444, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13176,7 +13159,7 @@ function scene_Scene_addSprite__P187661_mk(s) {
 
 
 
-function sprites_BaseSprite_z__P187080(s) {
+function sprites_BaseSprite_z__P1863(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13192,7 +13175,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C187075_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
     r0 = s.arg0.fields["_z"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== s.arg1);
@@ -13200,7 +13183,7 @@ 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__P187749_mk(s);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 173; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
@@ -13216,12 +13199,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_z__P187080.info = {"start":656,"length":174,"line":30,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"z","argumentNames":["this","v"]}
+sprites_BaseSprite_z__P1863.info = {"start":656,"length":174,"line":30,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"z","argumentNames":["this","v"]}
 
-function sprites_BaseSprite_z__P187080_mk(s) {
+function sprites_BaseSprite_z__P1863_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_z__P187080, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_z__P1863, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13235,7 +13218,7 @@ function sprites_BaseSprite_z__P187080_mk(s) {
 
 
 
-function sprites_BaseSprite_z__P187079(s) {
+function sprites_BaseSprite_z__P1862(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13250,18 +13233,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C187075_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
     r0 = s.arg0.fields["_z"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite_z__P187079.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__P187079.isGetter = true;
+sprites_BaseSprite_z__P1862.info = {"start":591,"length":55,"line":26,"column":8,"endLine":28,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"z","argumentNames":["this"]}
+sprites_BaseSprite_z__P1862.isGetter = true;
 
-function sprites_BaseSprite_z__P187079_mk(s) {
+function sprites_BaseSprite_z__P1862_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite_z__P187079, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite_z__P1862, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -13270,7 +13253,7 @@ function sprites_BaseSprite_z__P187079_mk(s) {
 
 
 
-function initilize_map__P426972(s) {
+function initilize_map__P88903(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13280,74 +13263,74 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___427005 = undefined;
-    s.index___427048 = undefined;
-    s.location___427136 = undefined;
-    s.unnamed20878___U3 = undefined;
-    s.unnamed20879___U4 = undefined;
-    s.tmp_0 = scene_setBackgroundColor__P187674_mk(s);
+    s.index___88936 = undefined;
+    s.index___88979 = undefined;
+    s.location___89067 = undefined;
+    s.unnamed3902___U3 = undefined;
+    s.unnamed3903___U4 = undefined;
+    s.tmp_0 = scene_setBackgroundColor__P2457_mk(s);
     s.tmp_0.arg0 = 9;
-    s.callLocIdx = 157; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 155; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___189149);
-    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___188423);
-    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___188592);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___188265);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___188269);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___188270);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___188267);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___188266);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___189150);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___189151);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___189152);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___189153);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___189154);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___189155);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___189156);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___189157);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___189158);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___189159);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___189160);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___189162);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___189163);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___189164);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile16___189165);
-    s.tmp_1 = tiles_setTilemap__P187558_mk(s);
-    s.tmp_2 = tiles_createTilemap__P187557_mk(s);
-    s.tmp_2.arg0 = _hex426977;
-    r0 = pxsim.image.ofBuffer(_hex426979);
+    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___3933);
+    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___3206);
+    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___3375);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___3048);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___3052);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___3053);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___3050);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___3049);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___3934);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___3935);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___3936);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___3937);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___3938);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___3939);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___3940);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___3941);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___3942);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___3943);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___3944);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___3946);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___3947);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___3948);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile16___3949);
+    s.tmp_1 = tiles_setTilemap__P2341_mk(s);
+    s.tmp_2 = tiles_createTilemap__P2340_mk(s);
+    s.tmp_2.arg0 = _hex88908;
+    r0 = pxsim.image.ofBuffer(_hex88910);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = s.tmp_0;
     s.tmp_2.arg3 = 4;
-    s.callLocIdx = 158; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 156; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 159; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 157; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.index___427005 = (0);
+    s.index___88936 = (0);
   case 1:
-    s.tmp_1 = r0 = s.index___427005;
-    r0 = (globals.user_shark_count___427011 - 1);
+    s.tmp_1 = r0 = s.index___88936;
+    r0 = (globals.user_shark_count___88942 - 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_3 = summon_shark__P427014_mk(s);
-    s.callLocIdx = 160; s.pc = 10; return s.tmp_3;
+    s.tmp_3 = summon_shark__P88945_mk(s);
+    s.callLocIdx = 158; s.pc = 10; return s.tmp_3;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.loading___426789;
-    r0 = (1 / globals.user_shark_count___427011);
+    s.tmp_0 = r0 = globals.loading___88729;
+    r0 = (1 / globals.user_shark_count___88942);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    globals.loading___426789 = (r0);
-    r0 = (s.index___427005 + 1);
+    globals.loading___88729 = (r0);
+    r0 = (s.index___88936 + 1);
     s.tmp_7 = r0;
     if ((s.tmp_7) && (s.tmp_7).vtable) {
     setupResume(s, 11);
@@ -13380,12 +13363,12 @@ switch (step) {
   case 13:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((globals.user_shark_count___427011) && (globals.user_shark_count___427011).vtable) {
+    if ((globals.user_shark_count___88942) && (globals.user_shark_count___88942).vtable) {
     setupResume(s, 14);
-    pxsim_String__stringConv(globals.user_shark_count___427011);
+    pxsim_String__stringConv(globals.user_shark_count___88942);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.user_shark_count___427011) + ""; }
+    } else { s.retval = (globals.user_shark_count___88942) + ""; }
   case 14:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -13401,46 +13384,46 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, ")");
-    globals.message___426820 = (r0);
-    s.tmp_0 = pause__P185619_mk(s);
+    globals.message___88760 = (r0);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 20;
-    s.callLocIdx = 161; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 159; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    r0 = (s.index___427005 + 1);
-    s.index___427005 = (r0);
+    r0 = (s.index___88936 + 1);
+    s.index___88936 = (r0);
     { step = 1; continue; }
   case 2:
-    globals.loading___426789 = (1);
-    s.tmp_0 = pause__P185619_mk(s);
+    globals.loading___88729 = (1);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 162; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 160; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
-    globals.loading___426789 = (0);
-    s.index___427048 = (0);
+    globals.loading___88729 = (0);
+    s.index___88979 = (0);
   case 3:
-    s.tmp_1 = r0 = s.index___427048;
-    r0 = (globals.user_fish_count___427054 - 2);
+    s.tmp_1 = r0 = s.index___88979;
+    r0 = (globals.user_fish_count___88985 - 2);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_3 = summon_fish__P426670_mk(s);
+    s.tmp_3 = summon_fish__P88595_mk(s);
     s.tmp_3.arg0 = true;
     s.tmp_3.arg1 = true;
-    s.callLocIdx = 163; s.pc = 18; return s.tmp_3;
+    s.callLocIdx = 161; s.pc = 18; return s.tmp_3;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.loading___426789;
-    r0 = (globals.user_fish_count___427054 - 1);
+    s.tmp_0 = r0 = globals.loading___88729;
+    r0 = (globals.user_fish_count___88985 - 1);
     s.tmp_2 = r0;
     r0 = (1 / s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    globals.loading___426789 = (r0);
-    r0 = (s.index___427048 + 1);
+    globals.loading___88729 = (r0);
+    r0 = (s.index___88979 + 1);
     s.tmp_7 = r0;
     if ((s.tmp_7) && (s.tmp_7).vtable) {
     setupResume(s, 19);
@@ -13473,7 +13456,7 @@ switch (step) {
   case 21:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = (globals.user_fish_count___427054 - 1);
+    r0 = (globals.user_fish_count___88985 - 1);
     s.tmp_9 = r0;
     if ((s.tmp_9) && (s.tmp_9).vtable) {
     setupResume(s, 22);
@@ -13496,128 +13479,128 @@ switch (step) {
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, ")");
-    globals.message___426820 = (r0);
-    s.tmp_0 = pause__P185619_mk(s);
+    globals.message___88760 = (r0);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 20;
-    s.callLocIdx = 164; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 162; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    r0 = (s.index___427048 + 1);
-    s.index___427048 = (r0);
+    r0 = (s.index___88979 + 1);
+    s.index___88979 = (r0);
     { step = 3; continue; }
   case 4:
-    globals.loading___426789 = (1);
-    s.tmp_0 = pause__P185619_mk(s);
+    globals.loading___88729 = (1);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 165; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 163; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___189149);
-    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___188423);
-    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___188592);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___188265);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___188269);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___188270);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___188267);
-    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___188266);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___189150);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___189151);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___189152);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___189153);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___189154);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___189155);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___189156);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___189157);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___189158);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___189159);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___189160);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___189162);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___189163);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___189164);
-    r0 = pxsim_Array__push(s.tmp_0, globals.tile12___189161);
-    s.tmp_1 = tiles_setTilemap__P187558_mk(s);
-    s.tmp_2 = tiles_createTilemap__P187557_mk(s);
-    s.tmp_2.arg0 = _hex427096;
-    r0 = pxsim.image.ofBuffer(_hex427098);
+    r0 = pxsim_Array__push(s.tmp_0, globals.transparency16___3933);
+    r0 = pxsim_Array__push(s.tmp_0, globals.oceanSand6___3206);
+    r0 = pxsim_Array__push(s.tmp_0, globals.hazardWater___3375);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral0___3048);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral4___3052);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral5___3053);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral2___3050);
+    r0 = pxsim_Array__push(s.tmp_0, globals.coral1___3049);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile1___3934);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile2___3935);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile3___3936);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile4___3937);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile5___3938);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile6___3939);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile7___3940);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile8___3941);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile9___3942);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile10___3943);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile11___3944);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile14___3946);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile13___3947);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile15___3948);
+    r0 = pxsim_Array__push(s.tmp_0, globals.tile12___3945);
+    s.tmp_1 = tiles_setTilemap__P2341_mk(s);
+    s.tmp_2 = tiles_createTilemap__P2340_mk(s);
+    s.tmp_2.arg0 = _hex89027;
+    r0 = pxsim.image.ofBuffer(_hex89029);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = s.tmp_0;
     s.tmp_2.arg3 = 4;
-    s.callLocIdx = 166; s.pc = 27; return s.tmp_2;
+    s.callLocIdx = 164; s.pc = 27; return s.tmp_2;
   case 27:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 167; s.pc = 26; return s.tmp_1;
+    s.callLocIdx = 165; s.pc = 26; return s.tmp_1;
   case 26:
     r0 = s.retval;
-    s.tmp_0 = summon_fish__P426670_mk(s);
+    s.tmp_0 = summon_fish__P88595_mk(s);
     s.tmp_0.arg0 = false;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 168; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 166; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    globals.sprite_player_fish___427125 = (r0);
-    s.tmp_0 = Sprite_setKind__P187288_mk(s);
-    s.tmp_0.arg0 = globals.sprite_player_fish___427125;
-    s.tmp_0.arg1 = globals.Player___187345;
-    s.callLocIdx = 169; s.pc = 29; return s.tmp_0;
+    globals.sprite_player_fish___89056 = (r0);
+    s.tmp_0 = Sprite_setKind__P2071_mk(s);
+    s.tmp_0.arg0 = globals.sprite_player_fish___89056;
+    s.tmp_0.arg1 = globals.Player___2128;
+    s.callLocIdx = 167; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
-    s.tmp_0 = controller_moveSprite__P187169_mk(s);
-    s.tmp_0.arg0 = globals.sprite_player_fish___427125;
+    s.tmp_0 = controller_moveSprite__P1952_mk(s);
+    s.tmp_0.arg0 = globals.sprite_player_fish___89056;
     s.tmp_0.arg1 = 64;
     s.tmp_0.arg2 = 64;
-    s.callLocIdx = 170; s.pc = 30; return s.tmp_0;
+    s.callLocIdx = 168; s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
-    s.tmp_0 = scene_cameraFollowSprite__P187681_mk(s);
-    s.tmp_0.arg0 = globals.sprite_player_fish___427125;
-    s.callLocIdx = 171; s.pc = 31; return s.tmp_0;
+    s.tmp_0 = scene_cameraFollowSprite__P2464_mk(s);
+    s.tmp_0.arg0 = globals.sprite_player_fish___89056;
+    s.callLocIdx = 169; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
-    s.location___427136 = (undefined);
-    s.tmp_0 = tiles_getTilesByType__P187567_mk(s);
-    s.tmp_0.arg0 = globals.tile13___189163;
-    s.callLocIdx = 172; s.pc = 32; return s.tmp_0;
+    s.location___89067 = (undefined);
+    s.tmp_0 = tiles_getTilesByType__P2350_mk(s);
+    s.tmp_0.arg0 = globals.tile13___3947;
+    s.callLocIdx = 170; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
-    s.unnamed20878___U3 = (r0);
-    s.unnamed20879___U4 = (0);
+    s.unnamed3902___U3 = (r0);
+    s.unnamed3903___U4 = (0);
   case 5:
-    s.tmp_0 = r0 = s.unnamed20879___U4;
-    r0 = pxsim_Array__length(s.unnamed20878___U3);
+    s.tmp_0 = r0 = s.unnamed3903___U4;
+    r0 = pxsim_Array__length(s.unnamed3902___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed20878___U3, s.unnamed20879___U4);
-    s.location___427136 = (r0);
-    s.tmp_2 = tiles_setTileAt__P187559_mk(s);
-    s.tmp_2.arg0 = s.location___427136;
-    s.tmp_2.arg1 = globals.tile15___189164;
-    s.callLocIdx = 173; s.pc = 33; return s.tmp_2;
+    r0 = pxsim_Array__getAt(s.unnamed3902___U3, s.unnamed3903___U4);
+    s.location___89067 = (r0);
+    s.tmp_2 = tiles_setTileAt__P2342_mk(s);
+    s.tmp_2.arg0 = s.location___89067;
+    s.tmp_2.arg1 = globals.tile15___3948;
+    s.callLocIdx = 171; s.pc = 33; return s.tmp_2;
   case 33:
     r0 = s.retval;
-    r0 = (s.unnamed20879___U4 + 1);
-    s.unnamed20879___U4 = (r0);
+    r0 = (s.unnamed3903___U4 + 1);
+    s.unnamed3903___U4 = (r0);
     { step = 5; continue; }
   case 6:
-    s.unnamed20878___U3 = (undefined);
-    s.tmp_0 = info_setScore__P187423_mk(s);
+    s.unnamed3902___U3 = (undefined);
+    s.tmp_0 = info_setScore__P2206_mk(s);
     s.tmp_0.arg0 = 60000;
-    s.callLocIdx = 174; s.pc = 34; return s.tmp_0;
+    s.callLocIdx = 172; s.pc = 34; return s.tmp_0;
   case 34:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-initilize_map__P426972.info = {"start":9494,"length":6779,"line":247,"column":0,"endLine":302,"endColumn":1,"fileName":"main.ts","functionName":"initilize_map","argumentNames":[]}
+initilize_map__P88903.info = {"start":12067,"length":6779,"line":310,"column":0,"endLine":365,"endColumn":1,"fileName":"main.ts","functionName":"initilize_map","argumentNames":[]}
 
-function initilize_map__P426972_mk(s) {
+function initilize_map__P88903_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: initilize_map__P426972, depth: s.depth + 1,
+        parent: s, fn: initilize_map__P88903, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13629,22 +13612,22 @@ function initilize_map__P426972_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  index___427005: undefined,
-  index___427048: undefined,
-  location___427136: undefined,
-  unnamed20878___U3: undefined,
-  unnamed20879___U4: undefined,
+  index___88936: undefined,
+  index___88979: undefined,
+  location___89067: undefined,
+  unnamed3902___U3: undefined,
+  unnamed3903___U4: undefined,
 } }
 
-const _hex426977 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
-const _hex426979 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
-const _hex427096 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
-const _hex427098 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000002222222222220000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
+const _hex88908 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
+const _hex88910 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
+const _hex89027 = pxsim.BufferMethods.createBufferFromHex("40000c000202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020213131314141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151616161414141515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151516161614141415151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515161616141414150f151515151515151515151515151515151515151515151515151515151515150f15151515151515151515151515151515151515151515150f1616161414140c1015151515151515150c151515151515151515151515151515150c15151515151015151515151515151515151515150c1515151515151515101616161414140d1103151515151515150d0809151515151515030405151515150b0e151515150312091515150b1515150706151515150d150a1515151503151116161601010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101")
+const _hex89029 = pxsim.BufferMethods.createBufferFromHex("870440000c0000000200000000200000020000000020000002000000002000002222222222220000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002200000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002000000200000000220000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000020000000020000002000000002200000200000000200000020000000020000002000000002000000200000000200000020000000022000002000000002000000200000000200000020000000020000002000000002000000200000000200000")
 
 
 
 
-function info_setScore__P187423(s) {
+function info_setScore__P2206(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13658,22 +13641,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_setScore__P187459_mk(s);
-    s.tmp_0.arg0 = globals.player1___187474;
+    s.tmp_0 = info_PlayerInfo_setScore__P2242_mk(s);
+    s.tmp_0.arg0 = globals.player1___2257;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 24; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 805; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_setScore__P187423.info = {"start":7362,"length":80,"line":251,"column":4,"endLine":253,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"setScore","argumentNames":["value"]}
+info_setScore__P2206.info = {"start":7362,"length":80,"line":251,"column":4,"endLine":253,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"setScore","argumentNames":["value"]}
 
-function info_setScore__P187423_mk(s) {
+function info_setScore__P2206_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_setScore__P187423, depth: s.depth + 1,
+        parent: s, fn: info_setScore__P2206, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -13683,7 +13666,7 @@ function info_setScore__P187423_mk(s) {
 
 
 
-function info_PlayerInfo_constructor__P187455(s) {
+function info_PlayerInfo_constructor__P2238(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13699,7 +13682,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_player"] = (s.arg1);
     r0 = (s.arg0).fields["border"] = (1);
     r0 = (s.arg0).fields["fc"] = (1);
@@ -13715,7 +13698,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 1; continue; }
@@ -13735,7 +13718,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 4; continue; }
@@ -13748,7 +13731,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.arg0).fields["bg"] = (s.tmp_2);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["x"] = (s.tmp_1);
     r0 = (s.arg0).fields["y"] = (0);
@@ -13759,7 +13742,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
@@ -13773,13 +13756,13 @@ switch (step) {
     r0 = (s.arg0).fields["bg"] = (s.tmp_2);
     r0 = (s.arg0).fields["x"] = (0);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["y"] = (s.tmp_1);
     r0 = (s.arg0).fields["up"] = (true);
     { step = 12; continue; }
   case 9:
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
@@ -13792,11 +13775,11 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.arg0).fields["bg"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     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___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["y"] = (s.tmp_1);
     r0 = (s.arg0).fields["left"] = (true);
@@ -13804,17 +13787,17 @@ switch (step) {
   case 12:
   case 13:
   case 14:
-    r0 = pxsim_numops_toBoolDecr(globals.players___189447);
+    r0 = pxsim_numops_toBoolDecr(globals.players___4231);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
     r0 = pxsim_Array__mk();
-    globals.players___189447 = (r0);
+    globals.players___4231 = (r0);
   case 15:
   case 16:
-    s.tmp_0 = r0 = globals.players___189447;
+    s.tmp_0 = r0 = globals.players___4231;
     r0 = s.arg0.fields["_player"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
@@ -13824,12 +13807,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_constructor__P187455.info = {"start":15446,"length":1370,"line":515,"column":8,"endLine":552,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this","player"]}
+info_PlayerInfo_constructor__P2238.info = {"start":15446,"length":1370,"line":515,"column":8,"endLine":552,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this","player"]}
 
-function info_PlayerInfo_constructor__P187455_mk(s) {
+function info_PlayerInfo_constructor__P2238_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_constructor__P187455, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_constructor__P2238, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13843,7 +13826,7 @@ function info_PlayerInfo_constructor__P187455_mk(s) {
 
 
 
-function info_PlayerInfo_setScore__P187459(s) {
+function info_PlayerInfo_setScore__P2242(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13853,32 +13836,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___364749 = undefined;
+    s.state___14898 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 25; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 831; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___364749 = (r0);
-    s.tmp_0 = info_updateFlag__P189496_mk(s);
+    s.state___14898 = (r0);
+    s.tmp_0 = info_updateFlag__P4280_mk(s);
     s.tmp_0.arg0 = 2;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 26; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 832; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = info_PlayerInfo_score__P187458_mk(s);
+    s.tmp_0 = info_PlayerInfo_score__P2241_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 27; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 833; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.state___364749;
+    s.tmp_0 = r0 = s.state___14898;
     r0 = (s.arg1 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["score"] = (s.tmp_1);
@@ -13886,16 +13869,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_setScore__P187459.info = {"start":18028,"length":220,"line":596,"column":8,"endLine":602,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"setScore","argumentNames":["this","value"]}
+info_PlayerInfo_setScore__P2242.info = {"start":18028,"length":220,"line":596,"column":8,"endLine":602,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"setScore","argumentNames":["this","value"]}
 
-function info_PlayerInfo_setScore__P187459_mk(s) {
+function info_PlayerInfo_setScore__P2242_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_setScore__P187459, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_setScore__P2242, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  state___364749: undefined,
+  state___14898: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -13904,7 +13887,7 @@ function info_PlayerInfo_setScore__P187459_mk(s) {
 
 
 
-function info_updateFlag__P189496(s) {
+function info_updateFlag__P4280(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13919,13 +13902,13 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_initHUD__P189492_mk(s);
-    s.callLocIdx = 810; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = info_initHUD__P4276_mk(s);
+    s.callLocIdx = 812; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = r0 = globals.infoState___189446;
+    s.tmp_0 = r0 = globals.infoState___4230;
     r0 = s.tmp_0.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | s.arg0);
@@ -13933,8 +13916,8 @@ switch (step) {
     r0 = (s.tmp_0).fields["visibilityFlag"] = (s.tmp_1);
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = r0 = globals.infoState___189446;
-    r0 = globals.infoState___189446.fields["visibilityFlag"];
+    s.tmp_0 = r0 = globals.infoState___4230;
+    r0 = globals.infoState___4230.fields["visibilityFlag"];
     s.tmp_4 = r0;
     r0 = (~ s.tmp_4);
     s.tmp_3 = r0;
@@ -13948,12 +13931,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_updateFlag__P189496.info = {"start":11455,"length":204,"line":393,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"updateFlag","argumentNames":["flag","on"]}
+info_updateFlag__P4280.info = {"start":11455,"length":204,"line":393,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"updateFlag","argumentNames":["flag","on"]}
 
-function info_updateFlag__P189496_mk(s) {
+function info_updateFlag__P4280_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_updateFlag__P189496, depth: s.depth + 1,
+        parent: s, fn: info_updateFlag__P4280, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -13968,7 +13951,7 @@ function info_updateFlag__P189496_mk(s) {
 
 
 
-function info_initHUD__P189492(s) {
+function info_initHUD__P4276(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -13978,22 +13961,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.infoState___189446);
+    r0 = pxsim_numops_toBoolDecr(globals.infoState___4230);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(info_InfoState__C189443_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(info_InfoState__C4227_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = info_InfoState_constructor__P189444_mk(s);
+    s.tmp_1 = info_InfoState_constructor__P4228_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 779; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    globals.infoState___189446 = (s.tmp_0);
-    s.tmp_0 = scene_createRenderable__P187600_mk(s);
+    globals.infoState___4230 = (s.tmp_0);
+    s.tmp_0 = scene_createRenderable__P2383_mk(s);
     s.tmp_0.arg0 = 100;
-    s.tmp_0.arg1 = inline__P193334;
+    s.tmp_0.arg1 = inline__P14958;
     s.tmp_0.arg2 = undefined;
     s.callLocIdx = 795; s.pc = 5; return s.tmp_0;
   case 5:
@@ -14003,12 +13986,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_initHUD__P189492.info = {"start":2595,"length":2080,"line":97,"column":4,"endLine":147,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"initHUD","argumentNames":[]}
+info_initHUD__P4276.info = {"start":2595,"length":2080,"line":97,"column":4,"endLine":147,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"initHUD","argumentNames":[]}
 
-function info_initHUD__P189492_mk(s) {
+function info_initHUD__P4276_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_initHUD__P189492, depth: s.depth + 1,
+        parent: s, fn: info_initHUD__P4276, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14018,7 +14001,7 @@ function info_initHUD__P189492_mk(s) {
 
 
 
-function inline__P193334(s) {
+function inline__P14958(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14028,12 +14011,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ps___193343 = undefined;
-    s.p___193364 = undefined;
-    s.scene___193397 = undefined;
-    s.elapsed___193400 = undefined;
-    s.t___193408 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.infoState___189446);
+    s.ps___14967 = undefined;
+    s.p___14988 = undefined;
+    s.scene___15022 = undefined;
+    s.elapsed___15025 = undefined;
+    s.t___15033 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.infoState___4230);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -14042,36 +14025,36 @@ switch (step) {
     { step = 23; continue; }
   case 1:
   case 2:
-    r0 = globals.infoState___189446.fields["visibilityFlag"];
+    r0 = globals.infoState___4230.fields["visibilityFlag"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 16);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_2.arg0 = globals.players___189447;
-    s.tmp_2.arg1 = inline__P193345;
+    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_2.arg0 = globals.players___4231;
+    s.tmp_2.arg1 = inline__P14969;
     s.callLocIdx = 780; s.pc = 24; return s.tmp_2;
   case 24:
     r0 = s.retval;
-    s.ps___193343 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_0.arg0 = s.ps___193343;
-    s.tmp_0.arg1 = inline__P193354;
+    s.ps___14967 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_0.arg0 = s.ps___14967;
+    s.tmp_0.arg1 = inline__P14978;
     s.callLocIdx = 782; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_0.arg0 = s.ps___193343;
-    s.tmp_0.arg1 = inline__P193360;
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_0.arg0 = s.ps___14967;
+    s.tmp_0.arg1 = inline__P14984;
     s.callLocIdx = 784; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
     { step = 12; continue; }
   case 3:
-    s.p___193364 = (globals.player1___187474);
-    s.tmp_1 = info_PlayerInfo_hasScore__P187461_mk(s);
-    s.tmp_1.arg0 = s.p___193364;
+    s.p___14988 = (globals.player1___2257);
+    s.tmp_1 = info_PlayerInfo_hasScore__P2244_mk(s);
+    s.tmp_1.arg0 = s.p___14988;
     s.callLocIdx = 785; s.pc = 27; return s.tmp_1;
   case 27:
     r0 = s.retval;
@@ -14081,7 +14064,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 4:
-    r0 = globals.infoState___189446.fields["visibilityFlag"];
+    r0 = globals.infoState___4230.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 2);
   case 5:
@@ -14089,15 +14072,15 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 6; continue; }
-    s.tmp_4 = info_PlayerInfo_drawScore__P187469_mk(s);
-    s.tmp_4.arg0 = s.p___193364;
+    s.tmp_4 = info_PlayerInfo_drawScore__P2252_mk(s);
+    s.tmp_4.arg0 = s.p___14988;
     s.callLocIdx = 786; s.pc = 28; return s.tmp_4;
   case 28:
     r0 = s.retval;
   case 6:
   case 7:
-    s.tmp_1 = info_PlayerInfo_hasLife__P187465_mk(s);
-    s.tmp_1.arg0 = s.p___193364;
+    s.tmp_1 = info_PlayerInfo_hasLife__P2248_mk(s);
+    s.tmp_1.arg0 = s.p___14988;
     s.callLocIdx = 787; s.pc = 29; return s.tmp_1;
   case 29:
     r0 = s.retval;
@@ -14107,7 +14090,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 9; continue; }
   case 8:
-    r0 = globals.infoState___189446.fields["visibilityFlag"];
+    r0 = globals.infoState___4230.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 4);
   case 9:
@@ -14115,21 +14098,21 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 10; continue; }
-    s.tmp_4 = info_PlayerInfo_drawLives__P187470_mk(s);
-    s.tmp_4.arg0 = s.p___193364;
+    s.tmp_4 = info_PlayerInfo_drawLives__P2253_mk(s);
+    s.tmp_4.arg0 = s.p___14988;
     s.callLocIdx = 788; s.pc = 30; return s.tmp_4;
   case 30:
     r0 = s.retval;
   case 10:
   case 11:
-    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P187467_mk(s);
-    s.tmp_0.arg0 = s.p___193364;
+    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P2250_mk(s);
+    s.tmp_0.arg0 = s.p___14988;
     s.tmp_0.arg1 = true;
     s.callLocIdx = 789; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
   case 12:
-    r0 = globals.infoState___189446.fields["gameEnd"];
+    r0 = globals.infoState___4230.fields["gameEnd"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
     s.tmp_0 = r0;
@@ -14138,7 +14121,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 14; continue; }
   case 13:
-    r0 = globals.infoState___189446.fields["visibilityFlag"];
+    r0 = globals.infoState___4230.fields["visibilityFlag"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 1);
   case 14:
@@ -14146,30 +14129,30 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 21; continue; }
-    s.tmp_4 = game_currentScene__P187749_mk(s);
+    s.tmp_4 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 790; s.pc = 32; return s.tmp_4;
   case 32:
     r0 = s.retval;
-    s.scene___193397 = (r0);
-    r0 = globals.infoState___189446.fields["gameEnd"];
+    s.scene___15022 = (r0);
+    r0 = globals.infoState___4230.fields["gameEnd"];
     s.tmp_0 = r0;
-    r0 = s.scene___193397.fields["_millis"];
+    r0 = s.scene___15022.fields["_millis"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.elapsed___193400 = (r0);
-    s.tmp_0 = info_drawTimer__P189497_mk(s);
-    s.tmp_0.arg0 = s.elapsed___193400;
+    s.elapsed___15025 = (r0);
+    s.tmp_0 = info_drawTimer__P4281_mk(s);
+    s.tmp_0.arg0 = s.elapsed___15025;
     s.callLocIdx = 792; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    r0 = (s.elapsed___193400 / 1000);
-    s.t___193408 = (r0);
-    r0 = (s.t___193408 <= 0);
+    r0 = (s.elapsed___15025 / 1000);
+    s.t___15033 = (r0);
+    r0 = (s.t___15033 <= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    s.t___193408 = (0);
-    r0 = globals.infoState___189446.fields["countdownExpired"];
+    s.t___15033 = (0);
+    r0 = globals.infoState___4230.fields["countdownExpired"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -14177,14 +14160,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
-    r0 = (globals.infoState___189446).fields["countdownExpired"] = (true);
-    r0 = (globals.infoState___189446).fields["gameEnd"] = (undefined);
-    r0 = globals.infoState___189446.fields["countdownEndHandler"];
+    r0 = (globals.infoState___4230).fields["countdownExpired"] = (true);
+    r0 = (globals.infoState___4230).fields["gameEnd"] = (undefined);
+    r0 = globals.infoState___4230.fields["countdownEndHandler"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
     s.tmp_1 = if_countdownEndHandler_1_mk(s);
-    s.tmp_1.arg0 = globals.infoState___189446;
+    s.tmp_1.arg0 = globals.infoState___4230;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "countdownEndHandler"), 1);
       s.callLocIdx = 793; s.pc = 34; return s.tmp_1;
@@ -14198,7 +14181,7 @@ switch (step) {
     r0 = s.retval;
     { step = 16; continue; }
   case 15:
-    s.tmp_0 = game_over__P187759_mk(s);
+    s.tmp_0 = game_over__P2542_mk(s);
     s.tmp_0.arg0 = false;
     s.tmp_0.arg1 = undefined;
     s.callLocIdx = 794; s.pc = 35; return s.tmp_0;
@@ -14216,30 +14199,30 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P193334.info = {"start":2755,"length":1903,"line":104,"column":12,"endLine":145,"endColumn":13,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":[]}
+inline__P14958.info = {"start":2755,"length":1903,"line":104,"column":12,"endLine":145,"endColumn":13,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P193334_mk(s) {
+function inline__P14958_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P193334, depth: s.depth + 1,
+        parent: s, fn: inline__P14958, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  ps___193343: undefined,
-  p___193364: undefined,
-  scene___193397: undefined,
-  elapsed___193400: undefined,
-  t___193408: undefined,
+  ps___14967: undefined,
+  p___14988: undefined,
+  scene___15022: undefined,
+  elapsed___15025: undefined,
+  t___15033: undefined,
 } }
 
 
 
 
 
-function inline__P193345(s) {
+function inline__P14969(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14263,12 +14246,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P193345.info = {"start":3003,"length":8,"line":109,"column":46,"endLine":109,"endColumn":54,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P14969.info = {"start":3003,"length":8,"line":109,"column":46,"endLine":109,"endColumn":54,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P193345_mk(s) {
+function inline__P14969_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P193345, depth: s.depth + 1,
+        parent: s, fn: inline__P14969, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14280,7 +14263,7 @@ function inline__P193345_mk(s) {
 
 
 
-function inline__P193354(s) {
+function inline__P14978(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14294,7 +14277,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_drawPlayer__P187468_mk(s);
+    s.tmp_0 = info_PlayerInfo_drawPlayer__P2251_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 781; s.pc = 1; return s.tmp_0;
   case 1:
@@ -14303,12 +14286,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P193354.info = {"start":3087,"length":19,"line":111,"column":31,"endLine":111,"endColumn":50,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P14978.info = {"start":3087,"length":19,"line":111,"column":31,"endLine":111,"endColumn":50,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P193354_mk(s) {
+function inline__P14978_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P193354, depth: s.depth + 1,
+        parent: s, fn: inline__P14978, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -14318,7 +14301,7 @@ function inline__P193354_mk(s) {
 
 
 
-function inline__P193360(s) {
+function inline__P14984(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14332,7 +14315,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P187467_mk(s);
+    s.tmp_0 = info_PlayerInfo_raiseLifeZero__P2250_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
     s.callLocIdx = 783; s.pc = 1; return s.tmp_0;
@@ -14342,12 +14325,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P193360.info = {"start":3189,"length":27,"line":113,"column":31,"endLine":113,"endColumn":58,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P14984.info = {"start":3189,"length":27,"line":113,"column":31,"endLine":113,"endColumn":58,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P193360_mk(s) {
+function inline__P14984_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P193360, depth: s.depth + 1,
+        parent: s, fn: inline__P14984, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -14357,7 +14340,7 @@ function inline__P193360_mk(s) {
 
 
 
-function info_drawTimer__P189497(s) {
+function info_drawTimer__P4281(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14367,18 +14350,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.font___193436 = undefined;
-    s.smallFont___193438 = undefined;
-    s.seconds___193440 = undefined;
-    s.width___193444 = undefined;
-    s.left___193449 = undefined;
-    s.color1___193459 = undefined;
-    s.color2___193463 = undefined;
-    s.temp___193476 = undefined;
-    s.remainder___193512 = undefined;
-    s.decimalLeft___193531 = undefined;
-    s.minutes___193549 = undefined;
-    s.remainder___193553 = undefined;
+    s.font___15062 = undefined;
+    s.smallFont___15064 = undefined;
+    s.seconds___15066 = undefined;
+    s.width___15070 = undefined;
+    s.left___15075 = undefined;
+    s.color1___15085 = undefined;
+    s.color2___15089 = undefined;
+    s.temp___15102 = undefined;
+    s.remainder___15138 = undefined;
+    s.decimalLeft___15157 = undefined;
+    s.minutes___15175 = undefined;
+    s.remainder___15179 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -14392,19 +14375,19 @@ switch (step) {
   case 2:
     r0 = (s.arg0 | 0);
     s.arg0 = (r0);
-    s.font___193436 = (globals.font8___186962);
-    s.smallFont___193438 = (globals.font5___186967);
+    s.font___15062 = (globals.font8___1745);
+    s.smallFont___15064 = (globals.font5___1750);
     r0 = pxsim.Math_.idiv(s.arg0, 1000);
-    s.seconds___193440 = (r0);
+    s.seconds___15066 = (r0);
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.font___193436;
+    s.tmp_2.arg0 = s.font___15062;
     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 = 811; s.pc = 11; return s.tmp_2; }
+     else { s.callLocIdx = 813; s.pc = 11; return s.tmp_2; }
     }
   case 11:
     r0 = s.retval;
@@ -14412,29 +14395,29 @@ switch (step) {
     r0 = (s.tmp_1 * 5);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 2);
-    s.width___193444 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.width___15070 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
-    r0 = (s.width___193444 >> 1);
+    r0 = (s.width___15070 >> 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_1 - s.tmp_3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.left___193449 = (r0);
-    r0 = globals.infoState___189446.fields["fontColor"];
-    s.color1___193459 = (r0);
-    r0 = globals.infoState___189446.fields["bgColor"];
-    s.color2___193463 = (r0);
-    r0 = (s.seconds___193440 < 10);
+    s.left___15075 = (r0);
+    r0 = globals.infoState___4230.fields["fontColor"];
+    s.color1___15085 = (r0);
+    r0 = globals.infoState___4230.fields["bgColor"];
+    s.color2___15089 = (r0);
+    r0 = (s.seconds___15066 < 10);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = (s.seconds___193440 & 1);
+    r0 = (s.seconds___15066 & 1);
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -14443,7 +14426,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 6; continue; }
   case 5:
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -14453,77 +14436,77 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 7; continue; }
-    s.temp___193476 = (s.color1___193459);
-    s.color1___193459 = (s.color2___193463);
-    s.color2___193463 = (s.temp___193476);
+    s.temp___15102 = (s.color1___15085);
+    s.color1___15085 = (s.color2___15089);
+    s.color2___15089 = (s.temp___15102);
   case 7:
   case 8:
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    r0 = (s.left___193449 - 3);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    r0 = (s.left___15075 - 3);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = (s.width___193444 + 6);
+    r0 = (s.width___15070 + 6);
     s.tmp_0.arg3 = r0;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___193436;
+    s.tmp_2.arg0 = s.font___15062;
     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 = 812; s.pc = 13; return s.tmp_2; }
+     else { s.callLocIdx = 814; s.pc = 13; return s.tmp_2; }
     }
   case 13:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___189446.fields["borderColor"];
+    r0 = globals.infoState___4230.fields["borderColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 813; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 815; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    r0 = (s.left___193449 - 2);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    r0 = (s.left___15075 - 2);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = (s.width___193444 + 4);
+    r0 = (s.width___15070 + 4);
     s.tmp_0.arg3 = r0;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___193436;
+    s.tmp_2.arg0 = s.font___15062;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charHeight");
     } else {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charHeight"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charHeight"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 814; s.pc = 15; return s.tmp_2; }
+     else { s.callLocIdx = 816; s.pc = 15; return s.tmp_2; }
     }
   case 15:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.color2___193463;
-    s.callLocIdx = 815; s.pc = 14; return s.tmp_0;
+    s.tmp_0.arg5 = s.color2___15089;
+    s.callLocIdx = 817; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    r0 = (s.seconds___193440 < 60);
+    r0 = (s.seconds___15066 < 60);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
     r0 = (s.arg0 % 1000);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 10);
-    s.remainder___193512 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_3 = info_formatDecimal__P189499_mk(s);
-    s.tmp_3.arg0 = s.seconds___193440;
-    s.callLocIdx = 816; s.pc = 17; return s.tmp_3;
+    s.remainder___15138 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_3 = info_formatDecimal__P4283_mk(s);
+    s.tmp_3.arg0 = s.seconds___15066;
+    s.callLocIdx = 818; s.pc = 17; return s.tmp_3;
   case 17:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -14538,24 +14521,24 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_1, ".");
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.left___193449;
+    s.tmp_0.arg2 = s.left___15075;
     s.tmp_0.arg3 = 1;
-    s.tmp_0.arg4 = s.color1___193459;
-    s.tmp_0.arg5 = s.font___193436;
+    s.tmp_0.arg4 = s.color1___15085;
+    s.tmp_0.arg5 = s.font___15062;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 817; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 819; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.left___193449;
+    s.tmp_0 = r0 = s.left___15075;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___193436;
+    s.tmp_3.arg0 = s.font___15062;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 818; s.pc = 19; return s.tmp_3; }
+     else { s.callLocIdx = 820; s.pc = 19; return s.tmp_3; }
     }
   case 19:
     r0 = s.retval;
@@ -14563,34 +14546,34 @@ switch (step) {
     r0 = (3 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.decimalLeft___193531 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_1 = info_formatDecimal__P189499_mk(s);
-    s.tmp_1.arg0 = s.remainder___193512;
-    s.callLocIdx = 819; s.pc = 21; return s.tmp_1;
+    s.decimalLeft___15157 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_1 = info_formatDecimal__P4283_mk(s);
+    s.tmp_1.arg0 = s.remainder___15138;
+    s.callLocIdx = 821; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.decimalLeft___193531;
+    s.tmp_0.arg2 = s.decimalLeft___15157;
     s.tmp_0.arg3 = 3;
-    s.tmp_0.arg4 = s.color1___193459;
-    s.tmp_0.arg5 = s.smallFont___193438;
+    s.tmp_0.arg4 = s.color1___15085;
+    s.tmp_0.arg5 = s.smallFont___15064;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 820; s.pc = 20; return s.tmp_0;
+    s.callLocIdx = 822; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     { step = 10; continue; }
   case 9:
-    r0 = pxsim.Math_.idiv(s.seconds___193440, 60);
-    s.minutes___193549 = (r0);
-    r0 = (s.seconds___193440 % 60);
-    s.remainder___193553 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_5 = info_formatDecimal__P189499_mk(s);
-    s.tmp_5.arg0 = s.minutes___193549;
-    s.callLocIdx = 821; s.pc = 23; return s.tmp_5;
+    r0 = pxsim.Math_.idiv(s.seconds___15066, 60);
+    s.minutes___15175 = (r0);
+    r0 = (s.seconds___15066 % 60);
+    s.remainder___15179 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_5 = info_formatDecimal__P4283_mk(s);
+    s.tmp_5.arg0 = s.minutes___15175;
+    s.callLocIdx = 823; s.pc = 23; return s.tmp_5;
   case 23:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -14614,9 +14597,9 @@ switch (step) {
   case 25:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_8 = info_formatDecimal__P189499_mk(s);
-    s.tmp_8.arg0 = s.remainder___193553;
-    s.callLocIdx = 822; s.pc = 26; return s.tmp_8;
+    s.tmp_8 = info_formatDecimal__P4283_mk(s);
+    s.tmp_8.arg0 = s.remainder___15179;
+    s.callLocIdx = 824; s.pc = 26; return s.tmp_8;
   case 26:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -14631,12 +14614,12 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_6);
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.left___193449;
+    s.tmp_0.arg2 = s.left___15075;
     s.tmp_0.arg3 = 1;
-    s.tmp_0.arg4 = s.color1___193459;
-    s.tmp_0.arg5 = s.font___193436;
+    s.tmp_0.arg4 = s.color1___15085;
+    s.tmp_0.arg5 = s.font___15062;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 823; s.pc = 22; return s.tmp_0;
+    s.callLocIdx = 825; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
   case 10:
@@ -14644,12 +14627,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_drawTimer__P189497.info = {"start":13488,"length":1328,"line":462,"column":4,"endLine":497,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"drawTimer","argumentNames":["millis"]}
+info_drawTimer__P4281.info = {"start":13488,"length":1328,"line":462,"column":4,"endLine":497,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"drawTimer","argumentNames":["millis"]}
 
-function info_drawTimer__P189497_mk(s) {
+function info_drawTimer__P4281_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_drawTimer__P189497, depth: s.depth + 1,
+        parent: s, fn: info_drawTimer__P4281, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14660,18 +14643,18 @@ function info_drawTimer__P189497_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  font___193436: undefined,
-  smallFont___193438: undefined,
-  seconds___193440: undefined,
-  width___193444: undefined,
-  left___193449: undefined,
-  color1___193459: undefined,
-  color2___193463: undefined,
-  temp___193476: undefined,
-  remainder___193512: undefined,
-  decimalLeft___193531: undefined,
-  minutes___193549: undefined,
-  remainder___193553: undefined,
+  font___15062: undefined,
+  smallFont___15064: undefined,
+  seconds___15066: undefined,
+  width___15070: undefined,
+  left___15075: undefined,
+  color1___15085: undefined,
+  color2___15089: undefined,
+  temp___15102: undefined,
+  remainder___15138: undefined,
+  decimalLeft___15157: undefined,
+  minutes___15175: undefined,
+  remainder___15179: undefined,
   arg0: undefined,
 } }
 
@@ -14679,7 +14662,7 @@ function info_drawTimer__P189497_mk(s) {
 
 
 
-function info_formatDecimal__P189499(s) {
+function info_formatDecimal__P4283(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14717,12 +14700,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_formatDecimal__P189499.info = {"start":28426,"length":156,"line":916,"column":4,"endLine":922,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"formatDecimal","argumentNames":["val"]}
+info_formatDecimal__P4283.info = {"start":28426,"length":156,"line":916,"column":4,"endLine":922,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"formatDecimal","argumentNames":["val"]}
 
-function info_formatDecimal__P189499_mk(s) {
+function info_formatDecimal__P4283_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_formatDecimal__P189499, depth: s.depth + 1,
+        parent: s, fn: info_formatDecimal__P4283, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -14733,7 +14716,7 @@ function info_formatDecimal__P189499_mk(s) {
 
 
 
-function helpers_imagePrint__P186977(s) {
+function helpers_imagePrint__P1760(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -14743,31 +14726,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x0___193610 = undefined;
-    s.cp___193612 = undefined;
-    s.mult___193613 = undefined;
-    s.dataW___193618 = undefined;
-    s.dataH___193624 = undefined;
-    s.byteHeight___193630 = undefined;
-    s.charSize___193636 = undefined;
-    s.dataSize___193640 = undefined;
-    s.fontdata___193644 = undefined;
-    s.lastchar___193647 = undefined;
-    s.imgBuf___193654 = undefined;
-    s.xOffset___193678 = undefined;
-    s.yOffset___193679 = undefined;
-    s.ch___193694 = undefined;
-    s.l___193713 = undefined;
-    s.r___193714 = undefined;
-    s.off___193716 = undefined;
-    s.guess___193717 = undefined;
-    s.m___193736 = undefined;
-    s.v___193745 = undefined;
-    s.i___193801 = undefined;
-    s.j___193806 = undefined;
-    s.mask___193807 = undefined;
-    s.c___193808 = undefined;
-    s.n___193825 = undefined;
+    s.x0___8846 = undefined;
+    s.cp___8848 = undefined;
+    s.mult___8849 = undefined;
+    s.dataW___8854 = undefined;
+    s.dataH___8860 = undefined;
+    s.byteHeight___8866 = undefined;
+    s.charSize___8872 = undefined;
+    s.dataSize___8876 = undefined;
+    s.fontdata___8880 = undefined;
+    s.lastchar___8883 = undefined;
+    s.imgBuf___8890 = undefined;
+    s.xOffset___8914 = undefined;
+    s.yOffset___8915 = undefined;
+    s.ch___8930 = undefined;
+    s.l___8949 = undefined;
+    s.r___8950 = undefined;
+    s.off___8952 = undefined;
+    s.guess___8953 = undefined;
+    s.m___8972 = undefined;
+    s.v___8981 = undefined;
+    s.i___9037 = undefined;
+    s.j___9042 = undefined;
+    s.mask___9043 = undefined;
+    s.c___9044 = undefined;
+    s.n___9061 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -14788,7 +14771,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = image_getFontForText__P186964_mk(s);
+    s.tmp_2 = image_getFontForText__P1747_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 139; s.pc = 39; return s.tmp_2;
   case 39:
@@ -14805,8 +14788,8 @@ switch (step) {
     s.arg4 = (1);
   case 3:
   case 4:
-    s.x0___193610 = (s.arg2);
-    s.cp___193612 = (0);
+    s.x0___8846 = (s.arg2);
+    s.cp___8848 = (0);
     s.tmp_1 = if_multiplier_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -14840,7 +14823,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.mult___193613 = (s.tmp_3);
+    s.mult___8849 = (s.tmp_3);
     s.tmp_1 = if_charWidth_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -14854,8 +14837,8 @@ switch (step) {
   case 42:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___193613);
-    s.dataW___193618 = (r0);
+    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___8849);
+    s.dataW___8854 = (r0);
     s.tmp_1 = if_charHeight_1_mk(s);
     s.tmp_1.arg0 = s.arg5;
     if (!s.tmp_1.arg0.vtable.iface) {
@@ -14869,16 +14852,16 @@ switch (step) {
   case 43:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___193613);
-    s.dataH___193624 = (r0);
-    r0 = (s.dataH___193624 + 7);
+    r0 = pxsim.Math_.idiv(s.tmp_0, s.mult___8849);
+    s.dataH___8860 = (r0);
+    r0 = (s.dataH___8860 + 7);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 3);
-    s.byteHeight___193630 = (r0);
-    r0 = (s.byteHeight___193630 * s.dataW___193618);
-    s.charSize___193636 = (r0);
-    r0 = (2 + s.charSize___193636);
-    s.dataSize___193640 = (r0);
+    s.byteHeight___8866 = (r0);
+    r0 = (s.byteHeight___8866 * s.dataW___8854);
+    s.charSize___8872 = (r0);
+    r0 = (2 + s.charSize___8872);
+    s.dataSize___8876 = (r0);
     s.tmp_0 = if_data_1_mk(s);
     s.tmp_0.arg0 = s.arg5;
     if (!s.tmp_0.arg0.vtable.iface) {
@@ -14891,44 +14874,44 @@ switch (step) {
     }
   case 44:
     r0 = s.retval;
-    s.fontdata___193644 = (r0);
-    r0 = pxsim.BufferMethods.length(s.fontdata___193644);
+    s.fontdata___8880 = (r0);
+    r0 = pxsim.BufferMethods.length(s.fontdata___8880);
     s.tmp_1 = r0;
-    r0 = pxsim.Math_.idiv(s.tmp_1, s.dataSize___193640);
+    r0 = pxsim.Math_.idiv(s.tmp_1, s.dataSize___8876);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.lastchar___193647 = (r0);
-    r0 = (s.mult___193613 == 1);
+    s.lastchar___8883 = (r0);
+    r0 = (s.mult___8849 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = (8 + s.charSize___193636);
+    r0 = (8 + s.charSize___8872);
     s.tmp_1 = r0;
     r0 = pxsim.control.createBuffer(s.tmp_1);
-    s.imgBuf___193654 = (r0);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___193654, 0, 135);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___193654, 1, 1);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___193654, 2, s.dataW___193618);
-    r0 = pxsim.BufferMethods.setByte(s.imgBuf___193654, 4, s.dataH___193624);
+    s.imgBuf___8890 = (r0);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8890, 0, 135);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8890, 1, 1);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8890, 2, s.dataW___8854);
+    r0 = pxsim.BufferMethods.setByte(s.imgBuf___8890, 4, s.dataH___8860);
   case 7:
   case 8:
   case 9:
-    s.tmp_1 = r0 = s.cp___193612;
+    s.tmp_1 = r0 = s.cp___8848;
     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___193678 = (0);
-    s.yOffset___193679 = (0);
+    s.xOffset___8914 = (0);
+    s.yOffset___8915 = (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___193612;
+    s.tmp_1 = r0 = s.cp___8848;
     r0 = pxsim_Array__length(s.arg6);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
@@ -14938,7 +14921,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___193612);
+    r0 = pxsim_Array__getAt(s.arg6, s.cp___8848);
     s.tmp_4.arg0 = r0;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "xOffset");
@@ -14950,9 +14933,9 @@ switch (step) {
     }
   case 45:
     r0 = s.retval;
-    s.xOffset___193678 = (r0);
+    s.xOffset___8914 = (r0);
     s.tmp_0 = if_yOffset_1_mk(s);
-    r0 = pxsim_Array__getAt(s.arg6, s.cp___193612);
+    r0 = pxsim_Array__getAt(s.arg6, s.cp___8848);
     s.tmp_0.arg0 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "yOffset");
@@ -14964,15 +14947,15 @@ switch (step) {
     }
   case 46:
     r0 = s.retval;
-    s.yOffset___193679 = (r0);
+    s.yOffset___8915 = (r0);
   case 12:
   case 13:
-    s.tmp_0 = r0 = s.cp___193612;
+    s.tmp_0 = r0 = s.cp___8848;
     r0 = (s.tmp_0 + 1);
-    s.cp___193612 = (r0);
+    s.cp___8848 = (r0);
     r0 = pxsim_String_.charCodeAt(s.arg1, s.tmp_0);
-    s.ch___193694 = (r0);
-    r0 = (s.ch___193694 == 10);
+    s.ch___8930 = (r0);
+    r0 = (s.ch___8930 == 10);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
@@ -14994,89 +14977,89 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.arg3 = (r0);
-    s.arg2 = (s.x0___193610);
+    s.arg2 = (s.x0___8846);
   case 14:
   case 15:
-    r0 = (s.ch___193694 < 32);
+    r0 = (s.ch___8930 < 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___193713 = (0);
-    s.r___193714 = (s.lastchar___193647);
-    s.off___193716 = (0);
-    r0 = (s.ch___193694 - 32);
+    s.l___8949 = (0);
+    s.r___8950 = (s.lastchar___8883);
+    s.off___8952 = (0);
+    r0 = (s.ch___8930 - 32);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.dataSize___193640);
-    s.guess___193717 = (r0);
-    r0 = pxsim.BufferMethods.getNumber(s.fontdata___193644, 4, s.guess___193717);
+    r0 = (s.tmp_0 * s.dataSize___8876);
+    s.guess___8953 = (r0);
+    r0 = pxsim.BufferMethods.getNumber(s.fontdata___8880, 4, s.guess___8953);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.ch___193694);
+    r0 = (s.tmp_1 == s.ch___8930);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.off___193716 = (s.guess___193717);
+    s.off___8952 = (s.guess___8953);
     { step = 25; continue; }
   case 18:
   case 19:
-    r0 = (s.l___193713 <= s.r___193714);
+    r0 = (s.l___8949 <= s.r___8950);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 24; continue; }
-    s.tmp_1 = r0 = s.l___193713;
-    r0 = (s.r___193714 - s.l___193713);
+    s.tmp_1 = r0 = s.l___8949;
+    r0 = (s.r___8950 - s.l___8949);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
-    s.m___193736 = (r0);
-    s.tmp_0 = r0 = s.fontdata___193644;
-    r0 = (s.m___193736 * s.dataSize___193640);
+    s.m___8972 = (r0);
+    s.tmp_0 = r0 = s.fontdata___8880;
+    r0 = (s.m___8972 * s.dataSize___8876);
     s.tmp_1 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_0, 4, s.tmp_1);
-    s.v___193745 = (r0);
-    r0 = (s.v___193745 == s.ch___193694);
+    s.v___8981 = (r0);
+    r0 = (s.v___8981 == s.ch___8930);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = (s.m___193736 * s.dataSize___193640);
-    s.off___193716 = (r0);
+    r0 = (s.m___8972 * s.dataSize___8876);
+    s.off___8952 = (r0);
     { step = 24; continue; }
   case 20:
   case 21:
-    r0 = (s.v___193745 < s.ch___193694);
+    r0 = (s.v___8981 < s.ch___8930);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = (s.m___193736 + 1);
-    s.l___193713 = (r0);
+    r0 = (s.m___8972 + 1);
+    s.l___8949 = (r0);
     { step = 23; continue; }
   case 22:
-    r0 = (s.m___193736 - 1);
-    s.r___193714 = (r0);
+    r0 = (s.m___8972 - 1);
+    s.r___8950 = (r0);
   case 23:
     { step = 19; continue; }
   case 24:
   case 25:
-    r0 = (s.mult___193613 == 1);
+    r0 = (s.mult___8849 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    s.tmp_1 = r0 = s.imgBuf___193654;
-    s.tmp_3 = r0 = s.fontdata___193644;
-    r0 = (s.off___193716 + 2);
+    s.tmp_1 = r0 = s.imgBuf___8890;
+    s.tmp_3 = r0 = s.fontdata___8880;
+    r0 = (s.off___8952 + 2);
     s.tmp_4 = r0;
-    r0 = pxsim.BufferMethods.slice(s.tmp_3, s.tmp_4, s.charSize___193636);
+    r0 = pxsim.BufferMethods.slice(s.tmp_3, s.tmp_4, s.charSize___8872);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.write(s.tmp_1, 8, s.tmp_2);
-    s.tmp_0 = helpers_imageDrawIcon__P186944_mk(s);
+    s.tmp_0 = helpers_imageDrawIcon__P1727_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.imgBuf___193654;
-    r0 = (s.arg2 + s.xOffset___193678);
+    s.tmp_0.arg1 = s.imgBuf___8890;
+    r0 = (s.arg2 + s.xOffset___8914);
     s.tmp_0.arg2 = r0;
-    r0 = (s.arg3 + s.yOffset___193679);
+    r0 = (s.arg3 + s.yOffset___8915);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg4;
     s.callLocIdx = 148; s.pc = 48; return s.tmp_0;
@@ -15100,88 +15083,88 @@ switch (step) {
     s.arg2 = (r0);
     { step = 37; continue; }
   case 26:
-    r0 = (s.off___193716 + 2);
-    s.off___193716 = (r0);
-    s.i___193801 = (0);
+    r0 = (s.off___8952 + 2);
+    s.off___8952 = (r0);
+    s.i___9037 = (0);
   case 27:
-    r0 = (s.i___193801 < s.dataW___193618);
+    r0 = (s.i___9037 < s.dataW___8854);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 36; continue; }
-    s.j___193806 = (0);
-    s.mask___193807 = (1);
-    s.tmp_0 = r0 = s.off___193716;
+    s.j___9042 = (0);
+    s.mask___9043 = (1);
+    s.tmp_0 = r0 = s.off___8952;
     r0 = (s.tmp_0 + 1);
-    s.off___193716 = (r0);
-    r0 = pxsim.BufferMethods.getByte(s.fontdata___193644, s.tmp_0);
-    s.c___193808 = (r0);
+    s.off___8952 = (r0);
+    r0 = pxsim.BufferMethods.getByte(s.fontdata___8880, s.tmp_0);
+    s.c___9044 = (r0);
   case 28:
-    r0 = (s.j___193806 < s.dataH___193624);
+    r0 = (s.j___9042 < s.dataH___8860);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 35; continue; }
-    r0 = (s.mask___193807 == 256);
+    r0 = (s.mask___9043 == 256);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 29; continue; }
-    s.tmp_2 = r0 = s.off___193716;
+    s.tmp_2 = r0 = s.off___8952;
     r0 = (s.tmp_2 + 1);
-    s.off___193716 = (r0);
-    r0 = pxsim.BufferMethods.getByte(s.fontdata___193644, s.tmp_2);
-    s.c___193808 = (r0);
-    s.mask___193807 = (1);
+    s.off___8952 = (r0);
+    r0 = pxsim.BufferMethods.getByte(s.fontdata___8880, s.tmp_2);
+    s.c___9044 = (r0);
+    s.mask___9043 = (1);
   case 29:
   case 30:
-    s.n___193825 = (0);
+    s.n___9061 = (0);
   case 31:
-    r0 = (s.c___193808 & s.mask___193807);
+    r0 = (s.c___9044 & s.mask___9043);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
-    r0 = (s.n___193825 + 1);
-    s.n___193825 = (r0);
-    r0 = (s.mask___193807 << 1);
-    s.mask___193807 = (r0);
+    r0 = (s.n___9061 + 1);
+    s.n___9061 = (r0);
+    r0 = (s.mask___9043 << 1);
+    s.mask___9043 = (r0);
     { step = 31; continue; }
   case 32:
-    r0 = pxsim_numops_toBoolDecr(s.n___193825);
+    r0 = pxsim_numops_toBoolDecr(s.n___9061);
     if (!r0) { step = 33; continue; }
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg2;
-    r0 = (s.xOffset___193678 * s.mult___193613);
+    r0 = (s.xOffset___8914 * s.mult___8849);
     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___193806 + s.yOffset___193679);
+    r0 = (s.j___9042 + s.yOffset___8915);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 * s.mult___193613);
+    r0 = (s.tmp_5 * s.mult___8849);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.mult___193613;
-    r0 = (s.mult___193613 * s.n___193825);
+    s.tmp_0.arg3 = s.mult___8849;
+    r0 = (s.mult___8849 * s.n___9061);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = s.arg4;
     s.callLocIdx = 150; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    r0 = (s.j___193806 + s.n___193825);
-    s.j___193806 = (r0);
+    r0 = (s.j___9042 + s.n___9061);
+    s.j___9042 = (r0);
     { step = 34; continue; }
   case 33:
-    r0 = (s.mask___193807 << 1);
-    s.mask___193807 = (r0);
-    r0 = (s.j___193806 + 1);
-    s.j___193806 = (r0);
+    r0 = (s.mask___9043 << 1);
+    s.mask___9043 = (r0);
+    r0 = (s.j___9042 + 1);
+    s.j___9042 = (r0);
   case 34:
     { step = 28; continue; }
   case 35:
-    r0 = (s.arg2 + s.mult___193613);
+    r0 = (s.arg2 + s.mult___8849);
     s.arg2 = (r0);
-    r0 = (s.i___193801 + 1);
-    s.i___193801 = (r0);
+    r0 = (s.i___9037 + 1);
+    s.i___9037 = (r0);
     { step = 27; continue; }
   case 36:
   case 37:
@@ -15191,12 +15174,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imagePrint__P186977.info = {"start":15326,"length":3300,"line":213,"column":4,"endLine":306,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"imagePrint","argumentNames":["img","text","x","y","color","font","offsets"]}
+helpers_imagePrint__P1760.info = {"start":15326,"length":3300,"line":213,"column":4,"endLine":306,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"imagePrint","argumentNames":["img","text","x","y","color","font","offsets"]}
 
-function helpers_imagePrint__P186977_mk(s) {
+function helpers_imagePrint__P1760_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imagePrint__P186977, depth: s.depth + 1,
+        parent: s, fn: helpers_imagePrint__P1760, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15204,31 +15187,31 @@ function helpers_imagePrint__P186977_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  x0___193610: undefined,
-  cp___193612: undefined,
-  mult___193613: undefined,
-  dataW___193618: undefined,
-  dataH___193624: undefined,
-  byteHeight___193630: undefined,
-  charSize___193636: undefined,
-  dataSize___193640: undefined,
-  fontdata___193644: undefined,
-  lastchar___193647: undefined,
-  imgBuf___193654: undefined,
-  xOffset___193678: undefined,
-  yOffset___193679: undefined,
-  ch___193694: undefined,
-  l___193713: undefined,
-  r___193714: undefined,
-  off___193716: undefined,
-  guess___193717: undefined,
-  m___193736: undefined,
-  v___193745: undefined,
-  i___193801: undefined,
-  j___193806: undefined,
-  mask___193807: undefined,
-  c___193808: undefined,
-  n___193825: undefined,
+  x0___8846: undefined,
+  cp___8848: undefined,
+  mult___8849: undefined,
+  dataW___8854: undefined,
+  dataH___8860: undefined,
+  byteHeight___8866: undefined,
+  charSize___8872: undefined,
+  dataSize___8876: undefined,
+  fontdata___8880: undefined,
+  lastchar___8883: undefined,
+  imgBuf___8890: undefined,
+  xOffset___8914: undefined,
+  yOffset___8915: undefined,
+  ch___8930: undefined,
+  l___8949: undefined,
+  r___8950: undefined,
+  off___8952: undefined,
+  guess___8953: undefined,
+  m___8972: undefined,
+  v___8981: undefined,
+  i___9037: undefined,
+  j___9042: undefined,
+  mask___9043: undefined,
+  c___9044: undefined,
+  n___9061: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -15242,7 +15225,7 @@ function helpers_imagePrint__P186977_mk(s) {
 
 
 
-function image_getFontForText__P186964(s) {
+function image_getFontForText__P1747(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15252,52 +15235,52 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___193904 = undefined;
+    s.i___9140 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.i___193904 = (0);
+    s.i___9140 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___193904;
+    s.tmp_1 = r0 = s.i___9140;
     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___193904);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___9140);
     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___186963;
+    r0 = globals.font12___1746;
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___193904 + 1);
-    s.i___193904 = (r0);
+    r0 = (s.i___9140 + 1);
+    s.i___9140 = (r0);
     { step = 1; continue; }
   case 4:
-    r0 = globals.font8___186962;
+    r0 = globals.font8___1745;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-image_getFontForText__P186964.info = {"start":11713,"length":259,"line":136,"column":4,"endLine":143,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"getFontForText","argumentNames":["text"]}
+image_getFontForText__P1747.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__P186964_mk(s) {
+function image_getFontForText__P1747_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_getFontForText__P186964, depth: s.depth + 1,
+        parent: s, fn: image_getFontForText__P1747, 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___193904: undefined,
+  i___9140: undefined,
   arg0: undefined,
 } }
 
@@ -15305,7 +15288,7 @@ function image_getFontForText__P186964_mk(s) {
 
 
 
-function helpers_imageDrawIcon__P186944(s) {
+function helpers_imageDrawIcon__P1727(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15325,7 +15308,7 @@ switch (step) {
     }
     s.tmp_0 = r0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = helpers_pack__P189316_mk(s);
+    s.tmp_3 = helpers_pack__P4100_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg3;
     s.callLocIdx = 120; s.pc = 1; return s.tmp_3;
@@ -15337,12 +15320,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawIcon__P186944.info = {"start":3500,"length":145,"line":128,"column":4,"endLine":130,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawIcon","argumentNames":["img","icon","x","y","c"]}
+helpers_imageDrawIcon__P1727.info = {"start":3500,"length":145,"line":128,"column":4,"endLine":130,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawIcon","argumentNames":["img","icon","x","y","c"]}
 
-function helpers_imageDrawIcon__P186944_mk(s) {
+function helpers_imageDrawIcon__P1727_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawIcon__P186944, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawIcon__P1727, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15359,7 +15342,7 @@ function helpers_imageDrawIcon__P186944_mk(s) {
 
 
 
-function helpers_pack__P189316(s) {
+function helpers_pack__P4100(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15374,7 +15357,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_2 = Math_clamp__P185339_mk(s);
+    s.tmp_2 = Math_clamp__P122_mk(s);
     s.tmp_2.arg0 = -30000;
     s.tmp_2.arg1 = 30000;
     r0 = (s.arg0 | 0);
@@ -15385,7 +15368,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 65535);
     s.tmp_0 = r0;
-    s.tmp_5 = Math_clamp__P185339_mk(s);
+    s.tmp_5 = Math_clamp__P122_mk(s);
     s.tmp_5.arg0 = -30000;
     s.tmp_5.arg1 = 30000;
     r0 = (s.arg1 | 0);
@@ -15400,12 +15383,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_pack__P189316.info = {"start":3152,"length":145,"line":120,"column":4,"endLine":122,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"pack","argumentNames":["x","y"]}
+helpers_pack__P4100.info = {"start":3152,"length":145,"line":120,"column":4,"endLine":122,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"pack","argumentNames":["x","y"]}
 
-function helpers_pack__P189316_mk(s) {
+function helpers_pack__P4100_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_pack__P189316, depth: s.depth + 1,
+        parent: s, fn: helpers_pack__P4100, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15421,7 +15404,7 @@ function helpers_pack__P189316_mk(s) {
 
 
 
-function info_InfoState_constructor__P189444(s) {
+function info_InfoState_constructor__P4228(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15436,24 +15419,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_InfoState__C189443_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_InfoState__C4227_VT)) failedCast(r0);
     r0 = (s.arg0).fields["visibilityFlag"] = (8);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["playerStates"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = info_defaultHeartImage__P189494_mk(s);
+    s.tmp_2 = info_defaultHeartImage__P4278_mk(s);
     s.callLocIdx = 773; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["heartImage"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim.image.ofBuffer(_hex194778);
+    r0 = pxsim.image.ofBuffer(_hex15853);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["multiplierImage"] = (s.tmp_1);
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -15465,7 +15448,7 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = (s.arg0).fields["bgColor"] = (s.tmp_1);
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -15477,7 +15460,7 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = (s.arg0).fields["borderColor"] = (s.tmp_1);
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -15500,12 +15483,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_InfoState_constructor__P189444.info = {"start":1045,"length":674,"line":43,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this"]}
+info_InfoState_constructor__P4228.info = {"start":1045,"length":674,"line":43,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this"]}
 
-function info_InfoState_constructor__P189444_mk(s) {
+function info_InfoState_constructor__P4228_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_InfoState_constructor__P189444, depth: s.depth + 1,
+        parent: s, fn: info_InfoState_constructor__P4228, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -15513,12 +15496,12 @@ function info_InfoState_constructor__P189444_mk(s) {
   arg0: undefined,
 } }
 
-const _hex194778 = pxsim.BufferMethods.createBufferFromHex("87040500050000000100010010100000000100001010000001000100")
+const _hex15853 = pxsim.BufferMethods.createBufferFromHex("87040500050000000100010010100000000100001010000001000100")
 
 
 
 
-function info_defaultHeartImage__P189494(s) {
+function info_defaultHeartImage__P4278(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15528,14 +15511,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex194806);
+    r0 = pxsim.image.ofBuffer(_hex15881);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex194808);
+    r0 = pxsim.image.ofBuffer(_hex15883);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -15543,24 +15526,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_defaultHeartImage__P189494.info = {"start":5080,"length":592,"line":162,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"defaultHeartImage","argumentNames":[]}
+info_defaultHeartImage__P4278.info = {"start":5080,"length":592,"line":162,"column":4,"endLine":183,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"defaultHeartImage","argumentNames":[]}
 
-function info_defaultHeartImage__P189494_mk(s) {
+function info_defaultHeartImage__P4278_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_defaultHeartImage__P189494, depth: s.depth + 1,
+        parent: s, fn: info_defaultHeartImage__P4278, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex194806 = pxsim.BufferMethods.createBufferFromHex("87040800070000001011000001000100010010001000000101001000010001001011000000000000")
-const _hex194808 = pxsim.BufferMethods.createBufferFromHex("8704080007000000c0cc00002c220c002222c2002222220c20222202222422004222020020220000")
+const _hex15881 = pxsim.BufferMethods.createBufferFromHex("87040800070000001011000001000100010010001000000101001000010001001011000000000000")
+const _hex15883 = pxsim.BufferMethods.createBufferFromHex("8704080007000000c0cc00002c220c002222c2002222220c20222202222422004222020020220000")
 
 
 
 
-function scene_Scene_millis__P187660(s) {
+function scene_Scene_millis__P2443(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15575,17 +15558,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C187636_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
     r0 = s.arg0.fields["_millis"];
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_millis__P187660.info = {"start":6788,"length":61,"line":189,"column":8,"endLine":191,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"millis","argumentNames":["this"]}
+scene_Scene_millis__P2443.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__P187660_mk(s) {
+function scene_Scene_millis__P2443_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_millis__P187660, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_millis__P2443, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -15594,7 +15577,7 @@ function scene_Scene_millis__P187660_mk(s) {
 
 
 
-function scene_createRenderable__P187600(s) {
+function scene_createRenderable__P2383(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15604,14 +15587,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.renderable___194712 = undefined;
+    s.renderable___15824 = 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__C187595_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Renderable__C2378_VT);
     s.tmp_0 = r0;
     s.tmp_1 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_1);
@@ -15619,35 +15602,35 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 2; continue; }
   case 1:
-    r0 = inline__P194718;
+    r0 = inline__P15830;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.tmp_3 = scene_Renderable_constructor__P187596_mk(s);
+    s.tmp_3 = scene_Renderable_constructor__P2379_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 = 1015; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1022; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
-    s.renderable___194712 = (s.tmp_0);
-    r0 = s.renderable___194712;
+    s.renderable___15824 = (s.tmp_0);
+    r0 = s.renderable___15824;
     return leave(s, r0)
   default: oops()
 } } }
-scene_createRenderable__P187600.info = {"start":608,"length":339,"line":24,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/game/renderable.ts","functionName":"createRenderable","argumentNames":["z","handler","shouldBeVisible"]}
+scene_createRenderable__P2383.info = {"start":608,"length":339,"line":24,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/game/renderable.ts","functionName":"createRenderable","argumentNames":["z","handler","shouldBeVisible"]}
 
-function scene_createRenderable__P187600_mk(s) {
+function scene_createRenderable__P2383_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_createRenderable__P187600, depth: s.depth + 1,
+        parent: s, fn: scene_createRenderable__P2383, 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___194712: undefined,
+  renderable___15824: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -15657,7 +15640,7 @@ function scene_createRenderable__P187600_mk(s) {
 
 
 
-function inline__P194718(s) {
+function inline__P15830(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15671,12 +15654,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194718.info = {"start":875,"length":10,"line":31,"column":32,"endLine":31,"endColumn":42,"fileName":"pxt_modules/game/renderable.ts","functionName":"inline","argumentNames":[]}
+inline__P15830.info = {"start":875,"length":10,"line":31,"column":32,"endLine":31,"endColumn":42,"fileName":"pxt_modules/game/renderable.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P194718_mk(s) {
+function inline__P15830_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194718, depth: s.depth + 1,
+        parent: s, fn: inline__P15830, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -15684,7 +15667,7 @@ function inline__P194718_mk(s) {
 
 
 
-function scene_Renderable_constructor__P187596(s) {
+function scene_Renderable_constructor__P2379(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15702,25 +15685,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C187595_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C2378_VT)) failedCast(r0);
     r0 = (s.arg0).fields["handler"] = (s.arg1);
     r0 = (s.arg0).fields["shouldBeVisible"] = (s.arg2);
-    s.tmp_0 = sprites_BaseSprite_constructor__P187077_mk(s);
+    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg3;
-    s.callLocIdx = 1012; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1019; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable_constructor__P187596.info = {"start":83,"length":212,"line":2,"column":8,"endLine":8,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"inline","argumentNames":["this","handler","shouldBeVisible","z"]}
+scene_Renderable_constructor__P2379.info = {"start":83,"length":212,"line":2,"column":8,"endLine":8,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"inline","argumentNames":["this","handler","shouldBeVisible","z"]}
 
-function scene_Renderable_constructor__P187596_mk(s) {
+function scene_Renderable_constructor__P2379_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable_constructor__P187596, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable_constructor__P2379, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -15733,7 +15716,7 @@ function scene_Renderable_constructor__P187596_mk(s) {
 
 
 
-function info_PlayerInfo_drawLives__P187470(s) {
+function info_PlayerInfo_drawLives__P2253(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -15743,25 +15726,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___193929 = undefined;
-    s.font___193935 = undefined;
-    s.i___193979 = undefined;
-    s.num___194001 = undefined;
-    s.textWidth___194008 = undefined;
-    s.mult___194061 = undefined;
+    s.state___15216 = undefined;
+    s.font___15222 = undefined;
+    s.i___15266 = undefined;
+    s.num___15288 = undefined;
+    s.textWidth___15295 = undefined;
+    s.mult___15348 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 858; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 865; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.state___193929 = (r0);
-    r0 = s.state___193929.fields["life"];
+    s.state___15216 = (r0);
+    r0 = s.state___15216.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -15770,20 +15753,20 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    s.font___193935 = (globals.font8___186962);
-    r0 = s.state___193929.fields["life"];
+    s.font___15222 = (globals.font8___1745);
+    r0 = s.state___15216.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 <= 4);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
+    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = 0;
-    r0 = s.state___193929.fields["life"];
+    r0 = s.state___15216.fields["life"];
     s.tmp_4 = r0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_7);
     s.tmp_6 = r0;
@@ -15793,24 +15776,24 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 3);
     s.tmp_2.arg3 = r0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_9 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_9);
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 4);
     s.tmp_2.arg4 = r0;
-    r0 = globals.infoState___189446.fields["borderColor"];
+    r0 = globals.infoState___4230.fields["borderColor"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 859; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 866; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    r0 = s.state___193929.fields["life"];
+    r0 = s.state___15216.fields["life"];
     s.tmp_2 = r0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
@@ -15820,30 +15803,30 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg3 = r0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_7);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___189446.fields["bgColor"];
+    r0 = globals.infoState___4230.fields["bgColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 860; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 867; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.i___193979 = (0);
+    s.i___15266 = (0);
   case 3:
-    r0 = s.state___193929.fields["life"];
+    r0 = s.state___15216.fields["life"];
     s.tmp_1 = r0;
-    r0 = (s.i___193979 < s.tmp_1);
+    r0 = (s.i___15266 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = r0 = globals.screen___187019;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    s.tmp_2 = r0 = globals.screen___1802;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_3 = r0;
-    s.tmp_6 = r0 = s.i___193979;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    s.tmp_6 = r0 = s.i___15266;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_9 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_9);
     s.tmp_8 = r0;
@@ -15854,13 +15837,13 @@ switch (step) {
     r0 = (1 + s.tmp_5);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_2, s.tmp_3, s.tmp_4, 1);
-    r0 = (s.i___193979 + 1);
-    s.i___193979 = (r0);
+    r0 = (s.i___15266 + 1);
+    s.i___15266 = (r0);
     { step = 3; continue; }
   case 4:
     { step = 6; continue; }
   case 5:
-    r0 = s.state___193929.fields["life"];
+    r0 = s.state___15216.fields["life"];
     s.tmp_1 = r0;
     if ((s.tmp_1) && (s.tmp_1).vtable) {
     setupResume(s, 11);
@@ -15874,18 +15857,18 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_2);
-    s.num___194001 = (r0);
-    r0 = pxsim_String_.length(s.num___194001);
+    s.num___15288 = (r0);
+    r0 = pxsim_String_.length(s.num___15288);
     s.tmp_1 = r0;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___193935;
+    s.tmp_3.arg0 = s.font___15222;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 861; s.pc = 12; return s.tmp_3; }
+     else { s.callLocIdx = 868; s.pc = 12; return s.tmp_3; }
     }
   case 12:
     r0 = s.retval;
@@ -15893,97 +15876,97 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.textWidth___194008 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.textWidth___15295 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_6 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_3 + s.tmp_5);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.textWidth___194008);
+    r0 = (s.tmp_2 + s.textWidth___15295);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 5);
     s.tmp_0.arg3 = r0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_8 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_8);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 4);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___189446.fields["borderColor"];
+    r0 = globals.infoState___4230.fields["borderColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 862; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 869; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_6 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_3 + s.tmp_5);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.textWidth___194008);
+    r0 = (s.tmp_2 + s.textWidth___15295);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 4);
     s.tmp_0.arg3 = r0;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_8 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_8);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___189446.fields["bgColor"];
+    r0 = globals.infoState___4230.fields["bgColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 863; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 870; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___187019, s.tmp_0, 1, 1);
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, s.tmp_0, 1, 1);
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_0);
-    s.mult___194061 = (r0);
-    r0 = globals.infoState___189446.fields["fontColor"];
+    s.mult___15348 = (r0);
+    r0 = globals.infoState___4230.fields["fontColor"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.replace(s.mult___194061, 1, s.tmp_0);
-    s.tmp_0 = r0 = globals.screen___187019;
-    s.tmp_1 = r0 = s.mult___194061;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = pxsim_ImageMethods.replace(s.mult___15348, 1, s.tmp_0);
+    s.tmp_0 = r0 = globals.screen___1802;
+    s.tmp_1 = r0 = s.mult___15348;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_2 = r0;
     s.tmp_8 = if_charHeight_1_mk(s);
-    s.tmp_8.arg0 = s.font___193935;
+    s.tmp_8.arg0 = s.font___15222;
     if (!s.tmp_8.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_8.arg0, "charHeight");
     } else {
       s.tmp_8.fn = s.tmp_8.arg0.vtable.iface["charHeight"];
       if (s.tmp_8.fn == null) { s.retval = s.tmp_8.arg0.fields["charHeight"]; }
       else if (!s.tmp_8.fn.isGetter) { s.retval = bind(s.tmp_8); }
-     else { s.callLocIdx = 864; s.pc = 15; return s.tmp_8; }
+     else { s.callLocIdx = 871; s.pc = 15; return s.tmp_8; }
     }
   case 15:
     r0 = s.retval;
     s.tmp_7 = r0;
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_10 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_10);
     s.tmp_9 = r0;
@@ -15992,27 +15975,27 @@ switch (step) {
     r0 = (s.tmp_6 - 1);
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_0, s.tmp_1, s.tmp_2, s.tmp_5);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_0.arg1 = s.num___194001;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0.arg1 = s.num___15288;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 3);
     s.tmp_1 = r0;
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_1 + s.tmp_4);
     s.tmp_0.arg2 = r0;
     s.tmp_0.arg3 = 1;
-    r0 = globals.infoState___189446.fields["fontColor"];
+    r0 = globals.infoState___4230.fields["fontColor"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___193935;
+    s.tmp_0.arg5 = s.font___15222;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 865; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 872; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
   case 6:
@@ -16021,12 +16004,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_drawLives__P187470.info = {"start":25956,"length":2458,"line":847,"column":8,"endLine":913,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawLives","argumentNames":["this"]}
+info_PlayerInfo_drawLives__P2253.info = {"start":25956,"length":2458,"line":847,"column":8,"endLine":913,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawLives","argumentNames":["this"]}
 
-function info_PlayerInfo_drawLives__P187470_mk(s) {
+function info_PlayerInfo_drawLives__P2253_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_drawLives__P187470, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_drawLives__P2253, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16039,12 +16022,12 @@ function info_PlayerInfo_drawLives__P187470_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  state___193929: undefined,
-  font___193935: undefined,
-  i___193979: undefined,
-  num___194001: undefined,
-  textWidth___194008: undefined,
-  mult___194061: undefined,
+  state___15216: undefined,
+  font___15222: undefined,
+  i___15266: undefined,
+  num___15288: undefined,
+  textWidth___15295: undefined,
+  mult___15348: undefined,
   arg0: undefined,
 } }
 
@@ -16052,7 +16035,7 @@ function info_PlayerInfo_drawLives__P187470_mk(s) {
 
 
 
-function info_PlayerInfo_drawScore__P187469(s) {
+function info_PlayerInfo_drawScore__P2252(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16062,153 +16045,153 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___194176 = undefined;
-    s.font___194180 = undefined;
-    s.offsetY___194181 = undefined;
-    s.num___194190 = undefined;
-    s.width___194194 = undefined;
+    s.s___15404 = undefined;
+    s.font___15408 = undefined;
+    s.offsetY___15409 = undefined;
+    s.num___15418 = undefined;
+    s.width___15422 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_1 = info_PlayerInfo_score__P187458_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_1 = info_PlayerInfo_score__P2241_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 851; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 858; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    s.s___194176 = (r0);
-    r0 = (s.s___194176 >= 1000000);
+    s.s___15404 = (r0);
+    r0 = (s.s___15404 >= 1000000);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.offsetY___194181 = (2);
-    s.font___194180 = (globals.font5___186967);
+    s.offsetY___15409 = (2);
+    s.font___15408 = (globals.font5___1750);
     { step = 2; continue; }
   case 1:
-    s.offsetY___194181 = (1);
-    s.font___194180 = (globals.font8___186962);
+    s.offsetY___15409 = (1);
+    s.font___15408 = (globals.font8___1745);
   case 2:
-    r0 = pxsim_numops.toString(s.s___194176);
-    s.num___194190 = (r0);
-    r0 = pxsim_String_.length(s.num___194190);
+    r0 = pxsim_numops.toString(s.s___15404);
+    s.num___15418 = (r0);
+    r0 = pxsim_String_.length(s.num___15418);
     s.tmp_0 = r0;
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.font___194180;
+    s.tmp_2.arg0 = s.font___15408;
     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 = 852; s.pc = 4; return s.tmp_2; }
+     else { s.callLocIdx = 859; s.pc = 4; return s.tmp_2; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.width___194194 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.width___15422 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.width___194194);
+    r0 = (s.tmp_2 - s.width___15422);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
     s.tmp_4 = if_charHeight_1_mk(s);
-    s.tmp_4.arg0 = globals.font8___186962;
+    s.tmp_4.arg0 = globals.font8___1745;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charHeight");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charHeight"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charHeight"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 853; s.pc = 6; return s.tmp_4; }
+     else { s.callLocIdx = 860; s.pc = 6; return s.tmp_4; }
     }
   case 6:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 3);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___189446.fields["borderColor"];
+    r0 = globals.infoState___4230.fields["borderColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 854; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 861; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.width___194194);
+    r0 = (s.tmp_2 - s.width___15422);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
     s.tmp_4 = if_charHeight_1_mk(s);
-    s.tmp_4.arg0 = globals.font8___186962;
+    s.tmp_4.arg0 = globals.font8___1745;
     if (!s.tmp_4.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_4.arg0, "charHeight");
     } else {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["charHeight"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["charHeight"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 855; s.pc = 8; return s.tmp_4; }
+     else { s.callLocIdx = 862; s.pc = 8; return s.tmp_4; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_0.arg4 = r0;
-    r0 = globals.infoState___189446.fields["bgColor"];
+    r0 = globals.infoState___4230.fields["bgColor"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 856; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 863; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_0.arg1 = s.num___194190;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0.arg1 = s.num___15418;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___194194);
+    r0 = (s.tmp_1 - s.width___15422);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.offsetY___194181;
-    r0 = globals.infoState___189446.fields["fontColor"];
+    s.tmp_0.arg3 = s.offsetY___15409;
+    r0 = globals.infoState___4230.fields["fontColor"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___194180;
+    s.tmp_0.arg5 = s.font___15408;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 857; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 864; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_drawScore__P187469.info = {"start":24898,"length":1048,"line":807,"column":8,"endLine":845,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawScore","argumentNames":["this"]}
+info_PlayerInfo_drawScore__P2252.info = {"start":24898,"length":1048,"line":807,"column":8,"endLine":845,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawScore","argumentNames":["this"]}
 
-function info_PlayerInfo_drawScore__P187469_mk(s) {
+function info_PlayerInfo_drawScore__P2252_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_drawScore__P187469, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_drawScore__P2252, 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___194176: undefined,
-  font___194180: undefined,
-  offsetY___194181: undefined,
-  num___194190: undefined,
-  width___194194: undefined,
+  s___15404: undefined,
+  font___15408: undefined,
+  offsetY___15409: undefined,
+  num___15418: undefined,
+  width___15422: undefined,
   arg0: undefined,
 } }
 
@@ -16216,7 +16199,7 @@ function info_PlayerInfo_drawScore__P187469_mk(s) {
 
 
 
-function info_PlayerInfo_drawPlayer__P187468(s) {
+function info_PlayerInfo_drawPlayer__P2251(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16226,44 +16209,44 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___194390 = undefined;
-    s.font___194393 = undefined;
-    s.score___194395 = undefined;
-    s.life___194396 = undefined;
-    s.height___194397 = undefined;
-    s.scoreWidth___194398 = undefined;
-    s.lifeWidth___194399 = undefined;
-    s.offsetY___194402 = undefined;
-    s.showScore___194403 = undefined;
-    s.showLife___194411 = undefined;
-    s.width___194479 = undefined;
-    s.x___194489 = undefined;
-    s.y___194496 = undefined;
-    s.bump___194529 = undefined;
-    s.xLoc___194554 = undefined;
-    s.mult___194565 = undefined;
-    s.pNum___194627 = undefined;
-    s.iconWidth___194634 = undefined;
-    s.iconHeight___194642 = undefined;
-    s.iconX___194650 = undefined;
-    s.iconY___194662 = undefined;
+    s.state___15502 = undefined;
+    s.font___15505 = undefined;
+    s.score___15507 = undefined;
+    s.life___15508 = undefined;
+    s.height___15509 = undefined;
+    s.scoreWidth___15510 = undefined;
+    s.lifeWidth___15511 = undefined;
+    s.offsetY___15514 = undefined;
+    s.showScore___15515 = undefined;
+    s.showLife___15523 = undefined;
+    s.width___15591 = undefined;
+    s.x___15601 = undefined;
+    s.y___15608 = undefined;
+    s.bump___15641 = undefined;
+    s.xLoc___15666 = undefined;
+    s.mult___15677 = undefined;
+    s.pNum___15739 = undefined;
+    s.iconWidth___15746 = undefined;
+    s.iconHeight___15754 = undefined;
+    s.iconX___15762 = undefined;
+    s.iconY___15774 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 834; s.pc = 43; return s.tmp_0;
+    s.callLocIdx = 841; s.pc = 43; return s.tmp_0;
   case 43:
     r0 = s.retval;
-    s.state___194390 = (r0);
-    s.font___194393 = (globals.font5___186967);
-    s.height___194397 = (4);
-    s.scoreWidth___194398 = (0);
-    s.lifeWidth___194399 = (0);
-    s.offsetY___194402 = (2);
+    s.state___15502 = (r0);
+    s.font___15505 = (globals.font5___1750);
+    s.height___15509 = (4);
+    s.scoreWidth___15510 = (0);
+    s.lifeWidth___15511 = (0);
+    s.offsetY___15514 = (2);
     r0 = s.arg0.fields["showScore"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -16271,13 +16254,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.state___194390.fields["score"];
+    r0 = s.state___15502.fields["score"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.showScore___194403 = (s.tmp_2);
+    s.showScore___15515 = (s.tmp_2);
     r0 = s.arg0.fields["showLife"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -16285,18 +16268,18 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = s.state___194390.fields["life"];
+    r0 = s.state___15502.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.showLife___194411 = (s.tmp_2);
-    r0 = pxsim_numops_toBoolDecr(s.showScore___194403);
+    s.showLife___15523 = (s.tmp_2);
+    r0 = pxsim_numops_toBoolDecr(s.showScore___15515);
     if (!r0) { step = 5; continue; }
     r0 = pxsim_String_.mkEmpty();
     s.tmp_0 = r0;
-    r0 = s.state___194390.fields["score"];
+    r0 = s.state___15502.fields["score"];
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 44);
@@ -16308,18 +16291,18 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_String__concat(s.tmp_0, s.tmp_1);
-    s.score___194395 = (r0);
-    r0 = pxsim_String_.length(s.score___194395);
+    s.score___15507 = (r0);
+    r0 = pxsim_String_.length(s.score___15507);
     s.tmp_1 = r0;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___194393;
+    s.tmp_3.arg0 = s.font___15505;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 835; s.pc = 45; return s.tmp_3; }
+     else { s.callLocIdx = 842; s.pc = 45; return s.tmp_3; }
     }
   case 45:
     r0 = s.retval;
@@ -16327,33 +16310,33 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 3);
-    s.scoreWidth___194398 = (r0);
-    s.tmp_0 = r0 = s.height___194397;
+    s.scoreWidth___15510 = (r0);
+    s.tmp_0 = r0 = s.height___15509;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___194393;
+    s.tmp_2.arg0 = s.font___15505;
     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 = 836; s.pc = 46; return s.tmp_2; }
+     else { s.callLocIdx = 843; s.pc = 46; return s.tmp_2; }
     }
   case 46:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.height___194397 = (r0);
-    s.tmp_0 = r0 = s.offsetY___194402;
+    s.height___15509 = (r0);
+    s.tmp_0 = r0 = s.offsetY___15514;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.font___194393;
+    s.tmp_3.arg0 = s.font___15505;
     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 = 837; s.pc = 47; return s.tmp_3; }
+     else { s.callLocIdx = 844; s.pc = 47; return s.tmp_3; }
     }
   case 47:
     r0 = s.retval;
@@ -16361,12 +16344,12 @@ switch (step) {
     r0 = (s.tmp_2 + 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.offsetY___194402 = (r0);
+    s.offsetY___15514 = (r0);
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(s.showLife___194411);
+    r0 = pxsim_numops_toBoolDecr(s.showLife___15523);
     if (!r0) { step = 9; continue; }
-    r0 = s.state___194390.fields["life"];
+    r0 = s.state___15502.fields["life"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 7; continue; }
@@ -16389,28 +16372,28 @@ switch (step) {
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = pxsim_String__concat(s.tmp_2, s.tmp_3);
-    s.life___194396 = (r0);
-    r0 = globals.infoState___189446.fields["heartImage"];
+    s.life___15508 = (r0);
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_3);
     s.tmp_2 = r0;
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_1 = r0;
-    r0 = pxsim_String_.length(s.life___194396);
+    r0 = pxsim_String_.length(s.life___15508);
     s.tmp_7 = r0;
     s.tmp_9 = if_charWidth_1_mk(s);
-    s.tmp_9.arg0 = s.font___194393;
+    s.tmp_9.arg0 = s.font___15505;
     if (!s.tmp_9.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_9.arg0, "charWidth");
     } else {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["charWidth"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["charWidth"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 838; s.pc = 49; return s.tmp_9; }
+     else { s.callLocIdx = 845; s.pc = 49; return s.tmp_9; }
     }
   case 49:
     r0 = s.retval;
@@ -16420,44 +16403,44 @@ switch (step) {
     r0 = (s.tmp_1 + s.tmp_6);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 3);
-    s.lifeWidth___194399 = (r0);
-    s.tmp_0 = r0 = s.height___194397;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    s.lifeWidth___15511 = (r0);
+    s.tmp_0 = r0 = s.height___15509;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.height___194397 = (r0);
+    s.height___15509 = (r0);
   case 9:
   case 10:
-    s.tmp_0 = Math_max__P185342_mk(s);
-    s.tmp_0.arg0 = s.scoreWidth___194398;
-    s.tmp_0.arg1 = s.lifeWidth___194399;
-    s.callLocIdx = 839; s.pc = 50; return s.tmp_0;
+    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0.arg0 = s.scoreWidth___15510;
+    s.tmp_0.arg1 = s.lifeWidth___15511;
+    s.callLocIdx = 846; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    s.width___194479 = (r0);
-    s.tmp_0 = r0 = s.showScore___194403;
+    s.width___15591 = (r0);
+    s.tmp_0 = r0 = s.showScore___15515;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    r0 = s.showLife___194411;
+    r0 = s.showLife___15523;
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 13; continue; }
-    r0 = (s.height___194397 + 1);
-    s.height___194397 = (r0);
+    r0 = (s.height___15509 + 1);
+    s.height___15509 = (r0);
   case 13:
   case 14:
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = s.width___194479;
+    r0 = s.width___15591;
     { step = 16; continue; }
   case 15:
     r0 = 0;
@@ -16467,12 +16450,12 @@ switch (step) {
     r0 = s.arg0.fields["x"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - s.tmp_1);
-    s.x___194489 = (r0);
+    s.x___15601 = (r0);
     r0 = s.arg0.fields["up"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 17; continue; }
-    r0 = s.height___194397;
+    r0 = s.height___15509;
     { step = 18; continue; }
   case 17:
     r0 = 0;
@@ -16482,139 +16465,139 @@ switch (step) {
     r0 = s.arg0.fields["y"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - s.tmp_1);
-    s.y___194496 = (r0);
-    s.tmp_0 = r0 = s.showScore___194403;
+    s.y___15608 = (r0);
+    s.tmp_0 = r0 = s.showScore___15515;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 19; continue; }
     r0 = s.tmp_0;
     { step = 20; continue; }
   case 19:
-    r0 = s.showLife___194411;
+    r0 = s.showLife___15523;
   case 20:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 21; continue; }
-    s.tmp_2 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
-    s.tmp_2.arg1 = s.x___194489;
-    s.tmp_2.arg2 = s.y___194496;
-    s.tmp_2.arg3 = s.width___194479;
-    s.tmp_2.arg4 = s.height___194397;
+    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
+    s.tmp_2.arg1 = s.x___15601;
+    s.tmp_2.arg2 = s.y___15608;
+    s.tmp_2.arg3 = s.width___15591;
+    s.tmp_2.arg4 = s.height___15509;
     r0 = s.arg0.fields["border"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 840; s.pc = 51; return s.tmp_2;
+    s.callLocIdx = 847; s.pc = 51; return s.tmp_2;
   case 51:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    r0 = (s.x___194489 + 1);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    r0 = (s.x___15601 + 1);
     s.tmp_0.arg1 = r0;
-    r0 = (s.y___194496 + 1);
+    r0 = (s.y___15608 + 1);
     s.tmp_0.arg2 = r0;
-    r0 = (s.width___194479 - 2);
+    r0 = (s.width___15591 - 2);
     s.tmp_0.arg3 = r0;
-    r0 = (s.height___194397 - 2);
+    r0 = (s.height___15509 - 2);
     s.tmp_0.arg4 = r0;
     r0 = s.arg0.fields["bg"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 841; s.pc = 52; return s.tmp_0;
+    s.callLocIdx = 848; s.pc = 52; return s.tmp_0;
   case 52:
     r0 = s.retval;
   case 21:
   case 22:
-    r0 = pxsim_numops_toBoolDecr(s.showScore___194403);
+    r0 = pxsim_numops_toBoolDecr(s.showScore___15515);
     if (!r0) { step = 25; continue; }
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 23; continue; }
-    r0 = (s.width___194479 - s.scoreWidth___194398);
+    r0 = (s.width___15591 - s.scoreWidth___15510);
     { step = 24; continue; }
   case 23:
     r0 = 0;
   case 24:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.bump___194529 = (s.tmp_1);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_0.arg1 = s.score___194395;
-    r0 = (s.x___194489 + 1);
+    s.bump___15641 = (s.tmp_1);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0.arg1 = s.score___15507;
+    r0 = (s.x___15601 + 1);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.bump___194529);
+    r0 = (s.tmp_2 + s.bump___15641);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     s.tmp_0.arg2 = r0;
-    r0 = (s.y___194496 + 2);
+    r0 = (s.y___15608 + 2);
     s.tmp_0.arg3 = r0;
     r0 = s.arg0.fields["fc"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___194393;
+    s.tmp_0.arg5 = s.font___15505;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 842; s.pc = 53; return s.tmp_0;
+    s.callLocIdx = 849; s.pc = 53; return s.tmp_0;
   case 53:
     r0 = s.retval;
   case 25:
   case 26:
-    r0 = pxsim_numops_toBoolDecr(s.showLife___194411);
+    r0 = pxsim_numops_toBoolDecr(s.showLife___15523);
     if (!r0) { step = 29; continue; }
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 27; continue; }
-    r0 = (s.width___194479 - s.lifeWidth___194399);
+    r0 = (s.width___15591 - s.lifeWidth___15511);
     { step = 28; continue; }
   case 27:
     r0 = 0;
   case 28:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.x___194489 + 1);
+    r0 = (s.x___15601 + 1);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + s.tmp_1);
-    s.xLoc___194554 = (r0);
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    s.xLoc___15666 = (r0);
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_0);
-    s.mult___194565 = (r0);
+    s.mult___15677 = (r0);
     r0 = s.arg0.fields["fc"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.replace(s.mult___194565, 1, s.tmp_0);
-    s.tmp_0 = r0 = globals.screen___187019;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    r0 = pxsim_ImageMethods.replace(s.mult___15677, 1, s.tmp_0);
+    s.tmp_0 = r0 = globals.screen___1802;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_1 = r0;
-    s.tmp_2 = r0 = s.xLoc___194554;
-    r0 = (s.y___194496 + s.offsetY___194402);
+    s.tmp_2 = r0 = s.xLoc___15666;
+    r0 = (s.y___15608 + s.offsetY___15514);
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_0, s.tmp_1, s.tmp_2, s.tmp_3);
-    s.tmp_0 = r0 = globals.screen___187019;
-    s.tmp_1 = r0 = s.mult___194565;
-    s.tmp_3 = r0 = s.xLoc___194554;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    s.tmp_0 = r0 = globals.screen___1802;
+    s.tmp_1 = r0 = s.mult___15677;
+    s.tmp_3 = r0 = s.xLoc___15666;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
-    r0 = (s.y___194496 + s.offsetY___194402);
+    r0 = (s.y___15608 + s.offsetY___15514);
     s.tmp_9 = r0;
     s.tmp_11 = if_charHeight_1_mk(s);
-    s.tmp_11.arg0 = s.font___194393;
+    s.tmp_11.arg0 = s.font___15505;
     if (!s.tmp_11.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_11.arg0, "charHeight");
     } else {
       s.tmp_11.fn = s.tmp_11.arg0.vtable.iface["charHeight"];
       if (s.tmp_11.fn == null) { s.retval = s.tmp_11.arg0.fields["charHeight"]; }
       else if (!s.tmp_11.fn.isGetter) { s.retval = bind(s.tmp_11); }
-     else { s.callLocIdx = 843; s.pc = 54; return s.tmp_11; }
+     else { s.callLocIdx = 850; s.pc = 54; return s.tmp_11; }
     }
   case 54:
     r0 = s.retval;
     s.tmp_10 = r0;
     r0 = (s.tmp_9 + s.tmp_10);
     s.tmp_8 = r0;
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_13 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_13);
     s.tmp_12 = r0;
@@ -16623,17 +16606,17 @@ switch (step) {
     r0 = (s.tmp_7 - 1);
     s.tmp_6 = r0;
     r0 = pxsim_ImageMethods.drawTransparentImage(s.tmp_0, s.tmp_1, s.tmp_2, s.tmp_6);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_0.arg1 = s.life___194396;
-    s.tmp_3 = r0 = s.xLoc___194554;
-    r0 = globals.infoState___189446.fields["heartImage"];
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0.arg1 = s.life___15508;
+    s.tmp_3 = r0 = s.xLoc___15666;
+    r0 = globals.infoState___4230.fields["heartImage"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
-    r0 = globals.infoState___189446.fields["multiplierImage"];
+    r0 = globals.infoState___4230.fields["multiplierImage"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_7);
     s.tmp_6 = r0;
@@ -16641,13 +16624,13 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     s.tmp_0.arg2 = r0;
-    r0 = (s.y___194496 + s.offsetY___194402);
+    r0 = (s.y___15608 + s.offsetY___15514);
     s.tmp_0.arg3 = r0;
     r0 = s.arg0.fields["fc"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___194393;
+    s.tmp_0.arg5 = s.font___15505;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 844; s.pc = 55; return s.tmp_0;
+    s.callLocIdx = 851; s.pc = 55; return s.tmp_0;
   case 55:
     r0 = s.retval;
   case 29:
@@ -16670,18 +16653,18 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_1, s.tmp_2);
-    s.pNum___194627 = (r0);
-    r0 = pxsim_String_.length(s.pNum___194627);
+    s.pNum___15739 = (r0);
+    r0 = pxsim_String_.length(s.pNum___15739);
     s.tmp_1 = r0;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = s.font___194393;
+    s.tmp_3.arg0 = s.font___15505;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 845; s.pc = 57; return s.tmp_3; }
+     else { s.callLocIdx = 852; s.pc = 57; return s.tmp_3; }
     }
   case 57:
     r0 = s.retval;
@@ -16689,46 +16672,46 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.iconWidth___194634 = (r0);
-    s.tmp_0 = Math_max__P185342_mk(s);
-    s.tmp_0.arg0 = s.height___194397;
+    s.iconWidth___15746 = (r0);
+    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0.arg0 = s.height___15509;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.font___194393;
+    s.tmp_2.arg0 = s.font___15505;
     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 = 846; s.pc = 59; return s.tmp_2; }
+     else { s.callLocIdx = 853; s.pc = 59; return s.tmp_2; }
     }
   case 59:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 847; s.pc = 58; return s.tmp_0;
+    s.callLocIdx = 854; s.pc = 58; return s.tmp_0;
   case 58:
     r0 = s.retval;
-    s.iconHeight___194642 = (r0);
+    s.iconHeight___15754 = (r0);
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 31; continue; }
-    r0 = (s.x___194489 - s.iconWidth___194634);
+    r0 = (s.x___15601 - s.iconWidth___15746);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     { step = 32; continue; }
   case 31:
-    r0 = (s.x___194489 + s.width___194479);
+    r0 = (s.x___15601 + s.width___15591);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
   case 32:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.iconX___194650 = (s.tmp_3);
-    s.iconY___194662 = (s.y___194496);
-    r0 = pxsim_numops_toBoolDecr(s.showScore___194403);
+    s.iconX___15762 = (s.tmp_3);
+    s.iconY___15774 = (s.y___15608);
+    r0 = pxsim_numops_toBoolDecr(s.showScore___15515);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -16737,7 +16720,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 34; continue; }
   case 33:
-    r0 = pxsim_numops_toBoolDecr(s.showLife___194411);
+    r0 = pxsim_numops_toBoolDecr(s.showLife___15523);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
   case 34:
@@ -16756,48 +16739,48 @@ switch (step) {
   case 36:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    r0 = (s.iconX___194650 + s.tmp_5);
-    s.iconX___194650 = (r0);
+    r0 = (s.iconX___15762 + s.tmp_5);
+    s.iconX___15762 = (r0);
     r0 = s.arg0.fields["up"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 37; continue; }
-    r0 = (s.iconY___194662 - 3);
-    s.iconY___194662 = (r0);
+    r0 = (s.iconY___15774 - 3);
+    s.iconY___15774 = (r0);
   case 37:
   case 38:
   case 39:
   case 40:
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_0.arg1 = s.iconX___194650;
-    s.tmp_0.arg2 = s.iconY___194662;
-    s.tmp_0.arg3 = s.iconWidth___194634;
-    s.tmp_0.arg4 = s.iconHeight___194642;
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0.arg1 = s.iconX___15762;
+    s.tmp_0.arg2 = s.iconY___15774;
+    s.tmp_0.arg3 = s.iconWidth___15746;
+    s.tmp_0.arg4 = s.iconHeight___15754;
     r0 = s.arg0.fields["border"];
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 848; s.pc = 60; return s.tmp_0;
+    s.callLocIdx = 855; s.pc = 60; return s.tmp_0;
   case 60:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_0.arg1 = s.pNum___194627;
-    r0 = (s.iconX___194650 + 1);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0.arg1 = s.pNum___15739;
+    r0 = (s.iconX___15762 + 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_2 = r0 = s.iconY___194662;
-    r0 = (s.iconHeight___194642 >> 1);
+    s.tmp_2 = r0 = s.iconY___15774;
+    r0 = (s.iconHeight___15754 >> 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     s.tmp_6 = if_charHeight_1_mk(s);
-    s.tmp_6.arg0 = s.font___194393;
+    s.tmp_6.arg0 = s.font___15505;
     if (!s.tmp_6.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_6.arg0, "charHeight");
     } else {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["charHeight"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["charHeight"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 849; s.pc = 62; return s.tmp_6; }
+     else { s.callLocIdx = 856; s.pc = 62; return s.tmp_6; }
     }
   case 62:
     r0 = s.retval;
@@ -16808,9 +16791,9 @@ switch (step) {
     s.tmp_0.arg3 = r0;
     r0 = s.arg0.fields["bg"];
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = s.font___194393;
+    s.tmp_0.arg5 = s.font___15505;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 850; s.pc = 61; return s.tmp_0;
+    s.callLocIdx = 857; s.pc = 61; return s.tmp_0;
   case 61:
     r0 = s.retval;
   case 41:
@@ -16819,12 +16802,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_drawPlayer__P187468.info = {"start":21253,"length":3635,"line":702,"column":8,"endLine":805,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawPlayer","argumentNames":["this"]}
+info_PlayerInfo_drawPlayer__P2251.info = {"start":21253,"length":3635,"line":702,"column":8,"endLine":805,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"drawPlayer","argumentNames":["this"]}
 
-function info_PlayerInfo_drawPlayer__P187468_mk(s) {
+function info_PlayerInfo_drawPlayer__P2251_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_drawPlayer__P187468, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_drawPlayer__P2251, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -16840,27 +16823,27 @@ function info_PlayerInfo_drawPlayer__P187468_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  state___194390: undefined,
-  font___194393: undefined,
-  score___194395: undefined,
-  life___194396: undefined,
-  height___194397: undefined,
-  scoreWidth___194398: undefined,
-  lifeWidth___194399: undefined,
-  offsetY___194402: undefined,
-  showScore___194403: undefined,
-  showLife___194411: undefined,
-  width___194479: undefined,
-  x___194489: undefined,
-  y___194496: undefined,
-  bump___194529: undefined,
-  xLoc___194554: undefined,
-  mult___194565: undefined,
-  pNum___194627: undefined,
-  iconWidth___194634: undefined,
-  iconHeight___194642: undefined,
-  iconX___194650: undefined,
-  iconY___194662: undefined,
+  state___15502: undefined,
+  font___15505: undefined,
+  score___15507: undefined,
+  life___15508: undefined,
+  height___15509: undefined,
+  scoreWidth___15510: undefined,
+  lifeWidth___15511: undefined,
+  offsetY___15514: undefined,
+  showScore___15515: undefined,
+  showLife___15523: undefined,
+  width___15591: undefined,
+  x___15601: undefined,
+  y___15608: undefined,
+  bump___15641: undefined,
+  xLoc___15666: undefined,
+  mult___15677: undefined,
+  pNum___15739: undefined,
+  iconWidth___15746: undefined,
+  iconHeight___15754: undefined,
+  iconX___15762: undefined,
+  iconY___15774: undefined,
   arg0: undefined,
 } }
 
@@ -16868,7 +16851,7 @@ function info_PlayerInfo_drawPlayer__P187468_mk(s) {
 
 
 
-function info_PlayerInfo_raiseLifeZero__P187467(s) {
+function info_PlayerInfo_raiseLifeZero__P2250(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16878,21 +16861,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___194368 = undefined;
+    s.state___15480 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 831; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 838; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.state___194368 = (r0);
-    r0 = s.state___194368.fields["life"];
+    s.state___15480 = (r0);
+    r0 = s.state___15480.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== null);
     s.tmp_0 = r0;
@@ -16901,7 +16884,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.state___194368.fields["life"];
+    r0 = s.state___15480.fields["life"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 <= 0);
   case 2:
@@ -16909,21 +16892,21 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
-    r0 = (s.state___194368).fields["life"] = (null);
-    r0 = s.state___194368.fields["lifeZeroHandler"];
+    r0 = (s.state___15480).fields["life"] = (null);
+    r0 = s.state___15480.fields["lifeZeroHandler"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     s.tmp_1 = if_lifeZeroHandler_1_mk(s);
-    s.tmp_1.arg0 = s.state___194368;
+    s.tmp_1.arg0 = s.state___15480;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "lifeZeroHandler"), 1);
-      s.callLocIdx = 832; s.pc = 10; return s.tmp_1;
+      s.callLocIdx = 839; s.pc = 10; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["lifeZeroHandler"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["lifeZeroHandler"], 1); s.callLocIdx = 832; s.pc = 10; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 832; s.pc = 10; return s.tmp_1;; }
-     else { s.callLocIdx = 832; s.pc = 10; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["lifeZeroHandler"], 1); s.callLocIdx = 839; s.pc = 10; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 839; s.pc = 10; return s.tmp_1;; }
+     else { s.callLocIdx = 839; s.pc = 10; return s.tmp_1; }
     }
   case 10:
     r0 = s.retval;
@@ -16931,10 +16914,10 @@ switch (step) {
   case 3:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 4; continue; }
-    s.tmp_0 = game_over__P187759_mk(s);
+    s.tmp_0 = game_over__P2542_mk(s);
     s.tmp_0.arg0 = false;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 833; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 840; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
   case 4:
@@ -16946,18 +16929,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_raiseLifeZero__P187467.info = {"start":20869,"length":374,"line":690,"column":8,"endLine":700,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"raiseLifeZero","argumentNames":["this","gameOver"]}
+info_PlayerInfo_raiseLifeZero__P2250.info = {"start":20869,"length":374,"line":690,"column":8,"endLine":700,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"raiseLifeZero","argumentNames":["this","gameOver"]}
 
-function info_PlayerInfo_raiseLifeZero__P187467_mk(s) {
+function info_PlayerInfo_raiseLifeZero__P2250_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_raiseLifeZero__P187467, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_raiseLifeZero__P2250, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  state___194368: undefined,
+  state___15480: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -16966,7 +16949,7 @@ function info_PlayerInfo_raiseLifeZero__P187467_mk(s) {
 
 
 
-function info_PlayerInfo_hasLife__P187465(s) {
+function info_PlayerInfo_hasLife__P2248(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -16976,20 +16959,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___194163 = undefined;
+    s.state___15391 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 830; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 837; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.state___194163 = (r0);
-    r0 = s.state___194163.fields["life"];
+    s.state___15391 = (r0);
+    r0 = s.state___15391.fields["life"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
     s.tmp_0 = r0;
@@ -16998,7 +16981,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.state___194163.fields["life"];
+    r0 = s.state___15391.fields["life"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 !== null);
   case 2:
@@ -17008,18 +16991,134 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_hasLife__P187465.info = {"start":20346,"length":141,"line":673,"column":8,"endLine":676,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"hasLife","argumentNames":["this"]}
+info_PlayerInfo_hasLife__P2248.info = {"start":20346,"length":141,"line":673,"column":8,"endLine":676,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"hasLife","argumentNames":["this"]}
 
-function info_PlayerInfo_hasLife__P187465_mk(s) {
+function info_PlayerInfo_hasLife__P2248_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_hasLife__P187465, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_hasLife__P2248, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  state___194163: undefined,
+  state___15391: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function info_PlayerInfo_hasScore__P2244(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.state___15471 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 836; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    s.state___15471 = (r0);
+    r0 = s.state___15471.fields["score"];
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 !== undefined);
+    return leave(s, r0)
+  default: oops()
+} } }
+info_PlayerInfo_hasScore__P2244.info = {"start":18619,"length":111,"line":616,"column":8,"endLine":619,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"hasScore","argumentNames":["this"]}
+
+function info_PlayerInfo_hasScore__P2244_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: info_PlayerInfo_hasScore__P2244, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  state___15471: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function info_PlayerInfo_score__P2241(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.state___14921 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = s.arg0;
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    r0 = s.arg0.fields["showScore"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 === undefined);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 1; continue; }
+    r0 = (s.arg0).fields["showScore"] = (true);
+  case 1:
+  case 2:
+    r0 = s.arg0.fields["showPlayer"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 === undefined);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 3; continue; }
+    r0 = (s.arg0).fields["showPlayer"] = (true);
+  case 3:
+  case 4:
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 830; s.pc = 7; return s.tmp_0;
+  case 7:
+    r0 = s.retval;
+    s.state___14921 = (r0);
+    r0 = s.state___14921.fields["score"];
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 == null);
+    s.tmp_0 = r0;
+    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
+    if (!r0) { step = 5; continue; }
+    r0 = (s.state___14921).fields["score"] = (0);
+  case 5:
+  case 6:
+    r0 = s.state___14921.fields["score"];
+    return leave(s, r0)
+  default: oops()
+} } }
+info_PlayerInfo_score__P2241.info = {"start":17492,"length":314,"line":578,"column":8,"endLine":587,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"score","argumentNames":["this"]}
+
+function info_PlayerInfo_score__P2241_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: info_PlayerInfo_score__P2241, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  tmp_1: undefined,
+  state___14921: undefined,
   arg0: undefined,
 } }
 
@@ -17027,7 +17126,7 @@ function info_PlayerInfo_hasLife__P187465_mk(s) {
 
 
 
-function info_PlayerInfo_hasScore__P187461(s) {
+function info_PlayerInfo_getState__P2239(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17037,134 +17136,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___194267 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_init__P4282_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 829; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___194267 = (r0);
-    r0 = s.state___194267.fields["score"];
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 !== undefined);
-    return leave(s, r0)
-  default: oops()
-} } }
-info_PlayerInfo_hasScore__P187461.info = {"start":18619,"length":111,"line":616,"column":8,"endLine":619,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"hasScore","argumentNames":["this"]}
-
-function info_PlayerInfo_hasScore__P187461_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: info_PlayerInfo_hasScore__P187461, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  state___194267: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function info_PlayerInfo_score__P187458(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    s.state___194255 = undefined;
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    r0 = s.arg0.fields["showScore"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 === undefined);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 1; continue; }
-    r0 = (s.arg0).fields["showScore"] = (true);
-  case 1:
-  case 2:
-    r0 = s.arg0.fields["showPlayer"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 === undefined);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 3; continue; }
-    r0 = (s.arg0).fields["showPlayer"] = (true);
-  case 3:
-  case 4:
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 828; s.pc = 7; return s.tmp_0;
-  case 7:
-    r0 = s.retval;
-    s.state___194255 = (r0);
-    r0 = s.state___194255.fields["score"];
-    s.tmp_1 = r0;
-    r0 = (s.tmp_1 == null);
-    s.tmp_0 = r0;
-    r0 = pxsim_numops_toBoolDecr(s.tmp_0);
-    if (!r0) { step = 5; continue; }
-    r0 = (s.state___194255).fields["score"] = (0);
-  case 5:
-  case 6:
-    r0 = s.state___194255.fields["score"];
-    return leave(s, r0)
-  default: oops()
-} } }
-info_PlayerInfo_score__P187458.info = {"start":17492,"length":314,"line":578,"column":8,"endLine":587,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"score","argumentNames":["this"]}
-
-function info_PlayerInfo_score__P187458_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: info_PlayerInfo_score__P187458, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  tmp_1: undefined,
-  state___194255: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function info_PlayerInfo_getState__P187456(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, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_init__P189498_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 827; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = globals.infoState___189446.fields["playerStates"];
+    r0 = globals.infoState___4230.fields["playerStates"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["_player"];
     s.tmp_2 = r0;
@@ -17174,12 +17157,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_getState__P187456.info = {"start":17088,"length":121,"line":562,"column":8,"endLine":565,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"getState","argumentNames":["this"]}
+info_PlayerInfo_getState__P2239.info = {"start":17088,"length":121,"line":562,"column":8,"endLine":565,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"getState","argumentNames":["this"]}
 
-function info_PlayerInfo_getState__P187456_mk(s) {
+function info_PlayerInfo_getState__P2239_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_getState__P187456, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_getState__P2239, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17191,7 +17174,7 @@ function info_PlayerInfo_getState__P187456_mk(s) {
 
 
 
-function info_PlayerInfo_init__P189498(s) {
+function info_PlayerInfo_init__P4282(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17206,9 +17189,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_initHUD__P189492_mk(s);
-    s.callLocIdx = 824; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_initHUD__P4276_mk(s);
+    s.callLocIdx = 826; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = s.arg0.fields["_player"];
@@ -17217,13 +17200,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = info_initMultiHUD__P189493_mk(s);
-    s.callLocIdx = 825; s.pc = 6; return s.tmp_2;
+    s.tmp_2 = info_initMultiHUD__P4277_mk(s);
+    s.callLocIdx = 827; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = globals.infoState___189446.fields["playerStates"];
+    r0 = globals.infoState___4230.fields["playerStates"];
     s.tmp_3 = r0;
     r0 = s.arg0.fields["_player"];
     s.tmp_5 = r0;
@@ -17237,10 +17220,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerState__C187414_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(info_PlayerState__C2197_VT);
     s.tmp_6 = r0;
     r0 = undefined;
-    r0 = globals.infoState___189446.fields["playerStates"];
+    r0 = globals.infoState___4230.fields["playerStates"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["_player"];
     s.tmp_9 = r0;
@@ -17253,12 +17236,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_init__P189498.info = {"start":16826,"length":252,"line":554,"column":8,"endLine":560,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"init","argumentNames":["this"]}
+info_PlayerInfo_init__P4282.info = {"start":16826,"length":252,"line":554,"column":8,"endLine":560,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"init","argumentNames":["this"]}
 
-function info_PlayerInfo_init__P189498_mk(s) {
+function info_PlayerInfo_init__P4282_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_init__P189498, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_init__P4282, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17277,7 +17260,7 @@ function info_PlayerInfo_init__P189498_mk(s) {
 
 
 
-function info_initMultiHUD__P189493(s) {
+function info_initMultiHUD__P4277(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17287,7 +17270,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.infoState___189446.fields["visibilityFlag"];
+    r0 = globals.infoState___4230.fields["visibilityFlag"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 16);
     s.tmp_0 = r0;
@@ -17296,13 +17279,13 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_2 = r0 = globals.infoState___189446;
+    s.tmp_2 = r0 = globals.infoState___4230;
     r0 = s.tmp_2.fields["visibilityFlag"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 | 16);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["visibilityFlag"] = (s.tmp_3);
-    r0 = globals.infoState___189446.fields["visibilityFlag"];
+    r0 = globals.infoState___4230.fields["visibilityFlag"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 32);
     s.tmp_2 = r0;
@@ -17312,8 +17295,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = r0 = globals.infoState___189446;
-    s.tmp_6 = info_defaultMultiplayerHeartImage__P189495_mk(s);
+    s.tmp_4 = r0 = globals.infoState___4230;
+    s.tmp_6 = info_defaultMultiplayerHeartImage__P4279_mk(s);
     s.callLocIdx = 796; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
@@ -17321,8 +17304,8 @@ switch (step) {
     r0 = (s.tmp_4).fields["heartImage"] = (s.tmp_5);
   case 3:
   case 4:
-    s.tmp_0 = r0 = globals.infoState___189446;
-    r0 = pxsim.image.ofBuffer(_hex194155);
+    s.tmp_0 = r0 = globals.infoState___4230;
+    r0 = pxsim.image.ofBuffer(_hex15934);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["multiplierImage"] = (s.tmp_1);
   case 5:
@@ -17330,12 +17313,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_initMultiHUD__P189493.info = {"start":4681,"length":393,"line":149,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"initMultiHUD","argumentNames":[]}
+info_initMultiHUD__P4277.info = {"start":4681,"length":393,"line":149,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"initMultiHUD","argumentNames":[]}
 
-function info_initMultiHUD__P189493_mk(s) {
+function info_initMultiHUD__P4277_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_initMultiHUD__P189493, depth: s.depth + 1,
+        parent: s, fn: info_initMultiHUD__P4277, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17346,12 +17329,12 @@ function info_initMultiHUD__P189493_mk(s) {
   tmp_6: undefined,
 } }
 
-const _hex194155 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100001000000001010000")
+const _hex15934 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100001000000001010000")
 
 
 
 
-function info_defaultMultiplayerHeartImage__P189495(s) {
+function info_defaultMultiplayerHeartImage__P4279(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17361,14 +17344,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex194159);
+    r0 = pxsim.image.ofBuffer(_hex15938);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex194161);
+    r0 = pxsim.image.ofBuffer(_hex15940);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -17376,24 +17359,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_defaultMultiplayerHeartImage__P189495.info = {"start":5678,"length":503,"line":185,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"defaultMultiplayerHeartImage","argumentNames":[]}
+info_defaultMultiplayerHeartImage__P4279.info = {"start":5678,"length":503,"line":185,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"defaultMultiplayerHeartImage","argumentNames":[]}
 
-function info_defaultMultiplayerHeartImage__P189495_mk(s) {
+function info_defaultMultiplayerHeartImage__P4279_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_defaultMultiplayerHeartImage__P189495, depth: s.depth + 1,
+        parent: s, fn: info_defaultMultiplayerHeartImage__P4279, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex194159 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100000110000010000100011000001001000000000000")
-const _hex194161 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100002112000010240100411200001001000000000000")
+const _hex15938 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100000110000010000100011000001001000000000000")
+const _hex15940 = pxsim.BufferMethods.createBufferFromHex("870407000500000000000000100100002112000010240100411200001001000000000000")
 
 
 
 
-function info_PlayerState_constructor__P187418(s) {
+function info_PlayerState_constructor__P2201(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17408,17 +17391,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerState__C187414_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_PlayerState__C2197_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerState_constructor__P187418.info = {"start":608,"length":17,"line":27,"column":8,"endLine":27,"endColumn":25,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this"]}
+info_PlayerState_constructor__P2201.info = {"start":608,"length":17,"line":27,"column":8,"endLine":27,"endColumn":25,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["this"]}
 
-function info_PlayerState_constructor__P187418_mk(s) {
+function info_PlayerState_constructor__P2201_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerState_constructor__P187418, depth: s.depth + 1,
+        parent: s, fn: info_PlayerState_constructor__P2201, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -17427,7 +17410,7 @@ function info_PlayerState_constructor__P187418_mk(s) {
 
 
 
-function tiles_setTileAt__P187559(s) {
+function tiles_setTileAt__P2342(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17437,19 +17420,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___206367 = undefined;
-    s.scale___206380 = undefined;
-    s.index___206384 = undefined;
+    s.scene___21311 = undefined;
+    s.scale___21324 = undefined;
+    s.index___21328 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 970; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 977; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.scene___206367 = (r0);
+    s.scene___21311 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -17470,7 +17453,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 4; continue; }
   case 3:
-    r0 = s.scene___206367.fields["tileMap"];
+    r0 = s.scene___21311.fields["tileMap"];
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     s.tmp_4 = r0;
@@ -17484,39 +17467,39 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    r0 = s.scene___206367.fields["tileMap"];
+    r0 = s.scene___21311.fields["tileMap"];
     s.tmp_7 = r0;
     r0 = s.tmp_7.fields["_scale"];
-    s.scale___206380 = (r0);
-    s.tmp_0 = tiles_TileMap_getImageType__P187549_mk(s);
-    r0 = s.scene___206367.fields["tileMap"];
+    s.scale___21324 = (r0);
+    s.tmp_0 = tiles_TileMap_getImageType__P2332_mk(s);
+    r0 = s.scene___21311.fields["tileMap"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 972; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 979; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.index___206384 = (r0);
-    s.tmp_0 = tiles_TileMap_setTileAt__P187548_mk(s);
-    r0 = s.scene___206367.fields["tileMap"];
+    s.index___21328 = (r0);
+    s.tmp_0 = tiles_TileMap_setTileAt__P2331_mk(s);
+    r0 = s.scene___21311.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_2 = tiles_Location_x__P187510_mk(s);
+    s.tmp_2 = tiles_Location_x__P2293_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 973; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 980; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 >> s.scale___206380);
+    r0 = (s.tmp_1 >> s.scale___21324);
     s.tmp_0.arg1 = r0;
-    s.tmp_4 = tiles_Location_y__P187511_mk(s);
+    s.tmp_4 = tiles_Location_y__P2294_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 974; s.pc = 12; return s.tmp_4;
+    s.callLocIdx = 981; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> s.scale___206380);
+    r0 = (s.tmp_3 >> s.scale___21324);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.index___206384;
-    s.callLocIdx = 975; s.pc = 10; return s.tmp_0;
+    s.tmp_0.arg3 = s.index___21328;
+    s.callLocIdx = 982; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 7:
@@ -17524,12 +17507,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_setTileAt__P187559.info = {"start":15058,"length":339,"line":482,"column":4,"endLine":488,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTileAt","argumentNames":["loc","tile"]}
+tiles_setTileAt__P2342.info = {"start":15058,"length":339,"line":482,"column":4,"endLine":488,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTileAt","argumentNames":["loc","tile"]}
 
-function tiles_setTileAt__P187559_mk(s) {
+function tiles_setTileAt__P2342_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_setTileAt__P187559, depth: s.depth + 1,
+        parent: s, fn: tiles_setTileAt__P2342, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17539,9 +17522,9 @@ function tiles_setTileAt__P187559_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  scene___206367: undefined,
-  scale___206380: undefined,
-  index___206384: undefined,
+  scene___21311: undefined,
+  scale___21324: undefined,
+  index___21328: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -17550,7 +17533,7 @@ function tiles_setTileAt__P187559_mk(s) {
 
 
 
-function tiles_TileMap_getImageType__P187549(s) {
+function tiles_TileMap_getImageType__P2332(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17560,49 +17543,49 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tileset___206093 = undefined;
-    s.i___206098 = undefined;
-    s.newIndex___206112 = undefined;
+    s.tileset___21037 = undefined;
+    s.i___21042 = undefined;
+    s.newIndex___21056 = 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__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["tileset"];
-    s.tileset___206093 = (r0);
-    s.i___206098 = (0);
+    s.tileset___21037 = (r0);
+    s.i___21042 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___206098;
-    r0 = pxsim_Array__length(s.tileset___206093);
+    s.tmp_1 = r0 = s.i___21042;
+    r0 = pxsim_Array__length(s.tileset___21037);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.tileset___206093, s.i___206098);
+    r0 = pxsim_Array__getAt(s.tileset___21037, s.i___21042);
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.equals(s.tmp_4, s.arg1);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 2; continue; }
-    r0 = s.i___206098;
+    r0 = s.i___21042;
     { step = 7; continue; }
   case 2:
   case 3:
-    r0 = (s.i___206098 + 1);
-    s.i___206098 = (r0);
+    r0 = (s.i___21042 + 1);
+    s.i___21042 = (r0);
     { step = 1; continue; }
   case 4:
-    r0 = pxsim_Array__length(s.tileset___206093);
-    s.newIndex___206112 = (r0);
-    s.tmp_3 = tiles_TileMap_isInvalidIndex__P189509_mk(s);
+    r0 = pxsim_Array__length(s.tileset___21037);
+    s.newIndex___21056 = (r0);
+    s.tmp_3 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.tmp_3.arg1 = s.newIndex___206112;
-    s.callLocIdx = 907; s.pc = 8; return s.tmp_3;
+    s.tmp_3.arg1 = s.newIndex___21056;
+    s.callLocIdx = 914; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -17612,8 +17595,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array__push(s.tileset___206093, s.arg1);
-    r0 = s.newIndex___206112;
+    r0 = pxsim_Array__push(s.tileset___21037, s.arg1);
+    r0 = s.newIndex___21056;
     { step = 7; continue; }
   case 5:
   case 6:
@@ -17622,21 +17605,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getImageType__P187549.info = {"start":7714,"length":482,"line":282,"column":8,"endLine":295,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getImageType","argumentNames":["this","im"]}
+tiles_TileMap_getImageType__P2332.info = {"start":7714,"length":482,"line":282,"column":8,"endLine":295,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getImageType","argumentNames":["this","im"]}
 
-function tiles_TileMap_getImageType__P187549_mk(s) {
+function tiles_TileMap_getImageType__P2332_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getImageType__P187549, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getImageType__P2332, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  tileset___206093: undefined,
-  i___206098: undefined,
-  newIndex___206112: undefined,
+  tileset___21037: undefined,
+  i___21042: undefined,
+  newIndex___21056: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -17645,7 +17628,7 @@ function tiles_TileMap_getImageType__P187549_mk(s) {
 
 
 
-function tiles_TileMap_isInvalidIndex__P189509(s) {
+function tiles_TileMap_isInvalidIndex__P4293(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17661,7 +17644,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = (s.arg1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -17677,12 +17660,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isInvalidIndex__P189509.info = {"start":10071,"length":106,"line":343,"column":8,"endLine":345,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isInvalidIndex","argumentNames":["this","index"]}
+tiles_TileMap_isInvalidIndex__P4293.info = {"start":10071,"length":106,"line":343,"column":8,"endLine":345,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isInvalidIndex","argumentNames":["this","index"]}
 
-function tiles_TileMap_isInvalidIndex__P189509_mk(s) {
+function tiles_TileMap_isInvalidIndex__P4293_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isInvalidIndex__P189509, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isInvalidIndex__P4293, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17694,7 +17677,7 @@ function tiles_TileMap_isInvalidIndex__P189509_mk(s) {
 
 
 
-function tiles_TileMapData_getTileset__P187529(s) {
+function tiles_TileMapData_getTileset__P2312(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17709,17 +17692,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
     r0 = s.arg0.fields["tileset"];
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_getTileset__P187529.info = {"start":4532,"length":57,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileset","argumentNames":["this"]}
+tiles_TileMapData_getTileset__P2312.info = {"start":4532,"length":57,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileset","argumentNames":["this"]}
 
-function tiles_TileMapData_getTileset__P187529_mk(s) {
+function tiles_TileMapData_getTileset__P2312_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_getTileset__P187529, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_getTileset__P2312, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -17728,7 +17711,7 @@ function tiles_TileMapData_getTileset__P187529_mk(s) {
 
 
 
-function tiles_TileMap_setTileAt__P187548(s) {
+function tiles_TileMap_setTileAt__P2331(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17746,13 +17729,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    s.tmp_3 = tiles_TileMapData_isOutsideMap__P187533_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_3 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.arg1;
     s.tmp_3.arg2 = s.arg2;
-    s.callLocIdx = 903; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 910; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -17765,10 +17748,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_6 = tiles_TileMap_isInvalidIndex__P189509_mk(s);
+    s.tmp_6 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.tmp_6.arg1 = s.arg3;
-    s.callLocIdx = 904; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 911; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -17780,13 +17763,13 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 3; continue; }
-    s.tmp_8 = tiles_TileMapData_setTile__P187528_mk(s);
+    s.tmp_8 = tiles_TileMapData_setTile__P2311_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_8.arg0 = r0;
     s.tmp_8.arg1 = s.arg1;
     s.tmp_8.arg2 = s.arg2;
     s.tmp_8.arg3 = s.arg3;
-    s.callLocIdx = 905; s.pc = 7; return s.tmp_8;
+    s.callLocIdx = 912; s.pc = 7; return s.tmp_8;
   case 7:
     r0 = s.retval;
   case 3:
@@ -17795,12 +17778,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_setTileAt__P187548.info = {"start":7495,"length":209,"line":277,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTileAt","argumentNames":["this","col","row","index"]}
+tiles_TileMap_setTileAt__P2331.info = {"start":7495,"length":209,"line":277,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTileAt","argumentNames":["this","col","row","index"]}
 
-function tiles_TileMap_setTileAt__P187548_mk(s) {
+function tiles_TileMap_setTileAt__P2331_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_setTileAt__P187548, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_setTileAt__P2331, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17821,7 +17804,7 @@ function tiles_TileMap_setTileAt__P187548_mk(s) {
 
 
 
-function tiles_TileMapData_setTile__P187528(s) {
+function tiles_TileMapData_setTile__P2311(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17839,12 +17822,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P187533_mk(s);
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 881; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 888; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -17887,12 +17870,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_setTile__P187528.info = {"start":4207,"length":315,"line":158,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTile","argumentNames":["this","col","row","tile"]}
+tiles_TileMapData_setTile__P2311.info = {"start":4207,"length":315,"line":158,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTile","argumentNames":["this","col","row","tile"]}
 
-function tiles_TileMapData_setTile__P187528_mk(s) {
+function tiles_TileMapData_setTile__P2311_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_setTile__P187528, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_setTile__P2311, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17911,7 +17894,7 @@ function tiles_TileMapData_setTile__P187528_mk(s) {
 
 
 
-function tiles_getTilesByType__P187567(s) {
+function tiles_getTilesByType__P2350(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -17921,17 +17904,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___206016 = undefined;
-    s.index___206026 = undefined;
+    s.scene___20960 = undefined;
+    s.index___20970 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 989; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 996; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___206016 = (r0);
+    s.scene___20960 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -17941,7 +17924,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___206016.fields["tileMap"];
+    r0 = s.scene___20960.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -17955,31 +17938,31 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = tiles_TileMap_getImageType__P187549_mk(s);
-    r0 = s.scene___206016.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getImageType__P2332_mk(s);
+    r0 = s.scene___20960.fields["tileMap"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg0;
-    s.callLocIdx = 990; s.pc = 7; return s.tmp_5;
+    s.callLocIdx = 997; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
-    s.index___206026 = (r0);
-    s.tmp_0 = tiles_TileMap_getTilesByType__P187551_mk(s);
-    r0 = s.scene___206016.fields["tileMap"];
+    s.index___20970 = (r0);
+    s.tmp_0 = tiles_TileMap_getTilesByType__P2334_mk(s);
+    r0 = s.scene___20960.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___206026;
-    s.callLocIdx = 991; s.pc = 8; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___20970;
+    s.callLocIdx = 998; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getTilesByType__P187567.info = {"start":19427,"length":262,"line":597,"column":4,"endLine":602,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTilesByType","argumentNames":["tile"]}
+tiles_getTilesByType__P2350.info = {"start":19427,"length":262,"line":597,"column":4,"endLine":602,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTilesByType","argumentNames":["tile"]}
 
-function tiles_getTilesByType__P187567_mk(s) {
+function tiles_getTilesByType__P2350_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getTilesByType__P187567, depth: s.depth + 1,
+        parent: s, fn: tiles_getTilesByType__P2350, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -17987,8 +17970,8 @@ function tiles_getTilesByType__P187567_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___206016: undefined,
-  index___206026: undefined,
+  scene___20960: undefined,
+  index___20970: undefined,
   arg0: undefined,
 } }
 
@@ -17996,7 +17979,7 @@ function tiles_getTilesByType__P187567_mk(s) {
 
 
 
-function tiles_TileMap_getTilesByType__P187551(s) {
+function tiles_TileMap_getTilesByType__P2334(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18006,21 +17989,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.output___206045 = undefined;
-    s.col___206047 = undefined;
-    s.row___206054 = undefined;
-    s.currTile___206061 = undefined;
+    s.output___20989 = undefined;
+    s.col___20991 = undefined;
+    s.row___20998 = undefined;
+    s.currTile___21005 = 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__C187534_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMap_isInvalidIndex__P189509_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 910; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 917; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -18052,10 +18035,10 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_Array__mk();
-    s.output___206045 = (r0);
-    s.col___206047 = (0);
+    s.output___20989 = (r0);
+    s.col___20991 = (0);
   case 5:
-    s.tmp_1 = r0 = s.col___206047;
+    s.tmp_1 = r0 = s.col___20991;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_width"];
@@ -18064,9 +18047,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.row___206054 = (0);
+    s.row___20998 = (0);
   case 6:
-    s.tmp_1 = r0 = s.row___206054;
+    s.tmp_1 = r0 = s.row___20998;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_height"];
@@ -18075,51 +18058,51 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_4 = tiles_TileMapData_getTile__P187527_mk(s);
+    s.tmp_4 = tiles_TileMapData_getTile__P2310_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.col___206047;
-    s.tmp_4.arg2 = s.row___206054;
-    s.callLocIdx = 914; s.pc = 13; return s.tmp_4;
+    s.tmp_4.arg1 = s.col___20991;
+    s.tmp_4.arg2 = s.row___20998;
+    s.callLocIdx = 921; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
-    s.currTile___206061 = (r0);
-    r0 = (s.currTile___206061 === s.arg1);
+    s.currTile___21005 = (r0);
+    r0 = (s.currTile___21005 === s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C187506_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = tiles_Location_constructor__P187509_mk(s);
+    s.tmp_2 = tiles_Location_constructor__P2292_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = s.col___206047;
-    s.tmp_2.arg2 = s.row___206054;
+    s.tmp_2.arg1 = s.col___20991;
+    s.tmp_2.arg2 = s.row___20998;
     s.tmp_2.arg3 = s.arg0;
-    s.callLocIdx = 915; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 922; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.output___206045, s.tmp_1);
+    r0 = pxsim_Array__push(s.output___20989, s.tmp_1);
   case 7:
   case 8:
-    r0 = (s.row___206054 + 1);
-    s.row___206054 = (r0);
+    r0 = (s.row___20998 + 1);
+    s.row___20998 = (r0);
     { step = 6; continue; }
   case 9:
-    r0 = (s.col___206047 + 1);
-    s.col___206047 = (r0);
+    r0 = (s.col___20991 + 1);
+    s.col___20991 = (r0);
     { step = 5; continue; }
   case 10:
-    r0 = s.output___206045;
+    r0 = s.output___20989;
   case 11:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_getTilesByType__P187551.info = {"start":8389,"length":561,"line":302,"column":8,"endLine":315,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTilesByType","argumentNames":["this","index"]}
+tiles_TileMap_getTilesByType__P2334.info = {"start":8389,"length":561,"line":302,"column":8,"endLine":315,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTilesByType","argumentNames":["this","index"]}
 
-function tiles_TileMap_getTilesByType__P187551_mk(s) {
+function tiles_TileMap_getTilesByType__P2334_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTilesByType__P187551, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTilesByType__P2334, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18130,10 +18113,10 @@ function tiles_TileMap_getTilesByType__P187551_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  output___206045: undefined,
-  col___206047: undefined,
-  row___206054: undefined,
-  currTile___206061: undefined,
+  output___20989: undefined,
+  col___20991: undefined,
+  row___20998: undefined,
+  currTile___21005: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -18142,7 +18125,7 @@ function tiles_TileMap_getTilesByType__P187551_mk(s) {
 
 
 
-function tiles_Location_constructor__P187509(s) {
+function tiles_Location_constructor__P2292(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18160,7 +18143,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C187506_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_col"] = (s.arg1);
     r0 = (s.arg0).fields["_row"] = (s.arg2);
     r0 = (s.arg0).fields["tileMap"] = (s.arg3);
@@ -18168,12 +18151,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_constructor__P187509.info = {"start":528,"length":153,"line":27,"column":8,"endLine":31,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","col","row","map"]}
+tiles_Location_constructor__P2292.info = {"start":528,"length":153,"line":27,"column":8,"endLine":31,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","col","row","map"]}
 
-function tiles_Location_constructor__P187509_mk(s) {
+function tiles_Location_constructor__P2292_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_constructor__P187509, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_constructor__P2292, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -18185,7 +18168,7 @@ function tiles_Location_constructor__P187509_mk(s) {
 
 
 
-function controller_moveSprite__P187169(s) {
+function controller_moveSprite__P1952(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18201,8 +18184,8 @@ switch (step) {
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller_moveSprite__P187156_mk(s);
-    s.tmp_1 = controller__player1__P187134_mk(s);
+    s.tmp_0 = controller_Controller_moveSprite__P1939_mk(s);
+    s.tmp_1 = controller__player1__P1917_mk(s);
     s.callLocIdx = 244; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
@@ -18217,12 +18200,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_moveSprite__P187169.info = {"start":18919,"length":133,"line":574,"column":4,"endLine":576,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"moveSprite","argumentNames":["sprite","vx","vy"]}
+controller_moveSprite__P1952.info = {"start":18919,"length":133,"line":574,"column":4,"endLine":576,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"moveSprite","argumentNames":["sprite","vx","vy"]}
 
-function controller_moveSprite__P187169_mk(s) {
+function controller_moveSprite__P1952_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_moveSprite__P187169, depth: s.depth + 1,
+        parent: s, fn: controller_moveSprite__P1952, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18235,7 +18218,7 @@ function controller_moveSprite__P187169_mk(s) {
 
 
 
-function controller_Controller_moveSprite__P187156(s) {
+function controller_Controller_moveSprite__P1939(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18245,7 +18228,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cp___200812 = undefined;
+    s.cp___15967 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -18254,7 +18237,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -18264,7 +18247,7 @@ switch (step) {
     { step = 15; continue; }
   case 1:
   case 2:
-    s.tmp_5 = controller_Controller__controlledSprites__P187145_mk(s);
+    s.tmp_5 = controller_Controller__controlledSprites__P1928_mk(s);
     s.tmp_5.arg0 = s.arg0;
     s.callLocIdx = 205; s.pc = 16; return s.tmp_5;
   case 16:
@@ -18276,7 +18259,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    s.tmp_6 = controller_Controller__controlledSprites__P187146_mk(s);
+    s.tmp_6 = controller_Controller__controlledSprites__P1929_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_6.arg1 = r0;
@@ -18285,11 +18268,11 @@ switch (step) {
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P200815);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P15970);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayFind__P185326_mk(s);
-    s.tmp_2 = controller_Controller__controlledSprites__P187145_mk(s);
+    s.tmp_1 = helpers_arrayFind__P109_mk(s);
+    s.tmp_2 = controller_Controller__controlledSprites__P1928_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 207; s.pc = 19; return s.tmp_2;
   case 19:
@@ -18299,16 +18282,16 @@ switch (step) {
     s.callLocIdx = 208; s.pc = 18; return s.tmp_1;
   case 18:
     r0 = s.retval;
-    s.cp___200812 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.cp___200812);
+    s.cp___15967 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.cp___15967);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(controller_ControlledSprite__C187136_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_ControlledSprite__C1919_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = controller_ControlledSprite_constructor__P187138_mk(s);
+    s.tmp_3 = controller_ControlledSprite_constructor__P1921_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
     s.tmp_3.arg1 = s.arg1;
     s.tmp_3.arg2 = s.arg2;
@@ -18316,17 +18299,17 @@ switch (step) {
     s.callLocIdx = 209; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
-    s.cp___200812 = (s.tmp_2);
-    s.tmp_1 = controller_Controller__controlledSprites__P187145_mk(s);
+    s.cp___15967 = (s.tmp_2);
+    s.tmp_1 = controller_Controller__controlledSprites__P1928_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 210; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.cp___200812);
+    r0 = pxsim_Array__push(s.tmp_0, s.cp___15967);
   case 5:
   case 6:
-    r0 = s.cp___200812.fields["vx"];
+    r0 = s.cp___15967.fields["vx"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 7; continue; }
@@ -18339,8 +18322,8 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 9; continue; }
-    s.tmp_2 = Sprite_vx__P187247_mk(s);
-    r0 = s.cp___200812.fields["s"];
+    s.tmp_2 = Sprite_vx__P2030_mk(s);
+    r0 = s.cp___15967.fields["s"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
     s.callLocIdx = 211; s.pc = 22; return s.tmp_2;
@@ -18348,7 +18331,7 @@ switch (step) {
     r0 = s.retval;
   case 9:
   case 10:
-    r0 = s.cp___200812.fields["vy"];
+    r0 = s.cp___15967.fields["vy"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 11; continue; }
@@ -18361,8 +18344,8 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 13; continue; }
-    s.tmp_2 = Sprite_vy__P187249_mk(s);
-    r0 = s.cp___200812.fields["s"];
+    s.tmp_2 = Sprite_vy__P2032_mk(s);
+    r0 = s.cp___15967.fields["s"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
     s.callLocIdx = 212; s.pc = 23; return s.tmp_2;
@@ -18370,19 +18353,19 @@ switch (step) {
     r0 = s.retval;
   case 13:
   case 14:
-    r0 = (s.cp___200812).fields["vx"] = (s.arg2);
-    r0 = (s.cp___200812).fields["vy"] = (s.arg3);
+    r0 = (s.cp___15967).fields["vx"] = (s.arg2);
+    r0 = (s.cp___15967).fields["vy"] = (s.arg3);
   case 15:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_moveSprite__P187156.info = {"start":10866,"length":608,"line":355,"column":8,"endLine":371,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"moveSprite","argumentNames":["this","sprite","vx","vy"]}
+controller_Controller_moveSprite__P1939.info = {"start":10866,"length":608,"line":355,"column":8,"endLine":371,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"moveSprite","argumentNames":["this","sprite","vx","vy"]}
 
-function controller_Controller_moveSprite__P187156_mk(s) {
+function controller_Controller_moveSprite__P1939_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_moveSprite__P187156, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_moveSprite__P1939, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18391,7 +18374,7 @@ function controller_Controller_moveSprite__P187156_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  cp___200812: undefined,
+  cp___15967: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -18402,7 +18385,7 @@ function controller_Controller_moveSprite__P187156_mk(s) {
 
 
 
-function inline__P200815(s) {
+function inline__P15970(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18425,12 +18408,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P200815.info = {"start":11086,"length":26,"line":358,"column":50,"endLine":358,"endColumn":76,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["cp"]}
+inline__P15970.info = {"start":11086,"length":26,"line":358,"column":50,"endLine":358,"endColumn":76,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["cp"]}
 
-function inline__P200815_mk(s) {
+function inline__P15970_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P200815, depth: s.depth + 1,
+        parent: s, fn: inline__P15970, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18441,7 +18424,7 @@ function inline__P200815_mk(s) {
 
 
 
-function controller_Controller__controlledSprites__P187146(s) {
+function controller_Controller__controlledSprites__P1929(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18457,8 +18440,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P187749_mk(s);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 200; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
@@ -18471,12 +18454,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller__controlledSprites__P187146.info = {"start":8697,"length":134,"line":272,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"_controlledSprites","argumentNames":["this","cps"]}
+controller_Controller__controlledSprites__P1929.info = {"start":8697,"length":134,"line":272,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"_controlledSprites","argumentNames":["this","cps"]}
 
-function controller_Controller__controlledSprites__P187146_mk(s) {
+function controller_Controller__controlledSprites__P1929_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller__controlledSprites__P187146, depth: s.depth + 1,
+        parent: s, fn: controller_Controller__controlledSprites__P1929, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18489,7 +18472,7 @@ function controller_Controller__controlledSprites__P187146_mk(s) {
 
 
 
-function controller_Controller__controlledSprites__P187145(s) {
+function controller_Controller__controlledSprites__P1928(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18504,8 +18487,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P187749_mk(s);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 199; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
@@ -18517,13 +18500,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller__controlledSprites__P187145.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__P187145.isGetter = true;
+controller_Controller__controlledSprites__P1928.info = {"start":8555,"length":132,"line":268,"column":8,"endLine":270,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"_controlledSprites","argumentNames":["this"]}
+controller_Controller__controlledSprites__P1928.isGetter = true;
 
-function controller_Controller__controlledSprites__P187145_mk(s) {
+function controller_Controller__controlledSprites__P1928_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller__controlledSprites__P187145, depth: s.depth + 1,
+        parent: s, fn: controller_Controller__controlledSprites__P1928, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18535,7 +18518,7 @@ function controller_Controller__controlledSprites__P187145_mk(s) {
 
 
 
-function controller_ControlledSprite_constructor__P187138(s) {
+function controller_ControlledSprite_constructor__P1921(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18553,7 +18536,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_ControlledSprite__C187136_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_ControlledSprite__C1919_VT)) failedCast(r0);
     r0 = (s.arg0).fields["s"] = (s.arg1);
     r0 = (s.arg0).fields["vx"] = (s.arg2);
     r0 = (s.arg0).fields["vy"] = (s.arg3);
@@ -18561,12 +18544,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_ControlledSprite_constructor__P187138.info = {"start":7271,"length":117,"line":227,"column":8,"endLine":231,"endColumn":13,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","s","vx","vy"]}
+controller_ControlledSprite_constructor__P1921.info = {"start":7271,"length":117,"line":227,"column":8,"endLine":231,"endColumn":13,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","s","vx","vy"]}
 
-function controller_ControlledSprite_constructor__P187138_mk(s) {
+function controller_ControlledSprite_constructor__P1921_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_ControlledSprite_constructor__P187138, depth: s.depth + 1,
+        parent: s, fn: controller_ControlledSprite_constructor__P1921, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -18578,7 +18561,7 @@ function controller_ControlledSprite_constructor__P187138_mk(s) {
 
 
 
-function controller__player1__P187134(s) {
+function controller__player1__P1917(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18588,7 +18571,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals._players___189406);
+    r0 = pxsim_numops_toBoolDecr(globals._players___4190);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -18597,7 +18580,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array__getAt(globals._players___189406, 0);
+    r0 = pxsim_Array__getAt(globals._players___4190, 0);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -18607,18 +18590,18 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Controller__C187140_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Controller__C1923_VT);
     s.tmp_5 = r0;
     r0 = pxsim_Array__mk();
     s.tmp_6 = r0;
-    r0 = pxsim_Array__push(s.tmp_6, globals.left___187096);
-    r0 = pxsim_Array__push(s.tmp_6, globals.up___187097);
-    r0 = pxsim_Array__push(s.tmp_6, globals.right___187098);
-    r0 = pxsim_Array__push(s.tmp_6, globals.down___187099);
-    r0 = pxsim_Array__push(s.tmp_6, globals.A___187094);
-    r0 = pxsim_Array__push(s.tmp_6, globals.B___187095);
-    r0 = pxsim_Array__push(s.tmp_6, globals.menu___187100);
-    s.tmp_7 = controller_Controller_constructor__P187144_mk(s);
+    r0 = pxsim_Array__push(s.tmp_6, globals.left___1879);
+    r0 = pxsim_Array__push(s.tmp_6, globals.up___1880);
+    r0 = pxsim_Array__push(s.tmp_6, globals.right___1881);
+    r0 = pxsim_Array__push(s.tmp_6, globals.down___1882);
+    r0 = pxsim_Array__push(s.tmp_6, globals.A___1877);
+    r0 = pxsim_Array__push(s.tmp_6, globals.B___1878);
+    r0 = pxsim_Array__push(s.tmp_6, globals.menu___1883);
+    s.tmp_7 = controller_Controller_constructor__P1927_mk(s);
     s.tmp_7.arg0 = s.tmp_5;
     s.tmp_7.arg1 = 1;
     s.tmp_7.arg2 = s.tmp_6;
@@ -18627,16 +18610,16 @@ switch (step) {
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_Array__getAt(globals._players___189406, 0);
+    r0 = pxsim_Array__getAt(globals._players___4190, 0);
     return leave(s, r0)
   default: oops()
 } } }
-controller__player1__P187134.info = {"start":6776,"length":258,"line":214,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_player1","argumentNames":[]}
+controller__player1__P1917.info = {"start":6776,"length":258,"line":214,"column":4,"endLine":218,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_player1","argumentNames":[]}
 
-function controller__player1__P187134_mk(s) {
+function controller__player1__P1917_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__player1__P187134, depth: s.depth + 1,
+        parent: s, fn: controller__player1__P1917, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18652,7 +18635,7 @@ function controller__player1__P187134_mk(s) {
 
 
 
-function controller_Controller_constructor__P187144(s) {
+function controller_Controller_constructor__P1927(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18662,9 +18645,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.leftId___197357 = undefined;
-    s.i___197365 = undefined;
-    s.i___197383 = undefined;
+    s.leftId___11278 = undefined;
+    s.i___11286 = undefined;
+    s.i___11304 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -18672,7 +18655,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim.control.allocateNotifyEvent();
     s.tmp_1 = r0;
@@ -18696,18 +18679,18 @@ switch (step) {
     r0 = (s.tmp_1 * 7);
     s.tmp_0 = r0;
     r0 = (1 + s.tmp_0);
-    s.leftId___197357 = (r0);
-    s.i___197365 = (0);
+    s.leftId___11278 = (r0);
+    s.i___11286 = (0);
   case 2:
-    r0 = (s.i___197365 < 7);
+    r0 = (s.i___11286 < 7);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C187120_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(controller_Button__C1903_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = controller_Button_constructor__P187126_mk(s);
+    s.tmp_2 = controller_Button_constructor__P1909_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    r0 = (s.leftId___197357 + s.i___197365);
+    r0 = (s.leftId___11278 + s.i___11286);
     s.tmp_2.arg1 = r0;
     s.tmp_2.arg2 = -1;
     s.callLocIdx = 197; s.pc = 7; return s.tmp_2;
@@ -18716,14 +18699,14 @@ switch (step) {
     r0 = s.arg0.fields["buttons"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_1);
-    r0 = (s.i___197365 + 1);
-    s.i___197365 = (r0);
+    r0 = (s.i___11286 + 1);
+    s.i___11286 = (r0);
     { step = 2; continue; }
   case 3:
   case 4:
-    s.i___197383 = (0);
+    s.i___11304 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___197383;
+    s.tmp_1 = r0 = s.i___11304;
     r0 = s.arg0.fields["buttons"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -18734,14 +18717,14 @@ 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___197383);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___11304);
     s.tmp_4 = r0;
     r0 = (s.tmp_4).fields["_owner"] = (s.arg0);
-    r0 = (s.i___197383 + 1);
-    s.i___197383 = (r0);
+    r0 = (s.i___11304 + 1);
+    s.i___11304 = (r0);
     { step = 5; continue; }
   case 6:
-    s.tmp_0 = controller_addController__P189407_mk(s);
+    s.tmp_0 = controller_addController__P4191_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 198; s.pc = 8; return s.tmp_0;
   case 8:
@@ -18750,12 +18733,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_constructor__P187144.info = {"start":7849,"length":696,"line":249,"column":8,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","playerIndex","buttons"]}
+controller_Controller_constructor__P1927.info = {"start":7849,"length":696,"line":249,"column":8,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","playerIndex","buttons"]}
 
-function controller_Controller_constructor__P187144_mk(s) {
+function controller_Controller_constructor__P1927_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_constructor__P187144, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_constructor__P1927, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18763,9 +18746,9 @@ function controller_Controller_constructor__P187144_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  leftId___197357: undefined,
-  i___197365: undefined,
-  i___197383: undefined,
+  leftId___11278: undefined,
+  i___11286: undefined,
+  i___11304: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -18775,7 +18758,7 @@ function controller_Controller_constructor__P187144_mk(s) {
 
 
 
-function controller_addController__P189407(s) {
+function controller_addController__P4191(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18789,17 +18772,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._players___189406);
+    r0 = pxsim_numops_toBoolDecr(globals._players___4190);
     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___189406 = (r0);
+    globals._players___4190 = (r0);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals._players___189406;
+    s.tmp_0 = r0 = globals._players___4190;
     r0 = s.arg0.fields["playerIndex"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
@@ -18809,12 +18792,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_addController__P189407.info = {"start":6613,"length":157,"line":207,"column":4,"endLine":212,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"addController","argumentNames":["ctrl"]}
+controller_addController__P4191.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__P189407_mk(s) {
+function controller_addController__P4191_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_addController__P189407, depth: s.depth + 1,
+        parent: s, fn: controller_addController__P4191, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -18826,7 +18809,7 @@ function controller_addController__P189407_mk(s) {
 
 
 
-function summon_fish__P426670(s) {
+function summon_fish__P88595(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -18843,7 +18826,7 @@ switch (step) {
     }
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex426678);
+    r0 = pxsim.image.ofBuffer(_hex88603);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
     r0 = pxsim_Array__mk();
@@ -18851,14 +18834,26 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_0);
     r0 = pxsim_Array__mk();
     s.tmp_3 = r0;
-    r0 = pxsim.image.ofBuffer(_hex426681);
+    r0 = pxsim.image.ofBuffer(_hex88606);
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_4);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_3);
-    globals.left_fish_animations___426674 = (s.tmp_2);
+    r0 = pxsim_Array__mk();
+    s.tmp_5 = r0;
+    r0 = pxsim.image.ofBuffer(_hex88609);
+    s.tmp_6 = r0;
+    r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
+    r0 = pxsim_Array__push(s.tmp_2, s.tmp_5);
+    r0 = pxsim_Array__mk();
+    s.tmp_7 = r0;
+    r0 = pxsim.image.ofBuffer(_hex88612);
+    s.tmp_8 = r0;
+    r0 = pxsim_Array__push(s.tmp_7, s.tmp_8);
+    r0 = pxsim_Array__push(s.tmp_2, s.tmp_7);
+    globals.left_fish_animations___88599 = (s.tmp_2);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex426687);
+    r0 = pxsim.image.ofBuffer(_hex88618);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
     r0 = pxsim_Array__mk();
@@ -18866,46 +18861,62 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_0);
     r0 = pxsim_Array__mk();
     s.tmp_3 = r0;
-    r0 = pxsim.image.ofBuffer(_hex426690);
+    r0 = pxsim.image.ofBuffer(_hex88621);
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_4);
     r0 = pxsim_Array__push(s.tmp_2, s.tmp_3);
-    globals.right_fish_animations___426683 = (s.tmp_2);
-    r0 = pxsim.Math_.randomRange(0, 1);
-    globals.local_choice___426692 = (r0);
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    r0 = pxsim_Array__getAt(globals.right_fish_animations___426683, globals.local_choice___426692);
+    r0 = pxsim_Array__mk();
+    s.tmp_5 = r0;
+    r0 = pxsim.image.ofBuffer(_hex88624);
+    s.tmp_6 = r0;
+    r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
+    r0 = pxsim_Array__push(s.tmp_2, s.tmp_5);
+    r0 = pxsim_Array__mk();
+    s.tmp_7 = r0;
+    r0 = pxsim.image.ofBuffer(_hex88627);
+    s.tmp_8 = r0;
+    r0 = pxsim_Array__push(s.tmp_7, s.tmp_8);
+    r0 = pxsim_Array__push(s.tmp_2, s.tmp_7);
+    globals.right_fish_animations___88614 = (s.tmp_2);
+    r0 = pxsim_Array__length(globals.left_fish_animations___88599);
+    s.tmp_1 = r0;
+    r0 = (s.tmp_1 - 1);
+    s.tmp_0 = r0;
+    r0 = pxsim.Math_.randomRange(0, s.tmp_0);
+    globals.local_choice___88629 = (r0);
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    r0 = pxsim_Array__getAt(globals.right_fish_animations___88614, globals.local_choice___88629);
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, 0);
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.NPC___426659;
+    s.tmp_0.arg1 = globals.NPC___88584;
     s.callLocIdx = 84; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.sprite_fish___426697 = (r0);
-    s.tmp_0 = tiles_placeOnRandomTile__P187566_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
-    s.tmp_0.arg1 = globals.tile13___189163;
+    globals.sprite_fish___88637 = (r0);
+    s.tmp_0 = tiles_placeOnRandomTile__P2349_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
+    s.tmp_0.arg1 = globals.tile13___3947;
     s.callLocIdx = 85; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = tiles_setTileAt__P187559_mk(s);
-    s.tmp_1 = tiles_locationOfSprite__P188992_mk(s);
-    s.tmp_1.arg0 = globals.sprite_fish___426697;
+    s.tmp_0 = tiles_setTileAt__P2342_mk(s);
+    s.tmp_1 = tiles_locationOfSprite__P3775_mk(s);
+    s.tmp_1.arg0 = globals.sprite_fish___88637;
     s.callLocIdx = 86; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.tile15___189164;
+    s.tmp_0.arg1 = globals.tile15___3948;
     s.callLocIdx = 87; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = character_loopFrames__P188956_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
-    r0 = pxsim_Array__getAt(globals.left_fish_animations___426674, globals.local_choice___426692);
+    s.tmp_0 = character_loopFrames__P3739_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
+    r0 = pxsim_Array__getAt(globals.left_fish_animations___88599, globals.local_choice___88629);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 100;
-    s.tmp_1 = character_rule__P188962_mk(s);
+    s.tmp_1 = character_rule__P3745_mk(s);
     s.tmp_1.arg0 = 512;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
@@ -18918,12 +18929,12 @@ switch (step) {
     s.callLocIdx = 89; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = character_loopFrames__P188956_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
-    r0 = pxsim_Array__getAt(globals.right_fish_animations___426683, globals.local_choice___426692);
+    s.tmp_0 = character_loopFrames__P3739_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
+    r0 = pxsim_Array__getAt(globals.right_fish_animations___88614, globals.local_choice___88629);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 100;
-    s.tmp_1 = character_rule__P188962_mk(s);
+    s.tmp_1 = character_rule__P3745_mk(s);
     s.tmp_1.arg0 = 128;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
@@ -18938,9 +18949,9 @@ switch (step) {
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = character_setCharacterState__P188960_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
-    s.tmp_1 = character_rule__P188962_mk(s);
+    s.tmp_0 = character_setCharacterState__P3743_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
+    s.tmp_1 = character_rule__P3745_mk(s);
     s.tmp_1.arg0 = 128;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
@@ -18955,43 +18966,51 @@ switch (step) {
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P426741);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P88681);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = timer_background__P188812_mk(s);
+    s.tmp_1 = timer_background__P3595_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 105; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    r0 = globals.sprite_fish___426697;
+    r0 = globals.sprite_fish___88637;
     return leave(s, r0)
   default: oops()
 } } }
-summon_fish__P426670.info = {"start":216,"length":4176,"line":6,"column":0,"endLine":108,"endColumn":1,"fileName":"main.ts","functionName":"summon_fish","argumentNames":["ai","force_animate"]}
+summon_fish__P88595.info = {"start":216,"length":6902,"line":6,"column":0,"endLine":176,"endColumn":1,"fileName":"main.ts","functionName":"summon_fish","argumentNames":["ai","force_animate"]}
 
-function summon_fish__P426670_mk(s) {
+function summon_fish__P88595_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: summon_fish__P426670, depth: s.depth + 1,
+        parent: s, fn: summon_fish__P88595, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
+  tmp_5: undefined,
+  tmp_6: undefined,
+  tmp_7: undefined,
+  tmp_8: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
 
-const _hex426678 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000f00f000000000000dc0f0000000000c0dc0f00000000ccccddf1000000cc11dd1df10000c01b111111110f005c1b11c111110f005cbb1b1111110fc055bbbbbb11b1f5c0551b1111b1bbf5c055bb11b1bbbbf5c055b51111115bf5c055c5cc5bfb5ff5005cc5005b0bf0ff00c00cc055c50000000000c0cccc0000")
-const _hex426681 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000ff0f0000000000c044f400000000004c44440f000000c04444440f0000004c44f444f40000c0dc444444fd0000cc44111111440f00cc4444c4c4440fc0cd4444c4444f0fc0cd444444ff4f0fc0cd4d444444c4cdc0dd1c4d44d4dccd00cccc1111fdbfcd000000ccf4ffcc0c0000c04444f400000000c0ccffff0000")
-const _hex426687 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cccc000000c00cc055c50000005cc5005b0bf0ffc055c5cc5bfb5ff5c055b51111115bf5c055bb11b1bbbbf5c0551b1111b1bbf5c055bbbbbb11b1f5005cbb1b1111110f005c1b11c111110f00c01b111111110f0000cc11dd1df100000000ccccddf10000000000c0dc0f000000000000dc0f000000000000f00f00")
-const _hex426690 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000c0ccffff00000000c04444f40000000000ccf4ffcc0c00cccc1111fdbfcdc0dd1c4d44d4dccdc0cd4d444444c4cdc0cd444444ff4f0fc0cd4444c4444f0f00cc4444c4c4440f00cc44111111440f00c0dc444444fd0000004c44f444f4000000c04444440f000000004c44440f00000000c044f4000000000000ff0f0000")
+const _hex88603 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000000000f00f000000000000dc0f0000000000c0dc0f00000000ccccddf1000000cc11dd1df10000c01b111111110f005c1b11c111110f005cbb1b1111110fc055bbbbbb11b1f5c0551b1111b1bbf5c055bb11b1bbbbf5c055b51111115bf5c055c5cc5bfb5ff5005cc5005b0bf0ff00c00cc055c50000000000c0cccc0000")
+const _hex88606 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000ff0f0000000000c044f400000000004c44440f000000c04444440f0000004c44f444f40000c0dc444444fd0000cc44111111440f00cc4444c4c4440fc0cd4444c4444f0fc0cd444444ff4f0fc0cd4d444444c4cdc0dd1c4d44d4dccd00cccc1111fdbfcd000000ccf4ffcc0c0000c04444f400000000c0ccffff0000")
+const _hex88609 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000b0bb0000000000001b110b00000000b01111c100000000b01111c1000000001b111f110c0000001b1111d10c0000b0dbdddd1dc10000b01b111b1bc10000db1b111bb1c10000db1b11b1bbc10000db1b111111cc0000dbdd1111cdcd0000b0dbddddcc0c000000b01bcbcc000000001b11110c00000000bbbbcc0c0000")
+const _hex88612 = pxsim.BufferMethods.createBufferFromHex("870410001000000000000000bb000000000000b0770b00000000007b7fc700000000007b77cd00000000b0dddd120c000000b02222120c000000bb4242120c000000bb4222140c0000b0bd2244140c0000b0bd2222120c0000b0bd2b22120c000000db2d221d0c000000b0ddddcc00000000005bcb0c00000000b055550c00000000b0bbcc0c0000")
+const _hex88618 = pxsim.BufferMethods.createBufferFromHex("8704100010000000000000c0cccc000000c00cc055c50000005cc5005b0bf0ffc055c5cc5bfb5ff5c055b51111115bf5c055bb11b1bbbbf5c0551b1111b1bbf5c055bbbbbb11b1f5005cbb1b1111110f005c1b11c111110f00c01b111111110f0000cc11dd1df100000000ccccddf10000000000c0dc0f000000000000dc0f000000000000f00f00")
+const _hex88621 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000c0ccffff00000000c04444f40000000000ccf4ffcc0c00cccc1111fdbfcdc0dd1c4d44d4dccdc0cd4d444444c4cdc0cd444444ff4f0fc0cd4444c4444f0f00cc4444c4c4440f00cc44111111440f00c0dc444444fd0000004c44f444f4000000c04444440f000000004c44440f00000000c044f4000000000000ff0f0000")
+const _hex88624 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000bbbbcc0c000000001b11110c00000000b01bcbcc000000b0dbddddcc0c0000dbdd1111cdcd0000db1b111111cc0000db1b11b1bbc10000db1b111bb1c10000b01b111b1bc10000b0dbdddd1dc10000001b1111d10c0000001b111f110c000000b01111c100000000b01111c100000000001b110b0000000000b0bb000000")
+const _hex88627 = pxsim.BufferMethods.createBufferFromHex("87041000100000000000b0bbcc0c00000000b055550c00000000005bcb0c00000000b0ddddcc00000000db2d221d0c0000b0bd2b22120c0000b0bd2222120c0000b0bd2244140c000000bb4222140c000000bb4242120c000000b02222120c000000b0dddd120c000000007b77cd00000000007b7fc70000000000b0770b000000000000bb000000")
 
 
 
 
-function inline__P426741(s) {
+function inline__P88681(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19003,14 +19022,14 @@ switch (step) {
 
     r0 = pxsim_numops_toBoolDecr(s.caps[0]);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = tiles_getTilesByType__P187567_mk(s);
-    s.tmp_1.arg0 = globals.tile16___189165;
+    s.tmp_1 = tiles_getTilesByType__P2350_mk(s);
+    s.tmp_1.arg0 = globals.tile16___3949;
     s.callLocIdx = 94; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_6 = tiles_getTilesByType__P187567_mk(s);
-    s.tmp_6.arg0 = globals.tile16___189165;
+    s.tmp_6 = tiles_getTilesByType__P2350_mk(s);
+    s.tmp_6.arg0 = globals.tile16___3949;
     s.callLocIdx = 95; s.pc = 4; return s.tmp_6;
   case 4:
     r0 = s.retval;
@@ -19022,43 +19041,43 @@ switch (step) {
     r0 = pxsim.Math_.randomRange(0, s.tmp_3);
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_2);
-    globals.location___426744 = (r0);
-    s.tmp_0 = tiles_setTileAt__P187559_mk(s);
-    s.tmp_0.arg0 = globals.location___426744;
-    s.tmp_0.arg1 = globals.tile12___189161;
+    globals.location___88684 = (r0);
+    s.tmp_0 = tiles_setTileAt__P2342_mk(s);
+    s.tmp_0.arg0 = globals.location___88684;
+    s.tmp_0.arg1 = globals.tile12___3945;
     s.callLocIdx = 96; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.paths___426761;
-    s.tmp_2 = scene_aStar__P188872_mk(s);
-    s.tmp_3 = tiles_locationOfSprite__P188992_mk(s);
-    s.tmp_3.arg0 = globals.sprite_fish___426697;
+    s.tmp_0 = r0 = globals.paths___88701;
+    s.tmp_2 = scene_aStar__P3655_mk(s);
+    s.tmp_3 = tiles_locationOfSprite__P3775_mk(s);
+    s.tmp_3.arg0 = globals.sprite_fish___88637;
     s.callLocIdx = 97; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = globals.location___426744;
+    s.tmp_2.arg1 = globals.location___88684;
     s.tmp_2.arg2 = null;
     s.callLocIdx = 98; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_0 = sprites_setDataNumber__P188836_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
+    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
     s.tmp_0.arg1 = "path_index";
-    r0 = pxsim_Array__length(globals.paths___426761);
+    r0 = pxsim_Array__length(globals.paths___88701);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
     s.callLocIdx = 99; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataNumber__P188836_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
+    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
     s.tmp_0.arg1 = "target_row";
-    s.tmp_1 = tiles_locationXY__P189008_mk(s);
-    s.tmp_1.arg0 = globals.location___426744;
+    s.tmp_1 = tiles_locationXY__P3791_mk(s);
+    s.tmp_1.arg0 = globals.location___88684;
     s.tmp_1.arg1 = 1;
     s.callLocIdx = 100; s.pc = 10; return s.tmp_1;
   case 10:
@@ -19067,11 +19086,11 @@ switch (step) {
     s.callLocIdx = 101; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataNumber__P188836_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
+    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
     s.tmp_0.arg1 = "target_col";
-    s.tmp_1 = tiles_locationXY__P189008_mk(s);
-    s.tmp_1.arg0 = globals.location___426744;
+    s.tmp_1 = tiles_locationXY__P3791_mk(s);
+    s.tmp_1.arg0 = globals.location___88684;
     s.tmp_1.arg1 = 0;
     s.callLocIdx = 102; s.pc = 12; return s.tmp_1;
   case 12:
@@ -19080,8 +19099,8 @@ switch (step) {
     s.callLocIdx = 103; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = sprites_setDataBoolean__P188841_mk(s);
-    s.tmp_0.arg0 = globals.sprite_fish___426697;
+    s.tmp_0 = sprites_setDataBoolean__P3624_mk(s);
+    s.tmp_0.arg0 = globals.sprite_fish___88637;
     s.tmp_0.arg1 = "running_away";
     s.tmp_0.arg2 = false;
     s.callLocIdx = 104; s.pc = 13; return s.tmp_0;
@@ -19093,12 +19112,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P426741.info = {"start":3702,"length":664,"line":96,"column":21,"endLine":106,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
+inline__P88681.info = {"start":6428,"length":664,"line":164,"column":21,"endLine":174,"endColumn":5,"fileName":"main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P426741_mk(s) {
+function inline__P88681_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P426741, depth: s.depth + 1,
+        parent: s, fn: inline__P88681, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19113,7 +19132,7 @@ function inline__P426741_mk(s) {
 
 
 
-function tiles_locationXY__P189008(s) {
+function tiles_locationXY__P3791(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19132,14 +19151,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = tiles_screenCoordinateToTile__P189014_mk(s);
-    s.tmp_2 = tiles_Location_y__P187511_mk(s);
+    s.tmp_1 = tiles_screenCoordinateToTile__P3797_mk(s);
+    s.tmp_2 = tiles_Location_y__P2294_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 2092; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 2102; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 2093; s.pc = 13; return s.tmp_1;
+    s.callLocIdx = 2103; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
     { step = 12; continue; }
@@ -19149,14 +19168,14 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 2; continue; }
-    s.tmp_4 = tiles_screenCoordinateToTile__P189014_mk(s);
-    s.tmp_5 = tiles_Location_x__P187510_mk(s);
+    s.tmp_4 = tiles_screenCoordinateToTile__P3797_mk(s);
+    s.tmp_5 = tiles_Location_x__P2293_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 2094; s.pc = 16; return s.tmp_5;
+    s.callLocIdx = 2104; s.pc = 16; return s.tmp_5;
   case 16:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 2095; s.pc = 15; return s.tmp_4;
+    s.callLocIdx = 2105; s.pc = 15; return s.tmp_4;
   case 15:
     r0 = s.retval;
     { step = 12; continue; }
@@ -19179,28 +19198,28 @@ switch (step) {
     r0 = s.tmp_6;
     { step = 11; continue; }
   case 5:
-    s.tmp_7 = tiles_Location_x__P187510_mk(s);
+    s.tmp_7 = tiles_Location_x__P2293_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 2096; s.pc = 17; return s.tmp_7;
+    s.callLocIdx = 2106; s.pc = 17; return s.tmp_7;
   case 17:
     r0 = s.retval;
     { step = 12; continue; }
   case 6:
-    s.tmp_8 = tiles_Location_y__P187511_mk(s);
+    s.tmp_8 = tiles_Location_y__P2294_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 2097; s.pc = 18; return s.tmp_8;
+    s.callLocIdx = 2107; s.pc = 18; return s.tmp_8;
   case 18:
     r0 = s.retval;
     { step = 12; continue; }
   case 7:
-    s.tmp_10 = tiles_Location_x__P187510_mk(s);
+    s.tmp_10 = tiles_Location_x__P2293_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 2098; s.pc = 19; return s.tmp_10;
+    s.callLocIdx = 2108; s.pc = 19; return s.tmp_10;
   case 19:
     r0 = s.retval;
     s.tmp_9 = r0;
-    s.tmp_13 = tiles_tileWidth__P189011_mk(s);
-    s.callLocIdx = 2099; s.pc = 20; return s.tmp_13;
+    s.tmp_13 = tiles_tileWidth__P3794_mk(s);
+    s.callLocIdx = 2109; s.pc = 20; return s.tmp_13;
   case 20:
     r0 = s.retval;
     s.tmp_12 = r0;
@@ -19209,14 +19228,14 @@ switch (step) {
     r0 = (s.tmp_9 - s.tmp_11);
     { step = 12; continue; }
   case 8:
-    s.tmp_15 = tiles_Location_x__P187510_mk(s);
+    s.tmp_15 = tiles_Location_x__P2293_mk(s);
     s.tmp_15.arg0 = s.arg0;
-    s.callLocIdx = 2100; s.pc = 21; return s.tmp_15;
+    s.callLocIdx = 2110; s.pc = 21; return s.tmp_15;
   case 21:
     r0 = s.retval;
     s.tmp_14 = r0;
-    s.tmp_18 = tiles_tileWidth__P189011_mk(s);
-    s.callLocIdx = 2101; s.pc = 22; return s.tmp_18;
+    s.tmp_18 = tiles_tileWidth__P3794_mk(s);
+    s.callLocIdx = 2111; s.pc = 22; return s.tmp_18;
   case 22:
     r0 = s.retval;
     s.tmp_17 = r0;
@@ -19225,14 +19244,14 @@ switch (step) {
     r0 = (s.tmp_14 + s.tmp_16);
     { step = 12; continue; }
   case 9:
-    s.tmp_20 = tiles_Location_y__P187511_mk(s);
+    s.tmp_20 = tiles_Location_y__P2294_mk(s);
     s.tmp_20.arg0 = s.arg0;
-    s.callLocIdx = 2102; s.pc = 23; return s.tmp_20;
+    s.callLocIdx = 2112; s.pc = 23; return s.tmp_20;
   case 23:
     r0 = s.retval;
     s.tmp_19 = r0;
-    s.tmp_23 = tiles_tileWidth__P189011_mk(s);
-    s.callLocIdx = 2103; s.pc = 24; return s.tmp_23;
+    s.tmp_23 = tiles_tileWidth__P3794_mk(s);
+    s.callLocIdx = 2113; s.pc = 24; return s.tmp_23;
   case 24:
     r0 = s.retval;
     s.tmp_22 = r0;
@@ -19241,14 +19260,14 @@ switch (step) {
     r0 = (s.tmp_19 - s.tmp_21);
     { step = 12; continue; }
   case 10:
-    s.tmp_25 = tiles_Location_y__P187511_mk(s);
+    s.tmp_25 = tiles_Location_y__P2294_mk(s);
     s.tmp_25.arg0 = s.arg0;
-    s.callLocIdx = 2104; s.pc = 25; return s.tmp_25;
+    s.callLocIdx = 2114; s.pc = 25; return s.tmp_25;
   case 25:
     r0 = s.retval;
     s.tmp_24 = r0;
-    s.tmp_28 = tiles_tileWidth__P189011_mk(s);
-    s.callLocIdx = 2105; s.pc = 26; return s.tmp_28;
+    s.tmp_28 = tiles_tileWidth__P3794_mk(s);
+    s.callLocIdx = 2115; s.pc = 26; return s.tmp_28;
   case 26:
     r0 = s.retval;
     s.tmp_27 = r0;
@@ -19262,12 +19281,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_locationXY__P189008.info = {"start":11480,"length":745,"line":324,"column":4,"endLine":345,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationXY","argumentNames":["location","xy"]}
+tiles_locationXY__P3791.info = {"start":11480,"length":745,"line":324,"column":4,"endLine":345,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"locationXY","argumentNames":["location","xy"]}
 
-function tiles_locationXY__P189008_mk(s) {
+function tiles_locationXY__P3791_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_locationXY__P189008, depth: s.depth + 1,
+        parent: s, fn: tiles_locationXY__P3791, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19306,7 +19325,7 @@ function tiles_locationXY__P189008_mk(s) {
 
 
 
-function tiles_tileWidth__P189011(s) {
+function tiles_tileWidth__P3794(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19316,14 +19335,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___205912 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 2106; s.pc = 4; return s.tmp_0;
+    s.tm___20856 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 2116; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___205912 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___205912);
+    s.tm___20856 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___20856);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -19333,31 +19352,31 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    r0 = s.tm___205912.fields["_scale"];
+    r0 = s.tm___20856.fields["_scale"];
     s.tmp_2 = r0;
     r0 = (1 << s.tmp_2);
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_tileWidth__P189011.info = {"start":13283,"length":154,"line":376,"column":4,"endLine":381,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"tileWidth","argumentNames":[]}
+tiles_tileWidth__P3794.info = {"start":13283,"length":154,"line":376,"column":4,"endLine":381,"endColumn":5,"fileName":"pxt_modules/tilemaps/tilemap.ts","functionName":"tileWidth","argumentNames":[]}
 
-function tiles_tileWidth__P189011_mk(s) {
+function tiles_tileWidth__P3794_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_tileWidth__P189011, depth: s.depth + 1,
+        parent: s, fn: tiles_tileWidth__P3794, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  tm___205912: undefined,
+  tm___20856: undefined,
 } }
 
 
 
 
 
-function sprites_setDataNumber__P188836(s) {
+function sprites_setDataNumber__P3619(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19367,7 +19386,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___205943 = undefined;
+    s.d___20887 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -19394,31 +19413,31 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P187258_mk(s);
+    s.tmp_4 = Sprite_data__P2041_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1765; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1772; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    s.d___205943 = (r0);
-    r0 = pxsim_pxtrt.mapSetGeneric(s.d___205943, s.arg1, s.arg2);
+    s.d___20887 = (r0);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.d___20887, s.arg1, s.arg2);
   case 5:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_setDataNumber__P188836.info = {"start":241,"length":176,"line":8,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataNumber","argumentNames":["sprite","name","value"]}
+sprites_setDataNumber__P3619.info = {"start":241,"length":176,"line":8,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"setDataNumber","argumentNames":["sprite","name","value"]}
 
-function sprites_setDataNumber__P188836_mk(s) {
+function sprites_setDataNumber__P3619_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_setDataNumber__P188836, depth: s.depth + 1,
+        parent: s, fn: sprites_setDataNumber__P3619, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___205943: undefined,
+  d___20887: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -19428,7 +19447,45 @@ function sprites_setDataNumber__P188836_mk(s) {
 
 
 
-function character_setCharacterState__P188960(s) {
+function timer_background__P3595(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    s.tmp_0 = control_runInBackground__P279_mk(s);
+    s.tmp_0.arg0 = s.arg0;
+    s.callLocIdx = 1748; s.pc = 1; return s.tmp_0;
+  case 1:
+    r0 = s.retval;
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+timer_background__P3595.info = {"start":665,"length":90,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"background","argumentNames":["then"]}
+
+function timer_background__P3595_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: timer_background__P3595, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  tmp_0: undefined,
+  arg0: undefined,
+} }
+
+
+
+
+
+function control_runInBackground__P279(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19438,38 +19495,71 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___206138 = undefined;
+    if (s.lambdaArgs) {
+      s.arg0 = (s.lambdaArgs[0]);
+      s.lambdaArgs = null;
+    }
+    r0 = pxsim.control.runInParallel(s.arg0);
+    r0 = undefined;
+    return leave(s, r0)
+  default: oops()
+} } }
+control_runInBackground__P279.info = {"start":384,"length":88,"line":10,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"runInBackground","argumentNames":["a"]}
+
+function control_runInBackground__P279_mk(s) {
+    checkStack(s.depth);
+    return {
+        parent: s, fn: control_runInBackground__P279, depth: s.depth + 1,
+        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
+  arg0: undefined,
+} }
+
+
+
+
+
+function character_setCharacterState__P3743(s) {
+let r0 = s.r0, step = s.pc;
+s.pc = -1;
+
+
+while (true) {
+if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
+switch (step) {
+  case 0:
+
+    s.state___21082 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_getStateForSprite__P191371_mk(s);
+    s.tmp_0 = character_getStateForSprite__P6155_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 2084; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2091; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___206138 = (r0);
-    s.tmp_0 = character_CharacterState_setManualFlags__P191364_mk(s);
-    s.tmp_0.arg0 = s.state___206138;
+    s.state___21082 = (r0);
+    s.tmp_0 = character_CharacterState_setManualFlags__P6148_mk(s);
+    s.tmp_0.arg0 = s.state___21082;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 2085; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 2092; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_setCharacterState__P188960.info = {"start":18284,"length":160,"line":529,"column":4,"endLine":532,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterState","argumentNames":["sprite","rule"]}
+character_setCharacterState__P3743.info = {"start":18284,"length":160,"line":529,"column":4,"endLine":532,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterState","argumentNames":["sprite","rule"]}
 
-function character_setCharacterState__P188960_mk(s) {
+function character_setCharacterState__P3743_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_setCharacterState__P188960, depth: s.depth + 1,
+        parent: s, fn: character_setCharacterState__P3743, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___206138: undefined,
+  state___21082: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -19478,7 +19568,7 @@ function character_setCharacterState__P188960_mk(s) {
 
 
 
-function character_getStateForSprite__P191371(s) {
+function character_getStateForSprite__P6155(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19488,18 +19578,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sceneState___201408 = undefined;
-    s.state___201415 = undefined;
-    s.unnamed8946___U2 = undefined;
-    s.unnamed8947___U3 = undefined;
-    s.newState___201426 = undefined;
+    s.sceneState___16563 = undefined;
+    s.state___16570 = undefined;
+    s.unnamed138___U2 = undefined;
+    s.unnamed139___U3 = undefined;
+    s.newState___16581 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_init__P191368_mk(s);
-    s.callLocIdx = 2076; s.pc = 10; return s.tmp_0;
+    s.tmp_0 = character_init__P6152_mk(s);
+    s.callLocIdx = 2083; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -19512,55 +19602,55 @@ switch (step) {
     { step = 9; continue; }
   case 1:
   case 2:
-    s.tmp_2 = r0 = globals.sceneStack___191351;
-    r0 = pxsim_Array__length(globals.sceneStack___191351);
+    s.tmp_2 = r0 = globals.sceneStack___6135;
+    r0 = pxsim_Array__length(globals.sceneStack___6135);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 - 1);
     s.tmp_3 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.tmp_3);
-    s.sceneState___201408 = (r0);
-    s.state___201415 = (undefined);
-    r0 = s.sceneState___201408.fields["characters"];
-    s.unnamed8946___U2 = (r0);
-    s.unnamed8947___U3 = (0);
+    s.sceneState___16563 = (r0);
+    s.state___16570 = (undefined);
+    r0 = s.sceneState___16563.fields["characters"];
+    s.unnamed138___U2 = (r0);
+    s.unnamed139___U3 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed8947___U3;
-    r0 = pxsim_Array__length(s.unnamed8946___U2);
+    s.tmp_0 = r0 = s.unnamed139___U3;
+    r0 = pxsim_Array__length(s.unnamed138___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8946___U2, s.unnamed8947___U3);
-    s.state___201415 = (r0);
-    r0 = s.state___201415.fields["sprite"];
+    r0 = pxsim_Array__getAt(s.unnamed138___U2, s.unnamed139___U3);
+    s.state___16570 = (r0);
+    r0 = s.state___16570.fields["sprite"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 === s.arg0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    r0 = s.state___201415;
+    r0 = s.state___16570;
     { step = 9; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed8947___U3 + 1);
-    s.unnamed8947___U3 = (r0);
+    r0 = (s.unnamed139___U3 + 1);
+    s.unnamed139___U3 = (r0);
     { step = 3; continue; }
   case 6:
-    s.unnamed8946___U2 = (undefined);
+    s.unnamed138___U2 = (undefined);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterState__C191357_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterState__C6141_VT);
     s.tmp_4 = r0;
-    s.tmp_5 = character_CharacterState_constructor__P191367_mk(s);
+    s.tmp_5 = character_CharacterState_constructor__P6151_mk(s);
     s.tmp_5.arg0 = s.tmp_4;
     s.tmp_5.arg1 = s.arg0;
-    s.callLocIdx = 2077; s.pc = 11; return s.tmp_5;
+    s.callLocIdx = 2084; s.pc = 11; return s.tmp_5;
   case 11:
     r0 = s.retval;
-    s.newState___201426 = (s.tmp_4);
-    r0 = s.sceneState___201408.fields["characters"];
+    s.newState___16581 = (s.tmp_4);
+    r0 = s.sceneState___16563.fields["characters"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.newState___201426);
-    r0 = s.newState___201426;
+    r0 = pxsim_Array__push(s.tmp_0, s.newState___16581);
+    r0 = s.newState___16581;
     { step = 9; continue; }
   case 7:
   case 8:
@@ -19569,12 +19659,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_getStateForSprite__P191371.info = {"start":11331,"length":551,"line":352,"column":4,"endLine":370,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"getStateForSprite","argumentNames":["sprite","createIfNotFound"]}
+character_getStateForSprite__P6155.info = {"start":11331,"length":551,"line":352,"column":4,"endLine":370,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"getStateForSprite","argumentNames":["sprite","createIfNotFound"]}
 
-function character_getStateForSprite__P191371_mk(s) {
+function character_getStateForSprite__P6155_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_getStateForSprite__P191371, depth: s.depth + 1,
+        parent: s, fn: character_getStateForSprite__P6155, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19582,11 +19672,11 @@ function character_getStateForSprite__P191371_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  sceneState___201408: undefined,
-  state___201415: undefined,
-  unnamed8946___U2: undefined,
-  unnamed8947___U3: undefined,
-  newState___201426: undefined,
+  sceneState___16563: undefined,
+  state___16570: undefined,
+  unnamed138___U2: undefined,
+  unnamed139___U3: undefined,
+  newState___16581: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -19595,7 +19685,7 @@ function character_getStateForSprite__P191371_mk(s) {
 
 
 
-function character_init__P191368(s) {
+function character_init__P6152(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19605,9 +19695,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___191351);
+    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___6135);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_Array__length(globals.sceneStack___191351);
+    r0 = pxsim_Array__length(globals.sceneStack___6135);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -19615,8 +19705,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = character_initScene__P191369_mk(s);
-    s.callLocIdx = 2069; s.pc = 6; return s.tmp_3;
+    s.tmp_3 = character_initScene__P6153_mk(s);
+    s.callLocIdx = 2076; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
   case 1:
@@ -19625,19 +19715,19 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_Array__mk();
-    globals.sceneStack___191351 = (r0);
-    s.tmp_0 = game_addScenePushHandler__P187766_mk(s);
-    s.tmp_0.arg0 = character_initScene__P191369;
-    s.callLocIdx = 2070; s.pc = 7; return s.tmp_0;
+    globals.sceneStack___6135 = (r0);
+    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
+    s.tmp_0.arg0 = character_initScene__P6153;
+    s.callLocIdx = 2077; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P187768_mk(s);
-    s.tmp_0.arg0 = inline__P201480;
-    s.callLocIdx = 2071; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
+    s.tmp_0.arg0 = inline__P16635;
+    s.callLocIdx = 2078; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = character_initScene__P191369_mk(s);
-    s.callLocIdx = 2072; s.pc = 9; return s.tmp_0;
+    s.tmp_0 = character_initScene__P6153_mk(s);
+    s.callLocIdx = 2079; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
   case 5:
@@ -19645,12 +19735,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_init__P191368.info = {"start":10391,"length":376,"line":310,"column":5,"endLine":326,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"init","argumentNames":[]}
+character_init__P6152.info = {"start":10391,"length":376,"line":310,"column":5,"endLine":326,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"init","argumentNames":[]}
 
-function character_init__P191368_mk(s) {
+function character_init__P6152_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_init__P191368, depth: s.depth + 1,
+        parent: s, fn: character_init__P6152, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19662,7 +19752,7 @@ function character_init__P191368_mk(s) {
 
 
 
-function inline__P201480(s) {
+function inline__P16635(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19676,17 +19766,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array_.pop(globals.sceneStack___191351);
+    r0 = pxsim_Array_.pop(globals.sceneStack___6135);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P201480.info = {"start":10659,"length":76,"line":321,"column":33,"endLine":323,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P16635.info = {"start":10659,"length":76,"line":321,"column":33,"endLine":323,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P201480_mk(s) {
+function inline__P16635_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P201480, depth: s.depth + 1,
+        parent: s, fn: inline__P16635, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -19695,7 +19785,7 @@ function inline__P201480_mk(s) {
 
 
 
-function character_initScene__P191369(s) {
+function character_initScene__P6153(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19705,52 +19795,52 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sceneState___201491 = undefined;
-    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimationSceneState__C191352_VT);
+    s.sceneState___16646 = undefined;
+    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimationSceneState__C6136_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = character_CharacterAnimationSceneState_constructor__P191354_mk(s);
+    s.tmp_1 = character_CharacterAnimationSceneState_constructor__P6138_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2073; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 2080; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_Array__push(globals.sceneStack___191351, s.tmp_0);
-    s.tmp_0 = r0 = globals.sceneStack___191351;
-    r0 = pxsim_Array__length(globals.sceneStack___191351);
+    r0 = pxsim_Array__push(globals.sceneStack___6135, s.tmp_0);
+    s.tmp_0 = r0 = globals.sceneStack___6135;
+    r0 = pxsim_Array__length(globals.sceneStack___6135);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    s.sceneState___201491 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P201498);
+    s.sceneState___16646 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P16653);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sceneState___201491);
-    s.tmp_1 = game_onUpdate__P187760_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sceneState___16646);
+    s.tmp_1 = game_onUpdate__P2543_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2075; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 2082; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_initScene__P191369.info = {"start":10774,"length":287,"line":328,"column":5,"endLine":336,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"initScene","argumentNames":[]}
+character_initScene__P6153.info = {"start":10774,"length":287,"line":328,"column":5,"endLine":336,"endColumn":6,"fileName":"pxt_modules/character-animations/main.ts","functionName":"initScene","argumentNames":[]}
 
-function character_initScene__P191369_mk(s) {
+function character_initScene__P6153_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_initScene__P191369, depth: s.depth + 1,
+        parent: s, fn: character_initScene__P6153, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  sceneState___201491: undefined,
+  sceneState___16646: undefined,
 } }
 
 
 
 
 
-function inline__P201498(s) {
+function inline__P16653(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19762,9 +19852,9 @@ switch (step) {
 
     r0 = pxsim_numops_toBoolDecr(s.caps[0]);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = character_CharacterAnimationSceneState_update__P191353_mk(s);
+    s.tmp_0 = character_CharacterAnimationSceneState_update__P6137_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 2074; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 2081; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
@@ -19773,12 +19863,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P201498.info = {"start":10945,"length":108,"line":331,"column":23,"endLine":335,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":[]}
+inline__P16653.info = {"start":10945,"length":108,"line":331,"column":23,"endLine":335,"endColumn":10,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P201498_mk(s) {
+function inline__P16653_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P201498, depth: s.depth + 1,
+        parent: s, fn: inline__P16653, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -19787,7 +19877,7 @@ function inline__P201498_mk(s) {
 
 
 
-function character_CharacterAnimationSceneState_constructor__P191354(s) {
+function character_CharacterAnimationSceneState_constructor__P6138(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19802,7 +19892,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C191352_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C6136_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -19811,12 +19901,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterAnimationSceneState_constructor__P191354.info = {"start":1525,"length":59,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this"]}
+character_CharacterAnimationSceneState_constructor__P6138.info = {"start":1525,"length":59,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this"]}
 
-function character_CharacterAnimationSceneState_constructor__P191354_mk(s) {
+function character_CharacterAnimationSceneState_constructor__P6138_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterAnimationSceneState_constructor__P191354, depth: s.depth + 1,
+        parent: s, fn: character_CharacterAnimationSceneState_constructor__P6138, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19827,7 +19917,7 @@ function character_CharacterAnimationSceneState_constructor__P191354_mk(s) {
 
 
 
-function character_CharacterAnimationSceneState_update__P191353(s) {
+function character_CharacterAnimationSceneState_update__P6137(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19837,66 +19927,66 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dt___201503 = undefined;
-    s.cleanup___201508 = undefined;
-    s.character___201510 = undefined;
-    s.unnamed8940___U3 = undefined;
-    s.unnamed8941___U4 = undefined;
+    s.dt___16658 = undefined;
+    s.cleanup___16663 = undefined;
+    s.character___16665 = undefined;
+    s.unnamed132___U3 = undefined;
+    s.unnamed133___U4 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C191352_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 2035; s.pc = 7; return s.tmp_0;
+    if (!checkSubtype(r0, character_CharacterAnimationSceneState__C6136_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 2042; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = r0.fields["eventContext"];
     r0 = r0.fields["deltaTimeMillis"];
-    s.dt___201503 = (r0);
-    s.cleanup___201508 = (false);
-    s.character___201510 = (undefined);
+    s.dt___16658 = (r0);
+    s.cleanup___16663 = (false);
+    s.character___16665 = (undefined);
     r0 = s.arg0.fields["characters"];
-    s.unnamed8940___U3 = (r0);
-    s.unnamed8941___U4 = (0);
+    s.unnamed132___U3 = (r0);
+    s.unnamed133___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8941___U4;
-    r0 = pxsim_Array__length(s.unnamed8940___U3);
+    s.tmp_0 = r0 = s.unnamed133___U4;
+    r0 = pxsim_Array__length(s.unnamed132___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8940___U3, s.unnamed8941___U4);
-    s.character___201510 = (r0);
-    r0 = s.character___201510.fields["sprite"];
+    r0 = pxsim_Array__getAt(s.unnamed132___U3, s.unnamed133___U4);
+    s.character___16665 = (r0);
+    r0 = s.character___16665.fields["sprite"];
     r0 = r0.fields["flags"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 2);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 2; continue; }
-    s.cleanup___201508 = (true);
+    s.cleanup___16663 = (true);
   case 2:
   case 3:
-    s.tmp_0 = character_CharacterState_update__P191361_mk(s);
-    s.tmp_0.arg0 = s.character___201510;
-    s.tmp_0.arg1 = s.dt___201503;
-    s.callLocIdx = 2036; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = character_CharacterState_update__P6145_mk(s);
+    s.tmp_0.arg0 = s.character___16665;
+    s.tmp_0.arg1 = s.dt___16658;
+    s.callLocIdx = 2043; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = (s.unnamed8941___U4 + 1);
-    s.unnamed8941___U4 = (r0);
+    r0 = (s.unnamed133___U4 + 1);
+    s.unnamed133___U4 = (r0);
     { step = 1; continue; }
   case 4:
-    s.unnamed8940___U3 = (undefined);
-    r0 = pxsim_numops_toBoolDecr(s.cleanup___201508);
+    s.unnamed132___U3 = (undefined);
+    r0 = pxsim_numops_toBoolDecr(s.cleanup___16663);
     if (!r0) { step = 5; continue; }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_arrayFilter__P185325_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
     r0 = s.arg0.fields["characters"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P201528;
-    s.callLocIdx = 2037; s.pc = 9; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P16683;
+    s.callLocIdx = 2044; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -19907,22 +19997,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterAnimationSceneState_update__P191353.info = {"start":1594,"length":483,"line":56,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this"]}
+character_CharacterAnimationSceneState_update__P6137.info = {"start":1594,"length":483,"line":56,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this"]}
 
-function character_CharacterAnimationSceneState_update__P191353_mk(s) {
+function character_CharacterAnimationSceneState_update__P6137_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterAnimationSceneState_update__P191353, depth: s.depth + 1,
+        parent: s, fn: character_CharacterAnimationSceneState_update__P6137, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  dt___201503: undefined,
-  cleanup___201508: undefined,
-  character___201510: undefined,
-  unnamed8940___U3: undefined,
-  unnamed8941___U4: undefined,
+  dt___16658: undefined,
+  cleanup___16663: undefined,
+  character___16665: undefined,
+  unnamed132___U3: undefined,
+  unnamed133___U4: undefined,
   arg0: undefined,
 } }
 
@@ -19930,7 +20020,7 @@ function character_CharacterAnimationSceneState_update__P191353_mk(s) {
 
 
 
-function inline__P201528(s) {
+function inline__P16683(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19955,12 +20045,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P201528.info = {"start":1989,"length":63,"line":66,"column":57,"endLine":66,"endColumn":120,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["character"]}
+inline__P16683.info = {"start":1989,"length":63,"line":66,"column":57,"endLine":66,"endColumn":120,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["character"]}
 
-function inline__P201528_mk(s) {
+function inline__P16683_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P201528, depth: s.depth + 1,
+        parent: s, fn: inline__P16683, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -19972,7 +20062,7 @@ function inline__P201528_mk(s) {
 
 
 
-function character_CharacterState_update__P191361(s) {
+function character_CharacterState_update__P6145(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -19982,27 +20072,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___201539 = undefined;
-    s.newAnimation___201765 = undefined;
+    s.state___16694 = undefined;
+    s.newAnimation___16920 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C191357_VT)) failedCast(r0);
-    s.state___201539 = (0);
-    s.tmp_2 = Sprite_vx__P187246_mk(s);
+    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
+    s.state___16694 = (0);
+    s.tmp_2 = Sprite_vx__P2029_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2042; s.pc = 66; return s.tmp_2;
+    s.callLocIdx = 2049; s.pc = 66; return s.tmp_2;
   case 66:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Sprite_vy__P187248_mk(s);
+    s.tmp_4 = Sprite_vy__P2031_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 2043; s.pc = 67; return s.tmp_4;
+    s.callLocIdx = 2050; s.pc = 67; return s.tmp_4;
   case 67:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -20010,12 +20100,12 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = (s.state___201539 | 2);
-    s.state___201539 = (r0);
-    s.tmp_2 = Sprite_vx__P187246_mk(s);
+    r0 = (s.state___16694 | 2);
+    s.state___16694 = (r0);
+    s.tmp_2 = Sprite_vx__P2029_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2044; s.pc = 68; return s.tmp_2;
+    s.callLocIdx = 2051; s.pc = 68; return s.tmp_2;
   case 68:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20023,7 +20113,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = r0 = s.state___201539;
+    s.tmp_3 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (8 & s.tmp_6);
@@ -20031,13 +20121,13 @@ switch (step) {
     r0 = (s.tmp_5 | 128);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
     { step = 4; continue; }
   case 1:
-    s.tmp_2 = Sprite_vx__P187246_mk(s);
+    s.tmp_2 = Sprite_vx__P2029_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2045; s.pc = 69; return s.tmp_2;
+    s.callLocIdx = 2052; s.pc = 69; return s.tmp_2;
   case 69:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20045,7 +20135,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_3 = r0 = s.state___201539;
+    s.tmp_3 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (32 & s.tmp_6);
@@ -20053,14 +20143,14 @@ switch (step) {
     r0 = (s.tmp_5 | 512);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
   case 2:
   case 3:
   case 4:
-    s.tmp_2 = Sprite_vy__P187248_mk(s);
+    s.tmp_2 = Sprite_vy__P2031_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2046; s.pc = 70; return s.tmp_2;
+    s.callLocIdx = 2053; s.pc = 70; return s.tmp_2;
   case 70:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20068,7 +20158,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_3 = r0 = s.state___201539;
+    s.tmp_3 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (16 & s.tmp_6);
@@ -20076,13 +20166,13 @@ switch (step) {
     r0 = (s.tmp_5 | 256);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
     { step = 8; continue; }
   case 5:
-    s.tmp_2 = Sprite_vy__P187248_mk(s);
+    s.tmp_2 = Sprite_vy__P2031_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2047; s.pc = 71; return s.tmp_2;
+    s.callLocIdx = 2054; s.pc = 71; return s.tmp_2;
   case 71:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20090,7 +20180,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_3 = r0 = s.state___201539;
+    s.tmp_3 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_6 = r0;
     r0 = (4 & s.tmp_6);
@@ -20098,11 +20188,11 @@ switch (step) {
     r0 = (s.tmp_5 | 64);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
   case 6:
   case 7:
   case 8:
-    r0 = (s.state___201539 & 60);
+    r0 = (s.state___16694 & 60);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -20110,21 +20200,21 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    s.tmp_3 = r0 = s.state___201539;
+    s.tmp_3 = r0 = s.state___16694;
     r0 = s.arg0.fields["lastState"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 & 60);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
   case 9:
   case 10:
     { step = 26; continue; }
   case 11:
-    s.tmp_2 = Sprite_x__P187242_mk(s);
+    s.tmp_2 = Sprite_x__P2025_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2048; s.pc = 72; return s.tmp_2;
+    s.callLocIdx = 2055; s.pc = 72; return s.tmp_2;
   case 72:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20137,10 +20227,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 13; continue; }
   case 12:
-    s.tmp_5 = Sprite_y__P187244_mk(s);
+    s.tmp_5 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_5.arg0 = r0;
-    s.callLocIdx = 2049; s.pc = 73; return s.tmp_5;
+    s.callLocIdx = 2056; s.pc = 73; return s.tmp_5;
   case 73:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -20152,12 +20242,12 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 24; continue; }
-    r0 = (s.state___201539 | 2);
-    s.state___201539 = (r0);
-    s.tmp_2 = Sprite_x__P187242_mk(s);
+    r0 = (s.state___16694 | 2);
+    s.state___16694 = (r0);
+    s.tmp_2 = Sprite_x__P2025_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2050; s.pc = 74; return s.tmp_2;
+    s.callLocIdx = 2057; s.pc = 74; return s.tmp_2;
   case 74:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20167,7 +20257,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_4 = r0 = s.state___201539;
+    s.tmp_4 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (8 & s.tmp_7);
@@ -20175,13 +20265,13 @@ switch (step) {
     r0 = (s.tmp_6 | 128);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
     { step = 17; continue; }
   case 14:
-    s.tmp_2 = Sprite_x__P187242_mk(s);
+    s.tmp_2 = Sprite_x__P2025_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2051; s.pc = 75; return s.tmp_2;
+    s.callLocIdx = 2058; s.pc = 75; return s.tmp_2;
   case 75:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20191,7 +20281,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_4 = r0 = s.state___201539;
+    s.tmp_4 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (32 & s.tmp_7);
@@ -20199,14 +20289,14 @@ switch (step) {
     r0 = (s.tmp_6 | 512);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
   case 15:
   case 16:
   case 17:
-    s.tmp_2 = Sprite_y__P187244_mk(s);
+    s.tmp_2 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2052; s.pc = 76; return s.tmp_2;
+    s.callLocIdx = 2059; s.pc = 76; return s.tmp_2;
   case 76:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20216,7 +20306,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.tmp_4 = r0 = s.state___201539;
+    s.tmp_4 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (16 & s.tmp_7);
@@ -20224,13 +20314,13 @@ switch (step) {
     r0 = (s.tmp_6 | 256);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
     { step = 21; continue; }
   case 18:
-    s.tmp_2 = Sprite_y__P187244_mk(s);
+    s.tmp_2 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2053; s.pc = 77; return s.tmp_2;
+    s.callLocIdx = 2060; s.pc = 77; return s.tmp_2;
   case 77:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20240,7 +20330,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    s.tmp_4 = r0 = s.state___201539;
+    s.tmp_4 = r0 = s.state___16694;
     r0 = s.arg0.fields["possibleFacingDirections"];
     s.tmp_7 = r0;
     r0 = (4 & s.tmp_7);
@@ -20248,11 +20338,11 @@ switch (step) {
     r0 = (s.tmp_6 | 64);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 | s.tmp_5);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
   case 19:
   case 20:
   case 21:
-    r0 = (s.state___201539 & 60);
+    r0 = (s.state___16694 & 60);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -20260,98 +20350,98 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    s.tmp_3 = r0 = s.state___201539;
+    s.tmp_3 = r0 = s.state___16694;
     r0 = s.arg0.fields["lastState"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 & 60);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 | s.tmp_4);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
   case 22:
   case 23:
     { step = 25; continue; }
   case 24:
-    r0 = (s.state___201539 | 1);
-    s.state___201539 = (r0);
-    s.tmp_0 = r0 = s.state___201539;
+    r0 = (s.state___16694 | 1);
+    s.state___16694 = (r0);
+    s.tmp_0 = r0 = s.state___16694;
     r0 = s.arg0.fields["lastState"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 60);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 | s.tmp_1);
-    s.state___201539 = (r0);
+    s.state___16694 = (r0);
   case 25:
   case 26:
-    s.tmp_1 = Sprite_isHittingTile__P187298_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 3;
-    s.callLocIdx = 2054; s.pc = 78; return s.tmp_1;
+    s.callLocIdx = 2061; s.pc = 78; return s.tmp_1;
   case 78:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 27; continue; }
-    r0 = (s.state___201539 | 4096);
-    s.state___201539 = (r0);
+    r0 = (s.state___16694 | 4096);
+    s.state___16694 = (r0);
   case 27:
   case 28:
-    s.tmp_1 = Sprite_isHittingTile__P187298_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 1;
-    s.callLocIdx = 2055; s.pc = 79; return s.tmp_1;
+    s.callLocIdx = 2062; s.pc = 79; return s.tmp_1;
   case 79:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 29; continue; }
-    r0 = (s.state___201539 | 1024);
-    s.state___201539 = (r0);
+    r0 = (s.state___16694 | 1024);
+    s.state___16694 = (r0);
   case 29:
   case 30:
-    s.tmp_1 = Sprite_isHittingTile__P187298_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 2;
-    s.callLocIdx = 2056; s.pc = 80; return s.tmp_1;
+    s.callLocIdx = 2063; s.pc = 80; return s.tmp_1;
   case 80:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 31; continue; }
-    r0 = (s.state___201539 | 2048);
-    s.state___201539 = (r0);
+    r0 = (s.state___16694 | 2048);
+    s.state___16694 = (r0);
   case 31:
   case 32:
-    s.tmp_1 = Sprite_isHittingTile__P187298_mk(s);
+    s.tmp_1 = Sprite_isHittingTile__P2081_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 2057; s.pc = 81; return s.tmp_1;
+    s.callLocIdx = 2064; s.pc = 81; return s.tmp_1;
   case 81:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 33; continue; }
-    r0 = (s.state___201539 | 8192);
-    s.state___201539 = (r0);
+    r0 = (s.state___16694 | 8192);
+    s.state___16694 = (r0);
   case 33:
   case 34:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_x__P187242_mk(s);
+    s.tmp_2 = Sprite_x__P2025_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2058; s.pc = 82; return s.tmp_2;
+    s.callLocIdx = 2065; s.pc = 82; return s.tmp_2;
   case 82:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["lastX"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_y__P187244_mk(s);
+    s.tmp_2 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 2059; s.pc = 83; return s.tmp_2;
+    s.callLocIdx = 2066; s.pc = 83; return s.tmp_2;
   case 83:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -20363,32 +20453,32 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 36; continue; }
   case 35:
-    r0 = s.state___201539;
+    r0 = s.state___16694;
   case 36:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = character_CharacterState_pickRule__P191366_mk(s);
+    s.tmp_2 = character_CharacterState_pickRule__P6150_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 2060; s.pc = 84; return s.tmp_2;
+    s.callLocIdx = 2067; s.pc = 84; return s.tmp_2;
   case 84:
     r0 = s.retval;
-    s.newAnimation___201765 = (r0);
+    s.newAnimation___16920 = (r0);
     r0 = s.arg0.fields["current"];
     s.tmp_1 = r0;
-    r0 = (s.newAnimation___201765 !== s.tmp_1);
+    r0 = (s.newAnimation___16920 !== s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 45; continue; }
     r0 = (s.arg0).fields["frame"] = (0);
     r0 = (s.arg0).fields["timer"] = (0);
-    s.tmp_0 = r0 = s.newAnimation___201765;
+    s.tmp_0 = r0 = s.newAnimation___16920;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 37; continue; }
     r0 = s.tmp_0;
     { step = 38; continue; }
   case 37:
-    r0 = s.newAnimation___201765.fields["startFrames"];
+    r0 = s.newAnimation___16920.fields["startFrames"];
   case 38:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -20402,7 +20492,7 @@ switch (step) {
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["runningStartFrames"] = (s.tmp_3);
-    r0 = (s.arg0).fields["current"] = (s.newAnimation___201765);
+    r0 = (s.arg0).fields["current"] = (s.newAnimation___16920);
     r0 = s.arg0.fields["current"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -20420,7 +20510,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 41; continue; }
-    s.tmp_3 = Sprite_setImage__P187273_mk(s);
+    s.tmp_3 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_3.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20428,12 +20518,12 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_Array__getAt(s.tmp_4, 0);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 2061; s.pc = 85; return s.tmp_3;
+    s.callLocIdx = 2068; s.pc = 85; return s.tmp_3;
   case 85:
     r0 = s.retval;
     { step = 42; continue; }
   case 41:
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20441,7 +20531,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, 0);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2062; s.pc = 86; return s.tmp_0;
+    s.callLocIdx = 2069; s.pc = 86; return s.tmp_0;
   case 86:
     r0 = s.retval;
   case 42:
@@ -20534,7 +20624,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 54; continue; }
-    s.tmp_1 = Sprite_setImage__P187273_mk(s);
+    s.tmp_1 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20542,7 +20632,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, 0);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 2063; s.pc = 87; return s.tmp_1;
+    s.callLocIdx = 2070; s.pc = 87; return s.tmp_1;
   case 87:
     r0 = s.retval;
     r0 = (s.arg0).fields["timer"] = (0);
@@ -20551,7 +20641,7 @@ switch (step) {
   case 55:
     { step = 57; continue; }
   case 56:
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20561,7 +20651,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2064; s.pc = 88; return s.tmp_0;
+    s.callLocIdx = 2071; s.pc = 88; return s.tmp_0;
   case 88:
     r0 = s.retval;
   case 57:
@@ -20606,7 +20696,7 @@ switch (step) {
     r0 = (s.tmp_2 % s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["frame"] = (s.tmp_1);
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["current"];
@@ -20616,7 +20706,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_1, s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 2065; s.pc = 89; return s.tmp_0;
+    s.callLocIdx = 2072; s.pc = 89; return s.tmp_0;
   case 89:
     r0 = s.retval;
     { step = 60; continue; }
@@ -20629,12 +20719,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_update__P191361.info = {"start":4439,"length":4624,"line":148,"column":8,"endLine":263,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this","dt"]}
+character_CharacterState_update__P6145.info = {"start":4439,"length":4624,"line":148,"column":8,"endLine":263,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"update","argumentNames":["this","dt"]}
 
-function character_CharacterState_update__P191361_mk(s) {
+function character_CharacterState_update__P6145_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_update__P191361, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_update__P6145, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20645,8 +20735,8 @@ function character_CharacterState_update__P191361_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  state___201539: undefined,
-  newAnimation___201765: undefined,
+  state___16694: undefined,
+  newAnimation___16920: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -20655,7 +20745,7 @@ function character_CharacterState_update__P191361_mk(s) {
 
 
 
-function character_CharacterState_pickRule__P191366(s) {
+function character_CharacterState_pickRule__P6150(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20665,22 +20755,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.best___201923 = undefined;
-    s.bestScore___201926 = undefined;
-    s.currentScore___201935 = undefined;
-    s.animation___201937 = undefined;
-    s.unnamed8944___U4 = undefined;
-    s.unnamed8945___U5 = undefined;
+    s.best___17078 = undefined;
+    s.bestScore___17081 = undefined;
+    s.currentScore___17090 = undefined;
+    s.animation___17092 = undefined;
+    s.unnamed136___U4 = undefined;
+    s.unnamed137___U5 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C191357_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
     r0 = (s.arg0).fields["lastState"] = (s.arg1);
     r0 = s.arg0.fields["current"];
-    s.best___201923 = (r0);
+    s.best___17078 = (r0);
     r0 = s.arg0.fields["current"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -20688,58 +20778,58 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_1 = character_score__P191370_mk(s);
+    s.tmp_1 = character_score__P6154_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    r0 = s.best___201923.fields["rule"];
+    r0 = s.best___17078.fields["rule"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 2067; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 2074; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.bestScore___201926 = (s.tmp_2);
-    s.animation___201937 = (undefined);
+    s.bestScore___17081 = (s.tmp_2);
+    s.animation___17092 = (undefined);
     r0 = s.arg0.fields["animations"];
-    s.unnamed8944___U4 = (r0);
-    s.unnamed8945___U5 = (0);
+    s.unnamed136___U4 = (r0);
+    s.unnamed137___U5 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed8945___U5;
-    r0 = pxsim_Array__length(s.unnamed8944___U4);
+    s.tmp_0 = r0 = s.unnamed137___U5;
+    r0 = pxsim_Array__length(s.unnamed136___U4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8944___U4, s.unnamed8945___U5);
-    s.animation___201937 = (r0);
-    s.tmp_2 = character_score__P191370_mk(s);
+    r0 = pxsim_Array__getAt(s.unnamed136___U4, s.unnamed137___U5);
+    s.animation___17092 = (r0);
+    s.tmp_2 = character_score__P6154_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    r0 = s.animation___201937.fields["rule"];
+    r0 = s.animation___17092.fields["rule"];
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 2068; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 2075; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
-    s.currentScore___201935 = (r0);
-    r0 = (s.currentScore___201935 > s.bestScore___201926);
+    s.currentScore___17090 = (r0);
+    r0 = (s.currentScore___17090 > s.bestScore___17081);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.bestScore___201926 = (s.currentScore___201935);
-    s.best___201923 = (s.animation___201937);
+    s.bestScore___17081 = (s.currentScore___17090);
+    s.best___17078 = (s.animation___17092);
   case 4:
   case 5:
-    r0 = (s.unnamed8945___U5 + 1);
-    s.unnamed8945___U5 = (r0);
+    r0 = (s.unnamed137___U5 + 1);
+    s.unnamed137___U5 = (r0);
     { step = 3; continue; }
   case 6:
-    s.unnamed8944___U4 = (undefined);
-    r0 = (s.bestScore___201926 === 0);
+    s.unnamed136___U4 = (undefined);
+    r0 = (s.bestScore___17081 === 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 7; continue; }
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    r0 = (s.bestScore___201926 == undefined);
+    r0 = (s.bestScore___17081 == undefined);
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -20749,27 +20839,27 @@ switch (step) {
     { step = 11; continue; }
   case 9:
   case 10:
-    r0 = s.best___201923;
+    r0 = s.best___17078;
   case 11:
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_pickRule__P191366.info = {"start":9567,"length":811,"line":286,"column":8,"endLine":307,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"pickRule","argumentNames":["this","state"]}
+character_CharacterState_pickRule__P6150.info = {"start":9567,"length":811,"line":286,"column":8,"endLine":307,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"pickRule","argumentNames":["this","state"]}
 
-function character_CharacterState_pickRule__P191366_mk(s) {
+function character_CharacterState_pickRule__P6150_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_pickRule__P191366, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_pickRule__P6150, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  best___201923: undefined,
-  bestScore___201926: undefined,
-  currentScore___201935: undefined,
-  animation___201937: undefined,
-  unnamed8944___U4: undefined,
-  unnamed8945___U5: undefined,
+  best___17078: undefined,
+  bestScore___17081: undefined,
+  currentScore___17090: undefined,
+  animation___17092: undefined,
+  unnamed136___U4: undefined,
+  unnamed137___U5: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -20778,7 +20868,7 @@ function character_CharacterState_pickRule__P191366_mk(s) {
 
 
 
-function character_score__P191370(s) {
+function character_score__P6154(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20788,15 +20878,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___201962 = undefined;
-    s.check___201963 = undefined;
+    s.res___17117 = undefined;
+    s.check___17118 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.res___201962 = (0);
-    s.check___201963 = (s.arg0);
+    s.res___17117 = (0);
+    s.check___17118 = (s.arg0);
     r0 = (s.arg0 & s.arg1);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 ^ s.arg1);
@@ -20808,37 +20898,37 @@ switch (step) {
   case 1:
   case 2:
   case 3:
-    r0 = pxsim_numops_toBoolDecr(s.check___201963);
+    r0 = pxsim_numops_toBoolDecr(s.check___17118);
     if (!r0) { step = 6; continue; }
-    r0 = (s.check___201963 & 1);
+    r0 = (s.check___17118 & 1);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    r0 = (s.res___201962 + 1);
-    s.res___201962 = (r0);
+    r0 = (s.res___17117 + 1);
+    s.res___17117 = (r0);
   case 4:
   case 5:
-    r0 = (s.check___201963 >> 1);
-    s.check___201963 = (r0);
+    r0 = (s.check___17118 >> 1);
+    s.check___17118 = (r0);
     { step = 3; continue; }
   case 6:
-    r0 = s.res___201962;
+    r0 = s.res___17117;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-character_score__P191370.info = {"start":11067,"length":258,"line":338,"column":4,"endLine":350,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"score","argumentNames":["state","rule"]}
+character_score__P6154.info = {"start":11067,"length":258,"line":338,"column":4,"endLine":350,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"score","argumentNames":["state","rule"]}
 
-function character_score__P191370_mk(s) {
+function character_score__P6154_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_score__P191370, depth: s.depth + 1,
+        parent: s, fn: character_score__P6154, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  res___201962: undefined,
-  check___201963: undefined,
+  res___17117: undefined,
+  check___17118: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -20847,7 +20937,7 @@ function character_score__P191370_mk(s) {
 
 
 
-function Sprite_isHittingTile__P187298(s) {
+function Sprite_isHittingTile__P2081(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20863,7 +20953,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = s.arg0.fields["_obstacles"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -20889,12 +20979,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_isHittingTile__P187298.info = {"start":25208,"length":125,"line":765,"column":4,"endLine":767,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isHittingTile","argumentNames":["this","direction"]}
+Sprite_isHittingTile__P2081.info = {"start":25208,"length":125,"line":765,"column":4,"endLine":767,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isHittingTile","argumentNames":["this","direction"]}
 
-function Sprite_isHittingTile__P187298_mk(s) {
+function Sprite_isHittingTile__P2081_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isHittingTile__P187298, depth: s.depth + 1,
+        parent: s, fn: Sprite_isHittingTile__P2081, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20911,7 +21001,7 @@ function Sprite_isHittingTile__P187298_mk(s) {
 
 
 
-function game_onUpdate__P187760(s) {
+function game_onUpdate__P2543(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20925,9 +21015,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P189572_mk(s);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1201; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1208; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -20939,15 +21029,15 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = control_EventContext_registerFrameHandler__P185609_mk(s);
-    s.tmp_3 = game_eventContext__P187752_mk(s);
-    s.callLocIdx = 1202; s.pc = 6; return s.tmp_3;
+    s.tmp_2 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_3 = game_eventContext__P2535_mk(s);
+    s.callLocIdx = 1209; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 20;
     s.tmp_2.arg2 = s.arg0;
-    s.callLocIdx = 1203; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1210; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -20955,12 +21045,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onUpdate__P187760.info = {"start":7427,"length":169,"line":242,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onUpdate","argumentNames":["a"]}
+game_onUpdate__P2543.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__P187760_mk(s) {
+function game_onUpdate__P2543_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onUpdate__P187760, depth: s.depth + 1,
+        parent: s, fn: game_onUpdate__P2543, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -20973,7 +21063,7 @@ function game_onUpdate__P187760_mk(s) {
 
 
 
-function game_init__P189572(s) {
+function game_init__P4356(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -20987,7 +21077,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scene___189564);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___4348);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -21002,73 +21092,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__C187636_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Scene__C2419_VT);
     s.tmp_3 = r0;
-    s.tmp_4 = scene_Scene_constructor__P187657_mk(s);
+    s.tmp_4 = scene_Scene_constructor__P2440_mk(s);
     s.tmp_4.arg0 = s.tmp_3;
-    s.tmp_5 = control_pushEventContext__P185615_mk(s);
-    s.callLocIdx = 1147; s.pc = 14; return s.tmp_5;
+    s.tmp_5 = control_pushEventContext__P398_mk(s);
+    s.callLocIdx = 1154; s.pc = 14; return s.tmp_5;
   case 14:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
-    s.tmp_4.arg2 = globals._scene___189564;
-    s.callLocIdx = 1148; s.pc = 13; return s.tmp_4;
+    s.tmp_4.arg2 = globals._scene___4348;
+    s.callLocIdx = 1155; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
-    globals._scene___189564 = (s.tmp_3);
+    globals._scene___4348 = (s.tmp_3);
   case 3:
   case 4:
-    s.tmp_0 = scene_Scene_init__P187658_mk(s);
-    s.tmp_0.arg0 = globals._scene___189564;
-    s.callLocIdx = 1149; s.pc = 15; return s.tmp_0;
+    s.tmp_0 = scene_Scene_init__P2441_mk(s);
+    s.tmp_0.arg0 = globals._scene___4348;
+    s.callLocIdx = 1156; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.winEffect___187747);
+    r0 = pxsim_numops_toBoolDecr(globals.winEffect___2530);
     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___187747 = (globals.confetti___188018);
+    globals.winEffect___2530 = (globals.confetti___2801);
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(globals.loseEffect___187748);
+    r0 = pxsim_numops_toBoolDecr(globals.loseEffect___2531);
     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___187748 = (globals.melt___188039);
+    globals.loseEffect___2531 = (globals.melt___2822);
   case 7:
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals.winSound___189563);
+    r0 = pxsim_numops_toBoolDecr(globals.winSound___4347);
     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___189563 = (globals.powerUp___186835);
+    globals.winSound___4347 = (globals.powerUp___1618);
   case 9:
   case 10:
-    r0 = pxsim_numops_toBoolDecr(globals.loseSound___189561);
+    r0 = pxsim_numops_toBoolDecr(globals.loseSound___4345);
     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___189561 = (globals.wawawawaa___186832);
+    globals.loseSound___4345 = (globals.wawawawaa___1615);
   case 11:
   case 12:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_init__P189572.info = {"start":1202,"length":452,"line":45,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"init","argumentNames":["forceNewScene"]}
+game_init__P4356.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__P189572_mk(s) {
+function game_init__P4356_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_init__P189572, depth: s.depth + 1,
+        parent: s, fn: game_init__P4356, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21083,7 +21173,7 @@ function game_init__P189572_mk(s) {
 
 
 
-function inline__P195328(s) {
+function inline__P9211(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21093,11 +21183,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rounds___195331 = undefined;
-    s.j___195339 = undefined;
-    s.x___195344 = undefined;
-    s.y___195350 = undefined;
-    s.c___195356 = undefined;
+    s.rounds___9214 = undefined;
+    s.j___9222 = undefined;
+    s.x___9227 = undefined;
+    s.y___9233 = undefined;
+    s.c___9239 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -21110,14 +21200,14 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 5);
-    s.rounds___195331 = (r0);
-    s.j___195339 = (0);
+    s.rounds___9214 = (r0);
+    s.j___9222 = (0);
   case 1:
-    r0 = (s.j___195339 < s.rounds___195331);
+    r0 = (s.j___9222 < s.rounds___9214);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.tmp_1 = Math_FastRandom_randomRange__P2590_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.tmp_1.arg1 = 0;
     r0 = pxsim_ImageMethods.width(s.arg0);
@@ -21127,8 +21217,8 @@ switch (step) {
     s.callLocIdx = 53; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.x___195344 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.x___9227 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 0;
     r0 = pxsim_ImageMethods.height(s.arg0);
@@ -21138,42 +21228,42 @@ switch (step) {
     s.callLocIdx = 54; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.y___195350 = (r0);
-    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___195344, s.y___195350);
-    s.c___195356 = (r0);
+    s.y___9233 = (r0);
+    r0 = pxsim_ImageMethods.getPixel(s.arg0, s.x___9227, s.y___9233);
+    s.c___9239 = (r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.x___195344;
-    r0 = (s.y___195350 + 1);
+    s.tmp_1 = r0 = s.x___9227;
+    r0 = (s.y___9233 + 1);
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___195356);
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___9239);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.x___195344;
-    r0 = (s.y___195350 + 2);
+    s.tmp_1 = r0 = s.x___9227;
+    r0 = (s.y___9233 + 2);
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___195356);
-    r0 = (s.j___195339 + 1);
-    s.j___195339 = (r0);
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_2, s.c___9239);
+    r0 = (s.j___9222 + 1);
+    s.j___9222 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195328.info = {"start":2652,"length":386,"line":72,"column":45,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["input","r"]}
+inline__P9211.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__P195328_mk(s) {
+function inline__P9211_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195328, depth: s.depth + 1,
+        parent: s, fn: inline__P9211, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  rounds___195331: undefined,
-  j___195339: undefined,
-  x___195344: undefined,
-  y___195350: undefined,
-  c___195356: undefined,
+  rounds___9214: undefined,
+  j___9222: undefined,
+  x___9227: undefined,
+  y___9233: undefined,
+  c___9239: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -21182,7 +21272,7 @@ function inline__P195328_mk(s) {
 
 
 
-function Math_FastRandom_randomRange__P187807(s) {
+function Math_FastRandom_randomRange__P2590(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21199,14 +21289,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C187803_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
     r0 = (s.arg2 > s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = Math_FastRandom_next__P187806_mk(s);
+    s.tmp_2 = Math_FastRandom_next__P2589_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1337; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1344; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -21225,12 +21315,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_randomRange__P187807.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"]}
+Math_FastRandom_randomRange__P2590.info = {"start":2079,"length":131,"line":62,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"randomRange","argumentNames":["this","min","max"]}
 
-function Math_FastRandom_randomRange__P187807_mk(s) {
+function Math_FastRandom_randomRange__P2590_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_randomRange__P187807, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_randomRange__P2590, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21247,7 +21337,7 @@ function Math_FastRandom_randomRange__P187807_mk(s) {
 
 
 
-function Math_FastRandom_next__P187806(s) {
+function Math_FastRandom_next__P2589(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21262,7 +21352,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C187803_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["lfsr"];
     s.tmp_3 = r0;
@@ -21283,12 +21373,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_next__P187806.info = {"start":1713,"length":107,"line":53,"column":8,"endLine":55,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"next","argumentNames":["this"]}
+Math_FastRandom_next__P2589.info = {"start":1713,"length":107,"line":53,"column":8,"endLine":55,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"next","argumentNames":["this"]}
 
-function Math_FastRandom_next__P187806_mk(s) {
+function Math_FastRandom_next__P2589_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_next__P187806, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_next__P2589, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21305,7 +21395,7 @@ function Math_FastRandom_next__P187806_mk(s) {
 
 
 
-function effects_ImageEffect_constructor__P188034(s) {
+function effects_ImageEffect_constructor__P2817(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21322,14 +21412,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C188033_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
     r0 = (s.arg0).fields["effect"] = (s.arg2);
-    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C187803_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C2586_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P187805_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P2588_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1643; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1650; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["fastRandom"] = (s.tmp_0);
@@ -21339,12 +21429,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_constructor__P188034.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"]}
+effects_ImageEffect_constructor__P2817.info = {"start":410,"length":290,"line":10,"column":8,"endLine":15,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["this","defaultRate","effectFactory"]}
 
-function effects_ImageEffect_constructor__P188034_mk(s) {
+function effects_ImageEffect_constructor__P2817_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_constructor__P188034, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_constructor__P2817, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21357,7 +21447,7 @@ function effects_ImageEffect_constructor__P188034_mk(s) {
 
 
 
-function inline__P195436(s) {
+function inline__P9319(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21367,13 +21457,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.factory___195439 = undefined;
+    s.factory___9322 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ConfettiFactory__C187962_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ConfettiFactory__C2745_VT);
     s.tmp_0 = r0;
     s.tmp_2 = if_width_1_mk(s);
     s.tmp_2.arg0 = s.arg0;
@@ -21408,27 +21498,27 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.tmp_5 = particles_ConfettiFactory_constructor__P187963_mk(s);
+    s.tmp_5 = particles_ConfettiFactory_constructor__P2746_mk(s);
     s.tmp_5.arg0 = s.tmp_0;
     s.tmp_5.arg1 = s.tmp_4;
     s.tmp_5.arg2 = 16;
     s.callLocIdx = 43; s.pc = 5; return s.tmp_5;
   case 5:
     r0 = s.retval;
-    s.factory___195439 = (s.tmp_0);
-    s.tmp_0 = particles_SprayFactory_setSpeed__P187939_mk(s);
-    s.tmp_0.arg0 = s.factory___195439;
+    s.factory___9322 = (s.tmp_0);
+    s.tmp_0 = particles_SprayFactory_setSpeed__P2722_mk(s);
+    s.tmp_0.arg0 = s.factory___9322;
     s.tmp_0.arg1 = 30;
     s.callLocIdx = 44; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C187895_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C2678_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_ParticleSource_constructor__P187900_mk(s);
+    s.tmp_1 = particles_ParticleSource_constructor__P2683_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
-    s.tmp_1.arg3 = s.factory___195439;
+    s.tmp_1.arg3 = s.factory___9322;
     s.callLocIdx = 45; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
@@ -21436,12 +21526,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195436.info = {"start":7534,"length":284,"line":191,"column":59,"endLine":195,"endColumn":5,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["anchor","particlesPerSecond"]}
+inline__P9319.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__P195436_mk(s) {
+function inline__P9319_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195436, depth: s.depth + 1,
+        parent: s, fn: inline__P9319, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21449,7 +21539,7 @@ function inline__P195436_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  factory___195439: undefined,
+  factory___9322: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -21458,7 +21548,7 @@ function inline__P195436_mk(s) {
 
 
 
-function particles_ParticleSource_constructor__P187900(s) {
+function particles_ParticleSource_constructor__P2683(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21468,8 +21558,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___195460 = undefined;
-    s.removedSource___195469 = undefined;
+    s.sources___9343 = undefined;
+    s.removedSource___9352 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -21478,65 +21568,65 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P187077_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1506; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1513; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = particles_init__P189922_mk(s);
-    s.callLocIdx = 1507; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = particles_init__P4706_mk(s);
+    s.callLocIdx = 1514; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = particles_particleSources__P189928_mk(s);
-    s.callLocIdx = 1508; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = particles_particleSources__P4712_mk(s);
+    s.callLocIdx = 1515; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.sources___195460 = (r0);
-    r0 = pxsim_Array__length(s.sources___195460);
+    s.sources___9343 = (r0);
+    r0 = pxsim_Array__length(s.sources___9343);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 >= globals.MAX_SOURCES___189899);
+    r0 = (s.tmp_1 >= globals.MAX_SOURCES___4683);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = particles_sortSources__P189925_mk(s);
-    s.tmp_2.arg0 = s.sources___195460;
-    s.callLocIdx = 1509; s.pc = 8; return s.tmp_2;
+    s.tmp_2 = particles_sortSources__P4709_mk(s);
+    s.tmp_2.arg0 = s.sources___9343;
+    s.callLocIdx = 1516; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeAt(s.sources___195460, 0);
-    s.removedSource___195469 = (r0);
-    s.tmp_0 = particles_ParticleSource_clear__P187910_mk(s);
-    s.tmp_0.arg0 = s.removedSource___195469;
-    s.callLocIdx = 1511; s.pc = 9; return s.tmp_0;
+    r0 = pxsim_Array_.removeAt(s.sources___9343, 0);
+    s.removedSource___9352 = (r0);
+    s.tmp_0 = particles_ParticleSource_clear__P2693_mk(s);
+    s.tmp_0.arg0 = s.removedSource___9352;
+    s.callLocIdx = 1518; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_destroy__P187909_mk(s);
-    s.tmp_0.arg0 = s.removedSource___195469;
-    s.callLocIdx = 1512; s.pc = 10; return s.tmp_0;
+    s.tmp_0 = particles_ParticleSource_destroy__P2692_mk(s);
+    s.tmp_0.arg0 = s.removedSource___9352;
+    s.callLocIdx = 1519; 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__P187912_mk(s);
+    s.tmp_0 = particles_ParticleSource_setRate__P2695_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1513; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1520; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_setAcceleration__P187904_mk(s);
+    s.tmp_0 = particles_ParticleSource_setAcceleration__P2687_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
-    s.callLocIdx = 1514; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1521; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = particles_ParticleSource_setAnchor__P187911_mk(s);
+    s.tmp_0 = particles_ParticleSource_setAnchor__P2694_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1515; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1522; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = (s.arg0).fields["lifespan"] = (undefined);
@@ -21548,39 +21638,39 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = globals.defaultFactory___187915;
+    r0 = globals.defaultFactory___2698;
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = particles_ParticleSource_setFactory__P187914_mk(s);
+    s.tmp_2 = particles_ParticleSource_setFactory__P2697_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 1516; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 1523; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.sources___195460, s.arg0);
-    s.tmp_0 = particles_ParticleSource_enabled__P187908_mk(s);
+    r0 = pxsim_Array__push(s.sources___9343, s.arg0);
+    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1517; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1524; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_constructor__P187900.info = {"start":2290,"length":899,"line":86,"column":8,"endLine":109,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["this","anchor","particlesPerSecond","factory"]}
+particles_ParticleSource_constructor__P2683.info = {"start":2290,"length":899,"line":86,"column":8,"endLine":109,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["this","anchor","particlesPerSecond","factory"]}
 
-function particles_ParticleSource_constructor__P187900_mk(s) {
+function particles_ParticleSource_constructor__P2683_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_constructor__P187900, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_constructor__P2683, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  sources___195460: undefined,
-  removedSource___195469: undefined,
+  sources___9343: undefined,
+  removedSource___9352: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -21591,7 +21681,7 @@ function particles_ParticleSource_constructor__P187900_mk(s) {
 
 
 
-function particles_particleSources__P189928(s) {
+function particles_particleSources__P4712(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21601,33 +21691,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___195099 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1568; s.pc = 1; return s.tmp_0;
+    s.sources___8647 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1575; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["particleSources"];
-    s.sources___195099 = (r0);
-    r0 = s.sources___195099;
+    s.sources___8647 = (r0);
+    r0 = s.sources___8647;
     return leave(s, r0)
   default: oops()
 } } }
-particles_particleSources__P189928.info = {"start":12831,"length":119,"line":420,"column":4,"endLine":423,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"particleSources","argumentNames":[]}
+particles_particleSources__P4712.info = {"start":12831,"length":119,"line":420,"column":4,"endLine":423,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"particleSources","argumentNames":[]}
 
-function particles_particleSources__P189928_mk(s) {
+function particles_particleSources__P4712_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_particleSources__P189928, depth: s.depth + 1,
+        parent: s, fn: particles_particleSources__P4712, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___195099: undefined,
+  sources___8647: undefined,
 } }
 
 
 
 
 
-function particles_sortSources__P189925(s) {
+function particles_sortSources__P4709(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21641,22 +21731,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_arraySort__P185320_mk(s);
+    s.tmp_0 = helpers_arraySort__P103_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = inline__P195671;
-    s.callLocIdx = 1555; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P9554;
+    s.callLocIdx = 1562; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_sortSources__P189925.info = {"start":10009,"length":129,"line":331,"column":4,"endLine":333,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"sortSources","argumentNames":["sources"]}
+particles_sortSources__P4709.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__P189925_mk(s) {
+function particles_sortSources__P4709_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_sortSources__P189925, depth: s.depth + 1,
+        parent: s, fn: particles_sortSources__P4709, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -21666,7 +21756,7 @@ function particles_sortSources__P189925_mk(s) {
 
 
 
-function inline__P195671(s) {
+function inline__P9554(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21704,12 +21794,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195671.info = {"start":10080,"length":50,"line":332,"column":21,"endLine":332,"endColumn":71,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P9554.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__P195671_mk(s) {
+function inline__P9554_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195671, depth: s.depth + 1,
+        parent: s, fn: inline__P9554, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21725,7 +21815,7 @@ function inline__P195671_mk(s) {
 
 
 
-function helpers_arraySort__P185320(s) {
+function helpers_arraySort__P103(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21757,10 +21847,10 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.arg1 = (inline__P195694);
+    s.arg1 = (inline__P9577);
   case 3:
   case 4:
-    s.tmp_0 = helpers_sortHelper__P189174_mk(s);
+    s.tmp_0 = helpers_sortHelper__P3958_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 3; s.pc = 5; return s.tmp_0;
@@ -21769,12 +21859,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySort__P185320.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__P103.info = {"start":5663,"length":859,"line":207,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySort","argumentNames":["arr","callbackfn"]}
 
-function helpers_arraySort__P185320_mk(s) {
+function helpers_arraySort__P103_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySort__P185320, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySort__P103, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21788,7 +21878,7 @@ function helpers_arraySort__P185320_mk(s) {
 
 
 
-function inline__P195694(s) {
+function inline__P9577(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21798,26 +21888,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.aIsUndef___195697 = undefined;
-    s.bIsUndef___195701 = undefined;
-    s.aIsNull___195712 = undefined;
-    s.bIsNull___195716 = undefined;
+    s.aIsUndef___9580 = undefined;
+    s.bIsUndef___9584 = undefined;
+    s.aIsNull___9595 = undefined;
+    s.bIsNull___9599 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = (s.arg0 === undefined);
-    s.aIsUndef___195697 = (r0);
+    s.aIsUndef___9580 = (r0);
     r0 = (s.arg1 === undefined);
-    s.bIsUndef___195701 = (r0);
-    s.tmp_0 = r0 = s.aIsUndef___195697;
+    s.bIsUndef___9584 = (r0);
+    s.tmp_0 = r0 = s.aIsUndef___9580;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.bIsUndef___195701;
+    r0 = s.bIsUndef___9584;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -21827,13 +21917,13 @@ switch (step) {
     { step = 17; continue; }
     { step = 8; continue; }
   case 3:
-    r0 = pxsim_numops_toBoolDecr(s.aIsUndef___195697);
+    r0 = pxsim_numops_toBoolDecr(s.aIsUndef___9580);
     if (!r0) { step = 4; continue; }
     r0 = 1;
     { step = 17; continue; }
     { step = 7; continue; }
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.bIsUndef___195701);
+    r0 = pxsim_numops_toBoolDecr(s.bIsUndef___9584);
     if (!r0) { step = 5; continue; }
     r0 = -1;
     { step = 17; continue; }
@@ -21842,16 +21932,16 @@ switch (step) {
   case 7:
   case 8:
     r0 = (s.arg0 === null);
-    s.aIsNull___195712 = (r0);
+    s.aIsNull___9595 = (r0);
     r0 = (s.arg1 === null);
-    s.bIsNull___195716 = (r0);
-    s.tmp_0 = r0 = s.aIsNull___195712;
+    s.bIsNull___9599 = (r0);
+    s.tmp_0 = r0 = s.aIsNull___9595;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 9; continue; }
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 9:
-    r0 = s.bIsNull___195716;
+    r0 = s.bIsNull___9599;
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -21861,13 +21951,13 @@ switch (step) {
     { step = 17; continue; }
     { step = 16; continue; }
   case 11:
-    r0 = pxsim_numops_toBoolDecr(s.aIsNull___195712);
+    r0 = pxsim_numops_toBoolDecr(s.aIsNull___9595);
     if (!r0) { step = 12; continue; }
     r0 = 1;
     { step = 17; continue; }
     { step = 15; continue; }
   case 12:
-    r0 = pxsim_numops_toBoolDecr(s.bIsNull___195716);
+    r0 = pxsim_numops_toBoolDecr(s.bIsNull___9599);
     if (!r0) { step = 13; continue; }
     r0 = -1;
     { step = 17; continue; }
@@ -21906,12 +21996,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195694.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__P9577.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__P195694_mk(s) {
+function inline__P9577_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195694, depth: s.depth + 1,
+        parent: s, fn: inline__P9577, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -21921,10 +22011,10 @@ function inline__P195694_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  aIsUndef___195697: undefined,
-  bIsUndef___195701: undefined,
-  aIsNull___195712: undefined,
-  bIsNull___195716: undefined,
+  aIsUndef___9580: undefined,
+  bIsUndef___9584: undefined,
+  aIsNull___9595: undefined,
+  bIsNull___9599: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -21933,7 +22023,7 @@ function inline__P195694_mk(s) {
 
 
 
-function helpers_sortHelper__P189174(s) {
+function helpers_sortHelper__P3958(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -21943,9 +22033,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___195751 = undefined;
-    s.i___195754 = undefined;
-    s.j___195760 = undefined;
+    s.len___9634 = undefined;
+    s.i___9637 = undefined;
+    s.j___9643 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -21973,28 +22063,28 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_Array__length(s.arg0);
-    s.len___195751 = (r0);
-    s.i___195754 = (0);
+    s.len___9634 = (r0);
+    s.i___9637 = (0);
   case 5:
-    s.tmp_1 = r0 = s.i___195754;
-    r0 = (s.len___195751 - 1);
+    s.tmp_1 = r0 = s.i___9637;
+    r0 = (s.len___9634 - 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___195754 + 1);
-    s.j___195760 = (r0);
+    r0 = (s.i___9637 + 1);
+    s.j___9643 = (r0);
   case 6:
-    r0 = (s.j___195760 < s.len___195751);
+    r0 = (s.j___9643 < s.len___9634);
     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___195754);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___9637);
     s.tmp_3.arg0 = r0;
-    r0 = pxsim_Array__getAt(s.arg0, s.j___195760);
+    r0 = pxsim_Array__getAt(s.arg0, s.j___9643);
     s.tmp_3.arg1 = r0;
     setupLambda(s.tmp_3, s.tmp_3.argL);
     s.callLocIdx = 1; s.pc = 12; return s.tmp_3;
@@ -22005,21 +22095,21 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = helpers_swap__P189173_mk(s);
+    s.tmp_4 = helpers_swap__P3957_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.tmp_4.arg1 = s.i___195754;
-    s.tmp_4.arg2 = s.j___195760;
+    s.tmp_4.arg1 = s.i___9637;
+    s.tmp_4.arg2 = s.j___9643;
     s.callLocIdx = 2; s.pc = 13; return s.tmp_4;
   case 13:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = (s.j___195760 + 1);
-    s.j___195760 = (r0);
+    r0 = (s.j___9643 + 1);
+    s.j___9643 = (r0);
     { step = 6; continue; }
   case 9:
-    r0 = (s.i___195754 + 1);
-    s.i___195754 = (r0);
+    r0 = (s.i___9637 + 1);
+    s.i___9637 = (r0);
     { step = 5; continue; }
   case 10:
     r0 = s.arg0;
@@ -22027,21 +22117,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_sortHelper__P189174.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__P3958.info = {"start":5176,"length":481,"line":191,"column":4,"endLine":205,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"sortHelper","argumentNames":["arr","callbackfn"]}
 
-function helpers_sortHelper__P189174_mk(s) {
+function helpers_sortHelper__P3958_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_sortHelper__P189174, depth: s.depth + 1,
+        parent: s, fn: helpers_sortHelper__P3958, 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___195751: undefined,
-  i___195754: undefined,
-  j___195760: undefined,
+  len___9634: undefined,
+  i___9637: undefined,
+  j___9643: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -22050,7 +22140,7 @@ function helpers_sortHelper__P189174_mk(s) {
 
 
 
-function helpers_swap__P189173(s) {
+function helpers_swap__P3957(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22060,7 +22150,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.temp___195789 = undefined;
+    s.temp___9672 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22068,28 +22158,28 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__getAt(s.arg0, s.arg1);
-    s.temp___195789 = (r0);
+    s.temp___9672 = (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___195789);
+    r0 = pxsim_Array_.setAt(s.arg0, s.arg2, s.temp___9672);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_swap__P189173.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__P3957.info = {"start":5030,"length":140,"line":185,"column":4,"endLine":189,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"swap","argumentNames":["arr","i","j"]}
 
-function helpers_swap__P189173_mk(s) {
+function helpers_swap__P3957_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_swap__P189173, depth: s.depth + 1,
+        parent: s, fn: helpers_swap__P3957, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  temp___195789: undefined,
+  temp___9672: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22099,7 +22189,7 @@ function helpers_swap__P189173_mk(s) {
 
 
 
-function particles_init__P189922(s) {
+function particles_init__P4706(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22109,34 +22199,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___195801 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1545; s.pc = 4; return s.tmp_0;
+    s.scene___9684 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1552; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.scene___195801 = (r0);
-    r0 = s.scene___195801.fields["particleSources"];
+    s.scene___9684 = (r0);
+    r0 = s.scene___9684.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___195801;
+    s.tmp_1 = r0 = s.scene___9684;
     r0 = pxsim_Array__mk();
     s.tmp_2 = r0;
     r0 = (s.tmp_1).fields["particleSources"] = (s.tmp_2);
     r0 = pxsim.control.millis();
-    globals.lastUpdate___189917 = (r0);
-    s.tmp_0 = game_onUpdate__P187760_mk(s);
-    s.tmp_0.arg0 = particles_updateParticles__P189923;
-    s.callLocIdx = 1546; s.pc = 5; return s.tmp_0;
+    globals.lastUpdate___4701 = (r0);
+    s.tmp_0 = game_onUpdate__P2543_mk(s);
+    s.tmp_0.arg0 = particles_updateParticles__P4707;
+    s.callLocIdx = 1553; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_onUpdateInterval__P187761_mk(s);
+    s.tmp_0 = game_onUpdateInterval__P2544_mk(s);
     s.tmp_0.arg0 = 250;
-    s.tmp_0.arg1 = particles_pruneParticles__P189924;
-    s.callLocIdx = 1547; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg1 = particles_pruneParticles__P4708;
+    s.callLocIdx = 1554; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -22144,24 +22234,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_init__P189922.info = {"start":9219,"length":276,"line":303,"column":4,"endLine":310,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"init","argumentNames":[]}
+particles_init__P4706.info = {"start":9219,"length":276,"line":303,"column":4,"endLine":310,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"init","argumentNames":[]}
 
-function particles_init__P189922_mk(s) {
+function particles_init__P4706_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_init__P189922, depth: s.depth + 1,
+        parent: s, fn: particles_init__P4706, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  scene___195801: undefined,
+  scene___9684: undefined,
 } }
 
 
 
 
 
-function particles_pruneParticles__P189924(s) {
+function particles_pruneParticles__P4708(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22171,26 +22261,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___194936 = undefined;
-    s.tmp_0 = particles_particleSources__P189928_mk(s);
-    s.callLocIdx = 1551; s.pc = 3; return s.tmp_0;
+    s.sources___8484 = undefined;
+    s.tmp_0 = particles_particleSources__P4712_mk(s);
+    s.callLocIdx = 1558; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___194936 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___194936);
+    s.sources___8484 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___8484);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_1 = helpers_arraySlice__P185329_mk(s);
-    s.tmp_1.arg0 = s.sources___194936;
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1 = helpers_arraySlice__P112_mk(s);
+    s.tmp_1.arg0 = s.sources___8484;
     s.tmp_1.arg1 = 0;
-    r0 = pxsim_Array__length(s.sources___194936);
+    r0 = pxsim_Array__length(s.sources___8484);
     s.tmp_1.arg2 = r0;
-    s.callLocIdx = 1552; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1559; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P194945;
-    s.callLocIdx = 1554; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg1 = inline__P8493;
+    s.callLocIdx = 1561; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -22199,23 +22289,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_pruneParticles__P189924.info = {"start":9847,"length":156,"line":326,"column":4,"endLine":329,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"pruneParticles","argumentNames":[]}
+particles_pruneParticles__P4708.info = {"start":9847,"length":156,"line":326,"column":4,"endLine":329,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"pruneParticles","argumentNames":[]}
 
-function particles_pruneParticles__P189924_mk(s) {
+function particles_pruneParticles__P4708_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_pruneParticles__P189924, depth: s.depth + 1,
+        parent: s, fn: particles_pruneParticles__P4708, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  sources___194936: undefined,
+  sources___8484: undefined,
 } }
 
 
 
 
 
-function inline__P194945(s) {
+function inline__P8493(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22229,21 +22319,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource__prune__P187903_mk(s);
+    s.tmp_0 = particles_ParticleSource__prune__P2686_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1553; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1560; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194945.info = {"start":9980,"length":15,"line":328,"column":62,"endLine":328,"endColumn":77,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P8493.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__P194945_mk(s) {
+function inline__P8493_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194945, depth: s.depth + 1,
+        parent: s, fn: inline__P8493, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -22253,7 +22343,7 @@ function inline__P194945_mk(s) {
 
 
 
-function particles_ParticleSource__prune__P187903(s) {
+function particles_ParticleSource__prune__P2686(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22263,15 +22353,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___194975 = undefined;
-    s.sources___194983 = undefined;
-    s.current___194997 = undefined;
+    s.scene___8523 = undefined;
+    s.sources___8531 = undefined;
+    s.current___8545 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
   case 1:
     r0 = s.arg0.fields["head"];
     s.tmp_0 = r0;
@@ -22314,36 +22404,36 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 13; continue; }
-    s.tmp_5 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1526; s.pc = 21; return s.tmp_5;
+    s.tmp_5 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1533; s.pc = 21; return s.tmp_5;
   case 21:
     r0 = s.retval;
-    s.scene___194975 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.scene___194975);
+    s.scene___8523 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.scene___8523);
     if (!r0) { step = 7; continue; }
-    r0 = s.scene___194975.fields["allSprites"];
+    r0 = s.scene___8523.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg0);
   case 7:
   case 8:
-    s.tmp_0 = particles_particleSources__P189928_mk(s);
-    s.callLocIdx = 1527; s.pc = 22; return s.tmp_0;
+    s.tmp_0 = particles_particleSources__P4712_mk(s);
+    s.callLocIdx = 1534; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
-    s.sources___194983 = (r0);
-    s.tmp_0 = r0 = s.sources___194983;
+    s.sources___8531 = (r0);
+    s.tmp_0 = r0 = s.sources___8531;
     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___194983);
+    r0 = pxsim_Array__length(s.sources___8531);
   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___194983, s.arg0);
+    r0 = pxsim_Array_.removeElement(s.sources___8531, s.arg0);
   case 11:
   case 12:
     r0 = s.arg0.fields["anchor"];
@@ -22352,35 +22442,35 @@ switch (step) {
   case 13:
   case 14:
     r0 = s.arg0.fields["head"];
-    s.current___194997 = (r0);
+    s.current___8545 = (r0);
   case 15:
-    s.tmp_0 = r0 = s.current___194997;
+    s.tmp_0 = r0 = s.current___8545;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 16; continue; }
     r0 = s.tmp_0;
     { step = 17; continue; }
   case 16:
-    r0 = s.current___194997.fields["next"];
+    r0 = s.current___8545.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___194997.fields["next"];
+    r0 = s.current___8545.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___194997.fields["next"];
+    r0 = s.current___8545.fields["next"];
     r0 = r0.fields["next"];
     s.tmp_4 = r0;
-    r0 = (s.current___194997).fields["next"] = (s.tmp_4);
+    r0 = (s.current___8545).fields["next"] = (s.tmp_4);
     { step = 19; continue; }
   case 18:
-    r0 = s.current___194997.fields["next"];
-    s.current___194997 = (r0);
+    r0 = s.current___8545.fields["next"];
+    s.current___8545 = (r0);
   case 19:
     { step = 15; continue; }
   case 20:
@@ -22388,12 +22478,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource__prune__P187903.info = {"start":5087,"length":830,"line":165,"column":8,"endLine":188,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"_prune","argumentNames":["this"]}
+particles_ParticleSource__prune__P2686.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__P187903_mk(s) {
+function particles_ParticleSource__prune__P2686_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource__prune__P187903, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource__prune__P2686, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22401,9 +22491,9 @@ function particles_ParticleSource__prune__P187903_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___194975: undefined,
-  sources___194983: undefined,
-  current___194997: undefined,
+  scene___8523: undefined,
+  sources___8531: undefined,
+  current___8545: undefined,
   arg0: undefined,
 } }
 
@@ -22411,7 +22501,7 @@ function particles_ParticleSource__prune__P187903_mk(s) {
 
 
 
-function helpers_arraySlice__P185329(s) {
+function helpers_arraySlice__P112(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22421,9 +22511,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___195020 = undefined;
-    s.len___195022 = undefined;
-    s.i___195056 = undefined;
+    s.res___8568 = undefined;
+    s.len___8570 = undefined;
+    s.i___8604 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -22431,9 +22521,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___195020 = (r0);
+    s.res___8568 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___195022 = (r0);
+    s.len___8570 = (r0);
     r0 = (s.arg1 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -22445,8 +22535,8 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_max__P185342_mk(s);
-    r0 = (s.len___195022 + s.arg1);
+    s.tmp_1 = Math_max__P125_mk(s);
+    r0 = (s.len___8570 + s.arg1);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
     s.callLocIdx = 10; s.pc = 16; return s.tmp_1;
@@ -22456,11 +22546,11 @@ switch (step) {
   case 2:
   case 3:
   case 4:
-    r0 = (s.arg1 > s.len___195022);
+    r0 = (s.arg1 > s.len___8570);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = s.res___195020;
+    r0 = s.res___8568;
     { step = 15; continue; }
   case 5:
   case 6:
@@ -22468,57 +22558,57 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 7; continue; }
-    s.arg2 = (s.len___195022);
+    s.arg2 = (s.len___8570);
     { 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___195022 + s.arg2);
+    r0 = (s.len___8570 + s.arg2);
     s.arg2 = (r0);
   case 8:
   case 9:
   case 10:
-    r0 = (s.arg2 > s.len___195022);
+    r0 = (s.arg2 > s.len___8570);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.arg2 = (s.len___195022);
+    s.arg2 = (s.len___8570);
   case 11:
   case 12:
-    s.i___195056 = (s.arg1);
+    s.i___8604 = (s.arg1);
   case 13:
-    r0 = (s.i___195056 < s.arg2);
+    r0 = (s.i___8604 < s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_1 = r0 = s.res___195020;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___195056);
+    s.tmp_1 = r0 = s.res___8568;
+    r0 = pxsim_Array__getAt(s.arg0, s.i___8604);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___195056 + 1);
-    s.i___195056 = (r0);
+    r0 = (s.i___8604 + 1);
+    s.i___8604 = (r0);
     { step = 13; continue; }
   case 14:
-    r0 = s.res___195020;
+    r0 = s.res___8568;
   case 15:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySlice__P185329.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__P112.info = {"start":8909,"length":690,"line":299,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySlice","argumentNames":["arr","start","end"]}
 
-function helpers_arraySlice__P185329_mk(s) {
+function helpers_arraySlice__P112_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySlice__P185329, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySlice__P112, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  res___195020: undefined,
-  len___195022: undefined,
-  i___195056: undefined,
+  res___8568: undefined,
+  len___8570: undefined,
+  i___8604: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -22528,7 +22618,7 @@ function helpers_arraySlice__P185329_mk(s) {
 
 
 
-function particles_updateParticles__P189923(s) {
+function particles_updateParticles__P4707(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22538,16 +22628,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___195842 = undefined;
-    s.time___195849 = undefined;
-    s.dt___195852 = undefined;
-    s.i___195858 = undefined;
-    s.tmp_0 = particles_particleSources__P189928_mk(s);
-    s.callLocIdx = 1548; s.pc = 6; return s.tmp_0;
+    s.sources___9725 = undefined;
+    s.time___9732 = undefined;
+    s.dt___9735 = undefined;
+    s.i___9741 = undefined;
+    s.tmp_0 = particles_particleSources__P4712_mk(s);
+    s.callLocIdx = 1555; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.sources___195842 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___195842);
+    s.sources___9725 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___9725);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -22556,34 +22646,34 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_2 = particles_sortSources__P189925_mk(s);
-    s.tmp_2.arg0 = s.sources___195842;
-    s.callLocIdx = 1549; s.pc = 7; return s.tmp_2;
+    s.tmp_2 = particles_sortSources__P4709_mk(s);
+    s.tmp_2.arg0 = s.sources___9725;
+    s.callLocIdx = 1556; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     r0 = pxsim.control.millis();
-    s.time___195849 = (r0);
-    r0 = (s.time___195849 - globals.lastUpdate___189917);
-    s.dt___195852 = (r0);
-    globals.lastUpdate___189917 = (s.time___195849);
-    s.i___195858 = (0);
+    s.time___9732 = (r0);
+    r0 = (s.time___9732 - globals.lastUpdate___4701);
+    s.dt___9735 = (r0);
+    globals.lastUpdate___4701 = (s.time___9732);
+    s.i___9741 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___195858;
-    r0 = pxsim_Array__length(s.sources___195842);
+    s.tmp_1 = r0 = s.i___9741;
+    r0 = pxsim_Array__length(s.sources___9725);
     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__P187902_mk(s);
-    r0 = pxsim_Array__getAt(s.sources___195842, s.i___195858);
+    s.tmp_3 = particles_ParticleSource__update__P2685_mk(s);
+    r0 = pxsim_Array__getAt(s.sources___9725, s.i___9741);
     s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = s.dt___195852;
-    s.callLocIdx = 1550; s.pc = 8; return s.tmp_3;
+    s.tmp_3.arg1 = s.dt___9735;
+    s.callLocIdx = 1557; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
-    r0 = (s.i___195858 + 1);
-    s.i___195858 = (r0);
+    r0 = (s.i___9741 + 1);
+    s.i___9741 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -22591,28 +22681,28 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_updateParticles__P189923.info = {"start":9501,"length":340,"line":312,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"updateParticles","argumentNames":[]}
+particles_updateParticles__P4707.info = {"start":9501,"length":340,"line":312,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"updateParticles","argumentNames":[]}
 
-function particles_updateParticles__P189923_mk(s) {
+function particles_updateParticles__P4707_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_updateParticles__P189923, depth: s.depth + 1,
+        parent: s, fn: particles_updateParticles__P4707, 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___195842: undefined,
-  time___195849: undefined,
-  dt___195852: undefined,
-  i___195858: undefined,
+  sources___9725: undefined,
+  time___9732: undefined,
+  dt___9735: undefined,
+  i___9741: undefined,
 } }
 
 
 
 
 
-function particles_ParticleSource__update__P187902(s) {
+function particles_ParticleSource__update__P2685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22622,16 +22712,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___195921 = undefined;
-    s.current___195940 = undefined;
-    s.fixedDt___195948 = undefined;
+    s.p___9804 = undefined;
+    s.current___9823 = undefined;
+    s.fixedDt___9831 = 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__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["timer"];
     s.tmp_2 = r0;
@@ -22657,9 +22747,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__P187909_mk(s);
+    s.tmp_0 = particles_ParticleSource_destroy__P2692_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1521; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1528; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
   case 1:
@@ -22682,7 +22772,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 = 1522; s.pc = 29; return s.tmp_2; }
+     else { s.callLocIdx = 1529; s.pc = 29; return s.tmp_2; }
     }
   case 29:
     r0 = s.retval;
@@ -22705,7 +22795,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 = 1523; s.pc = 30; return s.tmp_5; }
+     else { s.callLocIdx = 1530; s.pc = 30; return s.tmp_5; }
     }
   case 30:
     r0 = s.retval;
@@ -22730,9 +22820,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 13; continue; }
   case 12:
-    s.tmp_2 = particles_ParticleSource_enabled__P187907_mk(s);
+    s.tmp_2 = particles_ParticleSource_enabled__P2690_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1524; s.pc = 31; return s.tmp_2;
+    s.callLocIdx = 1531; s.pc = 31; return s.tmp_2;
   case 31:
     r0 = s.retval;
   case 13:
@@ -22748,18 +22838,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__C187931_v0_2_mk(s);
+    s.tmp_0 = particles_ParticleFactory__C2714_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__C187931_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C2714_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___195921 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.p___195921);
+    s.p___9804 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.p___9804);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -22770,8 +22860,8 @@ switch (step) {
   case 15:
     r0 = s.arg0.fields["head"];
     s.tmp_2 = r0;
-    r0 = (s.p___195921).fields["next"] = (s.tmp_2);
-    r0 = (s.arg0).fields["head"] = (s.p___195921);
+    r0 = (s.p___9804).fields["next"] = (s.tmp_2);
+    r0 = (s.arg0).fields["head"] = (s.p___9804);
     { step = 11; continue; }
   case 16:
     r0 = s.arg0.fields["head"];
@@ -22786,7 +22876,7 @@ switch (step) {
   case 17:
   case 18:
     r0 = s.arg0.fields["head"];
-    s.current___195940 = (r0);
+    s.current___9823 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["_dt"];
     s.tmp_2 = r0;
@@ -22798,36 +22888,36 @@ switch (step) {
     r0 = (s.tmp_0 * 256);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 | 0);
-    s.fixedDt___195948 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.fixedDt___195948);
+    s.fixedDt___9831 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.fixedDt___9831);
     if (!r0) { step = 23; continue; }
   case 19:
-    r0 = s.current___195940.fields["lifespan"];
+    r0 = s.current___9823.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___195940;
+    s.tmp_2 = r0 = s.current___9823;
     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__C187895_v4_3_mk(s);
+    s.tmp_0 = particles_ParticleSource__C2678_v4_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.current___195940;
-    s.tmp_0.arg2 = s.fixedDt___195948;
-    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleSource__C187895_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0.arg1 = s.current___9823;
+    s.tmp_0.arg2 = s.fixedDt___9831;
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleSource__C2678_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___195940.fields["next"];
+    r0 = s.current___9823.fields["next"];
     s.tmp_0 = r0;
-    s.current___195940 = (r0);
+    s.current___9823 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
     { step = 19; continue; }
@@ -22836,15 +22926,15 @@ switch (step) {
     { step = 26; continue; }
   case 23:
   case 24:
-    s.tmp_0 = r0 = s.current___195940;
+    s.tmp_0 = r0 = s.current___9823;
     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___195940.fields["next"];
+    r0 = s.current___9823.fields["next"];
     s.tmp_0 = r0;
-    s.current___195940 = (r0);
+    s.current___9823 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 25; continue; }
     { step = 24; continue; }
@@ -22855,12 +22945,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource__update__P187902.info = {"start":3677,"length":1400,"line":123,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"_update","argumentNames":["this","dt"]}
+particles_ParticleSource__update__P2685.info = {"start":3677,"length":1400,"line":123,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"_update","argumentNames":["this","dt"]}
 
-function particles_ParticleSource__update__P187902_mk(s) {
+function particles_ParticleSource__update__P2685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource__update__P187902, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource__update__P2685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22870,9 +22960,9 @@ function particles_ParticleSource__update__P187902_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  p___195921: undefined,
-  current___195940: undefined,
-  fixedDt___195948: undefined,
+  p___9804: undefined,
+  current___9823: undefined,
+  fixedDt___9831: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -22881,7 +22971,7 @@ function particles_ParticleSource__update__P187902_mk(s) {
 
 
 
-function particles_ParticleSource_updateParticle__P189919(s) {
+function particles_ParticleSource_updateParticle__P4703(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22898,7 +22988,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     r0 = (s.arg2 >> 10);
     s.arg2 = (r0);
     s.tmp_0 = r0 = s.arg1;
@@ -22953,12 +23043,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_updateParticle__P189919.info = {"start":8231,"length":357,"line":276,"column":8,"endLine":284,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"updateParticle","argumentNames":["this","p","fixedDt"]}
+particles_ParticleSource_updateParticle__P4703.info = {"start":8231,"length":357,"line":276,"column":8,"endLine":284,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"updateParticle","argumentNames":["this","p","fixedDt"]}
 
-function particles_ParticleSource_updateParticle__P189919_mk(s) {
+function particles_ParticleSource_updateParticle__P4703_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_updateParticle__P189919, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_updateParticle__P4703, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -22975,7 +23065,7 @@ function particles_ParticleSource_updateParticle__P189919_mk(s) {
 
 
 
-function Fx_rightShift__P185381(s) {
+function Fx_rightShift__P164(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -22994,12 +23084,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_rightShift__P185381.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__P164.info = {"start":2031,"length":108,"line":65,"column":4,"endLine":67,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"rightShift","argumentNames":["a","n"]}
 
-function Fx_rightShift__P185381_mk(s) {
+function Fx_rightShift__P164_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_rightShift__P185381, depth: s.depth + 1,
+        parent: s, fn: Fx_rightShift__P164, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23009,7 +23099,7 @@ function Fx_rightShift__P185381_mk(s) {
 
 
 
-function Fx_mul__P185372(s) {
+function Fx_mul__P155(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23030,12 +23120,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_mul__P185372.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__P155.info = {"start":872,"length":133,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"mul","argumentNames":["a","b"]}
 
-function Fx_mul__P185372_mk(s) {
+function Fx_mul__P155_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_mul__P185372, depth: s.depth + 1,
+        parent: s, fn: Fx_mul__P155, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -23046,7 +23136,7 @@ function Fx_mul__P185372_mk(s) {
 
 
 
-function Fx_add__P185369(s) {
+function Fx_add__P152(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23065,12 +23155,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_add__P185369.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__P152.info = {"start":511,"length":118,"line":20,"column":4,"endLine":22,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"add","argumentNames":["a","b"]}
 
-function Fx_add__P185369_mk(s) {
+function Fx_add__P152_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_add__P185369, depth: s.depth + 1,
+        parent: s, fn: Fx_add__P152, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23080,7 +23170,7 @@ function Fx_add__P185369_mk(s) {
 
 
 
-function particles_ParticleFactory_createParticle__P187933(s) {
+function particles_ParticleFactory_createParticle__P2716(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23090,17 +23180,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___196045 = undefined;
+    s.p___9928 = 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__C187931_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(particles_Particle__C187876_VT);
-    s.p___196045 = (r0);
-    s.tmp_0 = r0 = s.p___196045;
+    if (!checkSubtype(r0, particles_ParticleFactory__C2714_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_Particle__C2659_VT);
+    s.p___9928 = (r0);
+    s.tmp_0 = r0 = s.p___9928;
     s.tmp_3 = if_x_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -23109,7 +23199,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 = 1575; s.pc = 1; return s.tmp_3; }
+     else { s.callLocIdx = 1582; s.pc = 1; return s.tmp_3; }
     }
   case 1:
     r0 = s.retval;
@@ -23119,7 +23209,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___196045;
+    s.tmp_0 = r0 = s.p___9928;
     s.tmp_3 = if_y_1_mk(s);
     s.tmp_3.arg0 = s.arg1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -23128,7 +23218,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 = 1577; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 1584; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
@@ -23138,26 +23228,26 @@ switch (step) {
     r0 = (s.tmp_4 | 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    r0 = (s.p___196045).fields["vx"] = (0);
-    r0 = (s.p___196045).fields["vy"] = (0);
-    r0 = (s.p___196045).fields["lifespan"] = (500);
-    r0 = s.p___196045;
+    r0 = (s.p___9928).fields["vx"] = (0);
+    r0 = (s.p___9928).fields["vy"] = (0);
+    r0 = (s.p___9928).fields["lifespan"] = (500);
+    r0 = s.p___9928;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_createParticle__P187933.info = {"start":1822,"length":282,"line":67,"column":8,"endLine":77,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_ParticleFactory_createParticle__P2716.info = {"start":1822,"length":282,"line":67,"column":8,"endLine":77,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_ParticleFactory_createParticle__P187933_mk(s) {
+function particles_ParticleFactory_createParticle__P2716_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_createParticle__P187933, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_createParticle__P2716, 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___196045: undefined,
+  p___9928: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -23166,7 +23256,7 @@ function particles_ParticleFactory_createParticle__P187933_mk(s) {
 
 
 
-function game_onUpdateInterval__P187761(s) {
+function game_onUpdateInterval__P2544(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23176,15 +23266,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.timer___195825 = undefined;
+    s.timer___9708 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P189572_mk(s);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1204; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1211; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg1);
@@ -23206,22 +23296,22 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_pxtrt.mklocRef();
-    s.timer___195825 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.timer___195825, 0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P195829);
+    s.timer___9708 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.timer___9708, 0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P9712);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.timer___195825);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.timer___9708);
     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__P185609_mk(s);
-    s.tmp_2 = game_eventContext__P187752_mk(s);
-    s.callLocIdx = 1205; s.pc = 8; return s.tmp_2;
+    s.tmp_1 = control_EventContext_registerFrameHandler__P392_mk(s);
+    s.tmp_2 = game_eventContext__P2535_mk(s);
+    s.callLocIdx = 1212; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 19;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1209; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1216; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
   case 5:
@@ -23229,17 +23319,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onUpdateInterval__P187761.info = {"start":7929,"length":417,"line":256,"column":4,"endLine":267,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onUpdateInterval","argumentNames":["period","a"]}
+game_onUpdateInterval__P2544.info = {"start":7929,"length":417,"line":256,"column":4,"endLine":267,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onUpdateInterval","argumentNames":["period","a"]}
 
-function game_onUpdateInterval__P187761_mk(s) {
+function game_onUpdateInterval__P2544_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onUpdateInterval__P187761, depth: s.depth + 1,
+        parent: s, fn: game_onUpdateInterval__P2544, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  timer___195825: undefined,
+  timer___9708: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -23248,7 +23338,7 @@ function game_onUpdateInterval__P187761_mk(s) {
 
 
 
-function inline__P195829(s) {
+function inline__P9712(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23258,28 +23348,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.time___195830 = undefined;
-    s.tmp_1 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1206; s.pc = 3; return s.tmp_1;
+    s.time___9713 = undefined;
+    s.tmp_1 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1213; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["_millis"];
-    s.time___195830 = (r0);
+    s.time___9713 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.time___195830);
+    r0 = (s.tmp_1 <= s.time___9713);
     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___195830 + s.caps[1]);
+    r0 = (s.time___9713 + 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 = 1208; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1215; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -23288,25 +23378,25 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195829.info = {"start":8159,"length":179,"line":260,"column":81,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
+inline__P9712.info = {"start":8159,"length":179,"line":260,"column":81,"endLine":266,"endColumn":9,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195829_mk(s) {
+function inline__P9712_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195829, depth: s.depth + 1,
+        parent: s, fn: inline__P9712, 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___195830: undefined,
+  time___9713: undefined,
 } }
 
 
 
 
 
-function particles_SprayFactory_constructor__P187936(s) {
+function particles_SprayFactory_constructor__P2719(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23324,35 +23414,35 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C187935_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
     r0 = undefined;
-    s.tmp_0 = particles_initTrig__P189943_mk(s);
-    s.callLocIdx = 1582; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = particles_initTrig__P4727_mk(s);
+    s.callLocIdx = 1589; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = particles_SprayFactory_setSpeed__P187939_mk(s);
+    s.tmp_0 = particles_SprayFactory_setSpeed__P2722_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1583; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1590; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = particles_SprayFactory_setDirection__P187940_mk(s);
+    s.tmp_0 = particles_SprayFactory_setDirection__P2723_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
     s.tmp_0.arg2 = s.arg3;
-    s.callLocIdx = 1584; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1591; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_constructor__P187936.info = {"start":2623,"length":218,"line":98,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","speed","centerDegrees","arcDegrees"]}
+particles_SprayFactory_constructor__P2719.info = {"start":2623,"length":218,"line":98,"column":8,"endLine":103,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","speed","centerDegrees","arcDegrees"]}
 
-function particles_SprayFactory_constructor__P187936_mk(s) {
+function particles_SprayFactory_constructor__P2719_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_constructor__P187936, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_constructor__P2719, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -23365,7 +23455,7 @@ function particles_SprayFactory_constructor__P187936_mk(s) {
 
 
 
-function particles_initTrig__P189943(s) {
+function particles_initTrig__P4727(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23375,36 +23465,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.cachedSin___189929);
+    r0 = pxsim_numops_toBoolDecr(globals.cachedSin___4713);
     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__P187929_mk(s);
+    s.tmp_2 = particles_cacheSin__P2712_mk(s);
     s.tmp_2.arg0 = 100;
-    s.callLocIdx = 1570; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1577; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    globals.cachedSin___189929 = (r0);
-    s.tmp_0 = particles_cacheCos__P187930_mk(s);
+    globals.cachedSin___4713 = (r0);
+    s.tmp_0 = particles_cacheCos__P2713_mk(s);
     s.tmp_0.arg0 = 100;
-    s.callLocIdx = 1571; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1578; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    globals.cachedCos___189930 = (r0);
+    globals.cachedCos___4714 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_initTrig__P189943.info = {"start":291,"length":155,"line":11,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"initTrig","argumentNames":[]}
+particles_initTrig__P4727.info = {"start":291,"length":155,"line":11,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"initTrig","argumentNames":[]}
 
-function particles_initTrig__P189943_mk(s) {
+function particles_initTrig__P4727_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_initTrig__P189943, depth: s.depth + 1,
+        parent: s, fn: particles_initTrig__P4727, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23415,7 +23505,7 @@ function particles_initTrig__P189943_mk(s) {
 
 
 
-function particles_cacheCos__P187930(s) {
+function particles_cacheCos__P2713(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23425,25 +23515,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cos___195563 = undefined;
-    s.anglePerSlice___195565 = undefined;
-    s.i___195571 = undefined;
+    s.cos___9446 = undefined;
+    s.anglePerSlice___9448 = undefined;
+    s.i___9454 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.cos___195563 = (r0);
+    s.cos___9446 = (r0);
     r0 = (6.283185307179586 / s.arg0);
-    s.anglePerSlice___195565 = (r0);
-    s.i___195571 = (0);
+    s.anglePerSlice___9448 = (r0);
+    s.i___9454 = (0);
   case 1:
-    r0 = (s.i___195571 < s.arg0);
+    r0 = (s.i___9454 < s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.cos___195563;
-    r0 = (s.i___195571 * s.anglePerSlice___195565);
+    s.tmp_1 = r0 = s.cos___9446;
+    r0 = (s.i___9454 * s.anglePerSlice___9448);
     s.tmp_4 = r0;
     r0 = pxsim.Math_.cos(s.tmp_4);
     s.tmp_3 = r0;
@@ -23452,20 +23542,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___195571 + 1);
-    s.i___195571 = (r0);
+    r0 = (s.i___9454 + 1);
+    s.i___9454 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.cos___195563;
+    r0 = s.cos___9446;
     return leave(s, r0)
   default: oops()
 } } }
-particles_cacheCos__P187930.info = {"start":1005,"length":263,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"cacheCos","argumentNames":["slices"]}
+particles_cacheCos__P2713.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__P187930_mk(s) {
+function particles_cacheCos__P2713_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_cacheCos__P187930, depth: s.depth + 1,
+        parent: s, fn: particles_cacheCos__P2713, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23473,9 +23563,9 @@ function particles_cacheCos__P187930_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  cos___195563: undefined,
-  anglePerSlice___195565: undefined,
-  i___195571: undefined,
+  cos___9446: undefined,
+  anglePerSlice___9448: undefined,
+  i___9454: undefined,
   arg0: undefined,
 } }
 
@@ -23483,7 +23573,7 @@ function particles_cacheCos__P187930_mk(s) {
 
 
 
-function particles_cacheSin__P187929(s) {
+function particles_cacheSin__P2712(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23493,25 +23583,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sin___195589 = undefined;
-    s.anglePerSlice___195591 = undefined;
-    s.i___195597 = undefined;
+    s.sin___9472 = undefined;
+    s.anglePerSlice___9474 = undefined;
+    s.i___9480 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.sin___195589 = (r0);
+    s.sin___9472 = (r0);
     r0 = (6.283185307179586 / s.arg0);
-    s.anglePerSlice___195591 = (r0);
-    s.i___195597 = (0);
+    s.anglePerSlice___9474 = (r0);
+    s.i___9480 = (0);
   case 1:
-    r0 = (s.i___195597 < s.arg0);
+    r0 = (s.i___9480 < s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.sin___195589;
-    r0 = (s.i___195597 * s.anglePerSlice___195591);
+    s.tmp_1 = r0 = s.sin___9472;
+    r0 = (s.i___9480 * s.anglePerSlice___9474);
     s.tmp_4 = r0;
     r0 = pxsim.Math_.sin(s.tmp_4);
     s.tmp_3 = r0;
@@ -23520,20 +23610,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___195597 + 1);
-    s.i___195597 = (r0);
+    r0 = (s.i___9480 + 1);
+    s.i___9480 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.sin___195589;
+    r0 = s.sin___9472;
     return leave(s, r0)
   default: oops()
 } } }
-particles_cacheSin__P187929.info = {"start":594,"length":263,"line":22,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"cacheSin","argumentNames":["slices"]}
+particles_cacheSin__P2712.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__P187929_mk(s) {
+function particles_cacheSin__P2712_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_cacheSin__P187929, depth: s.depth + 1,
+        parent: s, fn: particles_cacheSin__P2712, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23541,9 +23631,9 @@ function particles_cacheSin__P187929_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  sin___195589: undefined,
-  anglePerSlice___195591: undefined,
-  i___195597: undefined,
+  sin___9472: undefined,
+  anglePerSlice___9474: undefined,
+  i___9480: undefined,
   arg0: undefined,
 } }
 
@@ -23551,7 +23641,7 @@ function particles_cacheSin__P187929_mk(s) {
 
 
 
-function particles_SprayFactory_setDirection__P187940(s) {
+function particles_SprayFactory_setDirection__P2723(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23568,31 +23658,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C187935_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_4 = particles_toRadians__P189948_mk(s);
+    s.tmp_4 = particles_toRadians__P4732_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 = 1592; s.pc = 1; return s.tmp_4;
+    s.callLocIdx = 1599; s.pc = 1; return s.tmp_4;
   case 1:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / globals.angleSlice___189942);
+    r0 = (s.tmp_3 / globals.angleSlice___4726);
     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__P189948_mk(s);
+    s.tmp_4 = particles_toRadians__P4732_mk(s);
     s.tmp_4.arg0 = s.arg2;
-    s.callLocIdx = 1593; s.pc = 2; return s.tmp_4;
+    s.callLocIdx = 1600; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / globals.angleSlice___189942);
+    r0 = (s.tmp_3 / globals.angleSlice___4726);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 | 0);
     s.tmp_1 = r0;
@@ -23601,12 +23691,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_setDirection__P187940.info = {"start":3424,"length":228,"line":123,"column":8,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"setDirection","argumentNames":["this","centerDegrees","arcDegrees"]}
+particles_SprayFactory_setDirection__P2723.info = {"start":3424,"length":228,"line":123,"column":8,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"setDirection","argumentNames":["this","centerDegrees","arcDegrees"]}
 
-function particles_SprayFactory_setDirection__P187940_mk(s) {
+function particles_SprayFactory_setDirection__P2723_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_setDirection__P187940, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_setDirection__P2723, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23624,7 +23714,7 @@ function particles_SprayFactory_setDirection__P187940_mk(s) {
 
 
 
-function particles_toRadians__P189948(s) {
+function particles_toRadians__P4732(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23642,9 +23732,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_3 = Math_abs__P185340_mk(s);
+    s.tmp_3 = Math_abs__P123_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1574; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 1581; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -23661,12 +23751,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_toRadians__P189948.info = {"start":1307,"length":206,"line":45,"column":4,"endLine":52,"endColumn":5,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"toRadians","argumentNames":["degrees"]}
+particles_toRadians__P4732.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__P189948_mk(s) {
+function particles_toRadians__P4732_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_toRadians__P189948, depth: s.depth + 1,
+        parent: s, fn: particles_toRadians__P4732, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23679,7 +23769,7 @@ function particles_toRadians__P189948_mk(s) {
 
 
 
-function particles_ParticleFactory_constructor__P187932(s) {
+function particles_ParticleFactory_constructor__P2715(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23694,17 +23784,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleFactory__C187931_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleFactory__C2714_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_constructor__P187932.info = {"start":1617,"length":78,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this"]}
+particles_ParticleFactory_constructor__P2715.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__P187932_mk(s) {
+function particles_ParticleFactory_constructor__P2715_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_constructor__P187932, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_constructor__P2715, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -23713,7 +23803,7 @@ function particles_ParticleFactory_constructor__P187932_mk(s) {
 
 
 
-function particles_ParticleSource_setFactory__P187914(s) {
+function particles_ParticleSource_setFactory__P2697(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23729,7 +23819,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["_factory"] = (s.arg1);
@@ -23739,12 +23829,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setFactory__P187914.info = {"start":8107,"length":114,"line":271,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setFactory","argumentNames":["this","factory"]}
+particles_ParticleSource_setFactory__P2697.info = {"start":8107,"length":114,"line":271,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setFactory","argumentNames":["this","factory"]}
 
-function particles_ParticleSource_setFactory__P187914_mk(s) {
+function particles_ParticleSource_setFactory__P2697_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setFactory__P187914, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setFactory__P2697, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23754,7 +23844,7 @@ function particles_ParticleSource_setFactory__P187914_mk(s) {
 
 
 
-function particles_ParticleSource_setRate__P187912(s) {
+function particles_ParticleSource_setRate__P2695(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23770,7 +23860,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (1000 / s.arg1);
     s.tmp_2 = r0;
@@ -23782,12 +23872,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setRate__P187912.info = {"start":7785,"length":139,"line":258,"column":8,"endLine":261,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRate","argumentNames":["this","particlesPerSecond"]}
+particles_ParticleSource_setRate__P2695.info = {"start":7785,"length":139,"line":258,"column":8,"endLine":261,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRate","argumentNames":["this","particlesPerSecond"]}
 
-function particles_ParticleSource_setRate__P187912_mk(s) {
+function particles_ParticleSource_setRate__P2695_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setRate__P187912, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setRate__P2695, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23800,7 +23890,7 @@ function particles_ParticleSource_setRate__P187912_mk(s) {
 
 
 
-function particles_ParticleSource_setAnchor__P187911(s) {
+function particles_ParticleSource_setAnchor__P2694(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23816,18 +23906,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     r0 = (s.arg0).fields["anchor"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setAnchor__P187911.info = {"start":7577,"length":79,"line":250,"column":8,"endLine":252,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setAnchor","argumentNames":["this","anchor"]}
+particles_ParticleSource_setAnchor__P2694.info = {"start":7577,"length":79,"line":250,"column":8,"endLine":252,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setAnchor","argumentNames":["this","anchor"]}
 
-function particles_ParticleSource_setAnchor__P187911_mk(s) {
+function particles_ParticleSource_setAnchor__P2694_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setAnchor__P187911, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setAnchor__P2694, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -23837,7 +23927,7 @@ function particles_ParticleSource_setAnchor__P187911_mk(s) {
 
 
 
-function particles_ParticleSource_clear__P187910(s) {
+function particles_ParticleSource_clear__P2693(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23852,18 +23942,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     r0 = (s.arg0).fields["head"] = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_clear__P187910.info = {"start":7407,"length":54,"line":242,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"clear","argumentNames":["this"]}
+particles_ParticleSource_clear__P2693.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__P187910_mk(s) {
+function particles_ParticleSource_clear__P2693_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_clear__P187910, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_clear__P2693, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -23872,7 +23962,7 @@ function particles_ParticleSource_clear__P187910_mk(s) {
 
 
 
-function particles_ParticleSource_destroy__P187909(s) {
+function particles_ParticleSource_destroy__P2692(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23887,11 +23977,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleSource_enabled__P187908_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1531; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1538; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -23900,21 +23990,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__P187903_mk(s);
+    s.tmp_0 = particles_ParticleSource__prune__P2686_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1532; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1539; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_destroy__P187909.info = {"start":7077,"length":240,"line":232,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"destroy","argumentNames":["this"]}
+particles_ParticleSource_destroy__P2692.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__P187909_mk(s) {
+function particles_ParticleSource_destroy__P2692_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_destroy__P187909, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_destroy__P2692, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23926,7 +24016,7 @@ function particles_ParticleSource_destroy__P187909_mk(s) {
 
 
 
-function particles_ParticleSource_enabled__P187908(s) {
+function particles_ParticleSource_enabled__P2691(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -23942,11 +24032,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = particles_ParticleSource_enabled__P187907_mk(s);
+    s.tmp_3 = particles_ParticleSource_enabled__P2690_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1530; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1537; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -23975,12 +24065,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_enabled__P187908.info = {"start":6799,"length":214,"line":222,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"enabled","argumentNames":["this","v"]}
+particles_ParticleSource_enabled__P2691.info = {"start":6799,"length":214,"line":222,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"enabled","argumentNames":["this","v"]}
 
-function particles_ParticleSource_enabled__P187908_mk(s) {
+function particles_ParticleSource_enabled__P2691_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_enabled__P187908, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_enabled__P2691, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -23997,7 +24087,7 @@ function particles_ParticleSource_enabled__P187908_mk(s) {
 
 
 
-function particles_ParticleSource_enabled__P187907(s) {
+function particles_ParticleSource_enabled__P2690(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24012,7 +24102,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 & 1);
@@ -24027,13 +24117,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_enabled__P187907.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__P187907.isGetter = true;
+particles_ParticleSource_enabled__P2690.info = {"start":6605,"length":76,"line":215,"column":8,"endLine":217,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"enabled","argumentNames":["this"]}
+particles_ParticleSource_enabled__P2690.isGetter = true;
 
-function particles_ParticleSource_enabled__P187907_mk(s) {
+function particles_ParticleSource_enabled__P2690_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_enabled__P187907, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_enabled__P2690, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24047,7 +24137,7 @@ function particles_ParticleSource_enabled__P187907_mk(s) {
 
 
 
-function particles_ParticleSource_setAcceleration__P187904(s) {
+function particles_ParticleSource_setAcceleration__P2687(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24064,7 +24154,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -24081,12 +24171,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setAcceleration__P187904.info = {"start":6009,"length":113,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setAcceleration","argumentNames":["this","ax","ay"]}
+particles_ParticleSource_setAcceleration__P2687.info = {"start":6009,"length":113,"line":193,"column":8,"endLine":196,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setAcceleration","argumentNames":["this","ax","ay"]}
 
-function particles_ParticleSource_setAcceleration__P187904_mk(s) {
+function particles_ParticleSource_setAcceleration__P2687_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setAcceleration__P187904, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setAcceleration__P2687, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24100,7 +24190,7 @@ function particles_ParticleSource_setAcceleration__P187904_mk(s) {
 
 
 
-function helpers_arrayShift__P185317(s) {
+function helpers_arrayShift__P100(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24118,12 +24208,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayShift__P185317.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__P100.info = {"start":4045,"length":82,"line":153,"column":4,"endLine":155,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayShift","argumentNames":["arr"]}
 
-function helpers_arrayShift__P185317_mk(s) {
+function helpers_arrayShift__P100_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayShift__P185317, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayShift__P100, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -24132,7 +24222,7 @@ function helpers_arrayShift__P185317_mk(s) {
 
 
 
-function particles_SprayFactory_setSpeed__P187939(s) {
+function particles_SprayFactory_setSpeed__P2722(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24148,7 +24238,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C187935_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -24159,12 +24249,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_setSpeed__P187939.info = {"start":3322,"length":92,"line":119,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"setSpeed","argumentNames":["this","pixelsPerSecond"]}
+particles_SprayFactory_setSpeed__P2722.info = {"start":3322,"length":92,"line":119,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"setSpeed","argumentNames":["this","pixelsPerSecond"]}
 
-function particles_SprayFactory_setSpeed__P187939_mk(s) {
+function particles_SprayFactory_setSpeed__P2722_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_setSpeed__P187939, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_setSpeed__P2722, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24177,7 +24267,7 @@ function particles_SprayFactory_setSpeed__P187939_mk(s) {
 
 
 
-function particles_ConfettiFactory_constructor__P187963(s) {
+function particles_ConfettiFactory_constructor__P2746(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24187,8 +24277,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.confetti___196077 = undefined;
-    s.i___196093 = undefined;
+    s.confetti___9998 = undefined;
+    s.i___10014 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -24196,52 +24286,52 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ConfettiFactory__C187962_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ConfettiFactory__C2745_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex196080);
+    r0 = pxsim.image.ofBuffer(_hex10001);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    r0 = pxsim.image.ofBuffer(_hex196082);
+    r0 = pxsim.image.ofBuffer(_hex10003);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_2);
-    r0 = pxsim.image.ofBuffer(_hex196084);
+    r0 = pxsim.image.ofBuffer(_hex10005);
     s.tmp_3 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_3);
-    r0 = pxsim.image.ofBuffer(_hex196086);
+    r0 = pxsim.image.ofBuffer(_hex10007);
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_4);
-    r0 = pxsim.image.ofBuffer(_hex196088);
+    r0 = pxsim.image.ofBuffer(_hex10009);
     s.tmp_5 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_5);
-    s.confetti___196077 = (s.tmp_0);
-    s.tmp_0 = particles_ShapeFactory_constructor__P187958_mk(s);
+    s.confetti___9998 = (s.tmp_0);
+    s.tmp_0 = particles_ShapeFactory_constructor__P2741_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___196077, 0);
+    r0 = pxsim_Array__getAt(s.confetti___9998, 0);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1616; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1623; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.i___196093 = (1);
+    s.i___10014 = (1);
   case 1:
-    s.tmp_1 = r0 = s.i___196093;
-    r0 = pxsim_Array__length(s.confetti___196077);
+    s.tmp_1 = r0 = s.i___10014;
+    r0 = pxsim_Array__length(s.confetti___9998);
     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__P187959_mk(s);
+    s.tmp_3 = particles_ShapeFactory_addShape__P2742_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    r0 = pxsim_Array__getAt(s.confetti___196077, s.i___196093);
+    r0 = pxsim_Array__getAt(s.confetti___9998, s.i___10014);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 1617; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1624; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
-    r0 = (s.i___196093 + 1);
-    s.i___196093 = (r0);
+    r0 = (s.i___10014 + 1);
+    s.i___10014 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = (s.arg0).fields["minLifespan"] = (1000);
@@ -24250,12 +24340,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ConfettiFactory_constructor__P187963.info = {"start":7755,"length":706,"line":247,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange"]}
+particles_ConfettiFactory_constructor__P2746.info = {"start":7755,"length":706,"line":247,"column":8,"endLine":274,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange"]}
 
-function particles_ConfettiFactory_constructor__P187963_mk(s) {
+function particles_ConfettiFactory_constructor__P2746_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ConfettiFactory_constructor__P187963, depth: s.depth + 1,
+        parent: s, fn: particles_ConfettiFactory_constructor__P2746, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24263,23 +24353,23 @@ function particles_ConfettiFactory_constructor__P187963_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  confetti___196077: undefined,
-  i___196093: undefined,
+  confetti___9998: undefined,
+  i___10014: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
 } }
 
-const _hex196080 = pxsim.BufferMethods.createBufferFromHex("87040100010000000f000000")
-const _hex196082 = pxsim.BufferMethods.createBufferFromHex("8704010002000000ff000000")
-const _hex196084 = pxsim.BufferMethods.createBufferFromHex("87040200010000000f0000000f000000")
-const _hex196086 = pxsim.BufferMethods.createBufferFromHex("8704020002000000ff0000000f000000")
-const _hex196088 = pxsim.BufferMethods.createBufferFromHex("87040200020000000f000000ff000000")
+const _hex10001 = pxsim.BufferMethods.createBufferFromHex("87040100010000000f000000")
+const _hex10003 = pxsim.BufferMethods.createBufferFromHex("8704010002000000ff000000")
+const _hex10005 = pxsim.BufferMethods.createBufferFromHex("87040200010000000f0000000f000000")
+const _hex10007 = pxsim.BufferMethods.createBufferFromHex("8704020002000000ff0000000f000000")
+const _hex10009 = pxsim.BufferMethods.createBufferFromHex("87040200020000000f000000ff000000")
 
 
 
 
-function particles_ShapeFactory_addShape__P187959(s) {
+function particles_ShapeFactory_addShape__P2742(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24295,7 +24385,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C187957_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["sources"];
@@ -24307,12 +24397,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_addShape__P187959.info = {"start":7079,"length":83,"line":225,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"addShape","argumentNames":["this","shape"]}
+particles_ShapeFactory_addShape__P2742.info = {"start":7079,"length":83,"line":225,"column":8,"endLine":227,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"addShape","argumentNames":["this","shape"]}
 
-function particles_ShapeFactory_addShape__P187959_mk(s) {
+function particles_ShapeFactory_addShape__P2742_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_addShape__P187959, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_addShape__P2742, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -24323,7 +24413,7 @@ function particles_ShapeFactory_addShape__P187959_mk(s) {
 
 
 
-function particles_ShapeFactory_constructor__P187958(s) {
+function particles_ShapeFactory_constructor__P2741(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24341,14 +24431,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C187957_VT)) failedCast(r0);
-    s.tmp_0 = particles_AreaFactory_constructor__P187946_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
+    s.tmp_0 = particles_AreaFactory_constructor__P2729_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 = 1606; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1613; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
@@ -24379,12 +24469,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_constructor__P187958.info = {"start":6668,"length":285,"line":212,"column":8,"endLine":219,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","source"]}
+particles_ShapeFactory_constructor__P2741.info = {"start":6668,"length":285,"line":212,"column":8,"endLine":219,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","source"]}
 
-function particles_ShapeFactory_constructor__P187958_mk(s) {
+function particles_ShapeFactory_constructor__P2741_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_constructor__P187958, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_constructor__P2741, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24401,7 +24491,7 @@ function particles_ShapeFactory_constructor__P187958_mk(s) {
 
 
 
-function particles_AreaFactory_constructor__P187946(s) {
+function particles_AreaFactory_constructor__P2729(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24420,13 +24510,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_AreaFactory__C187941_VT)) failedCast(r0);
-    s.tmp_0 = particles_SprayFactory_constructor__P187936_mk(s);
+    if (!checkSubtype(r0, particles_AreaFactory__C2724_VT)) failedCast(r0);
+    s.tmp_0 = particles_SprayFactory_constructor__P2719_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 = 1594; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1601; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = (s.arg0).fields["xRange"] = (s.arg1);
@@ -24451,12 +24541,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__C187803_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(Math_FastRandom__C2586_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = Math_FastRandom_constructor__P187805_mk(s);
+    s.tmp_1 = Math_FastRandom_constructor__P2588_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1595; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1602; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["galois"] = (s.tmp_0);
@@ -24464,12 +24554,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_constructor__P187946.info = {"start":3950,"length":374,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","minLifespan","maxLifespan"]}
+particles_AreaFactory_constructor__P2729.info = {"start":3950,"length":374,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"inline","argumentNames":["this","xRange","yRange","minLifespan","maxLifespan"]}
 
-function particles_AreaFactory_constructor__P187946_mk(s) {
+function particles_AreaFactory_constructor__P2729_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_constructor__P187946, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_constructor__P2729, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24484,7 +24574,7 @@ function particles_AreaFactory_constructor__P187946_mk(s) {
 
 
 
-function effects_ScreenEffect_constructor__P188011(s) {
+function effects_ScreenEffect_constructor__P2794(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24503,13 +24593,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ScreenEffect__C188010_VT)) failedCast(r0);
-    s.tmp_0 = effects_ParticleEffect_constructor__P188007_mk(s);
+    if (!checkSubtype(r0, effects_ScreenEffect__C2793_VT)) failedCast(r0);
+    s.tmp_0 = effects_ParticleEffect_constructor__P2790_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 = 1626; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1633; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["sceneDefaultRate"] = (s.arg2);
@@ -24517,12 +24607,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ScreenEffect_constructor__P188011.info = {"start":2911,"length":332,"line":81,"column":8,"endLine":85,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this","anchorDefault","sceneDefault","defaultLifespan","sourceFactory"]}
+effects_ScreenEffect_constructor__P2794.info = {"start":2911,"length":332,"line":81,"column":8,"endLine":85,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this","anchorDefault","sceneDefault","defaultLifespan","sourceFactory"]}
 
-function effects_ScreenEffect_constructor__P188011_mk(s) {
+function effects_ScreenEffect_constructor__P2794_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ScreenEffect_constructor__P188011, depth: s.depth + 1,
+        parent: s, fn: effects_ScreenEffect_constructor__P2794, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -24536,7 +24626,7 @@ function effects_ScreenEffect_constructor__P188011_mk(s) {
 
 
 
-function effects_ParticleEffect_constructor__P188007(s) {
+function effects_ParticleEffect_constructor__P2790(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24554,7 +24644,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C188006_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ParticleEffect__C2789_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sourceFactory"] = (s.arg3);
     r0 = (s.arg0).fields["defaultRate"] = (s.arg1);
     r0 = (s.arg0).fields["defaultLifespan"] = (s.arg2);
@@ -24562,12 +24652,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_constructor__P188007.info = {"start":384,"length":364,"line":13,"column":8,"endLine":18,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this","defaultParticlesPerSecond","defaultLifespan","sourceFactory"]}
+effects_ParticleEffect_constructor__P2790.info = {"start":384,"length":364,"line":13,"column":8,"endLine":18,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this","defaultParticlesPerSecond","defaultLifespan","sourceFactory"]}
 
-function effects_ParticleEffect_constructor__P188007_mk(s) {
+function effects_ParticleEffect_constructor__P2790_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_constructor__P188007, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_constructor__P2790, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -24579,7 +24669,7 @@ function effects_ParticleEffect_constructor__P188007_mk(s) {
 
 
 
-function scene_Scene_init__P187658(s) {
+function scene_Scene_init__P2441(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24594,7 +24684,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C187636_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -24602,8 +24692,8 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_1 = power_poke__P186922_mk(s);
-    s.callLocIdx = 1019; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = power_poke__P1705_mk(s);
+    s.callLocIdx = 1026; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -24611,84 +24701,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__P196212);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P10133);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P185609_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P392_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 = 1022; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1029; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = control_EventContext_registerFrameHandler__P185609_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameHandler__P392_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 13;
-    s.tmp_0.arg2 = controller__moveSprites__P187139;
-    s.callLocIdx = 1023; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg2 = controller__moveSprites__P1922;
+    s.callLocIdx = 1030; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P196235);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P10156);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P185609_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P392_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 = 1025; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1032; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P196248);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P10169);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P185609_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P392_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 = 1029; s.pc = 8; return s.tmp_1;
+    s.callLocIdx = 1036; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P196269);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P10190);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P185609_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P392_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 = 1031; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 1038; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P196277);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P10198);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = control_EventContext_registerFrameHandler__P185609_mk(s);
+    s.tmp_1 = control_EventContext_registerFrameHandler__P392_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 = 1035; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 1042; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = control_EventContext_registerFrameHandler__P185609_mk(s);
+    s.tmp_0 = control_EventContext_registerFrameHandler__P392_mk(s);
     r0 = s.arg0.fields["eventContext"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 200;
-    s.tmp_0.arg2 = control___screen_update__P186980;
-    s.callLocIdx = 1036; s.pc = 11; return s.tmp_0;
+    s.tmp_0.arg2 = control___screen_update__P1763;
+    s.callLocIdx = 1043; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P196306);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P10227);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_1.arg0 = globals.scene_Scene_initializers___187656;
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1.arg0 = globals.scene_Scene_initializers___2439;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1038; s.pc = 12; return s.tmp_1;
+    s.callLocIdx = 1045; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
   case 3:
@@ -24696,12 +24786,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_init__P187658.info = {"start":4168,"length":2477,"line":122,"column":8,"endLine":180,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"init","argumentNames":["this"]}
+scene_Scene_init__P2441.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__P187658_mk(s) {
+function scene_Scene_init__P2441_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_init__P187658, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_init__P2441, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24712,7 +24802,7 @@ function scene_Scene_init__P187658_mk(s) {
 
 
 
-function inline__P196212(s) {
+function inline__P10133(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24731,26 +24821,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__P187167_mk(s);
+    s.tmp_0 = controller___update__P1950_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 = 1021; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1028; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196212.info = {"start":4458,"length":217,"line":129,"column":72,"endLine":133,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P10133.info = {"start":4458,"length":217,"line":129,"column":72,"endLine":133,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P196212_mk(s) {
+function inline__P10133_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196212, depth: s.depth + 1,
+        parent: s, fn: inline__P10133, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24762,7 +24852,7 @@ function inline__P196212_mk(s) {
 
 
 
-function inline__P196235(s) {
+function inline__P10156(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24772,7 +24862,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = PhysicsEngine__C187376_v4_2_mk(s);
+    s.tmp_0 = PhysicsEngine__C2159_v4_2_mk(s);
     r0 = s.caps[0].fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
     r0 = s.caps[0].fields["eventContext"];
@@ -24781,7 +24871,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 1000);
     s.tmp_0.arg1 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C187376_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_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:
@@ -24790,12 +24880,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196235.info = {"start":4970,"length":159,"line":138,"column":69,"endLine":141,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P10156.info = {"start":4970,"length":159,"line":138,"column":69,"endLine":141,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P196235_mk(s) {
+function inline__P10156_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196235, depth: s.depth + 1,
+        parent: s, fn: inline__P10156, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -24806,7 +24896,7 @@ function inline__P196235_mk(s) {
 
 
 
-function inline__P196248(s) {
+function inline__P10169(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24816,80 +24906,80 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dt___196249 = undefined;
-    s.s___196257 = undefined;
-    s.unnamed8922___U2 = undefined;
-    s.unnamed8923___U3 = undefined;
+    s.dt___10170 = undefined;
+    s.s___10178 = undefined;
+    s.unnamed114___U2 = undefined;
+    s.unnamed115___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___196249 = (r0);
-    s.tmp_0 = scene_Camera_update__P187593_mk(s);
+    s.dt___10170 = (r0);
+    s.tmp_0 = scene_Camera_update__P2376_mk(s);
     r0 = s.caps[0].fields["camera"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1027; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1034; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.s___196257 = (undefined);
+    s.s___10178 = (undefined);
     r0 = s.caps[0].fields["allSprites"];
-    s.unnamed8922___U2 = (r0);
-    s.unnamed8923___U3 = (0);
+    s.unnamed114___U2 = (r0);
+    s.unnamed115___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8923___U3;
-    r0 = pxsim_Array__length(s.unnamed8922___U2);
+    s.tmp_0 = r0 = s.unnamed115___U3;
+    r0 = pxsim_Array__length(s.unnamed114___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8922___U2, s.unnamed8923___U3);
-    s.s___196257 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed114___U2, s.unnamed115___U3);
+    s.s___10178 = (r0);
     s.tmp_2 = if___update_3_mk(s);
-    s.tmp_2.arg0 = s.s___196257;
+    s.tmp_2.arg0 = s.s___10178;
     r0 = s.caps[0].fields["camera"];
     s.tmp_2.arg1 = r0;
-    s.tmp_2.arg2 = s.dt___196249;
+    s.tmp_2.arg2 = s.dt___10170;
     if (!s.tmp_2.arg0.vtable.iface) {
       setupLambda(s.tmp_2, pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "__update"), 3);
-      s.callLocIdx = 1028; s.pc = 4; return s.tmp_2;
+      s.callLocIdx = 1035; 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 = 1028; s.pc = 4; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1028; s.pc = 4; return s.tmp_2;; }
-     else { s.callLocIdx = 1028; 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 = 1035; s.pc = 4; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1035; s.pc = 4; return s.tmp_2;; }
+     else { s.callLocIdx = 1035; s.pc = 4; return s.tmp_2; }
     }
   case 4:
     r0 = s.retval;
-    r0 = (s.unnamed8923___U3 + 1);
-    s.unnamed8923___U3 = (r0);
+    r0 = (s.unnamed115___U3 + 1);
+    s.unnamed115___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed8922___U2 = (undefined);
+    s.unnamed114___U2 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196248.info = {"start":5318,"length":214,"line":147,"column":79,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P10169.info = {"start":5318,"length":214,"line":147,"column":79,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P196248_mk(s) {
+function inline__P10169_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196248, depth: s.depth + 1,
+        parent: s, fn: inline__P10169, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  dt___196249: undefined,
-  s___196257: undefined,
-  unnamed8922___U2: undefined,
-  unnamed8923___U3: undefined,
+  dt___10170: undefined,
+  s___10178: undefined,
+  unnamed114___U2: undefined,
+  unnamed115___U3: undefined,
 } }
 
 
 
 
 
-function inline__P196269(s) {
+function inline__P10190(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24899,21 +24989,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_Scene_render__P187663_mk(s);
+    s.tmp_0 = scene_Scene_render__P2446_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1030; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1037; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196269.info = {"start":5673,"length":109,"line":158,"column":76,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P10190.info = {"start":5673,"length":109,"line":158,"column":76,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P196269_mk(s) {
+function inline__P10190_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196269, depth: s.depth + 1,
+        parent: s, fn: inline__P10190, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -24922,7 +25012,7 @@ function inline__P196269_mk(s) {
 
 
 
-function inline__P196277(s) {
+function inline__P10198(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -24932,26 +25022,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = r0 = globals.stats___187746;
+    s.tmp_0 = r0 = globals.stats___2529;
     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___185604;
+    r0 = globals.control_EventContext_onStats___387;
   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___185604;
-    if ((globals.control_EventContext_lastStats___185603) && (globals.control_EventContext_lastStats___185603).vtable) {
+    s.tmp_2.argL = globals.control_EventContext_onStats___387;
+    if ((globals.control_EventContext_lastStats___386) && (globals.control_EventContext_lastStats___386).vtable) {
     setupResume(s, 8);
-    pxsim_String__stringConv(globals.control_EventContext_lastStats___185603);
+    pxsim_String__stringConv(globals.control_EventContext_lastStats___386);
     checkResumeConsumed();
     return;
-    } else { s.retval = (globals.control_EventContext_lastStats___185603) + ""; }
+    } else { s.retval = (globals.control_EventContext_lastStats___386) + ""; }
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -24982,41 +25072,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 = 1032; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1039; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___187745);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___2528);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = PhysicsEngine__C187376_v3_1_mk(s);
+    s.tmp_0 = PhysicsEngine__C2159_v3_1_mk(s);
     r0 = s.caps[0].fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C187376_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_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__P187871_mk(s);
-    s.callLocIdx = 1033; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = game_consoleOverlay_draw__P2654_mk(s);
+    s.callLocIdx = 1040; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = power_checkDeepSleep__P186923_mk(s);
-    s.callLocIdx = 1034; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = power_checkDeepSleep__P1706_mk(s);
+    s.callLocIdx = 1041; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196277.info = {"start":5899,"length":504,"line":163,"column":80,"endLine":175,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
+inline__P10198.info = {"start":5899,"length":504,"line":163,"column":80,"endLine":175,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P196277_mk(s) {
+function inline__P10198_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196277, depth: s.depth + 1,
+        parent: s, fn: inline__P10198, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25033,7 +25123,7 @@ function inline__P196277_mk(s) {
 
 
 
-function inline__P196306(s) {
+function inline__P10227(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25051,19 +25141,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 = 1037; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1044; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196306.info = {"start":6621,"length":12,"line":179,"column":39,"endLine":179,"endColumn":51,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["f"]}
+inline__P10227.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__P196306_mk(s) {
+function inline__P10227_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196306, depth: s.depth + 1,
+        parent: s, fn: inline__P10227, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -25073,7 +25163,7 @@ function inline__P196306_mk(s) {
 
 
 
-function game_consoleOverlay_draw__P187871(s) {
+function game_consoleOverlay_draw__P2654(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25083,16 +25173,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.height___196355 = undefined;
-    s.top___196360 = undefined;
-    s.i___196366 = undefined;
-    s.t___196379 = undefined;
-    s.tOff___196386 = undefined;
-    s.tab___196388 = undefined;
-    s.unnamed8926___U6 = undefined;
-    s.unnamed8927___U7 = undefined;
-    s.padding___196390 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___189862);
+    s.height___10276 = undefined;
+    s.top___10281 = undefined;
+    s.i___10287 = undefined;
+    s.t___10300 = undefined;
+    s.tOff___10307 = undefined;
+    s.tab___10309 = undefined;
+    s.unnamed118___U6 = undefined;
+    s.unnamed119___U7 = undefined;
+    s.padding___10311 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -25101,7 +25191,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(globals.instance___189816);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
     s.tmp_4 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
@@ -25117,23 +25207,23 @@ switch (step) {
   case 3:
   case 4:
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = globals.consoleFont___189870;
+    s.tmp_7.arg0 = globals.consoleFont___4654;
     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 = 1499; s.pc = 14; return s.tmp_7; }
+     else { s.callLocIdx = 1506; s.pc = 14; return s.tmp_7; }
     }
   case 14:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = (s.tmp_6 + 2);
-    s.height___196355 = (r0);
-    r0 = pxsim_numops_toBoolDecr(globals.stats___187746);
+    s.height___10276 = (r0);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
     if (!r0) { step = 5; continue; }
-    r0 = s.height___196355;
+    r0 = s.height___10276;
     { step = 6; continue; }
   case 5:
     r0 = 0;
@@ -25141,17 +25231,17 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_0 = r0;
     r0 = (2 + s.tmp_0);
-    s.top___196360 = (r0);
-    s.i___196366 = (0);
+    s.top___10281 = (r0);
+    s.i___10287 = (0);
   case 7:
-    s.tmp_1 = r0 = s.i___196366;
-    r0 = pxsim_Array__length(globals.consoleStrings___189862);
+    s.tmp_1 = r0 = s.i___10287;
+    r0 = pxsim_Array__length(globals.consoleStrings___4646);
     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___189862, s.i___196366);
+    r0 = pxsim_Array__getAt(globals.consoleStrings___4646, s.i___10287);
     s.tmp_5 = r0;
     r0 = pxsim_String_.indexOf(s.tmp_5, "\t", undefined);
     s.tmp_4 = r0;
@@ -25159,50 +25249,50 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 10; continue; }
-    s.tmp_6 = helpers_stringSplit__P185334_mk(s);
-    r0 = pxsim_Array__getAt(globals.consoleStrings___189862, s.i___196366);
+    s.tmp_6 = helpers_stringSplit__P117_mk(s);
+    r0 = pxsim_Array__getAt(globals.consoleStrings___4646, s.i___10287);
     s.tmp_6.arg0 = r0;
     s.tmp_6.arg1 = "\t";
     s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1500; s.pc = 15; return s.tmp_6;
+    s.callLocIdx = 1507; s.pc = 15; return s.tmp_6;
   case 15:
     r0 = s.retval;
-    s.t___196379 = (r0);
-    s.tOff___196386 = (0);
-    s.tab___196388 = (undefined);
-    s.unnamed8926___U6 = (s.t___196379);
-    s.unnamed8927___U7 = (0);
+    s.t___10300 = (r0);
+    s.tOff___10307 = (0);
+    s.tab___10309 = (undefined);
+    s.unnamed118___U6 = (s.t___10300);
+    s.unnamed119___U7 = (0);
   case 8:
-    s.tmp_0 = r0 = s.unnamed8927___U7;
-    r0 = pxsim_Array__length(s.unnamed8926___U6);
+    s.tmp_0 = r0 = s.unnamed119___U7;
+    r0 = pxsim_Array__length(s.unnamed118___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8926___U6, s.unnamed8927___U7);
-    s.tab___196388 = (r0);
-    s.tmp_2 = r0 = globals.tabSize___189864;
-    s.tmp_5 = r0 = s.tOff___196386;
-    r0 = pxsim_String_.length(s.tab___196388);
+    r0 = pxsim_Array__getAt(s.unnamed118___U6, s.unnamed119___U7);
+    s.tab___10309 = (r0);
+    s.tmp_2 = r0 = globals.tabSize___4648;
+    s.tmp_5 = r0 = s.tOff___10307;
+    r0 = pxsim_String_.length(s.tab___10309);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 % globals.tabSize___189864);
+    r0 = (s.tmp_4 % globals.tabSize___4648);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
-    s.padding___196390 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_0.arg1 = s.tab___196388;
-    s.tmp_2 = r0 = s.tOff___196386;
+    s.padding___10311 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_0.arg1 = s.tab___10309;
+    s.tmp_2 = r0 = s.tOff___10307;
     s.tmp_4 = if_charWidth_1_mk(s);
-    s.tmp_4.arg0 = globals.consoleFont___189870;
+    s.tmp_4.arg0 = globals.consoleFont___4654;
     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 = 1501; s.pc = 17; return s.tmp_4; }
+     else { s.callLocIdx = 1508; s.pc = 17; return s.tmp_4; }
     }
   case 17:
     r0 = s.retval;
@@ -25211,50 +25301,50 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (4 + s.tmp_1);
     s.tmp_0.arg2 = r0;
-    s.tmp_5 = r0 = s.top___196360;
-    r0 = (s.i___196366 * s.height___196355);
+    s.tmp_5 = r0 = s.top___10281;
+    r0 = (s.i___10287 * s.height___10276);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = globals.consoleColor___189861;
-    s.tmp_0.arg5 = globals.consoleFont___189870;
+    s.tmp_0.arg4 = globals.consoleColor___4645;
+    s.tmp_0.arg5 = globals.consoleFont___4654;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1502; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1509; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tOff___196386;
-    r0 = pxsim_String_.length(s.tab___196388);
+    s.tmp_0 = r0 = s.tOff___10307;
+    r0 = pxsim_String_.length(s.tab___10309);
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.padding___196390);
+    r0 = (s.tmp_2 + s.padding___10311);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.tOff___196386 = (r0);
-    r0 = (s.unnamed8927___U7 + 1);
-    s.unnamed8927___U7 = (r0);
+    s.tOff___10307 = (r0);
+    r0 = (s.unnamed119___U7 + 1);
+    s.unnamed119___U7 = (r0);
     { step = 8; continue; }
   case 9:
-    s.unnamed8926___U6 = (undefined);
+    s.unnamed118___U6 = (undefined);
     { step = 11; continue; }
   case 10:
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    r0 = pxsim_Array__getAt(globals.consoleStrings___189862, s.i___196366);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    r0 = pxsim_Array__getAt(globals.consoleStrings___4646, s.i___10287);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 4;
-    s.tmp_1 = r0 = s.top___196360;
-    r0 = (s.i___196366 * s.height___196355);
+    s.tmp_1 = r0 = s.top___10281;
+    r0 = (s.i___10287 * s.height___10276);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = globals.consoleColor___189861;
-    s.tmp_0.arg5 = globals.consoleFont___189870;
+    s.tmp_0.arg4 = globals.consoleColor___4645;
+    s.tmp_0.arg5 = globals.consoleFont___4654;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1503; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1510; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
   case 11:
-    r0 = (s.i___196366 + 1);
-    s.i___196366 = (r0);
+    r0 = (s.i___10287 + 1);
+    s.i___10287 = (r0);
     { step = 7; continue; }
   case 12:
   case 13:
@@ -25262,12 +25352,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_draw__P187871.info = {"start":1364,"length":859,"line":44,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"draw","argumentNames":[]}
+game_consoleOverlay_draw__P2654.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__P187871_mk(s) {
+function game_consoleOverlay_draw__P2654_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_draw__P187871, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_draw__P2654, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25277,22 +25367,22 @@ function game_consoleOverlay_draw__P187871_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  height___196355: undefined,
-  top___196360: undefined,
-  i___196366: undefined,
-  t___196379: undefined,
-  tOff___196386: undefined,
-  tab___196388: undefined,
-  unnamed8926___U6: undefined,
-  unnamed8927___U7: undefined,
-  padding___196390: undefined,
+  height___10276: undefined,
+  top___10281: undefined,
+  i___10287: undefined,
+  t___10300: undefined,
+  tOff___10307: undefined,
+  tab___10309: undefined,
+  unnamed118___U6: undefined,
+  unnamed119___U7: undefined,
+  padding___10311: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_isVisible__P187852(s) {
+function scene_systemMenu_isVisible__P2635(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25302,7 +25392,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___189816);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1 = r0;
@@ -25312,12 +25402,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_isVisible__P187852.info = {"start":13170,"length":62,"line":395,"column":4,"endLine":397,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"isVisible","argumentNames":[]}
+scene_systemMenu_isVisible__P2635.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__P187852_mk(s) {
+function scene_systemMenu_isVisible__P2635_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_isVisible__P187852, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_isVisible__P2635, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25328,7 +25418,7 @@ function scene_systemMenu_isVisible__P187852_mk(s) {
 
 
 
-function helpers_stringSplit__P185334(s) {
+function helpers_stringSplit__P117(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25338,15 +25428,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.A___196444 = undefined;
-    s.lim___196446 = undefined;
-    s.s___196462 = undefined;
-    s.p___196465 = undefined;
-    s.R___196466 = undefined;
-    s.z___196480 = undefined;
-    s.T___196493 = undefined;
-    s.q___196494 = undefined;
-    s.e___196500 = undefined;
+    s.A___10365 = undefined;
+    s.lim___10367 = undefined;
+    s.s___10383 = undefined;
+    s.p___10386 = undefined;
+    s.R___10387 = undefined;
+    s.z___10401 = undefined;
+    s.T___10414 = undefined;
+    s.q___10415 = undefined;
+    s.e___10421 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -25354,36 +25444,36 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.A___196444 = (r0);
-    s.lim___196446 = (0);
+    s.A___10365 = (r0);
+    s.lim___10367 = (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___196446 = (r0);
+    s.lim___10367 = (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___196446 = (0);
+    s.lim___10367 = (0);
     { step = 3; continue; }
   case 2:
     r0 = (s.arg2 | 0);
-    s.lim___196446 = (r0);
+    s.lim___10367 = (r0);
   case 3:
   case 4:
     r0 = pxsim_String_.length(s.arg0);
-    s.s___196462 = (r0);
-    s.p___196465 = (0);
-    s.R___196466 = (s.arg1);
-    r0 = (s.lim___196446 == 0);
+    s.s___10383 = (r0);
+    s.p___10386 = (0);
+    s.R___10387 = (s.arg1);
+    r0 = (s.lim___10367 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = s.A___196444;
+    r0 = s.A___10365;
     { step = 21; continue; }
   case 5:
   case 6:
@@ -25391,123 +25481,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___196444, 0, s.arg0);
-    r0 = s.A___196444;
+    r0 = pxsim_Array_.setAt(s.A___10365, 0, s.arg0);
+    r0 = s.A___10365;
     { step = 21; continue; }
   case 7:
   case 8:
-    r0 = (s.s___196462 == 0);
+    r0 = (s.s___10383 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = helpers_splitMatch__P189175_mk(s);
+    s.tmp_1 = helpers_splitMatch__P3959_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = 0;
-    s.tmp_1.arg2 = s.R___196466;
+    s.tmp_1.arg2 = s.R___10387;
     s.callLocIdx = 12; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    s.z___196480 = (r0);
-    r0 = (s.z___196480 > -1);
+    s.z___10401 = (r0);
+    r0 = (s.z___10401 > -1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = s.A___196444;
+    r0 = s.A___10365;
     { step = 21; continue; }
   case 9:
   case 10:
-    r0 = pxsim_Array_.setAt(s.A___196444, 0, s.arg0);
-    r0 = s.A___196444;
+    r0 = pxsim_Array_.setAt(s.A___10365, 0, s.arg0);
+    r0 = s.A___10365;
     { step = 21; continue; }
   case 11:
   case 12:
-    s.q___196494 = (s.p___196465);
+    s.q___10415 = (s.p___10386);
   case 13:
-    r0 = (s.q___196494 != s.s___196462);
+    r0 = (s.q___10415 != s.s___10383);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    s.tmp_1 = helpers_splitMatch__P189175_mk(s);
+    s.tmp_1 = helpers_splitMatch__P3959_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.q___196494;
-    s.tmp_1.arg2 = s.R___196466;
+    s.tmp_1.arg1 = s.q___10415;
+    s.tmp_1.arg2 = s.R___10387;
     s.callLocIdx = 13; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
-    s.e___196500 = (r0);
-    r0 = (s.e___196500 < 0);
+    s.e___10421 = (r0);
+    r0 = (s.e___10421 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.q___196494 + 1);
-    s.q___196494 = (r0);
+    r0 = (s.q___10415 + 1);
+    s.q___10415 = (r0);
     { step = 19; continue; }
   case 14:
-    r0 = (s.e___196500 == s.p___196465);
+    r0 = (s.e___10421 == s.p___10386);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = (s.q___196494 + 1);
-    s.q___196494 = (r0);
+    r0 = (s.q___10415 + 1);
+    s.q___10415 = (r0);
     { step = 18; continue; }
   case 15:
-    s.tmp_0 = helpers_stringSlice__P185332_mk(s);
+    s.tmp_0 = helpers_stringSlice__P115_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.p___196465;
-    s.tmp_0.arg2 = s.q___196494;
+    s.tmp_0.arg1 = s.p___10386;
+    s.tmp_0.arg2 = s.q___10415;
     s.callLocIdx = 14; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.T___196493 = (r0);
-    r0 = pxsim_Array__push(s.A___196444, s.T___196493);
-    r0 = pxsim_Array__length(s.A___196444);
+    s.T___10414 = (r0);
+    r0 = pxsim_Array__push(s.A___10365, s.T___10414);
+    r0 = pxsim_Array__length(s.A___10365);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 == s.lim___196446);
+    r0 = (s.tmp_1 == s.lim___10367);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    r0 = s.A___196444;
+    r0 = s.A___10365;
     { step = 21; continue; }
   case 16:
   case 17:
-    s.p___196465 = (s.e___196500);
-    s.q___196494 = (s.p___196465);
+    s.p___10386 = (s.e___10421);
+    s.q___10415 = (s.p___10386);
   case 18:
   case 19:
     { step = 13; continue; }
   case 20:
-    s.tmp_0 = helpers_stringSlice__P185332_mk(s);
+    s.tmp_0 = helpers_stringSlice__P115_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.p___196465;
-    s.tmp_0.arg2 = s.q___196494;
+    s.tmp_0.arg1 = s.p___10386;
+    s.tmp_0.arg2 = s.q___10415;
     s.callLocIdx = 15; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.T___196493 = (r0);
-    r0 = pxsim_Array__push(s.A___196444, s.T___196493);
-    r0 = s.A___196444;
+    s.T___10414 = (r0);
+    r0 = pxsim_Array__push(s.A___10365, s.T___10414);
+    r0 = s.A___10365;
   case 21:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_stringSplit__P185334.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__P117.info = {"start":11930,"length":1319,"line":407,"column":4,"endLine":451,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSplit","argumentNames":["S","separator","limit"]}
 
-function helpers_stringSplit__P185334_mk(s) {
+function helpers_stringSplit__P117_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_stringSplit__P185334, depth: s.depth + 1,
+        parent: s, fn: helpers_stringSplit__P117, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  A___196444: undefined,
-  lim___196446: undefined,
-  s___196462: undefined,
-  p___196465: undefined,
-  R___196466: undefined,
-  z___196480: undefined,
-  T___196493: undefined,
-  q___196494: undefined,
-  e___196500: undefined,
+  A___10365: undefined,
+  lim___10367: undefined,
+  s___10383: undefined,
+  p___10386: undefined,
+  R___10387: undefined,
+  z___10401: undefined,
+  T___10414: undefined,
+  q___10415: undefined,
+  e___10421: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -25517,7 +25607,7 @@ function helpers_stringSplit__P185334_mk(s) {
 
 
 
-function helpers_splitMatch__P189175(s) {
+function helpers_splitMatch__P3959(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25527,9 +25617,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___196576 = undefined;
-    s.s___196579 = undefined;
-    s.i___196589 = undefined;
+    s.r___10497 = undefined;
+    s.s___10500 = undefined;
+    s.i___10510 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -25537,12 +25627,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_String_.length(s.arg2);
-    s.r___196576 = (r0);
+    s.r___10497 = (r0);
     r0 = pxsim_String_.length(s.arg0);
-    s.s___196579 = (r0);
-    r0 = (s.arg1 + s.r___196576);
+    s.s___10500 = (r0);
+    r0 = (s.arg1 + s.r___10497);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.s___196579);
+    r0 = (s.tmp_1 > s.s___10500);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -25550,18 +25640,18 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    s.i___196589 = (0);
+    s.i___10510 = (0);
   case 3:
-    r0 = (s.i___196589 < s.r___196576);
+    r0 = (s.i___10510 < s.r___10497);
     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___196589);
+    r0 = (s.arg1 + s.i___10510);
     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___196589);
+    r0 = pxsim_String_.charAt(s.arg2, s.i___10510);
     s.tmp_5 = r0;
     r0 = (s.tmp_2 != s.tmp_5);
     s.tmp_1 = r0;
@@ -25571,21 +25661,21 @@ switch (step) {
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.i___196589 + 1);
-    s.i___196589 = (r0);
+    r0 = (s.i___10510 + 1);
+    s.i___10510 = (r0);
     { step = 3; continue; }
   case 6:
-    r0 = (s.arg1 + s.r___196576);
+    r0 = (s.arg1 + s.r___10497);
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-helpers_splitMatch__P189175.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__P3959.info = {"start":13255,"length":289,"line":453,"column":4,"endLine":462,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"splitMatch","argumentNames":["S","q","R"]}
 
-function helpers_splitMatch__P189175_mk(s) {
+function helpers_splitMatch__P3959_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_splitMatch__P189175, depth: s.depth + 1,
+        parent: s, fn: helpers_splitMatch__P3959, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25593,9 +25683,9 @@ function helpers_splitMatch__P189175_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  r___196576: undefined,
-  s___196579: undefined,
-  i___196589: undefined,
+  r___10497: undefined,
+  s___10500: undefined,
+  i___10510: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -25605,7 +25695,7 @@ function helpers_splitMatch__P189175_mk(s) {
 
 
 
-function helpers_stringSlice__P185332(s) {
+function helpers_stringSlice__P115(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25615,7 +25705,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___196545 = undefined;
+    s.len___10466 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -25623,13 +25713,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_String_.length(s.arg0);
-    s.len___196545 = (r0);
+    s.len___10466 = (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__P185342_mk(s);
-    r0 = (s.len___196545 + s.arg1);
+    s.tmp_1 = Math_max__P125_mk(s);
+    r0 = (s.len___10466 + s.arg1);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
     s.callLocIdx = 11; s.pc = 7; return s.tmp_1;
@@ -25642,14 +25732,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.arg2 = (s.len___196545);
+    s.arg2 = (s.len___10466);
   case 3:
   case 4:
     r0 = (s.arg2 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = (s.len___196545 + s.arg2);
+    r0 = (s.len___10466 + s.arg2);
     s.arg2 = (r0);
   case 5:
   case 6:
@@ -25661,17 +25751,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_stringSlice__P185332.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__P115.info = {"start":11047,"length":365,"line":373,"column":4,"endLine":389,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"stringSlice","argumentNames":["s","start","end"]}
 
-function helpers_stringSlice__P185332_mk(s) {
+function helpers_stringSlice__P115_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_stringSlice__P185332, depth: s.depth + 1,
+        parent: s, fn: helpers_stringSlice__P115, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___196545: undefined,
+  len___10466: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -25681,7 +25771,7 @@ function helpers_stringSlice__P185332_mk(s) {
 
 
 
-function scene_Scene_render__P187663(s) {
+function scene_Scene_render__P2446(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25691,15 +25781,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___196673 = undefined;
-    s.unnamed8924___U1 = undefined;
-    s.unnamed8925___U2 = undefined;
+    s.s___10594 = undefined;
+    s.unnamed116___U1 = undefined;
+    s.unnamed117___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C187636_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -25730,18 +25820,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__P187663_mk(s);
+    s.tmp_3 = scene_Scene_render__P2446_mk(s);
     r0 = s.arg0.fields["previousScene"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 1040; s.pc = 12; return s.tmp_3;
+    s.callLocIdx = 1047; s.pc = 12; return s.tmp_3;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = scene_Background_draw__P187491_mk(s);
+    s.tmp_0 = scene_Background_draw__P2274_mk(s);
     r0 = s.arg0.fields["background"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1041; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1048; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
   case 6:
@@ -25751,11 +25841,11 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_2 = helpers_arraySort__P185320_mk(s);
+    s.tmp_2 = helpers_arraySort__P103_mk(s);
     r0 = s.arg0.fields["allSprites"];
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P196650;
-    s.callLocIdx = 1046; s.pc = 14; return s.tmp_2;
+    s.tmp_2.arg1 = inline__P10571;
+    s.callLocIdx = 1053; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -25766,38 +25856,38 @@ switch (step) {
     r0 = (s.tmp_0).fields["flags"] = (s.tmp_1);
   case 7:
   case 8:
-    s.s___196673 = (undefined);
+    s.s___10594 = (undefined);
     r0 = s.arg0.fields["allSprites"];
-    s.unnamed8924___U1 = (r0);
-    s.unnamed8925___U2 = (0);
+    s.unnamed116___U1 = (r0);
+    s.unnamed117___U2 = (0);
   case 9:
-    s.tmp_0 = r0 = s.unnamed8925___U2;
-    r0 = pxsim_Array__length(s.unnamed8924___U1);
+    s.tmp_0 = r0 = s.unnamed117___U2;
+    r0 = pxsim_Array__length(s.unnamed116___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8924___U1, s.unnamed8925___U2);
-    s.s___196673 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed116___U1, s.unnamed117___U2);
+    s.s___10594 = (r0);
     s.tmp_2 = if___draw_2_mk(s);
-    s.tmp_2.arg0 = s.s___196673;
+    s.tmp_2.arg0 = s.s___10594;
     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 = 1047; s.pc = 15; return s.tmp_2;
+      s.callLocIdx = 1054; 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 = 1047; s.pc = 15; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1047; s.pc = 15; return s.tmp_2;; }
-     else { s.callLocIdx = 1047; 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 = 1054; s.pc = 15; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1054; s.pc = 15; return s.tmp_2;; }
+     else { s.callLocIdx = 1054; s.pc = 15; return s.tmp_2; }
     }
   case 15:
     r0 = s.retval;
-    r0 = (s.unnamed8925___U2 + 1);
-    s.unnamed8925___U2 = (r0);
+    r0 = (s.unnamed117___U2 + 1);
+    s.unnamed117___U2 = (r0);
     { step = 9; continue; }
   case 10:
-    s.unnamed8924___U1 = (undefined);
+    s.unnamed116___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["flags"];
     s.tmp_2 = r0;
@@ -25809,21 +25899,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_render__P187663.info = {"start":7844,"length":917,"line":221,"column":8,"endLine":245,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"render","argumentNames":["this"]}
+scene_Scene_render__P2446.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__P187663_mk(s) {
+function scene_Scene_render__P2446_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_render__P187663, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_render__P2446, 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___196673: undefined,
-  unnamed8924___U1: undefined,
-  unnamed8925___U2: undefined,
+  s___10594: undefined,
+  unnamed116___U1: undefined,
+  unnamed117___U2: undefined,
   arg0: undefined,
 } }
 
@@ -25831,7 +25921,7 @@ function scene_Scene_render__P187663_mk(s) {
 
 
 
-function inline__P196650(s) {
+function inline__P10571(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25854,7 +25944,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 = 1042; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1049; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
@@ -25867,7 +25957,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 = 1043; s.pc = 4; return s.tmp_4; }
+     else { s.callLocIdx = 1050; s.pc = 4; return s.tmp_4; }
     }
   case 4:
     r0 = s.retval;
@@ -25887,7 +25977,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 = 1044; s.pc = 5; return s.tmp_6; }
+     else { s.callLocIdx = 1051; s.pc = 5; return s.tmp_6; }
     }
   case 5:
     r0 = s.retval;
@@ -25900,7 +25990,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 = 1045; s.pc = 6; return s.tmp_8; }
+     else { s.callLocIdx = 1052; s.pc = 6; return s.tmp_8; }
     }
   case 6:
     r0 = s.retval;
@@ -25913,12 +26003,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196650.info = {"start":8422,"length":52,"line":235,"column":37,"endLine":235,"endColumn":89,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["a","b"]}
+inline__P10571.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__P196650_mk(s) {
+function inline__P10571_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196650, depth: s.depth + 1,
+        parent: s, fn: inline__P10571, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -25938,7 +26028,7 @@ function inline__P196650_mk(s) {
 
 
 
-function scene_Background_draw__P187491(s) {
+function scene_Background_draw__P2274(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -25953,31 +26043,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C187482_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
     r0 = s.arg0.fields["color"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.fill(globals.screen___187019, s.tmp_0);
+    r0 = pxsim_ImageMethods.fill(globals.screen___1802, 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___187019, s.tmp_1, 0, 0);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, 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__P196705);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P10626);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P185324_mk(s);
+    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
     r0 = s.arg0.fields["_layers"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = s.tmp_1;
-    s.callLocIdx = 868; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 875; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -25986,12 +26076,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_draw__P187491.info = {"start":1166,"length":545,"line":48,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"draw","argumentNames":["this"]}
+scene_Background_draw__P2274.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__P187491_mk(s) {
+function scene_Background_draw__P2274_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_draw__P187491, depth: s.depth + 1,
+        parent: s, fn: scene_Background_draw__P2274, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26003,7 +26093,7 @@ function scene_Background_draw__P187491_mk(s) {
 
 
 
-function inline__P196705(s) {
+function inline__P10626(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26013,8 +26103,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___196707 = undefined;
-    s.oy___196718 = undefined;
+    s.ox___10628 = undefined;
+    s.oy___10639 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -26029,7 +26119,7 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.round(s.tmp_0);
-    s.ox___196707 = (r0);
+    s.ox___10628 = (r0);
     r0 = s.caps[0].fields["camera"];
     r0 = r0.fields["drawOffsetY"];
     s.tmp_1 = r0;
@@ -26040,31 +26130,31 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.round(s.tmp_0);
-    s.oy___196718 = (r0);
-    s.tmp_0 = scene_BackgroundLayer_draw__P187500_mk(s);
+    s.oy___10639 = (r0);
+    s.tmp_0 = scene_BackgroundLayer_draw__P2283_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.ox___196707;
-    s.tmp_0.arg2 = s.oy___196718;
-    s.callLocIdx = 867; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg1 = s.ox___10628;
+    s.tmp_0.arg2 = s.oy___10639;
+    s.callLocIdx = 874; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P196705.info = {"start":1373,"length":312,"line":53,"column":37,"endLine":58,"endColumn":17,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["layer"]}
+inline__P10626.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__P196705_mk(s) {
+function inline__P10626_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P196705, depth: s.depth + 1,
+        parent: s, fn: inline__P10626, 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___196707: undefined,
-  oy___196718: undefined,
+  ox___10628: undefined,
+  oy___10639: undefined,
   arg0: undefined,
 } }
 
@@ -26072,7 +26162,7 @@ function inline__P196705_mk(s) {
 
 
 
-function scene_BackgroundLayer_draw__P187500(s) {
+function scene_BackgroundLayer_draw__P2283(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26082,19 +26172,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.w___196736 = undefined;
-    s.h___196739 = undefined;
-    s.pw___196742 = undefined;
-    s.ph___196746 = undefined;
-    s.rx___196755 = undefined;
-    s.ry___196758 = undefined;
-    s.y___196827 = undefined;
-    s.py___196828 = undefined;
-    s.dh___196837 = undefined;
-    s.x___196845 = undefined;
-    s.rxl___196846 = undefined;
-    s.px___196852 = undefined;
-    s.dw___196856 = undefined;
+    s.w___10657 = undefined;
+    s.h___10660 = undefined;
+    s.pw___10663 = undefined;
+    s.ph___10667 = undefined;
+    s.rx___10676 = undefined;
+    s.ry___10679 = undefined;
+    s.y___10748 = undefined;
+    s.py___10749 = undefined;
+    s.dh___10758 = undefined;
+    s.x___10766 = undefined;
+    s.rxl___10767 = undefined;
+    s.px___10773 = undefined;
+    s.dw___10777 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -26102,20 +26192,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_BackgroundLayer__C187492_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
-    s.w___196736 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
-    s.h___196739 = (r0);
+    if (!checkSubtype(r0, scene_BackgroundLayer__C2275_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.w___10657 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.h___10660 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_0);
-    s.pw___196742 = (r0);
+    s.pw___10663 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_0);
-    s.ph___196746 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.pw___196742);
+    s.ph___10667 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.pw___10663);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -26124,7 +26214,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(s.ph___196746);
+    r0 = pxsim_numops_toBoolDecr(s.ph___10667);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
   case 2:
@@ -26136,9 +26226,9 @@ switch (step) {
   case 3:
   case 4:
     r0 = (0 - s.arg1);
-    s.rx___196755 = (r0);
+    s.rx___10676 = (r0);
     r0 = (0 - s.arg2);
-    s.ry___196758 = (r0);
+    s.ry___10679 = (r0);
     r0 = s.arg0.fields["alignX"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(2, s.tmp_0);
@@ -26148,20 +26238,20 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 5:
-    s.tmp_1 = r0 = s.rx___196755;
-    r0 = (s.w___196736 + s.pw___196742);
+    s.tmp_1 = r0 = s.rx___10676;
+    r0 = (s.w___10657 + s.pw___10663);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
-    s.rx___196755 = (r0);
+    s.rx___10676 = (r0);
     { step = 7; continue; }
   case 6:
-    s.tmp_0 = r0 = s.rx___196755;
-    r0 = (s.w___196736 + s.pw___196742);
+    s.tmp_0 = r0 = s.rx___10676;
+    r0 = (s.w___10657 + s.pw___10663);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.rx___196755 = (r0);
+    s.rx___10676 = (r0);
   case 7:
     r0 = s.arg0.fields["alignY"];
     s.tmp_0 = r0;
@@ -26172,120 +26262,120 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 10; continue; }
   case 8:
-    s.tmp_1 = r0 = s.ry___196758;
-    r0 = (s.h___196739 + s.ph___196746);
+    s.tmp_1 = r0 = s.ry___10679;
+    r0 = (s.h___10660 + s.ph___10667);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
-    s.ry___196758 = (r0);
+    s.ry___10679 = (r0);
     { step = 10; continue; }
   case 9:
-    s.tmp_0 = r0 = s.ry___196758;
-    r0 = (s.h___196739 + s.ph___196746);
+    s.tmp_0 = r0 = s.ry___10679;
+    r0 = (s.h___10660 + s.ph___10667);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.ry___196758 = (r0);
+    s.ry___10679 = (r0);
   case 10:
-    r0 = (s.rx___196755 % s.w___196736);
-    s.rx___196755 = (r0);
-    r0 = (s.rx___196755 < 0);
+    r0 = (s.rx___10676 % s.w___10657);
+    s.rx___10676 = (r0);
+    r0 = (s.rx___10676 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    r0 = (s.rx___196755 + s.w___196736);
-    s.rx___196755 = (r0);
+    r0 = (s.rx___10676 + s.w___10657);
+    s.rx___10676 = (r0);
   case 11:
   case 12:
-    r0 = (s.ry___196758 % s.h___196739);
-    s.ry___196758 = (r0);
-    r0 = (s.ry___196758 < 0);
+    r0 = (s.ry___10679 % s.h___10660);
+    s.ry___10679 = (r0);
+    r0 = (s.ry___10679 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (s.ry___196758 + s.h___196739);
-    s.ry___196758 = (r0);
+    r0 = (s.ry___10679 + s.h___10660);
+    s.ry___10679 = (r0);
   case 13:
   case 14:
-    r0 = pxsim.Math_.floor(s.rx___196755);
-    s.rx___196755 = (r0);
-    r0 = pxsim.Math_.floor(s.ry___196758);
-    s.ry___196758 = (r0);
-    s.y___196827 = (0);
-    s.py___196828 = (0);
+    r0 = pxsim.Math_.floor(s.rx___10676);
+    s.rx___10676 = (r0);
+    r0 = pxsim.Math_.floor(s.ry___10679);
+    s.ry___10679 = (r0);
+    s.y___10748 = (0);
+    s.py___10749 = (0);
   case 15:
-    r0 = (s.y___196827 < s.h___196739);
+    r0 = (s.y___10748 < s.h___10660);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = (s.y___196827 % s.ph___196746);
-    s.py___196828 = (r0);
-    s.tmp_0 = Math_min__P185343_mk(s);
-    r0 = (s.ph___196746 - s.py___196828);
+    r0 = (s.y___10748 % s.ph___10667);
+    s.py___10749 = (r0);
+    s.tmp_0 = Math_min__P126_mk(s);
+    r0 = (s.ph___10667 - s.py___10749);
     s.tmp_0.arg0 = r0;
-    r0 = (s.h___196739 - s.ry___196758);
+    r0 = (s.h___10660 - s.ry___10679);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 870; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 877; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.dh___196837 = (r0);
-    s.x___196845 = (0);
-    s.rxl___196846 = (s.rx___196755);
+    s.dh___10758 = (r0);
+    s.x___10766 = (0);
+    s.rxl___10767 = (s.rx___10676);
   case 16:
-    r0 = (s.x___196845 < s.w___196736);
+    r0 = (s.x___10766 < s.w___10657);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 19; continue; }
-    r0 = (s.x___196845 % s.pw___196742);
-    s.px___196852 = (r0);
-    s.tmp_0 = Math_min__P185343_mk(s);
-    r0 = (s.pw___196742 - s.px___196852);
+    r0 = (s.x___10766 % s.pw___10663);
+    s.px___10773 = (r0);
+    s.tmp_0 = Math_min__P126_mk(s);
+    r0 = (s.pw___10663 - s.px___10773);
     s.tmp_0.arg0 = r0;
-    r0 = (s.w___196736 - s.rxl___196846);
+    r0 = (s.w___10657 - s.rxl___10767);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 871; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 878; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.dw___196856 = (r0);
+    s.dw___10777 = (r0);
     r0 = s.arg0.fields["img"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawImage(globals.screen___187019, s.tmp_0, s.rxl___196846, s.ry___196758);
-    r0 = (s.rxl___196846 + s.dw___196856);
+    r0 = pxsim_ImageMethods.drawImage(globals.screen___1802, s.tmp_0, s.rxl___10767, s.ry___10679);
+    r0 = (s.rxl___10767 + s.dw___10777);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.w___196736);
-    s.rxl___196846 = (r0);
+    r0 = (s.tmp_0 % s.w___10657);
+    s.rxl___10767 = (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___196856;
+    r0 = s.dw___10777;
     { step = 18; continue; }
   case 17:
-    r0 = s.w___196736;
+    r0 = s.w___10657;
   case 18:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.x___196845 + s.tmp_1);
-    s.x___196845 = (r0);
+    r0 = (s.x___10766 + s.tmp_1);
+    s.x___10766 = (r0);
     { step = 16; continue; }
   case 19:
-    r0 = (s.ry___196758 + s.dh___196837);
+    r0 = (s.ry___10679 + s.dh___10758);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.h___196739);
-    s.ry___196758 = (r0);
+    r0 = (s.tmp_0 % s.h___10660);
+    s.ry___10679 = (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___196837;
+    r0 = s.dh___10758;
     { step = 21; continue; }
   case 20:
-    r0 = s.h___196739;
+    r0 = s.h___10660;
   case 21:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.y___196827 + s.tmp_1);
-    s.y___196827 = (r0);
+    r0 = (s.y___10748 + s.tmp_1);
+    s.y___10748 = (r0);
     { step = 15; continue; }
   case 22:
   case 23:
@@ -26293,30 +26383,30 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_BackgroundLayer_draw__P187500.info = {"start":3063,"length":1537,"line":99,"column":8,"endLine":144,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"draw","argumentNames":["this","offsetX","offsetY"]}
+scene_BackgroundLayer_draw__P2283.info = {"start":3063,"length":1537,"line":99,"column":8,"endLine":144,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"draw","argumentNames":["this","offsetX","offsetY"]}
 
-function scene_BackgroundLayer_draw__P187500_mk(s) {
+function scene_BackgroundLayer_draw__P2283_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_BackgroundLayer_draw__P187500, depth: s.depth + 1,
+        parent: s, fn: scene_BackgroundLayer_draw__P2283, 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___196736: undefined,
-  h___196739: undefined,
-  pw___196742: undefined,
-  ph___196746: undefined,
-  rx___196755: undefined,
-  ry___196758: undefined,
-  y___196827: undefined,
-  py___196828: undefined,
-  dh___196837: undefined,
-  x___196845: undefined,
-  rxl___196846: undefined,
-  px___196852: undefined,
-  dw___196856: undefined,
+  w___10657: undefined,
+  h___10660: undefined,
+  pw___10663: undefined,
+  ph___10667: undefined,
+  rx___10676: undefined,
+  ry___10679: undefined,
+  y___10748: undefined,
+  py___10749: undefined,
+  dh___10758: undefined,
+  x___10766: undefined,
+  rxl___10767: undefined,
+  px___10773: undefined,
+  dw___10777: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -26326,7 +26416,7 @@ function scene_BackgroundLayer_draw__P187500_mk(s) {
 
 
 
-function scene_Camera_update__P187593(s) {
+function scene_Camera_update__P2376(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26336,78 +26426,78 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.elapsed___196937 = undefined;
-    s.percentComplete___196951 = undefined;
-    s.damp___196958 = undefined;
-    s.f___196967 = undefined;
-    s.x___196973 = undefined;
-    s.y___196980 = undefined;
+    s.elapsed___10858 = undefined;
+    s.percentComplete___10872 = undefined;
+    s.damp___10879 = undefined;
+    s.f___10888 = undefined;
+    s.x___10894 = undefined;
+    s.y___10901 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_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__P187583_mk(s);
+    s.tmp_1 = scene_Camera_offsetX__P2366_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_3 = Sprite_x__P187242_mk(s);
+    s.tmp_3 = Sprite_x__P2025_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 1001; s.pc = 10; return s.tmp_3;
+    s.callLocIdx = 1008; s.pc = 10; return s.tmp_3;
   case 10:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     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 = 1002; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 1009; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = scene_Camera_offsetY__P187585_mk(s);
+    s.tmp_0 = scene_Camera_offsetY__P2368_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_y__P187244_mk(s);
+    s.tmp_2 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["sprite"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1003; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 1010; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     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 = 1004; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1011; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
   case 1:
   case 2:
-    s.tmp_0 = scene_Camera_offsetX__P187583_mk(s);
+    s.tmp_0 = scene_Camera_offsetX__P2366_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 = 1006; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1013; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = scene_Camera_offsetY__P187585_mk(s);
+    s.tmp_0 = scene_Camera_offsetY__P2368_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 = 1008; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1015; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -26429,10 +26519,10 @@ switch (step) {
     r0 = s.arg0.fields["shakeStartTime"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 - s.tmp_3);
-    s.elapsed___196937 = (r0);
+    s.elapsed___10858 = (r0);
     r0 = s.arg0.fields["shakeDuration"];
     s.tmp_1 = r0;
-    r0 = (s.elapsed___196937 >= s.tmp_1);
+    r0 = (s.elapsed___10858 >= s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -26441,49 +26531,49 @@ switch (step) {
   case 3:
     r0 = s.arg0.fields["shakeDuration"];
     s.tmp_0 = r0;
-    r0 = (s.elapsed___196937 / s.tmp_0);
-    s.percentComplete___196951 = (r0);
-    s.damp___196958 = (1);
-    r0 = (s.percentComplete___196951 >= 0.75);
+    r0 = (s.elapsed___10858 / s.tmp_0);
+    s.percentComplete___10872 = (r0);
+    s.damp___10879 = (1);
+    r0 = (s.percentComplete___10872 >= 0.75);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = Math_max__P185342_mk(s);
+    s.tmp_1 = Math_max__P125_mk(s);
     s.tmp_1.arg0 = 0;
-    r0 = (1 - s.percentComplete___196951);
+    r0 = (1 - s.percentComplete___10872);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1011; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 1018; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
-    s.damp___196958 = (r0);
+    s.damp___10879 = (r0);
   case 4:
   case 5:
     r0 = s.arg0.fields["shakeAmplitude"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.damp___196958);
-    s.f___196967 = (r0);
+    r0 = (s.tmp_0 * s.damp___10879);
+    s.f___10888 = (r0);
     r0 = pxsim.Math_.random();
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.f___196967);
+    r0 = (s.tmp_1 * s.f___10888);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 0);
-    s.x___196973 = (r0);
+    s.x___10894 = (r0);
     r0 = pxsim.Math_.random();
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 * s.f___196967);
+    r0 = (s.tmp_1 * s.f___10888);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 0);
-    s.y___196980 = (r0);
+    s.y___10901 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["drawOffsetX"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.x___196973);
+    r0 = (s.tmp_2 + s.x___10894);
     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___196980);
+    r0 = (s.tmp_2 + s.y___10901);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["drawOffsetY"] = (s.tmp_1);
   case 6:
@@ -26493,12 +26583,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_update__P187593.info = {"start":2297,"length":1397,"line":77,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"update","argumentNames":["this"]}
+scene_Camera_update__P2376.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__P187593_mk(s) {
+function scene_Camera_update__P2376_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_update__P187593, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_update__P2376, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26506,12 +26596,12 @@ function scene_Camera_update__P187593_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  elapsed___196937: undefined,
-  percentComplete___196951: undefined,
-  damp___196958: undefined,
-  f___196967: undefined,
-  x___196973: undefined,
-  y___196980: undefined,
+  elapsed___10858: undefined,
+  percentComplete___10872: undefined,
+  damp___10879: undefined,
+  f___10888: undefined,
+  x___10894: undefined,
+  y___10901: undefined,
   arg0: undefined,
 } }
 
@@ -26519,7 +26609,7 @@ function scene_Camera_update__P187593_mk(s) {
 
 
 
-function scene_Camera_offsetY__P187585(s) {
+function scene_Camera_offsetY__P2368(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26529,27 +26619,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___196999 = undefined;
+    s.scene___10920 = 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__C187577_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 998; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1005; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.scene___196999 = (r0);
-    r0 = s.scene___196999.fields["tileMap"];
+    s.scene___10920 = (r0);
+    r0 = s.scene___10920.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___196999.fields["tileMap"];
+    r0 = s.scene___10920.fields["tileMap"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_map"];
     s.tmp_5 = r0;
@@ -26566,11 +26656,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__P187539_mk(s);
-    r0 = s.scene___196999.fields["tileMap"];
+    s.tmp_9 = tiles_TileMap_offsetY__P2322_mk(s);
+    r0 = s.scene___10920.fields["tileMap"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = s.arg1;
-    s.callLocIdx = 1000; s.pc = 6; return s.tmp_9;
+    s.callLocIdx = 1007; s.pc = 6; return s.tmp_9;
   case 6:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -26583,12 +26673,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetY__P187585.info = {"start":1034,"length":267,"line":37,"column":8,"endLine":44,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetY","argumentNames":["this","v"]}
+scene_Camera_offsetY__P2368.info = {"start":1034,"length":267,"line":37,"column":8,"endLine":44,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetY","argumentNames":["this","v"]}
 
-function scene_Camera_offsetY__P187585_mk(s) {
+function scene_Camera_offsetY__P2368_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetY__P187585, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetY__P2368, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26600,7 +26690,7 @@ function scene_Camera_offsetY__P187585_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  scene___196999: undefined,
+  scene___10920: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -26609,7 +26699,7 @@ function scene_Camera_offsetY__P187585_mk(s) {
 
 
 
-function tiles_TileMap_offsetY__P187539(s) {
+function tiles_TileMap_offsetY__P2322(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26625,38 +26715,38 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P185339_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P122_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_max__P185342_mk(s);
-    s.tmp_3 = tiles_TileMap_areaHeight__P187541_mk(s);
+    s.tmp_1 = Math_max__P125_mk(s);
+    s.tmp_3 = tiles_TileMap_areaHeight__P2324_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 893; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 900; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 894; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 901; 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 = 895; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 902; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_offsetY__P187539.info = {"start":6560,"length":123,"line":239,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetY","argumentNames":["this","value"]}
+tiles_TileMap_offsetY__P2322.info = {"start":6560,"length":123,"line":239,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetY","argumentNames":["this","value"]}
 
-function tiles_TileMap_offsetY__P187539_mk(s) {
+function tiles_TileMap_offsetY__P2322_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_offsetY__P187539, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_offsetY__P2322, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26671,7 +26761,7 @@ function tiles_TileMap_offsetY__P187539_mk(s) {
 
 
 
-function scene_Camera_offsetY__P187584(s) {
+function scene_Camera_offsetY__P2367(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26686,18 +26776,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
     r0 = s.arg0.fields["_offsetY"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetY__P187584.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__P187584.isGetter = true;
+scene_Camera_offsetY__P2367.info = {"start":966,"length":59,"line":34,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetY","argumentNames":["this"]}
+scene_Camera_offsetY__P2367.isGetter = true;
 
-function scene_Camera_offsetY__P187584_mk(s) {
+function scene_Camera_offsetY__P2367_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetY__P187584, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetY__P2367, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26706,7 +26796,7 @@ function scene_Camera_offsetY__P187584_mk(s) {
 
 
 
-function scene_Camera_offsetX__P187583(s) {
+function scene_Camera_offsetX__P2366(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26716,27 +26806,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___197055 = undefined;
+    s.scene___10976 = 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__C187577_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 995; s.pc = 5; return s.tmp_0;
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1002; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.scene___197055 = (r0);
-    r0 = s.scene___197055.fields["tileMap"];
+    s.scene___10976 = (r0);
+    r0 = s.scene___10976.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___197055.fields["tileMap"];
+    r0 = s.scene___10976.fields["tileMap"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_map"];
     s.tmp_5 = r0;
@@ -26753,11 +26843,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__P187538_mk(s);
-    r0 = s.scene___197055.fields["tileMap"];
+    s.tmp_9 = tiles_TileMap_offsetX__P2321_mk(s);
+    r0 = s.scene___10976.fields["tileMap"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = s.arg1;
-    s.callLocIdx = 997; s.pc = 6; return s.tmp_9;
+    s.callLocIdx = 1004; s.pc = 6; return s.tmp_9;
   case 6:
     r0 = s.retval;
     s.tmp_8 = r0;
@@ -26770,12 +26860,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetX__P187583.info = {"start":690,"length":267,"line":26,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetX","argumentNames":["this","v"]}
+scene_Camera_offsetX__P2366.info = {"start":690,"length":267,"line":26,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetX","argumentNames":["this","v"]}
 
-function scene_Camera_offsetX__P187583_mk(s) {
+function scene_Camera_offsetX__P2366_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetX__P187583, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetX__P2366, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26787,7 +26877,7 @@ function scene_Camera_offsetX__P187583_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  scene___197055: undefined,
+  scene___10976: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -26796,7 +26886,7 @@ function scene_Camera_offsetX__P187583_mk(s) {
 
 
 
-function tiles_TileMap_offsetX__P187538(s) {
+function tiles_TileMap_offsetX__P2321(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26812,38 +26902,38 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P185339_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P122_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_max__P185342_mk(s);
-    s.tmp_3 = tiles_TileMap_areaWidth__P187540_mk(s);
+    s.tmp_1 = Math_max__P125_mk(s);
+    s.tmp_3 = tiles_TileMap_areaWidth__P2323_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 890; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 897; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_4 = r0;
     r0 = (s.tmp_2 - s.tmp_4);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 0;
-    s.callLocIdx = 891; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 898; 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 = 892; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 899; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_offsetX__P187538.info = {"start":6429,"length":121,"line":235,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetX","argumentNames":["this","value"]}
+tiles_TileMap_offsetX__P2321.info = {"start":6429,"length":121,"line":235,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"offsetX","argumentNames":["this","value"]}
 
-function tiles_TileMap_offsetX__P187538_mk(s) {
+function tiles_TileMap_offsetX__P2321_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_offsetX__P187538, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_offsetX__P2321, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -26858,7 +26948,7 @@ function tiles_TileMap_offsetX__P187538_mk(s) {
 
 
 
-function scene_Camera_offsetX__P187582(s) {
+function scene_Camera_offsetX__P2365(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26873,18 +26963,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
     r0 = s.arg0.fields["_offsetX"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_offsetX__P187582.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__P187582.isGetter = true;
+scene_Camera_offsetX__P2365.info = {"start":622,"length":59,"line":23,"column":8,"endLine":25,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"offsetX","argumentNames":["this"]}
+scene_Camera_offsetX__P2365.isGetter = true;
 
-function scene_Camera_offsetX__P187582_mk(s) {
+function scene_Camera_offsetX__P2365_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_offsetX__P187582, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_offsetX__P2365, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26893,7 +26983,7 @@ function scene_Camera_offsetX__P187582_mk(s) {
 
 
 
-function PhysicsEngine_move__P187382(s) {
+function PhysicsEngine_move__P2165(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26909,17 +26999,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C187376_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_move__P187382.info = {"start":351,"length":20,"line":18,"column":4,"endLine":18,"endColumn":24,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
+PhysicsEngine_move__P2165.info = {"start":351,"length":20,"line":18,"column":4,"endLine":18,"endColumn":24,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
 
-function PhysicsEngine_move__P187382_mk(s) {
+function PhysicsEngine_move__P2165_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_move__P187382, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_move__P2165, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -26929,7 +27019,7 @@ function PhysicsEngine_move__P187382_mk(s) {
 
 
 
-function PhysicsEngine_draw__P187381(s) {
+function PhysicsEngine_draw__P2164(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26944,17 +27034,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C187376_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_draw__P187381.info = {"start":279,"length":10,"line":15,"column":4,"endLine":15,"endColumn":14,"fileName":"pxt_modules/game/physics.ts","functionName":"draw","argumentNames":["this"]}
+PhysicsEngine_draw__P2164.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__P187381_mk(s) {
+function PhysicsEngine_draw__P2164_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_draw__P187381, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_draw__P2164, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -26963,7 +27053,7 @@ function PhysicsEngine_draw__P187381_mk(s) {
 
 
 
-function controller___update__P187167(s) {
+function controller___update__P1950(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -26973,7 +27063,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dtms___197415 = undefined;
+    s.dtms___11336 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -26981,12 +27071,12 @@ switch (step) {
     r0 = (s.arg0 * 1000);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 | 0);
-    s.dtms___197415 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P197422);
+    s.dtms___11336 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P11343);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dtms___197415);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_2 = controller_players__P187135_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dtms___11336);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_2 = controller_players__P1918_mk(s);
     s.callLocIdx = 241; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
@@ -26999,17 +27089,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller___update__P187167.info = {"start":17961,"length":137,"line":550,"column":4,"endLine":553,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["dt"]}
+controller___update__P1950.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__P187167_mk(s) {
+function controller___update__P1950_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller___update__P187167, depth: s.depth + 1,
+        parent: s, fn: controller___update__P1950, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  dtms___197415: undefined,
+  dtms___11336: undefined,
   arg0: undefined,
 } }
 
@@ -27017,7 +27107,7 @@ function controller___update__P187167_mk(s) {
 
 
 
-function inline__P197422(s) {
+function inline__P11343(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27031,7 +27121,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller___update__P187165_mk(s);
+    s.tmp_0 = controller_Controller___update__P1948_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.caps[0];
     s.callLocIdx = 242; s.pc = 1; return s.tmp_0;
@@ -27041,12 +27131,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P197422.info = {"start":18063,"length":27,"line":552,"column":26,"endLine":552,"endColumn":53,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P11343.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__P197422_mk(s) {
+function inline__P11343_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P197422, depth: s.depth + 1,
+        parent: s, fn: inline__P11343, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27056,7 +27146,7 @@ function inline__P197422_mk(s) {
 
 
 
-function controller_Controller___update__P187165(s) {
+function controller_Controller___update__P1948(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27072,7 +27162,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
@@ -27083,10 +27173,10 @@ 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__P197435);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P11356);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
     r0 = s.arg0.fields["buttons"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
@@ -27097,12 +27187,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller___update__P187165.info = {"start":17439,"length":124,"line":532,"column":8,"endLine":535,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
+controller_Controller___update__P1948.info = {"start":17439,"length":124,"line":532,"column":8,"endLine":535,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
 
-function controller_Controller___update__P187165_mk(s) {
+function controller_Controller___update__P1948_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller___update__P187165, depth: s.depth + 1,
+        parent: s, fn: controller_Controller___update__P1948, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27116,7 +27206,7 @@ function controller_Controller___update__P187165_mk(s) {
 
 
 
-function inline__P197435(s) {
+function inline__P11356(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27130,7 +27220,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Button___update__P187132_mk(s);
+    s.tmp_0 = controller_Button___update__P1915_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg1 = r0;
@@ -27141,12 +27231,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P197435.info = {"start":17526,"length":25,"line":534,"column":33,"endLine":534,"endColumn":58,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["btn"]}
+inline__P11356.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__P197435_mk(s) {
+function inline__P11356_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P197435, depth: s.depth + 1,
+        parent: s, fn: inline__P11356, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27156,7 +27246,7 @@ function inline__P197435_mk(s) {
 
 
 
-function controller_Button___update__P187132(s) {
+function controller_Button___update__P1915(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27166,16 +27256,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.delay___197451 = undefined;
-    s.interval___197460 = undefined;
-    s.count___197473 = undefined;
+    s.delay___11372 = undefined;
+    s.interval___11381 = undefined;
+    s.count___11394 = 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__C187120_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -27199,31 +27289,31 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    r0 = globals.defaultRepeatDelay___189395;
+    r0 = globals.defaultRepeatDelay___4179;
     { step = 4; continue; }
   case 3:
     r0 = s.arg0.fields["repeatDelay"];
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.delay___197451 = (s.tmp_2);
+    s.delay___11372 = (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___189397;
+    r0 = globals.defaultRepeatInterval___4181;
     { step = 6; continue; }
   case 5:
     r0 = s.arg0.fields["repeatInterval"];
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.interval___197460 = (s.tmp_2);
+    s.interval___11381 = (s.tmp_2);
     r0 = s.arg0.fields["_pressedElasped"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 < s.delay___197451);
+    r0 = (s.tmp_1 < s.delay___11372);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
@@ -27232,26 +27322,26 @@ switch (step) {
   case 8:
     r0 = s.arg0.fields["_pressedElasped"];
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.delay___197451);
+    r0 = (s.tmp_5 - s.delay___11372);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.interval___197460);
+    r0 = (s.tmp_4 - s.interval___11381);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 / s.interval___197460);
+    r0 = (s.tmp_3 / s.interval___11381);
     s.tmp_2 = r0;
     r0 = pxsim.Math_.floor(s.tmp_2);
-    s.count___197473 = (r0);
+    s.count___11394 = (r0);
     r0 = s.arg0.fields["_repeatCount"];
     s.tmp_1 = r0;
-    r0 = (s.count___197473 != s.tmp_1);
+    r0 = (s.count___11394 != 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__P189402_mk(s);
+    s.tmp_2 = controller_Button_raiseButtonRepeat__P4186_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 189; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
-    r0 = (s.arg0).fields["_repeatCount"] = (s.count___197473);
+    r0 = (s.arg0).fields["_repeatCount"] = (s.count___11394);
   case 9:
   case 10:
   case 11:
@@ -27259,12 +27349,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button___update__P187132.info = {"start":5117,"length":704,"line":164,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
+controller_Button___update__P1915.info = {"start":5117,"length":704,"line":164,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__update","argumentNames":["this","dtms"]}
 
-function controller_Button___update__P187132_mk(s) {
+function controller_Button___update__P1915_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button___update__P187132, depth: s.depth + 1,
+        parent: s, fn: controller_Button___update__P1915, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27272,9 +27362,9 @@ function controller_Button___update__P187132_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  delay___197451: undefined,
-  interval___197460: undefined,
-  count___197473: undefined,
+  delay___11372: undefined,
+  interval___11381: undefined,
+  count___11394: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -27283,7 +27373,7 @@ function controller_Button___update__P187132_mk(s) {
 
 
 
-function controller_Button_raiseButtonRepeat__P189402(s) {
+function controller_Button_raiseButtonRepeat__P4186(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27298,8 +27388,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___189393);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___4177);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -27314,12 +27404,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonRepeat__P189402.info = {"start":2887,"length":211,"line":99,"column":8,"endLine":104,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonRepeat","argumentNames":["this"]}
+controller_Button_raiseButtonRepeat__P4186.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__P189402_mk(s) {
+function controller_Button_raiseButtonRepeat__P4186_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonRepeat__P189402, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonRepeat__P4186, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27329,7 +27419,7 @@ function controller_Button_raiseButtonRepeat__P189402_mk(s) {
 
 
 
-function controller_players__P187135(s) {
+function controller_players__P1918(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27339,25 +27429,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller__player1__P187134_mk(s);
+    s.tmp_0 = controller__player1__P1917_mk(s);
     s.callLocIdx = 192; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_0.arg0 = globals._players___189406;
-    s.tmp_0.arg1 = inline__P197310;
+    s.tmp_0 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_0.arg0 = globals._players___4190;
+    s.tmp_0.arg1 = inline__P11231;
     s.callLocIdx = 193; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-controller_players__P187135.info = {"start":7040,"length":144,"line":220,"column":4,"endLine":223,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"players","argumentNames":[]}
+controller_players__P1918.info = {"start":7040,"length":144,"line":220,"column":4,"endLine":223,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"players","argumentNames":[]}
 
-function controller_players__P187135_mk(s) {
+function controller_players__P1918_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_players__P187135, depth: s.depth + 1,
+        parent: s, fn: controller_players__P1918, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -27366,7 +27456,7 @@ function controller_players__P187135_mk(s) {
 
 
 
-function inline__P197310(s) {
+function inline__P11231(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27390,12 +27480,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P197310.info = {"start":7162,"length":14,"line":222,"column":31,"endLine":222,"endColumn":45,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P11231.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__P197310_mk(s) {
+function inline__P11231_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P197310, depth: s.depth + 1,
+        parent: s, fn: inline__P11231, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27407,7 +27497,7 @@ function inline__P197310_mk(s) {
 
 
 
-function controller__moveSprites__P187139(s) {
+function controller__moveSprites__P1922(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27417,13 +27507,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_1 = controller_players__P187135_mk(s);
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1 = controller_players__P1918_mk(s);
     s.callLocIdx = 194; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P197105;
+    s.tmp_0.arg1 = inline__P11026;
     s.callLocIdx = 196; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
@@ -27431,12 +27521,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller__moveSprites__P187139.info = {"start":7400,"length":182,"line":234,"column":4,"endLine":238,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_moveSprites","argumentNames":[]}
+controller__moveSprites__P1922.info = {"start":7400,"length":182,"line":234,"column":4,"endLine":238,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_moveSprites","argumentNames":[]}
 
-function controller__moveSprites__P187139_mk(s) {
+function controller__moveSprites__P1922_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__moveSprites__P187139, depth: s.depth + 1,
+        parent: s, fn: controller__moveSprites__P1922, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27446,7 +27536,7 @@ function controller__moveSprites__P187139_mk(s) {
 
 
 
-function inline__P197105(s) {
+function inline__P11026(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27460,7 +27550,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller_Controller___preUpdate__P187164_mk(s);
+    s.tmp_0 = controller_Controller___preUpdate__P1947_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 195; s.pc = 1; return s.tmp_0;
   case 1:
@@ -27469,12 +27559,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P197105.info = {"start":7548,"length":26,"line":237,"column":26,"endLine":237,"endColumn":52,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["ctrl"]}
+inline__P11026.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__P197105_mk(s) {
+function inline__P11026_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P197105, depth: s.depth + 1,
+        parent: s, fn: inline__P11026, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -27484,7 +27574,7 @@ function inline__P197105_mk(s) {
 
 
 
-function controller_Controller___preUpdate__P187164(s) {
+function controller_Controller___preUpdate__P1947(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27494,20 +27584,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.deadSprites___197112 = undefined;
-    s.svx___197113 = undefined;
-    s.svy___197114 = undefined;
-    s.svxInCricle___197149 = undefined;
-    s.svyInCircle___197151 = undefined;
-    s.sq___197153 = undefined;
-    s.scale___197168 = undefined;
+    s.deadSprites___11033 = undefined;
+    s.svx___11034 = undefined;
+    s.svy___11035 = undefined;
+    s.svxInCricle___11070 = undefined;
+    s.svyInCircle___11072 = undefined;
+    s.sq___11074 = undefined;
+    s.scale___11089 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
-    s.tmp_3 = controller_Controller__controlledSprites__P187145_mk(s);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
+    s.tmp_3 = controller_Controller__controlledSprites__P1928_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 214; s.pc = 18; return s.tmp_3;
   case 18:
@@ -27523,21 +27613,21 @@ switch (step) {
   case 1:
   case 2:
     r0 = pxsim_pxtrt.mklocRef();
-    s.deadSprites___197112 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.deadSprites___197112, false);
+    s.deadSprites___11033 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.deadSprites___11033, false);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svx___197113 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.svx___197113, 0);
+    s.svx___11034 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.svx___11034, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svy___197114 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.svy___197114, 0);
+    s.svy___11035 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.svy___11035, 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___197113;
-    s.tmp_5 = controller_Button_pressureLevel__P187130_mk(s);
-    s.tmp_6 = controller_Controller_right__P187150_mk(s);
+    s.tmp_1 = r0 = s.svx___11034;
+    s.tmp_5 = controller_Button_pressureLevel__P1913_mk(s);
+    s.tmp_6 = controller_Controller_right__P1933_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.callLocIdx = 215; s.pc = 20; return s.tmp_6;
   case 20:
@@ -27547,8 +27637,8 @@ switch (step) {
   case 19:
     r0 = s.retval;
     s.tmp_4 = r0;
-    s.tmp_8 = controller_Button_pressureLevel__P187130_mk(s);
-    s.tmp_9 = controller_Controller_left__P187149_mk(s);
+    s.tmp_8 = controller_Button_pressureLevel__P1913_mk(s);
+    s.tmp_9 = controller_Controller_left__P1932_mk(s);
     s.tmp_9.arg0 = s.arg0;
     s.callLocIdx = 217; s.pc = 22; return s.tmp_9;
   case 22:
@@ -27563,9 +27653,9 @@ 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___197114;
-    s.tmp_4 = controller_Button_pressureLevel__P187130_mk(s);
-    s.tmp_5 = controller_Controller_down__P187152_mk(s);
+    s.tmp_0 = r0 = s.svy___11035;
+    s.tmp_4 = controller_Button_pressureLevel__P1913_mk(s);
+    s.tmp_5 = controller_Controller_down__P1935_mk(s);
     s.tmp_5.arg0 = s.arg0;
     s.callLocIdx = 219; s.pc = 24; return s.tmp_5;
   case 24:
@@ -27575,8 +27665,8 @@ switch (step) {
   case 23:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_7 = controller_Button_pressureLevel__P187130_mk(s);
-    s.tmp_8 = controller_Controller_up__P187151_mk(s);
+    s.tmp_7 = controller_Button_pressureLevel__P1913_mk(s);
+    s.tmp_8 = controller_Controller_up__P1934_mk(s);
     s.tmp_8.arg0 = s.arg0;
     s.callLocIdx = 221; s.pc = 26; return s.tmp_8;
   case 26:
@@ -27593,14 +27683,14 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 12; continue; }
   case 3:
-    s.tmp_1 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_2 = controller_Controller_right__P187150_mk(s);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_2 = controller_Controller_right__P1933_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 223; 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__C187120_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_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:
@@ -27615,14 +27705,14 @@ switch (step) {
   case 5:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_5 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_6 = controller_Controller_left__P187149_mk(s);
+    s.tmp_5 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_6 = controller_Controller_left__P1932_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.callLocIdx = 224; 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__C187120_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C1903_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:
@@ -27637,18 +27727,18 @@ switch (step) {
   case 7:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.svx___197113;
+    s.tmp_8 = r0 = s.svx___11034;
     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__C187120_v0_1_mk(s);
-    s.tmp_2 = controller_Controller_down__P187152_mk(s);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_2 = controller_Controller_down__P1935_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 225; 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__C187120_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_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:
@@ -27663,14 +27753,14 @@ switch (step) {
   case 9:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_5 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_6 = controller_Controller_up__P187151_mk(s);
+    s.tmp_5 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_6 = controller_Controller_up__P1934_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.callLocIdx = 226; 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__C187120_VT)) failedCast(s.tmp_5.arg0);
+    if (!checkSubtype(s.tmp_5.arg0, controller_Button__C1903_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:
@@ -27685,57 +27775,57 @@ switch (step) {
   case 11:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.svy___197114;
+    s.tmp_8 = r0 = s.svy___11035;
     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___197149 = (r0);
-    s.tmp_0 = r0 = s.svxInCricle___197149;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___197113);
+    s.svxInCricle___11070 = (r0);
+    s.tmp_0 = r0 = s.svxInCricle___11070;
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___11034);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     r0 = pxsim_pxtrt.mklocRef();
-    s.svyInCircle___197151 = (r0);
-    s.tmp_0 = r0 = s.svyInCircle___197151;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___197114);
+    s.svyInCircle___11072 = (r0);
+    s.tmp_0 = r0 = s.svyInCircle___11072;
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___11035);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___197113);
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___11034);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___197113);
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___11034);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___197114);
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___11035);
     s.tmp_4 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___197114);
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___11035);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 * s.tmp_5);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 + s.tmp_3);
-    s.sq___197153 = (r0);
-    r0 = (s.sq___197153 > 65536);
+    s.sq___11074 = (r0);
+    r0 = (s.sq___11074 > 65536);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (65536 / s.sq___197153);
+    r0 = (65536 / s.sq___11074);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.sqrt(s.tmp_1);
-    s.scale___197168 = (r0);
-    s.tmp_0 = r0 = s.svxInCricle___197149;
-    s.tmp_3 = r0 = s.scale___197168;
-    r0 = pxsim_pxtrt_ldlocRef(s.svx___197113);
+    s.scale___11089 = (r0);
+    s.tmp_0 = r0 = s.svxInCricle___11070;
+    s.tmp_3 = r0 = s.scale___11089;
+    r0 = pxsim_pxtrt_ldlocRef(s.svx___11034);
     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___197151;
-    s.tmp_3 = r0 = s.scale___197168;
-    r0 = pxsim_pxtrt_ldlocRef(s.svy___197114);
+    s.tmp_0 = r0 = s.svyInCircle___11072;
+    s.tmp_3 = r0 = s.scale___11089;
+    r0 = pxsim_pxtrt_ldlocRef(s.svy___11035);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 * s.tmp_4);
     s.tmp_2 = r0;
@@ -27744,15 +27834,15 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
   case 13:
   case 14:
-    r0 = pxsim_pxtcore_mkAction(5, inline__P197186);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.deadSprites___197112);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.svx___197113);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.svy___197114);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.svxInCricle___197149);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.svyInCircle___197151);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_2 = controller_Controller__controlledSprites__P187145_mk(s);
+    r0 = pxsim_pxtcore_mkAction(5, inline__P11107);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.deadSprites___11033);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.svx___11034);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.svy___11035);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.svxInCricle___11070);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.svyInCircle___11072);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_2 = controller_Controller__controlledSprites__P1928_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 227; s.pc = 36; return s.tmp_2;
   case 36:
@@ -27762,20 +27852,20 @@ switch (step) {
     s.callLocIdx = 235; s.pc = 35; return s.tmp_1;
   case 35:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.deadSprites___197112);
+    r0 = pxsim_pxtrt_ldlocRef(s.deadSprites___11033);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_1 = controller_Controller__controlledSprites__P187146_mk(s);
+    s.tmp_1 = controller_Controller__controlledSprites__P1929_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_3 = controller_Controller__controlledSprites__P187145_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_3 = controller_Controller__controlledSprites__P1928_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 236; s.pc = 39; return s.tmp_3;
   case 39:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = inline__P197243;
+    s.tmp_2.arg1 = inline__P11164;
     s.callLocIdx = 237; s.pc = 38; return s.tmp_2;
   case 38:
     r0 = s.retval;
@@ -27790,12 +27880,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller___preUpdate__P187164.info = {"start":14894,"length":2535,"line":466,"column":8,"endLine":530,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"__preUpdate","argumentNames":["this"]}
+controller_Controller___preUpdate__P1947.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__P187164_mk(s) {
+function controller_Controller___preUpdate__P1947_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller___preUpdate__P187164, depth: s.depth + 1,
+        parent: s, fn: controller_Controller___preUpdate__P1947, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27807,13 +27897,13 @@ function controller_Controller___preUpdate__P187164_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  deadSprites___197112: undefined,
-  svx___197113: undefined,
-  svy___197114: undefined,
-  svxInCricle___197149: undefined,
-  svyInCircle___197151: undefined,
-  sq___197153: undefined,
-  scale___197168: undefined,
+  deadSprites___11033: undefined,
+  svx___11034: undefined,
+  svy___11035: undefined,
+  svxInCricle___11070: undefined,
+  svyInCircle___11072: undefined,
+  sq___11074: undefined,
+  scale___11089: undefined,
   arg0: undefined,
 } }
 
@@ -27821,7 +27911,7 @@ function controller_Controller___preUpdate__P187164_mk(s) {
 
 
 
-function inline__P197186(s) {
+function inline__P11107(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -27831,9 +27921,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___197189 = undefined;
-    s.vx___197190 = undefined;
-    s.vy___197191 = undefined;
+    s.s___11110 = undefined;
+    s.vx___11111 = undefined;
+    s.vy___11112 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -27851,7 +27941,7 @@ switch (step) {
     }
   case 22:
     r0 = s.retval;
-    s.s___197189 = (r0);
+    s.s___11110 = (r0);
     s.tmp_2 = if_vx_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -27864,7 +27954,7 @@ switch (step) {
     }
   case 23:
     r0 = s.retval;
-    s.vx___197190 = (r0);
+    s.vx___11111 = (r0);
     s.tmp_3 = if_vy_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -27877,8 +27967,8 @@ switch (step) {
     }
   case 24:
     r0 = s.retval;
-    s.vy___197191 = (r0);
-    r0 = s.s___197189.fields["flags"];
+    s.vy___11112 = (r0);
+    r0 = s.s___11110.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 2);
     s.tmp_0 = r0;
@@ -27892,14 +27982,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___197190);
+    r0 = pxsim_numops_toBoolDecr(s.vx___11111);
     if (!r0) { step = 3; continue; }
-    r0 = (s.s___197189).fields["_vx"] = (0);
+    r0 = (s.s___11110).fields["_vx"] = (0);
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(s.vy___197191);
+    r0 = pxsim_numops_toBoolDecr(s.vy___11112);
     if (!r0) { step = 5; continue; }
-    r0 = (s.s___197189).fields["_vy"] = (0);
+    r0 = (s.s___11110).fields["_vy"] = (0);
   case 5:
   case 6:
   case 7:
@@ -27917,48 +28007,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___197190;
+    s.tmp_2 = r0 = s.vx___11111;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_2;
     { step = 12; continue; }
   case 11:
-    r0 = s.vy___197191;
+    r0 = s.vy___11112;
   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___197189;
+    s.tmp_4 = r0 = s.s___11110;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[3]);
     s.tmp_6 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_6, s.vx___197190);
+    r0 = pxsim.Math_.imul(s.tmp_6, s.vx___11111);
     s.tmp_5 = r0;
     r0 = (s.tmp_4).fields["_vx"] = (s.tmp_5);
-    s.tmp_0 = r0 = s.s___197189;
+    s.tmp_0 = r0 = s.s___11110;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[4]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___197191);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___11112);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
     { step = 18; continue; }
   case 13:
-    r0 = pxsim_numops_toBoolDecr(s.vx___197190);
+    r0 = pxsim_numops_toBoolDecr(s.vx___11111);
     if (!r0) { step = 14; continue; }
-    s.tmp_0 = r0 = s.s___197189;
+    s.tmp_0 = r0 = s.s___11110;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vx___197190);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vx___11111);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vx"] = (s.tmp_1);
     { step = 17; continue; }
   case 14:
-    r0 = pxsim_numops_toBoolDecr(s.vy___197191);
+    r0 = pxsim_numops_toBoolDecr(s.vy___11112);
     if (!r0) { step = 15; continue; }
-    s.tmp_0 = r0 = s.s___197189;
+    s.tmp_0 = r0 = s.s___11110;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___197191);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.vy___11112);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
   case 15:
@@ -27975,12 +28065,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P197186.info = {"start":16077,"length":1171,"line":497,"column":44,"endLine":525,"endColumn":13,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["controlledSprite"]}
+inline__P11107.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__P197186_mk(s) {
+function inline__P11107_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P197186, depth: s.depth + 1,
+        parent: s, fn: inline__P11107, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -27989,9 +28079,9 @@ function inline__P197186_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  s___197189: undefined,
-  vx___197190: undefined,
-  vy___197191: undefined,
+  s___11110: undefined,
+  vx___11111: undefined,
+  vy___11112: undefined,
   arg0: undefined,
 } }
 
@@ -27999,7 +28089,7 @@ function inline__P197186_mk(s) {
 
 
 
-function inline__P197243(s) {
+function inline__P11164(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28024,12 +28114,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P197243.info = {"start":17375,"length":42,"line":529,"column":28,"endLine":529,"endColumn":70,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["s"]}
+inline__P11164.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__P197243_mk(s) {
+function inline__P11164_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P197243, depth: s.depth + 1,
+        parent: s, fn: inline__P11164, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28041,7 +28131,7 @@ function inline__P197243_mk(s) {
 
 
 
-function controller_Controller_down__P187152(s) {
+function controller_Controller_down__P1935(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28056,7 +28146,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (4 - 1);
@@ -28065,13 +28155,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_down__P187152.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__P187152.isGetter = true;
+controller_Controller_down__P1935.info = {"start":9528,"length":77,"line":312,"column":8,"endLine":314,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"down","argumentNames":["this"]}
+controller_Controller_down__P1935.isGetter = true;
 
-function controller_Controller_down__P187152_mk(s) {
+function controller_Controller_down__P1935_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_down__P187152, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_down__P1935, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28082,7 +28172,7 @@ function controller_Controller_down__P187152_mk(s) {
 
 
 
-function controller_Controller_button__P189408(s) {
+function controller_Controller_button__P4192(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28098,7 +28188,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (s.arg1 - 1);
@@ -28107,12 +28197,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_button__P189408.info = {"start":11484,"length":105,"line":373,"column":8,"endLine":375,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"button","argumentNames":["this","button"]}
+controller_Controller_button__P4192.info = {"start":11484,"length":105,"line":373,"column":8,"endLine":375,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"button","argumentNames":["this","button"]}
 
-function controller_Controller_button__P189408_mk(s) {
+function controller_Controller_button__P4192_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_button__P189408, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_button__P4192, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28124,7 +28214,7 @@ function controller_Controller_button__P189408_mk(s) {
 
 
 
-function controller_Controller_up__P187151(s) {
+function controller_Controller_up__P1934(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28139,7 +28229,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (2 - 1);
@@ -28148,13 +28238,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_up__P187151.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__P187151.isGetter = true;
+controller_Controller_up__P1934.info = {"start":9376,"length":73,"line":304,"column":8,"endLine":306,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"up","argumentNames":["this"]}
+controller_Controller_up__P1934.isGetter = true;
 
-function controller_Controller_up__P187151_mk(s) {
+function controller_Controller_up__P1934_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_up__P187151, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_up__P1934, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28165,7 +28255,7 @@ function controller_Controller_up__P187151_mk(s) {
 
 
 
-function controller_Controller_right__P187150(s) {
+function controller_Controller_right__P1933(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28180,7 +28270,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (3 - 1);
@@ -28189,13 +28279,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_right__P187150.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__P187150.isGetter = true;
+controller_Controller_right__P1933.info = {"start":9220,"length":79,"line":296,"column":8,"endLine":298,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"right","argumentNames":["this"]}
+controller_Controller_right__P1933.isGetter = true;
 
-function controller_Controller_right__P187150_mk(s) {
+function controller_Controller_right__P1933_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_right__P187150, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_right__P1933, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28206,7 +28296,7 @@ function controller_Controller_right__P187150_mk(s) {
 
 
 
-function controller_Controller_left__P187149(s) {
+function controller_Controller_left__P1932(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28221,7 +28311,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["buttons"];
     s.tmp_0 = r0;
     r0 = (1 - 1);
@@ -28230,13 +28320,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_left__P187149.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__P187149.isGetter = true;
+controller_Controller_left__P1932.info = {"start":9063,"length":77,"line":288,"column":8,"endLine":290,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"left","argumentNames":["this"]}
+controller_Controller_left__P1932.isGetter = true;
 
-function controller_Controller_left__P187149_mk(s) {
+function controller_Controller_left__P1932_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_left__P187149, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_left__P1932, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28247,7 +28337,7 @@ function controller_Controller_left__P187149_mk(s) {
 
 
 
-function controller_Button_pressureLevel__P187130(s) {
+function controller_Button_pressureLevel__P1913(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28262,16 +28352,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C1903_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__C187120_v0_1_mk(s);
+    s.tmp_3 = controller_Button__C1903_v0_1_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_3.arg0);
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C1903_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:
@@ -28300,12 +28390,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_pressureLevel__P187130.info = {"start":4279,"length":311,"line":139,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"pressureLevel","argumentNames":["this"]}
+controller_Button_pressureLevel__P1913.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__P187130_mk(s) {
+function controller_Button_pressureLevel__P1913_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_pressureLevel__P187130, depth: s.depth + 1,
+        parent: s, fn: controller_Button_pressureLevel__P1913, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28320,7 +28410,7 @@ function controller_Button_pressureLevel__P187130_mk(s) {
 
 
 
-function controller_Button_isPressed__P187129(s) {
+function controller_Button_isPressed__P1912(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28335,17 +28425,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_isPressed__P187129.info = {"start":4129,"length":57,"line":132,"column":8,"endLine":134,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"isPressed","argumentNames":["this"]}
+controller_Button_isPressed__P1912.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__P187129_mk(s) {
+function controller_Button_isPressed__P1912_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_isPressed__P187129, depth: s.depth + 1,
+        parent: s, fn: controller_Button_isPressed__P1912, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -28354,7 +28444,7 @@ function controller_Button_isPressed__P187129_mk(s) {
 
 
 
-function Fx_imul__P185373(s) {
+function Fx_imul__P156(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28373,12 +28463,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_imul__P185373.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__P156.info = {"start":1010,"length":130,"line":32,"column":4,"endLine":34,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"imul","argumentNames":["a","b"]}
 
-function Fx_imul__P185373_mk(s) {
+function Fx_imul__P156_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_imul__P185373, depth: s.depth + 1,
+        parent: s, fn: Fx_imul__P156, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -28388,7 +28478,7 @@ function Fx_imul__P185373_mk(s) {
 
 
 
-function power_checkDeepSleep__P186923(s) {
+function power_checkDeepSleep__P1706(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28398,13 +28488,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___196310 = undefined;
-    s.to___196313 = undefined;
-    s.tmp_0 = power_init__P189307_mk(s);
+    s.p___10231 = undefined;
+    s.to___10234 = undefined;
+    s.tmp_0 = power_init__P4091_mk(s);
     s.callLocIdx = 117; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals._poked___189305;
+    s.tmp_0 = r0 = globals._poked___4089;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
@@ -28414,8 +28504,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.p___196310 = (s.tmp_1);
-    s.tmp_0 = r0 = globals._timeout___189306;
+    s.p___10231 = (s.tmp_1);
+    s.tmp_0 = r0 = globals._timeout___4090;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = s.tmp_0;
@@ -28425,8 +28515,8 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.to___196313 = (s.tmp_1);
-    r0 = (s.to___196313 > 0);
+    s.to___10234 = (s.tmp_1);
+    r0 = (s.to___10234 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 5; continue; }
@@ -28435,9 +28525,9 @@ switch (step) {
   case 5:
     r0 = pxsim.control.millis();
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.p___196310);
+    r0 = (s.tmp_2 - s.p___10231);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.to___196313);
+    r0 = (s.tmp_1 > s.to___10234);
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -28463,12 +28553,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-power_checkDeepSleep__P186923.info = {"start":1087,"length":298,"line":36,"column":4,"endLine":46,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"checkDeepSleep","argumentNames":[]}
+power_checkDeepSleep__P1706.info = {"start":1087,"length":298,"line":36,"column":4,"endLine":46,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"checkDeepSleep","argumentNames":[]}
 
-function power_checkDeepSleep__P186923_mk(s) {
+function power_checkDeepSleep__P1706_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_checkDeepSleep__P186923, depth: s.depth + 1,
+        parent: s, fn: power_checkDeepSleep__P1706, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28477,15 +28567,15 @@ function power_checkDeepSleep__P186923_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  p___196310: undefined,
-  to___196313: undefined,
+  p___10231: undefined,
+  to___10234: undefined,
 } }
 
 
 
 
 
-function power_init__P189307(s) {
+function power_init__P4091(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28495,7 +28585,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals._timeout___189306 !== undefined);
+    r0 = (globals._timeout___4090 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -28505,21 +28595,21 @@ switch (step) {
     r0 = pxsim_pxtcore.getConfig(212, -1);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 1000);
-    globals._timeout___189306 = (r0);
-    r0 = (globals._timeout___189306 > 0);
+    globals._timeout___4090 = (r0);
+    r0 = (globals._timeout___4090 > 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___189306 < 300000);
+    r0 = (globals._timeout___4090 < 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___189306 = (300000);
+    globals._timeout___4090 = (300000);
   case 5:
   case 6:
   case 7:
@@ -28527,12 +28617,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-power_init__P189307.info = {"start":1610,"length":376,"line":57,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"init","argumentNames":[]}
+power_init__P4091.info = {"start":1610,"length":376,"line":57,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"init","argumentNames":[]}
 
-function power_init__P189307_mk(s) {
+function power_init__P4091_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_init__P189307, depth: s.depth + 1,
+        parent: s, fn: power_init__P4091, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28542,7 +28632,7 @@ function power_init__P189307_mk(s) {
 
 
 
-function power_poke__P186922(s) {
+function power_poke__P1705(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28552,22 +28642,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = power_init__P189307_mk(s);
+    s.tmp_0 = power_init__P4091_mk(s);
     s.callLocIdx = 116; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = pxsim.control.millis();
-    globals._poked___189305 = (r0);
+    globals._poked___4089 = (r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-power_poke__P186922.info = {"start":795,"length":81,"line":26,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"poke","argumentNames":[]}
+power_poke__P1705.info = {"start":795,"length":81,"line":26,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/power/power.ts","functionName":"poke","argumentNames":[]}
 
-function power_poke__P186922_mk(s) {
+function power_poke__P1705_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: power_poke__P186922, depth: s.depth + 1,
+        parent: s, fn: power_poke__P1705, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -28576,7 +28666,7 @@ function power_poke__P186922_mk(s) {
 
 
 
-function control_EventContext_deltaTime__P185606(s) {
+function control_EventContext_deltaTime__P389(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28591,20 +28681,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C384_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__P185606.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__P185606.isGetter = true;
+control_EventContext_deltaTime__P389.info = {"start":2097,"length":75,"line":70,"column":8,"endLine":72,"endColumn":9,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"deltaTime","argumentNames":["this"]}
+control_EventContext_deltaTime__P389.isGetter = true;
 
-function control_EventContext_deltaTime__P185606_mk(s) {
+function control_EventContext_deltaTime__P389_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_deltaTime__P185606, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_deltaTime__P389, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -28614,7 +28704,7 @@ function control_EventContext_deltaTime__P185606_mk(s) {
 
 
 
-function scene_Scene_constructor__P187657(s) {
+function scene_Scene_constructor__P2440(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28631,36 +28721,36 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C187636_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C2419_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__C187390_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(ArcadePhysicsEngine__C2173_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = ArcadePhysicsEngine_constructor__P187391_mk(s);
+    s.tmp_1 = ArcadePhysicsEngine_constructor__P2174_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 = 1016; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1023; 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__C187577_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Camera__C2360_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_Camera_constructor__P187581_mk(s);
+    s.tmp_1 = scene_Camera_constructor__P2364_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1017; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1024; 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__C187482_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_Background__C2265_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_Background_constructor__P187486_mk(s);
+    s.tmp_1 = scene_Background_constructor__P2269_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = s.arg0.fields["camera"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1018; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1025; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["background"] = (s.tmp_0);
@@ -28713,12 +28803,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_constructor__P187657.info = {"start":3365,"length":793,"line":102,"column":8,"endLine":120,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","eventContext","previousScene"]}
+scene_Scene_constructor__P2440.info = {"start":3365,"length":793,"line":102,"column":8,"endLine":120,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","eventContext","previousScene"]}
 
-function scene_Scene_constructor__P187657_mk(s) {
+function scene_Scene_constructor__P2440_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_constructor__P187657, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_constructor__P2440, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28731,7 +28821,7 @@ function scene_Scene_constructor__P187657_mk(s) {
 
 
 
-function scene_Camera_constructor__P187581(s) {
+function scene_Camera_constructor__P2364(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28746,7 +28836,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_offsetX"] = (0);
     r0 = (s.arg0).fields["_offsetY"] = (0);
     r0 = (s.arg0).fields["drawOffsetX"] = (0);
@@ -28755,12 +28845,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Camera_constructor__P187581.info = {"start":456,"length":156,"line":15,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"inline","argumentNames":["this"]}
+scene_Camera_constructor__P2364.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__P187581_mk(s) {
+function scene_Camera_constructor__P2364_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_constructor__P187581, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_constructor__P2364, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -28769,7 +28859,7 @@ function scene_Camera_constructor__P187581_mk(s) {
 
 
 
-function scene_Background_constructor__P187486(s) {
+function scene_Background_constructor__P2269(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28785,7 +28875,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C187482_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
     r0 = (s.arg0).fields["color"] = (0);
     r0 = (s.arg0).fields["camera"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
@@ -28796,12 +28886,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_constructor__P187486.info = {"start":367,"length":132,"line":20,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["this","camera"]}
+scene_Background_constructor__P2269.info = {"start":367,"length":132,"line":20,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["this","camera"]}
 
-function scene_Background_constructor__P187486_mk(s) {
+function scene_Background_constructor__P2269_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_constructor__P187486, depth: s.depth + 1,
+        parent: s, fn: scene_Background_constructor__P2269, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28813,7 +28903,7 @@ function scene_Background_constructor__P187486_mk(s) {
 
 
 
-function ArcadePhysicsEngine_constructor__P187391(s) {
+function ArcadePhysicsEngine_constructor__P2174(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28831,33 +28921,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_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__C187311_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteMap__C2094_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = sprites_SpriteMap_constructor__P187312_mk(s);
+    s.tmp_1 = sprites_SpriteMap_constructor__P2095_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 537; 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__P187393_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_maxSpeed__P2176_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 538; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = ArcadePhysicsEngine_maxStep__P187397_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_maxStep__P2180_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg3;
     s.callLocIdx = 539; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = ArcadePhysicsEngine_minStep__P187395_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_minStep__P2178_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg2;
     s.callLocIdx = 540; s.pc = 4; return s.tmp_0;
@@ -28867,12 +28957,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_constructor__P187391.info = {"start":1330,"length":277,"line":55,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","maxVelocity","minSingleStep","maxSingleStep"]}
+ArcadePhysicsEngine_constructor__P2174.info = {"start":1330,"length":277,"line":55,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","maxVelocity","minSingleStep","maxSingleStep"]}
 
-function ArcadePhysicsEngine_constructor__P187391_mk(s) {
+function ArcadePhysicsEngine_constructor__P2174_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_constructor__P187391, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_constructor__P2174, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28886,7 +28976,7 @@ function ArcadePhysicsEngine_constructor__P187391_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxStep__P187397(s) {
+function ArcadePhysicsEngine_maxStep__P2180(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28902,7 +28992,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -28913,12 +29003,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxStep__P187397.info = {"start":2058,"length":67,"line":85,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this","v"]}
+ArcadePhysicsEngine_maxStep__P2180.info = {"start":2058,"length":67,"line":85,"column":4,"endLine":87,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_maxStep__P187397_mk(s) {
+function ArcadePhysicsEngine_maxStep__P2180_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxStep__P187397, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxStep__P2180, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28931,7 +29021,7 @@ function ArcadePhysicsEngine_maxStep__P187397_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxStep__P187396(s) {
+function ArcadePhysicsEngine_maxStep__P2179(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28946,7 +29036,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = s.arg0.fields["maxSingleStep"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -28955,13 +29045,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxStep__P187396.info = {"start":1978,"length":74,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this"]}
-ArcadePhysicsEngine_maxStep__P187396.isGetter = true;
+ArcadePhysicsEngine_maxStep__P2179.info = {"start":1978,"length":74,"line":81,"column":4,"endLine":83,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxStep","argumentNames":["this"]}
+ArcadePhysicsEngine_maxStep__P2179.isGetter = true;
 
-function ArcadePhysicsEngine_maxStep__P187396_mk(s) {
+function ArcadePhysicsEngine_maxStep__P2179_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxStep__P187396, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxStep__P2179, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -28972,7 +29062,7 @@ function ArcadePhysicsEngine_maxStep__P187396_mk(s) {
 
 
 
-function Fx_toInt__P185382(s) {
+function Fx_toInt__P165(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -28992,12 +29082,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toInt__P185382.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__P165.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__P185382_mk(s) {
+function Fx_toInt__P165_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toInt__P185382, depth: s.depth + 1,
+        parent: s, fn: Fx_toInt__P165, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -29007,7 +29097,7 @@ function Fx_toInt__P185382_mk(s) {
 
 
 
-function ArcadePhysicsEngine_minStep__P187395(s) {
+function ArcadePhysicsEngine_minStep__P2178(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29023,7 +29113,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -29034,12 +29124,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_minStep__P187395.info = {"start":1905,"length":67,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this","v"]}
+ArcadePhysicsEngine_minStep__P2178.info = {"start":1905,"length":67,"line":77,"column":4,"endLine":79,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_minStep__P187395_mk(s) {
+function ArcadePhysicsEngine_minStep__P2178_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_minStep__P187395, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_minStep__P2178, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29052,7 +29142,7 @@ function ArcadePhysicsEngine_minStep__P187395_mk(s) {
 
 
 
-function ArcadePhysicsEngine_minStep__P187394(s) {
+function ArcadePhysicsEngine_minStep__P2177(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29067,7 +29157,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = s.arg0.fields["minSingleStep"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -29076,13 +29166,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_minStep__P187394.info = {"start":1825,"length":74,"line":73,"column":4,"endLine":75,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this"]}
-ArcadePhysicsEngine_minStep__P187394.isGetter = true;
+ArcadePhysicsEngine_minStep__P2177.info = {"start":1825,"length":74,"line":73,"column":4,"endLine":75,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"minStep","argumentNames":["this"]}
+ArcadePhysicsEngine_minStep__P2177.isGetter = true;
 
-function ArcadePhysicsEngine_minStep__P187394_mk(s) {
+function ArcadePhysicsEngine_minStep__P2177_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_minStep__P187394, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_minStep__P2177, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29093,7 +29183,7 @@ function ArcadePhysicsEngine_minStep__P187394_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxSpeed__P187393(s) {
+function ArcadePhysicsEngine_maxSpeed__P2176(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29109,7 +29199,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 * 256);
     s.tmp_2 = r0;
@@ -29126,12 +29216,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxSpeed__P187393.info = {"start":1692,"length":127,"line":68,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this","v"]}
+ArcadePhysicsEngine_maxSpeed__P2176.info = {"start":1692,"length":127,"line":68,"column":4,"endLine":71,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_maxSpeed__P187393_mk(s) {
+function ArcadePhysicsEngine_maxSpeed__P2176_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P187393, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P2176, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29144,7 +29234,7 @@ function ArcadePhysicsEngine_maxSpeed__P187393_mk(s) {
 
 
 
-function Fx_neg__P185367(s) {
+function Fx_neg__P150(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29162,12 +29252,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_neg__P185367.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__P150.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__P185367_mk(s) {
+function Fx_neg__P150_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_neg__P185367, depth: s.depth + 1,
+        parent: s, fn: Fx_neg__P150, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -29176,7 +29266,7 @@ function Fx_neg__P185367_mk(s) {
 
 
 
-function ArcadePhysicsEngine_maxSpeed__P187392(s) {
+function ArcadePhysicsEngine_maxSpeed__P2175(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29191,7 +29281,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = s.arg0.fields["maxVelocity"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 128);
@@ -29200,13 +29290,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_maxSpeed__P187392.info = {"start":1613,"length":73,"line":64,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this"]}
-ArcadePhysicsEngine_maxSpeed__P187392.isGetter = true;
+ArcadePhysicsEngine_maxSpeed__P2175.info = {"start":1613,"length":73,"line":64,"column":4,"endLine":66,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"maxSpeed","argumentNames":["this"]}
+ArcadePhysicsEngine_maxSpeed__P2175.isGetter = true;
 
-function ArcadePhysicsEngine_maxSpeed__P187392_mk(s) {
+function ArcadePhysicsEngine_maxSpeed__P2175_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P187392, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_maxSpeed__P2175, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29217,7 +29307,7 @@ function ArcadePhysicsEngine_maxSpeed__P187392_mk(s) {
 
 
 
-function PhysicsEngine_constructor__P187377(s) {
+function PhysicsEngine_constructor__P2160(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29232,17 +29322,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C187376_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_constructor__P187377.info = {"start":26,"length":21,"line":1,"column":4,"endLine":2,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this"]}
+PhysicsEngine_constructor__P2160.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__P187377_mk(s) {
+function PhysicsEngine_constructor__P2160_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_constructor__P187377, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_constructor__P2160, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -29251,7 +29341,7 @@ function PhysicsEngine_constructor__P187377_mk(s) {
 
 
 
-function sprites_SpriteMap_constructor__P187312(s) {
+function sprites_SpriteMap_constructor__P2095(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29266,7 +29356,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C187311_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -29275,12 +29365,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_constructor__P187312.info = {"start":237,"length":56,"line":8,"column":8,"endLine":10,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["this"]}
+sprites_SpriteMap_constructor__P2095.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__P187312_mk(s) {
+function sprites_SpriteMap_constructor__P2095_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_constructor__P187312, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_constructor__P2095, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29291,7 +29381,7 @@ function sprites_SpriteMap_constructor__P187312_mk(s) {
 
 
 
-function music_Melody_constructor__P186818(s) {
+function music_Melody_constructor__P1601(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29307,18 +29397,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C186815_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_text"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_constructor__P186818.info = {"start":6328,"length":67,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["this","text"]}
+music_Melody_constructor__P1601.info = {"start":6328,"length":67,"line":199,"column":8,"endLine":201,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["this","text"]}
 
-function music_Melody_constructor__P186818_mk(s) {
+function music_Melody_constructor__P1601_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_constructor__P186818, depth: s.depth + 1,
+        parent: s, fn: music_Melody_constructor__P1601, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -29328,7 +29418,7 @@ function music_Melody_constructor__P186818_mk(s) {
 
 
 
-function control_pushEventContext__P185615(s) {
+function control_pushEventContext__P398(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29338,63 +29428,63 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___197514 = undefined;
-    s.n___197520 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___189248);
+    s.ctx___11435 = undefined;
+    s.n___11441 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___4032);
     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___189248 = (r0);
+    globals.eventContexts___4032 = (r0);
   case 1:
   case 2:
-    s.tmp_0 = control_eventContext__P185614_mk(s);
+    s.tmp_0 = control_eventContext__P397_mk(s);
     s.callLocIdx = 62; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.ctx___197514 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___197514);
+    s.ctx___11435 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___11435);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = control_EventContext_unregister__P185608_mk(s);
-    s.tmp_0.arg0 = s.ctx___197514;
+    s.tmp_0 = control_EventContext_unregister__P391_mk(s);
+    s.tmp_0.arg0 = s.ctx___11435;
     s.callLocIdx = 63; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(control_EventContext__C185601_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_EventContext__C384_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_EventContext_constructor__P185605_mk(s);
+    s.tmp_1 = control_EventContext_constructor__P388_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.callLocIdx = 64; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.n___197520 = (s.tmp_0);
-    r0 = pxsim_Array__push(globals.eventContexts___189248, s.n___197520);
-    r0 = s.n___197520;
+    s.n___11441 = (s.tmp_0);
+    r0 = pxsim_Array__push(globals.eventContexts___4032, s.n___11441);
+    r0 = s.n___11441;
     return leave(s, r0)
   default: oops()
 } } }
-control_pushEventContext__P185615.info = {"start":7123,"length":340,"line":216,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
+control_pushEventContext__P398.info = {"start":7123,"length":340,"line":216,"column":4,"endLine":227,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"pushEventContext","argumentNames":[]}
 
-function control_pushEventContext__P185615_mk(s) {
+function control_pushEventContext__P398_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_pushEventContext__P185615, depth: s.depth + 1,
+        parent: s, fn: control_pushEventContext__P398, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  ctx___197514: undefined,
-  n___197520: undefined,
+  ctx___11435: undefined,
+  n___11441: undefined,
 } }
 
 
 
 
 
-function control_EventContext_unregister__P185608(s) {
+function control_EventContext_unregister__P391(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29404,37 +29494,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___195135 = undefined;
-    s.unnamed8900___U1 = undefined;
-    s.unnamed8901___U2 = undefined;
+    s.h___8683 = undefined;
+    s.unnamed92___U1 = undefined;
+    s.unnamed93___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
-    s.h___195135 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    s.h___8683 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed8900___U1 = (r0);
-    s.unnamed8901___U2 = (0);
+    s.unnamed92___U1 = (r0);
+    s.unnamed93___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8901___U2;
-    r0 = pxsim_Array__length(s.unnamed8900___U1);
+    s.tmp_0 = r0 = s.unnamed93___U2;
+    r0 = pxsim_Array__length(s.unnamed92___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8900___U1, s.unnamed8901___U2);
-    s.h___195135 = (r0);
-    s.tmp_2 = control_EventHandler_unregister__P189242_mk(s);
-    s.tmp_2.arg0 = s.h___195135;
+    r0 = pxsim_Array__getAt(s.unnamed92___U1, s.unnamed93___U2);
+    s.h___8683 = (r0);
+    s.tmp_2 = control_EventHandler_unregister__P4026_mk(s);
+    s.tmp_2.arg0 = s.h___8683;
     s.callLocIdx = 58; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed8901___U2 + 1);
-    s.unnamed8901___U2 = (r0);
+    r0 = (s.unnamed93___U2 + 1);
+    s.unnamed93___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed8900___U1 = (undefined);
+    s.unnamed92___U1 = (undefined);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["frameWorker"];
     s.tmp_2 = r0;
@@ -29445,19 +29535,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_unregister__P185608.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__P391.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__P185608_mk(s) {
+function control_EventContext_unregister__P391_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_unregister__P185608, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_unregister__P391, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  h___195135: undefined,
-  unnamed8900___U1: undefined,
-  unnamed8901___U2: undefined,
+  h___8683: undefined,
+  unnamed92___U1: undefined,
+  unnamed93___U2: undefined,
   arg0: undefined,
 } }
 
@@ -29465,7 +29555,7 @@ function control_EventContext_unregister__P185608_mk(s) {
 
 
 
-function control_EventHandler_unregister__P189242(s) {
+function control_EventHandler_unregister__P4026(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29480,24 +29570,24 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventHandler__C189240_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventHandler__C4024_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__P189244, s.tmp_2);
+    r0 = pxsim.control.internalOnEvent(s.tmp_0, s.tmp_1, control_doNothing__P4028, s.tmp_2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventHandler_unregister__P189242.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__P4026.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__P189242_mk(s) {
+function control_EventHandler_unregister__P4026_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventHandler_unregister__P189242, depth: s.depth + 1,
+        parent: s, fn: control_EventHandler_unregister__P4026, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29509,7 +29599,7 @@ function control_EventHandler_unregister__P189242_mk(s) {
 
 
 
-function control_doNothing__P189244(s) {
+function control_doNothing__P4028(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29523,12 +29613,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_doNothing__P189244.info = {"start":1254,"length":24,"line":41,"column":4,"endLine":41,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
+control_doNothing__P4028.info = {"start":1254,"length":24,"line":41,"column":4,"endLine":41,"endColumn":28,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"doNothing","argumentNames":[]}
 
-function control_doNothing__P189244_mk(s) {
+function control_doNothing__P4028_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_doNothing__P189244, depth: s.depth + 1,
+        parent: s, fn: control_doNothing__P4028, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -29536,7 +29626,7 @@ function control_doNothing__P189244_mk(s) {
 
 
 
-function control_EventContext_constructor__P185605(s) {
+function control_EventContext_constructor__P388(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29551,7 +29641,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -29561,26 +29651,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___185603);
+    r0 = pxsim_numops_toBoolDecr(globals.control_EventContext_lastStats___386);
     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___185603 = (r0);
+    globals.control_EventContext_lastStats___386 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_constructor__P185605.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__P388.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__P185605_mk(s) {
+function control_EventContext_constructor__P388_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_constructor__P185605, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_constructor__P388, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29591,7 +29681,7 @@ function control_EventContext_constructor__P185605_mk(s) {
 
 
 
-function character_CharacterState_constructor__P191367(s) {
+function character_CharacterState_constructor__P6151(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29607,7 +29697,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C191357_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sprite"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
@@ -29619,17 +29709,17 @@ switch (step) {
     r0 = (s.arg0).fields["possibleFacingDirections"] = (0);
     r0 = (s.arg0).fields["enabled"] = (true);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_x__P187242_mk(s);
+    s.tmp_2 = Sprite_x__P2025_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 2038; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 2045; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["lastX"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Sprite_y__P187244_mk(s);
+    s.tmp_2 = Sprite_y__P2027_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 2039; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 2046; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -29639,12 +29729,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_constructor__P191367.info = {"start":2778,"length":372,"line":98,"column":8,"endLine":108,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","sprite"]}
+character_CharacterState_constructor__P6151.info = {"start":2778,"length":372,"line":98,"column":8,"endLine":108,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","sprite"]}
 
-function character_CharacterState_constructor__P191367_mk(s) {
+function character_CharacterState_constructor__P6151_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_constructor__P191367, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_constructor__P6151, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29657,7 +29747,7 @@ function character_CharacterState_constructor__P191367_mk(s) {
 
 
 
-function character_CharacterState_setManualFlags__P191364(s) {
+function character_CharacterState_setManualFlags__P6148(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29673,14 +29763,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C191357_VT)) failedCast(r0);
-    s.tmp_0 = character_rule__P188962_mk(s);
+    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
+    s.tmp_0 = character_rule__P3745_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
     s.tmp_0.arg3 = undefined;
     s.tmp_0.arg4 = undefined;
-    s.callLocIdx = 2066; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 2073; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     s.arg1 = (r0);
@@ -29699,12 +29789,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setManualFlags__P191364.info = {"start":9280,"length":175,"line":273,"column":8,"endLine":279,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setManualFlags","argumentNames":["this","flags"]}
+character_CharacterState_setManualFlags__P6148.info = {"start":9280,"length":175,"line":273,"column":8,"endLine":279,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setManualFlags","argumentNames":["this","flags"]}
 
-function character_CharacterState_setManualFlags__P191364_mk(s) {
+function character_CharacterState_setManualFlags__P6148_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setManualFlags__P191364, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setManualFlags__P6148, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29716,7 +29806,7 @@ function character_CharacterState_setManualFlags__P191364_mk(s) {
 
 
 
-function character_rule__P188962(s) {
+function character_rule__P3745(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29726,7 +29816,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rule___206164 = undefined;
+    s.rule___21108 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -29735,33 +29825,33 @@ switch (step) {
       s.arg4 = (s.lambdaArgs[4]);
       s.lambdaArgs = null;
     }
-    s.rule___206164 = (s.arg0);
+    s.rule___21108 = (s.arg0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
-    r0 = (s.rule___206164 | s.arg1);
-    s.rule___206164 = (r0);
+    r0 = (s.rule___21108 | s.arg1);
+    s.rule___21108 = (r0);
   case 1:
   case 2:
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 3; continue; }
-    r0 = (s.rule___206164 | s.arg2);
-    s.rule___206164 = (r0);
+    r0 = (s.rule___21108 | s.arg2);
+    s.rule___21108 = (r0);
   case 3:
   case 4:
     r0 = pxsim_numops_toBoolDecr(s.arg3);
     if (!r0) { step = 5; continue; }
-    r0 = (s.rule___206164 | s.arg3);
-    s.rule___206164 = (r0);
+    r0 = (s.rule___21108 | s.arg3);
+    s.rule___21108 = (r0);
   case 5:
   case 6:
-    r0 = (s.rule___206164 & 1);
+    r0 = (s.rule___21108 & 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 7; continue; }
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    r0 = (s.rule___206164 & 962);
+    r0 = (s.rule___21108 & 962);
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -29770,14 +29860,14 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 12; continue; }
   case 9:
-    r0 = (s.rule___206164 & 544);
+    r0 = (s.rule___21108 & 544);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 10; continue; }
     r0 = s.tmp_2;
     { step = 11; continue; }
   case 10:
-    r0 = (s.rule___206164 & 136);
+    r0 = (s.rule___21108 & 136);
   case 11:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -29790,14 +29880,14 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 16; continue; }
   case 13:
-    r0 = (s.rule___206164 & 68);
+    r0 = (s.rule___21108 & 68);
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBool(s.tmp_5);
     if (r0) { step = 14; continue; }
     r0 = s.tmp_5;
     { step = 15; continue; }
   case 14:
-    r0 = (s.rule___206164 & 272);
+    r0 = (s.rule___21108 & 272);
   case 15:
     // jmp value (already in r0)
     s.tmp_6 = r0;
@@ -29810,14 +29900,14 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 20; continue; }
   case 17:
-    r0 = (s.rule___206164 & 256);
+    r0 = (s.rule___21108 & 256);
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBool(s.tmp_8);
     if (r0) { step = 18; continue; }
     r0 = s.tmp_8;
     { step = 19; continue; }
   case 18:
-    r0 = (s.rule___206164 & 4096);
+    r0 = (s.rule___21108 & 4096);
   case 19:
     // jmp value (already in r0)
     s.tmp_9 = r0;
@@ -29830,14 +29920,14 @@ switch (step) {
     r0 = s.tmp_10;
     { step = 24; continue; }
   case 21:
-    r0 = (s.rule___206164 & 64);
+    r0 = (s.rule___21108 & 64);
     s.tmp_11 = r0;
     r0 = pxsim_numops_toBool(s.tmp_11);
     if (r0) { step = 22; continue; }
     r0 = s.tmp_11;
     { step = 23; continue; }
   case 22:
-    r0 = (s.rule___206164 & 1024);
+    r0 = (s.rule___21108 & 1024);
   case 23:
     // jmp value (already in r0)
     s.tmp_12 = r0;
@@ -29850,14 +29940,14 @@ switch (step) {
     r0 = s.tmp_13;
     { step = 28; continue; }
   case 25:
-    r0 = (s.rule___206164 & 128);
+    r0 = (s.rule___21108 & 128);
     s.tmp_14 = r0;
     r0 = pxsim_numops_toBool(s.tmp_14);
     if (r0) { step = 26; continue; }
     r0 = s.tmp_14;
     { step = 27; continue; }
   case 26:
-    r0 = (s.rule___206164 & 2048);
+    r0 = (s.rule___21108 & 2048);
   case 27:
     // jmp value (already in r0)
     s.tmp_15 = r0;
@@ -29870,14 +29960,14 @@ switch (step) {
     r0 = s.tmp_16;
     { step = 32; continue; }
   case 29:
-    r0 = (s.rule___206164 & 512);
+    r0 = (s.rule___21108 & 512);
     s.tmp_17 = r0;
     r0 = pxsim_numops_toBool(s.tmp_17);
     if (r0) { step = 30; continue; }
     r0 = s.tmp_17;
     { step = 31; continue; }
   case 30:
-    r0 = (s.rule___206164 & 8192);
+    r0 = (s.rule___21108 & 8192);
   case 31:
     // jmp value (already in r0)
     s.tmp_18 = r0;
@@ -29891,17 +29981,17 @@ switch (step) {
     { step = 35; continue; }
   case 33:
   case 34:
-    r0 = s.rule___206164;
+    r0 = s.rule___21108;
   case 35:
     return leave(s, r0)
   default: oops()
 } } }
-character_rule__P188962.info = {"start":19564,"length":1258,"line":565,"column":4,"endLine":593,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"rule","argumentNames":["p1","p2","p3","p4","p5"]}
+character_rule__P3745.info = {"start":19564,"length":1258,"line":565,"column":4,"endLine":593,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"rule","argumentNames":["p1","p2","p3","p4","p5"]}
 
-function character_rule__P188962_mk(s) {
+function character_rule__P3745_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_rule__P188962, depth: s.depth + 1,
+        parent: s, fn: character_rule__P3745, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -29923,7 +30013,7 @@ function character_rule__P188962_mk(s) {
   tmp_17: undefined,
   tmp_18: undefined,
   tmp_19: undefined,
-  rule___206164: undefined,
+  rule___21108: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -29935,7 +30025,7 @@ function character_rule__P188962_mk(s) {
 
 
 
-function character_loopFrames__P188956(s) {
+function character_loopFrames__P3739(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -29945,7 +30035,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___206276 = undefined;
+    s.state___21220 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -29953,8 +30043,8 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_init__P191368_mk(s);
-    s.callLocIdx = 2078; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = character_init__P6152_mk(s);
+    s.callLocIdx = 2085; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -30001,9 +30091,9 @@ switch (step) {
     { step = 13; continue; }
   case 7:
   case 8:
-    s.tmp_10 = Number_isNaN__P185310_mk(s);
+    s.tmp_10 = Number_isNaN__P93_mk(s);
     s.tmp_10.arg0 = s.arg2;
-    s.callLocIdx = 2079; s.pc = 15; return s.tmp_10;
+    s.callLocIdx = 2086; s.pc = 15; return s.tmp_10;
   case 15:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -30021,19 +30111,19 @@ switch (step) {
     s.arg2 = (5);
   case 11:
   case 12:
-    s.tmp_0 = character_getStateForSprite__P191371_mk(s);
+    s.tmp_0 = character_getStateForSprite__P6155_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 2080; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 2087; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
-    s.state___206276 = (r0);
-    s.tmp_0 = character_CharacterState_setLoopFrames__P191359_mk(s);
-    s.tmp_0.arg0 = s.state___206276;
+    s.state___21220 = (r0);
+    s.tmp_0 = character_CharacterState_setLoopFrames__P6143_mk(s);
+    s.tmp_0.arg0 = s.state___21220;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = s.arg3;
-    s.callLocIdx = 2081; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 2088; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
   case 13:
@@ -30041,12 +30131,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_loopFrames__P188956.info = {"start":12857,"length":380,"line":394,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"loopFrames","argumentNames":["sprite","frames","frameInterval","rule"]}
+character_loopFrames__P3739.info = {"start":12857,"length":380,"line":394,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"loopFrames","argumentNames":["sprite","frames","frameInterval","rule"]}
 
-function character_loopFrames__P188956_mk(s) {
+function character_loopFrames__P3739_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_loopFrames__P188956, depth: s.depth + 1,
+        parent: s, fn: character_loopFrames__P3739, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30060,7 +30150,7 @@ function character_loopFrames__P188956_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  state___206276: undefined,
+  state___21220: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30071,7 +30161,7 @@ function character_loopFrames__P188956_mk(s) {
 
 
 
-function character_CharacterState_setLoopFrames__P191359(s) {
+function character_CharacterState_setLoopFrames__P6143(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30089,26 +30179,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C191357_VT)) failedCast(r0);
-    s.tmp_0 = character_CharacterState_setFrames__P191358_mk(s);
+    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
+    s.tmp_0 = character_CharacterState_setFrames__P6142_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg2;
     s.tmp_0.arg4 = s.arg3;
-    s.callLocIdx = 2041; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2048; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setLoopFrames__P191359.info = {"start":4157,"length":130,"line":140,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setLoopFrames","argumentNames":["this","frames","interval","rule"]}
+character_CharacterState_setLoopFrames__P6143.info = {"start":4157,"length":130,"line":140,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setLoopFrames","argumentNames":["this","frames","interval","rule"]}
 
-function character_CharacterState_setLoopFrames__P191359_mk(s) {
+function character_CharacterState_setLoopFrames__P6143_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setLoopFrames__P191359, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setLoopFrames__P6143, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -30121,7 +30211,7 @@ function character_CharacterState_setLoopFrames__P191359_mk(s) {
 
 
 
-function character_CharacterState_setFrames__P191358(s) {
+function character_CharacterState_setFrames__P6142(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30131,10 +30221,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.animation___206306 = undefined;
-    s.unnamed8942___U1 = undefined;
-    s.unnamed8943___U2 = undefined;
-    s.anim___206326 = undefined;
+    s.animation___21250 = undefined;
+    s.unnamed134___U1 = undefined;
+    s.unnamed135___U2 = undefined;
+    s.anim___21270 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30144,7 +30234,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C191357_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["possibleFacingDirections"];
     s.tmp_2 = r0;
@@ -30153,19 +30243,19 @@ switch (step) {
     r0 = (s.tmp_2 | s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["possibleFacingDirections"] = (s.tmp_1);
-    s.animation___206306 = (undefined);
+    s.animation___21250 = (undefined);
     r0 = s.arg0.fields["animations"];
-    s.unnamed8942___U1 = (r0);
-    s.unnamed8943___U2 = (0);
+    s.unnamed134___U1 = (r0);
+    s.unnamed135___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8943___U2;
-    r0 = pxsim_Array__length(s.unnamed8942___U1);
+    s.tmp_0 = r0 = s.unnamed135___U2;
+    r0 = pxsim_Array__length(s.unnamed134___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8942___U1, s.unnamed8943___U2);
-    s.animation___206306 = (r0);
-    r0 = s.animation___206306.fields["rule"];
+    r0 = pxsim_Array__getAt(s.unnamed134___U1, s.unnamed135___U2);
+    s.animation___21250 = (r0);
+    r0 = s.animation___21250.fields["rule"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 === s.arg4);
     s.tmp_2 = r0;
@@ -30173,62 +30263,62 @@ switch (step) {
     if (!r0) { step = 4; continue; }
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 2; continue; }
-    r0 = (s.animation___206306).fields["loopFrames"] = (s.arg2);
-    r0 = (s.animation___206306).fields["loopInterval"] = (s.arg3);
+    r0 = (s.animation___21250).fields["loopFrames"] = (s.arg2);
+    r0 = (s.animation___21250).fields["loopInterval"] = (s.arg3);
     { step = 3; continue; }
   case 2:
-    r0 = (s.animation___206306).fields["startFrames"] = (s.arg2);
-    r0 = (s.animation___206306).fields["startInterval"] = (s.arg3);
+    r0 = (s.animation___21250).fields["startFrames"] = (s.arg2);
+    r0 = (s.animation___21250).fields["startInterval"] = (s.arg3);
   case 3:
     { step = 9; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed8943___U2 + 1);
-    s.unnamed8943___U2 = (r0);
+    r0 = (s.unnamed135___U2 + 1);
+    s.unnamed135___U2 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed8942___U1 = (undefined);
-    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimation__C191355_VT);
+    s.unnamed134___U1 = (undefined);
+    r0 = pxsim_pxtcore_mkClassInstance(character_CharacterAnimation__C6139_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = character_CharacterAnimation_constructor__P191356_mk(s);
+    s.tmp_1 = character_CharacterAnimation_constructor__P6140_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg4;
-    s.callLocIdx = 2040; s.pc = 10; return s.tmp_1;
+    s.callLocIdx = 2047; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    s.anim___206326 = (s.tmp_0);
+    s.anim___21270 = (s.tmp_0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 7; continue; }
-    r0 = (s.anim___206326).fields["loopFrames"] = (s.arg2);
-    r0 = (s.anim___206326).fields["loopInterval"] = (s.arg3);
+    r0 = (s.anim___21270).fields["loopFrames"] = (s.arg2);
+    r0 = (s.anim___21270).fields["loopInterval"] = (s.arg3);
     { step = 8; continue; }
   case 7:
-    r0 = (s.anim___206326).fields["startFrames"] = (s.arg2);
-    r0 = (s.anim___206326).fields["startInterval"] = (s.arg3);
+    r0 = (s.anim___21270).fields["startFrames"] = (s.arg2);
+    r0 = (s.anim___21270).fields["startInterval"] = (s.arg3);
   case 8:
     r0 = s.arg0.fields["animations"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.anim___206326);
+    r0 = pxsim_Array__push(s.tmp_0, s.anim___21270);
   case 9:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setFrames__P191358.info = {"start":3160,"length":987,"line":110,"column":8,"endLine":138,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setFrames","argumentNames":["this","loop","frames","interval","rule"]}
+character_CharacterState_setFrames__P6142.info = {"start":3160,"length":987,"line":110,"column":8,"endLine":138,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setFrames","argumentNames":["this","loop","frames","interval","rule"]}
 
-function character_CharacterState_setFrames__P191358_mk(s) {
+function character_CharacterState_setFrames__P6142_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setFrames__P191358, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setFrames__P6142, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  animation___206306: undefined,
-  unnamed8942___U1: undefined,
-  unnamed8943___U2: undefined,
-  anim___206326: undefined,
+  animation___21250: undefined,
+  unnamed134___U1: undefined,
+  unnamed135___U2: undefined,
+  anim___21270: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30240,7 +30330,7 @@ function character_CharacterState_setFrames__P191358_mk(s) {
 
 
 
-function character_CharacterAnimation_constructor__P191356(s) {
+function character_CharacterAnimation_constructor__P6140(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30256,18 +30346,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterAnimation__C191355_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterAnimation__C6139_VT)) failedCast(r0);
     r0 = (s.arg0).fields["rule"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterAnimation_constructor__P191356.info = {"start":2245,"length":42,"line":77,"column":8,"endLine":78,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","rule"]}
+character_CharacterAnimation_constructor__P6140.info = {"start":2245,"length":42,"line":77,"column":8,"endLine":78,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"inline","argumentNames":["this","rule"]}
 
-function character_CharacterAnimation_constructor__P191356_mk(s) {
+function character_CharacterAnimation_constructor__P6140_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterAnimation_constructor__P191356, depth: s.depth + 1,
+        parent: s, fn: character_CharacterAnimation_constructor__P6140, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -30277,7 +30367,7 @@ function character_CharacterAnimation_constructor__P191356_mk(s) {
 
 
 
-function Number_isNaN__P185310(s) {
+function Number_isNaN__P93(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30308,12 +30398,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Number_isNaN__P185310.info = {"start":355,"length":93,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isNaN","argumentNames":["x"]}
+Number_isNaN__P93.info = {"start":355,"length":93,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isNaN","argumentNames":["x"]}
 
-function Number_isNaN__P185310_mk(s) {
+function Number_isNaN__P93_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Number_isNaN__P185310, depth: s.depth + 1,
+        parent: s, fn: Number_isNaN__P93, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30325,7 +30415,7 @@ function Number_isNaN__P185310_mk(s) {
 
 
 
-function tiles_placeOnRandomTile__P187566(s) {
+function tiles_placeOnRandomTile__P2349(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30335,7 +30425,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.loc___206468 = undefined;
+    s.loc___21412 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30350,8 +30440,8 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_4 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 986; s.pc = 8; return s.tmp_4;
+    s.tmp_4 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 993; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
@@ -30367,18 +30457,18 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_6 = tiles_getRandomTileByType__P187568_mk(s);
+    s.tmp_6 = tiles_getRandomTileByType__P2351_mk(s);
     s.tmp_6.arg0 = s.arg1;
-    s.callLocIdx = 987; s.pc = 9; return s.tmp_6;
+    s.callLocIdx = 994; s.pc = 9; return s.tmp_6;
   case 9:
     r0 = s.retval;
-    s.loc___206468 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.loc___206468);
+    s.loc___21412 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.loc___21412);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = tiles_Location_place__P187513_mk(s);
-    s.tmp_0.arg0 = s.loc___206468;
+    s.tmp_0 = tiles_Location_place__P2296_mk(s);
+    s.tmp_0.arg0 = s.loc___21412;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 988; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 995; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 5:
@@ -30388,12 +30478,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_placeOnRandomTile__P187566.info = {"start":18837,"length":232,"line":581,"column":4,"endLine":586,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"placeOnRandomTile","argumentNames":["sprite","tile"]}
+tiles_placeOnRandomTile__P2349.info = {"start":18837,"length":232,"line":581,"column":4,"endLine":586,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"placeOnRandomTile","argumentNames":["sprite","tile"]}
 
-function tiles_placeOnRandomTile__P187566_mk(s) {
+function tiles_placeOnRandomTile__P2349_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_placeOnRandomTile__P187566, depth: s.depth + 1,
+        parent: s, fn: tiles_placeOnRandomTile__P2349, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30402,7 +30492,7 @@ function tiles_placeOnRandomTile__P187566_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  loc___206468: undefined,
+  loc___21412: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -30411,7 +30501,7 @@ function tiles_placeOnRandomTile__P187566_mk(s) {
 
 
 
-function tiles_getRandomTileByType__P187568(s) {
+function tiles_getRandomTileByType__P2351(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30421,18 +30511,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___206477 = undefined;
-    s.index___206487 = undefined;
-    s.sample___206493 = undefined;
+    s.scene___21421 = undefined;
+    s.index___21431 = undefined;
+    s.sample___21437 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 992; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 999; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___206477 = (r0);
+    s.scene___21421 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -30442,7 +30532,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___206477.fields["tileMap"];
+    r0 = s.scene___21421.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -30456,34 +30546,34 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = tiles_TileMap_getImageType__P187549_mk(s);
-    r0 = s.scene___206477.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getImageType__P2332_mk(s);
+    r0 = s.scene___21421.fields["tileMap"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg0;
-    s.callLocIdx = 993; s.pc = 7; return s.tmp_5;
+    s.callLocIdx = 1000; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
-    s.index___206487 = (r0);
-    s.tmp_0 = tiles_TileMap_sampleTilesByType__P187552_mk(s);
-    r0 = s.scene___206477.fields["tileMap"];
+    s.index___21431 = (r0);
+    s.tmp_0 = tiles_TileMap_sampleTilesByType__P2335_mk(s);
+    r0 = s.scene___21421.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___206487;
+    s.tmp_0.arg1 = s.index___21431;
     s.tmp_0.arg2 = 1;
-    s.callLocIdx = 994; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1001; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.sample___206493 = (r0);
-    r0 = pxsim_Array__getAt(s.sample___206493, 0);
+    s.sample___21437 = (r0);
+    r0 = pxsim_Array__getAt(s.sample___21437, 0);
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getRandomTileByType__P187568.info = {"start":19819,"length":324,"line":608,"column":4,"endLine":615,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getRandomTileByType","argumentNames":["tile"]}
+tiles_getRandomTileByType__P2351.info = {"start":19819,"length":324,"line":608,"column":4,"endLine":615,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getRandomTileByType","argumentNames":["tile"]}
 
-function tiles_getRandomTileByType__P187568_mk(s) {
+function tiles_getRandomTileByType__P2351_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getRandomTileByType__P187568, depth: s.depth + 1,
+        parent: s, fn: tiles_getRandomTileByType__P2351, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30491,9 +30581,9 @@ function tiles_getRandomTileByType__P187568_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___206477: undefined,
-  index___206487: undefined,
-  sample___206493: undefined,
+  scene___21421: undefined,
+  index___21431: undefined,
+  sample___21437: undefined,
   arg0: undefined,
 } }
 
@@ -30501,7 +30591,7 @@ function tiles_getRandomTileByType__P187568_mk(s) {
 
 
 
-function tiles_TileMap_sampleTilesByType__P187552(s) {
+function tiles_TileMap_sampleTilesByType__P2335(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30511,12 +30601,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.count___206513 = undefined;
-    s.reservoir___206514 = undefined;
-    s.col___206516 = undefined;
-    s.row___206523 = undefined;
-    s.currTile___206530 = undefined;
-    s.potentialIndex___206549 = undefined;
+    s.count___21457 = undefined;
+    s.reservoir___21458 = undefined;
+    s.col___21460 = undefined;
+    s.row___21467 = undefined;
+    s.currTile___21474 = undefined;
+    s.potentialIndex___21493 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30524,11 +30614,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMap_isInvalidIndex__P189509_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMap_isInvalidIndex__P4293_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 916; s.pc = 18; return s.tmp_1;
+    s.callLocIdx = 923; s.pc = 18; return s.tmp_1;
   case 18:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -30568,12 +30658,12 @@ switch (step) {
     { step = 17; continue; }
   case 5:
   case 6:
-    s.count___206513 = (0);
+    s.count___21457 = (0);
     r0 = pxsim_Array__mk();
-    s.reservoir___206514 = (r0);
-    s.col___206516 = (0);
+    s.reservoir___21458 = (r0);
+    s.col___21460 = (0);
   case 7:
-    s.tmp_1 = r0 = s.col___206516;
+    s.tmp_1 = r0 = s.col___21460;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_width"];
@@ -30582,9 +30672,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.row___206523 = (0);
+    s.row___21467 = (0);
   case 8:
-    s.tmp_1 = r0 = s.row___206523;
+    s.tmp_1 = r0 = s.row___21467;
     r0 = s.arg0.fields["_map"];
     s.tmp_3 = r0;
     r0 = s.tmp_3.fields["_height"];
@@ -30593,79 +30683,79 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_4 = tiles_TileMapData_getTile__P187527_mk(s);
+    s.tmp_4 = tiles_TileMapData_getTile__P2310_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.col___206516;
-    s.tmp_4.arg2 = s.row___206523;
-    s.callLocIdx = 920; s.pc = 19; return s.tmp_4;
+    s.tmp_4.arg1 = s.col___21460;
+    s.tmp_4.arg2 = s.row___21467;
+    s.callLocIdx = 927; s.pc = 19; return s.tmp_4;
   case 19:
     r0 = s.retval;
-    s.currTile___206530 = (r0);
-    r0 = (s.currTile___206530 === s.arg1);
+    s.currTile___21474 = (r0);
+    r0 = (s.currTile___21474 === s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = (s.count___206513 < s.arg2);
+    r0 = (s.count___21457 < s.arg2);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C187506_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = tiles_Location_constructor__P187509_mk(s);
+    s.tmp_3 = tiles_Location_constructor__P2292_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
-    s.tmp_3.arg1 = s.col___206516;
-    s.tmp_3.arg2 = s.row___206523;
+    s.tmp_3.arg1 = s.col___21460;
+    s.tmp_3.arg2 = s.row___21467;
     s.tmp_3.arg3 = s.arg0;
-    s.callLocIdx = 921; s.pc = 20; return s.tmp_3;
+    s.callLocIdx = 928; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.reservoir___206514, s.tmp_2);
+    r0 = pxsim_Array__push(s.reservoir___21458, s.tmp_2);
     { step = 12; continue; }
   case 9:
-    r0 = pxsim.Math_.randomRange(0, s.count___206513);
-    s.potentialIndex___206549 = (r0);
-    r0 = (s.potentialIndex___206549 < s.arg2);
+    r0 = pxsim.Math_.randomRange(0, s.count___21457);
+    s.potentialIndex___21493 = (r0);
+    r0 = (s.potentialIndex___21493 < s.arg2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C187506_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = tiles_Location_constructor__P187509_mk(s);
+    s.tmp_2 = tiles_Location_constructor__P2292_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = s.col___206516;
-    s.tmp_2.arg2 = s.row___206523;
+    s.tmp_2.arg1 = s.col___21460;
+    s.tmp_2.arg2 = s.row___21467;
     s.tmp_2.arg3 = s.arg0;
-    s.callLocIdx = 922; s.pc = 21; return s.tmp_2;
+    s.callLocIdx = 929; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
-    r0 = pxsim_Array_.setAt(s.reservoir___206514, s.potentialIndex___206549, s.tmp_1);
+    r0 = pxsim_Array_.setAt(s.reservoir___21458, s.potentialIndex___21493, s.tmp_1);
   case 10:
   case 11:
   case 12:
-    r0 = (s.count___206513 + 1);
-    s.count___206513 = (r0);
+    r0 = (s.count___21457 + 1);
+    s.count___21457 = (r0);
   case 13:
   case 14:
-    r0 = (s.row___206523 + 1);
-    s.row___206523 = (r0);
+    r0 = (s.row___21467 + 1);
+    s.row___21467 = (r0);
     { step = 8; continue; }
   case 15:
-    r0 = (s.col___206516 + 1);
-    s.col___206516 = (r0);
+    r0 = (s.col___21460 + 1);
+    s.col___21460 = (r0);
     { step = 7; continue; }
   case 16:
-    r0 = s.reservoir___206514;
+    r0 = s.reservoir___21458;
   case 17:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_sampleTilesByType__P187552.info = {"start":8960,"length":1101,"line":317,"column":8,"endLine":341,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"sampleTilesByType","argumentNames":["this","index","maxCount"]}
+tiles_TileMap_sampleTilesByType__P2335.info = {"start":8960,"length":1101,"line":317,"column":8,"endLine":341,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"sampleTilesByType","argumentNames":["this","index","maxCount"]}
 
-function tiles_TileMap_sampleTilesByType__P187552_mk(s) {
+function tiles_TileMap_sampleTilesByType__P2335_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_sampleTilesByType__P187552, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_sampleTilesByType__P2335, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30677,12 +30767,12 @@ function tiles_TileMap_sampleTilesByType__P187552_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  count___206513: undefined,
-  reservoir___206514: undefined,
-  col___206516: undefined,
-  row___206523: undefined,
-  currTile___206530: undefined,
-  potentialIndex___206549: undefined,
+  count___21457: undefined,
+  reservoir___21458: undefined,
+  col___21460: undefined,
+  row___21467: undefined,
+  currTile___21474: undefined,
+  potentialIndex___21493: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30692,7 +30782,7 @@ function tiles_TileMap_sampleTilesByType__P187552_mk(s) {
 
 
 
-function tiles_Location_place__P187513(s) {
+function tiles_Location_place__P2296(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30708,7 +30798,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C187506_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -30718,21 +30808,21 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = Sprite_setPosition__P187289_mk(s);
+    s.tmp_2 = Sprite_setPosition__P2072_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.tmp_3 = tiles_Location_x__P187510_mk(s);
+    s.tmp_3 = tiles_Location_x__P2293_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 875; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 882; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2.arg1 = r0;
-    s.tmp_4 = tiles_Location_y__P187511_mk(s);
+    s.tmp_4 = tiles_Location_y__P2294_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 876; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 883; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 877; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 884; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
   case 3:
@@ -30740,12 +30830,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_Location_place__P187513.info = {"start":1189,"length":126,"line":51,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"place","argumentNames":["this","mySprite"]}
+tiles_Location_place__P2296.info = {"start":1189,"length":126,"line":51,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"place","argumentNames":["this","mySprite"]}
 
-function tiles_Location_place__P187513_mk(s) {
+function tiles_Location_place__P2296_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_place__P187513, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_place__P2296, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30760,7 +30850,7 @@ function tiles_Location_place__P187513_mk(s) {
 
 
 
-function Sprite_setPosition__P187289(s) {
+function Sprite_setPosition__P2072(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30770,7 +30860,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.physics___204849 = undefined;
+    s.physics___19687 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -30778,18 +30868,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 341; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["physicsEngine"];
-    s.physics___204849 = (r0);
-    s.tmp_0 = PhysicsEngine__C187376_v2_4_mk(s);
-    s.tmp_0.arg0 = s.physics___204849;
+    s.physics___19687 = (r0);
+    s.tmp_0 = PhysicsEngine__C2159_v2_4_mk(s);
+    s.tmp_0.arg0 = s.physics___19687;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_2 = r0 = s.arg1;
-    s.tmp_4 = Sprite_x__P187242_mk(s);
+    s.tmp_4 = Sprite_x__P2025_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.callLocIdx = 342; s.pc = 3; return s.tmp_4;
   case 3:
@@ -30802,7 +30892,7 @@ switch (step) {
     r0 = (s.tmp_5 | 0);
     s.tmp_0.arg2 = r0;
     s.tmp_7 = r0 = s.arg2;
-    s.tmp_9 = Sprite_y__P187244_mk(s);
+    s.tmp_9 = Sprite_y__P2027_mk(s);
     s.tmp_9.arg0 = s.arg0;
     s.callLocIdx = 344; s.pc = 4; return s.tmp_9;
   case 4:
@@ -30814,7 +30904,7 @@ switch (step) {
     s.tmp_10 = r0;
     r0 = (s.tmp_10 | 0);
     s.tmp_0.arg3 = r0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C187376_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_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:
@@ -30823,12 +30913,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setPosition__P187289.info = {"start":11962,"length":220,"line":430,"column":4,"endLine":437,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setPosition","argumentNames":["this","x","y"]}
+Sprite_setPosition__P2072.info = {"start":11962,"length":220,"line":430,"column":4,"endLine":437,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setPosition","argumentNames":["this","x","y"]}
 
-function Sprite_setPosition__P187289_mk(s) {
+function Sprite_setPosition__P2072_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setPosition__P187289, depth: s.depth + 1,
+        parent: s, fn: Sprite_setPosition__P2072, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30841,7 +30931,7 @@ function Sprite_setPosition__P187289_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  physics___204849: undefined,
+  physics___19687: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -30851,7 +30941,7 @@ function Sprite_setPosition__P187289_mk(s) {
 
 
 
-function summon_shark__P427014(s) {
+function summon_shark__P88945(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30861,37 +30951,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    r0 = pxsim.image.ofBuffer(_hex427188);
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    r0 = pxsim.image.ofBuffer(_hex89119);
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.Enemy___187348;
-    s.callLocIdx = 184; s.pc = 3; return s.tmp_0;
+    s.tmp_0.arg1 = globals.Enemy___2131;
+    s.callLocIdx = 182; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.sprite_shark___427184 = (r0);
-    s.tmp_0 = sprites_setDataNumber__P188836_mk(s);
-    s.tmp_0.arg0 = globals.sprite_shark___427184;
+    globals.sprite_shark___89115 = (r0);
+    s.tmp_0 = sprites_setDataNumber__P3619_mk(s);
+    s.tmp_0.arg0 = globals.sprite_shark___89115;
     s.tmp_0.arg1 = "speed_dif";
     s.tmp_0.arg2 = 0;
-    s.callLocIdx = 185; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 183; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = tiles_placeOnRandomTile__P187566_mk(s);
-    s.tmp_0.arg0 = globals.sprite_shark___427184;
-    s.tmp_0.arg1 = globals.tile15___189164;
-    s.callLocIdx = 186; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = tiles_placeOnRandomTile__P2349_mk(s);
+    s.tmp_0.arg0 = globals.sprite_shark___89115;
+    s.tmp_0.arg1 = globals.tile15___3948;
+    s.callLocIdx = 184; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
-    s.tmp_2 = tiles_locationXY__P189008_mk(s);
-    s.tmp_3 = tiles_locationOfSprite__P188992_mk(s);
-    s.tmp_3.arg0 = globals.sprite_shark___427184;
-    s.callLocIdx = 187; s.pc = 7; return s.tmp_3;
+    s.tmp_2 = tiles_locationXY__P3791_mk(s);
+    s.tmp_3 = tiles_locationOfSprite__P3775_mk(s);
+    s.tmp_3.arg0 = globals.sprite_shark___89115;
+    s.callLocIdx = 185; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 188; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 186; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -30899,68 +30989,68 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_4 = tiles_placeOnRandomTile__P187566_mk(s);
-    s.tmp_4.arg0 = globals.sprite_shark___427184;
-    s.tmp_4.arg1 = globals.tile15___189164;
-    s.callLocIdx = 189; s.pc = 8; return s.tmp_4;
+    s.tmp_4 = tiles_placeOnRandomTile__P2349_mk(s);
+    s.tmp_4.arg0 = globals.sprite_shark___89115;
+    s.tmp_4.arg1 = globals.tile15___3948;
+    s.callLocIdx = 187; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     { step = 1; continue; }
   case 2:
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex427209);
+    r0 = pxsim.image.ofBuffer(_hex89140);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_2 = character_loopFrames__P188956_mk(s);
-    s.tmp_2.arg0 = globals.sprite_shark___427184;
+    s.tmp_2 = character_loopFrames__P3739_mk(s);
+    s.tmp_2.arg0 = globals.sprite_shark___89115;
     s.tmp_2.arg1 = s.tmp_0;
     s.tmp_2.arg2 = 250;
-    s.tmp_3 = character_rule__P188962_mk(s);
+    s.tmp_3 = character_rule__P3745_mk(s);
     s.tmp_3.arg0 = 512;
     s.tmp_3.arg1 = undefined;
     s.tmp_3.arg2 = undefined;
     s.tmp_3.arg3 = undefined;
     s.tmp_3.arg4 = undefined;
-    s.callLocIdx = 190; s.pc = 10; return s.tmp_3;
+    s.callLocIdx = 188; s.pc = 10; return s.tmp_3;
   case 10:
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
-    s.callLocIdx = 191; s.pc = 9; return s.tmp_2;
+    s.callLocIdx = 189; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim.image.ofBuffer(_hex427220);
+    r0 = pxsim.image.ofBuffer(_hex89151);
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.tmp_2 = character_loopFrames__P188956_mk(s);
-    s.tmp_2.arg0 = globals.sprite_shark___427184;
+    s.tmp_2 = character_loopFrames__P3739_mk(s);
+    s.tmp_2.arg0 = globals.sprite_shark___89115;
     s.tmp_2.arg1 = s.tmp_0;
     s.tmp_2.arg2 = 250;
-    s.tmp_3 = character_rule__P188962_mk(s);
+    s.tmp_3 = character_rule__P3745_mk(s);
     s.tmp_3.arg0 = 128;
     s.tmp_3.arg1 = undefined;
     s.tmp_3.arg2 = undefined;
     s.tmp_3.arg3 = undefined;
     s.tmp_3.arg4 = undefined;
-    s.callLocIdx = 192; s.pc = 12; return s.tmp_3;
+    s.callLocIdx = 190; s.pc = 12; return s.tmp_3;
   case 12:
     r0 = s.retval;
     s.tmp_2.arg3 = r0;
-    s.callLocIdx = 193; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 191; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
-    r0 = globals.sprite_shark___427184;
+    r0 = globals.sprite_shark___89115;
     return leave(s, r0)
   default: oops()
 } } }
-summon_shark__P427014.info = {"start":16912,"length":2606,"line":317,"column":0,"endLine":388,"endColumn":1,"fileName":"main.ts","functionName":"summon_shark","argumentNames":[]}
+summon_shark__P88945.info = {"start":19485,"length":2606,"line":380,"column":0,"endLine":451,"endColumn":1,"fileName":"main.ts","functionName":"summon_shark","argumentNames":[]}
 
-function summon_shark__P427014_mk(s) {
+function summon_shark__P88945_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: summon_shark__P427014, depth: s.depth + 1,
+        parent: s, fn: summon_shark__P88945, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -30969,14 +31059,14 @@ function summon_shark__P427014_mk(s) {
   tmp_4: undefined,
 } }
 
-const _hex427188 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex427209 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
-const _hex427220 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000000000000000000000000000000000cc000000f00f0000bcfc00f0bf0f0000bcbbffcfbb0f0000c0bbcbbcfb000000c0ddbbbc0f00000000ccbffc0000000000f0cffc0000000000cfccbc0c00000000cfccdc0c000000f0ccccbccd000000f0cccccccd000000f0ccccccdd0cff00cfbbcbcccdfccfffbfbbbbccccfbbfcbbcbbbbcbbffbdcbbbccbbbbbbbfddcbdbcbcbbbbdbfcc0cdcccbbcbbbb0fc0ccbcbc1b11fc0c00fcbcbb1111110c0000bffb1f1c110c0000bffb1fcc110c0000bfbb1113cc000000bfbb1133c3000000bfbb1bc1c1000000f0bb1bc1fc000000f0bbbbc10f00000000bfbcfb0000000000f0bb0f0000000000f0ff000000")
+const _hex89119 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex89140 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000f0ff000000000000f0bb0f0000000000bfbcfb00000000f0bbbbc10f000000f0bb1bc1fc000000bfbb1bc1c1000000bfbb1133c3000000bfbb1113cc000000bffb1fcc110c0000bffb1f1c110c00fcbcbb1111110cc0ccbcbc1b11fc0cc0cdcccbbcbbbb0fdcbdbcbcbbbbdbfcdcbbbccbbbbbbbfdbfcbbcbbbbcbbffbcfffbfbbbbccccfbff00cfbbcbcccdfc0000f0ccccccdd0c0000f0cccccccd000000f0ccccbccd00000000cfccdc0c00000000cfccbc0c00000000f0cffc0000000000ccbffc00000000c0ddbbbc0f000000c0bbcbbcfb000000bcbbffcfbb0f0000bcfc00f0bf0f0000cc000000f00f00000000000000000000000000000000")
+const _hex89151 = pxsim.BufferMethods.createBufferFromHex("8704200010000000000000000000000000000000000000000000cc000000f00f0000bcfc00f0bf0f0000bcbbffcfbb0f0000c0bbcbbcfb000000c0ddbbbc0f00000000ccbffc0000000000f0cffc0000000000cfccbc0c00000000cfccdc0c000000f0ccccbccd000000f0cccccccd000000f0ccccccdd0cff00cfbbcbcccdfccfffbfbbbbccccfbbfcbbcbbbbcbbffbdcbbbccbbbbbbbfddcbdbcbcbbbbdbfcc0cdcccbbcbbbb0fc0ccbcbc1b11fc0c00fcbcbb1111110c0000bffb1f1c110c0000bffb1fcc110c0000bfbb1113cc000000bfbb1133c3000000bfbb1bc1c1000000f0bb1bc1fc000000f0bbbbc10f00000000bfbcfb0000000000f0bb0f0000000000f0ff000000")
 
 
 
 
-function game_runtime__P187765(s) {
+function game_runtime__P2548(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -30986,8 +31076,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_1 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1218; s.pc = 1; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1225; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -30995,12 +31085,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_runtime__P187765.info = {"start":10291,"length":81,"line":332,"column":4,"endLine":334,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"runtime","argumentNames":[]}
+game_runtime__P2548.info = {"start":10291,"length":81,"line":332,"column":4,"endLine":334,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"runtime","argumentNames":[]}
 
-function game_runtime__P187765_mk(s) {
+function game_runtime__P2548_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_runtime__P187765, depth: s.depth + 1,
+        parent: s, fn: game_runtime__P2548, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31010,7 +31100,7 @@ function game_runtime__P187765_mk(s) {
 
 
 
-function blockSettings_writeNumber__P188966(s) {
+function blockSettings_writeNumber__P3749(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31025,22 +31115,22 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = settings_writeNumber__P187046_mk(s);
+    s.tmp_0 = settings_writeNumber__P1829_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 75; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2093; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockSettings_writeNumber__P188966.info = {"start":401,"length":107,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"writeNumber","argumentNames":["name","value"]}
+blockSettings_writeNumber__P3749.info = {"start":401,"length":107,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"writeNumber","argumentNames":["name","value"]}
 
-function blockSettings_writeNumber__P188966_mk(s) {
+function blockSettings_writeNumber__P3749_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockSettings_writeNumber__P188966, depth: s.depth + 1,
+        parent: s, fn: blockSettings_writeNumber__P3749, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31051,7 +31141,7 @@ function blockSettings_writeNumber__P188966_mk(s) {
 
 
 
-function settings_writeNumber__P187046(s) {
+function settings_writeNumber__P1829(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31069,9 +31159,9 @@ switch (step) {
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.arg1);
-    s.tmp_1 = settings_writeBuffer__P187044_mk(s);
+    s.tmp_1 = settings_writeBuffer__P1827_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = msgpack_packNumberArray__P185394_mk(s);
+    s.tmp_2 = msgpack_packNumberArray__P177_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.callLocIdx = 164; s.pc = 2; return s.tmp_2;
   case 2:
@@ -31084,12 +31174,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeNumber__P187046.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__P1829.info = {"start":2087,"length":122,"line":82,"column":4,"endLine":84,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeNumber","argumentNames":["key","value"]}
 
-function settings_writeNumber__P187046_mk(s) {
+function settings_writeNumber__P1829_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeNumber__P187046, depth: s.depth + 1,
+        parent: s, fn: settings_writeNumber__P1829, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31102,7 +31192,7 @@ function settings_writeNumber__P187046_mk(s) {
 
 
 
-function settings_writeBuffer__P187044(s) {
+function settings_writeBuffer__P1827(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31129,12 +31219,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeBuffer__P187044.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__P1827.info = {"start":1538,"length":290,"line":63,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeBuffer","argumentNames":["key","value"]}
 
-function settings_writeBuffer__P187044_mk(s) {
+function settings_writeBuffer__P1827_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeBuffer__P187044, depth: s.depth + 1,
+        parent: s, fn: settings_writeBuffer__P1827, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31145,7 +31235,7 @@ function settings_writeBuffer__P187044_mk(s) {
 
 
 
-function msgpack_packNumberArray__P185394(s) {
+function msgpack_packNumberArray__P177(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31155,100 +31245,100 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.off___203505 = undefined;
-    s.n___203507 = undefined;
-    s.unnamed8892___U2 = undefined;
-    s.unnamed8893___U3 = undefined;
-    s.buf___203517 = undefined;
-    s.n___203523 = undefined;
-    s.unnamed8894___U6 = undefined;
-    s.unnamed8895___U7 = undefined;
+    s.off___8262 = undefined;
+    s.n___8264 = undefined;
+    s.unnamed84___U2 = undefined;
+    s.unnamed85___U3 = undefined;
+    s.buf___8274 = undefined;
+    s.n___8280 = undefined;
+    s.unnamed86___U6 = undefined;
+    s.unnamed87___U7 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.off___203505 = (0);
-    s.n___203507 = (undefined);
-    s.unnamed8892___U2 = (s.arg0);
-    s.unnamed8893___U3 = (0);
+    s.off___8262 = (0);
+    s.n___8264 = (undefined);
+    s.unnamed84___U2 = (s.arg0);
+    s.unnamed85___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8893___U3;
-    r0 = pxsim_Array__length(s.unnamed8892___U2);
+    s.tmp_0 = r0 = s.unnamed85___U3;
+    r0 = pxsim_Array__length(s.unnamed84___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8892___U2, s.unnamed8893___U3);
-    s.n___203507 = (r0);
-    s.tmp_2 = r0 = s.off___203505;
-    s.tmp_4 = msgpack_packNumberCore__P189189_mk(s);
+    r0 = pxsim_Array__getAt(s.unnamed84___U2, s.unnamed85___U3);
+    s.n___8264 = (r0);
+    s.tmp_2 = r0 = s.off___8262;
+    s.tmp_4 = msgpack_packNumberCore__P3973_mk(s);
     s.tmp_4.arg0 = null;
-    s.tmp_4.arg1 = s.off___203505;
-    s.tmp_4.arg2 = s.n___203507;
+    s.tmp_4.arg1 = s.off___8262;
+    s.tmp_4.arg2 = s.n___8264;
     s.callLocIdx = 23; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
-    s.off___203505 = (r0);
-    r0 = (s.unnamed8893___U3 + 1);
-    s.unnamed8893___U3 = (r0);
+    s.off___8262 = (r0);
+    r0 = (s.unnamed85___U3 + 1);
+    s.unnamed85___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed8892___U2 = (undefined);
-    r0 = pxsim.control.createBuffer(s.off___203505);
-    s.buf___203517 = (r0);
-    s.off___203505 = (0);
-    s.n___203523 = (undefined);
-    s.unnamed8894___U6 = (s.arg0);
-    s.unnamed8895___U7 = (0);
+    s.unnamed84___U2 = (undefined);
+    r0 = pxsim.control.createBuffer(s.off___8262);
+    s.buf___8274 = (r0);
+    s.off___8262 = (0);
+    s.n___8280 = (undefined);
+    s.unnamed86___U6 = (s.arg0);
+    s.unnamed87___U7 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed8895___U7;
-    r0 = pxsim_Array__length(s.unnamed8894___U6);
+    s.tmp_0 = r0 = s.unnamed87___U7;
+    r0 = pxsim_Array__length(s.unnamed86___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8894___U6, s.unnamed8895___U7);
-    s.n___203523 = (r0);
-    s.tmp_2 = r0 = s.off___203505;
-    s.tmp_4 = msgpack_packNumberCore__P189189_mk(s);
-    s.tmp_4.arg0 = s.buf___203517;
-    s.tmp_4.arg1 = s.off___203505;
-    s.tmp_4.arg2 = s.n___203523;
+    r0 = pxsim_Array__getAt(s.unnamed86___U6, s.unnamed87___U7);
+    s.n___8280 = (r0);
+    s.tmp_2 = r0 = s.off___8262;
+    s.tmp_4 = msgpack_packNumberCore__P3973_mk(s);
+    s.tmp_4.arg0 = s.buf___8274;
+    s.tmp_4.arg1 = s.off___8262;
+    s.tmp_4.arg2 = s.n___8280;
     s.callLocIdx = 24; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
-    s.off___203505 = (r0);
-    r0 = (s.unnamed8895___U7 + 1);
-    s.unnamed8895___U7 = (r0);
+    s.off___8262 = (r0);
+    r0 = (s.unnamed87___U7 + 1);
+    s.unnamed87___U7 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed8894___U6 = (undefined);
-    r0 = s.buf___203517;
+    s.unnamed86___U6 = (undefined);
+    r0 = s.buf___8274;
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_packNumberArray__P185394.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__P177.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__P185394_mk(s) {
+function msgpack_packNumberArray__P177_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_packNumberArray__P185394, depth: s.depth + 1,
+        parent: s, fn: msgpack_packNumberArray__P177, 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___203505: undefined,
-  n___203507: undefined,
-  unnamed8892___U2: undefined,
-  unnamed8893___U3: undefined,
-  buf___203517: undefined,
-  n___203523: undefined,
-  unnamed8894___U6: undefined,
-  unnamed8895___U7: undefined,
+  off___8262: undefined,
+  n___8264: undefined,
+  unnamed84___U2: undefined,
+  unnamed85___U3: undefined,
+  buf___8274: undefined,
+  n___8280: undefined,
+  unnamed86___U6: undefined,
+  unnamed87___U7: undefined,
   arg0: undefined,
 } }
 
@@ -31256,7 +31346,7 @@ function msgpack_packNumberArray__P185394_mk(s) {
 
 
 
-function msgpack_packNumberCore__P189189(s) {
+function msgpack_packNumberCore__P3973(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31266,15 +31356,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tag___203537 = undefined;
-    s.fmt___203580 = undefined;
+    s.tag___8294 = undefined;
+    s.fmt___8337 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tag___203537 = (203);
+    s.tag___8294 = (203);
     s.tmp_1 = r0 = s.arg2;
     r0 = (s.arg2 << 0);
     s.tmp_2 = r0;
@@ -31324,17 +31414,17 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 8; continue; }
-    s.tag___203537 = (204);
+    s.tag___8294 = (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___203537 = (205);
+    s.tag___8294 = (205);
     { step = 10; continue; }
   case 9:
-    s.tag___203537 = (206);
+    s.tag___8294 = (206);
   case 10:
   case 11:
     { step = 17; continue; }
@@ -31343,41 +31433,41 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    s.tag___203537 = (208);
+    s.tag___8294 = (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___203537 = (209);
+    s.tag___8294 = (209);
     { step = 15; continue; }
   case 14:
-    s.tag___203537 = (210);
+    s.tag___8294 = (210);
   case 15:
   case 16:
   case 17:
   case 18:
   case 19:
   case 20:
-    s.tmp_0 = msgpack_tagFormat__P189188_mk(s);
-    s.tmp_0.arg0 = s.tag___203537;
+    s.tmp_0 = msgpack_tagFormat__P3972_mk(s);
+    s.tmp_0.arg0 = s.tag___8294;
     s.callLocIdx = 19; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.fmt___203580 = (r0);
+    s.fmt___8337 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 21; continue; }
-    r0 = pxsim.BufferMethods.setByte(s.arg0, s.arg1, s.tag___203537);
+    r0 = pxsim.BufferMethods.setByte(s.arg0, s.arg1, s.tag___8294);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.fmt___203580;
+    s.tmp_1 = r0 = s.fmt___8337;
     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__P185385_mk(s);
-    s.tmp_1.arg0 = s.fmt___203580;
+    s.tmp_1 = pins_sizeOf__P168_mk(s);
+    s.tmp_1.arg0 = s.fmt___8337;
     s.callLocIdx = 20; s.pc = 25; return s.tmp_1;
   case 25:
     r0 = s.retval;
@@ -31387,12 +31477,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_packNumberCore__P189189.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__P3973.info = {"start":1632,"length":951,"line":56,"column":4,"endLine":86,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"packNumberCore","argumentNames":["buf","offset","num"]}
 
-function msgpack_packNumberCore__P189189_mk(s) {
+function msgpack_packNumberCore__P3973_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_packNumberCore__P189189, depth: s.depth + 1,
+        parent: s, fn: msgpack_packNumberCore__P3973, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31402,8 +31492,8 @@ function msgpack_packNumberCore__P189189_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  tag___203537: undefined,
-  fmt___203580: undefined,
+  tag___8294: undefined,
+  fmt___8337: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -31413,7 +31503,7 @@ function msgpack_packNumberCore__P189189_mk(s) {
 
 
 
-function msgpack_tagFormat__P189188(s) {
+function msgpack_tagFormat__P3972(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31473,12 +31563,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_tagFormat__P189188.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__P3972.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__P189188_mk(s) {
+function msgpack_tagFormat__P3972_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_tagFormat__P189188, depth: s.depth + 1,
+        parent: s, fn: msgpack_tagFormat__P3972, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31488,7 +31578,7 @@ function msgpack_tagFormat__P189188_mk(s) {
 
 
 
-function pins_sizeOf__P185385(s) {
+function pins_sizeOf__P168(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31502,7 +31592,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Buffer_sizeOfNumberFormat__P185421_mk(s);
+    s.tmp_0 = Buffer_sizeOfNumberFormat__P204_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 18; s.pc = 1; return s.tmp_0;
   case 1:
@@ -31510,12 +31600,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pins_sizeOf__P185385.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__P168.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__P185385_mk(s) {
+function pins_sizeOf__P168_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pins_sizeOf__P185385, depth: s.depth + 1,
+        parent: s, fn: pins_sizeOf__P168, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31525,7 +31615,7 @@ function pins_sizeOf__P185385_mk(s) {
 
 
 
-function Buffer_sizeOfNumberFormat__P185421(s) {
+function Buffer_sizeOfNumberFormat__P204(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31604,12 +31694,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Buffer_sizeOfNumberFormat__P185421.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__P204.info = {"start":12467,"length":856,"line":427,"column":4,"endLine":451,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"sizeOfNumberFormat","argumentNames":["format"]}
 
-function Buffer_sizeOfNumberFormat__P185421_mk(s) {
+function Buffer_sizeOfNumberFormat__P204_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Buffer_sizeOfNumberFormat__P185421, depth: s.depth + 1,
+        parent: s, fn: Buffer_sizeOfNumberFormat__P204, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -31619,7 +31709,7 @@ function Buffer_sizeOfNumberFormat__P185421_mk(s) {
 
 
 
-function fade_in__P426899(s) {
+function fade_in__P88839(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31629,14 +31719,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = color_startFade__P188787_mk(s);
-    s.tmp_0.arg0 = globals.originalPalette___188791;
-    s.tmp_0.arg1 = globals.Black___188802;
+    s.tmp_0 = color_startFade__P3570_mk(s);
+    s.tmp_0.arg0 = globals.originalPalette___3574;
+    s.tmp_0.arg1 = globals.Black___3585;
     s.tmp_0.arg2 = 2000;
     s.callLocIdx = 134; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = color_pauseUntilFadeDone__P188789_mk(s);
+    s.tmp_0 = color_pauseUntilFadeDone__P3572_mk(s);
     s.callLocIdx = 135; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
@@ -31644,12 +31734,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-fade_in__P426899.info = {"start":5935,"length":116,"line":155,"column":0,"endLine":158,"endColumn":1,"fileName":"main.ts","functionName":"fade_in","argumentNames":[]}
+fade_in__P88839.info = {"start":8661,"length":116,"line":223,"column":0,"endLine":226,"endColumn":1,"fileName":"main.ts","functionName":"fade_in","argumentNames":[]}
 
-function fade_in__P426899_mk(s) {
+function fade_in__P88839_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: fade_in__P426899, depth: s.depth + 1,
+        parent: s, fn: fade_in__P88839, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -31658,7 +31748,7 @@ function fade_in__P426899_mk(s) {
 
 
 
-function color_pauseUntilFadeDone__P188789(s) {
+function color_pauseUntilFadeDone__P3572(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31668,11 +31758,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.activeFade___191199);
+    r0 = pxsim_numops_toBoolDecr(globals.activeFade___5983);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = color_Fade_pauseUntilDone__P188782_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___191199;
-    s.callLocIdx = 1737; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = color_Fade_pauseUntilDone__P3565_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___5983;
+    s.callLocIdx = 1744; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
@@ -31681,12 +31771,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_pauseUntilFadeDone__P188789.info = {"start":7302,"length":121,"line":258,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilFadeDone","argumentNames":[]}
+color_pauseUntilFadeDone__P3572.info = {"start":7302,"length":121,"line":258,"column":4,"endLine":262,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilFadeDone","argumentNames":[]}
 
-function color_pauseUntilFadeDone__P188789_mk(s) {
+function color_pauseUntilFadeDone__P3572_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_pauseUntilFadeDone__P188789, depth: s.depth + 1,
+        parent: s, fn: color_pauseUntilFadeDone__P3572, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -31695,7 +31785,7 @@ function color_pauseUntilFadeDone__P188789_mk(s) {
 
 
 
-function color_Fade_pauseUntilDone__P188782(s) {
+function color_Fade_pauseUntilDone__P3565(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31710,26 +31800,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P205128);
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P19966);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = pauseUntil__P185573_mk(s);
+    s.tmp_1 = pauseUntil__P356_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1723; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1730; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.arg0;
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_pauseUntilDone__P188782.info = {"start":2872,"length":114,"line":102,"column":8,"endLine":105,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilDone","argumentNames":["this"]}
+color_Fade_pauseUntilDone__P3565.info = {"start":2872,"length":114,"line":102,"column":8,"endLine":105,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"pauseUntilDone","argumentNames":["this"]}
 
-function color_Fade_pauseUntilDone__P188782_mk(s) {
+function color_Fade_pauseUntilDone__P3565_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_pauseUntilDone__P188782, depth: s.depth + 1,
+        parent: s, fn: color_Fade_pauseUntilDone__P3565, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31740,7 +31830,7 @@ function color_Fade_pauseUntilDone__P188782_mk(s) {
 
 
 
-function inline__P205128(s) {
+function inline__P19966(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31750,9 +31840,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_2 = color_Fade_isActive__P188772_mk(s);
+    s.tmp_2 = color_Fade_isActive__P3555_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 1722; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1729; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -31762,12 +31852,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P205128.info = {"start":2927,"length":22,"line":103,"column":23,"endLine":103,"endColumn":45,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P19966.info = {"start":2927,"length":22,"line":103,"column":23,"endLine":103,"endColumn":45,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P205128_mk(s) {
+function inline__P19966_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P205128, depth: s.depth + 1,
+        parent: s, fn: inline__P19966, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31778,7 +31868,7 @@ function inline__P205128_mk(s) {
 
 
 
-function color_Fade_isActive__P188772(s) {
+function color_Fade_isActive__P3555(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31793,7 +31883,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
     r0 = s.arg0.fields["startTime"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
@@ -31820,8 +31910,8 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
-    s.tmp_8 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 1704; s.pc = 5; return s.tmp_8;
+    s.tmp_8 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 1711; s.pc = 5; return s.tmp_8;
   case 5:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -31833,12 +31923,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_isActive__P188772.info = {"start":623,"length":201,"line":23,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"isActive","argumentNames":["this"]}
+color_Fade_isActive__P3555.info = {"start":623,"length":201,"line":23,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"isActive","argumentNames":["this"]}
 
-function color_Fade_isActive__P188772_mk(s) {
+function color_Fade_isActive__P3555_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_isActive__P188772, depth: s.depth + 1,
+        parent: s, fn: color_Fade_isActive__P3555, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31857,7 +31947,7 @@ function color_Fade_isActive__P188772_mk(s) {
 
 
 
-function color_bufferToPalette__P188761(s) {
+function color_bufferToPalette__P3544(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31867,40 +31957,40 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___205155 = undefined;
+    s.p___19993 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C188747_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P188710_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     r0 = pxsim.BufferMethods.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 3);
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1687; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1694; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    s.p___205155 = (s.tmp_0);
-    r0 = (s.p___205155).fields["buf"] = (s.arg0);
-    r0 = s.p___205155;
+    s.p___19993 = (s.tmp_0);
+    r0 = (s.p___19993).fields["buf"] = (s.arg0);
+    r0 = s.p___19993;
     return leave(s, r0)
   default: oops()
 } } }
-color_bufferToPalette__P188761.info = {"start":10280,"length":147,"line":335,"column":4,"endLine":339,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"bufferToPalette","argumentNames":["buf"]}
+color_bufferToPalette__P3544.info = {"start":10280,"length":147,"line":335,"column":4,"endLine":339,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"bufferToPalette","argumentNames":["buf"]}
 
-function color_bufferToPalette__P188761_mk(s) {
+function color_bufferToPalette__P3544_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_bufferToPalette__P188761, depth: s.depth + 1,
+        parent: s, fn: color_bufferToPalette__P3544, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  p___205155: undefined,
+  p___19993: undefined,
   arg0: undefined,
 } }
 
@@ -31908,7 +31998,7 @@ function color_bufferToPalette__P188761_mk(s) {
 
 
 
-function color_ColorBuffer_constructor__P188710(s) {
+function color_ColorBuffer_constructor__P3493(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31925,7 +32015,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C188707_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -31940,9 +32030,9 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg1 | 0);
     s.tmp_3 = r0;
-    s.tmp_5 = color_ColorBuffer_stride__P188712_mk(s);
+    s.tmp_5 = color_ColorBuffer_stride__P3495_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1676; s.pc = 3; return s.tmp_5;
+    s.callLocIdx = 1683; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -31955,12 +32045,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_constructor__P188710.info = {"start":338,"length":199,"line":19,"column":8,"endLine":22,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"inline","argumentNames":["this","length","layout"]}
+color_ColorBuffer_constructor__P3493.info = {"start":338,"length":199,"line":19,"column":8,"endLine":22,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"inline","argumentNames":["this","length","layout"]}
 
-function color_ColorBuffer_constructor__P188710_mk(s) {
+function color_ColorBuffer_constructor__P3493_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_constructor__P188710, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_constructor__P3493, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -31977,7 +32067,7 @@ function color_ColorBuffer_constructor__P188710_mk(s) {
 
 
 
-function color_ColorBuffer_stride__P188712(s) {
+function color_ColorBuffer_stride__P3495(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -31992,7 +32082,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C188707_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
     r0 = s.arg0.fields["layout"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
@@ -32010,13 +32100,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_stride__P188712.info = {"start":737,"length":89,"line":30,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"stride","argumentNames":["this"]}
-color_ColorBuffer_stride__P188712.isGetter = true;
+color_ColorBuffer_stride__P3495.info = {"start":737,"length":89,"line":30,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"stride","argumentNames":["this"]}
+color_ColorBuffer_stride__P3495.isGetter = true;
 
-function color_ColorBuffer_stride__P188712_mk(s) {
+function color_ColorBuffer_stride__P3495_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_stride__P188712, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_stride__P3495, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32028,7 +32118,7 @@ function color_ColorBuffer_stride__P188712_mk(s) {
 
 
 
-function color_startFade__P188787(s) {
+function color_startFade__P3570(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32064,15 +32154,15 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 4; continue; }
   case 3:
-    s.tmp_5 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_5 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1731; s.pc = 8; return s.tmp_5;
+    s.callLocIdx = 1738; s.pc = 8; return s.tmp_5;
   case 8:
     r0 = s.retval;
     s.tmp_4 = r0;
-    s.tmp_7 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_7 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_7.arg0 = s.arg1;
-    s.callLocIdx = 1732; s.pc = 9; return s.tmp_7;
+    s.callLocIdx = 1739; s.pc = 9; return s.tmp_7;
   case 9:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -32085,26 +32175,26 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    r0 = pxsim_pxtcore_mkClassInstance(color_Fade__C188768_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Fade__C3551_VT);
     s.tmp_9 = r0;
     r0 = undefined;
-    globals.activeFade___191199 = (s.tmp_9);
-    s.tmp_0 = color_Fade_setStartPalette__P188776_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___191199;
+    globals.activeFade___5983 = (s.tmp_9);
+    s.tmp_0 = color_Fade_setStartPalette__P3559_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___5983;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1734; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1741; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.tmp_0 = color_Fade_setEndPalette__P188778_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___191199;
+    s.tmp_0 = color_Fade_setEndPalette__P3561_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___5983;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1735; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1742; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.tmp_0 = color_Fade_start__P188773_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___191199;
+    s.tmp_0 = color_Fade_start__P3556_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___5983;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1736; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1743; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
   case 7:
@@ -32112,12 +32202,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_startFade__P188787.info = {"start":6657,"length":310,"line":238,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startFade","argumentNames":["start","end","duration"]}
+color_startFade__P3570.info = {"start":6657,"length":310,"line":238,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startFade","argumentNames":["start","end","duration"]}
 
-function color_startFade__P188787_mk(s) {
+function color_startFade__P3570_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_startFade__P188787, depth: s.depth + 1,
+        parent: s, fn: color_startFade__P3570, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32138,7 +32228,7 @@ function color_startFade__P188787_mk(s) {
 
 
 
-function color_Fade_setEndPalette__P188778(s) {
+function color_Fade_setEndPalette__P3561(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32154,11 +32244,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = color__clone__P188766_mk(s);
+    s.tmp_2 = color__clone__P3549_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 1710; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1717; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -32167,12 +32257,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_setEndPalette__P188778.info = {"start":1647,"length":127,"line":59,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setEndPalette","argumentNames":["this","colors"]}
+color_Fade_setEndPalette__P3561.info = {"start":1647,"length":127,"line":59,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setEndPalette","argumentNames":["this","colors"]}
 
-function color_Fade_setEndPalette__P188778_mk(s) {
+function color_Fade_setEndPalette__P3561_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_setEndPalette__P188778, depth: s.depth + 1,
+        parent: s, fn: color_Fade_setEndPalette__P3561, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32185,7 +32275,7 @@ function color_Fade_setEndPalette__P188778_mk(s) {
 
 
 
-function color__clone__P188766(s) {
+function color__clone__P3549(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32195,33 +32285,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.out___205255 = undefined;
-    s.i___205261 = undefined;
+    s.out___20093 = undefined;
+    s.i___20099 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C188747_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P188710_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_2 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1698; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1705; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1699; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1706; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.out___205255 = (s.tmp_0);
-    s.i___205261 = (0);
+    s.out___20093 = (s.tmp_0);
+    s.i___20099 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___205261;
-    s.tmp_3 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_1 = r0 = s.i___20099;
+    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1700; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1707; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32229,33 +32319,33 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_4 = color_ColorBuffer_setColor__P188715_mk(s);
-    s.tmp_4.arg0 = s.out___205255;
-    s.tmp_4.arg1 = s.i___205261;
-    s.tmp_5 = color_ColorBuffer_color__P188714_mk(s);
+    s.tmp_4 = color_ColorBuffer_setColor__P3498_mk(s);
+    s.tmp_4.arg0 = s.out___20093;
+    s.tmp_4.arg1 = s.i___20099;
+    s.tmp_5 = color_ColorBuffer_color__P3497_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.tmp_5.arg1 = s.i___205261;
-    s.callLocIdx = 1701; s.pc = 7; return s.tmp_5;
+    s.tmp_5.arg1 = s.i___20099;
+    s.callLocIdx = 1708; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
     s.tmp_4.arg2 = r0;
-    s.callLocIdx = 1702; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1709; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    r0 = (s.i___205261 + 1);
-    s.i___205261 = (r0);
+    r0 = (s.i___20099 + 1);
+    s.i___20099 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.out___205255;
+    r0 = s.out___20093;
     return leave(s, r0)
   default: oops()
 } } }
-color__clone__P188766.info = {"start":12453,"length":200,"line":408,"column":4,"endLine":414,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"_clone","argumentNames":["p"]}
+color__clone__P3549.info = {"start":12453,"length":200,"line":408,"column":4,"endLine":414,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"_clone","argumentNames":["p"]}
 
-function color__clone__P188766_mk(s) {
+function color__clone__P3549_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color__clone__P188766, depth: s.depth + 1,
+        parent: s, fn: color__clone__P3549, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32263,8 +32353,8 @@ function color__clone__P188766_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  out___205255: undefined,
-  i___205261: undefined,
+  out___20093: undefined,
+  i___20099: undefined,
   arg0: undefined,
 } }
 
@@ -32272,7 +32362,7 @@ function color__clone__P188766_mk(s) {
 
 
 
-function color_ColorBuffer_setColor__P188715(s) {
+function color_ColorBuffer_setColor__P3498(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32282,9 +32372,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___205330 = undefined;
-    s.start___205332 = undefined;
-    s.i___205336 = undefined;
+    s.s___20168 = undefined;
+    s.start___20170 = undefined;
+    s.i___20174 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -32292,7 +32382,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C188707_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
     r0 = (s.arg1 | 0);
     s.arg1 = (r0);
     r0 = (s.arg1 < 0);
@@ -32303,9 +32393,9 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1680; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 1687; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32318,32 +32408,32 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_5 = color_ColorBuffer_stride__P188712_mk(s);
+    s.tmp_5 = color_ColorBuffer_stride__P3495_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1681; s.pc = 9; return s.tmp_5;
+    s.callLocIdx = 1688; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
-    s.s___205330 = (r0);
-    r0 = (s.arg1 * s.s___205330);
-    s.start___205332 = (r0);
-    r0 = (s.s___205330 - 1);
-    s.i___205336 = (r0);
+    s.s___20168 = (r0);
+    r0 = (s.arg1 * s.s___20168);
+    s.start___20170 = (r0);
+    r0 = (s.s___20168 - 1);
+    s.i___20174 = (r0);
   case 5:
-    r0 = (s.i___205336 >= 0);
+    r0 = (s.i___20174 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
     r0 = s.arg0.fields["buf"];
     s.tmp_1 = r0;
-    r0 = (s.start___205332 + s.i___205336);
+    r0 = (s.start___20170 + s.i___20174);
     s.tmp_2 = r0;
     r0 = (s.arg2 & 255);
     s.tmp_3 = r0;
     r0 = pxsim.BufferMethods.setByte(s.tmp_1, s.tmp_2, s.tmp_3);
     r0 = (s.arg2 >> 8);
     s.arg2 = (r0);
-    r0 = (s.i___205336 - 1);
-    s.i___205336 = (r0);
+    r0 = (s.i___20174 - 1);
+    s.i___20174 = (r0);
     { step = 5; continue; }
   case 6:
   case 7:
@@ -32351,12 +32441,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_setColor__P188715.info = {"start":1308,"length":362,"line":51,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"setColor","argumentNames":["this","index","color"]}
+color_ColorBuffer_setColor__P3498.info = {"start":1308,"length":362,"line":51,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"setColor","argumentNames":["this","index","color"]}
 
-function color_ColorBuffer_setColor__P188715_mk(s) {
+function color_ColorBuffer_setColor__P3498_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_setColor__P188715, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_setColor__P3498, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32364,9 +32454,9 @@ function color_ColorBuffer_setColor__P188715_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  s___205330: undefined,
-  start___205332: undefined,
-  i___205336: undefined,
+  s___20168: undefined,
+  start___20170: undefined,
+  i___20174: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -32376,7 +32466,7 @@ function color_ColorBuffer_setColor__P188715_mk(s) {
 
 
 
-function color_ColorBuffer_color__P188714(s) {
+function color_ColorBuffer_color__P3497(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32386,17 +32476,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___205290 = undefined;
-    s.start___205292 = undefined;
-    s.c___205296 = undefined;
-    s.i___205297 = undefined;
+    s.s___20128 = undefined;
+    s.start___20130 = undefined;
+    s.c___20134 = undefined;
+    s.i___20135 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C188707_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
     r0 = (s.arg1 | 0);
     s.arg1 = (r0);
     r0 = (s.arg1 < 0);
@@ -32407,9 +32497,9 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_1 = r0 = s.arg1;
-    s.tmp_3 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1678; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 1685; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32423,48 +32513,48 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_5 = color_ColorBuffer_stride__P188712_mk(s);
+    s.tmp_5 = color_ColorBuffer_stride__P3495_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.callLocIdx = 1679; s.pc = 9; return s.tmp_5;
+    s.callLocIdx = 1686; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
-    s.s___205290 = (r0);
-    r0 = (s.arg1 * s.s___205290);
-    s.start___205292 = (r0);
-    s.c___205296 = (0);
-    s.i___205297 = (0);
+    s.s___20128 = (r0);
+    r0 = (s.arg1 * s.s___20128);
+    s.start___20130 = (r0);
+    s.c___20134 = (0);
+    s.i___20135 = (0);
   case 5:
-    r0 = (s.i___205297 < s.s___205290);
+    r0 = (s.i___20135 < s.s___20128);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    r0 = (s.c___205296 << 8);
+    r0 = (s.c___20134 << 8);
     s.tmp_1 = r0;
     r0 = s.arg0.fields["buf"];
     s.tmp_4 = r0;
-    r0 = (s.start___205292 + s.i___205297);
+    r0 = (s.start___20130 + s.i___20135);
     s.tmp_5 = r0;
     r0 = pxsim.BufferMethods.getByte(s.tmp_4, s.tmp_5);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 255);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 | s.tmp_2);
-    s.c___205296 = (r0);
-    r0 = (s.i___205297 + 1);
-    s.i___205297 = (r0);
+    s.c___20134 = (r0);
+    r0 = (s.i___20135 + 1);
+    s.i___20135 = (r0);
     { step = 5; continue; }
   case 6:
-    r0 = s.c___205296;
+    r0 = s.c___20134;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_color__P188714.info = {"start":930,"length":368,"line":38,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"color","argumentNames":["this","index"]}
+color_ColorBuffer_color__P3497.info = {"start":930,"length":368,"line":38,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"color","argumentNames":["this","index"]}
 
-function color_ColorBuffer_color__P188714_mk(s) {
+function color_ColorBuffer_color__P3497_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_color__P188714, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_color__P3497, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32472,10 +32562,10 @@ function color_ColorBuffer_color__P188714_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  s___205290: undefined,
-  start___205292: undefined,
-  c___205296: undefined,
-  i___205297: undefined,
+  s___20128: undefined,
+  start___20130: undefined,
+  c___20134: undefined,
+  i___20135: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -32484,7 +32574,7 @@ function color_ColorBuffer_color__P188714_mk(s) {
 
 
 
-function color_Fade_setStartPalette__P188776(s) {
+function color_Fade_setStartPalette__P3559(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32500,11 +32590,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = color__clone__P188766_mk(s);
+    s.tmp_2 = color__clone__P3549_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 1709; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1716; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -32513,12 +32603,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_setStartPalette__P188776.info = {"start":1352,"length":131,"line":49,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setStartPalette","argumentNames":["this","colors"]}
+color_Fade_setStartPalette__P3559.info = {"start":1352,"length":131,"line":49,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"setStartPalette","argumentNames":["this","colors"]}
 
-function color_Fade_setStartPalette__P188776_mk(s) {
+function color_Fade_setStartPalette__P3559_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_setStartPalette__P188776, depth: s.depth + 1,
+        parent: s, fn: color_Fade_setStartPalette__P3559, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32531,7 +32621,7 @@ function color_Fade_setStartPalette__P188776_mk(s) {
 
 
 
-function color_Fade_start__P188773(s) {
+function color_Fade_start__P3556(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32547,43 +32637,43 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
-    s.tmp_0 = color_init__P191253_mk(s);
-    s.callLocIdx = 1705; s.pc = 1; return s.tmp_0;
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
+    s.tmp_0 = color_init__P6037_mk(s);
+    s.callLocIdx = 1712; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["duration"] = (s.arg1);
-    s.tmp_0 = color_setPalette__P188752_mk(s);
-    s.tmp_1 = color_Fade_startPalette__P188770_mk(s);
+    s.tmp_0 = color_setPalette__P3535_mk(s);
+    s.tmp_1 = color_Fade_startPalette__P3553_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1706; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1713; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
     s.tmp_0.arg3 = 0;
-    s.callLocIdx = 1707; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1714; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 1708; s.pc = 4; return s.tmp_2;
+    s.tmp_2 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 1715; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["startTime"] = (s.tmp_1);
-    globals.activeFade___191199 = (s.arg0);
+    globals.activeFade___5983 = (s.arg0);
     r0 = s.arg0;
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_start__P188773.info = {"start":834,"length":258,"line":29,"column":8,"endLine":37,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"start","argumentNames":["this","duration"]}
+color_Fade_start__P3556.info = {"start":834,"length":258,"line":29,"column":8,"endLine":37,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"start","argumentNames":["this","duration"]}
 
-function color_Fade_start__P188773_mk(s) {
+function color_Fade_start__P3556_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_start__P188773, depth: s.depth + 1,
+        parent: s, fn: color_Fade_start__P3556, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32596,7 +32686,7 @@ function color_Fade_start__P188773_mk(s) {
 
 
 
-function color_init__P191253(s) {
+function color_init__P6037(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32606,34 +32696,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.currentScene___191200);
+    r0 = pxsim_numops_toBoolDecr(globals.currentScene___5984);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = game_forever__P187762_mk(s);
-    s.tmp_2.arg0 = inline__P205419;
-    s.callLocIdx = 1729; s.pc = 3; return s.tmp_2;
+    s.tmp_2 = game_forever__P2545_mk(s);
+    s.tmp_2.arg0 = inline__P20257;
+    s.callLocIdx = 1736; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1730; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1737; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    globals.currentScene___191200 = (r0);
+    globals.currentScene___5984 = (r0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_init__P191253.info = {"start":6049,"length":374,"line":217,"column":4,"endLine":230,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"init","argumentNames":[]}
+color_init__P6037.info = {"start":6049,"length":374,"line":217,"column":4,"endLine":230,"endColumn":5,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"init","argumentNames":[]}
 
-function color_init__P191253_mk(s) {
+function color_init__P6037_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_init__P191253, depth: s.depth + 1,
+        parent: s, fn: color_init__P6037, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32644,7 +32734,7 @@ function color_init__P191253_mk(s) {
 
 
 
-function inline__P205419(s) {
+function inline__P20257(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32654,18 +32744,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.finished___205421 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.activeFade___191199);
+    s.finished___20259 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.activeFade___5983);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = color_Fade_step__P188780_mk(s);
-    s.tmp_0.arg0 = globals.activeFade___191199;
-    s.callLocIdx = 1728; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = color_Fade_step__P3563_mk(s);
+    s.tmp_0.arg0 = globals.activeFade___5983;
+    s.callLocIdx = 1735; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.finished___205421 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.finished___205421);
+    s.finished___20259 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.finished___20259);
     if (!r0) { step = 1; continue; }
-    globals.activeFade___191199 = (undefined);
+    globals.activeFade___5983 = (undefined);
   case 1:
   case 2:
   case 3:
@@ -32674,22 +32764,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P205419.info = {"start":6121,"length":236,"line":219,"column":25,"endLine":227,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
+inline__P20257.info = {"start":6121,"length":236,"line":219,"column":25,"endLine":227,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P205419_mk(s) {
+function inline__P20257_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P205419, depth: s.depth + 1,
+        parent: s, fn: inline__P20257, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  finished___205421: undefined,
+  finished___20259: undefined,
 } }
 
 
 
 
 
-function color_Fade_step__P188780(s) {
+function color_Fade_step__P3563(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32699,16 +32789,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.time___205449 = undefined;
-    s.p___205455 = undefined;
-    s.i___205462 = undefined;
-    s.col___205468 = undefined;
+    s.time___20287 = undefined;
+    s.p___20293 = undefined;
+    s.i___20300 = undefined;
+    s.col___20306 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
     r0 = s.arg0.fields["_endPalette"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -32732,9 +32822,9 @@ switch (step) {
     { step = 9; continue; }
   case 3:
   case 4:
-    s.tmp_8 = color_Fade_isActive__P188772_mk(s);
+    s.tmp_8 = color_Fade_isActive__P3555_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1711; s.pc = 10; return s.tmp_8;
+    s.callLocIdx = 1718; s.pc = 10; return s.tmp_8;
   case 10:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -32744,13 +32834,13 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
-    s.tmp_9 = color_setPalette__P188752_mk(s);
+    s.tmp_9 = color_setPalette__P3535_mk(s);
     r0 = s.arg0.fields["_endPalette"];
     s.tmp_9.arg0 = r0;
     s.tmp_9.arg1 = 0;
     s.tmp_9.arg2 = 0;
     s.tmp_9.arg3 = 0;
-    s.callLocIdx = 1712; s.pc = 11; return s.tmp_9;
+    s.callLocIdx = 1719; s.pc = 11; return s.tmp_9;
   case 11:
     r0 = s.retval;
     r0 = (s.arg0).fields["startTime"] = (undefined);
@@ -32758,37 +32848,37 @@ switch (step) {
     { step = 9; continue; }
   case 5:
   case 6:
-    s.tmp_1 = game_runtime__P187765_mk(s);
-    s.callLocIdx = 1713; s.pc = 12; return s.tmp_1;
+    s.tmp_1 = game_runtime__P2548_mk(s);
+    s.callLocIdx = 1720; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = s.arg0.fields["startTime"];
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.time___205449 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C188747_VT);
+    s.time___20287 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P188710_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_2 = color_ColorBuffer_length__P3496_mk(s);
     r0 = s.arg0.fields["_startPalette"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1714; s.pc = 14; return s.tmp_2;
+    s.callLocIdx = 1721; s.pc = 14; return s.tmp_2;
   case 14:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1715; s.pc = 13; return s.tmp_1;
+    s.callLocIdx = 1722; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    s.p___205455 = (s.tmp_0);
-    s.i___205462 = (0);
+    s.p___20293 = (s.tmp_0);
+    s.i___20300 = (0);
   case 7:
-    s.tmp_1 = r0 = s.i___205462;
-    s.tmp_3 = color_ColorBuffer_length__P188713_mk(s);
-    s.tmp_3.arg0 = s.p___205455;
-    s.callLocIdx = 1716; s.pc = 15; return s.tmp_3;
+    s.tmp_1 = r0 = s.i___20300;
+    s.tmp_3 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_3.arg0 = s.p___20293;
+    s.callLocIdx = 1723; s.pc = 15; return s.tmp_3;
   case 15:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -32796,48 +32886,48 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_4 = color_partialColorTransition__P188763_mk(s);
-    s.tmp_5 = color_ColorBuffer_color__P188714_mk(s);
+    s.tmp_4 = color_partialColorTransition__P3546_mk(s);
+    s.tmp_5 = color_ColorBuffer_color__P3497_mk(s);
     r0 = s.arg0.fields["_startPalette"];
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = s.i___205462;
-    s.callLocIdx = 1717; s.pc = 17; return s.tmp_5;
+    s.tmp_5.arg1 = s.i___20300;
+    s.callLocIdx = 1724; s.pc = 17; return s.tmp_5;
   case 17:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.tmp_6 = color_ColorBuffer_color__P188714_mk(s);
+    s.tmp_6 = color_ColorBuffer_color__P3497_mk(s);
     r0 = s.arg0.fields["_endPalette"];
     s.tmp_6.arg0 = r0;
-    s.tmp_6.arg1 = s.i___205462;
-    s.callLocIdx = 1718; s.pc = 18; return s.tmp_6;
+    s.tmp_6.arg1 = s.i___20300;
+    s.callLocIdx = 1725; s.pc = 18; return s.tmp_6;
   case 18:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
     r0 = s.arg0.fields["duration"];
     s.tmp_7 = r0;
-    r0 = (s.time___205449 / s.tmp_7);
+    r0 = (s.time___20287 / s.tmp_7);
     s.tmp_4.arg2 = r0;
-    s.callLocIdx = 1719; s.pc = 16; return s.tmp_4;
+    s.callLocIdx = 1726; s.pc = 16; return s.tmp_4;
   case 16:
     r0 = s.retval;
-    s.col___205468 = (r0);
-    s.tmp_0 = color_ColorBuffer_setColor__P188715_mk(s);
-    s.tmp_0.arg0 = s.p___205455;
-    s.tmp_0.arg1 = s.i___205462;
-    s.tmp_0.arg2 = s.col___205468;
-    s.callLocIdx = 1720; s.pc = 19; return s.tmp_0;
+    s.col___20306 = (r0);
+    s.tmp_0 = color_ColorBuffer_setColor__P3498_mk(s);
+    s.tmp_0.arg0 = s.p___20293;
+    s.tmp_0.arg1 = s.i___20300;
+    s.tmp_0.arg2 = s.col___20306;
+    s.callLocIdx = 1727; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    r0 = (s.i___205462 + 1);
-    s.i___205462 = (r0);
+    r0 = (s.i___20300 + 1);
+    s.i___20300 = (r0);
     { step = 7; continue; }
   case 8:
-    s.tmp_0 = color_setPalette__P188752_mk(s);
-    s.tmp_0.arg0 = s.p___205455;
+    s.tmp_0 = color_setPalette__P3535_mk(s);
+    s.tmp_0.arg0 = s.p___20293;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 0;
     s.tmp_0.arg3 = 0;
-    s.callLocIdx = 1721; s.pc = 20; return s.tmp_0;
+    s.callLocIdx = 1728; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     r0 = false;
@@ -32845,12 +32935,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_step__P188780.info = {"start":1934,"length":818,"line":69,"column":8,"endLine":95,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"step","argumentNames":["this"]}
+color_Fade_step__P3563.info = {"start":1934,"length":818,"line":69,"column":8,"endLine":95,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"step","argumentNames":["this"]}
 
-function color_Fade_step__P188780_mk(s) {
+function color_Fade_step__P3563_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_step__P188780, depth: s.depth + 1,
+        parent: s, fn: color_Fade_step__P3563, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32862,10 +32952,10 @@ function color_Fade_step__P188780_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  time___205449: undefined,
-  p___205455: undefined,
-  i___205462: undefined,
-  col___205468: undefined,
+  time___20287: undefined,
+  p___20293: undefined,
+  i___20300: undefined,
+  col___20306: undefined,
   arg0: undefined,
 } }
 
@@ -32873,7 +32963,7 @@ function color_Fade_step__P188780_mk(s) {
 
 
 
-function color_partialColorTransition__P188763(s) {
+function color_partialColorTransition__P3546(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -32883,12 +32973,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r1___205501 = undefined;
-    s.g1___205505 = undefined;
-    s.b1___205509 = undefined;
-    s.rDiff___205513 = undefined;
-    s.gDiff___205519 = undefined;
-    s.bDiff___205525 = undefined;
+    s.r1___20339 = undefined;
+    s.g1___20343 = undefined;
+    s.b1___20347 = undefined;
+    s.rDiff___20351 = undefined;
+    s.gDiff___20357 = undefined;
+    s.bDiff___20363 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -32915,68 +33005,68 @@ switch (step) {
     r0 = (s.arg0 >> 16);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 255);
-    s.r1___205501 = (r0);
+    s.r1___20339 = (r0);
     r0 = (s.arg0 >> 8);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 & 255);
-    s.g1___205505 = (r0);
+    s.g1___20343 = (r0);
     r0 = (s.arg0 >> 0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 & 255);
-    s.b1___205509 = (r0);
+    s.b1___20347 = (r0);
     r0 = (s.arg1 >> 16);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 255);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.r1___205501);
-    s.rDiff___205513 = (r0);
+    r0 = (s.tmp_0 - s.r1___20339);
+    s.rDiff___20351 = (r0);
     r0 = (s.arg1 >> 8);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 255);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.g1___205505);
-    s.gDiff___205519 = (r0);
+    r0 = (s.tmp_0 - s.g1___20343);
+    s.gDiff___20357 = (r0);
     r0 = (s.arg1 >> 0);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 255);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.b1___205509);
-    s.bDiff___205525 = (r0);
-    s.tmp_0 = color_toColor__P191196_mk(s);
-    s.tmp_1 = r0 = s.r1___205501;
-    r0 = (s.rDiff___205513 * s.arg2);
+    r0 = (s.tmp_0 - s.b1___20347);
+    s.bDiff___20363 = (r0);
+    s.tmp_0 = color_toColor__P5980_mk(s);
+    s.tmp_1 = r0 = s.r1___20339;
+    r0 = (s.rDiff___20351 * s.arg2);
     s.tmp_3 = r0;
     r0 = pxsim.Math_.round(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg0 = r0;
-    s.tmp_4 = r0 = s.g1___205505;
-    r0 = (s.gDiff___205519 * s.arg2);
+    s.tmp_4 = r0 = s.g1___20343;
+    r0 = (s.gDiff___20357 * s.arg2);
     s.tmp_6 = r0;
     r0 = pxsim.Math_.round(s.tmp_6);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_0.arg1 = r0;
-    s.tmp_7 = r0 = s.b1___205509;
-    r0 = (s.bDiff___205525 * s.arg2);
+    s.tmp_7 = r0 = s.b1___20347;
+    r0 = (s.bDiff___20363 * s.arg2);
     s.tmp_9 = r0;
     r0 = pxsim.Math_.round(s.tmp_9);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 1694; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1701; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-color_partialColorTransition__P188763.info = {"start":11146,"length":669,"line":364,"column":4,"endLine":384,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"partialColorTransition","argumentNames":["start","end","percentage"]}
+color_partialColorTransition__P3546.info = {"start":11146,"length":669,"line":364,"column":4,"endLine":384,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"partialColorTransition","argumentNames":["start","end","percentage"]}
 
-function color_partialColorTransition__P188763_mk(s) {
+function color_partialColorTransition__P3546_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_partialColorTransition__P188763, depth: s.depth + 1,
+        parent: s, fn: color_partialColorTransition__P3546, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -32988,12 +33078,12 @@ function color_partialColorTransition__P188763_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  r1___205501: undefined,
-  g1___205505: undefined,
-  b1___205509: undefined,
-  rDiff___205513: undefined,
-  gDiff___205519: undefined,
-  bDiff___205525: undefined,
+  r1___20339: undefined,
+  g1___20343: undefined,
+  b1___20347: undefined,
+  rDiff___20351: undefined,
+  gDiff___20357: undefined,
+  bDiff___20363: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -33003,7 +33093,7 @@ function color_partialColorTransition__P188763_mk(s) {
 
 
 
-function color_toColor__P191196(s) {
+function color_toColor__P5980(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33035,12 +33125,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_toColor__P191196.info = {"start":12315,"length":132,"line":404,"column":4,"endLine":406,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"toColor","argumentNames":["r","g","b"]}
+color_toColor__P5980.info = {"start":12315,"length":132,"line":404,"column":4,"endLine":406,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"toColor","argumentNames":["r","g","b"]}
 
-function color_toColor__P191196_mk(s) {
+function color_toColor__P5980_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_toColor__P191196, depth: s.depth + 1,
+        parent: s, fn: color_toColor__P5980, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33057,7 +33147,7 @@ function color_toColor__P191196_mk(s) {
 
 
 
-function color_unpackB__P188701(s) {
+function color_unpackB__P3484(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33077,12 +33167,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_unpackB__P188701.info = {"start":6324,"length":86,"line":200,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackB","argumentNames":["rgb"]}
+color_unpackB__P3484.info = {"start":6324,"length":86,"line":200,"column":4,"endLine":202,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackB","argumentNames":["rgb"]}
 
-function color_unpackB__P188701_mk(s) {
+function color_unpackB__P3484_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_unpackB__P188701, depth: s.depth + 1,
+        parent: s, fn: color_unpackB__P3484, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -33092,7 +33182,7 @@ function color_unpackB__P188701_mk(s) {
 
 
 
-function color_unpackG__P188700(s) {
+function color_unpackG__P3483(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33112,12 +33202,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_unpackG__P188700.info = {"start":6233,"length":86,"line":197,"column":4,"endLine":199,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackG","argumentNames":["rgb"]}
+color_unpackG__P3483.info = {"start":6233,"length":86,"line":197,"column":4,"endLine":199,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackG","argumentNames":["rgb"]}
 
-function color_unpackG__P188700_mk(s) {
+function color_unpackG__P3483_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_unpackG__P188700, depth: s.depth + 1,
+        parent: s, fn: color_unpackG__P3483, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -33127,7 +33217,7 @@ function color_unpackG__P188700_mk(s) {
 
 
 
-function color_unpackR__P188699(s) {
+function color_unpackR__P3482(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33147,12 +33237,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_unpackR__P188699.info = {"start":6141,"length":87,"line":194,"column":4,"endLine":196,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackR","argumentNames":["rgb"]}
+color_unpackR__P3482.info = {"start":6141,"length":87,"line":194,"column":4,"endLine":196,"endColumn":5,"fileName":"pxt_modules/color/colors.ts","functionName":"unpackR","argumentNames":["rgb"]}
 
-function color_unpackR__P188699_mk(s) {
+function color_unpackR__P3482_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_unpackR__P188699, depth: s.depth + 1,
+        parent: s, fn: color_unpackR__P3482, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -33162,7 +33252,7 @@ function color_unpackR__P188699_mk(s) {
 
 
 
-function color_Fade_startPalette__P188770(s) {
+function color_Fade_startPalette__P3553(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33177,7 +33267,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
     r0 = s.arg0.fields["_startPalette"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -33187,8 +33277,8 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_5 = color_currentPalette__P188765_mk(s);
-    s.callLocIdx = 1703; s.pc = 3; return s.tmp_5;
+    s.tmp_5 = color_currentPalette__P3548_mk(s);
+    s.callLocIdx = 1710; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -33199,12 +33289,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_startPalette__P188770.info = {"start":233,"length":189,"line":9,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startPalette","argumentNames":["this"]}
+color_Fade_startPalette__P3553.info = {"start":233,"length":189,"line":9,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"startPalette","argumentNames":["this"]}
 
-function color_Fade_startPalette__P188770_mk(s) {
+function color_Fade_startPalette__P3553_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_startPalette__P188770, depth: s.depth + 1,
+        parent: s, fn: color_Fade_startPalette__P3553, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33219,7 +33309,7 @@ function color_Fade_startPalette__P188770_mk(s) {
 
 
 
-function color_currentPalette__P188765(s) {
+function color_currentPalette__P3548(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33229,34 +33319,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___205239 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.currentColors___191192);
+    s.p___20077 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.currentColors___5976);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C188747_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(color_Palette__C3530_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = color_ColorBuffer_constructor__P188710_mk(s);
+    s.tmp_1 = color_ColorBuffer_constructor__P3493_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_2 = color_availableColors__P188758_mk(s);
-    s.callLocIdx = 1695; s.pc = 5; return s.tmp_2;
+    s.tmp_2 = color_availableColors__P3541_mk(s);
+    s.callLocIdx = 1702; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1696; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 1703; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    s.p___205239 = (s.tmp_0);
-    s.tmp_0 = r0 = s.p___205239;
-    r0 = pxsim.BufferMethods.slice(globals.currentColors___191192, 0, -1);
+    s.p___20077 = (s.tmp_0);
+    s.tmp_0 = r0 = s.p___20077;
+    r0 = pxsim.BufferMethods.slice(globals.currentColors___5976, 0, -1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["buf"] = (s.tmp_1);
-    r0 = s.p___205239;
+    r0 = s.p___20077;
     { step = 3; continue; }
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = color__clone__P188766_mk(s);
-    s.tmp_0.arg0 = globals.originalPalette___188791;
-    s.callLocIdx = 1697; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = color__clone__P3549_mk(s);
+    s.tmp_0.arg0 = globals.originalPalette___3574;
+    s.callLocIdx = 1704; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     { step = 3; continue; }
@@ -33266,24 +33356,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-color_currentPalette__P188765.info = {"start":11988,"length":258,"line":393,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"currentPalette","argumentNames":[]}
+color_currentPalette__P3548.info = {"start":11988,"length":258,"line":393,"column":4,"endLine":401,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"currentPalette","argumentNames":[]}
 
-function color_currentPalette__P188765_mk(s) {
+function color_currentPalette__P3548_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_currentPalette__P188765, depth: s.depth + 1,
+        parent: s, fn: color_currentPalette__P3548, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  p___205239: undefined,
+  p___20077: undefined,
 } }
 
 
 
 
 
-function color_availableColors__P188758(s) {
+function color_availableColors__P3541(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33293,20 +33383,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = color_ColorBuffer_length__P188713_mk(s);
-    s.tmp_0.arg0 = globals.originalPalette___188791;
-    s.callLocIdx = 1686; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = color_ColorBuffer_length__P3496_mk(s);
+    s.tmp_0.arg0 = globals.originalPalette___3574;
+    s.callLocIdx = 1693; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-color_availableColors__P188758.info = {"start":9742,"length":88,"line":317,"column":4,"endLine":319,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"availableColors","argumentNames":[]}
+color_availableColors__P3541.info = {"start":9742,"length":88,"line":317,"column":4,"endLine":319,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"availableColors","argumentNames":[]}
 
-function color_availableColors__P188758_mk(s) {
+function color_availableColors__P3541_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_availableColors__P188758, depth: s.depth + 1,
+        parent: s, fn: color_availableColors__P3541, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33315,7 +33405,7 @@ function color_availableColors__P188758_mk(s) {
 
 
 
-function color_setPalette__P188752(s) {
+function color_setPalette__P3535(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33325,11 +33415,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fromStart___205381 = undefined;
-    s.toStart___205384 = undefined;
-    s.asBuf___205387 = undefined;
-    s.copyLength___205390 = undefined;
-    s.i___205397 = undefined;
+    s.fromStart___20219 = undefined;
+    s.toStart___20222 = undefined;
+    s.asBuf___20225 = undefined;
+    s.copyLength___20228 = undefined;
+    s.i___20235 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -33347,9 +33437,9 @@ switch (step) {
     { step = 2; continue; }
   case 1:
     s.tmp_2 = r0 = s.arg2;
-    s.tmp_4 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_4 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1682; s.pc = 9; return s.tmp_4;
+    s.callLocIdx = 1689; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -33359,76 +33449,76 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 3; continue; }
-    s.tmp_6 = color_ColorBuffer_length__P188713_mk(s);
+    s.tmp_6 = color_ColorBuffer_length__P3496_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 1683; s.pc = 10; return s.tmp_6;
+    s.callLocIdx = 1690; s.pc = 10; return s.tmp_6;
   case 10:
     r0 = s.retval;
     s.arg2 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals.currentColors___191192);
+    r0 = pxsim_numops_toBoolDecr(globals.currentColors___5976);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = globals.originalPalette___188791.fields["buf"];
+    r0 = globals.originalPalette___3574.fields["buf"];
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.slice(s.tmp_2, 0, -1);
-    globals.currentColors___191192 = (r0);
+    globals.currentColors___5976 = (r0);
   case 5:
   case 6:
     r0 = (s.arg3 * 3);
-    s.fromStart___205381 = (r0);
+    s.fromStart___20219 = (r0);
     r0 = (s.arg1 * 3);
-    s.toStart___205384 = (r0);
+    s.toStart___20222 = (r0);
     r0 = s.arg0.fields["buf"];
-    s.asBuf___205387 = (r0);
-    s.tmp_1 = Math_clamp__P185339_mk(s);
+    s.asBuf___20225 = (r0);
+    s.tmp_1 = Math_clamp__P122_mk(s);
     s.tmp_1.arg0 = 0;
-    s.tmp_2 = color_availableColors__P188758_mk(s);
-    s.callLocIdx = 1684; s.pc = 12; return s.tmp_2;
+    s.tmp_2 = color_availableColors__P3541_mk(s);
+    s.callLocIdx = 1691; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1.arg1 = r0;
     s.tmp_1.arg2 = s.arg2;
-    s.callLocIdx = 1685; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 1692; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (3 * s.tmp_0);
-    s.copyLength___205390 = (r0);
-    s.i___205397 = (0);
+    s.copyLength___20228 = (r0);
+    s.i___20235 = (0);
   case 7:
-    r0 = (s.i___205397 < s.copyLength___205390);
+    r0 = (s.i___20235 < s.copyLength___20228);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_1 = r0 = globals.currentColors___191192;
-    r0 = (s.toStart___205384 + s.i___205397);
+    s.tmp_1 = r0 = globals.currentColors___5976;
+    r0 = (s.toStart___20222 + s.i___20235);
     s.tmp_2 = r0;
-    s.tmp_4 = r0 = s.asBuf___205387;
-    r0 = (s.fromStart___205381 + s.i___205397);
+    s.tmp_4 = r0 = s.asBuf___20225;
+    r0 = (s.fromStart___20219 + s.i___20235);
     s.tmp_5 = r0;
     r0 = pxsim.BufferMethods.getByte(s.tmp_4, s.tmp_5);
     s.tmp_3 = r0;
     r0 = pxsim.BufferMethods.setByte(s.tmp_1, s.tmp_2, s.tmp_3);
-    r0 = (s.i___205397 + 1);
-    s.i___205397 = (r0);
+    r0 = (s.i___20235 + 1);
+    s.i___20235 = (r0);
     { step = 7; continue; }
   case 8:
-    r0 = pxsim_pxtcore.setPalette(globals.currentColors___191192);
+    r0 = pxsim_pxtcore.setPalette(globals.currentColors___5976);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_setPalette__P188752.info = {"start":6189,"length":617,"line":219,"column":4,"endLine":236,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"setPalette","argumentNames":["palette","start","length","paletteOffset"]}
+color_setPalette__P3535.info = {"start":6189,"length":617,"line":219,"column":4,"endLine":236,"endColumn":5,"fileName":"pxt_modules/Color Fading/color.ts","functionName":"setPalette","argumentNames":["palette","start","length","paletteOffset"]}
 
-function color_setPalette__P188752_mk(s) {
+function color_setPalette__P3535_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_setPalette__P188752, depth: s.depth + 1,
+        parent: s, fn: color_setPalette__P3535, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33437,11 +33527,11 @@ function color_setPalette__P188752_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  fromStart___205381: undefined,
-  toStart___205384: undefined,
-  asBuf___205387: undefined,
-  copyLength___205390: undefined,
-  i___205397: undefined,
+  fromStart___20219: undefined,
+  toStart___20222: undefined,
+  asBuf___20225: undefined,
+  copyLength___20228: undefined,
+  i___20235: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -33452,7 +33542,7 @@ function color_setPalette__P188752_mk(s) {
 
 
 
-function color_Fade_constructor__P188769(s) {
+function color_Fade_constructor__P3552(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33467,17 +33557,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_Fade__C188768_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_Fade__C3551_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_Fade_constructor__P188769.info = {"start":206,"length":17,"line":7,"column":8,"endLine":7,"endColumn":25,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this"]}
+color_Fade_constructor__P3552.info = {"start":206,"length":17,"line":7,"column":8,"endLine":7,"endColumn":25,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this"]}
 
-function color_Fade_constructor__P188769_mk(s) {
+function color_Fade_constructor__P3552_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_Fade_constructor__P188769, depth: s.depth + 1,
+        parent: s, fn: color_Fade_constructor__P3552, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -33486,7 +33576,7 @@ function color_Fade_constructor__P188769_mk(s) {
 
 
 
-function color_ColorBuffer_length__P188713(s) {
+function color_ColorBuffer_length__P3496(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33501,14 +33591,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_ColorBuffer__C188707_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_ColorBuffer__C3490_VT)) failedCast(r0);
     r0 = s.arg0.fields["buf"];
     s.tmp_1 = r0;
     r0 = pxsim.BufferMethods.length(s.tmp_1);
     s.tmp_0 = r0;
-    s.tmp_3 = color_ColorBuffer_stride__P188712_mk(s);
+    s.tmp_3 = color_ColorBuffer_stride__P3495_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1677; s.pc = 1; return s.tmp_3;
+    s.callLocIdx = 1684; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -33516,13 +33606,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-color_ColorBuffer_length__P188713.info = {"start":836,"length":84,"line":34,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"length","argumentNames":["this"]}
-color_ColorBuffer_length__P188713.isGetter = true;
+color_ColorBuffer_length__P3496.info = {"start":836,"length":84,"line":34,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/color/colorbuffer.ts","functionName":"length","argumentNames":["this"]}
+color_ColorBuffer_length__P3496.isGetter = true;
 
-function color_ColorBuffer_length__P188713_mk(s) {
+function color_ColorBuffer_length__P3496_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_ColorBuffer_length__P188713, depth: s.depth + 1,
+        parent: s, fn: color_ColorBuffer_length__P3496, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33535,7 +33625,7 @@ function color_ColorBuffer_length__P188713_mk(s) {
 
 
 
-function game_askForNumber__P187790(s) {
+function game_askForNumber__P2573(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33545,58 +33635,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___194859 = undefined;
-    s.result___194863 = undefined;
+    s.p___8407 = undefined;
+    s.result___8411 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_max__P185342_mk(s);
+    s.tmp_0 = Math_max__P125_mk(s);
     s.tmp_0.arg0 = 0;
-    s.tmp_1 = Math_min__P185343_mk(s);
+    s.tmp_1 = Math_min__P126_mk(s);
     s.tmp_1.arg0 = 10;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 1220; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1227; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1221; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1228; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.arg1 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(game_NumberPrompt__C187791_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(game_NumberPrompt__C2574_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_NumberPrompt_constructor__P187796_mk(s);
+    s.tmp_1 = game_NumberPrompt_constructor__P2579_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1222; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1229; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.p___194859 = (s.tmp_0);
-    s.tmp_0 = game_NumberPrompt_show__P187797_mk(s);
-    s.tmp_0.arg0 = s.p___194859;
+    s.p___8407 = (s.tmp_0);
+    s.tmp_0 = game_NumberPrompt_show__P2580_mk(s);
+    s.tmp_0.arg0 = s.p___8407;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
-    s.callLocIdx = 1223; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1230; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.result___194863 = (r0);
-    r0 = s.result___194863;
+    s.result___8411 = (r0);
+    r0 = s.result___8411;
     return leave(s, r0)
   default: oops()
 } } }
-game_askForNumber__P187790.info = {"start":531,"length":253,"line":15,"column":4,"endLine":20,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"askForNumber","argumentNames":["message","answerLength"]}
+game_askForNumber__P2573.info = {"start":531,"length":253,"line":15,"column":4,"endLine":20,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"askForNumber","argumentNames":["message","answerLength"]}
 
-function game_askForNumber__P187790_mk(s) {
+function game_askForNumber__P2573_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_askForNumber__P187790, depth: s.depth + 1,
+        parent: s, fn: game_askForNumber__P2573, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  p___194859: undefined,
-  result___194863: undefined,
+  p___8407: undefined,
+  result___8411: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -33605,7 +33695,7 @@ function game_askForNumber__P187790_mk(s) {
 
 
 
-function game_NumberPrompt_show__P187797(s) {
+function game_NumberPrompt_show__P2580(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33622,46 +33712,46 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = (s.arg0).fields["message"] = (s.arg1);
     r0 = (s.arg0).fields["answerLength"] = (s.arg2);
     r0 = (s.arg0).fields["inputIndex"] = (0);
-    s.tmp_0 = controller__setUserEventsEnabled__P187171_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
     s.tmp_0.arg0 = false;
-    s.callLocIdx = 1229; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1236; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = game_pushScene__P187753_mk(s);
-    s.callLocIdx = 1230; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P2536_mk(s);
+    s.callLocIdx = 1237; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_draw__P189798_mk(s);
+    s.tmp_0 = game_NumberPrompt_draw__P4582_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1231; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1238; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_registerHandlers__P189808_mk(s);
+    s.tmp_0 = game_NumberPrompt_registerHandlers__P4592_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1232; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1239; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["confirmPressed"] = (false);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P194891);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8439);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = pauseUntil__P185573_mk(s);
+    s.tmp_1 = pauseUntil__P356_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1233; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1240; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P187754_mk(s);
-    s.callLocIdx = 1234; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_popScene__P2537_mk(s);
+    s.callLocIdx = 1241; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = controller__setUserEventsEnabled__P187171_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1235; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1242; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["result"];
@@ -33670,12 +33760,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_show__P187797.info = {"start":4834,"length":545,"line":148,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"show","argumentNames":["this","message","answerLength"]}
+game_NumberPrompt_show__P2580.info = {"start":4834,"length":545,"line":148,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"show","argumentNames":["this","message","answerLength"]}
 
-function game_NumberPrompt_show__P187797_mk(s) {
+function game_NumberPrompt_show__P2580_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_show__P187797, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_show__P2580, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33688,7 +33778,7 @@ function game_NumberPrompt_show__P187797_mk(s) {
 
 
 
-function inline__P194891(s) {
+function inline__P8439(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33702,12 +33792,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194891.info = {"start":5215,"length":25,"line":160,"column":23,"endLine":160,"endColumn":48,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8439.info = {"start":5215,"length":25,"line":160,"column":23,"endLine":160,"endColumn":48,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P194891_mk(s) {
+function inline__P8439_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194891, depth: s.depth + 1,
+        parent: s, fn: inline__P8439, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -33715,7 +33805,7 @@ function inline__P194891_mk(s) {
 
 
 
-function game_NumberPrompt_registerHandlers__P189808(s) {
+function game_NumberPrompt_registerHandlers__P4592(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33730,87 +33820,87 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P195157);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8705);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.up___187097;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.up___1880;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1292; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1299; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P195162);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8710);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.down___187099;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.down___1882;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1294; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1301; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P195167);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8715);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.right___187098;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.right___1881;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1296; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1303; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P195172);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8720);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.left___187096;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.left___1879;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1298; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 1305; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P195177);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8725);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.A___187094;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.A___1877;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1300; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1307; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P195182);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8730);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.B___187095;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.B___1878;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1302; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1309; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     r0 = (s.arg0).fields["frameCount"] = (0);
     r0 = (s.arg0).fields["blink"] = (true);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P195191);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8739);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = game_onUpdate__P187760_mk(s);
+    s.tmp_1 = game_onUpdate__P2543_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1304; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1311; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_registerHandlers__P189808.info = {"start":9716,"length":1066,"line":287,"column":8,"endLine":325,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"registerHandlers","argumentNames":["this"]}
+game_NumberPrompt_registerHandlers__P4592.info = {"start":9716,"length":1066,"line":287,"column":8,"endLine":325,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"registerHandlers","argumentNames":["this"]}
 
-function game_NumberPrompt_registerHandlers__P189808_mk(s) {
+function game_NumberPrompt_registerHandlers__P4592_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_registerHandlers__P189808, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_registerHandlers__P4592, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -33821,7 +33911,7 @@ function game_NumberPrompt_registerHandlers__P189808_mk(s) {
 
 
 
-function inline__P195157(s) {
+function inline__P8705(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33831,22 +33921,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveVertical__P189809_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveVertical__P4593_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1291; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1298; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195157.info = {"start":9796,"length":62,"line":288,"column":51,"endLine":290,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8705.info = {"start":9796,"length":62,"line":288,"column":51,"endLine":290,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195157_mk(s) {
+function inline__P8705_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195157, depth: s.depth + 1,
+        parent: s, fn: inline__P8705, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33855,7 +33945,7 @@ function inline__P195157_mk(s) {
 
 
 
-function inline__P195162(s) {
+function inline__P8710(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33865,22 +33955,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveVertical__P189809_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveVertical__P4593_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1293; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1300; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195162.info = {"start":9914,"length":63,"line":292,"column":53,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8710.info = {"start":9914,"length":63,"line":292,"column":53,"endLine":294,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195162_mk(s) {
+function inline__P8710_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195162, depth: s.depth + 1,
+        parent: s, fn: inline__P8710, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33889,7 +33979,7 @@ function inline__P195162_mk(s) {
 
 
 
-function inline__P195167(s) {
+function inline__P8715(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33899,22 +33989,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveHorizontal__P189810_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveHorizontal__P4594_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1295; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1302; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195167.info = {"start":10034,"length":64,"line":296,"column":54,"endLine":298,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8715.info = {"start":10034,"length":64,"line":296,"column":54,"endLine":298,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195167_mk(s) {
+function inline__P8715_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195167, depth: s.depth + 1,
+        parent: s, fn: inline__P8715, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33923,7 +34013,7 @@ function inline__P195167_mk(s) {
 
 
 
-function inline__P195172(s) {
+function inline__P8720(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33933,22 +34023,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_moveHorizontal__P189810_mk(s);
+    s.tmp_0 = game_NumberPrompt_moveHorizontal__P4594_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1297; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1304; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195172.info = {"start":10155,"length":65,"line":300,"column":53,"endLine":302,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8720.info = {"start":10155,"length":65,"line":300,"column":53,"endLine":302,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195172_mk(s) {
+function inline__P8720_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195172, depth: s.depth + 1,
+        parent: s, fn: inline__P8720, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33957,7 +34047,7 @@ function inline__P195172_mk(s) {
 
 
 
-function inline__P195177(s) {
+function inline__P8725(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -33967,21 +34057,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_confirm__P189811_mk(s);
+    s.tmp_0 = game_NumberPrompt_confirm__P4595_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1299; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1306; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195177.info = {"start":10274,"length":53,"line":304,"column":50,"endLine":306,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8725.info = {"start":10274,"length":53,"line":304,"column":50,"endLine":306,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195177_mk(s) {
+function inline__P8725_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195177, depth: s.depth + 1,
+        parent: s, fn: inline__P8725, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -33990,7 +34080,7 @@ function inline__P195177_mk(s) {
 
 
 
-function inline__P195182(s) {
+function inline__P8730(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34000,21 +34090,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_NumberPrompt_delete__P189812_mk(s);
+    s.tmp_0 = game_NumberPrompt_delete__P4596_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1301; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1308; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195182.info = {"start":10381,"length":52,"line":308,"column":50,"endLine":310,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8730.info = {"start":10381,"length":52,"line":308,"column":50,"endLine":310,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195182_mk(s) {
+function inline__P8730_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195182, depth: s.depth + 1,
+        parent: s, fn: inline__P8730, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -34023,7 +34113,7 @@ function inline__P195182_mk(s) {
 
 
 
-function inline__P195191(s) {
+function inline__P8739(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34055,9 +34145,9 @@ switch (step) {
     r0 = pxsim_Boolean__bang(s.tmp_4);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["blink"] = (s.tmp_3);
-    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P189805_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P4589_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1303; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1310; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
@@ -34066,12 +34156,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P195191.info = {"start":10529,"length":242,"line":316,"column":26,"endLine":324,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P8739.info = {"start":10529,"length":242,"line":316,"column":26,"endLine":324,"endColumn":13,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P195191_mk(s) {
+function inline__P8739_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P195191, depth: s.depth + 1,
+        parent: s, fn: inline__P8739, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34085,7 +34175,7 @@ function inline__P195191_mk(s) {
 
 
 
-function game_NumberPrompt_delete__P189812(s) {
+function game_NumberPrompt_delete__P4596(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34100,7 +34190,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 <= 0);
@@ -34118,7 +34208,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    s.tmp_5 = game_NumberPrompt_drawInput__P189807_mk(s);
+    s.tmp_5 = game_NumberPrompt_drawInput__P4591_mk(s);
     s.tmp_5.arg0 = s.arg0;
     r0 = s.arg0.fields["inputs"];
     s.tmp_7 = r0;
@@ -34139,12 +34229,12 @@ switch (step) {
       s.tmp_9.fn = s.tmp_9.arg0.vtable.iface["colorInput"];
       if (s.tmp_9.fn == null) { s.retval = s.tmp_9.arg0.fields["colorInput"]; }
       else if (!s.tmp_9.fn.isGetter) { s.retval = bind(s.tmp_9); }
-     else { s.callLocIdx = 1318; s.pc = 9; return s.tmp_9; }
+     else { s.callLocIdx = 1325; s.pc = 9; return s.tmp_9; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_5.arg3 = r0;
-    s.callLocIdx = 1319; s.pc = 8; return s.tmp_5;
+    s.callLocIdx = 1326; s.pc = 8; return s.tmp_5;
   case 8:
     r0 = s.retval;
   case 3:
@@ -34178,10 +34268,10 @@ switch (step) {
     r0 = pxsim_String_.substr(s.tmp_2, 0, s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["result"] = (s.tmp_1);
-    s.tmp_0 = game_NumberPrompt_changeInputIndex__P189813_mk(s);
+    s.tmp_0 = game_NumberPrompt_changeInputIndex__P4597_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1320; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1327; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 7:
@@ -34189,12 +34279,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_delete__P189812.info = {"start":12778,"length":479,"line":391,"column":8,"endLine":405,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"delete","argumentNames":["this"]}
+game_NumberPrompt_delete__P4596.info = {"start":12778,"length":479,"line":391,"column":8,"endLine":405,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"delete","argumentNames":["this"]}
 
-function game_NumberPrompt_delete__P189812_mk(s) {
+function game_NumberPrompt_delete__P4596_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_delete__P189812, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_delete__P4596, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34213,7 +34303,7 @@ function game_NumberPrompt_delete__P189812_mk(s) {
 
 
 
-function game_NumberPrompt_changeInputIndex__P189813(s) {
+function game_NumberPrompt_changeInputIndex__P4597(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34229,7 +34319,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["inputIndex"];
     s.tmp_2 = r0;
@@ -34238,21 +34328,21 @@ switch (step) {
     r0 = (s.tmp_0).fields["inputIndex"] = (s.tmp_1);
     r0 = (s.arg0).fields["frameCount"] = (0);
     r0 = (s.arg0).fields["blink"] = (false);
-    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P189805_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateSelectedInput__P4589_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1321; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1328; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_changeInputIndex__P189813.info = {"start":13267,"length":193,"line":407,"column":8,"endLine":412,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"changeInputIndex","argumentNames":["this","delta"]}
+game_NumberPrompt_changeInputIndex__P4597.info = {"start":13267,"length":193,"line":407,"column":8,"endLine":412,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"changeInputIndex","argumentNames":["this","delta"]}
 
-function game_NumberPrompt_changeInputIndex__P189813_mk(s) {
+function game_NumberPrompt_changeInputIndex__P4597_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_changeInputIndex__P189813, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_changeInputIndex__P4597, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34265,7 +34355,7 @@ function game_NumberPrompt_changeInputIndex__P189813_mk(s) {
 
 
 
-function game_NumberPrompt_drawInput__P189807(s) {
+function game_NumberPrompt_drawInput__P4591(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34283,27 +34373,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = pxsim_ImageMethods.fill(s.arg1, 0);
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
-    r0 = (globals.CELL_HEIGHT___189728 - 1);
+    r0 = (globals.CELL_HEIGHT___4512 - 1);
     s.tmp_0.arg2 = r0;
-    r0 = (globals.CELL_WIDTH___189730 - 2);
+    r0 = (globals.CELL_WIDTH___4514 - 2);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = s.arg3;
-    s.callLocIdx = 1288; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1295; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg2;
-    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___189734;
-    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___189738;
+    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___4518;
+    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___4522;
     s.tmp_1 = if_colorInputText_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -34313,14 +34403,14 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInputText"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInputText"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1289; s.pc = 5; return s.tmp_1; }
+     else { s.callLocIdx = 1296; s.pc = 5; return s.tmp_1; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.tmp_0.arg5 = globals.font___189699;
+    s.tmp_0.arg5 = globals.font___4483;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1290; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1297; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 1:
@@ -34329,12 +34419,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawInput__P189807.info = {"start":9373,"length":333,"line":278,"column":8,"endLine":285,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawInput","argumentNames":["this","img","char","color"]}
+game_NumberPrompt_drawInput__P4591.info = {"start":9373,"length":333,"line":278,"column":8,"endLine":285,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawInput","argumentNames":["this","img","char","color"]}
 
-function game_NumberPrompt_drawInput__P189807_mk(s) {
+function game_NumberPrompt_drawInput__P4591_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawInput__P189807, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawInput__P4591, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34348,7 +34438,7 @@ function game_NumberPrompt_drawInput__P189807_mk(s) {
 
 
 
-function game_NumberPrompt_confirm__P189811(s) {
+function game_NumberPrompt_confirm__P4595(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34358,15 +34448,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___197766 = undefined;
-    s.letter___197775 = undefined;
-    s.sprite___197808 = undefined;
+    s.index___11687 = undefined;
+    s.letter___11696 = undefined;
+    s.sprite___11729 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 4);
@@ -34394,14 +34484,14 @@ switch (step) {
     r0 = (s.tmp_5 * 3);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
-    s.index___197766 = (r0);
-    s.tmp_0 = game_getSymbolFromIndex__P189815_mk(s);
-    s.tmp_0.arg0 = s.index___197766;
-    s.callLocIdx = 1312; s.pc = 18; return s.tmp_0;
+    s.index___11687 = (r0);
+    s.tmp_0 = game_getSymbolFromIndex__P4599_mk(s);
+    s.tmp_0.arg0 = s.index___11687;
+    s.callLocIdx = 1319; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.letter___197775 = (r0);
-    r0 = (s.letter___197775 === ".");
+    s.letter___11696 = (r0);
+    r0 = (s.letter___11696 === ".");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
@@ -34416,7 +34506,7 @@ switch (step) {
   case 5:
   case 6:
   case 7:
-    r0 = (s.letter___197775 === "-");
+    r0 = (s.letter___11696 === "-");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 8; continue; }
@@ -34455,7 +34545,7 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 14; continue; }
-    r0 = (s.arg0).fields["result"] = (s.letter___197775);
+    r0 = (s.arg0).fields["result"] = (s.letter___11696);
     { step = 15; continue; }
   case 14:
     s.tmp_0 = r0 = s.arg0;
@@ -34470,12 +34560,12 @@ switch (step) {
   case 19:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((s.letter___197775) && (s.letter___197775).vtable) {
+    if ((s.letter___11696) && (s.letter___11696).vtable) {
     setupResume(s, 20);
-    pxsim_String__stringConv(s.letter___197775);
+    pxsim_String__stringConv(s.letter___11696);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.letter___197775) + ""; }
+    } else { s.retval = (s.letter___11696) + ""; }
   case 20:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -34488,18 +34578,18 @@ switch (step) {
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_1 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_1);
-    s.sprite___197808 = (r0);
-    s.tmp_0 = game_NumberPrompt_changeInputIndex__P189813_mk(s);
+    s.sprite___11729 = (r0);
+    s.tmp_0 = game_NumberPrompt_changeInputIndex__P4597_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.callLocIdx = 1313; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 1320; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawInput__P189807_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawInput__P4591_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = s.sprite___197808.fields["_image"];
+    r0 = s.sprite___11729.fields["_image"];
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.letter___197775;
+    s.tmp_0.arg2 = s.letter___11696;
     s.tmp_1 = if_colorInput_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -34509,12 +34599,12 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInput"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInput"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1315; s.pc = 23; return s.tmp_1; }
+     else { s.callLocIdx = 1322; s.pc = 23; return s.tmp_1; }
     }
   case 23:
     r0 = s.retval;
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1316; s.pc = 22; return s.tmp_0;
+    s.callLocIdx = 1323; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
   case 16:
@@ -34523,12 +34613,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_confirm__P189811.info = {"start":11690,"length":1078,"line":357,"column":8,"endLine":389,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"confirm","argumentNames":["this"]}
+game_NumberPrompt_confirm__P4595.info = {"start":11690,"length":1078,"line":357,"column":8,"endLine":389,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"confirm","argumentNames":["this"]}
 
-function game_NumberPrompt_confirm__P189811_mk(s) {
+function game_NumberPrompt_confirm__P4595_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_confirm__P189811, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_confirm__P4595, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34539,9 +34629,9 @@ function game_NumberPrompt_confirm__P189811_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  index___197766: undefined,
-  letter___197775: undefined,
-  sprite___197808: undefined,
+  index___11687: undefined,
+  letter___11696: undefined,
+  sprite___11729: undefined,
   arg0: undefined,
 } }
 
@@ -34549,7 +34639,7 @@ function game_NumberPrompt_confirm__P189811_mk(s) {
 
 
 
-function game_getSymbolFromIndex__P189815(s) {
+function game_getSymbolFromIndex__P4599(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34631,12 +34721,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_getSymbolFromIndex__P189815.info = {"start":15334,"length":406,"line":487,"column":4,"endLine":500,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"getSymbolFromIndex","argumentNames":["index"]}
+game_getSymbolFromIndex__P4599.info = {"start":15334,"length":406,"line":487,"column":4,"endLine":500,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"getSymbolFromIndex","argumentNames":["index"]}
 
-function game_getSymbolFromIndex__P189815_mk(s) {
+function game_getSymbolFromIndex__P4599_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_getSymbolFromIndex__P189815, depth: s.depth + 1,
+        parent: s, fn: game_getSymbolFromIndex__P4599, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34658,7 +34748,7 @@ function game_getSymbolFromIndex__P189815_mk(s) {
 
 
 
-function game_NumberPrompt_moveHorizontal__P189810(s) {
+function game_NumberPrompt_moveHorizontal__P4594(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34674,7 +34764,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -34696,21 +34786,21 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorColumn"] = (s.tmp_1);
   case 2:
-    s.tmp_0 = game_NumberPrompt_updateCursor__P189804_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateCursor__P4588_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1311; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1318; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_moveHorizontal__P189810.info = {"start":11340,"length":340,"line":346,"column":8,"endLine":355,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"moveHorizontal","argumentNames":["this","right"]}
+game_NumberPrompt_moveHorizontal__P4594.info = {"start":11340,"length":340,"line":346,"column":8,"endLine":355,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"moveHorizontal","argumentNames":["this","right"]}
 
-function game_NumberPrompt_moveHorizontal__P189810_mk(s) {
+function game_NumberPrompt_moveHorizontal__P4594_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_moveHorizontal__P189810, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_moveHorizontal__P4594, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34724,7 +34814,7 @@ function game_NumberPrompt_moveHorizontal__P189810_mk(s) {
 
 
 
-function game_NumberPrompt_updateCursor__P189804(s) {
+function game_NumberPrompt_updateCursor__P4588(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34739,7 +34829,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 4);
@@ -34751,37 +34841,37 @@ switch (step) {
     r0 = s.tmp_3.fields["_image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_2, 0);
-    s.tmp_0 = game_NumberPrompt_updateButtons__P189803_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateButtons__P4587_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1276; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1283; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = Sprite_x__P187243_mk(s);
+    s.tmp_0 = Sprite_x__P2026_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = r0 = globals.ROW_LEFT___189746;
+    s.tmp_1 = r0 = globals.ROW_LEFT___4530;
     r0 = s.arg0.fields["cursorColumn"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 * globals.CELL_WIDTH___189730);
+    r0 = (s.tmp_3 * globals.CELL_WIDTH___4514);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1277; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1284; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
+    s.tmp_0 = Sprite_y__P2028_mk(s);
     r0 = s.arg0.fields["cursor"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = r0 = globals.NUMPAD_TOP___189778;
+    s.tmp_1 = r0 = globals.NUMPAD_TOP___4562;
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 * globals.CELL_HEIGHT___189728);
+    r0 = (s.tmp_3 * globals.CELL_HEIGHT___4512);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1278; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1285; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 2:
@@ -34789,12 +34879,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateCursor__P189804.info = {"start":8275,"length":352,"line":246,"column":8,"endLine":255,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateCursor","argumentNames":["this"]}
+game_NumberPrompt_updateCursor__P4588.info = {"start":8275,"length":352,"line":246,"column":8,"endLine":255,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateCursor","argumentNames":["this"]}
 
-function game_NumberPrompt_updateCursor__P189804_mk(s) {
+function game_NumberPrompt_updateCursor__P4588_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateCursor__P189804, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateCursor__P4588, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34807,7 +34897,7 @@ function game_NumberPrompt_updateCursor__P189804_mk(s) {
 
 
 
-function game_NumberPrompt_updateButtons__P189803(s) {
+function game_NumberPrompt_updateButtons__P4587(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34822,7 +34912,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 4);
@@ -34842,7 +34932,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["colorCursor"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["colorCursor"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1270; s.pc = 3; return s.tmp_5; }
+     else { s.callLocIdx = 1277; s.pc = 3; return s.tmp_5; }
     }
   case 3:
     r0 = s.retval;
@@ -34863,37 +34953,37 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["colorBottomBackground"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["colorBottomBackground"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1272; s.pc = 4; return s.tmp_3; }
+     else { s.callLocIdx = 1279; s.pc = 4; return s.tmp_3; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, s.tmp_2);
   case 2:
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
     r0 = s.arg0.fields["confirmButton"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_image"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = globals.confirmText___189797;
-    s.tmp_0.arg2 = globals.BOTTOM_BAR_CONFIRM_X___189770;
-    s.tmp_0.arg3 = globals.BOTTOM_BAR_TEXT_Y___189767;
+    s.tmp_0.arg1 = globals.confirmText___4581;
+    s.tmp_0.arg2 = globals.BOTTOM_BAR_CONFIRM_X___4554;
+    s.tmp_0.arg3 = globals.BOTTOM_BAR_TEXT_Y___4551;
     s.tmp_0.arg4 = undefined;
     s.tmp_0.arg5 = undefined;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1274; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1281; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateButtons__P189803.info = {"start":7892,"length":373,"line":235,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateButtons","argumentNames":["this"]}
+game_NumberPrompt_updateButtons__P4587.info = {"start":7892,"length":373,"line":235,"column":8,"endLine":244,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateButtons","argumentNames":["this"]}
 
-function game_NumberPrompt_updateButtons__P189803_mk(s) {
+function game_NumberPrompt_updateButtons__P4587_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateButtons__P189803, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateButtons__P4587, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34908,7 +34998,7 @@ function game_NumberPrompt_updateButtons__P189803_mk(s) {
 
 
 
-function Sprite_y__P187245(s) {
+function Sprite_y__P2028(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34924,8 +35014,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P187284_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P2067_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -34943,12 +35033,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_y__P187245.info = {"start":2022,"length":72,"line":86,"column":4,"endLine":88,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this","v"]}
+Sprite_y__P2028.info = {"start":2022,"length":72,"line":86,"column":4,"endLine":88,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"y","argumentNames":["this","v"]}
 
-function Sprite_y__P187245_mk(s) {
+function Sprite_y__P2028_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_y__P187245, depth: s.depth + 1,
+        parent: s, fn: Sprite_y__P2028, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -34963,7 +35053,7 @@ function Sprite_y__P187245_mk(s) {
 
 
 
-function game_NumberPrompt_moveVertical__P189809(s) {
+function game_NumberPrompt_moveVertical__P4593(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -34979,7 +35069,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 3; continue; }
     r0 = s.arg0.fields["cursorRow"];
@@ -35001,28 +35091,28 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["colorCursor"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["colorCursor"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1306; s.pc = 5; return s.tmp_5; }
+     else { s.callLocIdx = 1313; s.pc = 5; return s.tmp_5; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_2, s.tmp_4);
     r0 = (s.arg0).fields["cursorRow"] = (3);
-    s.tmp_0 = game_NumberPrompt_updateButtons__P189803_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateButtons__P4587_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1307; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1314; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P185342_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
     s.tmp_2.arg0 = 0;
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1308; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1315; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -35031,33 +35121,33 @@ switch (step) {
     { step = 4; continue; }
   case 3:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_min__P185343_mk(s);
+    s.tmp_2 = Math_min__P126_mk(s);
     s.tmp_2.arg0 = 4;
     r0 = s.arg0.fields["cursorRow"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 1);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1309; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1316; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorRow"] = (s.tmp_1);
   case 4:
-    s.tmp_0 = game_NumberPrompt_updateCursor__P189804_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateCursor__P4588_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1310; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1317; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_moveVertical__P189809.info = {"start":10792,"length":538,"line":327,"column":8,"endLine":344,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"moveVertical","argumentNames":["this","up"]}
+game_NumberPrompt_moveVertical__P4593.info = {"start":10792,"length":538,"line":327,"column":8,"endLine":344,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"moveVertical","argumentNames":["this","up"]}
 
-function game_NumberPrompt_moveVertical__P189809_mk(s) {
+function game_NumberPrompt_moveVertical__P4593_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_moveVertical__P189809, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_moveVertical__P4593, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35073,7 +35163,7 @@ function game_NumberPrompt_moveVertical__P189809_mk(s) {
 
 
 
-function game_NumberPrompt_updateSelectedInput__P189805(s) {
+function game_NumberPrompt_updateSelectedInput__P4589(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35083,13 +35173,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.u___195215 = undefined;
+    s.u___8763 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["answerLength"];
@@ -35103,14 +35193,14 @@ switch (step) {
     r0 = s.arg0.fields["inputIndex"];
     s.tmp_4 = r0;
     r0 = pxsim_Array__getAt(s.tmp_3, s.tmp_4);
-    s.u___195215 = (r0);
+    s.u___8763 = (r0);
     r0 = s.arg0.fields["blink"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = game_NumberPrompt_drawInput__P189807_mk(s);
+    s.tmp_1 = game_NumberPrompt_drawInput__P4591_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    r0 = s.u___195215.fields["_image"];
+    r0 = s.u___8763.fields["_image"];
     s.tmp_1.arg1 = r0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1.arg2 = r0;
@@ -35123,19 +35213,19 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorInput"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorInput"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1280; s.pc = 6; return s.tmp_2; }
+     else { s.callLocIdx = 1287; s.pc = 6; return s.tmp_2; }
     }
   case 6:
     r0 = s.retval;
     s.tmp_1.arg3 = r0;
-    s.callLocIdx = 1281; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1288; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = game_NumberPrompt_drawInput__P189807_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawInput__P4591_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = s.u___195215.fields["_image"];
+    r0 = s.u___8763.fields["_image"];
     s.tmp_0.arg1 = r0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_0.arg2 = r0;
@@ -35148,12 +35238,12 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInputHighlighted"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInputHighlighted"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1283; s.pc = 8; return s.tmp_1; }
+     else { s.callLocIdx = 1290; s.pc = 8; return s.tmp_1; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1284; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1291; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 2:
@@ -35163,19 +35253,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateSelectedInput__P189805.info = {"start":8637,"length":413,"line":257,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateSelectedInput","argumentNames":["this"]}
+game_NumberPrompt_updateSelectedInput__P4589.info = {"start":8637,"length":413,"line":257,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateSelectedInput","argumentNames":["this"]}
 
-function game_NumberPrompt_updateSelectedInput__P189805_mk(s) {
+function game_NumberPrompt_updateSelectedInput__P4589_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateSelectedInput__P189805, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateSelectedInput__P4589, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  u___195215: undefined,
+  u___8763: undefined,
   arg0: undefined,
 } }
 
@@ -35183,7 +35273,7 @@ function game_NumberPrompt_updateSelectedInput__P189805_mk(s) {
 
 
 
-function controller_Button_onEvent__P187127(s) {
+function controller_Button_onEvent__P1910(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35200,8 +35290,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
-    s.tmp_0 = control_onEvent__P185597_mk(s);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    s.tmp_0 = control_onEvent__P380_mk(s);
     s.tmp_0.arg0 = s.arg1;
     r0 = s.arg0.fields["id"];
     s.tmp_0.arg1 = r0;
@@ -35214,12 +35304,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_onEvent__P187127.info = {"start":3368,"length":124,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"onEvent","argumentNames":["this","event","handler"]}
+controller_Button_onEvent__P1910.info = {"start":3368,"length":124,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"onEvent","argumentNames":["this","event","handler"]}
 
-function controller_Button_onEvent__P187127_mk(s) {
+function controller_Button_onEvent__P1910_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_onEvent__P187127, depth: s.depth + 1,
+        parent: s, fn: controller_Button_onEvent__P1910, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -35231,7 +35321,7 @@ function controller_Button_onEvent__P187127_mk(s) {
 
 
 
-function game_NumberPrompt_draw__P189798(s) {
+function game_NumberPrompt_draw__P4582(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35246,37 +35336,37 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
-    s.tmp_0 = game_NumberPrompt_drawPromptText__P189799_mk(s);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    s.tmp_0 = game_NumberPrompt_drawPromptText__P4583_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1236; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1243; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawNumpad__P189801_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawNumpad__P4585_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1237; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1244; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawInputarea__P189800_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawInputarea__P4584_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1238; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1245; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_drawBottomBar__P189802_mk(s);
+    s.tmp_0 = game_NumberPrompt_drawBottomBar__P4586_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1239; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1246; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_draw__P189798.info = {"start":5389,"length":160,"line":168,"column":8,"endLine":173,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"draw","argumentNames":["this"]}
+game_NumberPrompt_draw__P4582.info = {"start":5389,"length":160,"line":168,"column":8,"endLine":173,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"draw","argumentNames":["this"]}
 
-function game_NumberPrompt_draw__P189798_mk(s) {
+function game_NumberPrompt_draw__P4582_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_draw__P189798, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_draw__P4582, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -35286,7 +35376,7 @@ function game_NumberPrompt_draw__P189798_mk(s) {
 
 
 
-function game_NumberPrompt_drawBottomBar__P189802(s) {
+function game_NumberPrompt_drawBottomBar__P4586(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35296,19 +35386,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bg___198058 = undefined;
-    s.bgSprite___198070 = undefined;
+    s.bg___11979 = undefined;
+    s.bgSprite___11991 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0 = r0;
-    r0 = pxsim.image.create(s.tmp_0, globals.BOTTOM_BAR_HEIGHT___189754);
-    s.bg___198058 = (r0);
-    s.tmp_0 = r0 = s.bg___198058;
+    r0 = pxsim.image.create(s.tmp_0, globals.BOTTOM_BAR_HEIGHT___4538);
+    s.bg___11979 = (r0);
+    s.tmp_0 = r0 = s.bg___11979;
     s.tmp_2 = if_colorBottomBackground_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -35318,40 +35408,40 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorBottomBackground"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorBottomBackground"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1260; s.pc = 1; return s.tmp_2; }
+     else { s.callLocIdx = 1267; s.pc = 1; return s.tmp_2; }
     }
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, s.tmp_1);
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    s.tmp_0.arg0 = s.bg___198058;
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    s.tmp_0.arg0 = s.bg___11979;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1261; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1268; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.bgSprite___198070 = (r0);
-    s.tmp_0 = Sprite_x__P187243_mk(s);
-    s.tmp_0.arg0 = s.bgSprite___198070;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.bgSprite___11991 = (r0);
+    s.tmp_0 = Sprite_x__P2026_mk(s);
+    s.tmp_0.arg0 = s.bgSprite___11991;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1262; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1269; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
-    s.tmp_0.arg0 = s.bgSprite___198070;
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___189757;
-    r0 = (globals.BOTTOM_BAR_HEIGHT___189754 / 2);
+    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0.arg0 = s.bgSprite___11991;
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___4541;
+    r0 = (globals.BOTTOM_BAR_HEIGHT___4538 / 2);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1263; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1270; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     s.tmp_0 = if_z_2_mk(s);
-    s.tmp_0.arg0 = s.bgSprite___198070;
+    s.tmp_0.arg0 = s.bgSprite___11991;
     s.tmp_0.arg1 = -1;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapSetByString(s.tmp_0.arg0, "z", s.tmp_0.arg1);
@@ -35359,63 +35449,63 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 1264; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 1271; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = sprites_create__P187191_mk(s);
-    r0 = pxsim.image.create(globals.BOTTOM_BAR_BUTTON_WIDTH___189764, globals.BOTTOM_BAR_HEIGHT___189754);
+    s.tmp_2 = sprites_create__P1974_mk(s);
+    r0 = pxsim.image.create(globals.BOTTOM_BAR_BUTTON_WIDTH___4548, globals.BOTTOM_BAR_HEIGHT___4538);
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = -1;
-    s.callLocIdx = 1265; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 1272; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["confirmButton"] = (s.tmp_1);
-    s.tmp_0 = Sprite_right__P187282_mk(s);
+    s.tmp_0 = Sprite_right__P2065_mk(s);
     r0 = s.arg0.fields["confirmButton"];
     s.tmp_0.arg0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1266; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1273; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
+    s.tmp_0 = Sprite_y__P2028_mk(s);
     r0 = s.arg0.fields["confirmButton"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___189757;
-    r0 = (globals.BOTTOM_BAR_HEIGHT___189754 / 2);
+    s.tmp_1 = r0 = globals.BOTTOM_BAR_TOP___4541;
+    r0 = (globals.BOTTOM_BAR_HEIGHT___4538 / 2);
     s.tmp_3 = r0;
     r0 = pxsim.Math_.ceil(s.tmp_3);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1267; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1274; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_updateButtons__P189803_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateButtons__P4587_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1268; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1275; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawBottomBar__P189802.info = {"start":7245,"length":637,"line":219,"column":8,"endLine":233,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawBottomBar","argumentNames":["this"]}
+game_NumberPrompt_drawBottomBar__P4586.info = {"start":7245,"length":637,"line":219,"column":8,"endLine":233,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawBottomBar","argumentNames":["this"]}
 
-function game_NumberPrompt_drawBottomBar__P189802_mk(s) {
+function game_NumberPrompt_drawBottomBar__P4586_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawBottomBar__P189802, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawBottomBar__P4586, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  bg___198058: undefined,
-  bgSprite___198070: undefined,
+  bg___11979: undefined,
+  bgSprite___11991: undefined,
   arg0: undefined,
 } }
 
@@ -35423,7 +35513,7 @@ function game_NumberPrompt_drawBottomBar__P189802_mk(s) {
 
 
 
-function Sprite_right__P187282(s) {
+function Sprite_right__P2065(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35439,8 +35529,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P187280_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P2063_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_1 = r0 = s.arg1;
     r0 = s.arg0.fields["_image"];
@@ -35456,12 +35546,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_right__P187282.info = {"start":9428,"length":71,"line":344,"column":4,"endLine":346,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this","value"]}
+Sprite_right__P2065.info = {"start":9428,"length":71,"line":344,"column":4,"endLine":346,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this","value"]}
 
-function Sprite_right__P187282_mk(s) {
+function Sprite_right__P2065_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_right__P187282, depth: s.depth + 1,
+        parent: s, fn: Sprite_right__P2065, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35475,7 +35565,7 @@ function Sprite_right__P187282_mk(s) {
 
 
 
-function Sprite_right__P187281(s) {
+function Sprite_right__P2064(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35490,8 +35580,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_left__P187279_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_left__P2062_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 324; s.pc = 1; return s.tmp_1;
   case 1:
@@ -35505,13 +35595,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_right__P187281.info = {"start":9279,"length":57,"line":339,"column":4,"endLine":341,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this"]}
-Sprite_right__P187281.isGetter = true;
+Sprite_right__P2064.info = {"start":9279,"length":57,"line":339,"column":4,"endLine":341,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"right","argumentNames":["this"]}
+Sprite_right__P2064.isGetter = true;
 
-function Sprite_right__P187281_mk(s) {
+function Sprite_right__P2064_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_right__P187281, depth: s.depth + 1,
+        parent: s, fn: Sprite_right__P2064, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35524,7 +35614,7 @@ function Sprite_right__P187281_mk(s) {
 
 
 
-function game_NumberPrompt_drawNumpad__P189801(s) {
+function game_NumberPrompt_drawNumpad__P4585(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35534,21 +35624,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cursorImage___198205 = undefined;
-    s.j___198232 = undefined;
-    s.letter___198237 = undefined;
-    s.col2___198242 = undefined;
-    s.row2___198246 = undefined;
-    s.t___198252 = undefined;
+    s.cursorImage___12126 = undefined;
+    s.j___12153 = undefined;
+    s.letter___12158 = undefined;
+    s.col2___12163 = undefined;
+    s.row2___12167 = undefined;
+    s.t___12173 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
-    r0 = pxsim.image.create(globals.CELL_WIDTH___189730, globals.CELL_HEIGHT___189728);
-    s.cursorImage___198205 = (r0);
-    s.tmp_0 = r0 = s.cursorImage___198205;
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    r0 = pxsim.image.create(globals.CELL_WIDTH___4514, globals.CELL_HEIGHT___4512);
+    s.cursorImage___12126 = (r0);
+    s.tmp_0 = r0 = s.cursorImage___12126;
     s.tmp_2 = if_colorCursor_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -35558,17 +35648,17 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorCursor"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorCursor"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1252; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1259; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = sprites_create__P187191_mk(s);
-    s.tmp_2.arg0 = s.cursorImage___198205;
+    s.tmp_2 = sprites_create__P1974_mk(s);
+    s.tmp_2.arg0 = s.cursorImage___12126;
     s.tmp_2.arg1 = -1;
-    s.callLocIdx = 1253; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1260; s.pc = 4; return s.tmp_2;
   case 4:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -35583,92 +35673,92 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["set/z"];
       if (s.tmp_0.fn === null) { s.tmp_0.arg0.fields["z"] = s.tmp_0.arg1; }
       else if (s.tmp_0.fn === undefined) { failedCast(s.tmp_0.arg0) } 
-     else { s.callLocIdx = 1254; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 1261; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_NumberPrompt_updateCursor__P189804_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateCursor__P4588_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1255; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1262; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["numbers"] = (s.tmp_1);
-    s.j___198232 = (0);
+    s.j___12153 = (0);
   case 1:
-    r0 = (s.j___198232 < 12);
+    r0 = (s.j___12153 < 12);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim.image.create(globals.CELL_WIDTH___189730, globals.CELL_HEIGHT___189728);
-    s.letter___198237 = (r0);
-    r0 = (s.j___198232 % 3);
-    s.col2___198242 = (r0);
-    r0 = (s.j___198232 / 3);
+    r0 = pxsim.image.create(globals.CELL_WIDTH___4514, globals.CELL_HEIGHT___4512);
+    s.letter___12158 = (r0);
+    r0 = (s.j___12153 % 3);
+    s.col2___12163 = (r0);
+    r0 = (s.j___12153 / 3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.row2___198246 = (r0);
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    s.tmp_0.arg0 = s.letter___198237;
+    s.row2___12167 = (r0);
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    s.tmp_0.arg0 = s.letter___12158;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1256; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1263; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.t___198252 = (r0);
-    s.tmp_0 = Sprite_x__P187243_mk(s);
-    s.tmp_0.arg0 = s.t___198252;
-    s.tmp_1 = r0 = globals.ROW_LEFT___189746;
-    r0 = (s.col2___198242 * globals.CELL_WIDTH___189730);
+    s.t___12173 = (r0);
+    s.tmp_0 = Sprite_x__P2026_mk(s);
+    s.tmp_0.arg0 = s.t___12173;
+    s.tmp_1 = r0 = globals.ROW_LEFT___4530;
+    r0 = (s.col2___12163 * globals.CELL_WIDTH___4514);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1257; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1264; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
-    s.tmp_0.arg0 = s.t___198252;
-    s.tmp_1 = r0 = globals.NUMPAD_TOP___189778;
-    r0 = (s.row2___198246 * globals.CELL_HEIGHT___189728);
+    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0.arg0 = s.t___12173;
+    s.tmp_1 = r0 = globals.NUMPAD_TOP___4562;
+    r0 = (s.row2___12167 * globals.CELL_HEIGHT___4512);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1258; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1265; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = s.arg0.fields["numbers"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.t___198252);
-    r0 = (s.j___198232 + 1);
-    s.j___198232 = (r0);
+    r0 = pxsim_Array__push(s.tmp_0, s.t___12173);
+    r0 = (s.j___12153 + 1);
+    s.j___12153 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_0 = game_NumberPrompt_updateKeyboard__P189806_mk(s);
+    s.tmp_0 = game_NumberPrompt_updateKeyboard__P4590_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1259; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1266; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawNumpad__P189801.info = {"start":6433,"length":802,"line":196,"column":8,"endLine":217,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawNumpad","argumentNames":["this"]}
+game_NumberPrompt_drawNumpad__P4585.info = {"start":6433,"length":802,"line":196,"column":8,"endLine":217,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawNumpad","argumentNames":["this"]}
 
-function game_NumberPrompt_drawNumpad__P189801_mk(s) {
+function game_NumberPrompt_drawNumpad__P4585_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawNumpad__P189801, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawNumpad__P4585, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  cursorImage___198205: undefined,
-  j___198232: undefined,
-  letter___198237: undefined,
-  col2___198242: undefined,
-  row2___198246: undefined,
-  t___198252: undefined,
+  cursorImage___12126: undefined,
+  j___12153: undefined,
+  letter___12158: undefined,
+  col2___12163: undefined,
+  row2___12167: undefined,
+  t___12173: undefined,
   arg0: undefined,
 } }
 
@@ -35676,7 +35766,7 @@ function game_NumberPrompt_drawNumpad__P189801_mk(s) {
 
 
 
-function game_NumberPrompt_updateKeyboard__P189806(s) {
+function game_NumberPrompt_updateKeyboard__P4590(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35686,69 +35776,69 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___198281 = undefined;
-    s.k___198285 = undefined;
-    s.img___198290 = undefined;
+    s.len___12202 = undefined;
+    s.k___12206 = undefined;
+    s.img___12211 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = s.arg0.fields["numbers"];
     s.tmp_0 = r0;
     r0 = pxsim_Array__length(s.tmp_0);
-    s.len___198281 = (r0);
-    s.k___198285 = (0);
+    s.len___12202 = (r0);
+    s.k___12206 = (0);
   case 1:
-    r0 = (s.k___198285 < s.len___198281);
+    r0 = (s.k___12206 < s.len___12202);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
     r0 = s.arg0.fields["numbers"];
     s.tmp_2 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_2, s.k___198285);
+    r0 = pxsim_Array__getAt(s.tmp_2, s.k___12206);
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_image"];
-    s.img___198290 = (r0);
-    r0 = pxsim_ImageMethods.fill(s.img___198290, 0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = s.img___198290;
-    s.tmp_1 = game_getSymbolFromIndex__P189815_mk(s);
-    s.tmp_1.arg0 = s.k___198285;
-    s.callLocIdx = 1286; s.pc = 4; return s.tmp_1;
+    s.img___12211 = (r0);
+    r0 = pxsim_ImageMethods.fill(s.img___12211, 0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = s.img___12211;
+    s.tmp_1 = game_getSymbolFromIndex__P4599_mk(s);
+    s.tmp_1.arg0 = s.k___12206;
+    s.callLocIdx = 1293; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___189734;
-    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___189738;
+    s.tmp_0.arg2 = globals.LETTER_OFFSET_X___4518;
+    s.tmp_0.arg3 = globals.LETTER_OFFSET_Y___4522;
     s.tmp_0.arg4 = undefined;
     s.tmp_0.arg5 = undefined;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1287; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1294; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = (s.k___198285 + 1);
-    s.k___198285 = (r0);
+    r0 = (s.k___12206 + 1);
+    s.k___12206 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_updateKeyboard__P189806.info = {"start":9060,"length":303,"line":269,"column":8,"endLine":276,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateKeyboard","argumentNames":["this"]}
+game_NumberPrompt_updateKeyboard__P4590.info = {"start":9060,"length":303,"line":269,"column":8,"endLine":276,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"updateKeyboard","argumentNames":["this"]}
 
-function game_NumberPrompt_updateKeyboard__P189806_mk(s) {
+function game_NumberPrompt_updateKeyboard__P4590_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_updateKeyboard__P189806, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_updateKeyboard__P4590, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___198281: undefined,
-  k___198285: undefined,
-  img___198290: undefined,
+  len___12202: undefined,
+  k___12206: undefined,
+  img___12211: undefined,
   arg0: undefined,
 } }
 
@@ -35756,7 +35846,7 @@ function game_NumberPrompt_updateKeyboard__P189806_mk(s) {
 
 
 
-function game_NumberPrompt_drawInputarea__P189800(s) {
+function game_NumberPrompt_drawInputarea__P4584(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35766,43 +35856,43 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.answerLeft___198150 = undefined;
-    s.i___198163 = undefined;
-    s.blank___198169 = undefined;
-    s.s___198179 = undefined;
+    s.answerLeft___12071 = undefined;
+    s.i___12084 = undefined;
+    s.blank___12090 = undefined;
+    s.s___12100 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = s.arg0.fields["answerLength"];
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 * globals.CELL_WIDTH___189730);
+    r0 = (s.tmp_3 * globals.CELL_WIDTH___4514);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    s.answerLeft___198150 = (r0);
+    s.answerLeft___12071 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["inputs"] = (s.tmp_1);
-    s.i___198163 = (0);
+    s.i___12084 = (0);
   case 1:
     r0 = s.arg0.fields["answerLength"];
     s.tmp_1 = r0;
-    r0 = (s.i___198163 < s.tmp_1);
+    r0 = (s.i___12084 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim.image.create(globals.CELL_WIDTH___189730, globals.CELL_HEIGHT___189728);
-    s.blank___198169 = (r0);
-    s.tmp_0 = game_NumberPrompt_drawInput__P189807_mk(s);
+    r0 = pxsim.image.create(globals.CELL_WIDTH___4514, globals.CELL_HEIGHT___4512);
+    s.blank___12090 = (r0);
+    s.tmp_0 = game_NumberPrompt_drawInput__P4591_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.blank___198169;
+    s.tmp_0.arg1 = s.blank___12090;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_0.arg2 = r0;
     s.tmp_1 = if_colorInput_1_mk(s);
@@ -35814,63 +35904,63 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["colorInput"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["colorInput"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1247; s.pc = 4; return s.tmp_1; }
+     else { s.callLocIdx = 1254; s.pc = 4; return s.tmp_1; }
     }
   case 4:
     r0 = s.retval;
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1248; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1255; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    s.tmp_0.arg0 = s.blank___198169;
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    s.tmp_0.arg0 = s.blank___12090;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1249; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1256; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.s___198179 = (r0);
-    s.tmp_0 = Sprite_left__P187280_mk(s);
-    s.tmp_0.arg0 = s.s___198179;
-    s.tmp_1 = r0 = s.answerLeft___198150;
-    r0 = (s.i___198163 * globals.CELL_WIDTH___189730);
+    s.s___12100 = (r0);
+    s.tmp_0 = Sprite_left__P2063_mk(s);
+    s.tmp_0.arg0 = s.s___12100;
+    s.tmp_1 = r0 = s.answerLeft___12071;
+    r0 = (s.i___12084 * globals.CELL_WIDTH___4514);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1250; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1257; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
-    s.tmp_0.arg0 = s.s___198179;
-    s.tmp_0.arg1 = globals.INPUT_TOP___189788;
-    s.callLocIdx = 1251; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0.arg0 = s.s___12100;
+    s.tmp_0.arg1 = globals.INPUT_TOP___4572;
+    s.callLocIdx = 1258; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["inputs"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.s___198179);
-    r0 = (s.i___198163 + 1);
-    s.i___198163 = (r0);
+    r0 = pxsim_Array__push(s.tmp_0, s.s___12100);
+    r0 = (s.i___12084 + 1);
+    s.i___12084 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawInputarea__P189800.info = {"start":5889,"length":534,"line":181,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawInputarea","argumentNames":["this"]}
+game_NumberPrompt_drawInputarea__P4584.info = {"start":5889,"length":534,"line":181,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawInputarea","argumentNames":["this"]}
 
-function game_NumberPrompt_drawInputarea__P189800_mk(s) {
+function game_NumberPrompt_drawInputarea__P4584_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawInputarea__P189800, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawInputarea__P4584, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  answerLeft___198150: undefined,
-  i___198163: undefined,
-  blank___198169: undefined,
-  s___198179: undefined,
+  answerLeft___12071: undefined,
+  i___12084: undefined,
+  blank___12090: undefined,
+  s___12100: undefined,
   arg0: undefined,
 } }
 
@@ -35878,7 +35968,7 @@ function game_NumberPrompt_drawInputarea__P189800_mk(s) {
 
 
 
-function game_NumberPrompt_drawPromptText__P189799(s) {
+function game_NumberPrompt_drawPromptText__P4583(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -35888,19 +35978,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.prompt___198310 = undefined;
+    s.prompt___12231 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    s.tmp_1 = game_layoutText__P189814_mk(s);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    s.tmp_1 = game_layoutText__P4598_mk(s);
     r0 = s.arg0.fields["message"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = globals.PROMPT_WIDTH___189796;
-    s.tmp_1.arg2 = globals.PROMPT_HEIGHT___189793;
+    s.tmp_1.arg1 = globals.PROMPT_WIDTH___4580;
+    s.tmp_1.arg2 = globals.PROMPT_HEIGHT___4577;
     s.tmp_2 = if_colorPrompt_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -35910,33 +36000,33 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["colorPrompt"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["colorPrompt"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1240; s.pc = 3; return s.tmp_2; }
+     else { s.callLocIdx = 1247; s.pc = 3; return s.tmp_2; }
     }
   case 3:
     r0 = s.retval;
     s.tmp_1.arg3 = r0;
-    s.callLocIdx = 1241; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1248; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1242; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1249; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.prompt___198310 = (r0);
-    s.tmp_0 = Sprite_x__P187243_mk(s);
-    s.tmp_0.arg0 = s.prompt___198310;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.prompt___12231 = (r0);
+    s.tmp_0 = Sprite_x__P2026_mk(s);
+    s.tmp_0.arg0 = s.prompt___12231;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 / 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1243; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1250; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
-    s.tmp_0.arg0 = s.prompt___198310;
-    s.tmp_5 = r0 = globals.PROMPT_HEIGHT___189793;
-    r0 = s.prompt___198310.fields["_image"];
+    s.tmp_0 = Sprite_y__P2028_mk(s);
+    s.tmp_0.arg0 = s.prompt___12231;
+    s.tmp_5 = r0 = globals.PROMPT_HEIGHT___4577;
+    r0 = s.prompt___12231.fields["_image"];
     s.tmp_7 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_7);
     s.tmp_6 = r0;
@@ -35948,7 +36038,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (4 + s.tmp_2);
     s.tmp_1 = r0;
-    r0 = s.prompt___198310.fields["_image"];
+    r0 = s.prompt___12231.fields["_image"];
     s.tmp_11 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_11);
     s.tmp_10 = r0;
@@ -35958,19 +36048,19 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_1 + s.tmp_8);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1246; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1253; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_drawPromptText__P189799.info = {"start":5559,"length":320,"line":175,"column":8,"endLine":179,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawPromptText","argumentNames":["this"]}
+game_NumberPrompt_drawPromptText__P4583.info = {"start":5559,"length":320,"line":175,"column":8,"endLine":179,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"drawPromptText","argumentNames":["this"]}
 
-function game_NumberPrompt_drawPromptText__P189799_mk(s) {
+function game_NumberPrompt_drawPromptText__P4583_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_drawPromptText__P189799, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_drawPromptText__P4583, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -35984,7 +36074,7 @@ function game_NumberPrompt_drawPromptText__P189799_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  prompt___198310: undefined,
+  prompt___12231: undefined,
   arg0: undefined,
 } }
 
@@ -35992,7 +36082,7 @@ function game_NumberPrompt_drawPromptText__P189799_mk(s) {
 
 
 
-function game_layoutText__P189814(s) {
+function game_layoutText__P4598(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36002,21 +36092,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.lineHeight___198359 = undefined;
-    s.lineLength___198364 = undefined;
-    s.numLines___198371 = undefined;
-    s.lines___198377 = undefined;
-    s.word___198379 = undefined;
-    s.line___198380 = undefined;
-    s.pushWord___198381 = undefined;
-    s.l___198413 = undefined;
-    s.char___198419 = undefined;
-    s.maxLineWidth___198448 = undefined;
-    s.m___198449 = undefined;
-    s.actualWidth___198463 = undefined;
-    s.actualHeight___198468 = undefined;
-    s.res___198473 = undefined;
-    s.n___198478 = undefined;
+    s.lineHeight___12280 = undefined;
+    s.lineLength___12285 = undefined;
+    s.numLines___12292 = undefined;
+    s.lines___12298 = undefined;
+    s.word___12300 = undefined;
+    s.line___12301 = undefined;
+    s.pushWord___12302 = undefined;
+    s.l___12334 = undefined;
+    s.char___12340 = undefined;
+    s.maxLineWidth___12369 = undefined;
+    s.m___12370 = undefined;
+    s.actualWidth___12384 = undefined;
+    s.actualHeight___12389 = undefined;
+    s.res___12394 = undefined;
+    s.n___12399 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -36025,30 +36115,30 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = if_charHeight_1_mk(s);
-    s.tmp_1.arg0 = globals.font___189699;
+    s.tmp_1.arg0 = globals.font___4483;
     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 = 1322; s.pc = 19; return s.tmp_1; }
+     else { s.callLocIdx = 1329; s.pc = 19; return s.tmp_1; }
     }
   case 19:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 2);
-    s.lineHeight___198359 = (r0);
+    s.lineHeight___12280 = (r0);
     s.tmp_1 = r0 = s.arg1;
     s.tmp_3 = if_charWidth_1_mk(s);
-    s.tmp_3.arg0 = globals.font___189699;
+    s.tmp_3.arg0 = globals.font___4483;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charWidth");
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1323; s.pc = 20; return s.tmp_3; }
+     else { s.callLocIdx = 1330; s.pc = 20; return s.tmp_3; }
     }
   case 20:
     r0 = s.retval;
@@ -36056,56 +36146,56 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.lineLength___198364 = (r0);
-    r0 = (s.arg2 / s.lineHeight___198359);
+    s.lineLength___12285 = (r0);
+    r0 = (s.arg2 / s.lineHeight___12280);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.numLines___198371 = (r0);
+    s.numLines___12292 = (r0);
     r0 = pxsim_Array__mk();
-    s.lines___198377 = (r0);
+    s.lines___12298 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.word___198379 = (r0);
+    s.word___12300 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.line___198380 = (r0);
-    r0 = pxsim_pxtcore_mkAction(4, inline__P198382);
+    s.line___12301 = (r0);
+    r0 = pxsim_pxtcore_mkAction(4, inline__P12303);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___198380);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.word___198379);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.lineLength___198364);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.lines___198377);
-    s.pushWord___198381 = (s.tmp_0);
-    s.l___198413 = (0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___12301);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.word___12300);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.lineLength___12285);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.lines___12298);
+    s.pushWord___12302 = (s.tmp_0);
+    s.l___12334 = (0);
   case 1:
-    s.tmp_1 = r0 = s.l___198413;
+    s.tmp_1 = r0 = s.l___12334;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    r0 = pxsim_String_.charAt(s.arg0, s.l___198413);
-    s.char___198419 = (r0);
-    r0 = (s.char___198419 === " ");
+    r0 = pxsim_String_.charAt(s.arg0, s.l___12334);
+    s.char___12340 = (r0);
+    r0 = (s.char___12340 === " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_pxtrt_ldlocRef(s.word___198379);
+    r0 = pxsim_pxtrt_ldlocRef(s.word___12300);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 2; continue; }
     s.tmp_2 = lambda_1_mk(s);
-    s.tmp_2.argL = s.pushWord___198381;
+    s.tmp_2.argL = s.pushWord___12302;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1324; s.pc = 21; return s.tmp_2;
+    s.callLocIdx = 1331; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
     { step = 3; continue; }
   case 2:
-    r0 = pxsim_pxtrt_stlocRef(s.word___198379, " ");
+    r0 = pxsim_pxtrt_stlocRef(s.word___12300, " ");
   case 3:
     { step = 7; continue; }
   case 4:
-    r0 = pxsim_pxtrt_ldlocRef(s.word___198379);
+    r0 = pxsim_pxtrt_ldlocRef(s.word___12300);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -36113,11 +36203,11 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtrt_stlocRef(s.word___198379, s.char___198419);
+    r0 = pxsim_pxtrt_stlocRef(s.word___12300, s.char___12340);
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = r0 = s.word___198379;
-    r0 = pxsim_pxtrt_ldlocRef(s.word___198379);
+    s.tmp_0 = r0 = s.word___12300;
+    r0 = pxsim_pxtrt_ldlocRef(s.word___12300);
     s.tmp_3 = r0;
     if ((s.tmp_3) && (s.tmp_3).vtable) {
     setupResume(s, 22);
@@ -36128,12 +36218,12 @@ switch (step) {
   case 22:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((s.char___198419) && (s.char___198419).vtable) {
+    if ((s.char___12340) && (s.char___12340).vtable) {
     setupResume(s, 23);
-    pxsim_String__stringConv(s.char___198419);
+    pxsim_String__stringConv(s.char___12340);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.char___198419) + ""; }
+    } else { s.retval = (s.char___12340) + ""; }
   case 23:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -36142,123 +36232,123 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
   case 6:
   case 7:
-    r0 = (s.l___198413 + 1);
-    s.l___198413 = (r0);
+    r0 = (s.l___12334 + 1);
+    s.l___12334 = (r0);
     { step = 1; continue; }
   case 8:
-    r0 = pxsim_pxtrt_ldlocRef(s.word___198379);
+    r0 = pxsim_pxtrt_ldlocRef(s.word___12300);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
     s.tmp_1 = lambda_1_mk(s);
-    s.tmp_1.argL = s.pushWord___198381;
+    s.tmp_1.argL = s.pushWord___12302;
     setupLambda(s.tmp_1, s.tmp_1.argL);
-    s.callLocIdx = 1325; s.pc = 24; return s.tmp_1;
+    s.callLocIdx = 1332; s.pc = 24; return s.tmp_1;
   case 24:
     r0 = s.retval;
   case 9:
   case 10:
-    r0 = pxsim_pxtrt_ldlocRef(s.line___198380);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___12301);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_1 = r0 = s.lines___198377;
-    r0 = pxsim_pxtrt_ldlocRef(s.line___198380);
+    s.tmp_1 = r0 = s.lines___12298;
+    r0 = pxsim_pxtrt_ldlocRef(s.line___12301);
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
   case 11:
   case 12:
-    s.maxLineWidth___198448 = (0);
-    s.m___198449 = (0);
+    s.maxLineWidth___12369 = (0);
+    s.m___12370 = (0);
   case 13:
-    s.tmp_1 = r0 = s.m___198449;
-    r0 = pxsim_Array__length(s.lines___198377);
+    s.tmp_1 = r0 = s.m___12370;
+    r0 = pxsim_Array__length(s.lines___12298);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_3 = Math_max__P185342_mk(s);
-    s.tmp_3.arg0 = s.maxLineWidth___198448;
-    r0 = pxsim_Array__getAt(s.lines___198377, s.m___198449);
+    s.tmp_3 = Math_max__P125_mk(s);
+    s.tmp_3.arg0 = s.maxLineWidth___12369;
+    r0 = pxsim_Array__getAt(s.lines___12298, s.m___12370);
     s.tmp_4 = r0;
     r0 = pxsim_String_.length(s.tmp_4);
     s.tmp_3.arg1 = r0;
-    s.callLocIdx = 1326; s.pc = 25; return s.tmp_3;
+    s.callLocIdx = 1333; s.pc = 25; return s.tmp_3;
   case 25:
     r0 = s.retval;
-    s.maxLineWidth___198448 = (r0);
-    r0 = (s.m___198449 + 1);
-    s.m___198449 = (r0);
+    s.maxLineWidth___12369 = (r0);
+    r0 = (s.m___12370 + 1);
+    s.m___12370 = (r0);
     { step = 13; continue; }
   case 14:
-    s.tmp_0 = r0 = s.maxLineWidth___198448;
+    s.tmp_0 = r0 = s.maxLineWidth___12369;
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = globals.font___189699;
+    s.tmp_2.arg0 = globals.font___4483;
     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 = 1327; s.pc = 26; return s.tmp_2; }
+     else { s.callLocIdx = 1334; s.pc = 26; return s.tmp_2; }
     }
   case 26:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.actualWidth___198463 = (r0);
-    r0 = pxsim_Array__length(s.lines___198377);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.lineHeight___198359);
-    s.actualHeight___198468 = (r0);
-    r0 = pxsim.image.create(s.actualWidth___198463, s.actualHeight___198468);
-    s.res___198473 = (r0);
-    s.n___198478 = (0);
+    s.actualWidth___12384 = (r0);
+    r0 = pxsim_Array__length(s.lines___12298);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 * s.lineHeight___12280);
+    s.actualHeight___12389 = (r0);
+    r0 = pxsim.image.create(s.actualWidth___12384, s.actualHeight___12389);
+    s.res___12394 = (r0);
+    s.n___12399 = (0);
   case 15:
-    s.tmp_1 = r0 = s.n___198478;
-    r0 = pxsim_Array__length(s.lines___198377);
+    s.tmp_1 = r0 = s.n___12399;
+    r0 = pxsim_Array__length(s.lines___12298);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    r0 = (s.n___198478 + 1);
+    r0 = (s.n___12399 + 1);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 > s.numLines___198371);
+    r0 = (s.tmp_4 > s.numLines___12292);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 16; continue; }
     { step = 18; continue; }
   case 16:
   case 17:
-    s.tmp_5 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_5.arg0 = s.res___198473;
-    r0 = pxsim_Array__getAt(s.lines___198377, s.n___198478);
+    s.tmp_5 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_5.arg0 = s.res___12394;
+    r0 = pxsim_Array__getAt(s.lines___12298, s.n___12399);
     s.tmp_5.arg1 = r0;
     s.tmp_5.arg2 = 0;
-    r0 = (s.n___198478 * s.lineHeight___198359);
+    r0 = (s.n___12399 * s.lineHeight___12280);
     s.tmp_5.arg3 = r0;
     s.tmp_5.arg4 = s.arg3;
-    s.tmp_5.arg5 = globals.font___189699;
+    s.tmp_5.arg5 = globals.font___4483;
     s.tmp_5.arg6 = undefined;
-    s.callLocIdx = 1328; s.pc = 27; return s.tmp_5;
+    s.callLocIdx = 1335; s.pc = 27; return s.tmp_5;
   case 27:
     r0 = s.retval;
-    r0 = (s.n___198478 + 1);
-    s.n___198478 = (r0);
+    r0 = (s.n___12399 + 1);
+    s.n___12399 = (r0);
     { step = 15; continue; }
   case 18:
-    r0 = s.res___198473;
+    r0 = s.res___12394;
     return leave(s, r0)
   default: oops()
 } } }
-game_layoutText__P189814.info = {"start":13472,"length":1856,"line":415,"column":4,"endLine":485,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"layoutText","argumentNames":["message","width","height","color"]}
+game_layoutText__P4598.info = {"start":13472,"length":1856,"line":415,"column":4,"endLine":485,"endColumn":5,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"layoutText","argumentNames":["message","width","height","color"]}
 
-function game_layoutText__P189814_mk(s) {
+function game_layoutText__P4598_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_layoutText__P189814, depth: s.depth + 1,
+        parent: s, fn: game_layoutText__P4598, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36266,21 +36356,21 @@ function game_layoutText__P189814_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  lineHeight___198359: undefined,
-  lineLength___198364: undefined,
-  numLines___198371: undefined,
-  lines___198377: undefined,
-  word___198379: undefined,
-  line___198380: undefined,
-  pushWord___198381: undefined,
-  l___198413: undefined,
-  char___198419: undefined,
-  maxLineWidth___198448: undefined,
-  m___198449: undefined,
-  actualWidth___198463: undefined,
-  actualHeight___198468: undefined,
-  res___198473: undefined,
-  n___198478: undefined,
+  lineHeight___12280: undefined,
+  lineLength___12285: undefined,
+  numLines___12292: undefined,
+  lines___12298: undefined,
+  word___12300: undefined,
+  line___12301: undefined,
+  pushWord___12302: undefined,
+  l___12334: undefined,
+  char___12340: undefined,
+  maxLineWidth___12369: undefined,
+  m___12370: undefined,
+  actualWidth___12384: undefined,
+  actualHeight___12389: undefined,
+  res___12394: undefined,
+  n___12399: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -36291,7 +36381,7 @@ function game_layoutText__P189814_mk(s) {
 
 
 
-function inline__P198382(s) {
+function inline__P12303(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36381,12 +36471,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198382.info = {"start":13856,"length":385,"line":425,"column":23,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
+inline__P12303.info = {"start":13856,"length":385,"line":425,"column":23,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P198382_mk(s) {
+function inline__P12303_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198382, depth: s.depth + 1,
+        parent: s, fn: inline__P12303, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -36404,7 +36494,7 @@ function inline__P198382_mk(s) {
 
 
 
-function game_popScene__P187754(s) {
+function game_popScene__P2537(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36414,59 +36504,59 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.oldScene___194900 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1156; s.pc = 11; return s.tmp_0;
+    s.oldScene___8448 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1163; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
-    s.oldScene___194900 = (r0);
-    s.tmp_0 = r0 = globals._sceneStack___189565;
+    s.oldScene___8448 = (r0);
+    s.tmp_0 = r0 = globals._sceneStack___4349;
     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___189565);
+    r0 = pxsim_Array__length(globals._sceneStack___4349);
   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___189565);
-    globals._scene___189564 = (r0);
-    s.tmp_0 = control_popEventContext__P185616_mk(s);
-    s.callLocIdx = 1157; s.pc = 12; return s.tmp_0;
+    r0 = pxsim_Array_.pop(globals._sceneStack___4349);
+    globals._scene___4348 = (r0);
+    s.tmp_0 = control_popEventContext__P399_mk(s);
+    s.callLocIdx = 1164; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 6; continue; }
   case 3:
-    r0 = pxsim_numops_toBoolDecr(globals._scene___189564);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___4348);
     if (!r0) { step = 4; continue; }
-    s.tmp_0 = control_popEventContext__P185616_mk(s);
-    s.callLocIdx = 1158; s.pc = 13; return s.tmp_0;
+    s.tmp_0 = control_popEventContext__P399_mk(s);
+    s.callLocIdx = 1165; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    globals._scene___189564 = (undefined);
+    globals._scene___4348 = (undefined);
   case 4:
   case 5:
   case 6:
-    r0 = pxsim_numops_toBoolDecr(globals._scene___189564);
+    r0 = pxsim_numops_toBoolDecr(globals._scene___4348);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = particles_enableAll__P187927_mk(s);
-    s.callLocIdx = 1159; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = particles_enableAll__P2710_mk(s);
+    s.callLocIdx = 1166; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___189567);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___4351);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P194921);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P8469);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___194900);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_1.arg0 = globals._scenePopHandlers___189567;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___8448);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1.arg0 = globals._scenePopHandlers___4351;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1161; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 1168; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
   case 9:
@@ -36475,23 +36565,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_popScene__P187754.info = {"start":2033,"length":548,"line":75,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"popScene","argumentNames":[]}
+game_popScene__P2537.info = {"start":2033,"length":548,"line":75,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"popScene","argumentNames":[]}
 
-function game_popScene__P187754_mk(s) {
+function game_popScene__P2537_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_popScene__P187754, depth: s.depth + 1,
+        parent: s, fn: game_popScene__P2537, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  oldScene___194900: undefined,
+  oldScene___8448: undefined,
 } }
 
 
 
 
 
-function inline__P194921(s) {
+function inline__P8469(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36509,19 +36599,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 = 1160; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1167; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194921.info = {"start":2545,"length":18,"line":91,"column":38,"endLine":91,"endColumn":56,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["cb"]}
+inline__P8469.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__P194921_mk(s) {
+function inline__P8469_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194921, depth: s.depth + 1,
+        parent: s, fn: inline__P8469, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36531,7 +36621,7 @@ function inline__P194921_mk(s) {
 
 
 
-function particles_enableAll__P187927(s) {
+function particles_enableAll__P2710(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36541,22 +36631,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___194925 = undefined;
-    s.tmp_0 = particles_particleSources__P189928_mk(s);
-    s.callLocIdx = 1564; s.pc = 3; return s.tmp_0;
+    s.sources___8473 = undefined;
+    s.tmp_0 = particles_particleSources__P4712_mk(s);
+    s.callLocIdx = 1571; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___194925 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___194925);
+    s.sources___8473 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___8473);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_0.arg0 = s.sources___194925;
-    s.tmp_0.arg1 = inline__P194931;
-    s.callLocIdx = 1566; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_0.arg0 = s.sources___8473;
+    s.tmp_0.arg1 = inline__P8479;
+    s.callLocIdx = 1573; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P189924_mk(s);
-    s.callLocIdx = 1567; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P4708_mk(s);
+    s.callLocIdx = 1574; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -36565,22 +36655,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_enableAll__P187927.info = {"start":12632,"length":193,"line":412,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"enableAll","argumentNames":[]}
+particles_enableAll__P2710.info = {"start":12632,"length":193,"line":412,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"enableAll","argumentNames":[]}
 
-function particles_enableAll__P187927_mk(s) {
+function particles_enableAll__P2710_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_enableAll__P187927, depth: s.depth + 1,
+        parent: s, fn: particles_enableAll__P2710, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___194925: undefined,
+  sources___8473: undefined,
 } }
 
 
 
 
 
-function inline__P194931(s) {
+function inline__P8479(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36594,22 +36684,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_enabled__P187908_mk(s);
+    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1565; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1572; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = true;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P194931.info = {"start":12756,"length":21,"line":415,"column":28,"endLine":415,"endColumn":49,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P8479.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__P194931_mk(s) {
+function inline__P8479_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P194931, depth: s.depth + 1,
+        parent: s, fn: inline__P8479, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36619,7 +36709,7 @@ function inline__P194931_mk(s) {
 
 
 
-function control_popEventContext__P185616(s) {
+function control_popEventContext__P399(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36629,9 +36719,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctx___195106 = undefined;
-    s.context___195114 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___189248);
+    s.ctx___8654 = undefined;
+    s.context___8662 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.eventContexts___4032);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -36640,9 +36730,9 @@ switch (step) {
     { step = 7; continue; }
   case 1:
   case 2:
-    r0 = pxsim_Array_.pop(globals.eventContexts___189248);
-    s.ctx___195106 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.ctx___195106);
+    r0 = pxsim_Array_.pop(globals.eventContexts___4032);
+    s.ctx___8654 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.ctx___8654);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -36651,53 +36741,53 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_2 = control_EventContext_unregister__P185608_mk(s);
-    s.tmp_2.arg0 = s.ctx___195106;
+    s.tmp_2 = control_EventContext_unregister__P391_mk(s);
+    s.tmp_2.arg0 = s.ctx___8654;
     s.callLocIdx = 65; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.eventContexts___189248;
-    r0 = pxsim_Array__length(globals.eventContexts___189248);
+    s.tmp_0 = r0 = globals.eventContexts___4032;
+    r0 = pxsim_Array__length(globals.eventContexts___4032);
     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___195114 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.context___195114);
+    s.context___8662 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.context___8662);
     if (!r0) { step = 5; continue; }
-    s.tmp_0 = control_EventContext_register__P185607_mk(s);
-    s.tmp_0.arg0 = s.context___195114;
+    s.tmp_0 = control_EventContext_register__P390_mk(s);
+    s.tmp_0.arg0 = s.context___8662;
     s.callLocIdx = 66; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    globals.eventContexts___189248 = (undefined);
+    globals.eventContexts___4032 = (undefined);
   case 6:
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_popEventContext__P185616.info = {"start":7568,"length":413,"line":232,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
+control_popEventContext__P399.info = {"start":7568,"length":413,"line":232,"column":4,"endLine":246,"endColumn":5,"fileName":"pxt_modules/base/eventcontext.ts","functionName":"popEventContext","argumentNames":[]}
 
-function control_popEventContext__P185616_mk(s) {
+function control_popEventContext__P399_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_popEventContext__P185616, depth: s.depth + 1,
+        parent: s, fn: control_popEventContext__P399, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  ctx___195106: undefined,
-  context___195114: undefined,
+  ctx___8654: undefined,
+  context___8662: undefined,
 } }
 
 
 
 
 
-function control_EventContext_register__P185607(s) {
+function control_EventContext_register__P390(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36707,38 +36797,38 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.h___195127 = undefined;
-    s.unnamed8898___U1 = undefined;
-    s.unnamed8899___U2 = undefined;
+    s.h___8675 = undefined;
+    s.unnamed90___U1 = undefined;
+    s.unnamed91___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_EventContext__C185601_VT)) failedCast(r0);
-    s.h___195127 = (undefined);
+    if (!checkSubtype(r0, control_EventContext__C384_VT)) failedCast(r0);
+    s.h___8675 = (undefined);
     r0 = s.arg0.fields["handlers"];
-    s.unnamed8898___U1 = (r0);
-    s.unnamed8899___U2 = (0);
+    s.unnamed90___U1 = (r0);
+    s.unnamed91___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8899___U2;
-    r0 = pxsim_Array__length(s.unnamed8898___U1);
+    s.tmp_0 = r0 = s.unnamed91___U2;
+    r0 = pxsim_Array__length(s.unnamed90___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8898___U1, s.unnamed8899___U2);
-    s.h___195127 = (r0);
-    s.tmp_2 = control_EventHandler_register__P189241_mk(s);
-    s.tmp_2.arg0 = s.h___195127;
+    r0 = pxsim_Array__getAt(s.unnamed90___U1, s.unnamed91___U2);
+    s.h___8675 = (r0);
+    s.tmp_2 = control_EventHandler_register__P4025_mk(s);
+    s.tmp_2.arg0 = s.h___8675;
     s.callLocIdx = 56; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
-    r0 = (s.unnamed8899___U2 + 1);
-    s.unnamed8899___U2 = (r0);
+    r0 = (s.unnamed91___U2 + 1);
+    s.unnamed91___U2 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed8898___U1 = (undefined);
-    s.tmp_0 = control_EventContext_registerFrameCallbacks__P189246_mk(s);
+    s.unnamed90___U1 = (undefined);
+    s.tmp_0 = control_EventContext_registerFrameCallbacks__P4030_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 57; s.pc = 4; return s.tmp_0;
   case 4:
@@ -36747,19 +36837,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_EventContext_register__P185607.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__P390.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__P185607_mk(s) {
+function control_EventContext_register__P390_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_EventContext_register__P185607, depth: s.depth + 1,
+        parent: s, fn: control_EventContext_register__P390, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  h___195127: undefined,
-  unnamed8898___U1: undefined,
-  unnamed8899___U2: undefined,
+  h___8675: undefined,
+  unnamed90___U1: undefined,
+  unnamed91___U2: undefined,
   arg0: undefined,
 } }
 
@@ -36767,7 +36857,7 @@ function control_EventContext_register__P185607_mk(s) {
 
 
 
-function game_pushScene__P187753(s) {
+function game_pushScene__P2536(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36777,45 +36867,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.oldScene___198503 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1150; s.pc = 5; return s.tmp_0;
+    s.oldScene___12424 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1157; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.oldScene___198503 = (r0);
-    s.tmp_0 = particles_clearAll__P187925_mk(s);
-    s.callLocIdx = 1151; s.pc = 6; return s.tmp_0;
+    s.oldScene___12424 = (r0);
+    s.tmp_0 = particles_clearAll__P2708_mk(s);
+    s.callLocIdx = 1158; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = particles_disableAll__P187926_mk(s);
-    s.callLocIdx = 1152; s.pc = 7; return s.tmp_0;
+    s.tmp_0 = particles_disableAll__P2709_mk(s);
+    s.callLocIdx = 1159; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals._sceneStack___189565);
+    r0 = pxsim_numops_toBoolDecr(globals._sceneStack___4349);
     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___189565 = (r0);
+    globals._sceneStack___4349 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array__push(globals._sceneStack___189565, globals._scene___189564);
-    s.tmp_0 = game_init__P189572_mk(s);
+    r0 = pxsim_Array__push(globals._sceneStack___4349, globals._scene___4348);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1153; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1160; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___189566);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___4350);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P198520);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P12441);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___198503);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_1.arg0 = globals._scenePushHandlers___189566;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.oldScene___12424);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1.arg0 = globals._scenePushHandlers___4350;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1155; s.pc = 9; return s.tmp_1;
+    s.callLocIdx = 1162; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
   case 3:
@@ -36824,23 +36914,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_pushScene__P187753.info = {"start":1660,"length":367,"line":62,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"pushScene","argumentNames":[]}
+game_pushScene__P2536.info = {"start":1660,"length":367,"line":62,"column":4,"endLine":73,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"pushScene","argumentNames":[]}
 
-function game_pushScene__P187753_mk(s) {
+function game_pushScene__P2536_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_pushScene__P187753, depth: s.depth + 1,
+        parent: s, fn: game_pushScene__P2536, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  oldScene___198503: undefined,
+  oldScene___12424: undefined,
 } }
 
 
 
 
 
-function inline__P198520(s) {
+function inline__P12441(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36858,19 +36948,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 = 1154; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1161; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198520.info = {"start":1991,"length":18,"line":71,"column":39,"endLine":71,"endColumn":57,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["cb"]}
+inline__P12441.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__P198520_mk(s) {
+function inline__P12441_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198520, depth: s.depth + 1,
+        parent: s, fn: inline__P12441, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36880,7 +36970,7 @@ function inline__P198520_mk(s) {
 
 
 
-function particles_disableAll__P187926(s) {
+function particles_disableAll__P2709(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36890,22 +36980,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___198524 = undefined;
-    s.tmp_0 = particles_particleSources__P189928_mk(s);
-    s.callLocIdx = 1560; s.pc = 3; return s.tmp_0;
+    s.sources___12445 = undefined;
+    s.tmp_0 = particles_particleSources__P4712_mk(s);
+    s.callLocIdx = 1567; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___198524 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___198524);
+    s.sources___12445 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___12445);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_0.arg0 = s.sources___198524;
-    s.tmp_0.arg1 = inline__P198530;
-    s.callLocIdx = 1562; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_0.arg0 = s.sources___12445;
+    s.tmp_0.arg1 = inline__P12451;
+    s.callLocIdx = 1569; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P189924_mk(s);
-    s.callLocIdx = 1563; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P4708_mk(s);
+    s.callLocIdx = 1570; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -36914,22 +37004,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_disableAll__P187926.info = {"start":12353,"length":195,"line":401,"column":4,"endLine":407,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"disableAll","argumentNames":[]}
+particles_disableAll__P2709.info = {"start":12353,"length":195,"line":401,"column":4,"endLine":407,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"disableAll","argumentNames":[]}
 
-function particles_disableAll__P187926_mk(s) {
+function particles_disableAll__P2709_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_disableAll__P187926, depth: s.depth + 1,
+        parent: s, fn: particles_disableAll__P2709, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___198524: undefined,
+  sources___12445: undefined,
 } }
 
 
 
 
 
-function inline__P198530(s) {
+function inline__P12451(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36943,22 +37033,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_enabled__P187908_mk(s);
+    s.tmp_0 = particles_ParticleSource_enabled__P2691_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1561; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1568; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = false;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198530.info = {"start":12478,"length":22,"line":404,"column":28,"endLine":404,"endColumn":50,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P12451.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__P198530_mk(s) {
+function inline__P12451_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198530, depth: s.depth + 1,
+        parent: s, fn: inline__P12451, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -36968,7 +37058,7 @@ function inline__P198530_mk(s) {
 
 
 
-function particles_clearAll__P187925(s) {
+function particles_clearAll__P2708(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -36978,22 +37068,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sources___198535 = undefined;
-    s.tmp_0 = particles_particleSources__P189928_mk(s);
-    s.callLocIdx = 1556; s.pc = 3; return s.tmp_0;
+    s.sources___12456 = undefined;
+    s.tmp_0 = particles_particleSources__P4712_mk(s);
+    s.callLocIdx = 1563; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.sources___198535 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.sources___198535);
+    s.sources___12456 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.sources___12456);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_0.arg0 = s.sources___198535;
-    s.tmp_0.arg1 = inline__P198541;
-    s.callLocIdx = 1558; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_0.arg0 = s.sources___12456;
+    s.tmp_0.arg1 = inline__P12462;
+    s.callLocIdx = 1565; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = particles_pruneParticles__P189924_mk(s);
-    s.callLocIdx = 1559; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = particles_pruneParticles__P4708_mk(s);
+    s.callLocIdx = 1566; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -37002,22 +37092,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_clearAll__P187925.info = {"start":12081,"length":185,"line":390,"column":4,"endLine":396,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"clearAll","argumentNames":[]}
+particles_clearAll__P2708.info = {"start":12081,"length":185,"line":390,"column":4,"endLine":396,"endColumn":5,"fileName":"pxt_modules/game/particles.ts","functionName":"clearAll","argumentNames":[]}
 
-function particles_clearAll__P187925_mk(s) {
+function particles_clearAll__P2708_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_clearAll__P187925, depth: s.depth + 1,
+        parent: s, fn: particles_clearAll__P2708, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  sources___198535: undefined,
+  sources___12456: undefined,
 } }
 
 
 
 
 
-function inline__P198541(s) {
+function inline__P12462(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37031,21 +37121,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = particles_ParticleSource_clear__P187910_mk(s);
+    s.tmp_0 = particles_ParticleSource_clear__P2693_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1557; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1564; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198541.info = {"start":12204,"length":14,"line":393,"column":28,"endLine":393,"endColumn":42,"fileName":"pxt_modules/game/particles.ts","functionName":"inline","argumentNames":["s"]}
+inline__P12462.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__P198541_mk(s) {
+function inline__P12462_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198541, depth: s.depth + 1,
+        parent: s, fn: inline__P12462, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -37055,7 +37145,7 @@ function inline__P198541_mk(s) {
 
 
 
-function controller__setUserEventsEnabled__P187171(s) {
+function controller__setUserEventsEnabled__P1954(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37069,17 +37159,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    globals._userEventsEnabled___189393 = (s.arg0);
+    globals._userEventsEnabled___4177 = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-controller__setUserEventsEnabled__P187171.info = {"start":19246,"length":101,"line":587,"column":4,"endLine":589,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"_setUserEventsEnabled","argumentNames":["enabled"]}
+controller__setUserEventsEnabled__P1954.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__P187171_mk(s) {
+function controller__setUserEventsEnabled__P1954_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller__setUserEventsEnabled__P187171, depth: s.depth + 1,
+        parent: s, fn: controller__setUserEventsEnabled__P1954, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -37088,7 +37178,7 @@ function controller__setUserEventsEnabled__P187171_mk(s) {
 
 
 
-function game_NumberPrompt_constructor__P187796(s) {
+function game_NumberPrompt_constructor__P2579(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37104,7 +37194,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_NumberPrompt__C187791_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_NumberPrompt__C2574_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = (s.arg0).fields["theme"] = (s.arg1);
@@ -37131,12 +37221,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_NumberPrompt_constructor__P187796.info = {"start":4128,"length":696,"line":125,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":["this","theme"]}
+game_NumberPrompt_constructor__P2579.info = {"start":4128,"length":696,"line":125,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/game/numberprompt.ts","functionName":"inline","argumentNames":["this","theme"]}
 
-function game_NumberPrompt_constructor__P187796_mk(s) {
+function game_NumberPrompt_constructor__P2579_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_NumberPrompt_constructor__P187796, depth: s.depth + 1,
+        parent: s, fn: game_NumberPrompt_constructor__P2579, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -37147,7 +37237,7 @@ function game_NumberPrompt_constructor__P187796_mk(s) {
 
 
 
-function game_ask__P187799(s) {
+function game_ask__P2582(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37157,82 +37247,82 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.answer___198572 = undefined;
+    s.answer___12493 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_eventContext__P187752_mk(s);
-    s.callLocIdx = 1329; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_eventContext__P2535_mk(s);
+    s.callLocIdx = 1336; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = control_pushEventContext__P185615_mk(s);
-    s.callLocIdx = 1330; s.pc = 2; return s.tmp_0;
+    s.tmp_0 = control_pushEventContext__P398_mk(s);
+    s.callLocIdx = 1337; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_showDialog__P187755_mk(s);
+    s.tmp_0 = game_showDialog__P2538_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = "A = OK, B = CANCEL";
-    s.callLocIdx = 1331; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1338; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = pxsim_pxtrt.mklocRef();
-    s.answer___198572 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.answer___198572, null);
-    s.tmp_0 = pause__P185619_mk(s);
+    s.answer___12493 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.answer___12493, null);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 500;
-    s.callLocIdx = 1332; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1339; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P198579);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P12500);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___198572);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.A___187094;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___12493);
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.A___1877;
     s.tmp_1.arg1 = 2049;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1333; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1340; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P198584);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P12505);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___198572);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.B___187095;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___12493);
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.B___1878;
     s.tmp_1.arg1 = 2049;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1334; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1341; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P198588);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P12509);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___198572);
-    s.tmp_1 = pauseUntil__P185573_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.answer___12493);
+    s.tmp_1 = pauseUntil__P356_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1335; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1342; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = control_popEventContext__P185616_mk(s);
-    s.callLocIdx = 1336; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = control_popEventContext__P399_mk(s);
+    s.callLocIdx = 1343; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_ldlocRef(s.answer___198572);
+    r0 = pxsim_pxtrt_ldlocRef(s.answer___12493);
     return leave(s, r0)
   default: oops()
 } } }
-game_ask__P187799.info = {"start":261,"length":610,"line":10,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/game/ask.ts","functionName":"ask","argumentNames":["title","subtitle"]}
+game_ask__P2582.info = {"start":261,"length":610,"line":10,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/game/ask.ts","functionName":"ask","argumentNames":["title","subtitle"]}
 
-function game_ask__P187799_mk(s) {
+function game_ask__P2582_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_ask__P187799, depth: s.depth + 1,
+        parent: s, fn: game_ask__P2582, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  answer___198572: undefined,
+  answer___12493: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -37241,7 +37331,7 @@ function game_ask__P187799_mk(s) {
 
 
 
-function inline__P198579(s) {
+function inline__P12500(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37256,12 +37346,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198579.info = {"start":660,"length":19,"line":18,"column":60,"endLine":18,"endColumn":79,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
+inline__P12500.info = {"start":660,"length":19,"line":18,"column":60,"endLine":18,"endColumn":79,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P198579_mk(s) {
+function inline__P12500_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198579, depth: s.depth + 1,
+        parent: s, fn: inline__P12500, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -37269,7 +37359,7 @@ function inline__P198579_mk(s) {
 
 
 
-function inline__P198584(s) {
+function inline__P12505(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37284,12 +37374,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198584.info = {"start":742,"length":20,"line":19,"column":60,"endLine":19,"endColumn":80,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
+inline__P12505.info = {"start":742,"length":20,"line":19,"column":60,"endLine":19,"endColumn":80,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P198584_mk(s) {
+function inline__P12505_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198584, depth: s.depth + 1,
+        parent: s, fn: inline__P12505, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -37297,7 +37387,7 @@ function inline__P198584_mk(s) {
 
 
 
-function inline__P198588(s) {
+function inline__P12509(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37313,12 +37403,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198588.info = {"start":784,"length":21,"line":20,"column":19,"endLine":20,"endColumn":40,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
+inline__P12509.info = {"start":784,"length":21,"line":20,"column":19,"endLine":20,"endColumn":40,"fileName":"pxt_modules/game/ask.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P198588_mk(s) {
+function inline__P12509_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198588, depth: s.depth + 1,
+        parent: s, fn: inline__P12509, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -37327,7 +37417,7 @@ function inline__P198588_mk(s) {
 
 
 
-function game_showDialog__P187755(s) {
+function game_showDialog__P2538(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37337,22 +37427,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.titleFont___198599 = undefined;
-    s.subFont___198604 = undefined;
-    s.footerFont___198609 = undefined;
-    s.h___198614 = undefined;
-    s.top___198633 = undefined;
-    s.y___198637 = undefined;
-    s.footerTop___198674 = undefined;
+    s.titleFont___12520 = undefined;
+    s.subFont___12525 = undefined;
+    s.footerFont___12530 = undefined;
+    s.h___12535 = undefined;
+    s.top___12554 = undefined;
+    s.y___12558 = undefined;
+    s.footerTop___12595 = 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__P189572_mk(s);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1165; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 1172; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -37365,12 +37455,12 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P186964_mk(s);
+    s.tmp_2 = image_getFontForText__P1747_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 1166; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 1173; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
-    s.titleFont___198599 = (r0);
+    s.titleFont___12520 = (r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 3; continue; }
@@ -37381,12 +37471,12 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P186964_mk(s);
+    s.tmp_2 = image_getFontForText__P1747_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 1167; s.pc = 23; return s.tmp_2;
+    s.callLocIdx = 1174; s.pc = 23; return s.tmp_2;
   case 23:
     r0 = s.retval;
-    s.subFont___198604 = (r0);
+    s.subFont___12525 = (r0);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -37397,45 +37487,45 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = image_getFontForText__P186964_mk(s);
+    s.tmp_2 = image_getFontForText__P1747_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.callLocIdx = 1168; s.pc = 24; return s.tmp_2;
+    s.callLocIdx = 1175; s.pc = 24; return s.tmp_2;
   case 24:
     r0 = s.retval;
-    s.footerFont___198609 = (r0);
-    s.h___198614 = (8);
+    s.footerFont___12530 = (r0);
+    s.h___12535 = (8);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = r0 = s.h___198614;
+    s.tmp_0 = r0 = s.h___12535;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.titleFont___198599;
+    s.tmp_2.arg0 = s.titleFont___12520;
     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 = 1169; s.pc = 25; return s.tmp_2; }
+     else { s.callLocIdx = 1176; 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___198614 = (r0);
+    s.h___12535 = (r0);
   case 7:
   case 8:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 9; continue; }
-    s.tmp_0 = r0 = s.h___198614;
+    s.tmp_0 = r0 = s.h___12535;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.subFont___198604;
+    s.tmp_3.arg0 = s.subFont___12525;
     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 = 1170; s.pc = 26; return s.tmp_3; }
+     else { s.callLocIdx = 1177; s.pc = 26; return s.tmp_3; }
     }
   case 26:
     r0 = s.retval;
@@ -37443,23 +37533,23 @@ switch (step) {
     r0 = (2 + s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.h___198614 = (r0);
+    s.h___12535 = (r0);
   case 9:
   case 10:
-    r0 = (s.h___198614 + 8);
-    s.h___198614 = (r0);
-    s.tmp_0 = game_showDialogBackground__P189573_mk(s);
-    s.tmp_0.arg0 = s.h___198614;
+    r0 = (s.h___12535 + 8);
+    s.h___12535 = (r0);
+    s.tmp_0 = game_showDialogBackground__P4357_mk(s);
+    s.tmp_0.arg0 = s.h___12535;
     s.tmp_0.arg1 = 9;
-    s.callLocIdx = 1171; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 1178; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.top___198633 = (r0);
-    r0 = (s.top___198633 + 8);
-    s.y___198637 = (r0);
+    s.top___12554 = (r0);
+    r0 = (s.top___12554 + 8);
+    s.y___12558 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 13; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
@@ -37470,27 +37560,27 @@ switch (step) {
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
+    s.tmp_2 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = 8;
-    s.tmp_2.arg3 = s.y___198637;
+    s.tmp_2.arg3 = s.y___12558;
     s.tmp_2.arg4 = s.tmp_1;
-    s.tmp_2.arg5 = s.titleFont___198599;
+    s.tmp_2.arg5 = s.titleFont___12520;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 1172; s.pc = 28; return s.tmp_2;
+    s.callLocIdx = 1179; s.pc = 28; return s.tmp_2;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.y___198637;
+    s.tmp_0 = r0 = s.y___12558;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.titleFont___198599;
+    s.tmp_3.arg0 = s.titleFont___12520;
     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 = 1173; s.pc = 29; return s.tmp_3; }
+     else { s.callLocIdx = 1180; s.pc = 29; return s.tmp_3; }
     }
   case 29:
     r0 = s.retval;
@@ -37498,12 +37588,12 @@ switch (step) {
     r0 = (s.tmp_2 + 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y___198637 = (r0);
+    s.y___12558 = (r0);
   case 13:
   case 14:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 17; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
@@ -37514,27 +37604,27 @@ switch (step) {
   case 16:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
+    s.tmp_2 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
     s.tmp_2.arg1 = s.arg1;
     s.tmp_2.arg2 = 8;
-    s.tmp_2.arg3 = s.y___198637;
+    s.tmp_2.arg3 = s.y___12558;
     s.tmp_2.arg4 = s.tmp_1;
-    s.tmp_2.arg5 = s.subFont___198604;
+    s.tmp_2.arg5 = s.subFont___12525;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 1174; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 1181; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.y___198637;
+    s.tmp_0 = r0 = s.y___12558;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.subFont___198604;
+    s.tmp_3.arg0 = s.subFont___12525;
     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 = 1175; s.pc = 31; return s.tmp_3; }
+     else { s.callLocIdx = 1182; s.pc = 31; return s.tmp_3; }
     }
   case 31:
     r0 = s.retval;
@@ -37542,22 +37632,22 @@ switch (step) {
     r0 = (s.tmp_2 + 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y___198637 = (r0);
+    s.y___12558 = (r0);
   case 17:
   case 18:
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 19; continue; }
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     s.tmp_3 = if_charHeight_1_mk(s);
-    s.tmp_3.arg0 = s.footerFont___198609;
+    s.tmp_3.arg0 = s.footerFont___12530;
     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 = 1176; s.pc = 32; return s.tmp_3; }
+     else { s.callLocIdx = 1183; s.pc = 32; return s.tmp_3; }
     }
   case 32:
     r0 = s.retval;
@@ -37565,22 +37655,22 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.footerTop___198674 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.footerTop___12595 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.footerTop___198674;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_0.arg2 = s.footerTop___12595;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
     s.tmp_2 = if_charHeight_1_mk(s);
-    s.tmp_2.arg0 = s.footerFont___198609;
+    s.tmp_2.arg0 = s.footerFont___12530;
     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 = 1177; s.pc = 34; return s.tmp_2; }
+     else { s.callLocIdx = 1184; s.pc = 34; return s.tmp_2; }
     }
   case 34:
     r0 = s.retval;
@@ -37588,36 +37678,36 @@ switch (step) {
     r0 = (s.tmp_1 + 4);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 1178; s.pc = 33; return s.tmp_0;
+    s.callLocIdx = 1185; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P186947_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.footerTop___198674;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_0.arg2 = s.footerTop___12595;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = s.footerTop___198674;
+    s.tmp_0.arg4 = s.footerTop___12595;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1179; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 1186; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = s.arg2;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     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___198609;
+    s.tmp_6.arg0 = s.footerFont___12530;
     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 = 1180; s.pc = 37; return s.tmp_6; }
+     else { s.callLocIdx = 1187; s.pc = 37; return s.tmp_6; }
     }
   case 37:
     r0 = s.retval;
@@ -37628,17 +37718,17 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 8);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_8 = r0;
     s.tmp_10 = if_charHeight_1_mk(s);
-    s.tmp_10.arg0 = s.footerFont___198609;
+    s.tmp_10.arg0 = s.footerFont___12530;
     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 = 1181; s.pc = 38; return s.tmp_10; }
+     else { s.callLocIdx = 1188; s.pc = 38; return s.tmp_10; }
     }
   case 38:
     r0 = s.retval;
@@ -37648,9 +37738,9 @@ switch (step) {
     r0 = (s.tmp_7 - 2);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.footerFont___198609;
+    s.tmp_0.arg5 = s.footerFont___12530;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1182; s.pc = 36; return s.tmp_0;
+    s.callLocIdx = 1189; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
   case 19:
@@ -37659,12 +37749,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_showDialog__P187755.info = {"start":2895,"length":1313,"line":104,"column":4,"endLine":137,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"showDialog","argumentNames":["title","subtitle","footer"]}
+game_showDialog__P2538.info = {"start":2895,"length":1313,"line":104,"column":4,"endLine":137,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"showDialog","argumentNames":["title","subtitle","footer"]}
 
-function game_showDialog__P187755_mk(s) {
+function game_showDialog__P2538_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showDialog__P187755, depth: s.depth + 1,
+        parent: s, fn: game_showDialog__P2538, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37677,13 +37767,13 @@ function game_showDialog__P187755_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  titleFont___198599: undefined,
-  subFont___198604: undefined,
-  footerFont___198609: undefined,
-  h___198614: undefined,
-  top___198633: undefined,
-  y___198637: undefined,
-  footerTop___198674: undefined,
+  titleFont___12520: undefined,
+  subFont___12525: undefined,
+  footerFont___12530: undefined,
+  h___12535: undefined,
+  top___12554: undefined,
+  y___12558: undefined,
+  footerTop___12595: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -37693,7 +37783,7 @@ function game_showDialog__P187755_mk(s) {
 
 
 
-function game_showDialogBackground__P189573(s) {
+function game_showDialogBackground__P4357(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37703,72 +37793,72 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.top___198734 = undefined;
+    s.top___12655 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - s.arg0);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.top___198734 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.top___12655 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.top___198734;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_0.arg2 = s.top___12655;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = s.arg0;
     s.tmp_0.arg5 = 0;
-    s.callLocIdx = 1162; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1169; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P186947_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
-    s.tmp_0.arg2 = s.top___198734;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_0.arg2 = s.top___12655;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
-    s.tmp_0.arg4 = s.top___198734;
+    s.tmp_0.arg4 = s.top___12655;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1163; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1170; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P186947_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
-    r0 = (s.top___198734 + s.arg0);
+    r0 = (s.top___12655 + s.arg0);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
-    r0 = (s.top___198734 + s.arg0);
+    r0 = (s.top___12655 + s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 1);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1164; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1171; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = s.top___198734;
+    r0 = s.top___12655;
     return leave(s, r0)
   default: oops()
 } } }
-game_showDialogBackground__P189573.info = {"start":2587,"length":302,"line":95,"column":4,"endLine":102,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"showDialogBackground","argumentNames":["h","c"]}
+game_showDialogBackground__P4357.info = {"start":2587,"length":302,"line":95,"column":4,"endLine":102,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"showDialogBackground","argumentNames":["h","c"]}
 
-function game_showDialogBackground__P189573_mk(s) {
+function game_showDialogBackground__P4357_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showDialogBackground__P189573, depth: s.depth + 1,
+        parent: s, fn: game_showDialogBackground__P4357, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  top___198734: undefined,
+  top___12655: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -37777,7 +37867,7 @@ function game_showDialogBackground__P189573_mk(s) {
 
 
 
-function helpers_imageDrawLine__P186947(s) {
+function helpers_imageDrawLine__P1730(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37797,14 +37887,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_pack__P189316_mk(s);
+    s.tmp_2 = helpers_pack__P4100_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = s.arg2;
     s.callLocIdx = 123; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = helpers_pack__P189316_mk(s);
+    s.tmp_4 = helpers_pack__P4100_mk(s);
     s.tmp_4.arg0 = s.arg3;
     s.tmp_4.arg1 = s.arg4;
     s.callLocIdx = 124; s.pc = 2; return s.tmp_4;
@@ -37816,12 +37906,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawLine__P186947.info = {"start":3977,"length":159,"line":137,"column":4,"endLine":139,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawLine","argumentNames":["img","x","y","w","h","c"]}
+helpers_imageDrawLine__P1730.info = {"start":3977,"length":159,"line":137,"column":4,"endLine":139,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawLine","argumentNames":["img","x","y","w","h","c"]}
 
-function helpers_imageDrawLine__P186947_mk(s) {
+function helpers_imageDrawLine__P1730_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawLine__P186947, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawLine__P1730, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -37840,7 +37930,7 @@ function helpers_imageDrawLine__P186947_mk(s) {
 
 
 
-function game_showLongText__P187738(s) {
+function game_showLongText__P2521(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -37850,31 +37940,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.width___198776 = undefined;
-    s.height___198777 = undefined;
-    s.top___198778 = undefined;
-    s.left___198779 = undefined;
-    s.dialog___198890 = undefined;
-    s.s___198898 = undefined;
-    s.pressed___198914 = undefined;
-    s.done___198915 = undefined;
-    s.upPressed___198916 = undefined;
+    s.width___12697 = undefined;
+    s.height___12698 = undefined;
+    s.top___12699 = undefined;
+    s.left___12700 = undefined;
+    s.dialog___12811 = undefined;
+    s.s___12819 = undefined;
+    s.pressed___12835 = undefined;
+    s.done___12836 = undefined;
+    s.upPressed___12837 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = controller__setUserEventsEnabled__P187171_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
     s.tmp_0.arg0 = false;
-    s.callLocIdx = 1117; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1124; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = game_pushScene__P187753_mk(s);
-    s.callLocIdx = 1118; s.pc = 9; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P2536_mk(s);
+    s.callLocIdx = 1125; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_1 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1119; s.pc = 10; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1126; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -37899,206 +37989,206 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 1:
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 4);
-    s.width___198776 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    s.width___12697 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.height___198777 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    s.height___12698 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.height___198777);
-    s.top___198778 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = (s.tmp_0 - s.height___12698);
+    s.top___12699 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___198776);
+    r0 = (s.tmp_1 - s.width___12697);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.left___198779 = (r0);
+    s.left___12700 = (r0);
     { step = 7; continue; }
   case 2:
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.width___198776 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    s.width___12697 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.height___198777 = (r0);
-    s.top___198778 = (0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.height___12698 = (r0);
+    s.top___12699 = (0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___198776);
+    r0 = (s.tmp_1 - s.width___12697);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.left___198779 = (r0);
+    s.left___12700 = (r0);
     { step = 7; continue; }
   case 3:
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.width___198776 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
-    s.height___198777 = (r0);
-    s.top___198778 = (0);
-    s.left___198779 = (0);
+    s.width___12697 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.height___12698 = (r0);
+    s.top___12699 = (0);
+    s.left___12700 = (0);
     { step = 7; continue; }
   case 4:
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 3);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 5);
-    s.width___198776 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
-    s.height___198777 = (r0);
-    s.top___198778 = (0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
-    s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.width___198776);
-    s.left___198779 = (r0);
+    s.width___12697 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.height___12698 = (r0);
+    s.top___12699 = (0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.tmp_0 = r0;
+    r0 = (s.tmp_0 - s.width___12697);
+    s.left___12700 = (r0);
     { step = 7; continue; }
   case 5:
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 << 1);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 3);
-    s.width___198776 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.width___12697 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 << 1);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 3);
-    s.height___198777 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    s.height___12698 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.height___198777);
+    r0 = (s.tmp_1 - s.height___12698);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.top___198778 = (r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.top___12699 = (r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.width___198776);
+    r0 = (s.tmp_1 - s.width___12697);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 1);
-    s.left___198779 = (r0);
+    s.left___12700 = (r0);
     { step = 7; continue; }
   case 6:
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
-    s.width___198776 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
-    s.height___198777 = (r0);
-    s.top___198778 = (0);
-    s.left___198779 = (0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
+    s.width___12697 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
+    s.height___12698 = (r0);
+    s.top___12699 = (0);
+    s.left___12700 = (0);
   case 7:
-    r0 = pxsim_pxtcore_mkClassInstance(game_Dialog__C187711_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(game_Dialog__C2494_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_Dialog_constructor__P187714_mk(s);
+    s.tmp_1 = game_Dialog_constructor__P2497_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.width___198776;
-    s.tmp_1.arg2 = s.height___198777;
+    s.tmp_1.arg1 = s.width___12697;
+    s.tmp_1.arg2 = s.height___12698;
     s.tmp_1.arg3 = undefined;
     s.tmp_1.arg4 = undefined;
     s.tmp_1.arg5 = undefined;
-    s.callLocIdx = 1120; s.pc = 11; return s.tmp_1;
+    s.callLocIdx = 1127; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
-    s.dialog___198890 = (s.tmp_0);
-    s.tmp_0 = sprites_create__P187191_mk(s);
-    r0 = s.dialog___198890.fields["image"];
+    s.dialog___12811 = (s.tmp_0);
+    s.tmp_0 = sprites_create__P1974_mk(s);
+    r0 = s.dialog___12811.fields["image"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = -1;
-    s.callLocIdx = 1121; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1128; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.s___198898 = (r0);
-    s.tmp_0 = Sprite_top__P187284_mk(s);
-    s.tmp_0.arg0 = s.s___198898;
-    s.tmp_0.arg1 = s.top___198778;
-    s.callLocIdx = 1122; s.pc = 13; return s.tmp_0;
+    s.s___12819 = (r0);
+    s.tmp_0 = Sprite_top__P2067_mk(s);
+    s.tmp_0.arg0 = s.s___12819;
+    s.tmp_0.arg1 = s.top___12699;
+    s.callLocIdx = 1129; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = Sprite_left__P187280_mk(s);
-    s.tmp_0.arg0 = s.s___198898;
-    s.tmp_0.arg1 = s.left___198779;
-    s.callLocIdx = 1123; s.pc = 14; return s.tmp_0;
+    s.tmp_0 = Sprite_left__P2063_mk(s);
+    s.tmp_0.arg0 = s.s___12819;
+    s.tmp_0.arg1 = s.left___12700;
+    s.callLocIdx = 1130; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = game_Dialog__C187711_v1_2_mk(s);
-    s.tmp_0.arg0 = s.dialog___198890;
+    s.tmp_0 = game_Dialog__C2494_v1_2_mk(s);
+    s.tmp_0.arg0 = s.dialog___12811;
     s.tmp_0.arg1 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, game_Dialog__C187711_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_Dialog__C2494_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.setText;
     s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
     r0 = pxsim_pxtrt.mklocRef();
-    s.pressed___198914 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.pressed___198914, true);
+    s.pressed___12835 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.pressed___12835, true);
     r0 = pxsim_pxtrt.mklocRef();
-    s.done___198915 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.done___198915, false);
+    s.done___12836 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.done___12836, false);
     r0 = pxsim_pxtrt.mklocRef();
-    s.upPressed___198916 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.upPressed___198916, true);
-    r0 = pxsim_pxtcore_mkAction(4, inline__P198918);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dialog___198890);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pressed___198914);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.done___198915);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.upPressed___198916);
-    s.tmp_1 = game_onUpdate__P187760_mk(s);
+    s.upPressed___12837 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.upPressed___12837, true);
+    r0 = pxsim_pxtcore_mkAction(4, inline__P12839);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.dialog___12811);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pressed___12835);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.done___12836);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.upPressed___12837);
+    s.tmp_1 = game_onUpdate__P2543_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1130; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 1137; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P198966);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P12887);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.done___198915);
-    s.tmp_1 = pauseUntil__P185573_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.done___12836);
+    s.tmp_1 = pauseUntil__P356_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = undefined;
-    s.callLocIdx = 1131; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 1138; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = controller__setUserEventsEnabled__P187171_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1132; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1139; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_showLongText__P187738.info = {"start":13263,"length":3039,"line":410,"column":4,"endLine":502,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"showLongText","argumentNames":["str","layout"]}
+game_showLongText__P2521.info = {"start":13263,"length":3039,"line":410,"column":4,"endLine":502,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"showLongText","argumentNames":["str","layout"]}
 
-function game_showLongText__P187738_mk(s) {
+function game_showLongText__P2521_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_showLongText__P187738, depth: s.depth + 1,
+        parent: s, fn: game_showLongText__P2521, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  width___198776: undefined,
-  height___198777: undefined,
-  top___198778: undefined,
-  left___198779: undefined,
-  dialog___198890: undefined,
-  s___198898: undefined,
-  pressed___198914: undefined,
-  done___198915: undefined,
-  upPressed___198916: undefined,
+  width___12697: undefined,
+  height___12698: undefined,
+  top___12699: undefined,
+  left___12700: undefined,
+  dialog___12811: undefined,
+  s___12819: undefined,
+  pressed___12835: undefined,
+  done___12836: undefined,
+  upPressed___12837: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -38107,7 +38197,7 @@ function game_showLongText__P187738_mk(s) {
 
 
 
-function inline__P198918(s) {
+function inline__P12839(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38117,18 +38207,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currentState___198921 = undefined;
-    s.moveBack___198946 = undefined;
-    s.tmp_0 = game_BaseDialog__C187694_v0_1_mk(s);
+    s.currentState___12842 = undefined;
+    s.moveBack___12867 = undefined;
+    s.tmp_0 = game_BaseDialog__C2477_v0_1_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C187694_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C2477_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.update;
     s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    s.tmp_1 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.A___187094;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.A___1877;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 24; return s.tmp_1;
   case 24:
@@ -38139,9 +38229,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_2.arg0 = globals.down___187099;
-    if (!checkSubtype(s.tmp_2.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_2.arg0);
+    s.tmp_2 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_2.arg0 = globals.down___1882;
+    if (!checkSubtype(s.tmp_2.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_2.arg0);
     s.tmp_2.fn = s.tmp_2.arg0.vtable.methods.isPressed;
     s.pc = 25; return s.tmp_2;
   case 25:
@@ -38149,8 +38239,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.currentState___198921 = (s.tmp_3);
-    s.tmp_0 = r0 = s.currentState___198921;
+    s.currentState___12842 = (s.tmp_3);
+    s.tmp_0 = r0 = s.currentState___12842;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_0;
@@ -38167,28 +38257,28 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], true);
-    s.tmp_1 = game_Dialog_hasNext__P187715_mk(s);
+    s.tmp_1 = game_Dialog_hasNext__P2498_mk(s);
     s.tmp_1.arg0 = s.caps[0];
-    s.callLocIdx = 1124; s.pc = 26; return s.tmp_1;
+    s.callLocIdx = 1131; s.pc = 26; return s.tmp_1;
   case 26:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = game_Dialog_nextPage__P187717_mk(s);
+    s.tmp_2 = game_Dialog_nextPage__P2500_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 1125; s.pc = 27; return s.tmp_2;
+    s.callLocIdx = 1132; s.pc = 27; return s.tmp_2;
   case 27:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = scene_setBackgroundImage__P187676_mk(s);
+    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
     s.tmp_0.arg0 = null;
-    s.callLocIdx = 1126; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1133; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P187754_mk(s);
-    s.callLocIdx = 1127; s.pc = 29; return s.tmp_0;
+    s.tmp_0 = game_popScene__P2537_mk(s);
+    s.callLocIdx = 1134; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
     r0 = pxsim_pxtrt_stlocRef(s.caps[2], true);
@@ -38202,7 +38292,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 9; continue; }
   case 8:
-    r0 = pxsim_numops_toBoolDecr(s.currentState___198921);
+    r0 = pxsim_numops_toBoolDecr(s.currentState___12842);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
   case 9:
@@ -38214,15 +38304,15 @@ switch (step) {
   case 10:
   case 11:
   case 12:
-    s.tmp_0 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_0.arg0 = globals.up___187097;
-    if (!checkSubtype(s.tmp_0.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_0.arg0);
+    s.tmp_0 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_0.arg0 = globals.up___1880;
+    if (!checkSubtype(s.tmp_0.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.isPressed;
     s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
-    s.moveBack___198946 = (r0);
-    s.tmp_0 = r0 = s.moveBack___198946;
+    s.moveBack___12867 = (r0);
+    s.tmp_0 = r0 = s.moveBack___12867;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 13; continue; }
     r0 = s.tmp_0;
@@ -38239,17 +38329,17 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 17; continue; }
     r0 = pxsim_pxtrt_stlocRef(s.caps[3], true);
-    s.tmp_1 = game_Dialog_hasPrev__P187716_mk(s);
+    s.tmp_1 = game_Dialog_hasPrev__P2499_mk(s);
     s.tmp_1.arg0 = s.caps[0];
-    s.callLocIdx = 1128; s.pc = 31; return s.tmp_1;
+    s.callLocIdx = 1135; s.pc = 31; return s.tmp_1;
   case 31:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    s.tmp_2 = game_Dialog_prevPage__P187718_mk(s);
+    s.tmp_2 = game_Dialog_prevPage__P2501_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.callLocIdx = 1129; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 1136; s.pc = 32; return s.tmp_2;
   case 32:
     r0 = s.retval;
   case 15:
@@ -38263,7 +38353,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    r0 = pxsim_numops_toBoolDecr(s.moveBack___198946);
+    r0 = pxsim_numops_toBoolDecr(s.moveBack___12867);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
   case 19:
@@ -38279,26 +38369,26 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198918.info = {"start":15283,"length":931,"line":470,"column":22,"endLine":498,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":[]}
+inline__P12839.info = {"start":15283,"length":931,"line":470,"column":22,"endLine":498,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P198918_mk(s) {
+function inline__P12839_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198918, depth: s.depth + 1,
+        parent: s, fn: inline__P12839, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  currentState___198921: undefined,
-  moveBack___198946: undefined,
+  currentState___12842: undefined,
+  moveBack___12867: undefined,
 } }
 
 
 
 
 
-function inline__P198966(s) {
+function inline__P12887(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38312,12 +38402,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P198966.info = {"start":16236,"length":10,"line":500,"column":19,"endLine":500,"endColumn":29,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":[]}
+inline__P12887.info = {"start":16236,"length":10,"line":500,"column":19,"endLine":500,"endColumn":29,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P198966_mk(s) {
+function inline__P12887_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P198966, depth: s.depth + 1,
+        parent: s, fn: inline__P12887, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -38325,7 +38415,7 @@ function inline__P198966_mk(s) {
 
 
 
-function game_Dialog_setText__P187720(s) {
+function game_Dialog_setText__P2503(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38341,23 +38431,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_setFont__P189545_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_setFont__P4329_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = image_getFontForText__P186964_mk(s);
+    s.tmp_1 = image_getFontForText__P1747_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 1098; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1105; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1099; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1106; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = game_Dialog_chunkText__P187719_mk(s);
+    s.tmp_2 = game_Dialog_chunkText__P2502_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 1100; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1107; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -38367,12 +38457,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_setText__P187720.info = {"start":6990,"length":183,"line":227,"column":8,"endLine":231,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
+game_Dialog_setText__P2503.info = {"start":6990,"length":183,"line":227,"column":8,"endLine":231,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
 
-function game_Dialog_setText__P187720_mk(s) {
+function game_Dialog_setText__P2503_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_setText__P187720, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_setText__P2503, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38385,7 +38475,7 @@ function game_Dialog_setText__P187720_mk(s) {
 
 
 
-function game_BaseDialog_setFont__P189545(s) {
+function game_BaseDialog_setFont__P4329(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38401,18 +38491,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = (s.arg0).fields["font"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_setFont__P189545.info = {"start":5310,"length":77,"line":176,"column":8,"endLine":178,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setFont","argumentNames":["this","font"]}
+game_BaseDialog_setFont__P4329.info = {"start":5310,"length":77,"line":176,"column":8,"endLine":178,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setFont","argumentNames":["this","font"]}
 
-function game_BaseDialog_setFont__P189545_mk(s) {
+function game_BaseDialog_setFont__P4329_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_setFont__P189545, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_setFont__P4329, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -38422,7 +38512,7 @@ function game_BaseDialog_setFont__P189545_mk(s) {
 
 
 
-function game_Dialog_chunkText__P187719(s) {
+function game_Dialog_chunkText__P2502(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38432,23 +38522,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.charactersPerRow___199235 = undefined;
-    s.charactersPerCursorRow___199244 = undefined;
-    s.rowsOfCharacters___199256 = undefined;
-    s.rowsWithCursor___199263 = undefined;
-    s.lineLengths___199271 = undefined;
-    s.i___199273 = undefined;
-    s.i___199286 = undefined;
+    s.charactersPerRow___13156 = undefined;
+    s.charactersPerCursorRow___13165 = undefined;
+    s.rowsOfCharacters___13177 = undefined;
+    s.rowsWithCursor___13184 = undefined;
+    s.lineLengths___13192 = undefined;
+    s.i___13194 = undefined;
+    s.i___13207 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
-    s.tmp_2 = game_BaseDialog_textAreaWidth__P189543_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    s.tmp_2 = game_BaseDialog_textAreaWidth__P4327_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1091; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1098; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -38461,7 +38551,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 = 1092; s.pc = 6; return s.tmp_4; }
+     else { s.callLocIdx = 1099; s.pc = 6; return s.tmp_4; }
     }
   case 6:
     r0 = s.retval;
@@ -38469,8 +38559,8 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.charactersPerRow___199235 = (r0);
-    s.tmp_1 = r0 = s.charactersPerRow___199235;
+    s.charactersPerRow___13156 = (r0);
+    s.tmp_1 = r0 = s.charactersPerRow___13156;
     r0 = s.arg0.fields["cursor"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
@@ -38484,7 +38574,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["charWidth"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["charWidth"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1093; s.pc = 7; return s.tmp_6; }
+     else { s.callLocIdx = 1100; s.pc = 7; return s.tmp_6; }
     }
   case 7:
     r0 = s.retval;
@@ -38494,79 +38584,79 @@ switch (step) {
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.charactersPerCursorRow___199244 = (r0);
-    s.tmp_2 = game_BaseDialog_textAreaHeight__P189544_mk(s);
+    s.charactersPerCursorRow___13165 = (r0);
+    s.tmp_2 = game_BaseDialog_textAreaHeight__P4328_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1094; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1101; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = game_BaseDialog_rowHeight__P189542_mk(s);
+    s.tmp_4 = game_BaseDialog_rowHeight__P4326_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1095; s.pc = 9; return s.tmp_4;
+    s.callLocIdx = 1102; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_1 / s.tmp_3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.rowsOfCharacters___199256 = (r0);
+    s.rowsOfCharacters___13177 = (r0);
     r0 = s.arg0.fields["cursor"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
     s.tmp_1 = r0;
-    s.tmp_4 = game_BaseDialog_rowHeight__P189542_mk(s);
+    s.tmp_4 = game_BaseDialog_rowHeight__P4326_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1096; s.pc = 10; return s.tmp_4;
+    s.callLocIdx = 1103; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
     s.tmp_3 = r0;
     r0 = (s.tmp_1 / s.tmp_3);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.ceil(s.tmp_0);
-    s.rowsWithCursor___199263 = (r0);
+    s.rowsWithCursor___13184 = (r0);
     r0 = pxsim_Array__mk();
-    s.lineLengths___199271 = (r0);
-    s.i___199273 = (0);
+    s.lineLengths___13192 = (r0);
+    s.i___13194 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___199273;
-    r0 = (s.rowsOfCharacters___199256 - s.rowsWithCursor___199263);
+    s.tmp_1 = r0 = s.i___13194;
+    r0 = (s.rowsOfCharacters___13177 - s.rowsWithCursor___13184);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__push(s.lineLengths___199271, s.charactersPerRow___199235);
-    r0 = (s.i___199273 + 1);
-    s.i___199273 = (r0);
+    r0 = pxsim_Array__push(s.lineLengths___13192, s.charactersPerRow___13156);
+    r0 = (s.i___13194 + 1);
+    s.i___13194 = (r0);
     { step = 1; continue; }
   case 2:
-    s.i___199286 = (0);
+    s.i___13207 = (0);
   case 3:
-    r0 = (s.i___199286 < s.rowsWithCursor___199263);
+    r0 = (s.i___13207 < s.rowsWithCursor___13184);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__push(s.lineLengths___199271, s.charactersPerCursorRow___199244);
-    r0 = (s.i___199286 + 1);
-    s.i___199286 = (r0);
+    r0 = pxsim_Array__push(s.lineLengths___13192, s.charactersPerCursorRow___13165);
+    r0 = (s.i___13207 + 1);
+    s.i___13207 = (r0);
     { step = 3; continue; }
   case 4:
-    s.tmp_0 = game_breakIntoPages__P189554_mk(s);
+    s.tmp_0 = game_breakIntoPages__P4338_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.lineLengths___199271;
-    s.callLocIdx = 1097; s.pc = 11; return s.tmp_0;
+    s.tmp_0.arg1 = s.lineLengths___13192;
+    s.callLocIdx = 1104; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_chunkText__P187719.info = {"start":6245,"length":735,"line":213,"column":8,"endLine":225,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"chunkText","argumentNames":["this","str"]}
+game_Dialog_chunkText__P2502.info = {"start":6245,"length":735,"line":213,"column":8,"endLine":225,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"chunkText","argumentNames":["this","str"]}
 
-function game_Dialog_chunkText__P187719_mk(s) {
+function game_Dialog_chunkText__P2502_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_chunkText__P187719, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_chunkText__P2502, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38575,13 +38665,13 @@ function game_Dialog_chunkText__P187719_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  charactersPerRow___199235: undefined,
-  charactersPerCursorRow___199244: undefined,
-  rowsOfCharacters___199256: undefined,
-  rowsWithCursor___199263: undefined,
-  lineLengths___199271: undefined,
-  i___199273: undefined,
-  i___199286: undefined,
+  charactersPerRow___13156: undefined,
+  charactersPerCursorRow___13165: undefined,
+  rowsOfCharacters___13177: undefined,
+  rowsWithCursor___13184: undefined,
+  lineLengths___13192: undefined,
+  i___13194: undefined,
+  i___13207: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -38590,7 +38680,7 @@ function game_Dialog_chunkText__P187719_mk(s) {
 
 
 
-function game_breakIntoPages__P189554(s) {
+function game_breakIntoPages__P4338(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38600,83 +38690,83 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.result___199302 = undefined;
-    s.currentPage___199304 = undefined;
-    s.lastBreakLocation___199306 = undefined;
-    s.lastBreak___199307 = undefined;
-    s.line___199308 = undefined;
-    s.lineLength___199309 = undefined;
-    s.nextLine___199312 = undefined;
-    s.index___199318 = undefined;
+    s.result___13223 = undefined;
+    s.currentPage___13225 = undefined;
+    s.lastBreakLocation___13227 = undefined;
+    s.lastBreak___13228 = undefined;
+    s.line___13229 = undefined;
+    s.lineLength___13230 = undefined;
+    s.nextLine___13233 = undefined;
+    s.index___13239 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.result___199302 = (r0);
+    s.result___13223 = (r0);
     r0 = pxsim_Array__mk();
-    s.currentPage___199304 = (r0);
-    s.lastBreakLocation___199306 = (0);
-    s.lastBreak___199307 = (0);
+    s.currentPage___13225 = (r0);
+    s.lastBreakLocation___13227 = (0);
+    s.lastBreak___13228 = (0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.line___199308 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.line___199308, 0);
+    s.line___13229 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.line___13229, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.lineLength___199309 = (r0);
-    s.tmp_0 = r0 = s.lineLength___199309;
+    s.lineLength___13230 = (r0);
+    s.tmp_0 = r0 = s.lineLength___13230;
     s.tmp_2 = r0 = s.arg1;
-    r0 = pxsim_pxtrt_ldlocRef(s.line___199308);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___13229);
     s.tmp_3 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.tmp_3);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtcore_mkAction(3, nextLine__P199312);
+    r0 = pxsim_pxtcore_mkAction(3, nextLine__P13233);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___199308);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.lineLength___199309);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.line___13229);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.lineLength___13230);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg1);
-    s.nextLine___199312 = (s.tmp_0);
-    s.index___199318 = (0);
+    s.nextLine___13233 = (s.tmp_0);
+    s.index___13239 = (0);
   case 1:
-    s.tmp_1 = r0 = s.index___199318;
+    s.tmp_1 = r0 = s.index___13239;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    r0 = pxsim_String_.charAt(s.arg0, s.index___199318);
+    r0 = pxsim_String_.charAt(s.arg0, s.index___13239);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 === "\n");
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 2; continue; }
-    s.tmp_5 = r0 = s.currentPage___199304;
-    s.tmp_7 = game_formatLine__P189555_mk(s);
+    s.tmp_5 = r0 = s.currentPage___13225;
+    s.tmp_7 = game_formatLine__P4339_mk(s);
     s.tmp_8 = r0 = s.arg0;
-    s.tmp_9 = r0 = s.lastBreak___199307;
-    r0 = (s.index___199318 - s.lastBreak___199307);
+    s.tmp_9 = r0 = s.lastBreak___13228;
+    r0 = (s.index___13239 - s.lastBreak___13228);
     s.tmp_10 = r0;
     r0 = pxsim_String_.substr(s.tmp_8, s.tmp_9, s.tmp_10);
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 1133; s.pc = 23; return s.tmp_7;
+    s.callLocIdx = 1140; s.pc = 23; return s.tmp_7;
   case 23:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
-    r0 = (s.index___199318 + 1);
-    s.index___199318 = (r0);
-    s.lastBreak___199307 = (s.index___199318);
+    r0 = (s.index___13239 + 1);
+    s.index___13239 = (r0);
+    s.lastBreak___13228 = (s.index___13239);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___199312;
+    s.tmp_0.argL = s.nextLine___13233;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1134; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1141; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
     { step = 9; continue; }
   case 2:
-    r0 = pxsim_String_.charAt(s.arg0, s.index___199318);
+    r0 = pxsim_String_.charAt(s.arg0, s.index___13239);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === "\\");
     s.tmp_0 = r0;
@@ -38686,7 +38776,7 @@ switch (step) {
     { step = 4; continue; }
   case 3:
     s.tmp_3 = r0 = s.arg0;
-    r0 = (s.index___199318 + 1);
+    r0 = (s.index___13239 + 1);
     s.tmp_4 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_4);
     s.tmp_2 = r0;
@@ -38696,111 +38786,111 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
-    s.tmp_6 = r0 = s.currentPage___199304;
-    s.tmp_8 = game_formatLine__P189555_mk(s);
+    s.tmp_6 = r0 = s.currentPage___13225;
+    s.tmp_8 = game_formatLine__P4339_mk(s);
     s.tmp_9 = r0 = s.arg0;
-    s.tmp_10 = r0 = s.lastBreak___199307;
-    r0 = (s.index___199318 - s.lastBreak___199307);
+    s.tmp_10 = r0 = s.lastBreak___13228;
+    r0 = (s.index___13239 - s.lastBreak___13228);
     s.tmp_11 = r0;
     r0 = pxsim_String_.substr(s.tmp_9, s.tmp_10, s.tmp_11);
     s.tmp_8.arg0 = r0;
-    s.callLocIdx = 1135; s.pc = 25; return s.tmp_8;
+    s.callLocIdx = 1142; s.pc = 25; return s.tmp_8;
   case 25:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = pxsim_Array__push(s.tmp_6, s.tmp_7);
-    r0 = (s.index___199318 + 2);
-    s.index___199318 = (r0);
-    s.lastBreak___199307 = (s.index___199318);
+    r0 = (s.index___13239 + 2);
+    s.index___13239 = (r0);
+    s.lastBreak___13228 = (s.index___13239);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___199312;
+    s.tmp_0.argL = s.nextLine___13233;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1136; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 1143; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
     { step = 8; continue; }
   case 5:
-    s.tmp_1 = game_isBreakCharacter__P189553_mk(s);
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.index___199318);
+    s.tmp_1 = game_isBreakCharacter__P4337_mk(s);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.index___13239);
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1137; s.pc = 27; return s.tmp_1;
+    s.callLocIdx = 1144; s.pc = 27; return s.tmp_1;
   case 27:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.lastBreakLocation___199306 = (s.index___199318);
+    s.lastBreakLocation___13227 = (s.index___13239);
   case 6:
   case 7:
   case 8:
   case 9:
-    r0 = (s.index___199318 - s.lastBreak___199307);
+    r0 = (s.index___13239 - s.lastBreak___13228);
     s.tmp_1 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___199309);
+    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___13230);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 === s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.lastBreakLocation___199306 === s.index___199318);
+    r0 = (s.lastBreakLocation___13227 === s.index___13239);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBool(s.tmp_3);
     if (!r0) { step = 10; continue; }
     r0 = s.tmp_3;
     { step = 11; continue; }
   case 10:
-    r0 = (s.lastBreakLocation___199306 < s.lastBreak___199307);
+    r0 = (s.lastBreakLocation___13227 < s.lastBreak___13228);
   case 11:
     // jmp value (already in r0)
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 12; continue; }
-    s.tmp_5 = r0 = s.currentPage___199304;
-    s.tmp_7 = game_formatLine__P189555_mk(s);
+    s.tmp_5 = r0 = s.currentPage___13225;
+    s.tmp_7 = game_formatLine__P4339_mk(s);
     s.tmp_8 = r0 = s.arg0;
-    s.tmp_9 = r0 = s.lastBreak___199307;
-    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___199309);
+    s.tmp_9 = r0 = s.lastBreak___13228;
+    r0 = pxsim_pxtrt_ldlocRef(s.lineLength___13230);
     s.tmp_10 = r0;
     r0 = pxsim_String_.substr(s.tmp_8, s.tmp_9, s.tmp_10);
     s.tmp_7.arg0 = r0;
-    s.callLocIdx = 1138; s.pc = 28; return s.tmp_7;
+    s.callLocIdx = 1145; s.pc = 28; return s.tmp_7;
   case 28:
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_Array__push(s.tmp_5, s.tmp_6);
-    s.lastBreak___199307 = (s.index___199318);
+    s.lastBreak___13228 = (s.index___13239);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___199312;
+    s.tmp_0.argL = s.nextLine___13233;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1139; s.pc = 29; return s.tmp_0;
+    s.callLocIdx = 1146; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
     { step = 13; continue; }
   case 12:
-    s.tmp_0 = r0 = s.currentPage___199304;
-    s.tmp_2 = game_formatLine__P189555_mk(s);
+    s.tmp_0 = r0 = s.currentPage___13225;
+    s.tmp_2 = game_formatLine__P4339_mk(s);
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_4 = r0 = s.lastBreak___199307;
-    r0 = (s.lastBreakLocation___199306 - s.lastBreak___199307);
+    s.tmp_4 = r0 = s.lastBreak___13228;
+    r0 = (s.lastBreakLocation___13227 - s.lastBreak___13228);
     s.tmp_5 = r0;
     r0 = pxsim_String_.substr(s.tmp_3, s.tmp_4, s.tmp_5);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1140; s.pc = 30; return s.tmp_2;
+    s.callLocIdx = 1147; s.pc = 30; return s.tmp_2;
   case 30:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.lastBreak___199307 = (s.lastBreakLocation___199306);
+    s.lastBreak___13228 = (s.lastBreakLocation___13227);
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.nextLine___199312;
+    s.tmp_0.argL = s.nextLine___13233;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1141; s.pc = 31; return s.tmp_0;
+    s.callLocIdx = 1148; s.pc = 31; return s.tmp_0;
   case 31:
     r0 = s.retval;
   case 13:
   case 14:
   case 15:
-    r0 = pxsim_pxtrt_ldlocRef(s.line___199308);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___13229);
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.arg1);
     s.tmp_2 = r0;
@@ -38808,39 +38898,39 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    r0 = pxsim_pxtrt_stlocRef(s.line___199308, 0);
-    s.tmp_0 = r0 = s.lineLength___199309;
+    r0 = pxsim_pxtrt_stlocRef(s.line___13229, 0);
+    s.tmp_0 = r0 = s.lineLength___13230;
     s.tmp_2 = r0 = s.arg1;
-    r0 = pxsim_pxtrt_ldlocRef(s.line___199308);
+    r0 = pxsim_pxtrt_ldlocRef(s.line___13229);
     s.tmp_3 = r0;
     r0 = pxsim_Array__getAt(s.tmp_2, s.tmp_3);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_Array__push(s.result___199302, s.currentPage___199304);
+    r0 = pxsim_Array__push(s.result___13223, s.currentPage___13225);
     r0 = pxsim_Array__mk();
-    s.currentPage___199304 = (r0);
+    s.currentPage___13225 = (r0);
   case 16:
   case 17:
-    r0 = (s.index___199318 + 1);
-    s.index___199318 = (r0);
+    r0 = (s.index___13239 + 1);
+    s.index___13239 = (r0);
     { step = 1; continue; }
   case 18:
-    s.tmp_0 = r0 = s.currentPage___199304;
-    s.tmp_2 = game_formatLine__P189555_mk(s);
+    s.tmp_0 = r0 = s.currentPage___13225;
+    s.tmp_2 = game_formatLine__P4339_mk(s);
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_4 = r0 = s.lastBreak___199307;
+    s.tmp_4 = r0 = s.lastBreak___13228;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_6 = r0;
-    r0 = (s.tmp_6 - s.lastBreak___199307);
+    r0 = (s.tmp_6 - s.lastBreak___13228);
     s.tmp_5 = r0;
     r0 = pxsim_String_.substr(s.tmp_3, s.tmp_4, s.tmp_5);
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1142; s.pc = 32; return s.tmp_2;
+    s.callLocIdx = 1149; s.pc = 32; return s.tmp_2;
   case 32:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    r0 = pxsim_Array__length(s.currentPage___199304);
+    r0 = pxsim_Array__length(s.currentPage___13225);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 1);
     s.tmp_0 = r0;
@@ -38849,7 +38939,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 20; continue; }
   case 19:
-    r0 = pxsim_Array__getAt(s.currentPage___199304, 0);
+    r0 = pxsim_Array__getAt(s.currentPage___13225, 0);
     s.tmp_2 = r0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
@@ -38859,19 +38949,19 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 21; continue; }
-    r0 = pxsim_Array__push(s.result___199302, s.currentPage___199304);
+    r0 = pxsim_Array__push(s.result___13223, s.currentPage___13225);
   case 21:
   case 22:
-    r0 = s.result___199302;
+    r0 = s.result___13223;
     return leave(s, r0)
   default: oops()
 } } }
-game_breakIntoPages__P189554.info = {"start":20755,"length":2187,"line":661,"column":4,"endLine":722,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"breakIntoPages","argumentNames":["text","lineLengths"]}
+game_breakIntoPages__P4338.info = {"start":20755,"length":2187,"line":661,"column":4,"endLine":722,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"breakIntoPages","argumentNames":["text","lineLengths"]}
 
-function game_breakIntoPages__P189554_mk(s) {
+function game_breakIntoPages__P4338_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_breakIntoPages__P189554, depth: s.depth + 1,
+        parent: s, fn: game_breakIntoPages__P4338, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38885,14 +38975,14 @@ function game_breakIntoPages__P189554_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  result___199302: undefined,
-  currentPage___199304: undefined,
-  lastBreakLocation___199306: undefined,
-  lastBreak___199307: undefined,
-  line___199308: undefined,
-  lineLength___199309: undefined,
-  nextLine___199312: undefined,
-  index___199318: undefined,
+  result___13223: undefined,
+  currentPage___13225: undefined,
+  lastBreakLocation___13227: undefined,
+  lastBreak___13228: undefined,
+  line___13229: undefined,
+  lineLength___13230: undefined,
+  nextLine___13233: undefined,
+  index___13239: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -38901,7 +38991,7 @@ function game_breakIntoPages__P189554_mk(s) {
 
 
 
-function nextLine__P199312(s) {
+function nextLine__P13233(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38928,12 +39018,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-nextLine__P199312.info = {"start":21048,"length":95,"line":671,"column":8,"endLine":674,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"nextLine","argumentNames":[]}
+nextLine__P13233.info = {"start":21048,"length":95,"line":671,"column":8,"endLine":674,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"nextLine","argumentNames":[]}
 
-function nextLine__P199312_mk(s) {
+function nextLine__P13233_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: nextLine__P199312, depth: s.depth + 1,
+        parent: s, fn: nextLine__P13233, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -38945,7 +39035,7 @@ function nextLine__P199312_mk(s) {
 
 
 
-function game_formatLine__P189555(s) {
+function game_formatLine__P4339(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -38955,42 +39045,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___199483 = undefined;
+    s.i___13404 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.i___199483 = (0);
+    s.i___13404 = (0);
   case 1:
-    r0 = pxsim_String_.charAt(s.arg0, s.i___199483);
+    r0 = pxsim_String_.charAt(s.arg0, s.i___13404);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    r0 = (s.i___199483 + 1);
-    s.i___199483 = (r0);
+    r0 = (s.i___13404 + 1);
+    s.i___13404 = (r0);
     { step = 1; continue; }
   case 2:
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_1 = r0 = s.i___199483;
+    s.tmp_1 = r0 = s.i___13404;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = pxsim_String_.substr(s.tmp_0, s.tmp_1, s.tmp_2);
     return leave(s, r0)
   default: oops()
 } } }
-game_formatLine__P189555.info = {"start":22948,"length":148,"line":724,"column":4,"endLine":728,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"formatLine","argumentNames":["text"]}
+game_formatLine__P4339.info = {"start":22948,"length":148,"line":724,"column":4,"endLine":728,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"formatLine","argumentNames":["text"]}
 
-function game_formatLine__P189555_mk(s) {
+function game_formatLine__P4339_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_formatLine__P189555, depth: s.depth + 1,
+        parent: s, fn: game_formatLine__P4339, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  i___199483: undefined,
+  i___13404: undefined,
   arg0: undefined,
 } }
 
@@ -38998,7 +39088,7 @@ function game_formatLine__P189555_mk(s) {
 
 
 
-function game_isBreakCharacter__P189553(s) {
+function game_isBreakCharacter__P4337(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39078,12 +39168,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_isBreakCharacter__P189553.info = {"start":20515,"length":234,"line":654,"column":4,"endLine":659,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"isBreakCharacter","argumentNames":["charCode"]}
+game_isBreakCharacter__P4337.info = {"start":20515,"length":234,"line":654,"column":4,"endLine":659,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"isBreakCharacter","argumentNames":["charCode"]}
 
-function game_isBreakCharacter__P189553_mk(s) {
+function game_isBreakCharacter__P4337_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_isBreakCharacter__P189553, depth: s.depth + 1,
+        parent: s, fn: game_isBreakCharacter__P4337, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39102,7 +39192,7 @@ function game_isBreakCharacter__P189553_mk(s) {
 
 
 
-function game_BaseDialog_textAreaHeight__P189544(s) {
+function game_BaseDialog_textAreaHeight__P4328(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39117,7 +39207,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = s.arg0.fields["image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
@@ -39136,12 +39226,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_textAreaHeight__P189544.info = {"start":5183,"length":117,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"textAreaHeight","argumentNames":["this"]}
+game_BaseDialog_textAreaHeight__P4328.info = {"start":5183,"length":117,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"textAreaHeight","argumentNames":["this"]}
 
-function game_BaseDialog_textAreaHeight__P189544_mk(s) {
+function game_BaseDialog_textAreaHeight__P4328_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_textAreaHeight__P189544, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_textAreaHeight__P4328, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39157,7 +39247,7 @@ function game_BaseDialog_textAreaHeight__P189544_mk(s) {
 
 
 
-function game_BaseDialog_textAreaWidth__P189543(s) {
+function game_BaseDialog_textAreaWidth__P4327(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39172,7 +39262,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = s.arg0.fields["image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_2);
@@ -39191,12 +39281,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_textAreaWidth__P189543.info = {"start":5057,"length":116,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"textAreaWidth","argumentNames":["this"]}
+game_BaseDialog_textAreaWidth__P4327.info = {"start":5057,"length":116,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"textAreaWidth","argumentNames":["this"]}
 
-function game_BaseDialog_textAreaWidth__P189543_mk(s) {
+function game_BaseDialog_textAreaWidth__P4327_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_textAreaWidth__P189543, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_textAreaWidth__P4327, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39212,7 +39302,7 @@ function game_BaseDialog_textAreaWidth__P189543_mk(s) {
 
 
 
-function game_BaseDialog_rowHeight__P189542(s) {
+function game_BaseDialog_rowHeight__P4326(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39227,7 +39317,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     s.tmp_1 = if_charHeight_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_1.arg0 = r0;
@@ -39237,7 +39327,7 @@ switch (step) {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["charHeight"];
       if (s.tmp_1.fn == null) { s.retval = s.tmp_1.arg0.fields["charHeight"]; }
       else if (!s.tmp_1.fn.isGetter) { s.retval = bind(s.tmp_1); }
-     else { s.callLocIdx = 1087; s.pc = 1; return s.tmp_1; }
+     else { s.callLocIdx = 1094; s.pc = 1; return s.tmp_1; }
     }
   case 1:
     r0 = s.retval;
@@ -39246,12 +39336,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_rowHeight__P189542.info = {"start":4969,"length":78,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"rowHeight","argumentNames":["this"]}
+game_BaseDialog_rowHeight__P4326.info = {"start":4969,"length":78,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"rowHeight","argumentNames":["this"]}
 
-function game_BaseDialog_rowHeight__P189542_mk(s) {
+function game_BaseDialog_rowHeight__P4326_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_rowHeight__P189542, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_rowHeight__P4326, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39262,7 +39352,7 @@ function game_BaseDialog_rowHeight__P189542_mk(s) {
 
 
 
-function game_Dialog_prevPage__P187718(s) {
+function game_Dialog_prevPage__P2501(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39277,10 +39367,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
-    s.tmp_1 = game_Dialog_hasPrev__P187716_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    s.tmp_1 = game_Dialog_hasPrev__P2499_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1090; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1097; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -39298,12 +39388,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_prevPage__P187718.info = {"start":6130,"length":105,"line":207,"column":8,"endLine":211,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"prevPage","argumentNames":["this"]}
+game_Dialog_prevPage__P2501.info = {"start":6130,"length":105,"line":207,"column":8,"endLine":211,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"prevPage","argumentNames":["this"]}
 
-function game_Dialog_prevPage__P187718_mk(s) {
+function game_Dialog_prevPage__P2501_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_prevPage__P187718, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_prevPage__P2501, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39317,7 +39407,7 @@ function game_Dialog_prevPage__P187718_mk(s) {
 
 
 
-function game_Dialog_nextPage__P187717(s) {
+function game_Dialog_nextPage__P2500(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39332,10 +39422,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
-    s.tmp_1 = game_Dialog_hasNext__P187715_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    s.tmp_1 = game_Dialog_hasNext__P2498_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1089; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1096; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -39353,12 +39443,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_nextPage__P187717.info = {"start":6015,"length":105,"line":201,"column":8,"endLine":205,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"nextPage","argumentNames":["this"]}
+game_Dialog_nextPage__P2500.info = {"start":6015,"length":105,"line":201,"column":8,"endLine":205,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"nextPage","argumentNames":["this"]}
 
-function game_Dialog_nextPage__P187717_mk(s) {
+function game_Dialog_nextPage__P2500_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_nextPage__P187717, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_nextPage__P2500, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39372,7 +39462,7 @@ function game_Dialog_nextPage__P187717_mk(s) {
 
 
 
-function game_Dialog_hasPrev__P187716(s) {
+function game_Dialog_hasPrev__P2499(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39387,7 +39477,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
     r0 = s.arg0.fields["chunks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -39420,12 +39510,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_hasPrev__P187716.info = {"start":5872,"length":133,"line":196,"column":8,"endLine":199,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"hasPrev","argumentNames":["this"]}
+game_Dialog_hasPrev__P2499.info = {"start":5872,"length":133,"line":196,"column":8,"endLine":199,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"hasPrev","argumentNames":["this"]}
 
-function game_Dialog_hasPrev__P187716_mk(s) {
+function game_Dialog_hasPrev__P2499_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_hasPrev__P187716, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_hasPrev__P2499, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39441,7 +39531,7 @@ function game_Dialog_hasPrev__P187716_mk(s) {
 
 
 
-function game_Dialog_hasNext__P187715(s) {
+function game_Dialog_hasNext__P2498(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39456,7 +39546,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
     r0 = s.arg0.fields["chunks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -39495,12 +39585,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_hasNext__P187715.info = {"start":5708,"length":154,"line":191,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"hasNext","argumentNames":["this"]}
+game_Dialog_hasNext__P2498.info = {"start":5708,"length":154,"line":191,"column":8,"endLine":194,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"hasNext","argumentNames":["this"]}
 
-function game_Dialog_hasNext__P187715_mk(s) {
+function game_Dialog_hasNext__P2498_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_hasNext__P187715, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_hasNext__P2498, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39519,7 +39609,7 @@ function game_Dialog_hasNext__P187715_mk(s) {
 
 
 
-function game_Dialog_constructor__P187714(s) {
+function game_Dialog_constructor__P2497(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39539,15 +39629,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_constructor__P187706_mk(s);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_constructor__P2489_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = s.arg3;
     s.tmp_0.arg4 = s.arg4;
     s.tmp_0.arg5 = s.arg5;
-    s.callLocIdx = 1088; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1095; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["chunkIndex"] = (0);
@@ -39555,12 +39645,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_constructor__P187714.info = {"start":5505,"length":193,"line":185,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
+game_Dialog_constructor__P2497.info = {"start":5505,"length":193,"line":185,"column":8,"endLine":189,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
 
-function game_Dialog_constructor__P187714_mk(s) {
+function game_Dialog_constructor__P2497_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_constructor__P187714, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_constructor__P2497, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -39575,7 +39665,7 @@ function game_Dialog_constructor__P187714_mk(s) {
 
 
 
-function game_BaseDialog_constructor__P187706(s) {
+function game_BaseDialog_constructor__P2489(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39595,7 +39685,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim.image.create(s.arg1, s.arg2);
     s.tmp_1 = r0;
@@ -39606,7 +39696,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.dialogFrame___189534;
+    r0 = globals.dialogFrame___4318;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39615,12 +39705,12 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 4; continue; }
   case 3:
-    s.tmp_3 = game_defaultFrame__P189550_mk(s);
-    s.callLocIdx = 1059; s.pc = 13; return s.tmp_3;
+    s.tmp_3 = game_defaultFrame__P4334_mk(s);
+    s.callLocIdx = 1066; s.pc = 13; return s.tmp_3;
   case 13:
     r0 = s.retval;
     s.tmp_2 = r0;
-    globals.dialogFrame___189534 = (r0);
+    globals.dialogFrame___4318 = (r0);
     r0 = s.tmp_2;
   case 4:
     // jmp value (already in r0)
@@ -39632,7 +39722,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    r0 = globals.font8___186962;
+    r0 = globals.font8___1745;
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39643,7 +39733,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    r0 = globals.dialogCursor___189535;
+    r0 = globals.dialogCursor___4319;
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39652,26 +39742,26 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 10; continue; }
   case 9:
-    s.tmp_3 = game_defaultCursorImage__P189552_mk(s);
-    s.callLocIdx = 1060; s.pc = 14; return s.tmp_3;
+    s.tmp_3 = game_defaultCursorImage__P4336_mk(s);
+    s.callLocIdx = 1067; s.pc = 14; return s.tmp_3;
   case 14:
     r0 = s.retval;
     s.tmp_2 = r0;
-    globals.dialogCursor___189535 = (r0);
+    globals.dialogCursor___4319 = (r0);
     r0 = s.tmp_2;
   case 10:
     // jmp value (already in r0)
     s.tmp_4 = r0;
     r0 = (s.arg0).fields["cursor"] = (s.tmp_4);
-    r0 = (globals.dialogTextColor___189536 == undefined);
+    r0 = (globals.dialogTextColor___4320 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    globals.dialogTextColor___189536 = (15);
+    globals.dialogTextColor___4320 = (15);
     r0 = 15;
     { step = 12; continue; }
   case 11:
-    r0 = globals.dialogTextColor___189536;
+    r0 = globals.dialogTextColor___4320;
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39729,26 +39819,26 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["innerTop"] = (s.tmp_1);
     r0 = (s.arg0).fields["cursorCount"] = (0);
-    s.tmp_0 = game_BaseDialog_drawBorder__P189537_mk(s);
+    s.tmp_0 = game_BaseDialog_drawBorder__P4321_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1061; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1068; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_clearInterior__P189539_mk(s);
+    s.tmp_0 = game_BaseDialog_clearInterior__P4323_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1062; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1069; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_constructor__P187706.info = {"start":634,"length":895,"line":36,"column":8,"endLine":58,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
+game_BaseDialog_constructor__P2489.info = {"start":634,"length":895,"line":36,"column":8,"endLine":58,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","width","height","frame","font","cursor"]}
 
-function game_BaseDialog_constructor__P187706_mk(s) {
+function game_BaseDialog_constructor__P2489_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_constructor__P187706, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_constructor__P2489, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -39769,7 +39859,7 @@ function game_BaseDialog_constructor__P187706_mk(s) {
 
 
 
-function game_defaultCursorImage__P189552(s) {
+function game_defaultCursorImage__P4336(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39779,14 +39869,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex199706);
+    r0 = pxsim.image.ofBuffer(_hex13627);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex199708);
+    r0 = pxsim.image.ofBuffer(_hex13629);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39794,24 +39884,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_defaultCursorImage__P189552.info = {"start":17096,"length":690,"line":543,"column":4,"endLine":569,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultCursorImage","argumentNames":[]}
+game_defaultCursorImage__P4336.info = {"start":17096,"length":690,"line":543,"column":4,"endLine":569,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultCursorImage","argumentNames":[]}
 
-function game_defaultCursorImage__P189552_mk(s) {
+function game_defaultCursorImage__P4336_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_defaultCursorImage__P189552, depth: s.depth + 1,
+        parent: s, fn: game_defaultCursorImage__P4336, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex199706 = pxsim.BufferMethods.createBufferFromHex("87040a000800000011111101010000010111010111100001011101010100000101000001100010000001010000100000")
-const _hex199708 = pxsim.BufferMethods.createBufferFromHex("87040b000b00000000606686080000006076776686000000607777676608000076171111670800007671177766080000767117776608000076711777660800007617111167080000607777676608000060767766860000000060668608000000")
+const _hex13627 = pxsim.BufferMethods.createBufferFromHex("87040a000800000011111101010000010111010111100001011101010100000101000001100010000001010000100000")
+const _hex13629 = pxsim.BufferMethods.createBufferFromHex("87040b000b00000000606686080000006076776686000000607777676608000076171111670800007671177766080000767117776608000076711777660800007617111167080000607777676608000060767766860000000060668608000000")
 
 
 
 
-function game_defaultFrame__P189550(s) {
+function game_defaultFrame__P4334(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39821,14 +39911,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex199712);
+    r0 = pxsim.image.ofBuffer(_hex13633);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex199714);
+    r0 = pxsim.image.ofBuffer(_hex13635);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -39836,24 +39926,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_defaultFrame__P189550.info = {"start":16308,"length":556,"line":504,"column":4,"endLine":526,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultFrame","argumentNames":[]}
+game_defaultFrame__P4334.info = {"start":16308,"length":556,"line":504,"column":4,"endLine":526,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultFrame","argumentNames":[]}
 
-function game_defaultFrame__P189550_mk(s) {
+function game_defaultFrame__P4334_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_defaultFrame__P189550, depth: s.depth + 1,
+        parent: s, fn: game_defaultFrame__P4334, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex199712 = pxsim.BufferMethods.createBufferFromHex("8704030003000000110100000101000011010000")
-const _hex199714 = pxsim.BufferMethods.createBufferFromHex("87040c000c0000000000000000000000b0bbbbbbbb0b0000b0bbbbbbbbcb0000b0db1111bdcb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b0db1111bdcb0000b0bbbbbbbbcb0000b0bbbbbbbbcb000000cccccccccc0000")
+const _hex13633 = pxsim.BufferMethods.createBufferFromHex("8704030003000000110100000101000011010000")
+const _hex13635 = pxsim.BufferMethods.createBufferFromHex("87040c000c0000000000000000000000b0bbbbbbbb0b0000b0bbbbbbbbcb0000b0db1111bdcb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b01b1111b1cb0000b0db1111bdcb0000b0bbbbbbbbcb0000b0bbbbbbbbcb000000cccccccccc0000")
 
 
 
 
-function game_BaseDialog_clearInterior__P189539(s) {
+function game_BaseDialog_clearInterior__P4323(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39863,21 +39953,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___199101 = undefined;
-    s.s___199108 = undefined;
+    s.d___13022 = undefined;
+    s.s___13029 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_2 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = 4;
     s.tmp_2.arg2 = 1;
@@ -39890,15 +39980,15 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 - 2);
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 1085; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 1092; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     { step = 7; continue; }
   case 1:
   case 2:
-    s.d___199101 = (1);
+    s.d___13022 = (1);
   case 3:
-    s.tmp_1 = r0 = s.d___199101;
+    s.tmp_1 = r0 = s.d___13022;
     r0 = s.arg0.fields["columns"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -39907,9 +39997,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.s___199108 = (1);
+    s.s___13029 = (1);
   case 4:
-    s.tmp_1 = r0 = s.s___199108;
+    s.tmp_1 = r0 = s.s___13029;
     r0 = s.arg0.fields["rows"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -39918,20 +40008,20 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_4 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_4 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = 4;
-    s.tmp_4.arg2 = s.d___199101;
-    s.tmp_4.arg3 = s.s___199108;
-    s.callLocIdx = 1086; s.pc = 9; return s.tmp_4;
+    s.tmp_4.arg2 = s.d___13022;
+    s.tmp_4.arg3 = s.s___13029;
+    s.callLocIdx = 1093; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
-    r0 = (s.s___199108 + 1);
-    s.s___199108 = (r0);
+    r0 = (s.s___13029 + 1);
+    s.s___13029 = (r0);
     { step = 4; continue; }
   case 5:
-    r0 = (s.d___199101 + 1);
-    s.d___199101 = (r0);
+    r0 = (s.d___13022 + 1);
+    s.d___13022 = (r0);
     { step = 3; continue; }
   case 6:
   case 7:
@@ -39939,20 +40029,20 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_clearInterior__P189539.info = {"start":3911,"length":342,"line":132,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"clearInterior","argumentNames":["this"]}
+game_BaseDialog_clearInterior__P4323.info = {"start":3911,"length":342,"line":132,"column":8,"endLine":141,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"clearInterior","argumentNames":["this"]}
 
-function game_BaseDialog_clearInterior__P189539_mk(s) {
+function game_BaseDialog_clearInterior__P4323_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_clearInterior__P189539, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_clearInterior__P4323, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___199101: undefined,
-  s___199108: undefined,
+  d___13022: undefined,
+  s___13029: undefined,
   arg0: undefined,
 } }
 
@@ -39960,7 +40050,7 @@ function game_BaseDialog_clearInterior__P189539_mk(s) {
 
 
 
-function game_BaseDialog_drawPartial__P189540(s) {
+function game_BaseDialog_drawPartial__P4324(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -39970,12 +40060,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x0___199126 = undefined;
-    s.y0___199134 = undefined;
-    s.xf___199142 = undefined;
-    s.yf___199149 = undefined;
-    s.e___199156 = undefined;
-    s.t___199162 = undefined;
+    s.x0___13047 = undefined;
+    s.y0___13055 = undefined;
+    s.xf___13063 = undefined;
+    s.yf___13070 = undefined;
+    s.e___13077 = undefined;
+    s.t___13083 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -39984,7 +40074,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = s.arg0.fields["innerLeft"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
@@ -39992,7 +40082,7 @@ switch (step) {
     r0 = (s.arg2 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.x0___199126 = (r0);
+    s.x0___13047 = (r0);
     r0 = s.arg0.fields["innerTop"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
@@ -40000,68 +40090,68 @@ switch (step) {
     r0 = (s.arg3 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.y0___199134 = (r0);
+    s.y0___13055 = (r0);
     r0 = (s.arg1 % 3);
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.xf___199142 = (r0);
+    s.xf___13063 = (r0);
     r0 = pxsim.Math_.idiv(s.arg1, 3);
     s.tmp_0 = r0;
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.yf___199149 = (r0);
-    s.e___199156 = (0);
+    s.yf___13070 = (r0);
+    s.e___13077 = (0);
   case 1:
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
-    r0 = (s.e___199156 < s.tmp_1);
+    r0 = (s.e___13077 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.t___199162 = (0);
+    s.t___13083 = (0);
   case 2:
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
-    r0 = (s.t___199162 < s.tmp_1);
+    r0 = (s.t___13083 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
     r0 = s.arg0.fields["image"];
     s.tmp_2 = r0;
-    r0 = (s.x0___199126 + s.e___199156);
+    r0 = (s.x0___13047 + s.e___13077);
     s.tmp_3 = r0;
-    r0 = (s.y0___199134 + s.t___199162);
+    r0 = (s.y0___13055 + s.t___13083);
     s.tmp_4 = r0;
     r0 = s.arg0.fields["frame"];
     s.tmp_6 = r0;
-    r0 = (s.xf___199142 + s.e___199156);
+    r0 = (s.xf___13063 + s.e___13077);
     s.tmp_7 = r0;
-    r0 = (s.yf___199149 + s.t___199162);
+    r0 = (s.yf___13070 + s.t___13083);
     s.tmp_8 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_6, s.tmp_7, s.tmp_8);
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.setPixel(s.tmp_2, s.tmp_3, s.tmp_4, s.tmp_5);
-    r0 = (s.t___199162 + 1);
-    s.t___199162 = (r0);
+    r0 = (s.t___13083 + 1);
+    s.t___13083 = (r0);
     { step = 2; continue; }
   case 3:
-    r0 = (s.e___199156 + 1);
-    s.e___199156 = (r0);
+    r0 = (s.e___13077 + 1);
+    s.e___13077 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawPartial__P189540.info = {"start":4263,"length":604,"line":143,"column":8,"endLine":158,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawPartial","argumentNames":["this","index","colTo","rowTo"]}
+game_BaseDialog_drawPartial__P4324.info = {"start":4263,"length":604,"line":143,"column":8,"endLine":158,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawPartial","argumentNames":["this","index","colTo","rowTo"]}
 
-function game_BaseDialog_drawPartial__P189540_mk(s) {
+function game_BaseDialog_drawPartial__P4324_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawPartial__P189540, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawPartial__P4324, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40072,12 +40162,12 @@ function game_BaseDialog_drawPartial__P189540_mk(s) {
   tmp_6: undefined,
   tmp_7: undefined,
   tmp_8: undefined,
-  x0___199126: undefined,
-  y0___199134: undefined,
-  xf___199142: undefined,
-  yf___199149: undefined,
-  e___199156: undefined,
-  t___199162: undefined,
+  x0___13047: undefined,
+  y0___13055: undefined,
+  xf___13063: undefined,
+  yf___13070: undefined,
+  e___13077: undefined,
+  t___13083: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -40088,7 +40178,7 @@ function game_BaseDialog_drawPartial__P189540_mk(s) {
 
 
 
-function game_BaseDialog_fastFill__P189538(s) {
+function game_BaseDialog_fastFill__P4322(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40098,7 +40188,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.color___199198 = undefined;
+    s.color___13119 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -40109,7 +40199,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = s.arg0.fields["frame"];
     s.tmp_0 = r0;
     r0 = (s.arg1 % 3);
@@ -40117,8 +40207,8 @@ switch (step) {
     r0 = pxsim.Math_.idiv(s.arg1, 3);
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.getPixel(s.tmp_0, s.tmp_1, s.tmp_2);
-    s.color___199198 = (r0);
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
+    s.color___13119 = (r0);
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["innerLeft"];
@@ -40131,25 +40221,25 @@ switch (step) {
     s.tmp_0.arg2 = r0;
     s.tmp_0.arg3 = s.arg4;
     s.tmp_0.arg4 = s.arg5;
-    s.tmp_0.arg5 = s.color___199198;
-    s.callLocIdx = 1084; s.pc = 1; return s.tmp_0;
+    s.tmp_0.arg5 = s.color___13119;
+    s.callLocIdx = 1091; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_fastFill__P189538.info = {"start":3652,"length":249,"line":127,"column":8,"endLine":130,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"fastFill","argumentNames":["this","index","x","y","w","h"]}
+game_BaseDialog_fastFill__P4322.info = {"start":3652,"length":249,"line":127,"column":8,"endLine":130,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"fastFill","argumentNames":["this","index","x","y","w","h"]}
 
-function game_BaseDialog_fastFill__P189538_mk(s) {
+function game_BaseDialog_fastFill__P4322_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_fastFill__P189538, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_fastFill__P4322, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  color___199198: undefined,
+  color___13119: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -40162,7 +40252,7 @@ function game_BaseDialog_fastFill__P189538_mk(s) {
 
 
 
-function game_BaseDialog_drawBorder__P189537(s) {
+function game_BaseDialog_drawBorder__P4321(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40172,32 +40262,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.y___199637 = undefined;
-    s.c___199653 = undefined;
-    s.r___199687 = undefined;
+    s.y___13558 = undefined;
+    s.c___13574 = undefined;
+    s.r___13608 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = s.arg0.fields["unit"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_2 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = 0;
     s.tmp_2.arg3 = 0;
     s.tmp_2.arg4 = 1;
     s.tmp_2.arg5 = 1;
-    s.callLocIdx = 1068; s.pc = 12; return s.tmp_2;
+    s.callLocIdx = 1075; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 1;
@@ -40207,10 +40297,10 @@ switch (step) {
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1069; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1076; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 2;
     r0 = s.arg0.fields["columns"];
@@ -40220,10 +40310,10 @@ switch (step) {
     s.tmp_0.arg3 = 0;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1070; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1077; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 3;
     s.tmp_0.arg2 = 0;
@@ -40233,10 +40323,10 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 1071; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1078; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 5;
     r0 = s.arg0.fields["columns"];
@@ -40249,73 +40339,73 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 2);
     s.tmp_0.arg5 = r0;
-    s.callLocIdx = 1072; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1079; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
     r0 = s.arg0.fields["rows"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.y___199637 = (r0);
-    s.tmp_0 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.y___13558 = (r0);
+    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 6;
     s.tmp_0.arg2 = 0;
-    s.tmp_0.arg3 = s.y___199637;
+    s.tmp_0.arg3 = s.y___13558;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1073; s.pc = 17; return s.tmp_0;
+    s.callLocIdx = 1080; s.pc = 17; return s.tmp_0;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 7;
     s.tmp_0.arg2 = 1;
-    s.tmp_0.arg3 = s.y___199637;
+    s.tmp_0.arg3 = s.y___13558;
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1074; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1081; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_fastFill__P189538_mk(s);
+    s.tmp_0 = game_BaseDialog_fastFill__P4322_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 8;
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.y___199637;
+    s.tmp_0.arg3 = s.y___13558;
     s.tmp_0.arg4 = 1;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1075; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 1082; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
     { step = 11; continue; }
   case 1:
   case 2:
-    s.c___199653 = (0);
+    s.c___13574 = (0);
   case 3:
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
-    r0 = (s.c___199653 < s.tmp_1);
+    r0 = (s.c___13574 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    r0 = (s.c___199653 == 0);
+    r0 = (s.c___13574 == 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 4; continue; }
-    s.tmp_3 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_3 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.tmp_3.arg1 = 0;
     s.tmp_3.arg2 = 0;
     s.tmp_3.arg3 = 0;
-    s.callLocIdx = 1076; s.pc = 20; return s.tmp_3;
+    s.callLocIdx = 1083; s.pc = 20; return s.tmp_3;
   case 20:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 6;
     s.tmp_0.arg2 = 0;
@@ -40323,12 +40413,12 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1077; s.pc = 21; return s.tmp_0;
+    s.callLocIdx = 1084; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
     { step = 7; continue; }
   case 4:
-    s.tmp_1 = r0 = s.c___199653;
+    s.tmp_1 = r0 = s.c___13574;
     r0 = s.arg0.fields["columns"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -40337,55 +40427,55 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_4 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_4 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = 2;
-    s.tmp_4.arg2 = s.c___199653;
+    s.tmp_4.arg2 = s.c___13574;
     s.tmp_4.arg3 = 0;
-    s.callLocIdx = 1078; s.pc = 22; return s.tmp_4;
+    s.callLocIdx = 1085; s.pc = 22; return s.tmp_4;
   case 22:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 8;
-    s.tmp_0.arg2 = s.c___199653;
+    s.tmp_0.arg2 = s.c___13574;
     r0 = s.arg0.fields["rows"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1079; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 1086; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.tmp_0.arg2 = s.c___199653;
+    s.tmp_0.arg2 = s.c___13574;
     s.tmp_0.arg3 = 0;
-    s.callLocIdx = 1080; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1087; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 7;
-    s.tmp_0.arg2 = s.c___199653;
+    s.tmp_0.arg2 = s.c___13574;
     r0 = s.arg0.fields["rows"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1081; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 1088; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
   case 6:
   case 7:
-    r0 = (s.c___199653 + 1);
-    s.c___199653 = (r0);
+    r0 = (s.c___13574 + 1);
+    s.c___13574 = (r0);
     { step = 3; continue; }
   case 8:
-    s.r___199687 = (1);
+    s.r___13608 = (1);
   case 9:
-    s.tmp_1 = r0 = s.r___199687;
+    s.tmp_1 = r0 = s.r___13608;
     r0 = s.arg0.fields["rows"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 1);
@@ -40394,27 +40484,27 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.tmp_4 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_4 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = 3;
     s.tmp_4.arg2 = 0;
-    s.tmp_4.arg3 = s.r___199687;
-    s.callLocIdx = 1082; s.pc = 26; return s.tmp_4;
+    s.tmp_4.arg3 = s.r___13608;
+    s.callLocIdx = 1089; s.pc = 26; return s.tmp_4;
   case 26:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawPartial__P189540_mk(s);
+    s.tmp_0 = game_BaseDialog_drawPartial__P4324_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 5;
     r0 = s.arg0.fields["columns"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.r___199687;
-    s.callLocIdx = 1083; s.pc = 27; return s.tmp_0;
+    s.tmp_0.arg3 = s.r___13608;
+    s.callLocIdx = 1090; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    r0 = (s.r___199687 + 1);
-    s.r___199687 = (r0);
+    r0 = (s.r___13608 + 1);
+    s.r___13608 = (r0);
     { step = 9; continue; }
   case 10:
   case 11:
@@ -40422,21 +40512,21 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawBorder__P189537.info = {"start":2321,"length":1321,"line":89,"column":8,"endLine":125,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawBorder","argumentNames":["this"]}
+game_BaseDialog_drawBorder__P4321.info = {"start":2321,"length":1321,"line":89,"column":8,"endLine":125,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawBorder","argumentNames":["this"]}
 
-function game_BaseDialog_drawBorder__P189537_mk(s) {
+function game_BaseDialog_drawBorder__P4321_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawBorder__P189537, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawBorder__P4321, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  y___199637: undefined,
-  c___199653: undefined,
-  r___199687: undefined,
+  y___13558: undefined,
+  c___13574: undefined,
+  r___13608: undefined,
   arg0: undefined,
 } }
 
@@ -40444,7 +40534,7 @@ function game_BaseDialog_drawBorder__P189537_mk(s) {
 
 
 
-function game_BaseDialog_update__P187707(s) {
+function game_BaseDialog_update__P2490(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40459,34 +40549,34 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_clearInterior__P189539_mk(s);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_clearInterior__P4323_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1063; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1070; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog__C187694_v2_1_mk(s);
+    s.tmp_0 = game_BaseDialog__C2477_v2_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C187694_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_BaseDialog__C2477_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.drawTextCore;
     s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = game_BaseDialog_drawCursorRow__P187710_mk(s);
+    s.tmp_0 = game_BaseDialog_drawCursorRow__P2493_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1064; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1071; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_update__P187707.info = {"start":1539,"length":121,"line":60,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"update","argumentNames":["this"]}
+game_BaseDialog_update__P2490.info = {"start":1539,"length":121,"line":60,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"update","argumentNames":["this"]}
 
-function game_BaseDialog_update__P187707_mk(s) {
+function game_BaseDialog_update__P2490_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_update__P187707, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_update__P2490, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -40496,7 +40586,7 @@ function game_BaseDialog_update__P187707_mk(s) {
 
 
 
-function game_BaseDialog_drawCursorRow__P187710(s) {
+function game_BaseDialog_drawCursorRow__P2493(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40506,21 +40596,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.offset___199012 = undefined;
+    s.offset___12933 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
-    s.offset___199012 = (0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
+    s.offset___12933 = (0);
     r0 = s.arg0.fields["cursorCount"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 20);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.offset___199012 = (1);
+    s.offset___12933 = (1);
   case 1:
   case 2:
     s.tmp_0 = r0 = s.arg0;
@@ -40537,9 +40627,9 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = s.arg0.fields["innerLeft"];
     s.tmp_6 = r0;
-    s.tmp_8 = game_BaseDialog_textAreaWidth__P189543_mk(s);
+    s.tmp_8 = game_BaseDialog_textAreaWidth__P4327_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1065; s.pc = 3; return s.tmp_8;
+    s.callLocIdx = 1072; s.pc = 3; return s.tmp_8;
   case 3:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -40549,7 +40639,7 @@ switch (step) {
     s.tmp_9 = r0;
     r0 = (s.tmp_5 + s.tmp_9);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.offset___199012);
+    r0 = (s.tmp_4 + s.offset___12933);
     s.tmp_3 = r0;
     r0 = s.arg0.fields["cursor"];
     s.tmp_11 = r0;
@@ -40563,9 +40653,9 @@ switch (step) {
     s.tmp_17 = r0;
     r0 = (s.tmp_16 + s.tmp_17);
     s.tmp_15 = r0;
-    s.tmp_19 = game_BaseDialog_textAreaHeight__P189544_mk(s);
+    s.tmp_19 = game_BaseDialog_textAreaHeight__P4328_mk(s);
     s.tmp_19.arg0 = s.arg0;
-    s.callLocIdx = 1066; s.pc = 4; return s.tmp_19;
+    s.callLocIdx = 1073; s.pc = 4; return s.tmp_19;
   case 4:
     r0 = s.retval;
     s.tmp_18 = r0;
@@ -40586,12 +40676,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawCursorRow__P187710.info = {"start":1832,"length":479,"line":74,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawCursorRow","argumentNames":["this"]}
+game_BaseDialog_drawCursorRow__P2493.info = {"start":1832,"length":479,"line":74,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawCursorRow","argumentNames":["this"]}
 
-function game_BaseDialog_drawCursorRow__P187710_mk(s) {
+function game_BaseDialog_drawCursorRow__P2493_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawCursorRow__P187710, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawCursorRow__P2493, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40616,7 +40706,7 @@ function game_BaseDialog_drawCursorRow__P187710_mk(s) {
   tmp_20: undefined,
   tmp_21: undefined,
   tmp_22: undefined,
-  offset___199012: undefined,
+  offset___12933: undefined,
   arg0: undefined,
 } }
 
@@ -40624,7 +40714,7 @@ function game_BaseDialog_drawCursorRow__P187710_mk(s) {
 
 
 
-function game_BaseDialog_cursorRowHeight__P189541(s) {
+function game_BaseDialog_cursorRowHeight__P4325(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40639,7 +40729,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = s.arg0.fields["cursor"];
     s.tmp_1 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_1);
@@ -40648,12 +40738,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_cursorRowHeight__P189541.info = {"start":4877,"length":82,"line":160,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"cursorRowHeight","argumentNames":["this"]}
+game_BaseDialog_cursorRowHeight__P4325.info = {"start":4877,"length":82,"line":160,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"cursorRowHeight","argumentNames":["this"]}
 
-function game_BaseDialog_cursorRowHeight__P189541_mk(s) {
+function game_BaseDialog_cursorRowHeight__P4325_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_cursorRowHeight__P189541, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_cursorRowHeight__P4325, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -40664,7 +40754,7 @@ function game_BaseDialog_cursorRowHeight__P189541_mk(s) {
 
 
 
-function game_BaseDialog_drawTextCore__P187709(s) {
+function game_BaseDialog_drawTextCore__P2492(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40679,17 +40769,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_drawTextCore__P187709.info = {"start":1757,"length":65,"line":70,"column":8,"endLine":72,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
+game_BaseDialog_drawTextCore__P2492.info = {"start":1757,"length":65,"line":70,"column":8,"endLine":72,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
 
-function game_BaseDialog_drawTextCore__P187709_mk(s) {
+function game_BaseDialog_drawTextCore__P2492_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_drawTextCore__P187709, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_drawTextCore__P2492, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -40698,7 +40788,7 @@ function game_BaseDialog_drawTextCore__P187709_mk(s) {
 
 
 
-function blockMenu_selectedMenuIndex__P188902(s) {
+function blockMenu_selectedMenuIndex__P3685(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40708,34 +40798,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___199715 = undefined;
-    s.tmp_0 = blockMenu__getState__P188939_mk(s);
-    s.callLocIdx = 1937; s.pc = 1; return s.tmp_0;
+    s.state___13636 = undefined;
+    s.tmp_0 = blockMenu__getState__P3722_mk(s);
+    s.callLocIdx = 1944; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___199715 = (r0);
-    r0 = s.state___199715.fields["menu"];
+    s.state___13636 = (r0);
+    r0 = s.state___13636.fields["menu"];
     s.tmp_0 = r0;
     r0 = s.tmp_0.fields["selectedIndex"];
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_selectedMenuIndex__P188902.info = {"start":1948,"length":133,"line":71,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"selectedMenuIndex","argumentNames":[]}
+blockMenu_selectedMenuIndex__P3685.info = {"start":1948,"length":133,"line":71,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"selectedMenuIndex","argumentNames":[]}
 
-function blockMenu_selectedMenuIndex__P188902_mk(s) {
+function blockMenu_selectedMenuIndex__P3685_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_selectedMenuIndex__P188902, depth: s.depth + 1,
+        parent: s, fn: blockMenu_selectedMenuIndex__P3685, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___199715: undefined,
+  state___13636: undefined,
 } }
 
 
 
 
 
-function blockMenu__getState__P188939(s) {
+function blockMenu__getState__P3722(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40745,20 +40835,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = blockMenu__init__P188938_mk(s);
-    s.callLocIdx = 2034; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = blockMenu__init__P3721_mk(s);
+    s.callLocIdx = 2041; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals.state___191331;
+    r0 = globals.state___6115;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__getState__P188939.info = {"start":3289,"length":74,"line":110,"column":4,"endLine":113,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_getState","argumentNames":[]}
+blockMenu__getState__P3722.info = {"start":3289,"length":74,"line":110,"column":4,"endLine":113,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_getState","argumentNames":[]}
 
-function blockMenu__getState__P188939_mk(s) {
+function blockMenu__getState__P3722_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__getState__P188939, depth: s.depth + 1,
+        parent: s, fn: blockMenu__getState__P3722, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -40767,7 +40857,7 @@ function blockMenu__getState__P188939_mk(s) {
 
 
 
-function blockMenu__init__P188938(s) {
+function blockMenu__init__P3721(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40777,37 +40867,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.debounce___199733 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___191332);
+    s.debounce___13654 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.sceneStack___6116);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
     r0 = pxsim_Array__mk();
-    globals.sceneStack___191332 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C188930_VT);
+    globals.sceneStack___6116 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C3713_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu__BlockMenuState_constructor__P188934_mk(s);
+    s.tmp_1 = blockMenu__BlockMenuState_constructor__P3717_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2015; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 2022; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
-    globals.state___191331 = (s.tmp_0);
+    globals.state___6115 = (s.tmp_0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.debounce___199733 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.debounce___199733, 100);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P199736);
+    s.debounce___13654 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.debounce___13654, 100);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P13657);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.debounce___199733);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.debounce___13654);
     r0 = pxsim.control.runInParallel(s.tmp_0);
-    s.tmp_0 = game_addScenePushHandler__P187766_mk(s);
-    s.tmp_0.arg0 = inline__P199793;
-    s.callLocIdx = 2030; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = game_addScenePushHandler__P2549_mk(s);
+    s.tmp_0.arg0 = inline__P13714;
+    s.callLocIdx = 2037; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = game_addScenePopHandler__P187768_mk(s);
-    s.tmp_0.arg0 = inline__P199803;
-    s.callLocIdx = 2033; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_addScenePopHandler__P2551_mk(s);
+    s.tmp_0.arg0 = inline__P13724;
+    s.callLocIdx = 2040; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -40815,23 +40905,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__init__P188938.info = {"start":1098,"length":2185,"line":45,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_init","argumentNames":[]}
+blockMenu__init__P3721.info = {"start":1098,"length":2185,"line":45,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"_init","argumentNames":[]}
 
-function blockMenu__init__P188938_mk(s) {
+function blockMenu__init__P3721_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__init__P188938, depth: s.depth + 1,
+        parent: s, fn: blockMenu__init__P3721, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  debounce___199733: undefined,
+  debounce___13654: undefined,
 } }
 
 
 
 
 
-function inline__P199736(s) {
+function inline__P13657(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -40841,17 +40931,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.handler___199752 = undefined;
-    s.unnamed8938___U1 = undefined;
-    s.unnamed8939___U2 = undefined;
+    s.handler___13673 = undefined;
+    s.unnamed130___U1 = undefined;
+    s.unnamed131___U2 = undefined;
   case 1:
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 18; continue; }
-    s.tmp_0 = controller_pauseUntilAnyButtonIsPressed__P187170_mk(s);
-    s.callLocIdx = 2016; s.pc = 19; return s.tmp_0;
+    s.tmp_0 = controller_pauseUntilAnyButtonIsPressed__P1953_mk(s);
+    s.callLocIdx = 2023; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    r0 = globals.state___191331.fields["controlsEnabled"];
+    r0 = globals.state___6115.fields["controlsEnabled"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -40862,7 +40952,7 @@ switch (step) {
     { step = 1; continue; }
   case 2:
   case 3:
-    r0 = globals.state___191331.fields["menu"];
+    r0 = globals.state___6115.fields["menu"];
     r0 = r0.fields["style"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 === 0);
@@ -40874,9 +40964,9 @@ switch (step) {
   case 4:
     r0 = pxsim_pxtrt_stlocRef(s.caps[0], 100);
   case 5:
-    s.tmp_1 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.A___187094;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.A___1877;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 20; return s.tmp_1;
   case 20:
@@ -40884,51 +40974,51 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.handler___199752 = (undefined);
-    r0 = globals.state___191331.fields["handlers"];
-    s.unnamed8938___U1 = (r0);
-    s.unnamed8939___U2 = (0);
+    s.handler___13673 = (undefined);
+    r0 = globals.state___6115.fields["handlers"];
+    s.unnamed130___U1 = (r0);
+    s.unnamed131___U2 = (0);
   case 6:
-    s.tmp_0 = r0 = s.unnamed8939___U2;
-    r0 = pxsim_Array__length(s.unnamed8938___U1);
+    s.tmp_0 = r0 = s.unnamed131___U2;
+    r0 = pxsim_Array__length(s.unnamed130___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8938___U1, s.unnamed8939___U2);
-    s.handler___199752 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed130___U1, s.unnamed131___U2);
+    s.handler___13673 = (r0);
     s.tmp_2 = lambda_3_mk(s);
-    s.tmp_2.argL = s.handler___199752;
-    s.tmp_3 = blockMenu_MenuSprite_selectedMenuOption__P188916_mk(s);
-    r0 = globals.state___191331.fields["menu"];
+    s.tmp_2.argL = s.handler___13673;
+    s.tmp_3 = blockMenu_MenuSprite_selectedMenuOption__P3699_mk(s);
+    r0 = globals.state___6115.fields["menu"];
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 2017; s.pc = 22; return s.tmp_3;
+    s.callLocIdx = 2024; s.pc = 22; return s.tmp_3;
   case 22:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
-    r0 = globals.state___191331.fields["menu"];
+    r0 = globals.state___6115.fields["menu"];
     s.tmp_4 = r0;
     r0 = s.tmp_4.fields["selectedIndex"];
     s.tmp_2.arg1 = r0;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 2019; s.pc = 21; return s.tmp_2;
+    s.callLocIdx = 2026; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
-    r0 = (s.unnamed8939___U2 + 1);
-    s.unnamed8939___U2 = (r0);
+    r0 = (s.unnamed131___U2 + 1);
+    s.unnamed131___U2 = (r0);
     { step = 6; continue; }
   case 7:
-    s.unnamed8938___U1 = (undefined);
-    s.tmp_0 = pause__P185619_mk(s);
+    s.unnamed130___U1 = (undefined);
+    s.tmp_0 = pause__P402_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2020; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 2027; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
   case 8:
   case 9:
-    s.tmp_1 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.up___187097;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.up___1880;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 24; return s.tmp_1;
   case 24:
@@ -40936,24 +41026,24 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P188919_mk(s);
-    r0 = globals.state___191331.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P3702_mk(s);
+    r0 = globals.state___6115.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = true;
-    s.callLocIdx = 2021; s.pc = 25; return s.tmp_2;
+    s.callLocIdx = 2028; s.pc = 25; return s.tmp_2;
   case 25:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2022; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 2029; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
   case 10:
   case 11:
-    s.tmp_1 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.down___187099;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.down___1882;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 27; return s.tmp_1;
   case 27:
@@ -40961,24 +41051,24 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P188919_mk(s);
-    r0 = globals.state___191331.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionVertical__P3702_mk(s);
+    r0 = globals.state___6115.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 2023; s.pc = 28; return s.tmp_2;
+    s.callLocIdx = 2030; s.pc = 28; return s.tmp_2;
   case 28:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2024; s.pc = 29; return s.tmp_0;
+    s.callLocIdx = 2031; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
   case 12:
   case 13:
-    s.tmp_1 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.left___187096;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.left___1879;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 30; return s.tmp_1;
   case 30:
@@ -40986,24 +41076,24 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P188920_mk(s);
-    r0 = globals.state___191331.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P3703_mk(s);
+    r0 = globals.state___6115.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = true;
-    s.callLocIdx = 2025; s.pc = 31; return s.tmp_2;
+    s.callLocIdx = 2032; s.pc = 31; return s.tmp_2;
   case 31:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2026; s.pc = 32; return s.tmp_0;
+    s.callLocIdx = 2033; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
   case 14:
   case 15:
-    s.tmp_1 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_1.arg0 = globals.right___187098;
-    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_1.arg0);
+    s.tmp_1 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_1.arg0 = globals.right___1881;
+    if (!checkSubtype(s.tmp_1.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_1.arg0);
     s.tmp_1.fn = s.tmp_1.arg0.vtable.methods.isPressed;
     s.pc = 33; return s.tmp_1;
   case 33:
@@ -41011,17 +41101,17 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P188920_mk(s);
-    r0 = globals.state___191331.fields["menu"];
+    s.tmp_2 = blockMenu_MenuSprite_moveSelectionHorizontal__P3703_mk(s);
+    r0 = globals.state___6115.fields["menu"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = false;
-    s.callLocIdx = 2027; s.pc = 34; return s.tmp_2;
+    s.callLocIdx = 2034; s.pc = 34; return s.tmp_2;
   case 34:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2028; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 2035; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
   case 16:
@@ -41032,28 +41122,28 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P199736.info = {"start":1459,"length":1320,"line":54,"column":30,"endLine":90,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":[]}
+inline__P13657.info = {"start":1459,"length":1320,"line":54,"column":30,"endLine":90,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P199736_mk(s) {
+function inline__P13657_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P199736, depth: s.depth + 1,
+        parent: s, fn: inline__P13657, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  handler___199752: undefined,
-  unnamed8938___U1: undefined,
-  unnamed8939___U2: undefined,
+  handler___13673: undefined,
+  unnamed130___U1: undefined,
+  unnamed131___U2: undefined,
 } }
 
 
 
 
 
-function inline__P199793(s) {
+function inline__P13714(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41067,25 +41157,25 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array__push(globals.sceneStack___191332, globals.state___191331);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C188930_VT);
+    r0 = pxsim_Array__push(globals.sceneStack___6116, globals.state___6115);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C3713_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu__BlockMenuState_constructor__P188934_mk(s);
+    s.tmp_1 = blockMenu__BlockMenuState_constructor__P3717_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2029; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 2036; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
-    globals.state___191331 = (s.tmp_0);
+    globals.state___6115 = (s.tmp_0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P199793.info = {"start":2815,"length":123,"line":92,"column":33,"endLine":95,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P13714.info = {"start":2815,"length":123,"line":92,"column":33,"endLine":95,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P199793_mk(s) {
+function inline__P13714_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P199793, depth: s.depth + 1,
+        parent: s, fn: inline__P13714, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41096,7 +41186,7 @@ function inline__P199793_mk(s) {
 
 
 
-function inline__P199803(s) {
+function inline__P13724(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41110,42 +41200,42 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_Array__length(globals.sceneStack___191332);
+    r0 = pxsim_Array__length(globals.sceneStack___6116);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_Array_.pop(globals.sceneStack___191332);
-    globals.state___191331 = (r0);
+    r0 = pxsim_Array_.pop(globals.sceneStack___6116);
+    globals.state___6115 = (r0);
     { step = 4; continue; }
   case 1:
-    r0 = pxsim_numops_toBoolDecr(globals.state___191331);
+    r0 = pxsim_numops_toBoolDecr(globals.state___6115);
     if (!r0) { step = 2; continue; }
-    s.tmp_0 = blockMenu__BlockMenuState_destroy__P188937_mk(s);
-    s.tmp_0.arg0 = globals.state___191331;
-    s.callLocIdx = 2031; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = blockMenu__BlockMenuState_destroy__P3720_mk(s);
+    s.tmp_0.arg0 = globals.state___6115;
+    s.callLocIdx = 2038; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 2:
   case 3:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C188930_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu__BlockMenuState__C3713_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu__BlockMenuState_constructor__P188934_mk(s);
+    s.tmp_1 = blockMenu__BlockMenuState_constructor__P3717_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2032; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 2039; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    globals.state___191331 = (s.tmp_0);
+    globals.state___6115 = (s.tmp_0);
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P199803.info = {"start":2974,"length":301,"line":97,"column":32,"endLine":107,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
+inline__P13724.info = {"start":2974,"length":301,"line":97,"column":32,"endLine":107,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["oldScene"]}
 
-function inline__P199803_mk(s) {
+function inline__P13724_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P199803, depth: s.depth + 1,
+        parent: s, fn: inline__P13724, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41156,7 +41246,7 @@ function inline__P199803_mk(s) {
 
 
 
-function blockMenu__BlockMenuState_destroy__P188937(s) {
+function blockMenu__BlockMenuState_destroy__P3720(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41171,23 +41261,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu__BlockMenuState__C188930_VT)) failedCast(r0);
-    s.tmp_0 = blockMenu_MenuSprite_destroy__P188926_mk(s);
+    if (!checkSubtype(r0, blockMenu__BlockMenuState__C3713_VT)) failedCast(r0);
+    s.tmp_0 = blockMenu_MenuSprite_destroy__P3709_mk(s);
     r0 = s.arg0.fields["menu"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 2014; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2021; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__BlockMenuState_destroy__P188937.info = {"start":893,"length":54,"line":31,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"destroy","argumentNames":["this"]}
+blockMenu__BlockMenuState_destroy__P3720.info = {"start":893,"length":54,"line":31,"column":8,"endLine":33,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"destroy","argumentNames":["this"]}
 
-function blockMenu__BlockMenuState_destroy__P188937_mk(s) {
+function blockMenu__BlockMenuState_destroy__P3720_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__BlockMenuState_destroy__P188937, depth: s.depth + 1,
+        parent: s, fn: blockMenu__BlockMenuState_destroy__P3720, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41197,7 +41287,7 @@ function blockMenu__BlockMenuState_destroy__P188937_mk(s) {
 
 
 
-function blockMenu_MenuSprite_destroy__P188926(s) {
+function blockMenu_MenuSprite_destroy__P3709(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41212,9 +41302,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
-    s.tmp_1 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1970; s.pc = 1; return s.tmp_1;
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1977; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["allSprites"];
@@ -41224,12 +41314,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_destroy__P188926.info = {"start":5247,"length":85,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"destroy","argumentNames":["this"]}
+blockMenu_MenuSprite_destroy__P3709.info = {"start":5247,"length":85,"line":168,"column":8,"endLine":170,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"destroy","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_destroy__P188926_mk(s) {
+function blockMenu_MenuSprite_destroy__P3709_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_destroy__P188926, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_destroy__P3709, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41240,7 +41330,7 @@ function blockMenu_MenuSprite_destroy__P188926_mk(s) {
 
 
 
-function blockMenu__BlockMenuState_constructor__P188934(s) {
+function blockMenu__BlockMenuState_constructor__P3717(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41255,12 +41345,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu__BlockMenuState__C188930_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_MenuSprite__C188909_VT);
+    if (!checkSubtype(r0, blockMenu__BlockMenuState__C3713_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_MenuSprite__C3692_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = blockMenu_MenuSprite_constructor__P188911_mk(s);
+    s.tmp_1 = blockMenu_MenuSprite_constructor__P3694_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 2013; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 2020; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["menu"] = (s.tmp_0);
@@ -41273,12 +41363,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__BlockMenuState_constructor__P188934.info = {"start":261,"length":140,"line":9,"column":8,"endLine":13,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["this"]}
+blockMenu__BlockMenuState_constructor__P3717.info = {"start":261,"length":140,"line":9,"column":8,"endLine":13,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"inline","argumentNames":["this"]}
 
-function blockMenu__BlockMenuState_constructor__P188934_mk(s) {
+function blockMenu__BlockMenuState_constructor__P3717_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__BlockMenuState_constructor__P188934, depth: s.depth + 1,
+        parent: s, fn: blockMenu__BlockMenuState_constructor__P3717, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41289,7 +41379,7 @@ function blockMenu__BlockMenuState_constructor__P188934_mk(s) {
 
 
 
-function blockMenu_MenuSprite_constructor__P188911(s) {
+function blockMenu_MenuSprite_constructor__P3694(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41304,29 +41394,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
-    s.tmp_0 = sprites_BaseSprite_constructor__P187077_mk(s);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    s.tmp_0 = sprites_BaseSprite_constructor__P1860_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 100;
-    s.callLocIdx = 1941; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1948; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["selectedIndex"] = (0);
     r0 = (s.arg0).fields["style"] = (1);
-    s.tmp_0 = blockMenu_MenuSprite_setLocation__P188915_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setLocation__P3698_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 1;
-    s.callLocIdx = 1942; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1949; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["open"] = (false);
-    s.tmp_0 = blockMenu_MenuSprite_setColors__P188913_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setColors__P3696_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 15;
     s.tmp_0.arg2 = 1;
     s.tmp_0.arg3 = 1;
     s.tmp_0.arg4 = 3;
-    s.callLocIdx = 1943; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1950; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["padding"] = (2);
@@ -41334,12 +41424,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_constructor__P188911.info = {"start":859,"length":279,"line":31,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this"]}
+blockMenu_MenuSprite_constructor__P3694.info = {"start":859,"length":279,"line":31,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_constructor__P188911_mk(s) {
+function blockMenu_MenuSprite_constructor__P3694_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_constructor__P188911, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_constructor__P3694, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -41349,7 +41439,7 @@ function blockMenu_MenuSprite_constructor__P188911_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setLocation__P188915(s) {
+function blockMenu_MenuSprite_setLocation__P3698(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41365,31 +41455,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = (s.arg0).fields["location"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = blockMenu_getLayoutMetrics__P191330_mk(s);
+    s.tmp_2 = blockMenu_getLayoutMetrics__P6114_mk(s);
     s.tmp_2.arg0 = s.arg1;
-    s.callLocIdx = 1954; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1961; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["metrics"] = (s.tmp_1);
-    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P191323_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P6107_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1955; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1962; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setLocation__P188915.info = {"start":1841,"length":175,"line":58,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setLocation","argumentNames":["this","location"]}
+blockMenu_MenuSprite_setLocation__P3698.info = {"start":1841,"length":175,"line":58,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setLocation","argumentNames":["this","location"]}
 
-function blockMenu_MenuSprite_setLocation__P188915_mk(s) {
+function blockMenu_MenuSprite_setLocation__P3698_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setLocation__P188915, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setLocation__P3698, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41402,7 +41492,7 @@ function blockMenu_MenuSprite_setLocation__P188915_mk(s) {
 
 
 
-function blockMenu_getLayoutMetrics__P191330(s) {
+function blockMenu_getLayoutMetrics__P6114(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41412,20 +41502,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.maxWidth___200194 = undefined;
-    s.maxHeight___200201 = undefined;
+    s.maxWidth___14115 = undefined;
+    s.maxHeight___14122 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.maxWidth___200194 = (r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    s.maxWidth___14115 = (r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 4);
-    s.maxHeight___200201 = (r0);
+    s.maxHeight___14122 = (r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_pxtcore.switch_eq(0, s.tmp_0);
     if (r0) { step = 1; continue; }
@@ -41450,171 +41540,171 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 1:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_2 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     s.tmp_2.arg1 = 2;
     s.tmp_2.arg2 = 2;
-    s.tmp_2.arg3 = s.maxWidth___200194;
-    s.tmp_2.arg4 = s.maxHeight___200201;
-    s.callLocIdx = 2003; s.pc = 13; return s.tmp_2;
+    s.tmp_2.arg3 = s.maxWidth___14115;
+    s.tmp_2.arg4 = s.maxHeight___14122;
+    s.callLocIdx = 2010; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
     r0 = s.tmp_1;
     { step = 12; continue; }
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_3 = r0;
-    s.tmp_4 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_4 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_4.arg0 = s.tmp_3;
     s.tmp_4.arg1 = 0;
     s.tmp_4.arg2 = 0;
     s.tmp_4.arg3 = 0;
     s.tmp_4.arg4 = 0;
-    s.callLocIdx = 2004; s.pc = 14; return s.tmp_4;
+    s.callLocIdx = 2011; s.pc = 14; return s.tmp_4;
   case 14:
     r0 = s.retval;
     r0 = s.tmp_3;
     { step = 12; continue; }
   case 3:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_5 = r0;
-    s.tmp_6 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_6 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_6.arg0 = s.tmp_5;
     s.tmp_6.arg1 = 2;
     s.tmp_6.arg2 = 2;
-    s.tmp_6.arg3 = s.maxWidth___200194;
-    r0 = (s.maxHeight___200201 >> 1);
+    s.tmp_6.arg3 = s.maxWidth___14115;
+    r0 = (s.maxHeight___14122 >> 1);
     s.tmp_6.arg4 = r0;
-    s.callLocIdx = 2005; s.pc = 15; return s.tmp_6;
+    s.callLocIdx = 2012; s.pc = 15; return s.tmp_6;
   case 15:
     r0 = s.retval;
     r0 = s.tmp_5;
     { step = 12; continue; }
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_7 = r0;
-    s.tmp_8 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_8 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_8.arg0 = s.tmp_7;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_9 = r0;
     r0 = (s.tmp_9 >> 1);
     s.tmp_8.arg1 = r0;
     s.tmp_8.arg2 = 2;
-    r0 = (s.maxWidth___200194 >> 1);
+    r0 = (s.maxWidth___14115 >> 1);
     s.tmp_8.arg3 = r0;
-    s.tmp_8.arg4 = s.maxHeight___200201;
-    s.callLocIdx = 2006; s.pc = 16; return s.tmp_8;
+    s.tmp_8.arg4 = s.maxHeight___14122;
+    s.callLocIdx = 2013; s.pc = 16; return s.tmp_8;
   case 16:
     r0 = s.retval;
     r0 = s.tmp_7;
     { step = 12; continue; }
   case 5:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_10 = r0;
-    s.tmp_11 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_11 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_11.arg0 = s.tmp_10;
     s.tmp_11.arg1 = 2;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_12 = r0;
     r0 = (s.tmp_12 >> 1);
     s.tmp_11.arg2 = r0;
-    s.tmp_11.arg3 = s.maxWidth___200194;
-    r0 = (s.maxHeight___200201 >> 1);
+    s.tmp_11.arg3 = s.maxWidth___14115;
+    r0 = (s.maxHeight___14122 >> 1);
     s.tmp_11.arg4 = r0;
-    s.callLocIdx = 2007; s.pc = 17; return s.tmp_11;
+    s.callLocIdx = 2014; s.pc = 17; return s.tmp_11;
   case 17:
     r0 = s.retval;
     r0 = s.tmp_10;
     { step = 12; continue; }
   case 6:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_13 = r0;
-    s.tmp_14 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_14 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_14.arg0 = s.tmp_13;
     s.tmp_14.arg1 = 2;
     s.tmp_14.arg2 = 2;
-    r0 = (s.maxWidth___200194 >> 1);
+    r0 = (s.maxWidth___14115 >> 1);
     s.tmp_14.arg3 = r0;
-    s.tmp_14.arg4 = s.maxHeight___200201;
-    s.callLocIdx = 2008; s.pc = 18; return s.tmp_14;
+    s.tmp_14.arg4 = s.maxHeight___14122;
+    s.callLocIdx = 2015; s.pc = 18; return s.tmp_14;
   case 18:
     r0 = s.retval;
     r0 = s.tmp_13;
     { step = 12; continue; }
   case 7:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_15 = r0;
-    s.tmp_16 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_16 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_16.arg0 = s.tmp_15;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_17 = r0;
     r0 = (s.tmp_17 >> 1);
     s.tmp_16.arg1 = r0;
     s.tmp_16.arg2 = 2;
-    r0 = (s.maxWidth___200194 >> 1);
+    r0 = (s.maxWidth___14115 >> 1);
     s.tmp_16.arg3 = r0;
-    r0 = (s.maxHeight___200201 >> 1);
+    r0 = (s.maxHeight___14122 >> 1);
     s.tmp_16.arg4 = r0;
-    s.callLocIdx = 2009; s.pc = 19; return s.tmp_16;
+    s.callLocIdx = 2016; s.pc = 19; return s.tmp_16;
   case 19:
     r0 = s.retval;
     r0 = s.tmp_15;
     { step = 12; continue; }
   case 8:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_18 = r0;
-    s.tmp_19 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_19 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_19.arg0 = s.tmp_18;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_20 = r0;
     r0 = (s.tmp_20 >> 1);
     s.tmp_19.arg1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_21 = r0;
     r0 = (s.tmp_21 >> 1);
     s.tmp_19.arg2 = r0;
-    r0 = (s.maxWidth___200194 >> 1);
+    r0 = (s.maxWidth___14115 >> 1);
     s.tmp_19.arg3 = r0;
-    r0 = (s.maxHeight___200201 >> 1);
+    r0 = (s.maxHeight___14122 >> 1);
     s.tmp_19.arg4 = r0;
-    s.callLocIdx = 2010; s.pc = 20; return s.tmp_19;
+    s.callLocIdx = 2017; s.pc = 20; return s.tmp_19;
   case 20:
     r0 = s.retval;
     r0 = s.tmp_18;
     { step = 12; continue; }
   case 9:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_22 = r0;
-    s.tmp_23 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_23 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_23.arg0 = s.tmp_22;
     s.tmp_23.arg1 = 2;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_24 = r0;
     r0 = (s.tmp_24 >> 1);
     s.tmp_23.arg2 = r0;
-    r0 = (s.maxWidth___200194 >> 1);
+    r0 = (s.maxWidth___14115 >> 1);
     s.tmp_23.arg3 = r0;
-    r0 = (s.maxHeight___200201 >> 1);
+    r0 = (s.maxHeight___14122 >> 1);
     s.tmp_23.arg4 = r0;
-    s.callLocIdx = 2011; s.pc = 21; return s.tmp_23;
+    s.callLocIdx = 2018; s.pc = 21; return s.tmp_23;
   case 21:
     r0 = s.retval;
     r0 = s.tmp_22;
     { step = 12; continue; }
   case 10:
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C191317_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_LayoutMetrics__C6101_VT);
     s.tmp_25 = r0;
-    s.tmp_26 = blockMenu_LayoutMetrics_constructor__P191320_mk(s);
+    s.tmp_26 = blockMenu_LayoutMetrics_constructor__P6104_mk(s);
     s.tmp_26.arg0 = s.tmp_25;
     s.tmp_26.arg1 = 2;
     s.tmp_26.arg2 = 2;
-    r0 = (s.maxWidth___200194 >> 1);
+    r0 = (s.maxWidth___14115 >> 1);
     s.tmp_26.arg3 = r0;
-    r0 = (s.maxHeight___200201 >> 1);
+    r0 = (s.maxHeight___14122 >> 1);
     s.tmp_26.arg4 = r0;
-    s.callLocIdx = 2012; s.pc = 22; return s.tmp_26;
+    s.callLocIdx = 2019; s.pc = 22; return s.tmp_26;
   case 22:
     r0 = s.retval;
     r0 = s.tmp_25;
@@ -41625,12 +41715,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_getLayoutMetrics__P191330.info = {"start":11286,"length":1546,"line":352,"column":4,"endLine":380,"endColumn":5,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getLayoutMetrics","argumentNames":["layout"]}
+blockMenu_getLayoutMetrics__P6114.info = {"start":11286,"length":1546,"line":352,"column":4,"endLine":380,"endColumn":5,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getLayoutMetrics","argumentNames":["layout"]}
 
-function blockMenu_getLayoutMetrics__P191330_mk(s) {
+function blockMenu_getLayoutMetrics__P6114_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_getLayoutMetrics__P191330, depth: s.depth + 1,
+        parent: s, fn: blockMenu_getLayoutMetrics__P6114, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41659,8 +41749,8 @@ function blockMenu_getLayoutMetrics__P191330_mk(s) {
   tmp_24: undefined,
   tmp_25: undefined,
   tmp_26: undefined,
-  maxWidth___200194: undefined,
-  maxHeight___200201: undefined,
+  maxWidth___14115: undefined,
+  maxHeight___14122: undefined,
   arg0: undefined,
 } }
 
@@ -41668,7 +41758,7 @@ function blockMenu_getLayoutMetrics__P191330_mk(s) {
 
 
 
-function blockMenu_LayoutMetrics_constructor__P191320(s) {
+function blockMenu_LayoutMetrics_constructor__P6104(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41687,7 +41777,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_LayoutMetrics__C191317_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_LayoutMetrics__C6101_VT)) failedCast(r0);
     r0 = (s.arg0).fields["left"] = (s.arg1);
     r0 = (s.arg0).fields["top"] = (s.arg2);
     r0 = (s.arg0).fields["width"] = (s.arg3);
@@ -41696,12 +41786,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_LayoutMetrics_constructor__P191320.info = {"start":56,"length":109,"line":2,"column":8,"endLine":3,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","left","top","width","height"]}
+blockMenu_LayoutMetrics_constructor__P6104.info = {"start":56,"length":109,"line":2,"column":8,"endLine":3,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","left","top","width","height"]}
 
-function blockMenu_LayoutMetrics_constructor__P191320_mk(s) {
+function blockMenu_LayoutMetrics_constructor__P6104_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_LayoutMetrics_constructor__P191320, depth: s.depth + 1,
+        parent: s, fn: blockMenu_LayoutMetrics_constructor__P6104, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -41714,7 +41804,7 @@ function blockMenu_LayoutMetrics_constructor__P191320_mk(s) {
 
 
 
-function blockMenu_MenuSprite_recreateLabels__P191323(s) {
+function blockMenu_MenuSprite_recreateLabels__P6107(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41724,16 +41814,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.labelWidth___200086 = undefined;
-    s.option___200090 = undefined;
-    s.unnamed8936___U2 = undefined;
-    s.unnamed8937___U3 = undefined;
+    s.labelWidth___14007 = undefined;
+    s.option___14011 = undefined;
+    s.unnamed128___U2 = undefined;
+    s.unnamed129___U3 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -41749,46 +41839,46 @@ switch (step) {
     { step = 5; continue; }
   case 1:
   case 2:
-    s.tmp_3 = blockMenu_MenuSprite_getMaxLabelWidth__P191322_mk(s);
+    s.tmp_3 = blockMenu_MenuSprite_getMaxLabelWidth__P6106_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1974; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1981; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
-    s.labelWidth___200086 = (r0);
-    s.option___200090 = (undefined);
+    s.labelWidth___14007 = (r0);
+    s.option___14011 = (undefined);
     r0 = s.arg0.fields["options"];
-    s.unnamed8936___U2 = (r0);
-    s.unnamed8937___U3 = (0);
+    s.unnamed128___U2 = (r0);
+    s.unnamed129___U3 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed8937___U3;
-    r0 = pxsim_Array__length(s.unnamed8936___U2);
+    s.tmp_0 = r0 = s.unnamed129___U3;
+    r0 = pxsim_Array__length(s.unnamed128___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8936___U2, s.unnamed8937___U3);
-    s.option___200090 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_ScrollingLabel__C191326_VT);
+    r0 = pxsim_Array__getAt(s.unnamed128___U2, s.unnamed129___U3);
+    s.option___14011 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(blockMenu_ScrollingLabel__C6110_VT);
     s.tmp_2 = r0;
-    s.tmp_3 = blockMenu_ScrollingLabel_constructor__P191329_mk(s);
+    s.tmp_3 = blockMenu_ScrollingLabel_constructor__P6113_mk(s);
     s.tmp_3.arg0 = s.tmp_2;
-    s.tmp_3.arg1 = s.option___200090;
-    s.tmp_3.arg2 = s.labelWidth___200086;
-    s.callLocIdx = 1975; s.pc = 7; return s.tmp_3;
+    s.tmp_3.arg1 = s.option___14011;
+    s.tmp_3.arg2 = s.labelWidth___14007;
+    s.callLocIdx = 1982; s.pc = 7; return s.tmp_3;
   case 7:
     r0 = s.retval;
     r0 = s.arg0.fields["labels"];
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_4, s.tmp_2);
-    r0 = (s.unnamed8937___U3 + 1);
-    s.unnamed8937___U3 = (r0);
+    r0 = (s.unnamed129___U3 + 1);
+    s.unnamed129___U3 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed8936___U2 = (undefined);
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.unnamed128___U2 = (undefined);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1977; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1984; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 5:
@@ -41796,22 +41886,22 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_recreateLabels__P191323.info = {"start":6179,"length":363,"line":202,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"recreateLabels","argumentNames":["this"]}
+blockMenu_MenuSprite_recreateLabels__P6107.info = {"start":6179,"length":363,"line":202,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"recreateLabels","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_recreateLabels__P191323_mk(s) {
+function blockMenu_MenuSprite_recreateLabels__P6107_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_recreateLabels__P191323, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_recreateLabels__P6107, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  labelWidth___200086: undefined,
-  option___200090: undefined,
-  unnamed8936___U2: undefined,
-  unnamed8937___U3: undefined,
+  labelWidth___14007: undefined,
+  option___14011: undefined,
+  unnamed128___U2: undefined,
+  unnamed129___U3: undefined,
   arg0: undefined,
 } }
 
@@ -41819,7 +41909,7 @@ function blockMenu_MenuSprite_recreateLabels__P191323_mk(s) {
 
 
 
-function blockMenu_ScrollingLabel_constructor__P191329(s) {
+function blockMenu_ScrollingLabel_constructor__P6113(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41829,7 +41919,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.fullLength___200130 = undefined;
+    s.fullLength___14051 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -41837,7 +41927,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C191326_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C6110_VT)) failedCast(r0);
     r0 = (s.arg0).fields["text"] = (s.arg1);
     r0 = (s.arg0).fields["scrolling"] = (false);
     r0 = (s.arg0).fields["pauseTime"] = (1000);
@@ -41848,10 +41938,10 @@ switch (step) {
     r0 = (s.arg0).fields["offset"] = (0);
     r0 = (s.arg0).fields["width"] = (s.arg2);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = image_getFontForText__P186964_mk(s);
+    s.tmp_2 = image_getFontForText__P1747_mk(s);
     r0 = s.arg0.fields["text"];
     s.tmp_2.arg0 = r0;
-    s.callLocIdx = 1988; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1995; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -41869,13 +41959,13 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1989; s.pc = 2; return s.tmp_3; }
+     else { s.callLocIdx = 1996; s.pc = 2; return s.tmp_3; }
     }
   case 2:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 * s.tmp_2);
-    s.fullLength___200130 = (r0);
+    s.fullLength___14051 = (r0);
     s.tmp_0 = r0 = s.arg0;
     s.tmp_2 = r0 = s.arg2;
     s.tmp_4 = if_charWidth_1_mk(s);
@@ -41887,7 +41977,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 = 1990; s.pc = 3; return s.tmp_4; }
+     else { s.callLocIdx = 1997; s.pc = 3; return s.tmp_4; }
     }
   case 3:
     r0 = s.retval;
@@ -41896,7 +41986,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["maxCharacters"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = r0 = s.fullLength___200130;
+    s.tmp_2 = r0 = s.fullLength___14051;
     r0 = s.arg0.fields["maxCharacters"];
     s.tmp_4 = r0;
     s.tmp_6 = if_charWidth_1_mk(s);
@@ -41908,7 +41998,7 @@ switch (step) {
       s.tmp_6.fn = s.tmp_6.arg0.vtable.iface["charWidth"];
       if (s.tmp_6.fn == null) { s.retval = s.tmp_6.arg0.fields["charWidth"]; }
       else if (!s.tmp_6.fn.isGetter) { s.retval = bind(s.tmp_6); }
-     else { s.callLocIdx = 1991; s.pc = 4; return s.tmp_6; }
+     else { s.callLocIdx = 1998; s.pc = 4; return s.tmp_6; }
     }
   case 4:
     r0 = s.retval;
@@ -41928,7 +42018,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1992; s.pc = 5; return s.tmp_3; }
+     else { s.callLocIdx = 1999; s.pc = 5; return s.tmp_3; }
     }
   case 5:
     r0 = s.retval;
@@ -41942,7 +42032,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1993; s.pc = 6; return s.tmp_5; }
+     else { s.callLocIdx = 2000; s.pc = 6; return s.tmp_5; }
     }
   case 6:
     r0 = s.retval;
@@ -41954,12 +42044,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_ScrollingLabel_constructor__P191329.info = {"start":8624,"length":646,"line":276,"column":8,"endLine":291,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","text","maxWidth"]}
+blockMenu_ScrollingLabel_constructor__P6113.info = {"start":8624,"length":646,"line":276,"column":8,"endLine":291,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"inline","argumentNames":["this","text","maxWidth"]}
 
-function blockMenu_ScrollingLabel_constructor__P191329_mk(s) {
+function blockMenu_ScrollingLabel_constructor__P6113_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_ScrollingLabel_constructor__P191329, depth: s.depth + 1,
+        parent: s, fn: blockMenu_ScrollingLabel_constructor__P6113, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -41968,7 +42058,7 @@ function blockMenu_ScrollingLabel_constructor__P191329_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  fullLength___200130: undefined,
+  fullLength___14051: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -41978,7 +42068,7 @@ function blockMenu_ScrollingLabel_constructor__P191329_mk(s) {
 
 
 
-function blockMenu_MenuSprite_getMaxLabelWidth__P191322(s) {
+function blockMenu_MenuSprite_getMaxLabelWidth__P6106(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -41993,7 +42083,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["style"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 0);
@@ -42025,12 +42115,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_getMaxLabelWidth__P191322.info = {"start":5934,"length":235,"line":195,"column":8,"endLine":200,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getMaxLabelWidth","argumentNames":["this"]}
+blockMenu_MenuSprite_getMaxLabelWidth__P6106.info = {"start":5934,"length":235,"line":195,"column":8,"endLine":200,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"getMaxLabelWidth","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_getMaxLabelWidth__P191322_mk(s) {
+function blockMenu_MenuSprite_getMaxLabelWidth__P6106_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_getMaxLabelWidth__P191322, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_getMaxLabelWidth__P6106, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42048,7 +42138,7 @@ function blockMenu_MenuSprite_getMaxLabelWidth__P191322_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setSelectedIndex__P188918(s) {
+function blockMenu_MenuSprite_setSelectedIndex__P3701(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42058,14 +42148,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.numOptions___199848 = undefined;
+    s.numOptions___13769 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -42079,8 +42169,8 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.numOptions___199848 = (s.tmp_2);
-    r0 = pxsim_numops_toBoolDecr(s.numOptions___199848);
+    s.numOptions___13769 = (s.tmp_2);
+    r0 = pxsim_numops_toBoolDecr(s.numOptions___13769);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -42105,7 +42195,7 @@ switch (step) {
     s.arg1 = (r0);
     { step = 5; continue; }
   case 6:
-    r0 = (s.arg1 % s.numOptions___199848);
+    r0 = (s.arg1 % s.numOptions___13769);
     s.arg1 = (r0);
     r0 = s.arg0.fields["labels"];
     s.tmp_0 = r0;
@@ -42124,7 +42214,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 9; continue; }
-    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P191327_mk(s);
+    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P6111_mk(s);
     r0 = s.arg0.fields["labels"];
     s.tmp_5 = r0;
     r0 = s.arg0.fields["selectedIndex"];
@@ -42132,7 +42222,7 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_5, s.tmp_6);
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = false;
-    s.callLocIdx = 1956; s.pc = 16; return s.tmp_4;
+    s.callLocIdx = 1963; s.pc = 16; return s.tmp_4;
   case 16:
     r0 = s.retval;
   case 9:
@@ -42155,7 +42245,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 13; continue; }
-    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P191327_mk(s);
+    s.tmp_4 = blockMenu_ScrollingLabel_setScrolling__P6111_mk(s);
     r0 = s.arg0.fields["labels"];
     s.tmp_5 = r0;
     r0 = s.arg0.fields["selectedIndex"];
@@ -42163,7 +42253,7 @@ switch (step) {
     r0 = pxsim_Array__getAt(s.tmp_5, s.tmp_6);
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = true;
-    s.callLocIdx = 1957; s.pc = 17; return s.tmp_4;
+    s.callLocIdx = 1964; s.pc = 17; return s.tmp_4;
   case 17:
     r0 = s.retval;
   case 13:
@@ -42173,12 +42263,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setSelectedIndex__P188918.info = {"start":2329,"length":617,"line":76,"column":8,"endLine":94,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setSelectedIndex","argumentNames":["this","index"]}
+blockMenu_MenuSprite_setSelectedIndex__P3701.info = {"start":2329,"length":617,"line":76,"column":8,"endLine":94,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setSelectedIndex","argumentNames":["this","index"]}
 
-function blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s) {
+function blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setSelectedIndex__P188918, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setSelectedIndex__P3701, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42187,7 +42277,7 @@ function blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  numOptions___199848: undefined,
+  numOptions___13769: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -42196,7 +42286,7 @@ function blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s) {
 
 
 
-function blockMenu_ScrollingLabel_setScrolling__P191327(s) {
+function blockMenu_ScrollingLabel_setScrolling__P6111(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42212,7 +42302,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C191326_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C6110_VT)) failedCast(r0);
     r0 = s.arg0.fields["scrolling"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== s.arg1);
@@ -42228,12 +42318,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_ScrollingLabel_setScrolling__P191327.info = {"start":9280,"length":215,"line":293,"column":8,"endLine":299,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setScrolling","argumentNames":["this","scrolling"]}
+blockMenu_ScrollingLabel_setScrolling__P6111.info = {"start":9280,"length":215,"line":293,"column":8,"endLine":299,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setScrolling","argumentNames":["this","scrolling"]}
 
-function blockMenu_ScrollingLabel_setScrolling__P191327_mk(s) {
+function blockMenu_ScrollingLabel_setScrolling__P6111_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_ScrollingLabel_setScrolling__P191327, depth: s.depth + 1,
+        parent: s, fn: blockMenu_ScrollingLabel_setScrolling__P6111, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42245,7 +42335,7 @@ function blockMenu_ScrollingLabel_setScrolling__P191327_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setColors__P188913(s) {
+function blockMenu_MenuSprite_setColors__P3696(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42264,67 +42354,67 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P185342_mk(s);
-    s.tmp_3 = Math_min__P185343_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_3 = Math_min__P126_mk(s);
     r0 = (s.arg1 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1946; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 1953; s.pc = 2; return s.tmp_3;
   case 2:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1947; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1954; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["foreground"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P185342_mk(s);
-    s.tmp_3 = Math_min__P185343_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_3 = Math_min__P126_mk(s);
     r0 = (s.arg2 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1948; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1955; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1949; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1956; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["background"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P185342_mk(s);
-    s.tmp_3 = Math_min__P185343_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_3 = Math_min__P126_mk(s);
     r0 = (s.arg3 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1950; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1957; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1951; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1958; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cursorForeground"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P185342_mk(s);
-    s.tmp_3 = Math_min__P185343_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
+    s.tmp_3 = Math_min__P126_mk(s);
     r0 = (s.arg4 | 0);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = 15;
-    s.callLocIdx = 1952; s.pc = 8; return s.tmp_3;
+    s.callLocIdx = 1959; s.pc = 8; return s.tmp_3;
   case 8:
     r0 = s.retval;
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1953; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1960; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -42333,12 +42423,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setColors__P188913.info = {"start":1314,"length":429,"line":47,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setColors","argumentNames":["this","foreground","background","cursorForeground","cursorBackground"]}
+blockMenu_MenuSprite_setColors__P3696.info = {"start":1314,"length":429,"line":47,"column":8,"endLine":52,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setColors","argumentNames":["this","foreground","background","cursorForeground","cursorBackground"]}
 
-function blockMenu_MenuSprite_setColors__P188913_mk(s) {
+function blockMenu_MenuSprite_setColors__P3696_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setColors__P188913, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setColors__P3696, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42355,7 +42445,7 @@ function blockMenu_MenuSprite_setColors__P188913_mk(s) {
 
 
 
-function blockMenu_MenuSprite_moveSelectionHorizontal__P188920(s) {
+function blockMenu_MenuSprite_moveSelectionHorizontal__P3703(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42371,7 +42461,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["style"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 0);
@@ -42386,24 +42476,24 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 1; continue; }
-    s.tmp_5 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_5 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_5.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 + 1);
     s.tmp_5.arg1 = r0;
-    s.callLocIdx = 1966; s.pc = 5; return s.tmp_5;
+    s.callLocIdx = 1973; s.pc = 5; return s.tmp_5;
   case 5:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1967; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1974; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 2:
@@ -42413,12 +42503,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_moveSelectionHorizontal__P188920.info = {"start":4330,"length":358,"line":133,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionHorizontal","argumentNames":["this","left"]}
+blockMenu_MenuSprite_moveSelectionHorizontal__P3703.info = {"start":4330,"length":358,"line":133,"column":8,"endLine":142,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionHorizontal","argumentNames":["this","left"]}
 
-function blockMenu_MenuSprite_moveSelectionHorizontal__P188920_mk(s) {
+function blockMenu_MenuSprite_moveSelectionHorizontal__P3703_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_moveSelectionHorizontal__P188920, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_moveSelectionHorizontal__P3703, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42435,7 +42525,7 @@ function blockMenu_MenuSprite_moveSelectionHorizontal__P188920_mk(s) {
 
 
 
-function blockMenu_MenuSprite_moveSelectionVertical__P188919(s) {
+function blockMenu_MenuSprite_moveSelectionVertical__P3702(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42451,7 +42541,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["style"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 0);
@@ -42483,13 +42573,13 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 3; continue; }
-    s.tmp_8 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_8 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_8.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_9 = r0;
     r0 = (s.tmp_9 - 1);
     s.tmp_8.arg1 = r0;
-    s.callLocIdx = 1958; s.pc = 21; return s.tmp_8;
+    s.callLocIdx = 1965; s.pc = 21; return s.tmp_8;
   case 21:
     r0 = s.retval;
     { step = 6; continue; }
@@ -42500,37 +42590,37 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_2 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 - 3);
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1959; s.pc = 22; return s.tmp_2;
+    s.callLocIdx = 1966; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1960; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 1967; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
   case 5:
   case 6:
     { step = 8; continue; }
   case 7:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1961; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1968; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
   case 8:
@@ -42570,24 +42660,24 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 14; continue; }
-    s.tmp_9 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_9 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_9.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_10 = r0;
     r0 = (s.tmp_10 + 1);
     s.tmp_9.arg1 = r0;
-    s.callLocIdx = 1962; s.pc = 25; return s.tmp_9;
+    s.callLocIdx = 1969; s.pc = 25; return s.tmp_9;
   case 25:
     r0 = s.retval;
     { step = 15; continue; }
   case 14:
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1963; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 1970; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
   case 15:
@@ -42596,16 +42686,16 @@ switch (step) {
   case 17:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 18; continue; }
-    s.tmp_0 = blockMenu_MenuSprite_previous__P188922_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_previous__P3705_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1964; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 1971; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
     { step = 19; continue; }
   case 18:
-    s.tmp_0 = blockMenu_MenuSprite_next__P188921_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_next__P3704_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1965; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1972; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
   case 19:
@@ -42614,12 +42704,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_moveSelectionVertical__P188919.info = {"start":2956,"length":1364,"line":96,"column":8,"endLine":131,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionVertical","argumentNames":["this","up"]}
+blockMenu_MenuSprite_moveSelectionVertical__P3702.info = {"start":2956,"length":1364,"line":96,"column":8,"endLine":131,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"moveSelectionVertical","argumentNames":["this","up"]}
 
-function blockMenu_MenuSprite_moveSelectionVertical__P188919_mk(s) {
+function blockMenu_MenuSprite_moveSelectionVertical__P3702_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_moveSelectionVertical__P188919, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_moveSelectionVertical__P3702, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42640,7 +42730,7 @@ function blockMenu_MenuSprite_moveSelectionVertical__P188919_mk(s) {
 
 
 
-function blockMenu_MenuSprite_previous__P188922(s) {
+function blockMenu_MenuSprite_previous__P3705(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42655,26 +42745,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1969; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1976; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_previous__P188922.info = {"start":4785,"length":81,"line":148,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"previous","argumentNames":["this"]}
+blockMenu_MenuSprite_previous__P3705.info = {"start":4785,"length":81,"line":148,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"previous","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_previous__P188922_mk(s) {
+function blockMenu_MenuSprite_previous__P3705_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_previous__P188922, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_previous__P3705, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42685,7 +42775,7 @@ function blockMenu_MenuSprite_previous__P188922_mk(s) {
 
 
 
-function blockMenu_MenuSprite_next__P188921(s) {
+function blockMenu_MenuSprite_next__P3704(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42700,26 +42790,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
-    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P188918_mk(s);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
+    s.tmp_0 = blockMenu_MenuSprite_setSelectedIndex__P3701_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1968; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1975; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_next__P188921.info = {"start":4698,"length":77,"line":144,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"next","argumentNames":["this"]}
+blockMenu_MenuSprite_next__P3704.info = {"start":4698,"length":77,"line":144,"column":8,"endLine":146,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"next","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_next__P188921_mk(s) {
+function blockMenu_MenuSprite_next__P3704_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_next__P188921, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_next__P3704, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42730,7 +42820,7 @@ function blockMenu_MenuSprite_next__P188921_mk(s) {
 
 
 
-function blockMenu_MenuSprite_selectedMenuOption__P188916(s) {
+function blockMenu_MenuSprite_selectedMenuOption__P3699(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42745,7 +42835,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -42784,12 +42874,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_selectedMenuOption__P188916.info = {"start":2026,"length":205,"line":64,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuOption","argumentNames":["this"]}
+blockMenu_MenuSprite_selectedMenuOption__P3699.info = {"start":2026,"length":205,"line":64,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuOption","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_selectedMenuOption__P188916_mk(s) {
+function blockMenu_MenuSprite_selectedMenuOption__P3699_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_selectedMenuOption__P188916, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_selectedMenuOption__P3699, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42808,7 +42898,7 @@ function blockMenu_MenuSprite_selectedMenuOption__P188916_mk(s) {
 
 
 
-function blockMenu_MenuSprite_selectedMenuIndex__P188917(s) {
+function blockMenu_MenuSprite_selectedMenuIndex__P3700(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42823,17 +42913,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["selectedIndex"];
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_selectedMenuIndex__P188917.info = {"start":2241,"length":78,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuIndex","argumentNames":["this"]}
+blockMenu_MenuSprite_selectedMenuIndex__P3700.info = {"start":2241,"length":78,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"selectedMenuIndex","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_selectedMenuIndex__P188917_mk(s) {
+function blockMenu_MenuSprite_selectedMenuIndex__P3700_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_selectedMenuIndex__P188917, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_selectedMenuIndex__P3700, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -42842,7 +42932,7 @@ function blockMenu_MenuSprite_selectedMenuIndex__P188917_mk(s) {
 
 
 
-function wait_for_select_and_close__P426848(s) {
+function wait_for_select_and_close__P88788(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42852,22 +42942,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals.selected_option___426850 = (false);
+    globals.selected_option___88790 = (false);
   case 1:
-    r0 = pxsim_numops_toBoolDecr(globals.selected_option___426850);
+    r0 = pxsim_numops_toBoolDecr(globals.selected_option___88790);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = pause__P185619_mk(s);
+    s.tmp_2 = pause__P402_mk(s);
     s.tmp_2.arg0 = 100;
     s.callLocIdx = 123; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     { step = 1; continue; }
   case 2:
-    s.tmp_0 = blockMenu_closeMenu__P188899_mk(s);
+    s.tmp_0 = blockMenu_closeMenu__P3682_mk(s);
     s.callLocIdx = 124; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
@@ -42875,12 +42965,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-wait_for_select_and_close__P426848.info = {"start":5222,"length":153,"line":131,"column":0,"endLine":137,"endColumn":1,"fileName":"main.ts","functionName":"wait_for_select_and_close","argumentNames":[]}
+wait_for_select_and_close__P88788.info = {"start":7948,"length":153,"line":199,"column":0,"endLine":205,"endColumn":1,"fileName":"main.ts","functionName":"wait_for_select_and_close","argumentNames":[]}
 
-function wait_for_select_and_close__P426848_mk(s) {
+function wait_for_select_and_close__P88788_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: wait_for_select_and_close__P426848, depth: s.depth + 1,
+        parent: s, fn: wait_for_select_and_close__P88788, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -42891,7 +42981,7 @@ function wait_for_select_and_close__P426848_mk(s) {
 
 
 
-function blockMenu_closeMenu__P188899(s) {
+function blockMenu_closeMenu__P3682(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42901,39 +42991,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___205116 = undefined;
-    s.tmp_0 = blockMenu__getState__P188939_mk(s);
-    s.callLocIdx = 1933; s.pc = 1; return s.tmp_0;
+    s.state___19954 = undefined;
+    s.tmp_0 = blockMenu__getState__P3722_mk(s);
+    s.callLocIdx = 1940; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___205116 = (r0);
-    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P188925_mk(s);
-    r0 = s.state___205116.fields["menu"];
+    s.state___19954 = (r0);
+    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P3708_mk(s);
+    r0 = s.state___19954.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 1934; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1941; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_closeMenu__P188899.info = {"start":1078,"length":109,"line":46,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"closeMenu","argumentNames":[]}
+blockMenu_closeMenu__P3682.info = {"start":1078,"length":109,"line":46,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"closeMenu","argumentNames":[]}
 
-function blockMenu_closeMenu__P188899_mk(s) {
+function blockMenu_closeMenu__P3682_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_closeMenu__P188899, depth: s.depth + 1,
+        parent: s, fn: blockMenu_closeMenu__P3682, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___205116: undefined,
+  state___19954: undefined,
 } }
 
 
 
 
 
-function blockMenu_MenuSprite_setMenuOpen__P188925(s) {
+function blockMenu_MenuSprite_setMenuOpen__P3708(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42949,18 +43039,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = (s.arg0).fields["open"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setMenuOpen__P188925.info = {"start":5169,"length":68,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setMenuOpen","argumentNames":["this","open"]}
+blockMenu_MenuSprite_setMenuOpen__P3708.info = {"start":5169,"length":68,"line":164,"column":8,"endLine":166,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setMenuOpen","argumentNames":["this","open"]}
 
-function blockMenu_MenuSprite_setMenuOpen__P188925_mk(s) {
+function blockMenu_MenuSprite_setMenuOpen__P3708_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setMenuOpen__P188925, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setMenuOpen__P3708, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -42970,7 +43060,7 @@ function blockMenu_MenuSprite_setMenuOpen__P188925_mk(s) {
 
 
 
-function blockMenu_showMenu__P188898(s) {
+function blockMenu_showMenu__P3681(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -42980,59 +43070,59 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___200307 = undefined;
+    s.state___14228 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = blockMenu__getState__P188939_mk(s);
-    s.callLocIdx = 1928; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = blockMenu__getState__P3722_mk(s);
+    s.callLocIdx = 1935; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___200307 = (r0);
-    s.tmp_0 = blockMenu_MenuSprite_setOptions__P188912_mk(s);
-    r0 = s.state___200307.fields["menu"];
+    s.state___14228 = (r0);
+    s.tmp_0 = blockMenu_MenuSprite_setOptions__P3695_mk(s);
+    r0 = s.state___14228.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1929; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1936; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_MenuSprite_setStyle__P188914_mk(s);
-    r0 = s.state___200307.fields["menu"];
+    s.tmp_0 = blockMenu_MenuSprite_setStyle__P3697_mk(s);
+    r0 = s.state___14228.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1930; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1937; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_MenuSprite_setLocation__P188915_mk(s);
-    r0 = s.state___200307.fields["menu"];
+    s.tmp_0 = blockMenu_MenuSprite_setLocation__P3698_mk(s);
+    r0 = s.state___14228.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1931; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1938; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P188925_mk(s);
-    r0 = s.state___200307.fields["menu"];
+    s.tmp_0 = blockMenu_MenuSprite_setMenuOpen__P3708_mk(s);
+    r0 = s.state___14228.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 1932; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1939; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_showMenu__P188898.info = {"start":720,"length":285,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"showMenu","argumentNames":["options","style","location"]}
+blockMenu_showMenu__P3681.info = {"start":720,"length":285,"line":35,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"showMenu","argumentNames":["options","style","location"]}
 
-function blockMenu_showMenu__P188898_mk(s) {
+function blockMenu_showMenu__P3681_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_showMenu__P188898, depth: s.depth + 1,
+        parent: s, fn: blockMenu_showMenu__P3681, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___200307: undefined,
+  state___14228: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -43042,7 +43132,7 @@ function blockMenu_showMenu__P188898_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setStyle__P188914(s) {
+function blockMenu_MenuSprite_setStyle__P3697(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43058,18 +43148,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = (s.arg0).fields["style"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setStyle__P188914.info = {"start":1761,"length":70,"line":54,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setStyle","argumentNames":["this","style"]}
+blockMenu_MenuSprite_setStyle__P3697.info = {"start":1761,"length":70,"line":54,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setStyle","argumentNames":["this","style"]}
 
-function blockMenu_MenuSprite_setStyle__P188914_mk(s) {
+function blockMenu_MenuSprite_setStyle__P3697_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setStyle__P188914, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setStyle__P3697, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -43079,7 +43169,7 @@ function blockMenu_MenuSprite_setStyle__P188914_mk(s) {
 
 
 
-function blockMenu_MenuSprite_setOptions__P188912(s) {
+function blockMenu_MenuSprite_setOptions__P3695(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43095,33 +43185,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_arraySlice__P185329_mk(s);
+    s.tmp_2 = helpers_arraySlice__P112_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 1944; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1951; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["options"] = (s.tmp_1);
     r0 = (s.arg0).fields["selectedIndex"] = (0);
-    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P191323_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_recreateLabels__P6107_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1945; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1952; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_setOptions__P188912.info = {"start":1148,"length":156,"line":41,"column":8,"endLine":45,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setOptions","argumentNames":["this","options"]}
+blockMenu_MenuSprite_setOptions__P3695.info = {"start":1148,"length":156,"line":41,"column":8,"endLine":45,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"setOptions","argumentNames":["this","options"]}
 
-function blockMenu_MenuSprite_setOptions__P188912_mk(s) {
+function blockMenu_MenuSprite_setOptions__P3695_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_setOptions__P188912, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_setOptions__P3695, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43134,7 +43224,7 @@ function blockMenu_MenuSprite_setOptions__P188912_mk(s) {
 
 
 
-function blockMenu_setColors__P188900(s) {
+function blockMenu_setColors__P3683(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43144,40 +43234,40 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___200348 = undefined;
+    s.state___14269 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = blockMenu__getState__P188939_mk(s);
-    s.callLocIdx = 1935; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = blockMenu__getState__P3722_mk(s);
+    s.callLocIdx = 1942; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___200348 = (r0);
-    s.tmp_0 = blockMenu_MenuSprite_setColors__P188913_mk(s);
-    r0 = s.state___200348.fields["menu"];
+    s.state___14269 = (r0);
+    s.tmp_0 = blockMenu_MenuSprite_setColors__P3696_mk(s);
+    r0 = s.state___14269.fields["menu"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg1;
     s.tmp_0.arg4 = s.arg0;
-    s.callLocIdx = 1936; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1943; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_setColors__P188900.info = {"start":1443,"length":186,"line":57,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"setColors","argumentNames":["foreground","background"]}
+blockMenu_setColors__P3683.info = {"start":1443,"length":186,"line":57,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"setColors","argumentNames":["foreground","background"]}
 
-function blockMenu_setColors__P188900_mk(s) {
+function blockMenu_setColors__P3683_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_setColors__P188900, depth: s.depth + 1,
+        parent: s, fn: blockMenu_setColors__P3683, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___200348: undefined,
+  state___14269: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -43186,7 +43276,7 @@ function blockMenu_setColors__P188900_mk(s) {
 
 
 
-function fade_out__P426843(s) {
+function fade_out__P88783(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43196,14 +43286,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = color_startFade__P188787_mk(s);
-    s.tmp_0.arg0 = globals.Black___188802;
-    s.tmp_0.arg1 = globals.originalPalette___188791;
+    s.tmp_0 = color_startFade__P3570_mk(s);
+    s.tmp_0.arg0 = globals.Black___3585;
+    s.tmp_0.arg1 = globals.originalPalette___3574;
     s.tmp_0.arg2 = 2000;
     s.callLocIdx = 121; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = color_pauseUntilFadeDone__P188789_mk(s);
+    s.tmp_0 = color_pauseUntilFadeDone__P3572_mk(s);
     s.callLocIdx = 122; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
@@ -43211,12 +43301,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-fade_out__P426843.info = {"start":5104,"length":117,"line":127,"column":0,"endLine":130,"endColumn":1,"fileName":"main.ts","functionName":"fade_out","argumentNames":[]}
+fade_out__P88783.info = {"start":7830,"length":117,"line":195,"column":0,"endLine":198,"endColumn":1,"fileName":"main.ts","functionName":"fade_out","argumentNames":[]}
 
-function fade_out__P426843_mk(s) {
+function fade_out__P88783_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: fade_out__P426843, depth: s.depth + 1,
+        parent: s, fn: fade_out__P88783, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -43225,7 +43315,7 @@ function fade_out__P426843_mk(s) {
 
 
 
-function tiles_createTilemap__P187557(s) {
+function tiles_createTilemap__P2340(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43242,27 +43332,27 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMapData__C187521_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMapData__C2304_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = tiles_TileMapData_constructor__P187522_mk(s);
+    s.tmp_1 = tiles_TileMapData_constructor__P2305_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
     s.tmp_1.arg3 = s.arg2;
     s.tmp_1.arg4 = s.arg3;
-    s.callLocIdx = 968; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 975; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_createTilemap__P187557.info = {"start":14038,"length":170,"line":456,"column":4,"endLine":458,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"createTilemap","argumentNames":["data","layer","tiles","scale"]}
+tiles_createTilemap__P2340.info = {"start":14038,"length":170,"line":456,"column":4,"endLine":458,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"createTilemap","argumentNames":["data","layer","tiles","scale"]}
 
-function tiles_createTilemap__P187557_mk(s) {
+function tiles_createTilemap__P2340_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_createTilemap__P187557, depth: s.depth + 1,
+        parent: s, fn: tiles_createTilemap__P2340, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43276,7 +43366,7 @@ function tiles_createTilemap__P187557_mk(s) {
 
 
 
-function tiles_TileMapData_constructor__P187522(s) {
+function tiles_TileMapData_constructor__P2305(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43295,14 +43385,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_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__P187526_mk(s);
+    s.tmp_0 = tiles_TileMapData_scale__P2309_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg4;
-    s.callLocIdx = 878; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 885; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
@@ -43317,12 +43407,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_constructor__P187522.info = {"start":3293,"length":358,"line":125,"column":8,"endLine":133,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","data","layers","tileset","scale"]}
+tiles_TileMapData_constructor__P2305.info = {"start":3293,"length":358,"line":125,"column":8,"endLine":133,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","data","layers","tileset","scale"]}
 
-function tiles_TileMapData_constructor__P187522_mk(s) {
+function tiles_TileMapData_constructor__P2305_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_constructor__P187522, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_constructor__P2305, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43337,7 +43427,7 @@ function tiles_TileMapData_constructor__P187522_mk(s) {
 
 
 
-function tiles_TileMapData_scale__P187526(s) {
+function tiles_TileMapData_scale__P2309(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43353,7 +43443,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_scale"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
@@ -43363,12 +43453,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_scale__P187526.info = {"start":3885,"length":102,"line":147,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
+tiles_TileMapData_scale__P2309.info = {"start":3885,"length":102,"line":147,"column":8,"endLine":150,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
 
-function tiles_TileMapData_scale__P187526_mk(s) {
+function tiles_TileMapData_scale__P2309_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_scale__P187526, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_scale__P2309, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43380,7 +43470,7 @@ function tiles_TileMapData_scale__P187526_mk(s) {
 
 
 
-function tiles_setTilemap__P187558(s) {
+function tiles_setTilemap__P2341(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43394,21 +43484,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_setTileMapLevel__P187679_mk(s);
+    s.tmp_0 = scene_setTileMapLevel__P2462_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 969; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 976; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_setTilemap__P187558.info = {"start":14603,"length":96,"line":468,"column":4,"endLine":470,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTilemap","argumentNames":["tilemap"]}
+tiles_setTilemap__P2341.info = {"start":14603,"length":96,"line":468,"column":4,"endLine":470,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setTilemap","argumentNames":["tilemap"]}
 
-function tiles_setTilemap__P187558_mk(s) {
+function tiles_setTilemap__P2341_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_setTilemap__P187558, depth: s.depth + 1,
+        parent: s, fn: tiles_setTilemap__P2341, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43418,7 +43508,7 @@ function tiles_setTilemap__P187558_mk(s) {
 
 
 
-function scene_setTileMapLevel__P187679(s) {
+function scene_setTileMapLevel__P2462(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43428,17 +43518,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___200925 = undefined;
+    s.scene___16080 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1053; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1060; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.scene___200925 = (r0);
-    r0 = s.scene___200925.fields["tileMap"];
+    s.scene___16080 = (r0);
+    r0 = s.scene___16080.fields["tileMap"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -43446,49 +43536,49 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMap__C187534_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_TileMap__C2317_VT);
     s.tmp_3 = r0;
-    s.tmp_4 = tiles_TileMap_constructor__P187535_mk(s);
+    s.tmp_4 = tiles_TileMap_constructor__P2318_mk(s);
     s.tmp_4.arg0 = s.tmp_3;
     s.tmp_4.arg1 = 4;
-    s.callLocIdx = 1054; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 1061; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
-    r0 = (s.scene___200925).fields["tileMap"] = (s.tmp_3);
+    r0 = (s.scene___16080).fields["tileMap"] = (s.tmp_3);
   case 1:
   case 2:
-    s.tmp_0 = tiles_TileMap_setData__P187545_mk(s);
-    r0 = s.scene___200925.fields["tileMap"];
+    s.tmp_0 = tiles_TileMap_setData__P2328_mk(s);
+    r0 = s.scene___16080.fields["tileMap"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1055; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1062; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = tiles_TileMap_scale__P187537_mk(s);
-    r0 = s.scene___200925.fields["tileMap"];
+    s.tmp_0 = tiles_TileMap_scale__P2320_mk(s);
+    r0 = s.scene___16080.fields["tileMap"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["_scale"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1057; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1064; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setTileMapLevel__P187679.info = {"start":2994,"length":260,"line":113,"column":4,"endLine":119,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setTileMapLevel","argumentNames":["map"]}
+scene_setTileMapLevel__P2462.info = {"start":2994,"length":260,"line":113,"column":4,"endLine":119,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setTileMapLevel","argumentNames":["map"]}
 
-function scene_setTileMapLevel__P187679_mk(s) {
+function scene_setTileMapLevel__P2462_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setTileMapLevel__P187679, depth: s.depth + 1,
+        parent: s, fn: scene_setTileMapLevel__P2462, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  scene___200925: undefined,
+  scene___16080: undefined,
   arg0: undefined,
 } }
 
@@ -43496,7 +43586,7 @@ function scene_setTileMapLevel__P187679_mk(s) {
 
 
 
-function tiles_TileMap_setData__P187545(s) {
+function tiles_TileMap_setData__P2328(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43512,18 +43602,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_map"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_setData__P187545.info = {"start":7183,"length":66,"line":265,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setData","argumentNames":["this","map"]}
+tiles_TileMap_setData__P2328.info = {"start":7183,"length":66,"line":265,"column":8,"endLine":267,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setData","argumentNames":["this","map"]}
 
-function tiles_TileMap_setData__P187545_mk(s) {
+function tiles_TileMap_setData__P2328_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_setData__P187545, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_setData__P2328, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -43533,7 +43623,7 @@ function tiles_TileMap_setData__P187545_mk(s) {
 
 
 
-function tiles_TileMap_scale__P187537(s) {
+function tiles_TileMap_scale__P2320(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43549,17 +43639,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_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__P187526_mk(s);
+    s.tmp_1 = tiles_TileMapData_scale__P2309_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
-    s.callLocIdx = 889; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 896; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
   case 1:
@@ -43568,12 +43658,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_scale__P187537.info = {"start":6190,"length":144,"line":224,"column":8,"endLine":229,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
+tiles_TileMap_scale__P2320.info = {"start":6190,"length":144,"line":224,"column":8,"endLine":229,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"scale","argumentNames":["this","s"]}
 
-function tiles_TileMap_scale__P187537_mk(s) {
+function tiles_TileMap_scale__P2320_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_scale__P187537, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_scale__P2320, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43585,7 +43675,7 @@ function tiles_TileMap_scale__P187537_mk(s) {
 
 
 
-function tiles_TileMap_constructor__P187535(s) {
+function tiles_TileMap_constructor__P2318(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43601,34 +43691,34 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_layer"] = (1);
-    s.tmp_0 = tiles_TileMap_scale__P187537_mk(s);
+    s.tmp_0 = tiles_TileMap_scale__P2320_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 886; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 893; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P200971);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P16126);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = scene_createRenderable__P187600_mk(s);
+    s.tmp_1 = scene_createRenderable__P2383_mk(s);
     s.tmp_1.arg0 = -1;
     s.tmp_1.arg1 = s.tmp_0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 888; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 895; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_constructor__P187535.info = {"start":5865,"length":250,"line":210,"column":8,"endLine":218,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","scale"]}
+tiles_TileMap_constructor__P2318.info = {"start":5865,"length":250,"line":210,"column":8,"endLine":218,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["this","scale"]}
 
-function tiles_TileMap_constructor__P187535_mk(s) {
+function tiles_TileMap_constructor__P2318_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_constructor__P187535, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_constructor__P2318, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43640,7 +43730,7 @@ function tiles_TileMap_constructor__P187535_mk(s) {
 
 
 
-function inline__P200971(s) {
+function inline__P16126(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43655,23 +43745,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = tiles_TileMap_draw__P189510_mk(s);
+    s.tmp_0 = tiles_TileMap_draw__P4294_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg1;
-    s.callLocIdx = 887; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 894; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P200971.info = {"start":6065,"length":25,"line":216,"column":16,"endLine":216,"endColumn":41,"fileName":"pxt_modules/game/tilemap.ts","functionName":"inline","argumentNames":["t","c"]}
+inline__P16126.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__P200971_mk(s) {
+function inline__P16126_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P200971, depth: s.depth + 1,
+        parent: s, fn: inline__P16126, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -43682,7 +43772,7 @@ function inline__P200971_mk(s) {
 
 
 
-function tiles_TileMap_draw__P189510(s) {
+function tiles_TileMap_draw__P4294(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -43692,21 +43782,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bitmask___200982 = undefined;
-    s.offsetX___200988 = undefined;
-    s.offsetY___200993 = undefined;
-    s.x0___200998 = undefined;
-    s.xn___201005 = undefined;
-    s.y0___201022 = undefined;
-    s.yn___201029 = undefined;
-    s.x___201046 = undefined;
-    s.y___201052 = undefined;
-    s.index___201058 = undefined;
-    s.tile___201065 = undefined;
-    s.x___201101 = undefined;
-    s.xLine___201107 = undefined;
-    s.y___201133 = undefined;
-    s.yLine___201139 = undefined;
+    s.bitmask___16137 = undefined;
+    s.offsetX___16143 = undefined;
+    s.offsetY___16148 = undefined;
+    s.x0___16153 = undefined;
+    s.xn___16160 = undefined;
+    s.y0___16177 = undefined;
+    s.yn___16184 = undefined;
+    s.x___16201 = undefined;
+    s.y___16207 = undefined;
+    s.index___16213 = undefined;
+    s.tile___16220 = undefined;
+    s.x___16256 = undefined;
+    s.xLine___16262 = undefined;
+    s.y___16288 = undefined;
+    s.yLine___16294 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -43714,7 +43804,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = s.arg0.fields["_map"];
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
@@ -43739,16 +43829,16 @@ switch (step) {
     r0 = (1 << s.tmp_8);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 - 1);
-    s.bitmask___200982 = (r0);
+    s.bitmask___16137 = (r0);
     r0 = s.arg2.fields["drawOffsetX"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 & s.bitmask___200982);
-    s.offsetX___200988 = (r0);
+    r0 = (s.tmp_0 & s.bitmask___16137);
+    s.offsetX___16143 = (r0);
     r0 = s.arg2.fields["drawOffsetY"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 & s.bitmask___200982);
-    s.offsetY___200993 = (r0);
-    s.tmp_0 = Math_max__P185342_mk(s);
+    r0 = (s.tmp_0 & s.bitmask___16137);
+    s.offsetY___16148 = (r0);
+    s.tmp_0 = Math_max__P125_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg2.fields["drawOffsetX"];
     s.tmp_1 = r0;
@@ -43756,11 +43846,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 >> s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 926; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 933; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
-    s.x0___200998 = (r0);
-    s.tmp_0 = Math_min__P185343_mk(s);
+    s.x0___16153 = (r0);
+    s.tmp_0 = Math_min__P126_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_width"];
@@ -43777,11 +43867,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 929; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 936; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.xn___201005 = (r0);
-    s.tmp_0 = Math_max__P185342_mk(s);
+    s.xn___16160 = (r0);
+    s.tmp_0 = Math_max__P125_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg2.fields["drawOffsetY"];
     s.tmp_1 = r0;
@@ -43789,11 +43879,11 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_1 >> s.tmp_2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 931; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 938; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
-    s.y0___201022 = (r0);
-    s.tmp_0 = Math_min__P185343_mk(s);
+    s.y0___16177 = (r0);
+    s.tmp_0 = Math_min__P126_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_height"];
@@ -43810,95 +43900,95 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 934; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 941; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.yn___201029 = (r0);
-    s.x___201046 = (s.x0___200998);
+    s.yn___16184 = (r0);
+    s.x___16201 = (s.x0___16153);
   case 3:
-    r0 = (s.x___201046 <= s.xn___201005);
+    r0 = (s.x___16201 <= s.xn___16160);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.y___201052 = (s.y0___201022);
+    s.y___16207 = (s.y0___16177);
   case 4:
-    r0 = (s.y___201052 <= s.yn___201029);
+    r0 = (s.y___16207 <= s.yn___16184);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = tiles_TileMapData_getTile__P187527_mk(s);
+    s.tmp_1 = tiles_TileMapData_getTile__P2310_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.x___201046;
-    s.tmp_1.arg2 = s.y___201052;
-    s.callLocIdx = 935; s.pc = 28; return s.tmp_1;
+    s.tmp_1.arg1 = s.x___16201;
+    s.tmp_1.arg2 = s.y___16207;
+    s.callLocIdx = 942; s.pc = 28; return s.tmp_1;
   case 28:
     r0 = s.retval;
-    s.index___201058 = (r0);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P187530_mk(s);
+    s.index___16213 = (r0);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P2313_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___201058;
-    s.callLocIdx = 936; s.pc = 29; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___16213;
+    s.callLocIdx = 943; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
-    s.tile___201065 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tile___201065);
+    s.tile___16220 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tile___16220);
     if (!r0) { step = 5; continue; }
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_1 = r0 = s.tile___201065;
-    r0 = (s.x___201046 - s.x0___200998);
+    s.tmp_1 = r0 = s.tile___16220;
+    r0 = (s.x___16201 - s.x0___16153);
     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___200988);
+    r0 = (s.tmp_3 - s.offsetX___16143);
     s.tmp_2 = r0;
-    r0 = (s.y___201052 - s.y0___201022);
+    r0 = (s.y___16207 - s.y0___16177);
     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___200993);
+    r0 = (s.tmp_7 - s.offsetY___16148);
     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___201052 + 1);
-    s.y___201052 = (r0);
+    r0 = (s.y___16207 + 1);
+    s.y___16207 = (r0);
     { step = 4; continue; }
   case 7:
-    r0 = (s.x___201046 + 1);
-    s.x___201046 = (r0);
+    r0 = (s.x___16201 + 1);
+    s.x___16201 = (r0);
     { step = 3; continue; }
   case 8:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___187745);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___2528);
     if (!r0) { step = 21; continue; }
-    s.x___201101 = (s.x0___200998);
+    s.x___16256 = (s.x0___16153);
   case 9:
-    r0 = (s.x___201101 <= s.xn___201005);
+    r0 = (s.x___16256 <= s.xn___16160);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.x___201101 - s.x0___200998);
+    r0 = (s.x___16256 - s.x0___16153);
     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___200988);
-    s.xLine___201107 = (r0);
-    r0 = (s.xLine___201107 >= 0);
+    r0 = (s.tmp_1 - s.offsetX___16143);
+    s.xLine___16262 = (r0);
+    r0 = (s.xLine___16262 >= 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___201107;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    s.tmp_1 = r0 = s.xLine___16262;
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
   case 11:
@@ -43906,46 +43996,46 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 12; continue; }
-    s.tmp_4 = helpers_imageDrawLine__P186947_mk(s);
+    s.tmp_4 = helpers_imageDrawLine__P1730_mk(s);
     s.tmp_4.arg0 = s.arg1;
-    s.tmp_4.arg1 = s.xLine___201107;
+    s.tmp_4.arg1 = s.xLine___16262;
     s.tmp_4.arg2 = 0;
-    s.tmp_4.arg3 = s.xLine___201107;
+    s.tmp_4.arg3 = s.xLine___16262;
     r0 = pxsim_ImageMethods.height(s.arg1);
     s.tmp_4.arg4 = r0;
     s.tmp_4.arg5 = 1;
-    s.callLocIdx = 940; s.pc = 30; return s.tmp_4;
+    s.callLocIdx = 947; s.pc = 30; return s.tmp_4;
   case 30:
     r0 = s.retval;
   case 12:
   case 13:
-    r0 = (s.x___201101 + 1);
-    s.x___201101 = (r0);
+    r0 = (s.x___16256 + 1);
+    s.x___16256 = (r0);
     { step = 9; continue; }
   case 14:
-    s.y___201133 = (s.y0___201022);
+    s.y___16288 = (s.y0___16177);
   case 15:
-    r0 = (s.y___201133 <= s.yn___201029);
+    r0 = (s.y___16288 <= s.yn___16184);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
-    r0 = (s.y___201133 - s.y0___201022);
+    r0 = (s.y___16288 - s.y0___16177);
     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___200993);
-    s.yLine___201139 = (r0);
-    r0 = (s.yLine___201139 >= 0);
+    r0 = (s.tmp_1 - s.offsetY___16148);
+    s.yLine___16294 = (r0);
+    r0 = (s.yLine___16294 >= 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___201139;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    s.tmp_1 = r0 = s.yLine___16294;
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 <= s.tmp_2);
   case 17:
@@ -43953,21 +44043,21 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 18; continue; }
-    s.tmp_4 = helpers_imageDrawLine__P186947_mk(s);
+    s.tmp_4 = helpers_imageDrawLine__P1730_mk(s);
     s.tmp_4.arg0 = s.arg1;
     s.tmp_4.arg1 = 0;
-    s.tmp_4.arg2 = s.yLine___201139;
+    s.tmp_4.arg2 = s.yLine___16294;
     r0 = pxsim_ImageMethods.width(s.arg1);
     s.tmp_4.arg3 = r0;
-    s.tmp_4.arg4 = s.yLine___201139;
+    s.tmp_4.arg4 = s.yLine___16294;
     s.tmp_4.arg5 = 1;
-    s.callLocIdx = 942; s.pc = 31; return s.tmp_4;
+    s.callLocIdx = 949; s.pc = 31; return s.tmp_4;
   case 31:
     r0 = s.retval;
   case 18:
   case 19:
-    r0 = (s.y___201133 + 1);
-    s.y___201133 = (r0);
+    r0 = (s.y___16288 + 1);
+    s.y___16288 = (r0);
     { step = 15; continue; }
   case 20:
   case 21:
@@ -43977,12 +44067,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_draw__P189510.info = {"start":10187,"length":2224,"line":347,"column":8,"endLine":402,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"draw","argumentNames":["this","target","camera"]}
+tiles_TileMap_draw__P4294.info = {"start":10187,"length":2224,"line":347,"column":8,"endLine":402,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"draw","argumentNames":["this","target","camera"]}
 
-function tiles_TileMap_draw__P189510_mk(s) {
+function tiles_TileMap_draw__P4294_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_draw__P189510, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_draw__P4294, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -43994,21 +44084,21 @@ function tiles_TileMap_draw__P189510_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  bitmask___200982: undefined,
-  offsetX___200988: undefined,
-  offsetY___200993: undefined,
-  x0___200998: undefined,
-  xn___201005: undefined,
-  y0___201022: undefined,
-  yn___201029: undefined,
-  x___201046: undefined,
-  y___201052: undefined,
-  index___201058: undefined,
-  tile___201065: undefined,
-  x___201101: undefined,
-  xLine___201107: undefined,
-  y___201133: undefined,
-  yLine___201139: undefined,
+  bitmask___16137: undefined,
+  offsetX___16143: undefined,
+  offsetY___16148: undefined,
+  x0___16153: undefined,
+  xn___16160: undefined,
+  y0___16177: undefined,
+  yn___16184: undefined,
+  x___16201: undefined,
+  y___16207: undefined,
+  index___16213: undefined,
+  tile___16220: undefined,
+  x___16256: undefined,
+  xLine___16262: undefined,
+  y___16288: undefined,
+  yLine___16294: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -44018,7 +44108,7 @@ function tiles_TileMap_draw__P189510_mk(s) {
 
 
 
-function scene_setBackgroundImage__P187676(s) {
+function scene_setBackgroundImage__P2459(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44028,36 +44118,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___200359 = undefined;
+    s.scene___14280 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1049; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1056; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___200359 = (r0);
-    s.tmp_0 = scene_Background_image__P187489_mk(s);
-    r0 = s.scene___200359.fields["background"];
+    s.scene___14280 = (r0);
+    s.tmp_0 = scene_Background_image__P2272_mk(s);
+    r0 = s.scene___14280.fields["background"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1050; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1057; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setBackgroundImage__P187676.info = {"start":1938,"length":135,"line":78,"column":4,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setBackgroundImage","argumentNames":["img"]}
+scene_setBackgroundImage__P2459.info = {"start":1938,"length":135,"line":78,"column":4,"endLine":81,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setBackgroundImage","argumentNames":["img"]}
 
-function scene_setBackgroundImage__P187676_mk(s) {
+function scene_setBackgroundImage__P2459_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setBackgroundImage__P187676, depth: s.depth + 1,
+        parent: s, fn: scene_setBackgroundImage__P2459, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___200359: undefined,
+  scene___14280: undefined,
   arg0: undefined,
 } }
 
@@ -44065,7 +44155,7 @@ function scene_setBackgroundImage__P187676_mk(s) {
 
 
 
-function scene_Background_image__P187489(s) {
+function scene_Background_image__P2272(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44081,18 +44171,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C187482_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_image"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_image__P187489.info = {"start":1003,"length":68,"line":40,"column":8,"endLine":42,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"image","argumentNames":["this","image"]}
+scene_Background_image__P2272.info = {"start":1003,"length":68,"line":40,"column":8,"endLine":42,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"image","argumentNames":["this","image"]}
 
-function scene_Background_image__P187489_mk(s) {
+function scene_Background_image__P2272_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_image__P187489, depth: s.depth + 1,
+        parent: s, fn: scene_Background_image__P2272, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -44102,7 +44192,7 @@ function scene_Background_image__P187489_mk(s) {
 
 
 
-function scene_Background_image__P187488(s) {
+function scene_Background_image__P2271(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44117,7 +44207,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C187482_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -44127,9 +44217,9 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     s.tmp_3 = r0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_5 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_6 = r0;
     r0 = pxsim.image.create(s.tmp_5, s.tmp_6);
     s.tmp_4 = r0;
@@ -44140,13 +44230,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Background_image__P187488.info = {"start":811,"length":174,"line":33,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"image","argumentNames":["this"]}
-scene_Background_image__P187488.isGetter = true;
+scene_Background_image__P2271.info = {"start":811,"length":174,"line":33,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"image","argumentNames":["this"]}
+scene_Background_image__P2271.isGetter = true;
 
-function scene_Background_image__P187488_mk(s) {
+function scene_Background_image__P2271_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_image__P187488, depth: s.depth + 1,
+        parent: s, fn: scene_Background_image__P2271, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44162,7 +44252,7 @@ function scene_Background_image__P187488_mk(s) {
 
 
 
-function scene_setBackgroundColor__P187674(s) {
+function scene_setBackgroundColor__P2457(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44172,32 +44262,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___201166 = undefined;
+    s.scene___16321 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1048; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1055; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___201166 = (r0);
-    r0 = s.scene___201166.fields["background"];
+    s.scene___16321 = (r0);
+    r0 = s.scene___16321.fields["background"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["color"] = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setBackgroundColor__P187674.info = {"start":1207,"length":140,"line":53,"column":4,"endLine":56,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"setBackgroundColor","argumentNames":["color"]}
+scene_setBackgroundColor__P2457.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__P187674_mk(s) {
+function scene_setBackgroundColor__P2457_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setBackgroundColor__P187674, depth: s.depth + 1,
+        parent: s, fn: scene_setBackgroundColor__P2457, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___201166: undefined,
+  scene___16321: undefined,
   arg0: undefined,
 } }
 
@@ -44205,7 +44295,7 @@ function scene_setBackgroundColor__P187674_mk(s) {
 
 
 
-function blockSettings_readNumber__P188967(s) {
+function blockSettings_readNumber__P3750(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44219,20 +44309,20 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = settings_readNumber__P187050_mk(s);
+    s.tmp_0 = settings_readNumber__P1833_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 75; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 2094; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-blockSettings_readNumber__P188967.info = {"start":752,"length":90,"line":23,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"readNumber","argumentNames":["name"]}
+blockSettings_readNumber__P3750.info = {"start":752,"length":90,"line":23,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"readNumber","argumentNames":["name"]}
 
-function blockSettings_readNumber__P188967_mk(s) {
+function blockSettings_readNumber__P3750_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockSettings_readNumber__P188967, depth: s.depth + 1,
+        parent: s, fn: blockSettings_readNumber__P3750, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -44242,7 +44332,7 @@ function blockSettings_readNumber__P188967_mk(s) {
 
 
 
-function settings_readNumber__P187050(s) {
+function settings_readNumber__P1833(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44252,15 +44342,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___203645 = undefined;
-    s.nums___203652 = undefined;
+    s.buf___14310 = undefined;
+    s.nums___14317 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim.settings._get(s.arg0);
-    s.buf___203645 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.buf___203645);
+    s.buf___14310 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.buf___14310);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -44270,20 +44360,20 @@ switch (step) {
     { step = 7; continue; }
     { step = 6; continue; }
   case 1:
-    s.tmp_2 = msgpack_unpackNumberArray__P185393_mk(s);
-    s.tmp_2.arg0 = s.buf___203645;
+    s.tmp_2 = msgpack_unpackNumberArray__P176_mk(s);
+    s.tmp_2.arg0 = s.buf___14310;
     s.tmp_2.arg1 = 0;
     s.callLocIdx = 168; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
-    s.nums___203652 = (r0);
-    s.tmp_0 = r0 = s.nums___203652;
+    s.nums___14317 = (r0);
+    s.tmp_0 = r0 = s.nums___14317;
     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___203652);
+    r0 = pxsim_Array__length(s.nums___14317);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >= 1);
   case 3:
@@ -44291,7 +44381,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___203652, 0);
+    r0 = pxsim_Array__getAt(s.nums___14317, 0);
     { step = 7; continue; }
   case 4:
   case 5:
@@ -44303,18 +44393,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readNumber__P187050.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__P1833.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__P187050_mk(s) {
+function settings_readNumber__P1833_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readNumber__P187050, depth: s.depth + 1,
+        parent: s, fn: settings_readNumber__P1833, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  buf___203645: undefined,
-  nums___203652: undefined,
+  buf___14310: undefined,
+  nums___14317: undefined,
   arg0: undefined,
 } }
 
@@ -44322,7 +44412,7 @@ function settings_readNumber__P187050_mk(s) {
 
 
 
-function settings_readBuffer__P187048(s) {
+function settings_readBuffer__P1831(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44340,12 +44430,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readBuffer__P187048.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__P1831.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__P187048_mk(s) {
+function settings_readBuffer__P1831_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readBuffer__P187048, depth: s.depth + 1,
+        parent: s, fn: settings_readBuffer__P1831, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -44354,7 +44444,7 @@ function settings_readBuffer__P187048_mk(s) {
 
 
 
-function msgpack_unpackNumberArray__P185393(s) {
+function msgpack_unpackNumberArray__P176(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44364,16 +44454,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___203665 = undefined;
-    s.fmt___203672 = undefined;
-    s.v___203681 = undefined;
+    s.res___14330 = undefined;
+    s.fmt___14337 = undefined;
+    s.v___14346 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___203665 = (r0);
+    s.res___14330 = (r0);
   case 1:
     s.tmp_1 = r0 = s.arg1;
     r0 = pxsim.BufferMethods.length(s.arg0);
@@ -44385,14 +44475,14 @@ switch (step) {
     s.tmp_3 = r0 = s.arg1;
     r0 = (s.tmp_3 + 1);
     s.arg1 = (r0);
-    s.tmp_4 = msgpack_tagFormat__P189188_mk(s);
+    s.tmp_4 = msgpack_tagFormat__P3972_mk(s);
     r0 = pxsim.BufferMethods.getByte(s.arg0, s.tmp_3);
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 21; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
-    s.fmt___203672 = (r0);
-    r0 = (s.fmt___203672 === null);
+    s.fmt___14337 = (r0);
+    r0 = (s.fmt___14337 === null);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
@@ -44400,21 +44490,21 @@ switch (step) {
     r0 = (s.arg1 - 1);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_1, 6, s.tmp_2);
-    s.v___203681 = (r0);
-    r0 = (-31 <= s.v___203681);
+    s.v___14346 = (r0);
+    r0 = (-31 <= s.v___14346);
     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___203681 <= 127);
+    r0 = (s.v___14346 <= 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___203665, s.v___203681);
+    r0 = pxsim_Array__push(s.res___14330, s.v___14346);
     { step = 5; continue; }
   case 4:
     r0 = null;
@@ -44422,13 +44512,13 @@ switch (step) {
   case 5:
     { step = 7; continue; }
   case 6:
-    s.tmp_0 = r0 = s.res___203665;
-    r0 = pxsim.BufferMethods.getNumber(s.arg0, s.fmt___203672, s.arg1);
+    s.tmp_0 = r0 = s.res___14330;
+    r0 = pxsim.BufferMethods.getNumber(s.arg0, s.fmt___14337, 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__P185385_mk(s);
-    s.tmp_2.arg0 = s.fmt___203672;
+    s.tmp_2 = pins_sizeOf__P168_mk(s);
+    s.tmp_2.arg0 = s.fmt___14337;
     s.callLocIdx = 22; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
@@ -44449,26 +44539,26 @@ switch (step) {
   case 9:
     { step = 1; continue; }
   case 10:
-    r0 = s.res___203665;
+    r0 = s.res___14330;
   case 11:
     return leave(s, r0)
   default: oops()
 } } }
-msgpack_unpackNumberArray__P185393.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__P176.info = {"start":2650,"length":669,"line":91,"column":4,"endLine":111,"endColumn":5,"fileName":"pxt_modules/base/buffer.ts","functionName":"unpackNumberArray","argumentNames":["buf","offset"]}
 
-function msgpack_unpackNumberArray__P185393_mk(s) {
+function msgpack_unpackNumberArray__P176_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: msgpack_unpackNumberArray__P185393, depth: s.depth + 1,
+        parent: s, fn: msgpack_unpackNumberArray__P176, 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___203665: undefined,
-  fmt___203672: undefined,
-  v___203681: undefined,
+  res___14330: undefined,
+  fmt___14337: undefined,
+  v___14346: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -44477,7 +44567,7 @@ function msgpack_unpackNumberArray__P185393_mk(s) {
 
 
 
-function blockSettings_exists__P188973(s) {
+function blockSettings_exists__P3756(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44495,12 +44585,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockSettings_exists__P188973.info = {"start":2896,"length":82,"line":95,"column":4,"endLine":97,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"exists","argumentNames":["name"]}
+blockSettings_exists__P3756.info = {"start":2896,"length":82,"line":95,"column":4,"endLine":97,"endColumn":5,"fileName":"pxt_modules/settings-blocks/main.ts","functionName":"exists","argumentNames":["name"]}
 
-function blockSettings_exists__P188973_mk(s) {
+function blockSettings_exists__P3756_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockSettings_exists__P188973, depth: s.depth + 1,
+        parent: s, fn: blockSettings_exists__P3756, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -44509,7 +44599,7 @@ function blockSettings_exists__P188973_mk(s) {
 
 
 
-function settings_exists__P187054(s) {
+function settings_exists__P1837(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44527,12 +44617,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_exists__P187054.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__P1837.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__P187054_mk(s) {
+function settings_exists__P1837_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_exists__P187054, depth: s.depth + 1,
+        parent: s, fn: settings_exists__P1837, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -44541,7 +44631,7 @@ function settings_exists__P187054_mk(s) {
 
 
 
-function scene_cameraFollowSprite__P187681(s) {
+function scene_cameraFollowSprite__P2464(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44551,32 +44641,32 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___200787 = undefined;
+    s.scene___15942 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1058; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1065; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___200787 = (r0);
-    r0 = s.scene___200787.fields["camera"];
+    s.scene___15942 = (r0);
+    r0 = s.scene___15942.fields["camera"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0).fields["sprite"] = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_cameraFollowSprite__P187681.info = {"start":3990,"length":139,"line":142,"column":4,"endLine":145,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"cameraFollowSprite","argumentNames":["sprite"]}
+scene_cameraFollowSprite__P2464.info = {"start":3990,"length":139,"line":142,"column":4,"endLine":145,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"cameraFollowSprite","argumentNames":["sprite"]}
 
-function scene_cameraFollowSprite__P187681_mk(s) {
+function scene_cameraFollowSprite__P2464_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_cameraFollowSprite__P187681, depth: s.depth + 1,
+        parent: s, fn: scene_cameraFollowSprite__P2464, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___200787: undefined,
+  scene___15942: undefined,
   arg0: undefined,
 } }
 
@@ -44584,7 +44674,7 @@ function scene_cameraFollowSprite__P187681_mk(s) {
 
 
 
-function blockMenu_onMenuOptionSelected__P188904(s) {
+function blockMenu_onMenuOptionSelected__P3687(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44594,35 +44684,35 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___200386 = undefined;
+    s.state___14399 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = blockMenu__getState__P188939_mk(s);
-    s.callLocIdx = 1939; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = blockMenu__getState__P3722_mk(s);
+    s.callLocIdx = 1946; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.state___200386 = (r0);
-    s.tmp_0 = blockMenu__BlockMenuState_addHandler__P188935_mk(s);
-    s.tmp_0.arg0 = s.state___200386;
+    s.state___14399 = (r0);
+    s.tmp_0 = blockMenu__BlockMenuState_addHandler__P3718_mk(s);
+    s.tmp_0.arg0 = s.state___14399;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1940; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1947; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_onMenuOptionSelected__P188904.info = {"start":2427,"length":164,"line":86,"column":4,"endLine":89,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"onMenuOptionSelected","argumentNames":["handler"]}
+blockMenu_onMenuOptionSelected__P3687.info = {"start":2427,"length":164,"line":86,"column":4,"endLine":89,"endColumn":5,"fileName":"pxt_modules/block-menu/api.ts","functionName":"onMenuOptionSelected","argumentNames":["handler"]}
 
-function blockMenu_onMenuOptionSelected__P188904_mk(s) {
+function blockMenu_onMenuOptionSelected__P3687_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_onMenuOptionSelected__P188904, depth: s.depth + 1,
+        parent: s, fn: blockMenu_onMenuOptionSelected__P3687, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  state___200386: undefined,
+  state___14399: undefined,
   arg0: undefined,
 } }
 
@@ -44630,7 +44720,7 @@ function blockMenu_onMenuOptionSelected__P188904_mk(s) {
 
 
 
-function blockMenu__BlockMenuState_addHandler__P188935(s) {
+function blockMenu__BlockMenuState_addHandler__P3718(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44646,7 +44736,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu__BlockMenuState__C188930_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu__BlockMenuState__C3713_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["handlers"];
@@ -44658,12 +44748,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu__BlockMenuState_addHandler__P188935.info = {"start":411,"length":160,"line":15,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"addHandler","argumentNames":["this","handler"]}
+blockMenu__BlockMenuState_addHandler__P3718.info = {"start":411,"length":160,"line":15,"column":8,"endLine":19,"endColumn":9,"fileName":"pxt_modules/block-menu/menuState.ts","functionName":"addHandler","argumentNames":["this","handler"]}
 
-function blockMenu__BlockMenuState_addHandler__P188935_mk(s) {
+function blockMenu__BlockMenuState_addHandler__P3718_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu__BlockMenuState_addHandler__P188935, depth: s.depth + 1,
+        parent: s, fn: blockMenu__BlockMenuState_addHandler__P3718, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -44674,7 +44764,7 @@ function blockMenu__BlockMenuState_addHandler__P188935_mk(s) {
 
 
 
-function Sprite_setImage__P187273(s) {
+function Sprite_setImage__P2056(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44690,7 +44780,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -44701,7 +44791,7 @@ switch (step) {
   case 1:
   case 2:
     r0 = (s.arg0).fields["_image"] = (s.arg1);
-    s.tmp_0 = Sprite_setHitbox__P187274_mk(s);
+    s.tmp_0 = Sprite_setHitbox__P2057_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 302; s.pc = 4; return s.tmp_0;
   case 4:
@@ -44711,12 +44801,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setImage__P187273.info = {"start":6825,"length":133,"line":252,"column":4,"endLine":256,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setImage","argumentNames":["this","img"]}
+Sprite_setImage__P2056.info = {"start":6825,"length":133,"line":252,"column":4,"endLine":256,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setImage","argumentNames":["this","img"]}
 
-function Sprite_setImage__P187273_mk(s) {
+function Sprite_setImage__P2056_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setImage__P187273, depth: s.depth + 1,
+        parent: s, fn: Sprite_setImage__P2056, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -44728,7 +44818,7 @@ function Sprite_setImage__P187273_mk(s) {
 
 
 
-function Sprite_setHitbox__P187274(s) {
+function Sprite_setHitbox__P2057(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44738,29 +44828,29 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.newHitBox___201182 = undefined;
-    s.oMinX___201190 = undefined;
-    s.oMinY___201194 = undefined;
-    s.oMaxX___201198 = undefined;
-    s.oMaxY___201205 = undefined;
-    s.nMinX___201212 = undefined;
-    s.nMinY___201215 = undefined;
-    s.nMaxX___201218 = undefined;
-    s.nMaxY___201224 = undefined;
-    s.xDiff___201230 = undefined;
-    s.yDiff___201241 = undefined;
+    s.newHitBox___16337 = undefined;
+    s.oMinX___16345 = undefined;
+    s.oMinY___16349 = undefined;
+    s.oMaxX___16353 = undefined;
+    s.oMaxY___16360 = undefined;
+    s.nMinX___16367 = undefined;
+    s.nMinY___16370 = undefined;
+    s.nMaxX___16373 = undefined;
+    s.nMaxY___16379 = undefined;
+    s.xDiff___16385 = undefined;
+    s.yDiff___16396 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_0 = game_calculateHitBox__P187187_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_0 = game_calculateHitBox__P1970_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 303; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.newHitBox___201182 = (r0);
+    s.newHitBox___16337 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -44769,95 +44859,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___201182);
+    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___16337);
     { step = 7; continue; }
   case 1:
   case 2:
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["ox"];
-    s.oMinX___201190 = (r0);
+    s.oMinX___16345 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["oy"];
-    s.oMinY___201194 = (r0);
+    s.oMinY___16349 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["width"];
     s.tmp_0 = r0;
-    r0 = (s.oMinX___201190 + s.tmp_0);
-    s.oMaxX___201198 = (r0);
+    r0 = (s.oMinX___16345 + s.tmp_0);
+    s.oMaxX___16353 = (r0);
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["height"];
     s.tmp_0 = r0;
-    r0 = (s.oMinY___201194 + s.tmp_0);
-    s.oMaxY___201205 = (r0);
-    r0 = s.newHitBox___201182.fields["ox"];
-    s.nMinX___201212 = (r0);
-    r0 = s.newHitBox___201182.fields["oy"];
-    s.nMinY___201215 = (r0);
-    r0 = s.newHitBox___201182.fields["width"];
-    s.tmp_0 = r0;
-    r0 = (s.nMinX___201212 + s.tmp_0);
-    s.nMaxX___201218 = (r0);
-    r0 = s.newHitBox___201182.fields["height"];
-    s.tmp_0 = r0;
-    r0 = (s.nMinY___201215 + s.tmp_0);
-    s.nMaxY___201224 = (r0);
-    s.tmp_1 = Fx_abs__P185377_mk(s);
-    r0 = (s.oMinX___201190 - s.nMinX___201212);
+    r0 = (s.oMinY___16349 + s.tmp_0);
+    s.oMaxY___16360 = (r0);
+    r0 = s.newHitBox___16337.fields["ox"];
+    s.nMinX___16367 = (r0);
+    r0 = s.newHitBox___16337.fields["oy"];
+    s.nMinY___16370 = (r0);
+    r0 = s.newHitBox___16337.fields["width"];
+    s.tmp_0 = r0;
+    r0 = (s.nMinX___16367 + s.tmp_0);
+    s.nMaxX___16373 = (r0);
+    r0 = s.newHitBox___16337.fields["height"];
+    s.tmp_0 = r0;
+    r0 = (s.nMinY___16370 + s.tmp_0);
+    s.nMaxY___16379 = (r0);
+    s.tmp_1 = Fx_abs__P160_mk(s);
+    r0 = (s.oMinX___16345 - s.nMinX___16367);
     s.tmp_1.arg0 = r0;
     s.callLocIdx = 309; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Fx_abs__P185377_mk(s);
-    r0 = (s.oMaxX___201198 - s.nMaxX___201218);
+    s.tmp_3 = Fx_abs__P160_mk(s);
+    r0 = (s.oMaxX___16353 - s.nMaxX___16373);
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 311; 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___201230 = (r0);
-    s.tmp_1 = Fx_abs__P185377_mk(s);
-    r0 = (s.oMinY___201194 - s.nMinY___201215);
+    s.xDiff___16385 = (r0);
+    s.tmp_1 = Fx_abs__P160_mk(s);
+    r0 = (s.oMinY___16349 - s.nMinY___16370);
     s.tmp_1.arg0 = r0;
     s.callLocIdx = 314; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Fx_abs__P185377_mk(s);
-    r0 = (s.oMaxY___201205 - s.nMaxY___201224);
+    s.tmp_3 = Fx_abs__P160_mk(s);
+    r0 = (s.oMaxY___16360 - s.nMaxY___16379);
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 316; 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___201241 = (r0);
-    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___201182);
-    r0 = (s.xDiff___201230 <= 512);
+    s.yDiff___16396 = (r0);
+    r0 = (s.arg0).fields["_hitbox"] = (s.newHitBox___16337);
+    r0 = (s.xDiff___16385 <= 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___201190);
+    r0 = (s.tmp_1).fields["ox"] = (s.oMinX___16345);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_0 = r0;
-    r0 = (s.oMaxX___201198 - s.oMinX___201190);
+    r0 = (s.oMaxX___16353 - s.oMinX___16345);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["width"] = (s.tmp_1);
   case 3:
   case 4:
-    r0 = (s.yDiff___201241 <= 512);
+    r0 = (s.yDiff___16396 <= 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___201194);
+    r0 = (s.tmp_1).fields["oy"] = (s.oMinY___16349);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_0 = r0;
-    r0 = (s.oMaxY___201205 - s.oMinY___201194);
+    r0 = (s.oMaxY___16360 - s.oMinY___16349);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["height"] = (s.tmp_1);
   case 5:
@@ -44867,28 +44957,28 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setHitbox__P187274.info = {"start":6964,"length":1296,"line":258,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setHitbox","argumentNames":["this"]}
+Sprite_setHitbox__P2057.info = {"start":6964,"length":1296,"line":258,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setHitbox","argumentNames":["this"]}
 
-function Sprite_setHitbox__P187274_mk(s) {
+function Sprite_setHitbox__P2057_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setHitbox__P187274, depth: s.depth + 1,
+        parent: s, fn: Sprite_setHitbox__P2057, 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___201182: undefined,
-  oMinX___201190: undefined,
-  oMinY___201194: undefined,
-  oMaxX___201198: undefined,
-  oMaxY___201205: undefined,
-  nMinX___201212: undefined,
-  nMinY___201215: undefined,
-  nMaxX___201218: undefined,
-  nMaxY___201224: undefined,
-  xDiff___201230: undefined,
-  yDiff___201241: undefined,
+  newHitBox___16337: undefined,
+  oMinX___16345: undefined,
+  oMinY___16349: undefined,
+  oMaxX___16353: undefined,
+  oMaxY___16360: undefined,
+  nMinX___16367: undefined,
+  nMinY___16370: undefined,
+  nMaxX___16373: undefined,
+  nMaxY___16379: undefined,
+  xDiff___16385: undefined,
+  yDiff___16396: undefined,
   arg0: undefined,
 } }
 
@@ -44896,7 +44986,7 @@ function Sprite_setHitbox__P187274_mk(s) {
 
 
 
-function game_calculateHitBox__P187187(s) {
+function game_calculateHitBox__P1970(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -44906,104 +44996,104 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___201290 = undefined;
-    s.minX___201293 = undefined;
-    s.minY___201296 = undefined;
-    s.maxX___201299 = undefined;
-    s.maxY___201300 = undefined;
-    s.c___201301 = undefined;
-    s.r___201307 = undefined;
-    s.width___201338 = undefined;
-    s.height___201344 = undefined;
+    s.i___16445 = undefined;
+    s.minX___16448 = undefined;
+    s.minY___16451 = undefined;
+    s.maxX___16454 = undefined;
+    s.maxY___16455 = undefined;
+    s.c___16456 = undefined;
+    s.r___16462 = undefined;
+    s.width___16493 = undefined;
+    s.height___16499 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0.fields["_image"];
-    s.i___201290 = (r0);
-    r0 = pxsim_ImageMethods.width(s.i___201290);
-    s.minX___201293 = (r0);
-    r0 = pxsim_ImageMethods.height(s.i___201290);
-    s.minY___201296 = (r0);
-    s.maxX___201299 = (0);
-    s.maxY___201300 = (0);
-    s.c___201301 = (0);
-  case 1:
-    s.tmp_1 = r0 = s.c___201301;
-    r0 = pxsim_ImageMethods.width(s.i___201290);
+    s.i___16445 = (r0);
+    r0 = pxsim_ImageMethods.width(s.i___16445);
+    s.minX___16448 = (r0);
+    r0 = pxsim_ImageMethods.height(s.i___16445);
+    s.minY___16451 = (r0);
+    s.maxX___16454 = (0);
+    s.maxY___16455 = (0);
+    s.c___16456 = (0);
+  case 1:
+    s.tmp_1 = r0 = s.c___16456;
+    r0 = pxsim_ImageMethods.width(s.i___16445);
     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___201307 = (0);
+    s.r___16462 = (0);
   case 2:
-    s.tmp_1 = r0 = s.r___201307;
-    r0 = pxsim_ImageMethods.height(s.i___201290);
+    s.tmp_1 = r0 = s.r___16462;
+    r0 = pxsim_ImageMethods.height(s.i___16445);
     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___201290, s.c___201301, s.r___201307);
+    r0 = pxsim_ImageMethods.getPixel(s.i___16445, s.c___16456, s.r___16462);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = Math_min__P185343_mk(s);
-    s.tmp_4.arg0 = s.minX___201293;
-    s.tmp_4.arg1 = s.c___201301;
+    s.tmp_4 = Math_min__P126_mk(s);
+    s.tmp_4.arg0 = s.minX___16448;
+    s.tmp_4.arg1 = s.c___16456;
     s.callLocIdx = 260; s.pc = 7; return s.tmp_4;
   case 7:
     r0 = s.retval;
-    s.minX___201293 = (r0);
-    s.tmp_0 = Math_min__P185343_mk(s);
-    s.tmp_0.arg0 = s.minY___201296;
-    s.tmp_0.arg1 = s.r___201307;
+    s.minX___16448 = (r0);
+    s.tmp_0 = Math_min__P126_mk(s);
+    s.tmp_0.arg0 = s.minY___16451;
+    s.tmp_0.arg1 = s.r___16462;
     s.callLocIdx = 261; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.minY___201296 = (r0);
-    s.tmp_0 = Math_max__P185342_mk(s);
-    s.tmp_0.arg0 = s.maxX___201299;
-    s.tmp_0.arg1 = s.c___201301;
+    s.minY___16451 = (r0);
+    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0.arg0 = s.maxX___16454;
+    s.tmp_0.arg1 = s.c___16456;
     s.callLocIdx = 262; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.maxX___201299 = (r0);
-    s.tmp_0 = Math_max__P185342_mk(s);
-    s.tmp_0.arg0 = s.maxY___201300;
-    s.tmp_0.arg1 = s.r___201307;
+    s.maxX___16454 = (r0);
+    s.tmp_0 = Math_max__P125_mk(s);
+    s.tmp_0.arg0 = s.maxY___16455;
+    s.tmp_0.arg1 = s.r___16462;
     s.callLocIdx = 263; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.maxY___201300 = (r0);
+    s.maxY___16455 = (r0);
   case 3:
   case 4:
-    r0 = (s.r___201307 + 1);
-    s.r___201307 = (r0);
+    r0 = (s.r___16462 + 1);
+    s.r___16462 = (r0);
     { step = 2; continue; }
   case 5:
-    r0 = (s.c___201301 + 1);
-    s.c___201301 = (r0);
+    r0 = (s.c___16456 + 1);
+    s.c___16456 = (r0);
     { step = 1; continue; }
   case 6:
-    r0 = (s.maxX___201299 - s.minX___201293);
+    r0 = (s.maxX___16454 - s.minX___16448);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.width___201338 = (r0);
-    r0 = (s.maxY___201300 - s.minY___201296);
+    s.width___16493 = (r0);
+    r0 = (s.maxY___16455 - s.minY___16451);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.height___201344 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(game_Hitbox__C187176_VT);
+    s.height___16499 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(game_Hitbox__C1959_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_Hitbox_constructor__P187182_mk(s);
+    s.tmp_1 = game_Hitbox_constructor__P1965_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    s.tmp_1.arg2 = s.width___201338;
-    s.tmp_1.arg3 = s.height___201344;
-    s.tmp_1.arg4 = s.minX___201293;
-    s.tmp_1.arg5 = s.minY___201296;
+    s.tmp_1.arg2 = s.width___16493;
+    s.tmp_1.arg3 = s.height___16499;
+    s.tmp_1.arg4 = s.minX___16448;
+    s.tmp_1.arg5 = s.minY___16451;
     s.callLocIdx = 264; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
@@ -45011,27 +45101,27 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_calculateHitBox__P187187.info = {"start":894,"length":684,"line":40,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game/hitbox.ts","functionName":"calculateHitBox","argumentNames":["s"]}
+game_calculateHitBox__P1970.info = {"start":894,"length":684,"line":40,"column":4,"endLine":62,"endColumn":5,"fileName":"pxt_modules/game/hitbox.ts","functionName":"calculateHitBox","argumentNames":["s"]}
 
-function game_calculateHitBox__P187187_mk(s) {
+function game_calculateHitBox__P1970_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_calculateHitBox__P187187, depth: s.depth + 1,
+        parent: s, fn: game_calculateHitBox__P1970, 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___201290: undefined,
-  minX___201293: undefined,
-  minY___201296: undefined,
-  maxX___201299: undefined,
-  maxY___201300: undefined,
-  c___201301: undefined,
-  r___201307: undefined,
-  width___201338: undefined,
-  height___201344: undefined,
+  i___16445: undefined,
+  minX___16448: undefined,
+  minY___16451: undefined,
+  maxX___16454: undefined,
+  maxY___16455: undefined,
+  c___16456: undefined,
+  r___16462: undefined,
+  width___16493: undefined,
+  height___16499: undefined,
   arg0: undefined,
 } }
 
@@ -45039,7 +45129,7 @@ function game_calculateHitBox__P187187_mk(s) {
 
 
 
-function game_Hitbox_constructor__P187182(s) {
+function game_Hitbox_constructor__P1965(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45059,7 +45149,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C187176_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
     r0 = (s.arg0).fields["parent"] = (s.arg1);
     s.tmp_0 = r0 = s.arg0;
     r0 = (s.arg2 * 256);
@@ -45089,12 +45179,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Hitbox_constructor__P187182.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"]}
+game_Hitbox_constructor__P1965.info = {"start":151,"length":266,"line":8,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"inline","argumentNames":["this","parent","width","height","ox","oy"]}
 
-function game_Hitbox_constructor__P187182_mk(s) {
+function game_Hitbox_constructor__P1965_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_constructor__P187182, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_constructor__P1965, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45111,7 +45201,7 @@ function game_Hitbox_constructor__P187182_mk(s) {
 
 
 
-function Fx_abs__P185377(s) {
+function Fx_abs__P160(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45141,12 +45231,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_abs__P185377.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__P160.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__P185377_mk(s) {
+function Fx_abs__P160_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_abs__P185377, depth: s.depth + 1,
+        parent: s, fn: Fx_abs__P160, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -45156,7 +45246,7 @@ function Fx_abs__P185377_mk(s) {
 
 
 
-function Sprite_image__P187272(s) {
+function Sprite_image__P2055(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45171,18 +45261,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-Sprite_image__P187272.info = {"start":6549,"length":54,"line":242,"column":4,"endLine":244,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"image","argumentNames":["this"]}
-Sprite_image__P187272.isGetter = true;
+Sprite_image__P2055.info = {"start":6549,"length":54,"line":242,"column":4,"endLine":244,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"image","argumentNames":["this"]}
+Sprite_image__P2055.isGetter = true;
 
-function Sprite_image__P187272_mk(s) {
+function Sprite_image__P2055_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_image__P187272, depth: s.depth + 1,
+        parent: s, fn: Sprite_image__P2055, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -45191,7 +45281,7 @@ function Sprite_image__P187272_mk(s) {
 
 
 
-function character_setCharacterAnimationsEnabled__P188959(s) {
+function character_setCharacterAnimationsEnabled__P3742(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45201,20 +45291,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.state___201387 = undefined;
+    s.state___16542 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = character_getStateForSprite__P191371_mk(s);
+    s.tmp_0 = character_getStateForSprite__P6155_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 2082; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 2089; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.state___201387 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.state___201387);
+    s.state___16542 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.state___16542);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -45223,10 +45313,10 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = character_CharacterState_setEnabled__P191363_mk(s);
-    s.tmp_2.arg0 = s.state___201387;
+    s.tmp_2 = character_CharacterState_setEnabled__P6147_mk(s);
+    s.tmp_2.arg0 = s.state___16542;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 2083; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 2090; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -45234,17 +45324,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-character_setCharacterAnimationsEnabled__P188959.info = {"start":17492,"length":207,"line":507,"column":4,"endLine":512,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterAnimationsEnabled","argumentNames":["sprite","enabled"]}
+character_setCharacterAnimationsEnabled__P3742.info = {"start":17492,"length":207,"line":507,"column":4,"endLine":512,"endColumn":5,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setCharacterAnimationsEnabled","argumentNames":["sprite","enabled"]}
 
-function character_setCharacterAnimationsEnabled__P188959_mk(s) {
+function character_setCharacterAnimationsEnabled__P3742_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_setCharacterAnimationsEnabled__P188959, depth: s.depth + 1,
+        parent: s, fn: character_setCharacterAnimationsEnabled__P3742, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  state___201387: undefined,
+  state___16542: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -45253,7 +45343,7 @@ function character_setCharacterAnimationsEnabled__P188959_mk(s) {
 
 
 
-function character_CharacterState_setEnabled__P191363(s) {
+function character_CharacterState_setEnabled__P6147(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45269,18 +45359,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, character_CharacterState__C191357_VT)) failedCast(r0);
+    if (!checkSubtype(r0, character_CharacterState__C6141_VT)) failedCast(r0);
     r0 = (s.arg0).fields["enabled"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-character_CharacterState_setEnabled__P191363.info = {"start":9194,"length":76,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setEnabled","argumentNames":["this","enabled"]}
+character_CharacterState_setEnabled__P6147.info = {"start":9194,"length":76,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/character-animations/main.ts","functionName":"setEnabled","argumentNames":["this","enabled"]}
 
-function character_CharacterState_setEnabled__P191363_mk(s) {
+function character_CharacterState_setEnabled__P6147_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: character_CharacterState_setEnabled__P191363, depth: s.depth + 1,
+        parent: s, fn: character_CharacterState_setEnabled__P6147, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -45290,7 +45380,7 @@ function character_CharacterState_setEnabled__P191363_mk(s) {
 
 
 
-function sprites_changeDataNumberBy__P188837(s) {
+function sprites_changeDataNumberBy__P3620(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45300,7 +45390,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___202105 = undefined;
+    s.d___17161 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -45327,13 +45417,13 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P187258_mk(s);
+    s.tmp_4 = Sprite_data__P2041_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1766; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 1773; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
-    s.d___202105 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.d___202105, s.arg1);
+    s.d___17161 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.d___17161, s.arg1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 5; continue; }
@@ -45344,7 +45434,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_2 = r0 = s.d___202105;
+    s.tmp_2 = r0 = s.d___17161;
     s.tmp_3 = r0 = s.arg1;
     r0 = (s.tmp_1 + s.arg2);
     s.tmp_4 = r0;
@@ -45354,19 +45444,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_changeDataNumberBy__P188837.info = {"start":665,"length":198,"line":21,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"changeDataNumberBy","argumentNames":["sprite","name","value"]}
+sprites_changeDataNumberBy__P3620.info = {"start":665,"length":198,"line":21,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"changeDataNumberBy","argumentNames":["sprite","name","value"]}
 
-function sprites_changeDataNumberBy__P188837_mk(s) {
+function sprites_changeDataNumberBy__P3620_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_changeDataNumberBy__P188837, depth: s.depth + 1,
+        parent: s, fn: sprites_changeDataNumberBy__P3620, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___202105: undefined,
+  d___17161: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -45376,7 +45466,7 @@ function sprites_changeDataNumberBy__P188837_mk(s) {
 
 
 
-function inline__P202119(s) {
+function inline__P17175(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45386,9 +45476,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C187935_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_SprayFactory__C2718_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_SprayFactory_constructor__P187936_mk(s);
+    s.tmp_1 = particles_SprayFactory_constructor__P2719_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = 100;
     s.tmp_1.arg2 = 0;
@@ -45400,12 +45490,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202119.info = {"start":5988,"length":62,"line":154,"column":48,"endLine":154,"endColumn":110,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":[]}
+inline__P17175.info = {"start":5988,"length":62,"line":154,"column":48,"endLine":154,"endColumn":110,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P202119_mk(s) {
+function inline__P17175_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202119, depth: s.depth + 1,
+        parent: s, fn: inline__P17175, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45415,7 +45505,7 @@ function inline__P202119_mk(s) {
 
 
 
-function effects_createEffect__P189969(s) {
+function effects_createEffect__P4753(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45431,29 +45521,29 @@ switch (step) {
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(effects_ParticleEffect__C188006_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_ParticleEffect__C2789_VT);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P202129);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P17185);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg2);
-    s.tmp_2 = effects_ParticleEffect_constructor__P188007_mk(s);
+    s.tmp_2 = effects_ParticleEffect_constructor__P2790_mk(s);
     s.tmp_2.arg0 = s.tmp_0;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = s.arg1;
     s.tmp_2.arg3 = s.tmp_1;
-    s.callLocIdx = 1634; s.pc = 1; return s.tmp_2;
+    s.callLocIdx = 1641; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-effects_createEffect__P189969.info = {"start":5459,"length":434,"line":146,"column":4,"endLine":151,"endColumn":5,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"createEffect","argumentNames":["defaultParticlesPerSecond","defaultLifespan","factoryFactory"]}
+effects_createEffect__P4753.info = {"start":5459,"length":434,"line":146,"column":4,"endLine":151,"endColumn":5,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"createEffect","argumentNames":["defaultParticlesPerSecond","defaultLifespan","factoryFactory"]}
 
-function effects_createEffect__P189969_mk(s) {
+function effects_createEffect__P4753_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_createEffect__P189969, depth: s.depth + 1,
+        parent: s, fn: effects_createEffect__P4753, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45467,7 +45557,7 @@ function effects_createEffect__P189969_mk(s) {
 
 
 
-function inline__P202129(s) {
+function inline__P17185(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45482,9 +45572,9 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C187895_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(particles_ParticleSource__C2678_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = particles_ParticleSource_constructor__P187900_mk(s);
+    s.tmp_1 = particles_ParticleSource_constructor__P2683_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -45492,23 +45582,23 @@ switch (step) {
     s.tmp_2.argL = s.caps[0];
     s.tmp_2.arg0 = undefined;
     setupLambda(s.tmp_2, s.tmp_2.argL);
-    s.callLocIdx = 1632; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 1639; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1.arg3 = r0;
-    s.callLocIdx = 1633; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1640; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202129.info = {"start":5751,"length":134,"line":149,"column":20,"endLine":150,"endColumn":83,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["anchor","pps"]}
+inline__P17185.info = {"start":5751,"length":134,"line":149,"column":20,"endLine":150,"endColumn":83,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["anchor","pps"]}
 
-function inline__P202129_mk(s) {
+function inline__P17185_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202129, depth: s.depth + 1,
+        parent: s, fn: inline__P17185, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45521,7 +45611,7 @@ function inline__P202129_mk(s) {
 
 
 
-function Sprite_destroy__P187304(s) {
+function Sprite_destroy__P2087(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45538,7 +45628,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 2);
@@ -45556,7 +45646,7 @@ 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__P188009_mk(s);
+    s.tmp_0 = effects_ParticleEffect_destroy__P2792_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.arg2;
@@ -45566,7 +45656,7 @@ switch (step) {
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    s.tmp_0 = Sprite__destroyCore__P187305_mk(s);
+    s.tmp_0 = Sprite__destroyCore__P2088_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 431; s.pc = 7; return s.tmp_0;
   case 7:
@@ -45577,12 +45667,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_destroy__P187304.info = {"start":28412,"length":293,"line":858,"column":4,"endLine":867,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"destroy","argumentNames":["this","effect","duration"]}
+Sprite_destroy__P2087.info = {"start":28412,"length":293,"line":858,"column":4,"endLine":867,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"destroy","argumentNames":["this","effect","duration"]}
 
-function Sprite_destroy__P187304_mk(s) {
+function Sprite_destroy__P2087_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_destroy__P187304, depth: s.depth + 1,
+        parent: s, fn: Sprite_destroy__P2087, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45598,7 +45688,7 @@ function Sprite_destroy__P187304_mk(s) {
 
 
 
-function effects_ParticleEffect_destroy__P188009(s) {
+function effects_ParticleEffect_destroy__P2792(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45616,15 +45706,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C188006_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_setFlag__P187296_mk(s);
+    if (!checkSubtype(r0, effects_ParticleEffect__C2789_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_setFlag__P2079_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = true;
-    s.callLocIdx = 1620; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1627; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = effects_ParticleEffect_start__P188008_mk(s);
+    s.tmp_0 = effects_ParticleEffect_start__P2791_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg3;
@@ -45641,7 +45731,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1621; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1628; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -45656,22 +45746,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__P188035_mk(s);
-    s.tmp_0.arg0 = globals.dissolve___188038;
+    s.tmp_0 = effects_ImageEffect_applyTo__P2818_mk(s);
+    s.tmp_0.arg0 = globals.dissolve___2821;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1622; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1629; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_destroy__P188009.info = {"start":1736,"length":368,"line":41,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"destroy","argumentNames":["this","anchor","duration","particlesPerSecond"]}
+effects_ParticleEffect_destroy__P2792.info = {"start":1736,"length":368,"line":41,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"destroy","argumentNames":["this","anchor","duration","particlesPerSecond"]}
 
-function effects_ParticleEffect_destroy__P188009_mk(s) {
+function effects_ParticleEffect_destroy__P2792_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_destroy__P188009, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_destroy__P2792, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45689,7 +45779,7 @@ function effects_ParticleEffect_destroy__P188009_mk(s) {
 
 
 
-function inline__P202259(s) {
+function inline__P17315(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45699,11 +45789,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___202262 = undefined;
-    s.x___202273 = undefined;
-    s.y___202279 = undefined;
-    s.w___202285 = undefined;
-    s.h___202289 = undefined;
+    s.i___17318 = undefined;
+    s.x___17329 = undefined;
+    s.y___17335 = undefined;
+    s.w___17341 = undefined;
+    s.h___17345 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -45716,13 +45806,13 @@ switch (step) {
     r0 = (s.tmp_1 * s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 >> 5);
-    s.i___202262 = (r0);
+    s.i___17318 = (r0);
   case 1:
-    r0 = (s.i___202262 > 0);
+    r0 = (s.i___17318 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.tmp_1 = Math_FastRandom_randomRange__P2590_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.tmp_1.arg1 = 0;
     r0 = pxsim_ImageMethods.width(s.arg0);
@@ -45730,8 +45820,8 @@ switch (step) {
     s.callLocIdx = 47; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.x___202273 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.x___17329 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 0;
     r0 = pxsim_ImageMethods.height(s.arg0);
@@ -45739,56 +45829,56 @@ switch (step) {
     s.callLocIdx = 48; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.y___202279 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.y___17335 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 3;
     s.callLocIdx = 49; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.w___202285 = (r0);
-    s.tmp_0 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.w___17341 = (r0);
+    s.tmp_0 = Math_FastRandom_randomRange__P2590_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = 1;
     s.tmp_0.arg2 = 3;
     s.callLocIdx = 50; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.h___202289 = (r0);
-    s.tmp_0 = helpers_imageDrawRect__P186948_mk(s);
+    s.h___17345 = (r0);
+    s.tmp_0 = helpers_imageDrawRect__P1731_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.x___202273;
-    s.tmp_0.arg2 = s.y___202279;
-    s.tmp_0.arg3 = s.w___202285;
-    s.tmp_0.arg4 = s.h___202289;
+    s.tmp_0.arg1 = s.x___17329;
+    s.tmp_0.arg2 = s.y___17335;
+    s.tmp_0.arg3 = s.w___17341;
+    s.tmp_0.arg4 = s.h___17345;
     s.tmp_0.arg5 = 0;
     s.callLocIdx = 51; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    r0 = (s.i___202262 - 1);
-    s.i___202262 = (r0);
+    r0 = (s.i___17318 - 1);
+    s.i___17318 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202259.info = {"start":2199,"length":360,"line":60,"column":49,"endLine":69,"endColumn":5,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":["input","r"]}
+inline__P17315.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__P202259_mk(s) {
+function inline__P17315_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202259, depth: s.depth + 1,
+        parent: s, fn: inline__P17315, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  i___202262: undefined,
-  x___202273: undefined,
-  y___202279: undefined,
-  w___202285: undefined,
-  h___202289: undefined,
+  i___17318: undefined,
+  x___17329: undefined,
+  y___17335: undefined,
+  w___17341: undefined,
+  h___17345: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -45797,7 +45887,7 @@ function inline__P202259_mk(s) {
 
 
 
-function effects_ImageEffect_applyTo__P188035(s) {
+function effects_ImageEffect_applyTo__P2818(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45807,14 +45897,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.clonedImage___202310 = undefined;
+    s.clonedImage___17366 = 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__C188033_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -45840,17 +45930,17 @@ switch (step) {
     r0 = s.arg1.fields["_image"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.clone(s.tmp_5);
-    s.clonedImage___202310 = (r0);
-    s.tmp_0 = effects_ImageEffect_change__P188036_mk(s);
+    s.clonedImage___17366 = (r0);
+    s.tmp_0 = effects_ImageEffect_change__P2819_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.clonedImage___202310;
-    s.callLocIdx = 1646; s.pc = 6; return s.tmp_0;
+    s.tmp_0.arg1 = s.clonedImage___17366;
+    s.callLocIdx = 1653; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     s.tmp_0.arg0 = s.arg1;
-    s.tmp_0.arg1 = s.clonedImage___202310;
-    s.callLocIdx = 1647; s.pc = 7; return s.tmp_0;
+    s.tmp_0.arg1 = s.clonedImage___17366;
+    s.callLocIdx = 1654; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 5:
@@ -45858,12 +45948,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_applyTo__P188035.info = {"start":823,"length":218,"line":21,"column":8,"endLine":26,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"applyTo","argumentNames":["this","sprite"]}
+effects_ImageEffect_applyTo__P2818.info = {"start":823,"length":218,"line":21,"column":8,"endLine":26,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"applyTo","argumentNames":["this","sprite"]}
 
-function effects_ImageEffect_applyTo__P188035_mk(s) {
+function effects_ImageEffect_applyTo__P2818_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_applyTo__P188035, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_applyTo__P2818, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -45871,7 +45961,7 @@ function effects_ImageEffect_applyTo__P188035_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  clonedImage___202310: undefined,
+  clonedImage___17366: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -45880,7 +45970,7 @@ function effects_ImageEffect_applyTo__P188035_mk(s) {
 
 
 
-function effects_ImageEffect_change__P188036(s) {
+function effects_ImageEffect_change__P2819(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45896,7 +45986,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C188033_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
     s.tmp_0 = if_effect_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
@@ -45904,12 +45994,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 = 1648; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 1655; 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 = 1648; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1648; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1648; 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 = 1655; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1655; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 1655; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -45917,12 +46007,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_change__P188036.info = {"start":1151,"length":81,"line":32,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"change","argumentNames":["this","input"]}
+effects_ImageEffect_change__P2819.info = {"start":1151,"length":81,"line":32,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"change","argumentNames":["this","input"]}
 
-function effects_ImageEffect_change__P188036_mk(s) {
+function effects_ImageEffect_change__P2819_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_change__P188036, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_change__P2819, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -45933,7 +46023,7 @@ function effects_ImageEffect_change__P188036_mk(s) {
 
 
 
-function effects_ParticleEffect_start__P188008(s) {
+function effects_ParticleEffect_start__P2791(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -45943,7 +46033,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.src___202334 = undefined;
+    s.src___17390 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -45953,7 +46043,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ParticleEffect__C188006_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ParticleEffect__C2789_VT)) failedCast(r0);
     r0 = s.arg0.fields["sourceFactory"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -45980,18 +46070,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 = 1618; s.pc = 10; return s.tmp_4;
+      s.callLocIdx = 1625; 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 = 1618; s.pc = 10; return s.tmp_4; }
-      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1618; s.pc = 10; return s.tmp_4;; }
-     else { s.callLocIdx = 1618; 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 = 1625; s.pc = 10; return s.tmp_4; }
+      else if (s.tmp_4.fn.isGetter) { s.tmp_4.stage2Call = true; s.callLocIdx = 1625; s.pc = 10; return s.tmp_4;; }
+     else { s.callLocIdx = 1625; s.pc = 10; return s.tmp_4; }
     }
   case 10:
     r0 = s.retval;
-    s.src___202334 = (r0);
-    s.tmp_0 = particles_ParticleSource_setRelativeToCamera__P187906_mk(s);
-    s.tmp_0.arg0 = s.src___202334;
+    s.src___17390 = (r0);
+    s.tmp_0 = particles_ParticleSource_setRelativeToCamera__P2689_mk(s);
+    s.tmp_0.arg0 = s.src___17390;
     r0 = pxsim_numops_toBoolDecr(s.arg4);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
@@ -46000,7 +46090,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1619; s.pc = 11; return s.tmp_0;
+    s.callLocIdx = 1626; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -46016,7 +46106,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = (s.src___202334).fields["lifespan"] = (s.tmp_1);
+    r0 = (s.src___17390).fields["lifespan"] = (s.tmp_1);
   case 7:
   case 8:
   case 9:
@@ -46024,19 +46114,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ParticleEffect_start__P188008.info = {"start":967,"length":452,"line":26,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"start","argumentNames":["this","anchor","duration","particlesPerSecond","relativeToCamera"]}
+effects_ParticleEffect_start__P2791.info = {"start":967,"length":452,"line":26,"column":8,"endLine":32,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"start","argumentNames":["this","anchor","duration","particlesPerSecond","relativeToCamera"]}
 
-function effects_ParticleEffect_start__P188008_mk(s) {
+function effects_ParticleEffect_start__P2791_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ParticleEffect_start__P188008, depth: s.depth + 1,
+        parent: s, fn: effects_ParticleEffect_start__P2791, 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___202334: undefined,
+  src___17390: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -46048,7 +46138,7 @@ function effects_ParticleEffect_start__P188008_mk(s) {
 
 
 
-function particles_ParticleSource_setRelativeToCamera__P187906(s) {
+function particles_ParticleSource_setRelativeToCamera__P2689(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46064,7 +46154,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = r0 = s.arg0;
@@ -46090,12 +46180,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_setRelativeToCamera__P187906.info = {"start":6422,"length":173,"line":210,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRelativeToCamera","argumentNames":["this","on"]}
+particles_ParticleSource_setRelativeToCamera__P2689.info = {"start":6422,"length":173,"line":210,"column":8,"endLine":213,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"setRelativeToCamera","argumentNames":["this","on"]}
 
-function particles_ParticleSource_setRelativeToCamera__P187906_mk(s) {
+function particles_ParticleSource_setRelativeToCamera__P2689_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_setRelativeToCamera__P187906, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_setRelativeToCamera__P2689, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46110,7 +46200,7 @@ function particles_ParticleSource_setRelativeToCamera__P187906_mk(s) {
 
 
 
-function Sprite__destroyCore__P187305(s) {
+function Sprite__destroyCore__P2088(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46120,29 +46210,29 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___202162 = undefined;
+    s.scene___17218 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187749_mk(s);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 432; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.scene___202162 = (r0);
+    s.scene___17218 = (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__P187304_mk(s);
+    s.tmp_1 = Sprite_destroy__P2087_mk(s);
     r0 = s.arg0.fields["sayBubbleSprite"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
@@ -46152,7 +46242,7 @@ switch (step) {
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = s.scene___202162.fields["allSprites"];
+    r0 = s.scene___17218.fields["allSprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg0);
     r0 = s.arg0.fields["_kind"];
@@ -46164,7 +46254,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = s.scene___202162.fields["spritesByKind"];
+    r0 = s.scene___17218.fields["spritesByKind"];
     s.tmp_2 = r0;
     r0 = s.arg0.fields["_kind"];
     s.tmp_3 = r0;
@@ -46174,8 +46264,8 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 5; continue; }
-    s.tmp_5 = sprites_SpriteSet_remove__P187335_mk(s);
-    r0 = s.scene___202162.fields["spritesByKind"];
+    s.tmp_5 = sprites_SpriteSet_remove__P2118_mk(s);
+    r0 = s.scene___17218.fields["spritesByKind"];
     s.tmp_6 = r0;
     r0 = s.arg0.fields["_kind"];
     s.tmp_7 = r0;
@@ -46187,11 +46277,11 @@ switch (step) {
     r0 = s.retval;
   case 5:
   case 6:
-    s.tmp_0 = PhysicsEngine__C187376_v1_2_mk(s);
-    r0 = s.scene___202162.fields["physicsEngine"];
+    s.tmp_0 = PhysicsEngine__C2159_v1_2_mk(s);
+    r0 = s.scene___17218.fields["physicsEngine"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C187376_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, PhysicsEngine__C2159_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:
@@ -46215,15 +46305,15 @@ switch (step) {
     r0 = s.retval;
   case 7:
   case 8:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P202198);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P17254);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P202205);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P17261);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P185325_mk(s);
-    r0 = s.scene___202162.fields["destroyedHandlers"];
+    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
+    r0 = s.scene___17218.fields["destroyedHandlers"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.tmp_0;
     s.callLocIdx = 440; s.pc = 15; return s.tmp_3;
@@ -46238,12 +46328,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite__destroyCore__P187305.info = {"start":28711,"length":693,"line":869,"column":4,"endLine":885,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"_destroyCore","argumentNames":["this"]}
+Sprite__destroyCore__P2088.info = {"start":28711,"length":693,"line":869,"column":4,"endLine":885,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"_destroyCore","argumentNames":["this"]}
 
-function Sprite__destroyCore__P187305_mk(s) {
+function Sprite__destroyCore__P2088_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite__destroyCore__P187305, depth: s.depth + 1,
+        parent: s, fn: Sprite__destroyCore__P2088, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46253,7 +46343,7 @@ function Sprite__destroyCore__P187305_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  scene___202162: undefined,
+  scene___17218: undefined,
   arg0: undefined,
 } }
 
@@ -46261,7 +46351,7 @@ function Sprite__destroyCore__P187305_mk(s) {
 
 
 
-function inline__P202198(s) {
+function inline__P17254(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46283,12 +46373,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202198.info = {"start":29327,"length":26,"line":883,"column":20,"endLine":883,"endColumn":46,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P17254.info = {"start":29327,"length":26,"line":883,"column":20,"endLine":883,"endColumn":46,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P202198_mk(s) {
+function inline__P17254_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202198, depth: s.depth + 1,
+        parent: s, fn: inline__P17254, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46299,7 +46389,7 @@ function inline__P202198_mk(s) {
 
 
 
-function inline__P202205(s) {
+function inline__P17261(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46331,12 +46421,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202205.info = {"start":29376,"length":20,"line":884,"column":21,"endLine":884,"endColumn":41,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P17261.info = {"start":29376,"length":20,"line":884,"column":21,"endLine":884,"endColumn":41,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P202205_mk(s) {
+function inline__P17261_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202205, depth: s.depth + 1,
+        parent: s, fn: inline__P17261, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46346,7 +46436,7 @@ function inline__P202205_mk(s) {
 
 
 
-function PhysicsEngine_removeSprite__P187379(s) {
+function PhysicsEngine_removeSprite__P2162(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46362,17 +46452,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, PhysicsEngine__C187376_VT)) failedCast(r0);
+    if (!checkSubtype(r0, PhysicsEngine__C2159_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-PhysicsEngine_removeSprite__P187379.info = {"start":159,"length":32,"line":10,"column":4,"endLine":10,"endColumn":36,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
+PhysicsEngine_removeSprite__P2162.info = {"start":159,"length":32,"line":10,"column":4,"endLine":10,"endColumn":36,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
 
-function PhysicsEngine_removeSprite__P187379_mk(s) {
+function PhysicsEngine_removeSprite__P2162_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: PhysicsEngine_removeSprite__P187379, depth: s.depth + 1,
+        parent: s, fn: PhysicsEngine_removeSprite__P2162, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -46382,7 +46472,7 @@ function PhysicsEngine_removeSprite__P187379_mk(s) {
 
 
 
-function sprites_SpriteSet_remove__P187335(s) {
+function sprites_SpriteSet_remove__P2118(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46392,26 +46482,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.i___202214 = undefined;
+    s.i___17270 = 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__C187328_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_0, s.arg1, undefined);
-    s.i___202214 = (r0);
-    r0 = (s.i___202214 > -1);
+    s.i___17270 = (r0);
+    r0 = (s.i___17270 > -1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_arraySplice__P185315_mk(s);
+    s.tmp_1 = helpers_arraySplice__P98_mk(s);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = s.i___202214;
+    s.tmp_1.arg1 = s.i___17270;
     s.tmp_1.arg2 = 1;
     s.callLocIdx = 527; s.pc = 4; return s.tmp_1;
   case 4:
@@ -46425,16 +46515,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_remove__P187335.info = {"start":1816,"length":235,"line":66,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"remove","argumentNames":["this","sprite"]}
+sprites_SpriteSet_remove__P2118.info = {"start":1816,"length":235,"line":66,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"remove","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_remove__P187335_mk(s) {
+function sprites_SpriteSet_remove__P2118_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_remove__P187335, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_remove__P2118, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  i___202214: undefined,
+  i___17270: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -46443,7 +46533,7 @@ function sprites_SpriteSet_remove__P187335_mk(s) {
 
 
 
-function sprites_onOverlap__P187323(s) {
+function sprites_onOverlap__P2106(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46453,10 +46543,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.sc___202386 = undefined;
-    s.overlapHandlers___202389 = undefined;
-    s.overlapMap___202392 = undefined;
-    s.associate___202395 = undefined;
+    s.sc___17442 = undefined;
+    s.overlapHandlers___17445 = undefined;
+    s.overlapMap___17448 = undefined;
+    s.associate___17451 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -46490,21 +46580,21 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    s.tmp_4 = game_currentScene__P187749_mk(s);
+    s.tmp_4 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 519; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
-    s.sc___202386 = (r0);
-    r0 = s.sc___202386.fields["overlapHandlers"];
-    s.overlapHandlers___202389 = (r0);
-    r0 = s.sc___202386.fields["overlapMap"];
-    s.overlapMap___202392 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, associate__P202395);
+    s.sc___17442 = (r0);
+    r0 = s.sc___17442.fields["overlapHandlers"];
+    s.overlapHandlers___17445 = (r0);
+    r0 = s.sc___17442.fields["overlapMap"];
+    s.overlapMap___17448 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, associate__P17451);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overlapMap___202392);
-    s.associate___202395 = (s.tmp_0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overlapMap___17448);
+    s.associate___17451 = (s.tmp_0);
     s.tmp_1 = lambda_3_mk(s);
-    s.tmp_1.argL = s.associate___202395;
+    s.tmp_1.argL = s.associate___17451;
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     setupLambda(s.tmp_1, s.tmp_1.argL);
@@ -46512,16 +46602,16 @@ switch (step) {
   case 9:
     r0 = s.retval;
     s.tmp_0 = lambda_3_mk(s);
-    s.tmp_0.argL = s.associate___202395;
+    s.tmp_0.argL = s.associate___17451;
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 521; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(scene_OverlapHandler__C187609_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_OverlapHandler__C2392_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_OverlapHandler_constructor__P187610_mk(s);
+    s.tmp_1 = scene_OverlapHandler_constructor__P2393_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -46529,28 +46619,28 @@ switch (step) {
     s.callLocIdx = 522; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.overlapHandlers___202389, s.tmp_0);
+    r0 = pxsim_Array__push(s.overlapHandlers___17445, s.tmp_0);
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_onOverlap__P187323.info = {"start":1605,"length":755,"line":50,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"onOverlap","argumentNames":["kind","otherKind","handler"]}
+sprites_onOverlap__P2106.info = {"start":1605,"length":755,"line":50,"column":4,"endLine":74,"endColumn":5,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"onOverlap","argumentNames":["kind","otherKind","handler"]}
 
-function sprites_onOverlap__P187323_mk(s) {
+function sprites_onOverlap__P2106_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_onOverlap__P187323, depth: s.depth + 1,
+        parent: s, fn: sprites_onOverlap__P2106, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  sc___202386: undefined,
-  overlapHandlers___202389: undefined,
-  overlapMap___202392: undefined,
-  associate___202395: undefined,
+  sc___17442: undefined,
+  overlapHandlers___17445: undefined,
+  overlapMap___17448: undefined,
+  associate___17451: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -46560,7 +46650,7 @@ function sprites_onOverlap__P187323_mk(s) {
 
 
 
-function associate__P202395(s) {
+function associate__P17451(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46597,12 +46687,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-associate__P202395.info = {"start":1942,"length":172,"line":56,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"associate","argumentNames":["a","b"]}
+associate__P17451.info = {"start":1942,"length":172,"line":56,"column":8,"endLine":62,"endColumn":9,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"associate","argumentNames":["a","b"]}
 
-function associate__P202395_mk(s) {
+function associate__P17451_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: associate__P202395, depth: s.depth + 1,
+        parent: s, fn: associate__P17451, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46618,7 +46708,7 @@ function associate__P202395_mk(s) {
 
 
 
-function scene_OverlapHandler_constructor__P187610(s) {
+function scene_OverlapHandler_constructor__P2393(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46636,7 +46726,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_OverlapHandler__C187609_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_OverlapHandler__C2392_VT)) failedCast(r0);
     r0 = (s.arg0).fields["kind"] = (s.arg1);
     r0 = (s.arg0).fields["otherKind"] = (s.arg2);
     r0 = (s.arg0).fields["handler"] = (s.arg3);
@@ -46644,12 +46734,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_OverlapHandler_constructor__P187610.info = {"start":655,"length":171,"line":22,"column":8,"endLine":26,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","kind","otherKind","handler"]}
+scene_OverlapHandler_constructor__P2393.info = {"start":655,"length":171,"line":22,"column":8,"endLine":26,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","kind","otherKind","handler"]}
 
-function scene_OverlapHandler_constructor__P187610_mk(s) {
+function scene_OverlapHandler_constructor__P2393_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_OverlapHandler_constructor__P187610, depth: s.depth + 1,
+        parent: s, fn: scene_OverlapHandler_constructor__P2393, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -46661,7 +46751,7 @@ function scene_OverlapHandler_constructor__P187610_mk(s) {
 
 
 
-function info_changeScoreBy__P187424(s) {
+function info_changeScoreBy__P2207(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46675,22 +46765,22 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_PlayerInfo_changeScoreBy__P187460_mk(s);
-    s.tmp_0.arg0 = globals.player1___187474;
+    s.tmp_0 = info_PlayerInfo_changeScoreBy__P2243_mk(s);
+    s.tmp_0.arg0 = globals.player1___2257;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 24; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 806; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_changeScoreBy__P187424.info = {"start":7694,"length":90,"line":263,"column":4,"endLine":265,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"changeScoreBy","argumentNames":["value"]}
+info_changeScoreBy__P2207.info = {"start":7694,"length":90,"line":263,"column":4,"endLine":265,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"changeScoreBy","argumentNames":["value"]}
 
-function info_changeScoreBy__P187424_mk(s) {
+function info_changeScoreBy__P2207_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_changeScoreBy__P187424, depth: s.depth + 1,
+        parent: s, fn: info_changeScoreBy__P2207, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -46700,7 +46790,7 @@ function info_changeScoreBy__P187424_mk(s) {
 
 
 
-function info_PlayerInfo_changeScoreBy__P187460(s) {
+function info_PlayerInfo_changeScoreBy__P2243(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46716,30 +46806,30 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
-    s.tmp_0 = info_PlayerInfo_setScore__P187459_mk(s);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
+    s.tmp_0 = info_PlayerInfo_setScore__P2242_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = info_PlayerInfo_score__P187458_mk(s);
+    s.tmp_2 = info_PlayerInfo_score__P2241_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 25; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 834; s.pc = 2; return s.tmp_2;
   case 2:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + s.arg1);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 26; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 835; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_changeScoreBy__P187460.info = {"start":18514,"length":95,"line":612,"column":8,"endLine":614,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"changeScoreBy","argumentNames":["this","value"]}
+info_PlayerInfo_changeScoreBy__P2243.info = {"start":18514,"length":95,"line":612,"column":8,"endLine":614,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"changeScoreBy","argumentNames":["this","value"]}
 
-function info_PlayerInfo_changeScoreBy__P187460_mk(s) {
+function info_PlayerInfo_changeScoreBy__P2243_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_changeScoreBy__P187460, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_changeScoreBy__P2243, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -46752,45 +46842,7 @@ function info_PlayerInfo_changeScoreBy__P187460_mk(s) {
 
 
 
-function timer_background__P188812(s) {
-let r0 = s.r0, step = s.pc;
-s.pc = -1;
-
-
-while (true) {
-if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) return null;
-switch (step) {
-  case 0:
-
-    if (s.lambdaArgs) {
-      s.arg0 = (s.lambdaArgs[0]);
-      s.lambdaArgs = null;
-    }
-    s.tmp_0 = control_runInBackground__P185496_mk(s);
-    s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1741; s.pc = 1; return s.tmp_0;
-  case 1:
-    r0 = s.retval;
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-timer_background__P188812.info = {"start":665,"length":90,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"background","argumentNames":["then"]}
-
-function timer_background__P188812_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: timer_background__P188812, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  tmp_0: undefined,
-  arg0: undefined,
-} }
-
-
-
-
-
-function control_runInBackground__P185496(s) {
+function game_over__P2542(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -46800,65 +46852,32 @@ 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;
-    }
-    r0 = pxsim.control.runInParallel(s.arg0);
-    r0 = undefined;
-    return leave(s, r0)
-  default: oops()
-} } }
-control_runInBackground__P185496.info = {"start":384,"length":88,"line":10,"column":4,"endLine":12,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"runInBackground","argumentNames":["a"]}
-
-function control_runInBackground__P185496_mk(s) {
-    checkStack(s.depth);
-    return {
-        parent: s, fn: control_runInBackground__P185496, depth: s.depth + 1,
-        pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
-  arg0: undefined,
-} }
-
-
-
-
-
-function game_over__P187759(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.scoreInfo___202444 = undefined;
-    s.highScore___202448 = undefined;
-    s.overDialog___202477 = undefined;
+    s.scoreInfo___17511 = undefined;
+    s.highScore___17515 = undefined;
+    s.overDialog___17544 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P189572_mk(s);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1183; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1190; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(globals.__isOver___189571);
+    r0 = pxsim_numops_toBoolDecr(globals.__isOver___4355);
     if (!r0) { step = 1; continue; }
     { step = 17; continue; }
   case 1:
   case 2:
-    globals.__isOver___189571 = (true);
-    r0 = pxsim_numops_toBoolDecr(globals.__gameOverHandler___189569);
+    globals.__isOver___4355 = (true);
+    r0 = pxsim_numops_toBoolDecr(globals.__gameOverHandler___4353);
     if (!r0) { step = 3; continue; }
     s.tmp_0 = lambda_2_mk(s);
-    s.tmp_0.argL = globals.__gameOverHandler___189569;
+    s.tmp_0.argL = globals.__gameOverHandler___4353;
     s.tmp_0.arg0 = s.arg0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1184; s.pc = 19; return s.tmp_0;
+    s.callLocIdx = 1191; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
     { step = 16; continue; }
@@ -46871,87 +46890,87 @@ switch (step) {
     if (!r0) { step = 6; continue; }
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 4; continue; }
-    r0 = globals.winEffect___187747;
+    r0 = globals.winEffect___2530;
     { step = 5; continue; }
   case 4:
-    r0 = globals.loseEffect___187748;
+    r0 = globals.loseEffect___2531;
   case 5:
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.arg1 = (s.tmp_2);
   case 6:
   case 7:
-    s.tmp_0 = info_PlayerInfo_getState__P187456_mk(s);
-    s.tmp_0.arg0 = globals.player1___187474;
-    s.callLocIdx = 1185; s.pc = 20; return s.tmp_0;
+    s.tmp_0 = info_PlayerInfo_getState__P2239_mk(s);
+    s.tmp_0.arg0 = globals.player1___2257;
+    s.callLocIdx = 1192; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
-    s.scoreInfo___202444 = (r0);
-    s.tmp_0 = info_highScore__P187422_mk(s);
-    s.callLocIdx = 1186; s.pc = 21; return s.tmp_0;
+    s.scoreInfo___17511 = (r0);
+    s.tmp_0 = info_highScore__P2205_mk(s);
+    s.callLocIdx = 1193; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.highScore___202448 = (r0);
-    r0 = s.scoreInfo___202444.fields["score"];
+    s.highScore___17515 = (r0);
+    r0 = s.scoreInfo___17511.fields["score"];
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.highScore___202448);
+    r0 = (s.tmp_1 > s.highScore___17515);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_2 = info_saveHighScore__P187419_mk(s);
-    s.callLocIdx = 1187; s.pc = 22; return s.tmp_2;
+    s.tmp_2 = info_saveHighScore__P2202_mk(s);
+    s.callLocIdx = 1194; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
   case 8:
   case 9:
   case 10:
-    s.tmp_0 = r0 = globals._sceneStack___189565;
+    s.tmp_0 = r0 = globals._sceneStack___4349;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    r0 = pxsim_Array__length(globals._sceneStack___189565);
+    r0 = pxsim_Array__length(globals._sceneStack___4349);
   case 12:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 13; continue; }
-    s.tmp_2 = scene_Scene_destroy__P187662_mk(s);
-    s.tmp_2.arg0 = globals._scene___189564;
-    s.callLocIdx = 1188; s.pc = 23; return s.tmp_2;
+    s.tmp_2 = scene_Scene_destroy__P2445_mk(s);
+    s.tmp_2.arg0 = globals._scene___4348;
+    s.callLocIdx = 1195; s.pc = 23; return s.tmp_2;
   case 23:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P187754_mk(s);
-    s.callLocIdx = 1189; s.pc = 24; return s.tmp_0;
+    s.tmp_0 = game_popScene__P2537_mk(s);
+    s.callLocIdx = 1196; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
     { step = 10; continue; }
   case 13:
-    s.tmp_0 = game_pushScene__P187753_mk(s);
-    s.callLocIdx = 1190; s.pc = 25; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P2536_mk(s);
+    s.callLocIdx = 1197; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.tmp_0 = scene_setBackgroundImage__P187676_mk(s);
-    r0 = pxsim_ImageMethods.clone(globals.screen___187019);
+    s.tmp_0 = scene_setBackgroundImage__P2459_mk(s);
+    r0 = pxsim_ImageMethods.clone(globals.screen___1802);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1191; s.pc = 26; return s.tmp_0;
+    s.callLocIdx = 1198; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     if (!r0) { step = 14; continue; }
-    s.tmp_0 = music_Melody_play__P186822_mk(s);
-    s.tmp_0.arg0 = globals.winSound___189563;
+    s.tmp_0 = music_Melody_play__P1605_mk(s);
+    s.tmp_0.arg0 = globals.winSound___4347;
     s.tmp_0.arg1 = 255;
-    s.callLocIdx = 1192; s.pc = 27; return s.tmp_0;
+    s.callLocIdx = 1199; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
     { step = 15; continue; }
   case 14:
-    s.tmp_0 = music_Melody_play__P186822_mk(s);
-    s.tmp_0.arg0 = globals.loseSound___189561;
+    s.tmp_0 = music_Melody_play__P1605_mk(s);
+    s.tmp_0.arg0 = globals.loseSound___4345;
     s.tmp_0.arg1 = 255;
-    s.callLocIdx = 1193; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1200; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
   case 15:
@@ -46959,54 +46978,54 @@ switch (step) {
     s.tmp_0.arg0 = s.arg1;
     if (!s.tmp_0.arg0.vtable.iface) {
       setupLambda(s.tmp_0, pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "startScreenEffect"), 1);
-      s.callLocIdx = 1194; s.pc = 29; return s.tmp_0;
+      s.callLocIdx = 1201; s.pc = 29; return s.tmp_0;
     } else {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["startScreenEffect"];
-      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["startScreenEffect"], 1); s.callLocIdx = 1194; s.pc = 29; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1194; s.pc = 29; return s.tmp_0;; }
-     else { s.callLocIdx = 1194; s.pc = 29; return s.tmp_0; }
+      if (s.tmp_0.fn == null) { setupLambda(s.tmp_0, s.tmp_0.arg0.fields["startScreenEffect"], 1); s.callLocIdx = 1201; s.pc = 29; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1201; s.pc = 29; return s.tmp_0;; }
+     else { s.callLocIdx = 1201; s.pc = 29; return s.tmp_0; }
     }
   case 29:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 400;
-    s.callLocIdx = 1195; s.pc = 30; return s.tmp_0;
+    s.callLocIdx = 1202; s.pc = 30; return s.tmp_0;
   case 30:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(game_GameOverDialog__C187733_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(game_GameOverDialog__C2516_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = game_GameOverDialog_constructor__P187734_mk(s);
+    s.tmp_1 = game_GameOverDialog_constructor__P2517_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
-    r0 = s.scoreInfo___202444.fields["score"];
+    r0 = s.scoreInfo___17511.fields["score"];
     s.tmp_1.arg2 = r0;
-    s.tmp_1.arg3 = s.highScore___202448;
-    s.callLocIdx = 1196; s.pc = 31; return s.tmp_1;
+    s.tmp_1.arg3 = s.highScore___17515;
+    s.callLocIdx = 1203; s.pc = 31; return s.tmp_1;
   case 31:
     r0 = s.retval;
-    s.overDialog___202477 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P202487);
+    s.overDialog___17544 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P17554);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overDialog___202477);
-    s.tmp_1 = scene_createRenderable__P187600_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.overDialog___17544);
+    s.tmp_1 = scene_createRenderable__P2383_mk(s);
     s.tmp_1.arg0 = 100;
     s.tmp_1.arg1 = s.tmp_0;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1197; s.pc = 32; return s.tmp_1;
+    s.callLocIdx = 1204; s.pc = 32; return s.tmp_1;
   case 32:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 500;
-    s.callLocIdx = 1198; s.pc = 33; return s.tmp_0;
+    s.callLocIdx = 1205; s.pc = 33; return s.tmp_0;
   case 33:
     r0 = s.retval;
-    s.tmp_0 = game_GameOverDialog_displayCursor__P187735_mk(s);
-    s.tmp_0.arg0 = s.overDialog___202477;
-    s.callLocIdx = 1199; s.pc = 34; return s.tmp_0;
+    s.tmp_0 = game_GameOverDialog_displayCursor__P2518_mk(s);
+    s.tmp_0.arg0 = s.overDialog___17544;
+    s.callLocIdx = 1206; s.pc = 34; return s.tmp_0;
   case 34:
     r0 = s.retval;
-    s.tmp_0 = game_waitAnyButton__P187751_mk(s);
-    s.callLocIdx = 1200; s.pc = 35; return s.tmp_0;
+    s.tmp_0 = game_waitAnyButton__P2534_mk(s);
+    s.callLocIdx = 1207; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
     setupResume(s, 36);
@@ -47021,19 +47040,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_over__P187759.info = {"start":5382,"length":1774,"line":181,"column":4,"endLine":232,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"over","argumentNames":["win","effect"]}
+game_over__P2542.info = {"start":5382,"length":1774,"line":181,"column":4,"endLine":232,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"over","argumentNames":["win","effect"]}
 
-function game_over__P187759_mk(s) {
+function game_over__P2542_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_over__P187759, depth: s.depth + 1,
+        parent: s, fn: game_over__P2542, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  scoreInfo___202444: undefined,
-  highScore___202448: undefined,
-  overDialog___202477: undefined,
+  scoreInfo___17511: undefined,
+  highScore___17515: undefined,
+  overDialog___17544: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -47042,7 +47061,7 @@ function game_over__P187759_mk(s) {
 
 
 
-function inline__P202487(s) {
+function inline__P17554(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47056,9 +47075,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_GameOverDialog__C187733_v0_1_mk(s);
+    s.tmp_0 = game_GameOverDialog__C2516_v0_1_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C187733_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C2516_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.update;
     s.pc = 1; return s.tmp_0;
   case 1:
@@ -47066,7 +47085,7 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = s.caps[0].fields["image"];
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_4 = r0;
     r0 = s.caps[0].fields["image"];
     s.tmp_6 = r0;
@@ -47081,12 +47100,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202487.info = {"start":6721,"length":254,"line":218,"column":48,"endLine":225,"endColumn":13,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["target"]}
+inline__P17554.info = {"start":6721,"length":254,"line":218,"column":48,"endLine":225,"endColumn":13,"fileName":"pxt_modules/game/game.ts","functionName":"inline","argumentNames":["target"]}
 
-function inline__P202487_mk(s) {
+function inline__P17554_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202487, depth: s.depth + 1,
+        parent: s, fn: inline__P17554, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47102,7 +47121,7 @@ function inline__P202487_mk(s) {
 
 
 
-function game_waitAnyButton__P187751(s) {
+function game_waitAnyButton__P2534(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47112,19 +47131,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.__waitAnyButton___189568);
+    r0 = pxsim_numops_toBoolDecr(globals.__waitAnyButton___4352);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = globals.__waitAnyButton___189568;
+    s.tmp_0.argL = globals.__waitAnyButton___4352;
     setupLambda(s.tmp_0, s.tmp_0.argL);
-    s.callLocIdx = 1144; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1151; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     s.tmp_0.arg0 = 3000;
-    s.callLocIdx = 1145; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1152; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 2:
@@ -47132,12 +47151,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_waitAnyButton__P187751.info = {"start":967,"length":111,"line":35,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"waitAnyButton","argumentNames":[]}
+game_waitAnyButton__P2534.info = {"start":967,"length":111,"line":35,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"waitAnyButton","argumentNames":[]}
 
-function game_waitAnyButton__P187751_mk(s) {
+function game_waitAnyButton__P2534_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_waitAnyButton__P187751, depth: s.depth + 1,
+        parent: s, fn: game_waitAnyButton__P2534, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -47146,7 +47165,7 @@ function game_waitAnyButton__P187751_mk(s) {
 
 
 
-function game_GameOverDialog_update__P187736(s) {
+function game_GameOverDialog_update__P2519(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47161,15 +47180,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C187733_VT)) failedCast(r0);
-    s.tmp_0 = game_BaseDialog_clearInterior__P189539_mk(s);
+    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
+    s.tmp_0 = game_BaseDialog_clearInterior__P4323_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1111; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1118; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = game_GameOverDialog__C187733_v2_1_mk(s);
+    s.tmp_0 = game_GameOverDialog__C2516_v2_1_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C187733_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, game_GameOverDialog__C2516_VT)) failedCast(s.tmp_0.arg0);
     s.tmp_0.fn = s.tmp_0.arg0.vtable.methods.drawTextCore;
     s.pc = 4; return s.tmp_0;
   case 4:
@@ -47178,9 +47197,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = game_BaseDialog_drawCursorRow__P187710_mk(s);
+    s.tmp_1 = game_BaseDialog_drawCursorRow__P2493_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.callLocIdx = 1112; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1119; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
   case 1:
@@ -47189,12 +47208,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_GameOverDialog_update__P187736.info = {"start":11365,"length":173,"line":349,"column":8,"endLine":356,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"update","argumentNames":["this"]}
+game_GameOverDialog_update__P2519.info = {"start":11365,"length":173,"line":349,"column":8,"endLine":356,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"update","argumentNames":["this"]}
 
-function game_GameOverDialog_update__P187736_mk(s) {
+function game_GameOverDialog_update__P2519_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_GameOverDialog_update__P187736, depth: s.depth + 1,
+        parent: s, fn: game_GameOverDialog_update__P2519, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47205,7 +47224,7 @@ function game_GameOverDialog_update__P187736_mk(s) {
 
 
 
-function game_GameOverDialog_drawTextCore__P187737(s) {
+function game_GameOverDialog_drawTextCore__P2520(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47215,13 +47234,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scoreColor___202545 = undefined;
+    s.scoreColor___17612 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C187733_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
     r0 = s.arg0.fields["win"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -47233,7 +47252,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
@@ -47244,14 +47263,14 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_4 = helpers_imagePrintCenter__P186976_mk(s);
+    s.tmp_4 = helpers_imagePrintCenter__P1759_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.tmp_1;
     s.tmp_4.arg2 = 8;
     s.tmp_4.arg3 = s.tmp_3;
-    s.tmp_4.arg4 = globals.font8___186962;
-    s.callLocIdx = 1113; s.pc = 11; return s.tmp_4;
+    s.tmp_4.arg4 = globals.font8___1745;
+    s.callLocIdx = 1120; s.pc = 11; return s.tmp_4;
   case 11:
     r0 = s.retval;
     r0 = s.arg0.fields["score"];
@@ -47260,7 +47279,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 5; continue; }
@@ -47271,8 +47290,8 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.scoreColor___202545 = (s.tmp_3);
-    s.tmp_0 = helpers_imagePrintCenter__P186976_mk(s);
+    s.scoreColor___17612 = (s.tmp_3);
+    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["score"];
@@ -47289,28 +47308,28 @@ switch (step) {
     r0 = pxsim_String__concat("Score:", s.tmp_1);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 23;
-    s.tmp_0.arg3 = s.scoreColor___202545;
-    s.tmp_0.arg4 = globals.font8___186962;
-    s.callLocIdx = 1114; s.pc = 12; return s.tmp_0;
+    s.tmp_0.arg3 = s.scoreColor___17612;
+    s.tmp_0.arg4 = globals.font8___1745;
+    s.callLocIdx = 1121; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     r0 = s.arg0.fields["isNewHighScore"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = helpers_imagePrintCenter__P186976_mk(s);
+    s.tmp_1 = helpers_imagePrintCenter__P1759_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = "New High Score!";
     s.tmp_1.arg2 = 34;
-    s.tmp_1.arg3 = s.scoreColor___202545;
-    s.tmp_1.arg4 = globals.font5___186967;
-    s.callLocIdx = 1115; s.pc = 14; return s.tmp_1;
+    s.tmp_1.arg3 = s.scoreColor___17612;
+    s.tmp_1.arg4 = globals.font5___1750;
+    s.callLocIdx = 1122; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
     { step = 8; continue; }
   case 7:
-    s.tmp_0 = helpers_imagePrintCenter__P186976_mk(s);
+    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["highScore"];
@@ -47327,9 +47346,9 @@ switch (step) {
     r0 = pxsim_String__concat("HI", s.tmp_1);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 34;
-    s.tmp_0.arg3 = s.scoreColor___202545;
-    s.tmp_0.arg4 = globals.font8___186962;
-    s.callLocIdx = 1116; s.pc = 15; return s.tmp_0;
+    s.tmp_0.arg3 = s.scoreColor___17612;
+    s.tmp_0.arg4 = globals.font8___1745;
+    s.callLocIdx = 1123; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
   case 8:
@@ -47339,19 +47358,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_GameOverDialog_drawTextCore__P187737.info = {"start":11548,"length":1200,"line":358,"column":8,"endLine":395,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
+game_GameOverDialog_drawTextCore__P2520.info = {"start":11548,"length":1200,"line":358,"column":8,"endLine":395,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
 
-function game_GameOverDialog_drawTextCore__P187737_mk(s) {
+function game_GameOverDialog_drawTextCore__P2520_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_GameOverDialog_drawTextCore__P187737, depth: s.depth + 1,
+        parent: s, fn: game_GameOverDialog_drawTextCore__P2520, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  scoreColor___202545: undefined,
+  scoreColor___17612: undefined,
   arg0: undefined,
 } }
 
@@ -47359,7 +47378,7 @@ function game_GameOverDialog_drawTextCore__P187737_mk(s) {
 
 
 
-function helpers_imagePrintCenter__P186976(s) {
+function helpers_imagePrintCenter__P1759(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47369,8 +47388,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.w___202593 = undefined;
-    s.x___202599 = undefined;
+    s.w___17660 = undefined;
+    s.x___17666 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -47385,7 +47404,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = image_getFontForText__P186964_mk(s);
+    s.tmp_2 = image_getFontForText__P1747_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 136; s.pc = 3; return s.tmp_2;
   case 3:
@@ -47409,17 +47428,17 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 * s.tmp_1);
-    s.w___202593 = (r0);
+    s.w___17660 = (r0);
     r0 = pxsim_ImageMethods.width(s.arg0);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.w___202593);
+    r0 = (s.tmp_1 - s.w___17660);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 2);
-    s.x___202599 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
+    s.x___17666 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.tmp_0.arg2 = s.x___202599;
+    s.tmp_0.arg2 = s.x___17666;
     s.tmp_0.arg3 = s.arg2;
     s.tmp_0.arg4 = s.arg3;
     s.tmp_0.arg5 = s.arg4;
@@ -47431,18 +47450,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imagePrintCenter__P186976.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"]}
+helpers_imagePrintCenter__P1759.info = {"start":15025,"length":295,"line":206,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"imagePrintCenter","argumentNames":["img","text","y","color","font"]}
 
-function helpers_imagePrintCenter__P186976_mk(s) {
+function helpers_imagePrintCenter__P1759_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imagePrintCenter__P186976, depth: s.depth + 1,
+        parent: s, fn: helpers_imagePrintCenter__P1759, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  w___202593: undefined,
-  x___202599: undefined,
+  w___17660: undefined,
+  x___17666: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -47454,7 +47473,7 @@ function helpers_imagePrintCenter__P186976_mk(s) {
 
 
 
-function game_GameOverDialog_displayCursor__P187735(s) {
+function game_GameOverDialog_displayCursor__P2518(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47469,18 +47488,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C187733_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
     r0 = (s.arg0).fields["cursorOn"] = (true);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_GameOverDialog_displayCursor__P187735.info = {"start":11294,"length":61,"line":345,"column":8,"endLine":347,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"displayCursor","argumentNames":["this"]}
+game_GameOverDialog_displayCursor__P2518.info = {"start":11294,"length":61,"line":345,"column":8,"endLine":347,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"displayCursor","argumentNames":["this"]}
 
-function game_GameOverDialog_displayCursor__P187735_mk(s) {
+function game_GameOverDialog_displayCursor__P2518_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_GameOverDialog_displayCursor__P187735, depth: s.depth + 1,
+        parent: s, fn: game_GameOverDialog_displayCursor__P2518, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -47489,7 +47508,7 @@ function game_GameOverDialog_displayCursor__P187735_mk(s) {
 
 
 
-function game_GameOverDialog_constructor__P187734(s) {
+function game_GameOverDialog_constructor__P2517(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47507,23 +47526,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_GameOverDialog__C187733_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_GameOverDialog__C2516_VT)) failedCast(r0);
     r0 = (s.arg0).fields["win"] = (s.arg1);
     r0 = (s.arg0).fields["score"] = (s.arg2);
     r0 = (s.arg0).fields["highScore"] = (s.arg3);
-    s.tmp_0 = game_BaseDialog_constructor__P187706_mk(s);
+    s.tmp_0 = game_BaseDialog_constructor__P2489_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 46;
-    s.tmp_1 = game_defaultSplashFrame__P189551_mk(s);
-    s.callLocIdx = 1109; s.pc = 2; return s.tmp_1;
+    s.tmp_1 = game_defaultSplashFrame__P4335_mk(s);
+    s.callLocIdx = 1116; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg3 = r0;
     s.tmp_0.arg4 = undefined;
     s.tmp_0.arg5 = undefined;
-    s.callLocIdx = 1110; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1117; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = (s.arg0).fields["cursorOn"] = (false);
@@ -47539,12 +47558,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_GameOverDialog_constructor__P187734.info = {"start":10978,"length":306,"line":335,"column":8,"endLine":343,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","win","score","highScore"]}
+game_GameOverDialog_constructor__P2517.info = {"start":10978,"length":306,"line":335,"column":8,"endLine":343,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"inline","argumentNames":["this","win","score","highScore"]}
 
-function game_GameOverDialog_constructor__P187734_mk(s) {
+function game_GameOverDialog_constructor__P2517_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_GameOverDialog_constructor__P187734, depth: s.depth + 1,
+        parent: s, fn: game_GameOverDialog_constructor__P2517, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47560,7 +47579,7 @@ function game_GameOverDialog_constructor__P187734_mk(s) {
 
 
 
-function game_defaultSplashFrame__P189551(s) {
+function game_defaultSplashFrame__P4335(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47570,14 +47589,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.isMono(globals.screen___187019);
+    r0 = pxsim_ImageMethods.isMono(globals.screen___1802);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim.image.ofBuffer(_hex202633);
+    r0 = pxsim.image.ofBuffer(_hex17700);
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.image.ofBuffer(_hex202635);
+    r0 = pxsim.image.ofBuffer(_hex17702);
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -47585,24 +47604,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_defaultSplashFrame__P189551.info = {"start":16870,"length":220,"line":528,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultSplashFrame","argumentNames":[]}
+game_defaultSplashFrame__P4335.info = {"start":16870,"length":220,"line":528,"column":4,"endLine":541,"endColumn":5,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"defaultSplashFrame","argumentNames":[]}
 
-function game_defaultSplashFrame__P189551_mk(s) {
+function game_defaultSplashFrame__P4335_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_defaultSplashFrame__P189551, depth: s.depth + 1,
+        parent: s, fn: game_defaultSplashFrame__P4335, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
 } }
 
-const _hex202633 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100000101000001010000")
-const _hex202635 = pxsim.BufferMethods.createBufferFromHex("8704030003000000f1010000f1010000f1010000")
+const _hex17700 = pxsim.BufferMethods.createBufferFromHex("8704030003000000010100000101000001010000")
+const _hex17702 = pxsim.BufferMethods.createBufferFromHex("8704030003000000f1010000f1010000f1010000")
 
 
 
 
-function scene_Scene_destroy__P187662(s) {
+function scene_Scene_destroy__P2445(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47617,7 +47636,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C187636_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
     r0 = (s.arg0).fields["eventContext"] = (undefined);
     r0 = (s.arg0).fields["background"] = (undefined);
     r0 = (s.arg0).fields["tileMap"] = (undefined);
@@ -47639,12 +47658,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Scene_destroy__P187662.info = {"start":6997,"length":764,"line":198,"column":8,"endLine":216,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"destroy","argumentNames":["this"]}
+scene_Scene_destroy__P2445.info = {"start":6997,"length":764,"line":198,"column":8,"endLine":216,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"destroy","argumentNames":["this"]}
 
-function scene_Scene_destroy__P187662_mk(s) {
+function scene_Scene_destroy__P2445_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_destroy__P187662, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_destroy__P2445, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -47653,7 +47672,7 @@ function scene_Scene_destroy__P187662_mk(s) {
 
 
 
-function info_highScore__P187422(s) {
+function info_highScore__P2205(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47663,7 +47682,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_1 = settings_readNumber__P187050_mk(s);
+    s.tmp_1 = settings_readNumber__P1833_mk(s);
     s.tmp_1.arg0 = "high-score";
     s.callLocIdx = 804; s.pc = 3; return s.tmp_1;
   case 3:
@@ -47682,12 +47701,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_highScore__P187422.info = {"start":7086,"length":98,"line":240,"column":4,"endLine":242,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"highScore","argumentNames":[]}
+info_highScore__P2205.info = {"start":7086,"length":98,"line":240,"column":4,"endLine":242,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"highScore","argumentNames":[]}
 
-function info_highScore__P187422_mk(s) {
+function info_highScore__P2205_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_highScore__P187422, depth: s.depth + 1,
+        parent: s, fn: info_highScore__P2205, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47698,7 +47717,7 @@ function info_highScore__P187422_mk(s) {
 
 
 
-function info_saveHighScore__P187419(s) {
+function info_saveHighScore__P2202(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47708,20 +47727,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hs___203467 = undefined;
-    s.curr___203484 = undefined;
-    r0 = pxsim_numops_toBoolDecr(globals.players___189447);
+    s.hs___18534 = undefined;
+    s.curr___18551 = undefined;
+    r0 = pxsim_numops_toBoolDecr(globals.players___4231);
     if (!r0) { step = 5; continue; }
     r0 = pxsim_pxtrt.mklocRef();
-    s.hs___203467 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.hs___203467, 0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P203477);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hs___203467);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_2 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_2.arg0 = globals.players___189447;
-    s.tmp_2.arg1 = inline__P203471;
+    s.hs___18534 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.hs___18534, 0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P18544);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hs___18534);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_2 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_2.arg0 = globals.players___4231;
+    s.tmp_2.arg1 = inline__P18538;
     s.callLocIdx = 798; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
@@ -47730,30 +47749,30 @@ switch (step) {
     s.callLocIdx = 801; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = settings_readNumber__P187050_mk(s);
+    s.tmp_0 = settings_readNumber__P1833_mk(s);
     s.tmp_0.arg0 = "high-score";
     s.callLocIdx = 802; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.curr___203484 = (r0);
-    r0 = (s.curr___203484 == null);
+    s.curr___18551 = (r0);
+    r0 = (s.curr___18551 == null);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_pxtrt_ldlocRef(s.hs___203467);
+    r0 = pxsim_pxtrt_ldlocRef(s.hs___18534);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.curr___203484);
+    r0 = (s.tmp_1 > s.curr___18551);
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = settings_writeNumber__P187046_mk(s);
+    s.tmp_3 = settings_writeNumber__P1829_mk(s);
     s.tmp_3.arg0 = "high-score";
-    r0 = pxsim_pxtrt_ldlocRef(s.hs___203467);
+    r0 = pxsim_pxtrt_ldlocRef(s.hs___18534);
     s.tmp_3.arg1 = r0;
     s.callLocIdx = 803; s.pc = 10; return s.tmp_3;
   case 10:
@@ -47766,26 +47785,26 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-info_saveHighScore__P187419.info = {"start":6187,"length":383,"line":204,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"saveHighScore","argumentNames":[]}
+info_saveHighScore__P2202.info = {"start":6187,"length":383,"line":204,"column":4,"endLine":214,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"saveHighScore","argumentNames":[]}
 
-function info_saveHighScore__P187419_mk(s) {
+function info_saveHighScore__P2202_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_saveHighScore__P187419, depth: s.depth + 1,
+        parent: s, fn: info_saveHighScore__P2202, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  hs___203467: undefined,
-  curr___203484: undefined,
+  hs___18534: undefined,
+  curr___18551: undefined,
 } }
 
 
 
 
 
-function inline__P203471(s) {
+function inline__P18538(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47805,7 +47824,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_1 = info_PlayerInfo_hasScore__P187461_mk(s);
+    s.tmp_1 = info_PlayerInfo_hasScore__P2244_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 797; s.pc = 3; return s.tmp_1;
   case 3:
@@ -47817,12 +47836,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P203471.info = {"start":6312,"length":22,"line":208,"column":24,"endLine":208,"endColumn":46,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P18538.info = {"start":6312,"length":22,"line":208,"column":24,"endLine":208,"endColumn":46,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P203471_mk(s) {
+function inline__P18538_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P203471, depth: s.depth + 1,
+        parent: s, fn: inline__P18538, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47834,7 +47853,7 @@ function inline__P203471_mk(s) {
 
 
 
-function inline__P203477(s) {
+function inline__P18544(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47849,10 +47868,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_0 = r0 = s.caps[0];
-    s.tmp_2 = Math_max__P185342_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_2.arg0 = r0;
-    s.tmp_3 = info_PlayerInfo_score__P187458_mk(s);
+    s.tmp_3 = info_PlayerInfo_score__P2241_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 799; s.pc = 2; return s.tmp_3;
   case 2:
@@ -47867,12 +47886,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P203477.info = {"start":6361,"length":33,"line":209,"column":25,"endLine":209,"endColumn":58,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
+inline__P18544.info = {"start":6361,"length":33,"line":209,"column":25,"endLine":209,"endColumn":58,"fileName":"pxt_modules/game/info.ts","functionName":"inline","argumentNames":["p"]}
 
-function inline__P203477_mk(s) {
+function inline__P18544_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P203477, depth: s.depth + 1,
+        parent: s, fn: inline__P18544, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -47885,7 +47904,7 @@ function inline__P203477_mk(s) {
 
 
 
-function music_Melody_play__P186822(s) {
+function music_Melody_play__P1605(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47901,8 +47920,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C186815_VT)) failedCast(r0);
-    s.tmp_0 = music_Melody_playCore__P189289_mk(s);
+    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
+    s.tmp_0 = music_Melody_playCore__P4073_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = false;
@@ -47913,12 +47932,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_play__P186822.info = {"start":8858,"length":71,"line":278,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"play","argumentNames":["this","volume"]}
+music_Melody_play__P1605.info = {"start":8858,"length":71,"line":278,"column":8,"endLine":280,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"play","argumentNames":["this","volume"]}
 
-function music_Melody_play__P186822_mk(s) {
+function music_Melody_play__P1605_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_play__P186822, depth: s.depth + 1,
+        parent: s, fn: music_Melody_play__P1605, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -47929,7 +47948,7 @@ function music_Melody_play__P186822_mk(s) {
 
 
 
-function music_Melody_playCore__P189289(s) {
+function music_Melody_playCore__P4073(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -47939,7 +47958,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___202644 = undefined;
+    s.p___17711 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -47947,31 +47966,31 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C186815_VT)) failedCast(r0);
-    s.tmp_0 = music_Melody_stop__P186820_mk(s);
+    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
+    s.tmp_0 = music_Melody_stop__P1603_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 83; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(music_MelodyPlayer__C186825_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(music_MelodyPlayer__C1608_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = music_MelodyPlayer_constructor__P186828_mk(s);
+    s.tmp_1 = music_MelodyPlayer_constructor__P1611_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.callLocIdx = 84; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     r0 = (s.arg0).fields["_player"] = (s.tmp_0);
-    s.p___202644 = (s.tmp_0);
-    s.tmp_0 = music_Melody_registerMelody__P189287_mk(s);
+    s.p___17711 = (s.tmp_0);
+    s.tmp_0 = music_Melody_registerMelody__P4071_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 85; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(4, inline__P202654);
+    r0 = pxsim_pxtcore_mkAction(4, inline__P17721);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.p___202644);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.p___17711);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg1);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.arg2);
     r0 = pxsim.control.runInParallel(s.tmp_0);
@@ -47979,16 +47998,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_playCore__P189289.info = {"start":7682,"length":434,"line":242,"column":8,"endLine":254,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playCore","argumentNames":["this","volume","loop"]}
+music_Melody_playCore__P4073.info = {"start":7682,"length":434,"line":242,"column":8,"endLine":254,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playCore","argumentNames":["this","volume","loop"]}
 
-function music_Melody_playCore__P189289_mk(s) {
+function music_Melody_playCore__P4073_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_playCore__P189289, depth: s.depth + 1,
+        parent: s, fn: music_Melody_playCore__P4073, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  p___202644: undefined,
+  p___17711: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -47998,7 +48017,7 @@ function music_Melody_playCore__P189289_mk(s) {
 
 
 
-function inline__P202654(s) {
+function inline__P17721(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48015,7 +48034,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = music_MelodyPlayer_play__P186830_mk(s);
+    s.tmp_2 = music_MelodyPlayer_play__P1613_mk(s);
     s.tmp_2.arg0 = s.caps[1];
     s.tmp_2.arg1 = s.caps[2];
     s.callLocIdx = 86; s.pc = 5; return s.tmp_2;
@@ -48032,7 +48051,7 @@ switch (step) {
   case 3:
     { step = 1; continue; }
   case 4:
-    s.tmp_2 = music_Melody_unregisterMelody__P189288_mk(s);
+    s.tmp_2 = music_Melody_unregisterMelody__P4072_mk(s);
     s.tmp_2.arg0 = s.caps[0];
     s.callLocIdx = 87; s.pc = 6; return s.tmp_2;
   case 6:
@@ -48041,12 +48060,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202654.info = {"start":7885,"length":220,"line":246,"column":34,"endLine":253,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
+inline__P17721.info = {"start":7885,"length":220,"line":246,"column":34,"endLine":253,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P202654_mk(s) {
+function inline__P17721_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202654, depth: s.depth + 1,
+        parent: s, fn: inline__P17721, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48057,7 +48076,7 @@ function inline__P202654_mk(s) {
 
 
 
-function music_Melody_unregisterMelody__P189288(s) {
+function music_Melody_unregisterMelody__P4072(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48072,22 +48091,22 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C186815_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___189290);
+    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___4074);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___189290, s.arg0);
+    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___4074, s.arg0);
   case 1:
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_unregisterMelody__P189288.info = {"start":7471,"length":201,"line":235,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"unregisterMelody","argumentNames":["this"]}
+music_Melody_unregisterMelody__P4072.info = {"start":7471,"length":201,"line":235,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"unregisterMelody","argumentNames":["this"]}
 
-function music_Melody_unregisterMelody__P189288_mk(s) {
+function music_Melody_unregisterMelody__P4072_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_unregisterMelody__P189288, depth: s.depth + 1,
+        parent: s, fn: music_Melody_unregisterMelody__P4072, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -48096,7 +48115,7 @@ function music_Melody_unregisterMelody__P189288_mk(s) {
 
 
 
-function music_Melody_registerMelody__P189287(s) {
+function music_Melody_registerMelody__P4071(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48111,26 +48130,26 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C186815_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___189290);
+    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals.music_Melody_playingMelodies___4074);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
     r0 = pxsim_Array__mk();
-    globals.music_Melody_playingMelodies___189290 = (r0);
+    globals.music_Melody_playingMelodies___4074 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___189290);
+    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___4074);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 4);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = music_Melody_stop__P186820_mk(s);
-    s.tmp_3 = r0 = globals.music_Melody_playingMelodies___189290;
-    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___189290);
+    s.tmp_2 = music_Melody_stop__P1603_mk(s);
+    s.tmp_3 = r0 = globals.music_Melody_playingMelodies___4074;
+    r0 = pxsim_Array__length(globals.music_Melody_playingMelodies___4074);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 - 1);
     s.tmp_4 = r0;
@@ -48141,18 +48160,18 @@ switch (step) {
     r0 = s.retval;
   case 3:
   case 4:
-    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___189290, s.arg0);
-    r0 = pxsim_Array__push(globals.music_Melody_playingMelodies___189290, s.arg0);
+    r0 = pxsim_Array_.removeElement(globals.music_Melody_playingMelodies___4074, s.arg0);
+    r0 = pxsim_Array__push(globals.music_Melody_playingMelodies___4074, s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_registerMelody__P189287.info = {"start":6889,"length":573,"line":223,"column":8,"endLine":234,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"registerMelody","argumentNames":["this"]}
+music_Melody_registerMelody__P4071.info = {"start":6889,"length":573,"line":223,"column":8,"endLine":234,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"registerMelody","argumentNames":["this"]}
 
-function music_Melody_registerMelody__P189287_mk(s) {
+function music_Melody_registerMelody__P4071_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_registerMelody__P189287, depth: s.depth + 1,
+        parent: s, fn: music_Melody_registerMelody__P4071, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48167,7 +48186,7 @@ function music_Melody_registerMelody__P189287_mk(s) {
 
 
 
-function music_MelodyPlayer_play__P186830(s) {
+function music_MelodyPlayer_play__P1613(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48177,46 +48196,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.notes___202683 = undefined;
-    s.pos___202687 = undefined;
-    s.duration___202688 = undefined;
-    s.octave___202689 = undefined;
-    s.tempo___202690 = undefined;
-    s.hz___202691 = undefined;
-    s.endHz___202692 = undefined;
-    s.ms___202695 = undefined;
-    s.timePos___202696 = undefined;
-    s.startTime___202697 = undefined;
-    s.now___202700 = undefined;
-    s.envA___202701 = undefined;
-    s.envD___202702 = undefined;
-    s.envS___202703 = undefined;
-    s.envR___202704 = undefined;
-    s.soundWave___202705 = undefined;
-    s.sndInstr___202706 = undefined;
-    s.sndInstrPtr___202712 = undefined;
-    s.addForm___202713 = undefined;
-    s.scanNextWord___202773 = undefined;
-    s.token___202830 = undefined;
-    s.tokenKind___202831 = undefined;
-    s.consumeToken___202834 = undefined;
-    s.currNote___202910 = undefined;
-    s.prevNote___202912 = undefined;
-    s.timeLeft___202915 = undefined;
-    s.note___202929 = undefined;
-    s.i___202933 = undefined;
-    s.noteChar___202939 = undefined;
-    s.keyNumber___203013 = undefined;
-    s.currMs___203030 = undefined;
-    s.beat___203034 = undefined;
-    s.timeLeft___203091 = undefined;
+    s.notes___17750 = undefined;
+    s.pos___17754 = undefined;
+    s.duration___17755 = undefined;
+    s.octave___17756 = undefined;
+    s.tempo___17757 = undefined;
+    s.hz___17758 = undefined;
+    s.endHz___17759 = undefined;
+    s.ms___17762 = undefined;
+    s.timePos___17763 = undefined;
+    s.startTime___17764 = undefined;
+    s.now___17767 = undefined;
+    s.envA___17768 = undefined;
+    s.envD___17769 = undefined;
+    s.envS___17770 = undefined;
+    s.envR___17771 = undefined;
+    s.soundWave___17772 = undefined;
+    s.sndInstr___17773 = undefined;
+    s.sndInstrPtr___17779 = undefined;
+    s.addForm___17780 = undefined;
+    s.scanNextWord___17840 = undefined;
+    s.token___17897 = undefined;
+    s.tokenKind___17898 = undefined;
+    s.consumeToken___17901 = undefined;
+    s.currNote___17977 = undefined;
+    s.prevNote___17979 = undefined;
+    s.timeLeft___17982 = undefined;
+    s.note___17996 = undefined;
+    s.i___18000 = undefined;
+    s.noteChar___18006 = undefined;
+    s.keyNumber___18080 = undefined;
+    s.currMs___18097 = undefined;
+    s.beat___18101 = undefined;
+    s.timeLeft___18158 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C186825_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
     r0 = pxsim_pxtrt.mklocRef();
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.arg1);
@@ -48233,12 +48252,12 @@ switch (step) {
   case 1:
   case 2:
     s.tmp_4 = r0 = s.arg1;
-    s.tmp_6 = Math_clamp__P185339_mk(s);
+    s.tmp_6 = Math_clamp__P122_mk(s);
     s.tmp_6.arg0 = 0;
     s.tmp_6.arg1 = 255;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_8 = r0;
-    s.tmp_10 = music_volume__P186810_mk(s);
+    s.tmp_10 = music_volume__P1593_mk(s);
     s.callLocIdx = 89; s.pc = 61; return s.tmp_10;
   case 61:
     r0 = s.retval;
@@ -48254,121 +48273,121 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_4, s.tmp_5);
     r0 = s.arg0.fields["melody"];
     r0 = r0.fields["_text"];
-    s.notes___202683 = (r0);
+    s.notes___17750 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.pos___202687 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.pos___202687, 0);
+    s.pos___17754 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.pos___17754, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.duration___202688 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.duration___202688, 4);
+    s.duration___17755 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.duration___17755, 4);
     r0 = pxsim_pxtrt.mklocRef();
-    s.octave___202689 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.octave___202689, 4);
+    s.octave___17756 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.octave___17756, 4);
     r0 = pxsim_pxtrt.mklocRef();
-    s.tempo___202690 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.tempo___202690, 120);
+    s.tempo___17757 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.tempo___17757, 120);
     r0 = pxsim_pxtrt.mklocRef();
-    s.hz___202691 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.hz___202691, 0);
+    s.hz___17758 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.hz___17758, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.endHz___202692 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.endHz___202692, -1);
+    s.endHz___17759 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.endHz___17759, -1);
     r0 = pxsim_pxtrt.mklocRef();
-    s.ms___202695 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.ms___202695, 0);
-    s.timePos___202696 = (0);
+    s.ms___17762 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.ms___17762, 0);
+    s.timePos___17763 = (0);
     r0 = pxsim.control.millis();
-    s.startTime___202697 = (r0);
-    s.now___202700 = (0);
+    s.startTime___17764 = (r0);
+    s.now___17767 = (0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.envA___202701 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envA___202701, 0);
+    s.envA___17768 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envA___17768, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.envD___202702 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envD___202702, 0);
+    s.envD___17769 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envD___17769, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.envS___202703 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envS___202703, 255);
+    s.envS___17770 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envS___17770, 255);
     r0 = pxsim_pxtrt.mklocRef();
-    s.envR___202704 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.envR___202704, 0);
+    s.envR___17771 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.envR___17771, 0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.soundWave___202705 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.soundWave___202705, 1);
+    s.soundWave___17772 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.soundWave___17772, 1);
     r0 = pxsim.control.createBuffer(60);
-    s.sndInstr___202706 = (r0);
+    s.sndInstr___17773 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.sndInstrPtr___202712 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___202712, 0);
-    r0 = pxsim_pxtcore_mkAction(10, inline__P202714);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hz___202691);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.endHz___202692);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.ms___202695);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___202688);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.tempo___202690);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.envR___202704);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.sndInstrPtr___202712);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.sndInstr___202706);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.soundWave___202705);
+    s.sndInstrPtr___17779 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___17779, 0);
+    r0 = pxsim_pxtcore_mkAction(10, inline__P17781);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.hz___17758);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.endHz___17759);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.ms___17762);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___17755);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.tempo___17757);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.envR___17771);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.sndInstrPtr___17779);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.sndInstr___17773);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.soundWave___17772);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 9, s.arg1);
-    s.addForm___202713 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P202774);
+    s.addForm___17780 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P17841);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pos___202687);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.notes___202683);
-    s.scanNextWord___202773 = (s.tmp_0);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.pos___17754);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.notes___17750);
+    s.scanNextWord___17840 = (s.tmp_0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.token___202830 = (r0);
-    s.tmp_0 = r0 = s.token___202830;
+    s.token___17897 = (r0);
+    s.tmp_0 = r0 = s.token___17897;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     r0 = pxsim_pxtrt.mklocRef();
-    s.tokenKind___202831 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 0);
-    r0 = pxsim_pxtcore_mkAction(13, inline__P202835);
-    s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.token___202830);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tokenKind___202831);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.octave___202689);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___202688);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.ms___202695);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.tempo___202690);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.hz___202691);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.soundWave___202705);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.envA___202701);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 9, s.envD___202702);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 10, s.envS___202703);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 11, s.envR___202704);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 12, s.endHz___202692);
-    s.consumeToken___202834 = (s.tmp_0);
+    s.tokenKind___17898 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 0);
+    r0 = pxsim_pxtcore_mkAction(13, inline__P17902);
+    s.tmp_0 = r0;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.token___17897);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tokenKind___17898);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.octave___17756);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 3, s.duration___17755);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 4, s.ms___17762);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 5, s.tempo___17757);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 6, s.hz___17758);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 7, s.soundWave___17772);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 8, s.envA___17768);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 9, s.envD___17769);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 10, s.envS___17770);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 11, s.envR___17771);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 12, s.endHz___17759);
+    s.consumeToken___17901 = (s.tmp_0);
   case 3:
     r0 = pxsim_numops_toBoolDecr(true);
     if (!r0) { step = 58; continue; }
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.scanNextWord___202773;
+    s.tmp_0.argL = s.scanNextWord___17840;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 98; s.pc = 62; return s.tmp_0;
   case 62:
     r0 = s.retval;
-    s.currNote___202910 = (r0);
-    s.prevNote___202912 = (false);
-    r0 = pxsim_numops_toBoolDecr(s.currNote___202910);
+    s.currNote___17977 = (r0);
+    s.prevNote___17979 = (false);
+    r0 = pxsim_numops_toBoolDecr(s.currNote___17977);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    r0 = (s.timePos___202696 - s.now___202700);
-    s.timeLeft___202915 = (r0);
-    r0 = (s.timeLeft___202915 > 0);
+    r0 = (s.timePos___17763 - s.now___17767);
+    s.timeLeft___17982 = (r0);
+    r0 = (s.timeLeft___17982 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_1 = pause__P185619_mk(s);
-    s.tmp_1.arg0 = s.timeLeft___202915;
+    s.tmp_1 = pause__P402_mk(s);
+    s.tmp_1.arg0 = s.timeLeft___17982;
     s.callLocIdx = 99; s.pc = 63; return s.tmp_1;
   case 63:
     r0 = s.retval;
@@ -48396,25 +48415,25 @@ switch (step) {
     { step = 59; continue; }
   case 8:
   case 9:
-    r0 = pxsim_pxtrt_stlocRef(s.hz___202691, -1);
-    s.note___202929 = (0);
-    s.tmp_0 = r0 = s.token___202830;
+    r0 = pxsim_pxtrt_stlocRef(s.hz___17758, -1);
+    s.note___17996 = (0);
+    s.tmp_0 = r0 = s.token___17897;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 0);
-    s.i___202933 = (0);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 0);
+    s.i___18000 = (0);
   case 10:
-    s.tmp_1 = r0 = s.i___202933;
-    r0 = pxsim_String_.length(s.currNote___202910);
+    s.tmp_1 = r0 = s.i___18000;
+    r0 = pxsim_String_.length(s.currNote___17977);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 41; continue; }
-    r0 = pxsim_String_.charAt(s.currNote___202910, s.i___202933);
-    s.noteChar___202939 = (r0);
-    s.tmp_0 = r0 = s.noteChar___202939;
+    r0 = pxsim_String_.charAt(s.currNote___17977, s.i___18000);
+    s.noteChar___18006 = (r0);
+    s.tmp_0 = r0 = s.noteChar___18006;
     r0 = pxsim_pxtcore.switch_eq("c", s.tmp_0);
     if (r0) { step = 11; continue; }
     r0 = pxsim_pxtcore.switch_eq("C", s.tmp_0);
@@ -48467,133 +48486,133 @@ switch (step) {
     { step = 37; continue; }
   case 11:
   case 12:
-    s.note___202929 = (1);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (1);
+    s.prevNote___17979 = (true);
     { step = 40; continue; }
   case 13:
   case 14:
-    s.note___202929 = (3);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (3);
+    s.prevNote___17979 = (true);
     { step = 40; continue; }
   case 15:
   case 16:
-    s.note___202929 = (5);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (5);
+    s.prevNote___17979 = (true);
     { step = 40; continue; }
   case 17:
   case 18:
-    s.note___202929 = (6);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (6);
+    s.prevNote___17979 = (true);
     { step = 40; continue; }
   case 19:
   case 20:
-    s.note___202929 = (8);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (8);
+    s.prevNote___17979 = (true);
     { step = 40; continue; }
   case 21:
   case 22:
-    s.note___202929 = (10);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (10);
+    s.prevNote___17979 = (true);
     { step = 40; continue; }
   case 23:
-    s.note___202929 = (12);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (12);
+    s.prevNote___17979 = (true);
     { step = 40; continue; }
   case 24:
   case 25:
-    r0 = pxsim_pxtrt_stlocRef(s.hz___202691, 0);
-    s.prevNote___202912 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.hz___17758, 0);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 26:
-    r0 = (s.note___202929 + 1);
-    s.note___202929 = (r0);
-    s.prevNote___202912 = (false);
+    r0 = (s.note___17996 + 1);
+    s.note___17996 = (r0);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 27:
-    r0 = pxsim_numops_toBoolDecr(s.prevNote___202912);
+    r0 = pxsim_numops_toBoolDecr(s.prevNote___17979);
     if (!r0) { step = 28; continue; }
-    r0 = (s.note___202929 - 1);
-    s.note___202929 = (r0);
+    r0 = (s.note___17996 - 1);
+    s.note___17996 = (r0);
     { step = 29; continue; }
   case 28:
-    s.note___202929 = (12);
-    s.prevNote___202912 = (true);
+    s.note___17996 = (12);
+    s.prevNote___17979 = (true);
   case 29:
     { step = 40; continue; }
   case 30:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___202834;
+    s.tmp_0.argL = s.consumeToken___17901;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 101; s.pc = 65; return s.tmp_0;
   case 65:
     r0 = s.retval;
-    s.prevNote___202912 = (false);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 31:
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 4);
-    s.prevNote___202912 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 4);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 32:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___202834;
+    s.tmp_0.argL = s.consumeToken___17901;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 102; s.pc = 66; return s.tmp_0;
   case 66:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 8);
-    s.prevNote___202912 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 8);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 33:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___202834;
+    s.tmp_0.argL = s.consumeToken___17901;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 103; s.pc = 67; return s.tmp_0;
   case 67:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 7);
-    s.prevNote___202912 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 7);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 34:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___202834;
+    s.tmp_0.argL = s.consumeToken___17901;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 104; s.pc = 68; return s.tmp_0;
   case 68:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 2);
-    s.prevNote___202912 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 2);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 35:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___202834;
+    s.tmp_0.argL = s.consumeToken___17901;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 105; s.pc = 69; return s.tmp_0;
   case 69:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 3);
-    s.prevNote___202912 = (false);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 3);
+    s.prevNote___17979 = (false);
     { step = 40; continue; }
   case 36:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___202834;
+    s.tmp_0.argL = s.consumeToken___17901;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 106; s.pc = 70; return s.tmp_0;
   case 70:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 5);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 5);
     { step = 40; continue; }
   case 37:
-    r0 = pxsim_pxtrt_ldlocRef(s.tokenKind___202831);
+    r0 = pxsim_pxtrt_ldlocRef(s.tokenKind___17898);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 38; continue; }
-    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___202831, 1);
+    r0 = pxsim_pxtrt_stlocRef(s.tokenKind___17898, 1);
   case 38:
   case 39:
-    s.tmp_0 = r0 = s.token___202830;
-    r0 = pxsim_pxtrt_ldlocRef(s.token___202830);
+    s.tmp_0 = r0 = s.token___17897;
+    r0 = pxsim_pxtrt_ldlocRef(s.token___17897);
     s.tmp_3 = r0;
     if ((s.tmp_3) && (s.tmp_3).vtable) {
     setupResume(s, 71);
@@ -48604,37 +48623,37 @@ switch (step) {
   case 71:
     r0 = s.retval;
     s.tmp_2 = r0;
-    if ((s.noteChar___202939) && (s.noteChar___202939).vtable) {
+    if ((s.noteChar___18006) && (s.noteChar___18006).vtable) {
     setupResume(s, 72);
-    pxsim_String__stringConv(s.noteChar___202939);
+    pxsim_String__stringConv(s.noteChar___18006);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.noteChar___202939) + ""; }
+    } else { s.retval = (s.noteChar___18006) + ""; }
   case 72:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_2, s.tmp_4);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    s.prevNote___202912 = (false);
+    s.prevNote___17979 = (false);
   case 40:
-    r0 = (s.i___202933 + 1);
-    s.i___202933 = (r0);
+    r0 = (s.i___18000 + 1);
+    s.i___18000 = (r0);
     { step = 10; continue; }
   case 41:
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = s.consumeToken___202834;
+    s.tmp_0.argL = s.consumeToken___17901;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 107; s.pc = 73; return s.tmp_0;
   case 73:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.note___202929;
+    s.tmp_0 = r0 = s.note___17996;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 42; continue; }
     r0 = s.tmp_0;
     { step = 43; continue; }
   case 42:
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___202691);
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___17758);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
   case 43:
@@ -48642,17 +48661,17 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 46; continue; }
-    s.tmp_3 = r0 = s.note___202929;
-    r0 = pxsim_pxtrt_ldlocRef(s.octave___202689);
+    s.tmp_3 = r0 = s.note___17996;
+    r0 = pxsim_pxtrt_ldlocRef(s.octave___17756);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 - 1);
     s.tmp_5 = r0;
     r0 = (12 * s.tmp_5);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
-    s.keyNumber___203013 = (r0);
-    s.tmp_1 = r0 = globals.freqs___189275;
-    r0 = (s.keyNumber___203013 * 2);
+    s.keyNumber___18080 = (r0);
+    s.tmp_1 = r0 = globals.freqs___4059;
+    r0 = (s.keyNumber___18080 * 2);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.getNumber(s.tmp_1, 4, s.tmp_2);
     s.tmp_0 = r0;
@@ -48665,26 +48684,26 @@ switch (step) {
   case 45:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    r0 = pxsim_pxtrt_stlocRef(s.hz___202691, s.tmp_3);
+    r0 = pxsim_pxtrt_stlocRef(s.hz___17758, s.tmp_3);
   case 46:
   case 47:
-    r0 = pxsim_pxtrt_ldlocRef(s.ms___202695);
-    s.currMs___203030 = (r0);
-    r0 = (s.currMs___203030 <= 0);
+    r0 = pxsim_pxtrt_ldlocRef(s.ms___17762);
+    s.currMs___18097 = (r0);
+    r0 = (s.currMs___18097 <= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 48; continue; }
-    r0 = pxsim_pxtrt_ldlocRef(s.tempo___202690);
+    r0 = pxsim_pxtrt_ldlocRef(s.tempo___17757);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(15000, s.tmp_1);
-    s.beat___203034 = (r0);
-    r0 = pxsim_pxtrt_ldlocRef(s.duration___202688);
+    s.beat___18101 = (r0);
+    r0 = pxsim_pxtrt_ldlocRef(s.duration___17755);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 * s.beat___203034);
-    s.currMs___203030 = (r0);
+    r0 = (s.tmp_0 * s.beat___18101);
+    s.currMs___18097 = (r0);
   case 48:
   case 49:
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___202691);
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___17758);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -48692,32 +48711,32 @@ switch (step) {
     if (!r0) { step = 50; continue; }
     { step = 55; continue; }
   case 50:
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___202691);
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___17758);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 == 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 51; continue; }
-    r0 = (s.timePos___202696 + s.currMs___203030);
-    s.timePos___202696 = (r0);
+    r0 = (s.timePos___17763 + s.currMs___18097);
+    s.timePos___17763 = (r0);
     { step = 54; continue; }
   case 51:
-    r0 = pxsim_pxtrt_ldlocRef(s.endHz___202692);
+    r0 = pxsim_pxtrt_ldlocRef(s.endHz___17759);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 52; continue; }
-    s.tmp_2 = r0 = s.endHz___202692;
-    r0 = pxsim_pxtrt_ldlocRef(s.hz___202691);
+    s.tmp_2 = r0 = s.endHz___17759;
+    r0 = pxsim_pxtrt_ldlocRef(s.hz___17758);
     s.tmp_3 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_2, s.tmp_3);
   case 52:
   case 53:
-    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___202712, 0);
+    r0 = pxsim_pxtrt_stlocRef(s.sndInstrPtr___17779, 0);
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___202713;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___202701);
+    s.tmp_0.argL = s.addForm___17780;
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___17768);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
     s.tmp_0.arg2 = 255;
@@ -48727,36 +48746,36 @@ switch (step) {
   case 74:
     r0 = s.retval;
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___202713;
-    r0 = pxsim_pxtrt_ldlocRef(s.envD___202702);
+    s.tmp_0.argL = s.addForm___17780;
+    r0 = pxsim_pxtrt_ldlocRef(s.envD___17769);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 255;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___202703);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___17770);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___202701);
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___17768);
     s.tmp_0.arg3 = r0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 109; s.pc = 75; return s.tmp_0;
   case 75:
     r0 = s.retval;
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___202713;
-    s.tmp_1 = r0 = s.currMs___203030;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___202701);
+    s.tmp_0.argL = s.addForm___17780;
+    s.tmp_1 = r0 = s.currMs___18097;
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___17768);
     s.tmp_3 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envD___202702);
+    r0 = pxsim_pxtrt_ldlocRef(s.envD___17769);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 + s.tmp_4);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 - s.tmp_2);
     s.tmp_0.arg0 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___202703);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___17770);
     s.tmp_0.arg1 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___202703);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___17770);
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envD___202702);
+    r0 = pxsim_pxtrt_ldlocRef(s.envD___17769);
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envA___202701);
+    r0 = pxsim_pxtrt_ldlocRef(s.envA___17768);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_0.arg3 = r0;
@@ -48765,50 +48784,50 @@ switch (step) {
   case 76:
     r0 = s.retval;
     s.tmp_0 = lambda_5_mk(s);
-    s.tmp_0.argL = s.addForm___202713;
-    r0 = pxsim_pxtrt_ldlocRef(s.envR___202704);
+    s.tmp_0.argL = s.addForm___17780;
+    r0 = pxsim_pxtrt_ldlocRef(s.envR___17771);
     s.tmp_0.arg0 = r0;
-    r0 = pxsim_pxtrt_ldlocRef(s.envS___202703);
+    r0 = pxsim_pxtrt_ldlocRef(s.envS___17770);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = 0;
-    s.tmp_0.arg3 = s.currMs___203030;
+    s.tmp_0.arg3 = s.currMs___18097;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 111; s.pc = 77; return s.tmp_0;
   case 77:
     r0 = s.retval;
-    s.tmp_0 = music_MelodyPlayer_queuePlayInstructions__P189292_mk(s);
+    s.tmp_0 = music_MelodyPlayer_queuePlayInstructions__P4076_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = (s.timePos___202696 - s.now___202700);
+    r0 = (s.timePos___17763 - s.now___17767);
     s.tmp_0.arg1 = r0;
-    s.tmp_1 = r0 = s.sndInstr___202706;
-    r0 = pxsim_pxtrt_ldlocRef(s.sndInstrPtr___202712);
+    s.tmp_1 = r0 = s.sndInstr___17773;
+    r0 = pxsim_pxtrt_ldlocRef(s.sndInstrPtr___17779);
     s.tmp_2 = r0;
     r0 = pxsim.BufferMethods.slice(s.tmp_1, 0, s.tmp_2);
     s.tmp_0.arg2 = r0;
     s.callLocIdx = 112; s.pc = 78; return s.tmp_0;
   case 78:
     r0 = s.retval;
-    r0 = pxsim_pxtrt_stlocRef(s.endHz___202692, -1);
-    r0 = (s.timePos___202696 + s.currMs___203030);
-    s.timePos___202696 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.endHz___17759, -1);
+    r0 = (s.timePos___17763 + s.currMs___18097);
+    s.timePos___17763 = (r0);
   case 54:
   case 55:
-    r0 = (s.timePos___202696 - s.now___202700);
-    s.timeLeft___203091 = (r0);
-    r0 = (s.timeLeft___203091 > 200);
+    r0 = (s.timePos___17763 - s.now___17767);
+    s.timeLeft___18158 = (r0);
+    r0 = (s.timeLeft___18158 > 200);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 56; continue; }
-    s.tmp_1 = pause__P185619_mk(s);
-    r0 = (s.timeLeft___203091 - 100);
+    s.tmp_1 = pause__P402_mk(s);
+    r0 = (s.timeLeft___18158 - 100);
     s.tmp_1.arg0 = r0;
     s.callLocIdx = 113; s.pc = 79; return s.tmp_1;
   case 79:
     r0 = s.retval;
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.startTime___202697);
-    s.now___202700 = (r0);
+    r0 = (s.tmp_0 - s.startTime___17764);
+    s.now___17767 = (r0);
   case 56:
   case 57:
     { step = 3; continue; }
@@ -48818,12 +48837,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_MelodyPlayer_play__P186830.info = {"start":10980,"length":9006,"line":341,"column":8,"endLine":572,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"play","argumentNames":["this","volume"]}
+music_MelodyPlayer_play__P1613.info = {"start":10980,"length":9006,"line":341,"column":8,"endLine":572,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"play","argumentNames":["this","volume"]}
 
-function music_MelodyPlayer_play__P186830_mk(s) {
+function music_MelodyPlayer_play__P1613_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_MelodyPlayer_play__P186830, depth: s.depth + 1,
+        parent: s, fn: music_MelodyPlayer_play__P1613, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -48836,39 +48855,39 @@ function music_MelodyPlayer_play__P186830_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  notes___202683: undefined,
-  pos___202687: undefined,
-  duration___202688: undefined,
-  octave___202689: undefined,
-  tempo___202690: undefined,
-  hz___202691: undefined,
-  endHz___202692: undefined,
-  ms___202695: undefined,
-  timePos___202696: undefined,
-  startTime___202697: undefined,
-  now___202700: undefined,
-  envA___202701: undefined,
-  envD___202702: undefined,
-  envS___202703: undefined,
-  envR___202704: undefined,
-  soundWave___202705: undefined,
-  sndInstr___202706: undefined,
-  sndInstrPtr___202712: undefined,
-  addForm___202713: undefined,
-  scanNextWord___202773: undefined,
-  token___202830: undefined,
-  tokenKind___202831: undefined,
-  consumeToken___202834: undefined,
-  currNote___202910: undefined,
-  prevNote___202912: undefined,
-  timeLeft___202915: undefined,
-  note___202929: undefined,
-  i___202933: undefined,
-  noteChar___202939: undefined,
-  keyNumber___203013: undefined,
-  currMs___203030: undefined,
-  beat___203034: undefined,
-  timeLeft___203091: undefined,
+  notes___17750: undefined,
+  pos___17754: undefined,
+  duration___17755: undefined,
+  octave___17756: undefined,
+  tempo___17757: undefined,
+  hz___17758: undefined,
+  endHz___17759: undefined,
+  ms___17762: undefined,
+  timePos___17763: undefined,
+  startTime___17764: undefined,
+  now___17767: undefined,
+  envA___17768: undefined,
+  envD___17769: undefined,
+  envS___17770: undefined,
+  envR___17771: undefined,
+  soundWave___17772: undefined,
+  sndInstr___17773: undefined,
+  sndInstrPtr___17779: undefined,
+  addForm___17780: undefined,
+  scanNextWord___17840: undefined,
+  token___17897: undefined,
+  tokenKind___17898: undefined,
+  consumeToken___17901: undefined,
+  currNote___17977: undefined,
+  prevNote___17979: undefined,
+  timeLeft___17982: undefined,
+  note___17996: undefined,
+  i___18000: undefined,
+  noteChar___18006: undefined,
+  keyNumber___18080: undefined,
+  currMs___18097: undefined,
+  beat___18101: undefined,
+  timeLeft___18158: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -48877,7 +48896,7 @@ function music_MelodyPlayer_play__P186830_mk(s) {
 
 
 
-function inline__P202714(s) {
+function inline__P17781(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -48887,10 +48906,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.freqStart___202719 = undefined;
-    s.freqEnd___202721 = undefined;
-    s.envelopeWidth___202723 = undefined;
-    s.slope___202741 = undefined;
+    s.freqStart___17786 = undefined;
+    s.freqEnd___17788 = undefined;
+    s.envelopeWidth___17790 = undefined;
+    s.slope___17808 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -48899,9 +48918,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
-    s.freqStart___202719 = (r0);
+    s.freqStart___17786 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
-    s.freqEnd___202721 = (r0);
+    s.freqEnd___17788 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[2]);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 0);
@@ -48925,7 +48944,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.envelopeWidth___202723 = (s.tmp_7);
+    s.envelopeWidth___17790 = (s.tmp_7);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
@@ -48937,35 +48956,35 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    r0 = (s.envelopeWidth___202723 != 0);
+    r0 = (s.envelopeWidth___17790 != 0);
   case 4:
     // jmp value (already in r0)
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 5; continue; }
-    r0 = (s.freqEnd___202721 - s.freqStart___202719);
+    r0 = (s.freqEnd___17788 - s.freqStart___17786);
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 / s.envelopeWidth___202723);
-    s.slope___202741 = (r0);
+    r0 = (s.tmp_4 / s.envelopeWidth___17790);
+    s.slope___17808 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0 = r0;
-    r0 = (s.slope___202741 * s.arg3);
+    r0 = (s.slope___17808 * s.arg3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.freqStart___202719 = (r0);
+    s.freqStart___17786 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0 = r0;
-    s.tmp_2 = r0 = s.slope___202741;
+    s.tmp_2 = r0 = s.slope___17808;
     r0 = (s.arg3 + s.arg0);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 * s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.freqEnd___202721 = (r0);
+    s.freqEnd___17788 = (r0);
   case 5:
   case 6:
     s.tmp_0 = r0 = s.caps[6];
-    s.tmp_2 = music_addNote__P189291_mk(s);
+    s.tmp_2 = music_addNote__P4075_mk(s);
     s.tmp_2.arg0 = s.caps[7];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[6]);
     s.tmp_2.arg1 = r0;
@@ -48974,10 +48993,10 @@ switch (step) {
     s.tmp_2.arg4 = s.arg2;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[8]);
     s.tmp_2.arg5 = r0;
-    s.tmp_2.arg6 = s.freqStart___202719;
+    s.tmp_2.arg6 = s.freqStart___17786;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[9]);
     s.tmp_2.arg7 = r0;
-    s.tmp_2.arg8 = s.freqEnd___202721;
+    s.tmp_2.arg8 = s.freqEnd___17788;
     s.callLocIdx = 91; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
@@ -48987,12 +49006,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202714.info = {"start":11788,"length":643,"line":367,"column":28,"endLine":378,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["formDuration","beg","end","msOff"]}
+inline__P17781.info = {"start":11788,"length":643,"line":367,"column":28,"endLine":378,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["formDuration","beg","end","msOff"]}
 
-function inline__P202714_mk(s) {
+function inline__P17781_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202714, depth: s.depth + 1,
+        parent: s, fn: inline__P17781, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49002,10 +49021,10 @@ function inline__P202714_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  freqStart___202719: undefined,
-  freqEnd___202721: undefined,
-  envelopeWidth___202723: undefined,
-  slope___202741: undefined,
+  freqStart___17786: undefined,
+  freqEnd___17788: undefined,
+  envelopeWidth___17790: undefined,
+  slope___17808: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -49016,7 +49035,7 @@ function inline__P202714_mk(s) {
 
 
 
-function inline__P202774(s) {
+function inline__P17841(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49026,9 +49045,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.c___202783 = undefined;
-    s.note___202800 = undefined;
-    s.c___202806 = undefined;
+    s.c___17850 = undefined;
+    s.note___17867 = undefined;
+    s.c___17873 = undefined;
     r0 = s.caps[0].fields["melody"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -49054,15 +49073,15 @@ switch (step) {
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_7 = r0;
     r0 = pxsim_String_.charAt(s.tmp_6, s.tmp_7);
-    s.c___202783 = (r0);
-    r0 = (s.c___202783 != " ");
+    s.c___17850 = (r0);
+    r0 = (s.c___17850 != " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 4; continue; }
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 4:
-    r0 = (s.c___202783 != "\r");
+    r0 = (s.c___17850 != "\r");
   case 5:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -49071,7 +49090,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 7; continue; }
   case 6:
-    r0 = (s.c___202783 != "\n");
+    r0 = (s.c___17850 != "\n");
   case 7:
     // jmp value (already in r0)
     s.tmp_2 = r0;
@@ -49080,7 +49099,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 9; continue; }
   case 8:
-    r0 = (s.c___202783 != "\t");
+    r0 = (s.c___17850 != "\t");
   case 9:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -49098,7 +49117,7 @@ switch (step) {
     { step = 3; continue; }
   case 12:
     r0 = pxsim_String_.mkEmpty();
-    s.note___202800 = (r0);
+    s.note___17867 = (r0);
   case 13:
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_1 = r0;
@@ -49112,15 +49131,15 @@ switch (step) {
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_4 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_4);
-    s.c___202806 = (r0);
-    r0 = (s.c___202806 == " ");
+    s.c___17873 = (r0);
+    r0 = (s.c___17873 == " ");
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 14; continue; }
     r0 = s.tmp_0;
     { step = 15; continue; }
   case 14:
-    r0 = (s.c___202806 == "\r");
+    r0 = (s.c___17873 == "\r");
   case 15:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -49129,7 +49148,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 17; continue; }
   case 16:
-    r0 = (s.c___202806 == "\n");
+    r0 = (s.c___17873 == "\n");
   case 17:
     // jmp value (already in r0)
     s.tmp_2 = r0;
@@ -49138,7 +49157,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 19; continue; }
   case 18:
-    r0 = (s.c___202806 == "\t");
+    r0 = (s.c___17873 == "\t");
   case 19:
     // jmp value (already in r0)
     s.tmp_3 = r0;
@@ -49147,26 +49166,26 @@ switch (step) {
     { step = 22; continue; }
   case 20:
   case 21:
-    if ((s.note___202800) && (s.note___202800).vtable) {
+    if ((s.note___17867) && (s.note___17867).vtable) {
     setupResume(s, 24);
-    pxsim_String__stringConv(s.note___202800);
+    pxsim_String__stringConv(s.note___17867);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.note___202800) + ""; }
+    } else { s.retval = (s.note___17867) + ""; }
   case 24:
     r0 = s.retval;
     s.tmp_4 = r0;
-    if ((s.c___202806) && (s.c___202806).vtable) {
+    if ((s.c___17873) && (s.c___17873).vtable) {
     setupResume(s, 25);
-    pxsim_String__stringConv(s.c___202806);
+    pxsim_String__stringConv(s.c___17873);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.c___202806) + ""; }
+    } else { s.retval = (s.c___17873) + ""; }
   case 25:
     r0 = s.retval;
     s.tmp_5 = r0;
     r0 = pxsim_String__concat(s.tmp_4, s.tmp_5);
-    s.note___202800 = (r0);
+    s.note___17867 = (r0);
     s.tmp_0 = r0 = s.caps[1];
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_2 = r0;
@@ -49175,17 +49194,17 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 13; continue; }
   case 22:
-    r0 = s.note___202800;
+    r0 = s.note___17867;
   case 23:
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202774.info = {"start":12466,"length":708,"line":380,"column":33,"endLine":402,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
+inline__P17841.info = {"start":12466,"length":708,"line":380,"column":33,"endLine":402,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P202774_mk(s) {
+function inline__P17841_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202774, depth: s.depth + 1,
+        parent: s, fn: inline__P17841, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49195,16 +49214,16 @@ function inline__P202774_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  c___202783: undefined,
-  note___202800: undefined,
-  c___202806: undefined,
+  c___17850: undefined,
+  note___17867: undefined,
+  c___17873: undefined,
 } }
 
 
 
 
 
-function inline__P202835(s) {
+function inline__P17902(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49214,7 +49233,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___202841 = undefined;
+    s.d___17908 = undefined;
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -49230,14 +49249,14 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 15; continue; }
-    s.tmp_3 = parseInt__P185312_mk(s);
+    s.tmp_3 = parseInt__P95_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[0]);
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = undefined;
     s.callLocIdx = 92; s.pc = 17; return s.tmp_3;
   case 17:
     r0 = s.retval;
-    s.d___202841 = (r0);
+    s.d___17908 = (r0);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(1, s.tmp_0);
@@ -49265,15 +49284,15 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 14; continue; }
   case 3:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[2], s.d___202841);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[2], s.d___17908);
     { step = 14; continue; }
   case 4:
     s.tmp_0 = r0 = s.caps[3];
-    s.tmp_2 = Math_max__P185342_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
     s.tmp_2.arg0 = 1;
-    s.tmp_3 = Math_min__P185343_mk(s);
+    s.tmp_3 = Math_min__P126_mk(s);
     s.tmp_3.arg0 = 16;
-    s.tmp_3.arg1 = s.d___202841;
+    s.tmp_3.arg1 = s.d___17908;
     s.callLocIdx = 93; s.pc = 19; return s.tmp_3;
   case 19:
     r0 = s.retval;
@@ -49287,9 +49306,9 @@ switch (step) {
     { step = 14; continue; }
   case 5:
     s.tmp_0 = r0 = s.caps[5];
-    s.tmp_2 = Math_max__P185342_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
     s.tmp_2.arg0 = 1;
-    s.tmp_2.arg1 = s.d___202841;
+    s.tmp_2.arg1 = s.d___17908;
     s.callLocIdx = 95; s.pc = 20; return s.tmp_2;
   case 20:
     r0 = s.retval;
@@ -49297,18 +49316,18 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 14; continue; }
   case 6:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[6], s.d___202841);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[6], s.d___17908);
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 6);
     { step = 14; continue; }
   case 7:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[4], s.d___202841);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[4], s.d___17908);
     { step = 14; continue; }
   case 8:
     s.tmp_0 = r0 = s.caps[7];
-    s.tmp_2 = Math_clamp__P185339_mk(s);
+    s.tmp_2 = Math_clamp__P122_mk(s);
     s.tmp_2.arg0 = 1;
     s.tmp_2.arg1 = 15;
-    s.tmp_2.arg2 = s.d___202841;
+    s.tmp_2.arg2 = s.d___17908;
     s.callLocIdx = 96; s.pc = 21; return s.tmp_2;
   case 21:
     r0 = s.retval;
@@ -49316,19 +49335,19 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
     { step = 14; continue; }
   case 9:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[8], s.d___202841);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[8], s.d___17908);
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 9);
     { step = 14; continue; }
   case 10:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[9], s.d___202841);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[9], s.d___17908);
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 10);
     { step = 14; continue; }
   case 11:
     s.tmp_0 = r0 = s.caps[10];
-    s.tmp_2 = Math_clamp__P185339_mk(s);
+    s.tmp_2 = Math_clamp__P122_mk(s);
     s.tmp_2.arg0 = 0;
     s.tmp_2.arg1 = 255;
-    s.tmp_2.arg2 = s.d___202841;
+    s.tmp_2.arg2 = s.d___17908;
     s.callLocIdx = 97; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
@@ -49337,10 +49356,10 @@ switch (step) {
     r0 = pxsim_pxtrt_stlocRef(s.caps[1], 11);
     { step = 14; continue; }
   case 12:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[11], s.d___202841);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[11], s.d___17908);
     { step = 14; continue; }
   case 13:
-    r0 = pxsim_pxtrt_stlocRef(s.caps[12], s.d___202841);
+    r0 = pxsim_pxtrt_stlocRef(s.caps[12], s.d___17908);
   case 14:
     s.tmp_0 = r0 = s.caps[0];
     r0 = pxsim_String_.mkEmpty();
@@ -49352,25 +49371,25 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202835.info = {"start":14207,"length":1189,"line":438,"column":33,"endLine":459,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
+inline__P17902.info = {"start":14207,"length":1189,"line":438,"column":33,"endLine":459,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P202835_mk(s) {
+function inline__P17902_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202835, depth: s.depth + 1,
+        parent: s, fn: inline__P17902, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  d___202841: undefined,
+  d___17908: undefined,
 } }
 
 
 
 
 
-function music_MelodyPlayer_queuePlayInstructions__P189292(s) {
+function music_MelodyPlayer_queuePlayInstructions__P4076(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49387,18 +49406,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C186825_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
     r0 = pxsim.music.queuePlayInstructions(s.arg1, s.arg2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_MelodyPlayer_queuePlayInstructions__P189292.info = {"start":10845,"length":125,"line":337,"column":8,"endLine":339,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"queuePlayInstructions","argumentNames":["this","timeDelta","buf"]}
+music_MelodyPlayer_queuePlayInstructions__P4076.info = {"start":10845,"length":125,"line":337,"column":8,"endLine":339,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"queuePlayInstructions","argumentNames":["this","timeDelta","buf"]}
 
-function music_MelodyPlayer_queuePlayInstructions__P189292_mk(s) {
+function music_MelodyPlayer_queuePlayInstructions__P4076_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_MelodyPlayer_queuePlayInstructions__P189292, depth: s.depth + 1,
+        parent: s, fn: music_MelodyPlayer_queuePlayInstructions__P4076, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -49409,7 +49428,7 @@ function music_MelodyPlayer_queuePlayInstructions__P189292_mk(s) {
 
 
 
-function music_addNote__P189291(s) {
+function music_addNote__P4075(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49477,12 +49496,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_addNote__P189291.info = {"start":9705,"length":904,"line":308,"column":4,"endLine":321,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"addNote","argumentNames":["sndInstr","sndInstrPtr","ms","beg","end","soundWave","hz","volume","endHz"]}
+music_addNote__P4075.info = {"start":9705,"length":904,"line":308,"column":4,"endLine":321,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"addNote","argumentNames":["sndInstr","sndInstrPtr","ms","beg","end","soundWave","hz","volume","endHz"]}
 
-function music_addNote__P189291_mk(s) {
+function music_addNote__P4075_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_addNote__P189291, depth: s.depth + 1,
+        parent: s, fn: music_addNote__P4075, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49503,7 +49522,7 @@ function music_addNote__P189291_mk(s) {
 
 
 
-function music_volume__P186810(s) {
+function music_volume__P1593(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49513,20 +49532,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = music_initVolume__P189283_mk(s);
+    s.tmp_0 = music_initVolume__P4067_mk(s);
     s.callLocIdx = 71; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals.globalVolume___189279;
+    r0 = globals.globalVolume___4063;
     return leave(s, r0)
   default: oops()
 } } }
-music_volume__P186810.info = {"start":1781,"length":90,"line":61,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"volume","argumentNames":[]}
+music_volume__P1593.info = {"start":1781,"length":90,"line":61,"column":4,"endLine":64,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"volume","argumentNames":[]}
 
-function music_volume__P186810_mk(s) {
+function music_volume__P1593_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_volume__P186810, depth: s.depth + 1,
+        parent: s, fn: music_volume__P1593, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -49535,7 +49554,7 @@ function music_volume__P186810_mk(s) {
 
 
 
-function music_initVolume__P189283(s) {
+function music_initVolume__P4067(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49545,12 +49564,12 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals.globalVolume___189279 === null);
+    r0 = (globals.globalVolume___4063 === null);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.globalVolume___189279 = (0);
-    s.tmp_0 = music_setVolume__P186809_mk(s);
+    globals.globalVolume___4063 = (0);
+    s.tmp_0 = music_setVolume__P1592_mk(s);
     r0 = pxsim_pxtcore.getConfig(59, 128);
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 68; s.pc = 3; return s.tmp_0;
@@ -49562,12 +49581,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_initVolume__P189283.info = {"start":1014,"length":180,"line":33,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"initVolume","argumentNames":[]}
+music_initVolume__P4067.info = {"start":1014,"length":180,"line":33,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"initVolume","argumentNames":[]}
 
-function music_initVolume__P189283_mk(s) {
+function music_initVolume__P4067_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_initVolume__P189283, depth: s.depth + 1,
+        parent: s, fn: music_initVolume__P4067, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -49576,7 +49595,7 @@ function music_initVolume__P189283_mk(s) {
 
 
 
-function music_setVolume__P186809(s) {
+function music_setVolume__P1592(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49590,7 +49609,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_clamp__P185339_mk(s);
+    s.tmp_0 = Math_clamp__P122_mk(s);
     s.tmp_0.arg0 = 0;
     s.tmp_0.arg1 = 255;
     r0 = (s.arg0 | 0);
@@ -49598,8 +49617,8 @@ switch (step) {
     s.callLocIdx = 69; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.globalVolume___189279 = (r0);
-    r0 = (globals.globalVolume___189279 > 0);
+    globals.globalVolume___4063 = (r0);
+    r0 = (globals.globalVolume___4063 > 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
@@ -49615,12 +49634,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_setVolume__P186809.info = {"start":1533,"length":153,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"setVolume","argumentNames":["volume"]}
+music_setVolume__P1592.info = {"start":1533,"length":153,"line":51,"column":4,"endLine":54,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"setVolume","argumentNames":["volume"]}
 
-function music_setVolume__P186809_mk(s) {
+function music_setVolume__P1592_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_setVolume__P186809, depth: s.depth + 1,
+        parent: s, fn: music_setVolume__P1592, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49631,7 +49650,7 @@ function music_setVolume__P186809_mk(s) {
 
 
 
-function music_enableAmp__P189282(s) {
+function music_enableAmp__P4066(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49649,12 +49668,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_enableAmp__P189282.info = {"start":944,"length":64,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"enableAmp","argumentNames":["en"]}
+music_enableAmp__P4066.info = {"start":944,"length":64,"line":29,"column":4,"endLine":31,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"enableAmp","argumentNames":["en"]}
 
-function music_enableAmp__P189282_mk(s) {
+function music_enableAmp__P4066_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_enableAmp__P189282, depth: s.depth + 1,
+        parent: s, fn: music_enableAmp__P4066, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -49663,7 +49682,7 @@ function music_enableAmp__P189282_mk(s) {
 
 
 
-function parseInt__P185312(s) {
+function parseInt__P95(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -49673,13 +49692,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.start___203128 = undefined;
-    s.sign___203158 = undefined;
-    s.output___203203 = undefined;
-    s.hasDigit___203204 = undefined;
-    s.i___203205 = undefined;
-    s.code___203212 = undefined;
-    s.val___203219 = undefined;
+    s.start___18195 = undefined;
+    s.sign___18225 = undefined;
+    s.output___18270 = undefined;
+    s.hasDigit___18271 = undefined;
+    s.i___18272 = undefined;
+    s.code___18279 = undefined;
+    s.val___18286 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -49726,9 +49745,9 @@ switch (step) {
     { step = 46; continue; }
   case 7:
   case 8:
-    s.start___203128 = (0);
+    s.start___18195 = (0);
   case 9:
-    s.tmp_1 = r0 = s.start___203128;
+    s.tmp_1 = r0 = s.start___18195;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
@@ -49738,8 +49757,8 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 10:
-    s.tmp_3 = helpers_isWhitespace__P185336_mk(s);
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.start___203128);
+    s.tmp_3 = helpers_isWhitespace__P119_mk(s);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.start___18195);
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 0; s.pc = 47; return s.tmp_3;
   case 47:
@@ -49749,11 +49768,11 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 12; continue; }
-    r0 = (s.start___203128 + 1);
-    s.start___203128 = (r0);
+    r0 = (s.start___18195 + 1);
+    s.start___18195 = (r0);
     { step = 9; continue; }
   case 12:
-    s.tmp_1 = r0 = s.start___203128;
+    s.tmp_1 = r0 = s.start___18195;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 === s.tmp_2);
@@ -49764,8 +49783,8 @@ switch (step) {
     { step = 46; continue; }
   case 13:
   case 14:
-    s.sign___203158 = (1);
-    r0 = pxsim_String_.charAt(s.arg0, s.start___203128);
+    s.sign___18225 = (1);
+    r0 = pxsim_String_.charAt(s.arg0, s.start___18195);
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq("-", s.tmp_0);
     if (r0) { step = 15; continue; }
@@ -49774,10 +49793,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 17; continue; }
   case 15:
-    s.sign___203158 = (-1);
+    s.sign___18225 = (-1);
   case 16:
-    r0 = (s.start___203128 + 1);
-    s.start___203128 = (r0);
+    r0 = (s.start___18195 + 1);
+    s.start___18195 = (r0);
   case 17:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
@@ -49797,7 +49816,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 21; continue; }
   case 20:
-    r0 = pxsim_String_.charAt(s.arg0, s.start___203128);
+    r0 = pxsim_String_.charAt(s.arg0, s.start___18195);
     s.tmp_3 = r0;
     r0 = ("0" === s.tmp_3);
   case 21:
@@ -49809,7 +49828,7 @@ switch (step) {
     { step = 25; continue; }
   case 22:
     s.tmp_7 = r0 = s.arg0;
-    r0 = (s.start___203128 + 1);
+    r0 = (s.start___18195 + 1);
     s.tmp_8 = r0;
     r0 = pxsim_String_.charAt(s.tmp_7, s.tmp_8);
     s.tmp_6 = r0;
@@ -49821,7 +49840,7 @@ switch (step) {
     { step = 24; continue; }
   case 23:
     s.tmp_10 = r0 = s.arg0;
-    r0 = (s.start___203128 + 1);
+    r0 = (s.start___18195 + 1);
     s.tmp_11 = r0;
     r0 = pxsim_String_.charAt(s.tmp_10, s.tmp_11);
     s.tmp_9 = r0;
@@ -49836,8 +49855,8 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_13);
     if (!r0) { step = 26; continue; }
     s.arg1 = (16);
-    r0 = (s.start___203128 + 2);
-    s.start___203128 = (r0);
+    r0 = (s.start___18195 + 2);
+    s.start___18195 = (r0);
     { step = 29; continue; }
   case 26:
     r0 = pxsim_numops_toBoolDecr(s.arg1);
@@ -49850,73 +49869,73 @@ switch (step) {
   case 27:
   case 28:
   case 29:
-    s.output___203203 = (0);
-    s.hasDigit___203204 = (false);
-    s.i___203205 = (s.start___203128);
+    s.output___18270 = (0);
+    s.hasDigit___18271 = (false);
+    s.i___18272 = (s.start___18195);
   case 30:
-    s.tmp_1 = r0 = s.i___203205;
+    s.tmp_1 = r0 = s.i___18272;
     r0 = pxsim_String_.length(s.arg0);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 45; continue; }
-    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___203205);
+    r0 = pxsim_String_.charCodeAt(s.arg0, s.i___18272);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 | 32);
-    s.code___203212 = (r0);
-    s.val___203219 = (undefined);
-    r0 = (s.code___203212 >= 48);
+    s.code___18279 = (r0);
+    s.val___18286 = (undefined);
+    r0 = (s.code___18279 >= 48);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 31; continue; }
     r0 = s.tmp_0;
     { step = 32; continue; }
   case 31:
-    r0 = (s.code___203212 < 58);
+    r0 = (s.code___18279 < 58);
   case 32:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 33; continue; }
-    r0 = (s.code___203212 - 48);
-    s.val___203219 = (r0);
+    r0 = (s.code___18279 - 48);
+    s.val___18286 = (r0);
     { step = 38; continue; }
   case 33:
-    r0 = (s.code___203212 >= 97);
+    r0 = (s.code___18279 >= 97);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 34; continue; }
     r0 = s.tmp_0;
     { step = 35; continue; }
   case 34:
-    r0 = (s.code___203212 < 123);
+    r0 = (s.code___18279 < 123);
   case 35:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 36; continue; }
-    r0 = (10 + s.code___203212);
+    r0 = (10 + s.code___18279);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 - 97);
-    s.val___203219 = (r0);
+    s.val___18286 = (r0);
   case 36:
   case 37:
   case 38:
-    r0 = (s.val___203219 == undefined);
+    r0 = (s.val___18286 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 39; continue; }
     r0 = s.tmp_0;
     { step = 40; continue; }
   case 39:
-    r0 = (s.val___203219 >= s.arg1);
+    r0 = (s.val___18286 >= s.arg1);
   case 40:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 43; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.hasDigit___203204);
+    r0 = pxsim_numops_toBoolDecr(s.hasDigit___18271);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
     s.tmp_2 = r0;
@@ -49929,26 +49948,26 @@ switch (step) {
     { step = 45; continue; }
   case 43:
   case 44:
-    s.hasDigit___203204 = (true);
-    r0 = (s.output___203203 * s.arg1);
+    s.hasDigit___18271 = (true);
+    r0 = (s.output___18270 * s.arg1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.val___203219);
-    s.output___203203 = (r0);
-    r0 = (s.i___203205 + 1);
-    s.i___203205 = (r0);
+    r0 = (s.tmp_0 + s.val___18286);
+    s.output___18270 = (r0);
+    r0 = (s.i___18272 + 1);
+    s.i___18272 = (r0);
     { step = 30; continue; }
   case 45:
-    r0 = (s.sign___203158 * s.output___203203);
+    r0 = (s.sign___18225 * s.output___18270);
   case 46:
     return leave(s, r0)
   default: oops()
 } } }
-parseInt__P185312.info = {"start":1064,"length":1690,"line":44,"column":0,"endLine":103,"endColumn":1,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"parseInt","argumentNames":["text","radix"]}
+parseInt__P95.info = {"start":1064,"length":1690,"line":44,"column":0,"endLine":103,"endColumn":1,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"parseInt","argumentNames":["text","radix"]}
 
-function parseInt__P185312_mk(s) {
+function parseInt__P95_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: parseInt__P185312, depth: s.depth + 1,
+        parent: s, fn: parseInt__P95, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -49964,13 +49983,13 @@ function parseInt__P185312_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  start___203128: undefined,
-  sign___203158: undefined,
-  output___203203: undefined,
-  hasDigit___203204: undefined,
-  i___203205: undefined,
-  code___203212: undefined,
-  val___203219: undefined,
+  start___18195: undefined,
+  sign___18225: undefined,
+  output___18270: undefined,
+  hasDigit___18271: undefined,
+  i___18272: undefined,
+  code___18279: undefined,
+  val___18286: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -49979,7 +49998,7 @@ function parseInt__P185312_mk(s) {
 
 
 
-function helpers_isWhitespace__P185336(s) {
+function helpers_isWhitespace__P119(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50036,12 +50055,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_isWhitespace__P185336.info = {"start":13875,"length":674,"line":476,"column":4,"endLine":493,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isWhitespace","argumentNames":["c"]}
+helpers_isWhitespace__P119.info = {"start":13875,"length":674,"line":476,"column":4,"endLine":493,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"isWhitespace","argumentNames":["c"]}
 
-function helpers_isWhitespace__P185336_mk(s) {
+function helpers_isWhitespace__P119_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_isWhitespace__P185336, depth: s.depth + 1,
+        parent: s, fn: helpers_isWhitespace__P119, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -50051,7 +50070,7 @@ function helpers_isWhitespace__P185336_mk(s) {
 
 
 
-function music_MelodyPlayer_constructor__P186828(s) {
+function music_MelodyPlayer_constructor__P1611(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50067,18 +50086,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C186825_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
     r0 = (s.arg0).fields["melody"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_MelodyPlayer_constructor__P186828.info = {"start":10714,"length":62,"line":329,"column":8,"endLine":331,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["this","m"]}
+music_MelodyPlayer_constructor__P1611.info = {"start":10714,"length":62,"line":329,"column":8,"endLine":331,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":["this","m"]}
 
-function music_MelodyPlayer_constructor__P186828_mk(s) {
+function music_MelodyPlayer_constructor__P1611_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_MelodyPlayer_constructor__P186828, depth: s.depth + 1,
+        parent: s, fn: music_MelodyPlayer_constructor__P1611, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -50088,7 +50107,7 @@ function music_MelodyPlayer_constructor__P186828_mk(s) {
 
 
 
-function music_Melody_stop__P186820(s) {
+function music_Melody_stop__P1603(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50103,12 +50122,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C186815_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
     r0 = s.arg0.fields["_player"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = music_MelodyPlayer_stop__P186829_mk(s);
+    s.tmp_1 = music_MelodyPlayer_stop__P1612_mk(s);
     r0 = s.arg0.fields["_player"];
     s.tmp_1.arg0 = r0;
     s.callLocIdx = 80; s.pc = 3; return s.tmp_1;
@@ -50117,7 +50136,7 @@ switch (step) {
     r0 = (s.arg0).fields["_player"] = (null);
   case 1:
   case 2:
-    s.tmp_0 = music_Melody_unregisterMelody__P189288_mk(s);
+    s.tmp_0 = music_Melody_unregisterMelody__P4072_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 81; s.pc = 4; return s.tmp_0;
   case 4:
@@ -50126,12 +50145,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_stop__P186820.info = {"start":6706,"length":173,"line":215,"column":8,"endLine":221,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"stop","argumentNames":["this"]}
+music_Melody_stop__P1603.info = {"start":6706,"length":173,"line":215,"column":8,"endLine":221,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"stop","argumentNames":["this"]}
 
-function music_Melody_stop__P186820_mk(s) {
+function music_Melody_stop__P1603_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_stop__P186820, depth: s.depth + 1,
+        parent: s, fn: music_Melody_stop__P1603, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50142,7 +50161,7 @@ function music_Melody_stop__P186820_mk(s) {
 
 
 
-function music_MelodyPlayer_stop__P186829(s) {
+function music_MelodyPlayer_stop__P1612(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50157,18 +50176,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_MelodyPlayer__C186825_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_MelodyPlayer__C1608_VT)) failedCast(r0);
     r0 = (s.arg0).fields["melody"] = (null);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_MelodyPlayer_stop__P186829.info = {"start":10786,"length":49,"line":333,"column":8,"endLine":335,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"stop","argumentNames":["this"]}
+music_MelodyPlayer_stop__P1612.info = {"start":10786,"length":49,"line":333,"column":8,"endLine":335,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"stop","argumentNames":["this"]}
 
-function music_MelodyPlayer_stop__P186829_mk(s) {
+function music_MelodyPlayer_stop__P1612_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_MelodyPlayer_stop__P186829, depth: s.depth + 1,
+        parent: s, fn: music_MelodyPlayer_stop__P1612, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -50177,7 +50196,7 @@ function music_MelodyPlayer_stop__P186829_mk(s) {
 
 
 
-function sprites_readDataNumber__P188838(s) {
+function sprites_readDataNumber__P3621(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50187,7 +50206,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.d___203737 = undefined;
+    s.d___18575 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -50214,30 +50233,30 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_4 = Sprite_data__P187258_mk(s);
+    s.tmp_4 = Sprite_data__P2041_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1767; s.pc = 6; return s.tmp_4;
+    s.callLocIdx = 1774; s.pc = 6; return s.tmp_4;
   case 6:
     r0 = s.retval;
-    s.d___203737 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.d___203737, s.arg1);
+    s.d___18575 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.d___18575, s.arg1);
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-sprites_readDataNumber__P188838.info = {"start":1075,"length":181,"line":34,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataNumber","argumentNames":["sprite","name"]}
+sprites_readDataNumber__P3621.info = {"start":1075,"length":181,"line":34,"column":4,"endLine":38,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-data/main.ts","functionName":"readDataNumber","argumentNames":["sprite","name"]}
 
-function sprites_readDataNumber__P188838_mk(s) {
+function sprites_readDataNumber__P3621_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_readDataNumber__P188838, depth: s.depth + 1,
+        parent: s, fn: sprites_readDataNumber__P3621, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  d___203737: undefined,
+  d___18575: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -50246,7 +50265,7 @@ function sprites_readDataNumber__P188838_mk(s) {
 
 
 
-function scene_followPath__P188876(s) {
+function scene_followPath__P3659(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50256,20 +50275,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pathFollowingSprites___203756 = undefined;
-    s.i___203760 = undefined;
-    s.pfs___203767 = undefined;
-    s.tm___203786 = undefined;
-    s.nearestTile___203795 = undefined;
-    s.minDistSquared___203797 = undefined;
-    s.p___203799 = undefined;
-    s.unnamed8932___U7 = undefined;
-    s.unnamed8933___U8 = undefined;
-    s.distSqrd___203801 = undefined;
-    s.remainingPath___203827 = undefined;
-    s.remainingPath___203837 = undefined;
-    s.currentLocation___203848 = undefined;
-    s.pathToNearest___203852 = undefined;
+    s.pathFollowingSprites___18594 = undefined;
+    s.i___18598 = undefined;
+    s.pfs___18605 = undefined;
+    s.tm___18624 = undefined;
+    s.nearestTile___18633 = undefined;
+    s.minDistSquared___18635 = undefined;
+    s.p___18637 = undefined;
+    s.unnamed124___U7 = undefined;
+    s.unnamed125___U8 = undefined;
+    s.distSqrd___18639 = undefined;
+    s.remainingPath___18665 = undefined;
+    s.remainingPath___18675 = undefined;
+    s.currentLocation___18686 = undefined;
+    s.pathToNearest___18690 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -50315,47 +50334,47 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 13; continue; }
-    s.tmp_9 = scene_getPathFollowingSprites__P191312_mk(s);
-    s.callLocIdx = 1883; s.pc = 26; return s.tmp_9;
+    s.tmp_9 = scene_getPathFollowingSprites__P6096_mk(s);
+    s.callLocIdx = 1890; s.pc = 26; return s.tmp_9;
   case 26:
     r0 = s.retval;
-    s.pathFollowingSprites___203756 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.pathFollowingSprites___203756);
+    s.pathFollowingSprites___18594 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.pathFollowingSprites___18594);
     if (!r0) { step = 11; continue; }
-    r0 = pxsim_Array__length(s.pathFollowingSprites___203756);
+    r0 = pxsim_Array__length(s.pathFollowingSprites___18594);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.i___203760 = (r0);
+    s.i___18598 = (r0);
   case 7:
-    r0 = (s.i___203760 >= 0);
+    r0 = (s.i___18598 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__getAt(s.pathFollowingSprites___203756, s.i___203760);
-    s.pfs___203767 = (r0);
-    r0 = s.pfs___203767.fields["sprite"];
+    r0 = pxsim_Array__getAt(s.pathFollowingSprites___18594, s.i___18598);
+    s.pfs___18605 = (r0);
+    r0 = s.pfs___18605.fields["sprite"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.tmp_2 = Sprite_vx__P187247_mk(s);
+    s.tmp_2 = Sprite_vx__P2030_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1884; s.pc = 27; return s.tmp_2;
+    s.callLocIdx = 1891; s.pc = 27; return s.tmp_2;
   case 27:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1885; s.pc = 28; return s.tmp_0;
+    s.callLocIdx = 1892; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeAt(s.pathFollowingSprites___203756, s.i___203760);
+    r0 = pxsim_Array_.removeAt(s.pathFollowingSprites___18594, s.i___18598);
   case 8:
   case 9:
-    r0 = (s.i___203760 - 1);
-    s.i___203760 = (r0);
+    r0 = (s.i___18598 - 1);
+    s.i___18598 = (r0);
     { step = 7; continue; }
   case 10:
   case 11:
@@ -50363,13 +50382,13 @@ switch (step) {
     { step = 25; continue; }
   case 13:
   case 14:
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1886; s.pc = 29; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1893; s.pc = 29; return s.tmp_0;
   case 29:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___203786 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___203786);
+    s.tm___18624 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___18624);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -50378,38 +50397,38 @@ switch (step) {
     { step = 25; continue; }
   case 15:
   case 16:
-    s.tmp_3 = tiles_TileMap_isOnWall__P187555_mk(s);
-    s.tmp_3.arg0 = s.tm___203786;
+    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_3.arg0 = s.tm___18624;
     s.tmp_3.arg1 = s.arg0;
-    s.callLocIdx = 1887; s.pc = 30; return s.tmp_3;
+    s.callLocIdx = 1894; s.pc = 30; return s.tmp_3;
   case 30:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 21; continue; }
     r0 = pxsim_Array__getAt(s.arg1, 0);
-    s.nearestTile___203795 = (r0);
-    s.minDistSquared___203797 = (999999);
-    s.p___203799 = (undefined);
-    s.unnamed8932___U7 = (s.arg1);
-    s.unnamed8933___U8 = (0);
+    s.nearestTile___18633 = (r0);
+    s.minDistSquared___18635 = (999999);
+    s.p___18637 = (undefined);
+    s.unnamed124___U7 = (s.arg1);
+    s.unnamed125___U8 = (0);
   case 17:
-    s.tmp_0 = r0 = s.unnamed8933___U8;
-    r0 = pxsim_Array__length(s.unnamed8932___U7);
+    s.tmp_0 = r0 = s.unnamed125___U8;
+    r0 = pxsim_Array__length(s.unnamed124___U7);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8932___U7, s.unnamed8933___U8);
-    s.p___203799 = (r0);
-    s.tmp_5 = tiles_Location_x__P187510_mk(s);
-    s.tmp_5.arg0 = s.p___203799;
-    s.callLocIdx = 1888; s.pc = 31; return s.tmp_5;
+    r0 = pxsim_Array__getAt(s.unnamed124___U7, s.unnamed125___U8);
+    s.p___18637 = (r0);
+    s.tmp_5 = tiles_Location_x__P2293_mk(s);
+    s.tmp_5.arg0 = s.p___18637;
+    s.callLocIdx = 1895; s.pc = 31; return s.tmp_5;
   case 31:
     r0 = s.retval;
     s.tmp_4 = r0;
-    s.tmp_7 = Sprite_x__P187242_mk(s);
+    s.tmp_7 = Sprite_x__P2025_mk(s);
     s.tmp_7.arg0 = s.arg0;
-    s.callLocIdx = 1889; s.pc = 32; return s.tmp_7;
+    s.callLocIdx = 1896; s.pc = 32; return s.tmp_7;
   case 32:
     r0 = s.retval;
     s.tmp_6 = r0;
@@ -50417,15 +50436,15 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim.Math_.pow(s.tmp_3, 2);
     s.tmp_2 = r0;
-    s.tmp_11 = tiles_Location_y__P187511_mk(s);
-    s.tmp_11.arg0 = s.p___203799;
-    s.callLocIdx = 1890; s.pc = 33; return s.tmp_11;
+    s.tmp_11 = tiles_Location_y__P2294_mk(s);
+    s.tmp_11.arg0 = s.p___18637;
+    s.callLocIdx = 1897; s.pc = 33; return s.tmp_11;
   case 33:
     r0 = s.retval;
     s.tmp_10 = r0;
-    s.tmp_13 = Sprite_y__P187244_mk(s);
+    s.tmp_13 = Sprite_y__P2027_mk(s);
     s.tmp_13.arg0 = s.arg0;
-    s.callLocIdx = 1891; s.pc = 34; return s.tmp_13;
+    s.callLocIdx = 1898; s.pc = 34; return s.tmp_13;
   case 34:
     r0 = s.retval;
     s.tmp_12 = r0;
@@ -50434,94 +50453,94 @@ switch (step) {
     r0 = pxsim.Math_.pow(s.tmp_9, 2);
     s.tmp_8 = r0;
     r0 = (s.tmp_2 + s.tmp_8);
-    s.distSqrd___203801 = (r0);
-    r0 = (s.distSqrd___203801 < s.minDistSquared___203797);
+    s.distSqrd___18639 = (r0);
+    r0 = (s.distSqrd___18639 < s.minDistSquared___18635);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.nearestTile___203795 = (s.p___203799);
-    s.minDistSquared___203797 = (s.distSqrd___203801);
+    s.nearestTile___18633 = (s.p___18637);
+    s.minDistSquared___18635 = (s.distSqrd___18639);
   case 18:
   case 19:
-    r0 = (s.unnamed8933___U8 + 1);
-    s.unnamed8933___U8 = (r0);
+    r0 = (s.unnamed125___U8 + 1);
+    s.unnamed125___U8 = (r0);
     { step = 17; continue; }
   case 20:
-    s.unnamed8932___U7 = (undefined);
-    s.tmp_0 = tiles_Location_place__P187513_mk(s);
-    s.tmp_0.arg0 = s.nearestTile___203795;
+    s.unnamed124___U7 = (undefined);
+    s.tmp_0 = tiles_Location_place__P2296_mk(s);
+    s.tmp_0.arg0 = s.nearestTile___18633;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1892; s.pc = 35; return s.tmp_0;
+    s.callLocIdx = 1899; s.pc = 35; return s.tmp_0;
   case 35:
     r0 = s.retval;
-    s.tmp_0 = scene_getRemainingPath__P191316_mk(s);
+    s.tmp_0 = scene_getRemainingPath__P6100_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1893; s.pc = 36; return s.tmp_0;
+    s.callLocIdx = 1900; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
-    s.remainingPath___203827 = (r0);
-    s.tmp_0 = scene__followPath__P188881_mk(s);
+    s.remainingPath___18665 = (r0);
+    s.tmp_0 = scene__followPath__P3664_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.remainingPath___203827;
+    s.tmp_0.arg1 = s.remainingPath___18665;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = undefined;
-    s.callLocIdx = 1894; s.pc = 37; return s.tmp_0;
+    s.callLocIdx = 1901; s.pc = 37; return s.tmp_0;
   case 37:
     r0 = s.retval;
     { step = 25; continue; }
   case 21:
   case 22:
-    s.tmp_0 = scene_getRemainingPath__P191316_mk(s);
+    s.tmp_0 = scene_getRemainingPath__P6100_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1895; s.pc = 38; return s.tmp_0;
+    s.callLocIdx = 1902; s.pc = 38; return s.tmp_0;
   case 38:
     r0 = s.retval;
-    s.remainingPath___203837 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.remainingPath___203837);
+    s.remainingPath___18675 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.remainingPath___18675);
     if (!r0) { step = 23; continue; }
-    s.tmp_0 = scene__followPath__P188881_mk(s);
+    s.tmp_0 = scene__followPath__P3664_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.remainingPath___203837;
+    s.tmp_0.arg1 = s.remainingPath___18675;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = undefined;
-    s.callLocIdx = 1896; s.pc = 39; return s.tmp_0;
+    s.callLocIdx = 1903; s.pc = 39; return s.tmp_0;
   case 39:
     r0 = s.retval;
     { step = 25; continue; }
   case 23:
   case 24:
-    s.tmp_0 = scene_locationOfSprite__P191315_mk(s);
+    s.tmp_0 = scene_locationOfSprite__P6099_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1897; s.pc = 40; return s.tmp_0;
+    s.callLocIdx = 1904; s.pc = 40; return s.tmp_0;
   case 40:
     r0 = s.retval;
-    s.currentLocation___203848 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P203859);
+    s.currentLocation___18686 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P18697);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = scene_generalAStar__P188874_mk(s);
-    s.tmp_1.arg0 = s.tm___203786;
-    s.tmp_1.arg1 = s.currentLocation___203848;
+    s.tmp_1 = scene_generalAStar__P3657_mk(s);
+    s.tmp_1.arg0 = s.tm___18624;
+    s.tmp_1.arg1 = s.currentLocation___18686;
     s.tmp_1.arg2 = null;
-    s.tmp_1.arg3 = inline__P203858;
+    s.tmp_1.arg3 = inline__P18696;
     s.tmp_1.arg4 = s.tmp_0;
-    s.callLocIdx = 1902; s.pc = 41; return s.tmp_1;
+    s.callLocIdx = 1909; s.pc = 41; return s.tmp_1;
   case 41:
     r0 = s.retval;
-    s.pathToNearest___203852 = (r0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P203879);
+    s.pathToNearest___18690 = (r0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P18717);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.arg1);
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.arg2);
-    s.tmp_1 = scene__followPath__P188881_mk(s);
+    s.tmp_1 = scene__followPath__P3664_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.pathToNearest___203852;
+    s.tmp_1.arg1 = s.pathToNearest___18690;
     s.tmp_1.arg2 = s.arg2;
     s.tmp_1.arg3 = s.tmp_0;
-    s.callLocIdx = 1905; s.pc = 42; return s.tmp_1;
+    s.callLocIdx = 1912; s.pc = 42; return s.tmp_1;
   case 42:
     r0 = s.retval;
   case 25:
@@ -50529,12 +50548,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_followPath__P188876.info = {"start":3834,"length":2414,"line":97,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"followPath","argumentNames":["sprite","path","speed"]}
+scene_followPath__P3659.info = {"start":3834,"length":2414,"line":97,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"followPath","argumentNames":["sprite","path","speed"]}
 
-function scene_followPath__P188876_mk(s) {
+function scene_followPath__P3659_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_followPath__P188876, depth: s.depth + 1,
+        parent: s, fn: scene_followPath__P3659, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50550,20 +50569,20 @@ function scene_followPath__P188876_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  pathFollowingSprites___203756: undefined,
-  i___203760: undefined,
-  pfs___203767: undefined,
-  tm___203786: undefined,
-  nearestTile___203795: undefined,
-  minDistSquared___203797: undefined,
-  p___203799: undefined,
-  unnamed8932___U7: undefined,
-  unnamed8933___U8: undefined,
-  distSqrd___203801: undefined,
-  remainingPath___203827: undefined,
-  remainingPath___203837: undefined,
-  currentLocation___203848: undefined,
-  pathToNearest___203852: undefined,
+  pathFollowingSprites___18594: undefined,
+  i___18598: undefined,
+  pfs___18605: undefined,
+  tm___18624: undefined,
+  nearestTile___18633: undefined,
+  minDistSquared___18635: undefined,
+  p___18637: undefined,
+  unnamed124___U7: undefined,
+  unnamed125___U8: undefined,
+  distSqrd___18639: undefined,
+  remainingPath___18665: undefined,
+  remainingPath___18675: undefined,
+  currentLocation___18686: undefined,
+  pathToNearest___18690: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -50573,7 +50592,7 @@ function scene_followPath__P188876_mk(s) {
 
 
 
-function inline__P203858(s) {
+function inline__P18696(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50587,12 +50606,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P203858.info = {"start":5766,"length":7,"line":146,"column":70,"endLine":146,"endColumn":77,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
+inline__P18696.info = {"start":5766,"length":7,"line":146,"column":70,"endLine":146,"endColumn":77,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P203858_mk(s) {
+function inline__P18696_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P203858, depth: s.depth + 1,
+        parent: s, fn: inline__P18696, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -50600,7 +50619,7 @@ function inline__P203858_mk(s) {
 
 
 
-function inline__P203859(s) {
+function inline__P18697(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50610,33 +50629,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pathTile___203862 = undefined;
-    s.unnamed8934___U1 = undefined;
-    s.unnamed8935___U2 = undefined;
+    s.pathTile___18700 = undefined;
+    s.unnamed126___U1 = undefined;
+    s.unnamed127___U2 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.pathTile___203862 = (undefined);
-    s.unnamed8934___U1 = (s.caps[0]);
-    s.unnamed8935___U2 = (0);
+    s.pathTile___18700 = (undefined);
+    s.unnamed126___U1 = (s.caps[0]);
+    s.unnamed127___U2 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8935___U2;
-    r0 = pxsim_Array__length(s.unnamed8934___U1);
+    s.tmp_0 = r0 = s.unnamed127___U2;
+    r0 = pxsim_Array__length(s.unnamed126___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8934___U1, s.unnamed8935___U2);
-    s.pathTile___203862 = (r0);
-    s.tmp_4 = tiles_Location_x__P187510_mk(s);
+    r0 = pxsim_Array__getAt(s.unnamed126___U1, s.unnamed127___U2);
+    s.pathTile___18700 = (r0);
+    s.tmp_4 = tiles_Location_x__P2293_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1898; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 1905; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     s.tmp_3 = r0;
-    s.tmp_6 = tiles_Location_x__P187510_mk(s);
-    s.tmp_6.arg0 = s.pathTile___203862;
-    s.callLocIdx = 1899; s.pc = 9; return s.tmp_6;
+    s.tmp_6 = tiles_Location_x__P2293_mk(s);
+    s.tmp_6.arg0 = s.pathTile___18700;
+    s.callLocIdx = 1906; s.pc = 9; return s.tmp_6;
   case 9:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -50647,15 +50666,15 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    s.tmp_8 = tiles_Location_y__P187511_mk(s);
+    s.tmp_8 = tiles_Location_y__P2294_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1900; s.pc = 10; return s.tmp_8;
+    s.callLocIdx = 1907; s.pc = 10; return s.tmp_8;
   case 10:
     r0 = s.retval;
     s.tmp_7 = r0;
-    s.tmp_10 = tiles_Location_y__P187511_mk(s);
-    s.tmp_10.arg0 = s.pathTile___203862;
-    s.callLocIdx = 1901; s.pc = 11; return s.tmp_10;
+    s.tmp_10 = tiles_Location_y__P2294_mk(s);
+    s.tmp_10.arg0 = s.pathTile___18700;
+    s.callLocIdx = 1908; s.pc = 11; return s.tmp_10;
   case 11:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -50669,22 +50688,22 @@ switch (step) {
     { step = 7; continue; }
   case 4:
   case 5:
-    r0 = (s.unnamed8935___U2 + 1);
-    s.unnamed8935___U2 = (r0);
+    r0 = (s.unnamed127___U2 + 1);
+    s.unnamed127___U2 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed8934___U1 = (undefined);
+    s.unnamed126___U1 = (undefined);
     r0 = false;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-inline__P203859.info = {"start":5775,"length":221,"line":146,"column":79,"endLine":153,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["tile"]}
+inline__P18697.info = {"start":5775,"length":221,"line":146,"column":79,"endLine":153,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["tile"]}
 
-function inline__P203859_mk(s) {
+function inline__P18697_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P203859, depth: s.depth + 1,
+        parent: s, fn: inline__P18697, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50698,9 +50717,9 @@ function inline__P203859_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  pathTile___203862: undefined,
-  unnamed8934___U1: undefined,
-  unnamed8935___U2: undefined,
+  pathTile___18700: undefined,
+  unnamed126___U1: undefined,
+  unnamed127___U2: undefined,
   arg0: undefined,
 } }
 
@@ -50708,7 +50727,7 @@ function inline__P203859_mk(s) {
 
 
 
-function inline__P203879(s) {
+function inline__P18717(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50718,42 +50737,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.remainingPath___203880 = undefined;
-    s.tmp_0 = scene_getRemainingPath__P191316_mk(s);
+    s.remainingPath___18718 = undefined;
+    s.tmp_0 = scene_getRemainingPath__P6100_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.caps[1];
-    s.callLocIdx = 1903; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1910; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.remainingPath___203880 = (r0);
-    s.tmp_0 = scene__followPath__P188881_mk(s);
+    s.remainingPath___18718 = (r0);
+    s.tmp_0 = scene__followPath__P3664_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_0.arg1 = s.remainingPath___203880;
+    s.tmp_0.arg1 = s.remainingPath___18718;
     s.tmp_0.arg2 = s.caps[2];
     s.tmp_0.arg3 = undefined;
-    s.callLocIdx = 1904; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1911; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P203879.info = {"start":6050,"length":191,"line":155,"column":50,"endLine":159,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
+inline__P18717.info = {"start":6050,"length":191,"line":155,"column":50,"endLine":159,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P203879_mk(s) {
+function inline__P18717_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P203879, depth: s.depth + 1,
+        parent: s, fn: inline__P18717, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  remainingPath___203880: undefined,
+  remainingPath___18718: undefined,
 } }
 
 
 
 
 
-function scene_getRemainingPath__P191316(s) {
+function scene_getRemainingPath__P6100(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50763,26 +50782,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currentLocation___204796 = undefined;
-    s.i___204800 = undefined;
-    s.pathTile___204806 = undefined;
-    s.remainingPath___204821 = undefined;
+    s.currentLocation___19634 = undefined;
+    s.i___19638 = undefined;
+    s.pathTile___19644 = undefined;
+    s.remainingPath___19659 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_locationOfSprite__P191315_mk(s);
+    s.tmp_0 = scene_locationOfSprite__P6099_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1922; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1929; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    s.currentLocation___204796 = (r0);
+    s.currentLocation___19634 = (r0);
     r0 = pxsim_pxtrt.mklocRef();
-    s.i___204800 = (r0);
-    r0 = pxsim_pxtrt_stlocRef(s.i___204800, 0);
+    s.i___19638 = (r0);
+    r0 = pxsim_pxtrt_stlocRef(s.i___19638, 0);
   case 1:
-    r0 = pxsim_pxtrt_ldlocRef(s.i___204800);
+    r0 = pxsim_pxtrt_ldlocRef(s.i___19638);
     s.tmp_1 = r0;
     r0 = pxsim_Array__length(s.arg1);
     s.tmp_2 = r0;
@@ -50791,19 +50810,19 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
     s.tmp_3 = r0 = s.arg1;
-    r0 = pxsim_pxtrt_ldlocRef(s.i___204800);
+    r0 = pxsim_pxtrt_ldlocRef(s.i___19638);
     s.tmp_4 = r0;
     r0 = pxsim_Array__getAt(s.tmp_3, s.tmp_4);
-    s.pathTile___204806 = (r0);
-    s.tmp_2 = tiles_Location_x__P187510_mk(s);
-    s.tmp_2.arg0 = s.currentLocation___204796;
-    s.callLocIdx = 1923; s.pc = 11; return s.tmp_2;
+    s.pathTile___19644 = (r0);
+    s.tmp_2 = tiles_Location_x__P2293_mk(s);
+    s.tmp_2.arg0 = s.currentLocation___19634;
+    s.callLocIdx = 1930; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = tiles_Location_x__P187510_mk(s);
-    s.tmp_4.arg0 = s.pathTile___204806;
-    s.callLocIdx = 1924; s.pc = 12; return s.tmp_4;
+    s.tmp_4 = tiles_Location_x__P2293_mk(s);
+    s.tmp_4.arg0 = s.pathTile___19644;
+    s.callLocIdx = 1931; s.pc = 12; return s.tmp_4;
   case 12:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -50814,15 +50833,15 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 3; continue; }
   case 2:
-    s.tmp_6 = tiles_Location_y__P187511_mk(s);
-    s.tmp_6.arg0 = s.currentLocation___204796;
-    s.callLocIdx = 1925; s.pc = 13; return s.tmp_6;
+    s.tmp_6 = tiles_Location_y__P2294_mk(s);
+    s.tmp_6.arg0 = s.currentLocation___19634;
+    s.callLocIdx = 1932; s.pc = 13; return s.tmp_6;
   case 13:
     r0 = s.retval;
     s.tmp_5 = r0;
-    s.tmp_8 = tiles_Location_y__P187511_mk(s);
-    s.tmp_8.arg0 = s.pathTile___204806;
-    s.callLocIdx = 1926; s.pc = 14; return s.tmp_8;
+    s.tmp_8 = tiles_Location_y__P2294_mk(s);
+    s.tmp_8.arg0 = s.pathTile___19644;
+    s.callLocIdx = 1933; s.pc = 14; return s.tmp_8;
   case 14:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -50832,7 +50851,7 @@ switch (step) {
     s.tmp_9 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_9);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_pxtrt_ldlocRef(s.i___204800);
+    r0 = pxsim_pxtrt_ldlocRef(s.i___19638);
     s.tmp_11 = r0;
     r0 = (s.tmp_11 === 0);
     s.tmp_10 = r0;
@@ -50841,25 +50860,25 @@ switch (step) {
     r0 = s.arg1;
     { step = 5; continue; }
   case 4:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P204828);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P19666);
     s.tmp_12 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_12, 0, s.i___204800);
-    s.tmp_13 = helpers_arrayFilter__P185325_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_12, 0, s.i___19638);
+    s.tmp_13 = helpers_arrayFilter__P108_mk(s);
     s.tmp_13.arg0 = s.arg1;
     s.tmp_13.arg1 = s.tmp_12;
-    s.callLocIdx = 1927; s.pc = 15; return s.tmp_13;
+    s.callLocIdx = 1934; s.pc = 15; return s.tmp_13;
   case 15:
     r0 = s.retval;
   case 5:
     // jmp value (already in r0)
     s.tmp_14 = r0;
-    s.remainingPath___204821 = (s.tmp_14);
-    r0 = s.remainingPath___204821;
+    s.remainingPath___19659 = (s.tmp_14);
+    r0 = s.remainingPath___19659;
     { step = 9; continue; }
   case 6:
   case 7:
-    s.tmp_0 = r0 = s.i___204800;
-    r0 = pxsim_pxtrt_ldlocRef(s.i___204800);
+    s.tmp_0 = r0 = s.i___19638;
+    r0 = pxsim_pxtrt_ldlocRef(s.i___19638);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 + 1);
     s.tmp_1 = r0;
@@ -50871,12 +50890,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_getRemainingPath__P191316.info = {"start":10579,"length":497,"line":292,"column":4,"endLine":302,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getRemainingPath","argumentNames":["sprite","path"]}
+scene_getRemainingPath__P6100.info = {"start":10579,"length":497,"line":292,"column":4,"endLine":302,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getRemainingPath","argumentNames":["sprite","path"]}
 
-function scene_getRemainingPath__P191316_mk(s) {
+function scene_getRemainingPath__P6100_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_getRemainingPath__P191316, depth: s.depth + 1,
+        parent: s, fn: scene_getRemainingPath__P6100, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50893,10 +50912,10 @@ function scene_getRemainingPath__P191316_mk(s) {
   tmp_12: undefined,
   tmp_13: undefined,
   tmp_14: undefined,
-  currentLocation___204796: undefined,
-  i___204800: undefined,
-  pathTile___204806: undefined,
-  remainingPath___204821: undefined,
+  currentLocation___19634: undefined,
+  i___19638: undefined,
+  pathTile___19644: undefined,
+  remainingPath___19659: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -50905,7 +50924,7 @@ function scene_getRemainingPath__P191316_mk(s) {
 
 
 
-function inline__P204828(s) {
+function inline__P19666(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50927,12 +50946,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P204828.info = {"start":10970,"length":16,"line":297,"column":67,"endLine":297,"endColumn":83,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["_","j"]}
+inline__P19666.info = {"start":10970,"length":16,"line":297,"column":67,"endLine":297,"endColumn":83,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["_","j"]}
 
-function inline__P204828_mk(s) {
+function inline__P19666_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P204828, depth: s.depth + 1,
+        parent: s, fn: inline__P19666, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -50944,7 +50963,7 @@ function inline__P204828_mk(s) {
 
 
 
-function scene_locationOfSprite__P191315(s) {
+function scene_locationOfSprite__P6099(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -50958,41 +50977,41 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = tiles_getTileLocation__P187561_mk(s);
-    s.tmp_1 = scene_screenCoordinateToTile__P191314_mk(s);
-    s.tmp_2 = Sprite_x__P187242_mk(s);
+    s.tmp_0 = tiles_getTileLocation__P2344_mk(s);
+    s.tmp_1 = scene_screenCoordinateToTile__P6098_mk(s);
+    s.tmp_2 = Sprite_x__P2025_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1917; s.pc = 3; return s.tmp_2;
+    s.callLocIdx = 1924; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1918; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1925; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg0 = r0;
-    s.tmp_3 = scene_screenCoordinateToTile__P191314_mk(s);
-    s.tmp_4 = Sprite_y__P187244_mk(s);
+    s.tmp_3 = scene_screenCoordinateToTile__P6098_mk(s);
+    s.tmp_4 = Sprite_y__P2027_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 1919; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 1926; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3.arg0 = r0;
-    s.callLocIdx = 1920; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1927; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1921; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1928; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_locationOfSprite__P191315.info = {"start":10417,"length":156,"line":288,"column":4,"endLine":290,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"locationOfSprite","argumentNames":["s"]}
+scene_locationOfSprite__P6099.info = {"start":10417,"length":156,"line":288,"column":4,"endLine":290,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"locationOfSprite","argumentNames":["s"]}
 
-function scene_locationOfSprite__P191315_mk(s) {
+function scene_locationOfSprite__P6099_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_locationOfSprite__P191315, depth: s.depth + 1,
+        parent: s, fn: scene_locationOfSprite__P6099, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51006,7 +51025,7 @@ function scene_locationOfSprite__P191315_mk(s) {
 
 
 
-function scene_screenCoordinateToTile__P191314(s) {
+function scene_screenCoordinateToTile__P6098(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51016,18 +51035,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___204520 = undefined;
+    s.tm___19358 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1915; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1922; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___204520 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tm___204520);
+    s.tm___19358 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tm___19358);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -51038,25 +51057,25 @@ switch (step) {
   case 1:
   case 2:
     s.tmp_2 = r0 = s.arg0;
-    r0 = s.tm___204520.fields["_scale"];
+    r0 = s.tm___19358.fields["_scale"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 >> s.tmp_3);
   case 3:
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenCoordinateToTile__P191314.info = {"start":10239,"length":172,"line":282,"column":4,"endLine":286,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
+scene_screenCoordinateToTile__P6098.info = {"start":10239,"length":172,"line":282,"column":4,"endLine":286,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"screenCoordinateToTile","argumentNames":["value"]}
 
-function scene_screenCoordinateToTile__P191314_mk(s) {
+function scene_screenCoordinateToTile__P6098_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenCoordinateToTile__P191314, depth: s.depth + 1,
+        parent: s, fn: scene_screenCoordinateToTile__P6098, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
-  tm___204520: undefined,
+  tm___19358: undefined,
   arg0: undefined,
 } }
 
@@ -51064,7 +51083,7 @@ function scene_screenCoordinateToTile__P191314_mk(s) {
 
 
 
-function scene_getPathFollowingSprites__P191312(s) {
+function scene_getPathFollowingSprites__P6096(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51074,23 +51093,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_2 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1911; s.pc = 1; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1918; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_data"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_FOLLOW_KEY___191304);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_FOLLOW_KEY___6088);
     return leave(s, r0)
   default: oops()
 } } }
-scene_getPathFollowingSprites__P191312.info = {"start":9927,"length":148,"line":274,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathFollowingSprites","argumentNames":[]}
+scene_getPathFollowingSprites__P6096.info = {"start":9927,"length":148,"line":274,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathFollowingSprites","argumentNames":[]}
 
-function scene_getPathFollowingSprites__P191312_mk(s) {
+function scene_getPathFollowingSprites__P6096_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_getPathFollowingSprites__P191312, depth: s.depth + 1,
+        parent: s, fn: scene_getPathFollowingSprites__P6096, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51101,7 +51120,7 @@ function scene_getPathFollowingSprites__P191312_mk(s) {
 
 
 
-function scene_Scene_data__P187659(s) {
+function scene_Scene_data__P2442(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51116,18 +51135,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Scene__C187636_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Scene__C2419_VT)) failedCast(r0);
     r0 = s.arg0.fields["_data"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Scene_data__P187659.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__P187659.isGetter = true;
+scene_Scene_data__P2442.info = {"start":6655,"length":53,"line":182,"column":8,"endLine":184,"endColumn":9,"fileName":"pxt_modules/game/scene.ts","functionName":"data","argumentNames":["this"]}
+scene_Scene_data__P2442.isGetter = true;
 
-function scene_Scene_data__P187659_mk(s) {
+function scene_Scene_data__P2442_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Scene_data__P187659, depth: s.depth + 1,
+        parent: s, fn: scene_Scene_data__P2442, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -51136,7 +51155,7 @@ function scene_Scene_data__P187659_mk(s) {
 
 
 
-function scene__followPath__P188881(s) {
+function scene__followPath__P3664(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51146,10 +51165,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.store___204539 = undefined;
-    s.previousEl___204542 = undefined;
-    s.start___204552 = undefined;
-    s.pfs___204563 = undefined;
+    s.store___19377 = undefined;
+    s.previousEl___19380 = undefined;
+    s.start___19390 = undefined;
+    s.pfs___19401 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -51166,25 +51185,25 @@ switch (step) {
     { step = 19; continue; }
   case 1:
   case 2:
-    s.tmp_2 = scene_init__P191310_mk(s);
-    s.callLocIdx = 1906; s.pc = 20; return s.tmp_2;
+    s.tmp_2 = scene_init__P6094_mk(s);
+    s.callLocIdx = 1913; s.pc = 20; return s.tmp_2;
   case 20:
     r0 = s.retval;
-    s.tmp_0 = scene_getPathFollowingSprites__P191312_mk(s);
-    s.callLocIdx = 1907; s.pc = 21; return s.tmp_0;
+    s.tmp_0 = scene_getPathFollowingSprites__P6096_mk(s);
+    s.callLocIdx = 1914; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.store___204539 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P204544);
+    s.store___19377 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P19382);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFind__P185326_mk(s);
-    s.tmp_1.arg0 = s.store___204539;
+    s.tmp_1 = helpers_arrayFind__P109_mk(s);
+    s.tmp_1.arg0 = s.store___19377;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1908; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 1915; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    s.previousEl___204542 = (r0);
+    s.previousEl___19380 = (r0);
     s.tmp_0 = r0 = s.arg1;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 3; continue; }
@@ -51195,28 +51214,28 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.start___204552 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.start___204552);
+    s.start___19390 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.start___19390);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.previousEl___204542);
+    r0 = pxsim_numops_toBoolDecr(s.previousEl___19380);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_Array_.removeElement(s.store___204539, s.previousEl___204542);
+    r0 = pxsim_Array_.removeElement(s.store___19377, s.previousEl___19380);
   case 5:
   case 6:
     { step = 19; continue; }
   case 7:
   case 8:
-    s.tmp_0 = r0 = s.previousEl___204542;
+    s.tmp_0 = r0 = s.previousEl___19380;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (!r0) { step = 9; continue; }
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 9:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_PathFollowingSprite__C191306_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_PathFollowingSprite__C6090_VT);
     s.tmp_1 = r0;
     s.tmp_2 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_2);
@@ -51228,44 +51247,44 @@ switch (step) {
   case 11:
     // jmp value (already in r0)
     s.tmp_3 = r0;
-    s.tmp_4 = scene_PathFollowingSprite_constructor__P191307_mk(s);
+    s.tmp_4 = scene_PathFollowingSprite_constructor__P6091_mk(s);
     s.tmp_4.arg0 = s.tmp_1;
     s.tmp_4.arg1 = s.arg0;
     s.tmp_4.arg2 = s.arg1;
     s.tmp_4.arg3 = s.tmp_3;
-    s.callLocIdx = 1909; s.pc = 23; return s.tmp_4;
+    s.callLocIdx = 1916; s.pc = 23; return s.tmp_4;
   case 23:
     r0 = s.retval;
     r0 = s.tmp_1;
   case 12:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.pfs___204563 = (s.tmp_5);
-    r0 = pxsim_numops_toBoolDecr(s.previousEl___204542);
+    s.pfs___19401 = (s.tmp_5);
+    r0 = pxsim_numops_toBoolDecr(s.previousEl___19380);
     if (!r0) { step = 17; continue; }
     r0 = pxsim_numops_toBoolDecr(s.arg2);
     if (!r0) { step = 13; continue; }
-    r0 = (s.previousEl___204542).fields["speed"] = (s.arg2);
+    r0 = (s.previousEl___19380).fields["speed"] = (s.arg2);
   case 13:
   case 14:
-    r0 = (s.previousEl___204542).fields["path"] = (s.arg1);
-    r0 = (s.previousEl___204542).fields["index"] = (0);
+    r0 = (s.previousEl___19380).fields["path"] = (s.arg1);
+    r0 = (s.previousEl___19380).fields["index"] = (0);
     r0 = pxsim_numops_toBoolDecr(s.arg3);
     if (!r0) { step = 15; continue; }
-    r0 = (s.previousEl___204542).fields["onEndHandler"] = (s.arg3);
+    r0 = (s.previousEl___19380).fields["onEndHandler"] = (s.arg3);
   case 15:
   case 16:
     { step = 18; continue; }
   case 17:
-    r0 = (s.pfs___204563).fields["onEndHandler"] = (s.arg3);
-    r0 = pxsim_Array__push(s.store___204539, s.pfs___204563);
+    r0 = (s.pfs___19401).fields["onEndHandler"] = (s.arg3);
+    r0 = pxsim_Array__push(s.store___19377, s.pfs___19401);
   case 18:
-    s.tmp_0 = scene_setVelocityTowards__P191311_mk(s);
+    s.tmp_0 = scene_setVelocityTowards__P6095_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.start___204552;
-    r0 = s.pfs___204563.fields["speed"];
+    s.tmp_0.arg1 = s.start___19390;
+    r0 = s.pfs___19401.fields["speed"];
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 1910; s.pc = 24; return s.tmp_0;
+    s.callLocIdx = 1917; s.pc = 24; return s.tmp_0;
   case 24:
     r0 = s.retval;
   case 19:
@@ -51273,12 +51292,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene__followPath__P188881.info = {"start":8364,"length":1001,"line":219,"column":4,"endLine":255,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"_followPath","argumentNames":["sprite","path","speed","endCb"]}
+scene__followPath__P3664.info = {"start":8364,"length":1001,"line":219,"column":4,"endLine":255,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"_followPath","argumentNames":["sprite","path","speed","endCb"]}
 
-function scene__followPath__P188881_mk(s) {
+function scene__followPath__P3664_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene__followPath__P188881, depth: s.depth + 1,
+        parent: s, fn: scene__followPath__P3664, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51286,10 +51305,10 @@ function scene__followPath__P188881_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  store___204539: undefined,
-  previousEl___204542: undefined,
-  start___204552: undefined,
-  pfs___204563: undefined,
+  store___19377: undefined,
+  previousEl___19380: undefined,
+  start___19390: undefined,
+  pfs___19401: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -51300,7 +51319,7 @@ function scene__followPath__P188881_mk(s) {
 
 
 
-function inline__P204544(s) {
+function inline__P19382(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51320,12 +51339,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P204544.info = {"start":8615,"length":26,"line":225,"column":38,"endLine":225,"endColumn":64,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["el"]}
+inline__P19382.info = {"start":8615,"length":26,"line":225,"column":38,"endLine":225,"endColumn":64,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["el"]}
 
-function inline__P204544_mk(s) {
+function inline__P19382_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P204544, depth: s.depth + 1,
+        parent: s, fn: inline__P19382, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -51335,7 +51354,7 @@ function inline__P204544_mk(s) {
 
 
 
-function scene_setVelocityTowards__P191311(s) {
+function scene_setVelocityTowards__P6095(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51345,46 +51364,46 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dx___204605 = undefined;
-    s.dy___204611 = undefined;
-    s.dist___204617 = undefined;
+    s.dx___19443 = undefined;
+    s.dy___19449 = undefined;
+    s.dist___19455 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.arg2 = (s.lambdaArgs[2]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = tiles_Location_x__P187510_mk(s);
+    s.tmp_1 = tiles_Location_x__P2293_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 1877; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1884; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_x__P187242_mk(s);
+    s.tmp_3 = Sprite_x__P2025_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1878; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1885; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dx___204605 = (r0);
-    s.tmp_1 = tiles_Location_y__P187511_mk(s);
+    s.dx___19443 = (r0);
+    s.tmp_1 = tiles_Location_y__P2294_mk(s);
     s.tmp_1.arg0 = s.arg1;
-    s.callLocIdx = 1879; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1886; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0;
-    s.tmp_3 = Sprite_y__P187244_mk(s);
+    s.tmp_3 = Sprite_y__P2027_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1880; s.pc = 6; return s.tmp_3;
+    s.callLocIdx = 1887; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_0 - s.tmp_2);
-    s.dy___204611 = (r0);
-    r0 = (s.dx___204605 * s.dx___204605);
+    s.dy___19449 = (r0);
+    r0 = (s.dx___19443 * s.dx___19443);
     s.tmp_2 = r0;
-    r0 = (s.dy___204611 * s.dy___204611);
+    r0 = (s.dy___19449 * s.dy___19449);
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
@@ -51399,44 +51418,44 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.dist___204617 = (s.tmp_4);
-    s.tmp_0 = Sprite_vx__P187247_mk(s);
+    s.dist___19455 = (s.tmp_4);
+    s.tmp_0 = Sprite_vx__P2030_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = (s.dx___204605 / s.dist___204617);
+    r0 = (s.dx___19443 / s.dist___19455);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * s.arg2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1881; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1888; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    r0 = (s.dy___204611 / s.dist___204617);
+    r0 = (s.dy___19449 / s.dist___19455);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * s.arg2);
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1882; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1889; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_setVelocityTowards__P191311.info = {"start":2926,"length":304,"line":74,"column":4,"endLine":80,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"setVelocityTowards","argumentNames":["sprite","target","speed"]}
+scene_setVelocityTowards__P6095.info = {"start":2926,"length":304,"line":74,"column":4,"endLine":80,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"setVelocityTowards","argumentNames":["sprite","target","speed"]}
 
-function scene_setVelocityTowards__P191311_mk(s) {
+function scene_setVelocityTowards__P6095_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_setVelocityTowards__P191311, depth: s.depth + 1,
+        parent: s, fn: scene_setVelocityTowards__P6095, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
   tmp_3: undefined,
   tmp_4: undefined,
-  dx___204605: undefined,
-  dy___204611: undefined,
-  dist___204617: undefined,
+  dx___19443: undefined,
+  dy___19449: undefined,
+  dist___19455: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -51446,7 +51465,7 @@ function scene_setVelocityTowards__P191311_mk(s) {
 
 
 
-function scene_init__P191310(s) {
+function scene_init__P6094(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51456,14 +51475,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_5 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1848; s.pc = 3; return s.tmp_5;
+    s.tmp_5 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1855; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = s.tmp_4.fields["_data"];
     s.tmp_3 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_3, globals.PATH_FOLLOW_KEY___191304);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_3, globals.PATH_FOLLOW_KEY___6088);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -51471,31 +51490,31 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_8 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1850; s.pc = 4; return s.tmp_8;
+    s.tmp_8 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1857; s.pc = 4; return s.tmp_8;
   case 4:
     r0 = s.retval;
     s.tmp_7 = r0;
     r0 = s.tmp_7.fields["_data"];
     s.tmp_6 = r0;
-    s.tmp_9 = r0 = globals.PATH_FOLLOW_KEY___191304;
+    s.tmp_9 = r0 = globals.PATH_FOLLOW_KEY___6088;
     r0 = pxsim_Array__mk();
     s.tmp_10 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_6, s.tmp_9, s.tmp_10);
-    s.tmp_2 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1852; s.pc = 5; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1859; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_data"];
     s.tmp_0 = r0;
-    s.tmp_3 = r0 = globals.PATH_COMPLETION_KEY___191305;
+    s.tmp_3 = r0 = globals.PATH_COMPLETION_KEY___6089;
     r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
     r0 = pxsim_pxtrt.mapSetGeneric(s.tmp_0, s.tmp_3, s.tmp_4);
-    s.tmp_0 = game_onUpdate__P187760_mk(s);
-    s.tmp_0.arg0 = inline__P204665;
-    s.callLocIdx = 1876; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_onUpdate__P2543_mk(s);
+    s.tmp_0.arg0 = inline__P19503;
+    s.callLocIdx = 1883; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 1:
@@ -51504,12 +51523,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_init__P191310.info = {"start":619,"length":2301,"line":24,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"init","argumentNames":[]}
+scene_init__P6094.info = {"start":619,"length":2301,"line":24,"column":4,"endLine":72,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"init","argumentNames":[]}
 
-function scene_init__P191310_mk(s) {
+function scene_init__P6094_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_init__P191310, depth: s.depth + 1,
+        parent: s, fn: scene_init__P6094, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51528,7 +51547,7 @@ function scene_init__P191310_mk(s) {
 
 
 
-function inline__P204665(s) {
+function inline__P19503(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51538,45 +51557,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.store___204666 = undefined;
-    s.handlers___204669 = undefined;
-    s.i___204672 = undefined;
-    s.pfs___204679 = undefined;
-    s.sprite___204684 = undefined;
-    s.index___204685 = undefined;
-    s.path___204686 = undefined;
-    s.speed___204687 = undefined;
-    s.target___204688 = undefined;
-    s.x___204693 = undefined;
-    s.y___204694 = undefined;
-    s.vx___204695 = undefined;
-    s.vy___204696 = undefined;
-    s.pastTargetHorizontally___204697 = undefined;
-    s.pastTargetVertically___204716 = undefined;
-    s.newTarget___204741 = undefined;
-    s.tmp_0 = scene_getPathFollowingSprites__P191312_mk(s);
-    s.callLocIdx = 1854; s.pc = 27; return s.tmp_0;
+    s.store___19504 = undefined;
+    s.handlers___19507 = undefined;
+    s.i___19510 = undefined;
+    s.pfs___19517 = undefined;
+    s.sprite___19522 = undefined;
+    s.index___19523 = undefined;
+    s.path___19524 = undefined;
+    s.speed___19525 = undefined;
+    s.target___19526 = undefined;
+    s.x___19531 = undefined;
+    s.y___19532 = undefined;
+    s.vx___19533 = undefined;
+    s.vy___19534 = undefined;
+    s.pastTargetHorizontally___19535 = undefined;
+    s.pastTargetVertically___19554 = undefined;
+    s.newTarget___19579 = undefined;
+    s.tmp_0 = scene_getPathFollowingSprites__P6096_mk(s);
+    s.callLocIdx = 1861; s.pc = 27; return s.tmp_0;
   case 27:
     r0 = s.retval;
-    s.store___204666 = (r0);
-    s.tmp_0 = scene_getPathCompletionEvents__P191313_mk(s);
-    s.callLocIdx = 1855; s.pc = 28; return s.tmp_0;
+    s.store___19504 = (r0);
+    s.tmp_0 = scene_getPathCompletionEvents__P6097_mk(s);
+    s.callLocIdx = 1862; s.pc = 28; return s.tmp_0;
   case 28:
     r0 = s.retval;
-    s.handlers___204669 = (r0);
-    r0 = pxsim_Array__length(s.store___204666);
+    s.handlers___19507 = (r0);
+    r0 = pxsim_Array__length(s.store___19504);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 - 1);
-    s.i___204672 = (r0);
+    s.i___19510 = (r0);
   case 1:
-    r0 = (s.i___204672 >= 0);
+    r0 = (s.i___19510 >= 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    r0 = pxsim_Array__getAt(s.store___204666, s.i___204672);
-    s.pfs___204679 = (r0);
+    r0 = pxsim_Array__getAt(s.store___19504, s.i___19510);
+    s.pfs___19517 = (r0);
     s.tmp_0 = if_sprite_1_mk(s);
-    s.tmp_1 = r0 = s.pfs___204679;
+    s.tmp_1 = r0 = s.pfs___19517;
     s.tmp_0.arg0 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "sprite");
@@ -51584,11 +51603,11 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["sprite"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["sprite"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 1856; s.pc = 29; return s.tmp_0; }
+     else { s.callLocIdx = 1863; s.pc = 29; return s.tmp_0; }
     }
   case 29:
     r0 = s.retval;
-    s.sprite___204684 = (r0);
+    s.sprite___19522 = (r0);
     s.tmp_2 = if_index_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -51597,11 +51616,11 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["index"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["index"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1857; s.pc = 30; return s.tmp_2; }
+     else { s.callLocIdx = 1864; s.pc = 30; return s.tmp_2; }
     }
   case 30:
     r0 = s.retval;
-    s.index___204685 = (r0);
+    s.index___19523 = (r0);
     s.tmp_3 = if_path_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -51610,11 +51629,11 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["path"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["path"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1858; s.pc = 31; return s.tmp_3; }
+     else { s.callLocIdx = 1865; s.pc = 31; return s.tmp_3; }
     }
   case 31:
     r0 = s.retval;
-    s.path___204686 = (r0);
+    s.path___19524 = (r0);
     s.tmp_4 = if_speed_1_mk(s);
     s.tmp_4.arg0 = s.tmp_1;
     if (!s.tmp_4.arg0.vtable.iface) {
@@ -51623,15 +51642,15 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["speed"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["speed"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1859; s.pc = 32; return s.tmp_4; }
+     else { s.callLocIdx = 1866; s.pc = 32; return s.tmp_4; }
     }
   case 32:
     r0 = s.retval;
-    s.speed___204687 = (r0);
-    r0 = pxsim_Array__getAt(s.path___204686, s.index___204685);
-    s.target___204688 = (r0);
+    s.speed___19525 = (r0);
+    r0 = pxsim_Array__getAt(s.path___19524, s.index___19523);
+    s.target___19526 = (r0);
     s.tmp_0 = if_x_1_mk(s);
-    s.tmp_1 = r0 = s.sprite___204684;
+    s.tmp_1 = r0 = s.sprite___19522;
     s.tmp_0.arg0 = r0;
     if (!s.tmp_0.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_0.arg0, "x");
@@ -51639,11 +51658,11 @@ switch (step) {
       s.tmp_0.fn = s.tmp_0.arg0.vtable.iface["x"];
       if (s.tmp_0.fn == null) { s.retval = s.tmp_0.arg0.fields["x"]; }
       else if (!s.tmp_0.fn.isGetter) { s.retval = bind(s.tmp_0); }
-     else { s.callLocIdx = 1860; s.pc = 33; return s.tmp_0; }
+     else { s.callLocIdx = 1867; s.pc = 33; return s.tmp_0; }
     }
   case 33:
     r0 = s.retval;
-    s.x___204693 = (r0);
+    s.x___19531 = (r0);
     s.tmp_2 = if_y_1_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
     if (!s.tmp_2.arg0.vtable.iface) {
@@ -51652,11 +51671,11 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["y"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["y"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1861; s.pc = 34; return s.tmp_2; }
+     else { s.callLocIdx = 1868; s.pc = 34; return s.tmp_2; }
     }
   case 34:
     r0 = s.retval;
-    s.y___204694 = (r0);
+    s.y___19532 = (r0);
     s.tmp_3 = if_vx_1_mk(s);
     s.tmp_3.arg0 = s.tmp_1;
     if (!s.tmp_3.arg0.vtable.iface) {
@@ -51665,11 +51684,11 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["vx"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["vx"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1862; s.pc = 35; return s.tmp_3; }
+     else { s.callLocIdx = 1869; s.pc = 35; return s.tmp_3; }
     }
   case 35:
     r0 = s.retval;
-    s.vx___204695 = (r0);
+    s.vx___19533 = (r0);
     s.tmp_4 = if_vy_1_mk(s);
     s.tmp_4.arg0 = s.tmp_1;
     if (!s.tmp_4.arg0.vtable.iface) {
@@ -51678,12 +51697,12 @@ switch (step) {
       s.tmp_4.fn = s.tmp_4.arg0.vtable.iface["vy"];
       if (s.tmp_4.fn == null) { s.retval = s.tmp_4.arg0.fields["vy"]; }
       else if (!s.tmp_4.fn.isGetter) { s.retval = bind(s.tmp_4); }
-     else { s.callLocIdx = 1863; s.pc = 36; return s.tmp_4; }
+     else { s.callLocIdx = 1870; s.pc = 36; return s.tmp_4; }
     }
   case 36:
     r0 = s.retval;
-    s.vy___204696 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.vx___204695);
+    s.vy___19534 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.vx___19533);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -51692,17 +51711,17 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 5; continue; }
   case 2:
-    r0 = (s.vx___204695 < 0);
+    r0 = (s.vx___19533 < 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 3; continue; }
     r0 = s.tmp_2;
     { step = 4; continue; }
   case 3:
-    s.tmp_3 = r0 = s.x___204693;
-    s.tmp_5 = tiles_Location_x__P187510_mk(s);
-    s.tmp_5.arg0 = s.target___204688;
-    s.callLocIdx = 1864; s.pc = 37; return s.tmp_5;
+    s.tmp_3 = r0 = s.x___19531;
+    s.tmp_5 = tiles_Location_x__P2293_mk(s);
+    s.tmp_5.arg0 = s.target___19526;
+    s.callLocIdx = 1871; s.pc = 37; return s.tmp_5;
   case 37:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -51719,17 +51738,17 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 9; continue; }
   case 6:
-    r0 = (s.vx___204695 > 0);
+    r0 = (s.vx___19533 > 0);
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBool(s.tmp_8);
     if (r0) { step = 7; continue; }
     r0 = s.tmp_8;
     { step = 8; continue; }
   case 7:
-    s.tmp_9 = r0 = s.x___204693;
-    s.tmp_11 = tiles_Location_x__P187510_mk(s);
-    s.tmp_11.arg0 = s.target___204688;
-    s.callLocIdx = 1865; s.pc = 38; return s.tmp_11;
+    s.tmp_9 = r0 = s.x___19531;
+    s.tmp_11 = tiles_Location_x__P2293_mk(s);
+    s.tmp_11.arg0 = s.target___19526;
+    s.callLocIdx = 1872; s.pc = 38; return s.tmp_11;
   case 38:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -51741,8 +51760,8 @@ switch (step) {
   case 9:
     // jmp value (already in r0)
     s.tmp_13 = r0;
-    s.pastTargetHorizontally___204697 = (s.tmp_13);
-    r0 = pxsim_numops_toBoolDecr(s.vy___204696);
+    s.pastTargetHorizontally___19535 = (s.tmp_13);
+    r0 = pxsim_numops_toBoolDecr(s.vy___19534);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -51751,17 +51770,17 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 13; continue; }
   case 10:
-    r0 = (s.vy___204696 < 0);
+    r0 = (s.vy___19534 < 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBool(s.tmp_2);
     if (r0) { step = 11; continue; }
     r0 = s.tmp_2;
     { step = 12; continue; }
   case 11:
-    s.tmp_3 = r0 = s.y___204694;
-    s.tmp_5 = tiles_Location_y__P187511_mk(s);
-    s.tmp_5.arg0 = s.target___204688;
-    s.callLocIdx = 1866; s.pc = 39; return s.tmp_5;
+    s.tmp_3 = r0 = s.y___19532;
+    s.tmp_5 = tiles_Location_y__P2294_mk(s);
+    s.tmp_5.arg0 = s.target___19526;
+    s.callLocIdx = 1873; s.pc = 39; return s.tmp_5;
   case 39:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -51778,17 +51797,17 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 17; continue; }
   case 14:
-    r0 = (s.vy___204696 > 0);
+    r0 = (s.vy___19534 > 0);
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBool(s.tmp_8);
     if (r0) { step = 15; continue; }
     r0 = s.tmp_8;
     { step = 16; continue; }
   case 15:
-    s.tmp_9 = r0 = s.y___204694;
-    s.tmp_11 = tiles_Location_y__P187511_mk(s);
-    s.tmp_11.arg0 = s.target___204688;
-    s.callLocIdx = 1867; s.pc = 40; return s.tmp_11;
+    s.tmp_9 = r0 = s.y___19532;
+    s.tmp_11 = tiles_Location_y__P2294_mk(s);
+    s.tmp_11.arg0 = s.target___19526;
+    s.callLocIdx = 1874; s.pc = 40; return s.tmp_11;
   case 40:
     r0 = s.retval;
     s.tmp_10 = r0;
@@ -51800,112 +51819,112 @@ switch (step) {
   case 17:
     // jmp value (already in r0)
     s.tmp_13 = r0;
-    s.pastTargetVertically___204716 = (s.tmp_13);
-    s.tmp_0 = r0 = s.pastTargetHorizontally___204697;
+    s.pastTargetVertically___19554 = (s.tmp_13);
+    s.tmp_0 = r0 = s.pastTargetHorizontally___19535;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 18; continue; }
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    r0 = s.pastTargetVertically___204716;
+    r0 = s.pastTargetVertically___19554;
   case 19:
     // jmp value (already in r0)
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 24; continue; }
-    s.tmp_2 = r0 = s.pfs___204679;
+    s.tmp_2 = r0 = s.pfs___19517;
     r0 = s.tmp_2.fields["index"];
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 1);
     s.tmp_3 = r0;
     r0 = (s.tmp_2).fields["index"] = (s.tmp_3);
-    r0 = s.pfs___204679.fields["index"];
+    r0 = s.pfs___19517.fields["index"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.path___204686, s.tmp_0);
-    s.newTarget___204741 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.newTarget___204741);
+    r0 = pxsim_Array__getAt(s.path___19524, s.tmp_0);
+    s.newTarget___19579 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.newTarget___19579);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    s.tmp_2 = Sprite_setVelocity__P187290_mk(s);
-    s.tmp_2.arg0 = s.sprite___204684;
+    s.tmp_2 = Sprite_setVelocity__P2073_mk(s);
+    s.tmp_2.arg0 = s.sprite___19522;
     s.tmp_2.arg1 = 0;
     s.tmp_2.arg2 = 0;
-    s.callLocIdx = 1868; s.pc = 41; return s.tmp_2;
+    s.callLocIdx = 1875; s.pc = 41; return s.tmp_2;
   case 41:
     r0 = s.retval;
-    s.tmp_0 = tiles_Location_place__P187513_mk(s);
-    s.tmp_0.arg0 = s.target___204688;
-    s.tmp_0.arg1 = s.sprite___204684;
-    s.callLocIdx = 1869; s.pc = 42; return s.tmp_0;
+    s.tmp_0 = tiles_Location_place__P2296_mk(s);
+    s.tmp_0.arg0 = s.target___19526;
+    s.tmp_0.arg1 = s.sprite___19522;
+    s.callLocIdx = 1876; s.pc = 42; return s.tmp_0;
   case 42:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeAt(s.store___204666, s.i___204672);
-    r0 = s.pfs___204679.fields["onEndHandler"];
+    r0 = pxsim_Array_.removeAt(s.store___19504, s.i___19510);
+    r0 = s.pfs___19517.fields["onEndHandler"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 20; continue; }
     s.tmp_1 = if_onEndHandler_1_mk(s);
-    s.tmp_1.arg0 = s.pfs___204679;
+    s.tmp_1.arg0 = s.pfs___19517;
     if (!s.tmp_1.arg0.vtable.iface) {
       setupLambda(s.tmp_1, pxsim_pxtrt.mapGetByString(s.tmp_1.arg0, "onEndHandler"), 1);
-      s.callLocIdx = 1870; s.pc = 43; return s.tmp_1;
+      s.callLocIdx = 1877; s.pc = 43; return s.tmp_1;
     } else {
       s.tmp_1.fn = s.tmp_1.arg0.vtable.iface["onEndHandler"];
-      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["onEndHandler"], 1); s.callLocIdx = 1870; s.pc = 43; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1870; s.pc = 43; return s.tmp_1;; }
-     else { s.callLocIdx = 1870; s.pc = 43; return s.tmp_1; }
+      if (s.tmp_1.fn == null) { setupLambda(s.tmp_1, s.tmp_1.arg0.fields["onEndHandler"], 1); s.callLocIdx = 1877; s.pc = 43; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1877; s.pc = 43; return s.tmp_1;; }
+     else { s.callLocIdx = 1877; s.pc = 43; return s.tmp_1; }
     }
   case 43:
     r0 = s.retval;
     { step = 21; continue; }
   case 20:
-    r0 = pxsim_pxtcore_mkAction(3, inline__P204763);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P19601);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite___204684);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.path___204686);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.pfs___204679);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_1.arg0 = s.handlers___204669;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.sprite___19522);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.path___19524);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.pfs___19517);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1.arg0 = s.handlers___19507;
     s.tmp_1.arg1 = s.tmp_0;
-    s.callLocIdx = 1873; s.pc = 44; return s.tmp_1;
+    s.callLocIdx = 1880; s.pc = 44; return s.tmp_1;
   case 44:
     r0 = s.retval;
   case 21:
     { step = 23; continue; }
   case 22:
-    s.tmp_0 = tiles_Location_place__P187513_mk(s);
-    s.tmp_0.arg0 = s.target___204688;
-    s.tmp_0.arg1 = s.sprite___204684;
-    s.callLocIdx = 1874; s.pc = 45; return s.tmp_0;
+    s.tmp_0 = tiles_Location_place__P2296_mk(s);
+    s.tmp_0.arg0 = s.target___19526;
+    s.tmp_0.arg1 = s.sprite___19522;
+    s.callLocIdx = 1881; s.pc = 45; return s.tmp_0;
   case 45:
     r0 = s.retval;
-    s.tmp_0 = scene_setVelocityTowards__P191311_mk(s);
-    s.tmp_0.arg0 = s.sprite___204684;
-    s.tmp_0.arg1 = s.newTarget___204741;
-    s.tmp_0.arg2 = s.speed___204687;
-    s.callLocIdx = 1875; s.pc = 46; return s.tmp_0;
+    s.tmp_0 = scene_setVelocityTowards__P6095_mk(s);
+    s.tmp_0.arg0 = s.sprite___19522;
+    s.tmp_0.arg1 = s.newTarget___19579;
+    s.tmp_0.arg2 = s.speed___19525;
+    s.callLocIdx = 1882; s.pc = 46; return s.tmp_0;
   case 46:
     r0 = s.retval;
   case 23:
   case 24:
   case 25:
-    r0 = (s.i___204672 - 1);
-    s.i___204672 = (r0);
+    r0 = (s.i___19510 - 1);
+    s.i___19510 = (r0);
     { step = 1; continue; }
   case 26:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P204665.info = {"start":896,"length":2006,"line":29,"column":26,"endLine":70,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
+inline__P19503.info = {"start":896,"length":2006,"line":29,"column":26,"endLine":70,"endColumn":13,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P204665_mk(s) {
+function inline__P19503_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P204665, depth: s.depth + 1,
+        parent: s, fn: inline__P19503, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -51921,29 +51940,29 @@ function inline__P204665_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  store___204666: undefined,
-  handlers___204669: undefined,
-  i___204672: undefined,
-  pfs___204679: undefined,
-  sprite___204684: undefined,
-  index___204685: undefined,
-  path___204686: undefined,
-  speed___204687: undefined,
-  target___204688: undefined,
-  x___204693: undefined,
-  y___204694: undefined,
-  vx___204695: undefined,
-  vy___204696: undefined,
-  pastTargetHorizontally___204697: undefined,
-  pastTargetVertically___204716: undefined,
-  newTarget___204741: undefined,
+  store___19504: undefined,
+  handlers___19507: undefined,
+  i___19510: undefined,
+  pfs___19517: undefined,
+  sprite___19522: undefined,
+  index___19523: undefined,
+  path___19524: undefined,
+  speed___19525: undefined,
+  target___19526: undefined,
+  x___19531: undefined,
+  y___19532: undefined,
+  vx___19533: undefined,
+  vy___19534: undefined,
+  pastTargetHorizontally___19535: undefined,
+  pastTargetVertically___19554: undefined,
+  newTarget___19579: undefined,
 } }
 
 
 
 
 
-function inline__P204763(s) {
+function inline__P19601(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -51977,12 +51996,12 @@ switch (step) {
     s.tmp_3.arg2 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       setupLambda(s.tmp_3, pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "handler"), 3);
-      s.callLocIdx = 1872; s.pc = 3; return s.tmp_3;
+      s.callLocIdx = 1879; s.pc = 3; return s.tmp_3;
     } else {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["handler"];
-      if (s.tmp_3.fn == null) { setupLambda(s.tmp_3, s.tmp_3.arg0.fields["handler"], 3); s.callLocIdx = 1872; s.pc = 3; return s.tmp_3; }
-      else if (s.tmp_3.fn.isGetter) { s.tmp_3.stage2Call = true; s.callLocIdx = 1872; s.pc = 3; return s.tmp_3;; }
-     else { s.callLocIdx = 1872; s.pc = 3; return s.tmp_3; }
+      if (s.tmp_3.fn == null) { setupLambda(s.tmp_3, s.tmp_3.arg0.fields["handler"], 3); s.callLocIdx = 1879; s.pc = 3; return s.tmp_3; }
+      else if (s.tmp_3.fn.isGetter) { s.tmp_3.stage2Call = true; s.callLocIdx = 1879; s.pc = 3; return s.tmp_3;; }
+     else { s.callLocIdx = 1879; s.pc = 3; return s.tmp_3; }
     }
   case 3:
     r0 = s.retval;
@@ -51992,12 +52011,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P204763.info = {"start":2359,"length":274,"line":58,"column":49,"endLine":62,"endColumn":33,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["completionHandler"]}
+inline__P19601.info = {"start":2359,"length":274,"line":58,"column":49,"endLine":62,"endColumn":33,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["completionHandler"]}
 
-function inline__P204763_mk(s) {
+function inline__P19601_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P204763, depth: s.depth + 1,
+        parent: s, fn: inline__P19601, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52013,7 +52032,7 @@ function inline__P204763_mk(s) {
 
 
 
-function scene_getPathCompletionEvents__P191313(s) {
+function scene_getPathCompletionEvents__P6097(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52023,23 +52042,23 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_2 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1913; s.pc = 1; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1920; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_data"];
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_COMPLETION_KEY___191305);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.tmp_0, globals.PATH_COMPLETION_KEY___6089);
     return leave(s, r0)
   default: oops()
 } } }
-scene_getPathCompletionEvents__P191313.info = {"start":10081,"length":152,"line":278,"column":4,"endLine":280,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathCompletionEvents","argumentNames":[]}
+scene_getPathCompletionEvents__P6097.info = {"start":10081,"length":152,"line":278,"column":4,"endLine":280,"endColumn":5,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"getPathCompletionEvents","argumentNames":[]}
 
-function scene_getPathCompletionEvents__P191313_mk(s) {
+function scene_getPathCompletionEvents__P6097_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_getPathCompletionEvents__P191313, depth: s.depth + 1,
+        parent: s, fn: scene_getPathCompletionEvents__P6097, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52050,7 +52069,7 @@ function scene_getPathCompletionEvents__P191313_mk(s) {
 
 
 
-function scene_PathFollowingSprite_constructor__P191307(s) {
+function scene_PathFollowingSprite_constructor__P6091(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52068,7 +52087,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_PathFollowingSprite__C191306_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_PathFollowingSprite__C6090_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sprite"] = (s.arg1);
     r0 = (s.arg0).fields["path"] = (s.arg2);
     r0 = (s.arg0).fields["speed"] = (s.arg3);
@@ -52077,12 +52096,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_PathFollowingSprite_constructor__P191307.info = {"start":247,"length":174,"line":8,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["this","sprite","path","speed"]}
+scene_PathFollowingSprite_constructor__P6091.info = {"start":247,"length":174,"line":8,"column":8,"endLine":14,"endColumn":9,"fileName":"pxt_modules/arcade-tilemap-a-star/path-following.ts","functionName":"inline","argumentNames":["this","sprite","path","speed"]}
 
-function scene_PathFollowingSprite_constructor__P191307_mk(s) {
+function scene_PathFollowingSprite_constructor__P6091_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_PathFollowingSprite_constructor__P191307, depth: s.depth + 1,
+        parent: s, fn: scene_PathFollowingSprite_constructor__P6091, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -52094,7 +52113,7 @@ function scene_PathFollowingSprite_constructor__P191307_mk(s) {
 
 
 
-function tiles_TileMap_isOnWall__P187555(s) {
+function tiles_TileMap_isOnWall__P2338(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52104,25 +52123,25 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hbox___204900 = undefined;
-    s.left___204903 = undefined;
-    s.right___204909 = undefined;
-    s.top___204915 = undefined;
-    s.bottom___204921 = undefined;
-    s.col___204927 = undefined;
-    s.row___204933 = undefined;
+    s.hbox___19738 = undefined;
+    s.left___19741 = undefined;
+    s.right___19747 = undefined;
+    s.top___19753 = undefined;
+    s.bottom___19759 = undefined;
+    s.col___19765 = undefined;
+    s.row___19771 = 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__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = s.arg1.fields["_hitbox"];
-    s.hbox___204900 = (r0);
-    s.tmp_1 = game_Hitbox_left__P187183_mk(s);
-    s.tmp_1.arg0 = s.hbox___204900;
-    s.callLocIdx = 953; s.pc = 8; return s.tmp_1;
+    s.hbox___19738 = (r0);
+    s.tmp_1 = game_Hitbox_left__P1966_mk(s);
+    s.tmp_1.arg0 = s.hbox___19738;
+    s.callLocIdx = 960; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52131,10 +52150,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.left___204903 = (r0);
-    s.tmp_1 = game_Hitbox_right__P187185_mk(s);
-    s.tmp_1.arg0 = s.hbox___204900;
-    s.callLocIdx = 956; s.pc = 9; return s.tmp_1;
+    s.left___19741 = (r0);
+    s.tmp_1 = game_Hitbox_right__P1968_mk(s);
+    s.tmp_1.arg0 = s.hbox___19738;
+    s.callLocIdx = 963; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52143,10 +52162,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.right___204909 = (r0);
-    s.tmp_1 = game_Hitbox_top__P187184_mk(s);
-    s.tmp_1.arg0 = s.hbox___204900;
-    s.callLocIdx = 959; s.pc = 10; return s.tmp_1;
+    s.right___19747 = (r0);
+    s.tmp_1 = game_Hitbox_top__P1967_mk(s);
+    s.tmp_1.arg0 = s.hbox___19738;
+    s.callLocIdx = 966; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52155,10 +52174,10 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.top___204915 = (r0);
-    s.tmp_1 = game_Hitbox_bottom__P187186_mk(s);
-    s.tmp_1.arg0 = s.hbox___204900;
-    s.callLocIdx = 962; s.pc = 11; return s.tmp_1;
+    s.top___19753 = (r0);
+    s.tmp_1 = game_Hitbox_bottom__P1969_mk(s);
+    s.tmp_1.arg0 = s.hbox___19738;
+    s.callLocIdx = 969; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -52167,24 +52186,24 @@ switch (step) {
     r0 = (s.tmp_2 + 8);
     s.tmp_3 = r0;
     r0 = (s.tmp_0 >> s.tmp_3);
-    s.bottom___204921 = (r0);
-    s.col___204927 = (s.left___204903);
+    s.bottom___19759 = (r0);
+    s.col___19765 = (s.left___19741);
   case 1:
-    r0 = (s.col___204927 <= s.right___204909);
+    r0 = (s.col___19765 <= s.right___19747);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.row___204933 = (s.top___204915);
+    s.row___19771 = (s.top___19753);
   case 2:
-    r0 = (s.row___204933 <= s.bottom___204921);
+    r0 = (s.row___19771 <= s.bottom___19759);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = tiles_TileMap_isObstacle__P187553_mk(s);
+    s.tmp_2 = tiles_TileMap_isObstacle__P2336_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.col___204927;
-    s.tmp_2.arg2 = s.row___204933;
-    s.callLocIdx = 965; s.pc = 12; return s.tmp_2;
+    s.tmp_2.arg1 = s.col___19765;
+    s.tmp_2.arg2 = s.row___19771;
+    s.callLocIdx = 972; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -52194,12 +52213,12 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = (s.row___204933 + 1);
-    s.row___204933 = (r0);
+    r0 = (s.row___19771 + 1);
+    s.row___19771 = (r0);
     { step = 2; continue; }
   case 5:
-    r0 = (s.col___204927 + 1);
-    s.col___204927 = (r0);
+    r0 = (s.col___19765 + 1);
+    s.col___19765 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = false;
@@ -52207,24 +52226,24 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_isOnWall__P187555.info = {"start":13062,"length":627,"line":423,"column":8,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isOnWall","argumentNames":["this","s"]}
+tiles_TileMap_isOnWall__P2338.info = {"start":13062,"length":627,"line":423,"column":8,"endLine":440,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"isOnWall","argumentNames":["this","s"]}
 
-function tiles_TileMap_isOnWall__P187555_mk(s) {
+function tiles_TileMap_isOnWall__P2338_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_isOnWall__P187555, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_isOnWall__P2338, 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___204900: undefined,
-  left___204903: undefined,
-  right___204909: undefined,
-  top___204915: undefined,
-  bottom___204921: undefined,
-  col___204927: undefined,
-  row___204933: undefined,
+  hbox___19738: undefined,
+  left___19741: undefined,
+  right___19747: undefined,
+  top___19753: undefined,
+  bottom___19759: undefined,
+  col___19765: undefined,
+  row___19771: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52233,7 +52252,7 @@ function tiles_TileMap_isOnWall__P187555_mk(s) {
 
 
 
-function game_Hitbox_bottom__P187186(s) {
+function game_Hitbox_bottom__P1969(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52248,10 +52267,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C187176_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
     r0 = s.arg0.fields["height"];
     s.tmp_1 = r0;
-    s.tmp_3 = game_Hitbox_top__P187184_mk(s);
+    s.tmp_3 = game_Hitbox_top__P1967_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 256; s.pc = 1; return s.tmp_3;
   case 1:
@@ -52263,13 +52282,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_bottom__P187186.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__P187186.isGetter = true;
+game_Hitbox_bottom__P1969.info = {"start":742,"length":139,"line":31,"column":8,"endLine":36,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"bottom","argumentNames":["this"]}
+game_Hitbox_bottom__P1969.isGetter = true;
 
-function game_Hitbox_bottom__P187186_mk(s) {
+function game_Hitbox_bottom__P1969_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_bottom__P187186, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_bottom__P1969, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52282,7 +52301,7 @@ function game_Hitbox_bottom__P187186_mk(s) {
 
 
 
-function game_Hitbox_right__P187185(s) {
+function game_Hitbox_right__P1968(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52297,10 +52316,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C187176_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
     r0 = s.arg0.fields["width"];
     s.tmp_1 = r0;
-    s.tmp_3 = game_Hitbox_left__P187183_mk(s);
+    s.tmp_3 = game_Hitbox_left__P1966_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 253; s.pc = 1; return s.tmp_3;
   case 1:
@@ -52312,13 +52331,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_right__P187185.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__P187185.isGetter = true;
+game_Hitbox_right__P1968.info = {"start":594,"length":138,"line":24,"column":8,"endLine":29,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"right","argumentNames":["this"]}
+game_Hitbox_right__P1968.isGetter = true;
 
-function game_Hitbox_right__P187185_mk(s) {
+function game_Hitbox_right__P1968_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_right__P187185, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_right__P1968, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52331,7 +52350,7 @@ function game_Hitbox_right__P187185_mk(s) {
 
 
 
-function game_Hitbox_top__P187184(s) {
+function game_Hitbox_top__P1967(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52346,7 +52365,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C187176_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
     r0 = s.arg0.fields["oy"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["parent"];
@@ -52356,13 +52375,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_top__P187184.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__P187184.isGetter = true;
+game_Hitbox_top__P1967.info = {"start":511,"length":73,"line":20,"column":8,"endLine":22,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"top","argumentNames":["this"]}
+game_Hitbox_top__P1967.isGetter = true;
 
-function game_Hitbox_top__P187184_mk(s) {
+function game_Hitbox_top__P1967_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_top__P187184, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_top__P1967, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52373,7 +52392,7 @@ function game_Hitbox_top__P187184_mk(s) {
 
 
 
-function game_Hitbox_left__P187183(s) {
+function game_Hitbox_left__P1966(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52388,7 +52407,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Hitbox__C187176_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Hitbox__C1959_VT)) failedCast(r0);
     r0 = s.arg0.fields["ox"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["parent"];
@@ -52398,13 +52417,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-game_Hitbox_left__P187183.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__P187183.isGetter = true;
+game_Hitbox_left__P1966.info = {"start":427,"length":74,"line":16,"column":8,"endLine":18,"endColumn":9,"fileName":"pxt_modules/game/hitbox.ts","functionName":"left","argumentNames":["this"]}
+game_Hitbox_left__P1966.isGetter = true;
 
-function game_Hitbox_left__P187183_mk(s) {
+function game_Hitbox_left__P1966_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Hitbox_left__P187183, depth: s.depth + 1,
+        parent: s, fn: game_Hitbox_left__P1966, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52415,7 +52434,7 @@ function game_Hitbox_left__P187183_mk(s) {
 
 
 
-function Fx_toIntShifted__P185368(s) {
+function Fx_toIntShifted__P151(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52437,12 +52456,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_toIntShifted__P185368.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__P151.info = {"start":404,"length":102,"line":17,"column":4,"endLine":19,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"toIntShifted","argumentNames":["a","n"]}
 
-function Fx_toIntShifted__P185368_mk(s) {
+function Fx_toIntShifted__P151_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_toIntShifted__P185368, depth: s.depth + 1,
+        parent: s, fn: Fx_toIntShifted__P151, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52454,7 +52473,7 @@ function Fx_toIntShifted__P185368_mk(s) {
 
 
 
-function sprites_allOfKind__P187192(s) {
+function sprites_allOfKind__P1975(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52464,17 +52483,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.spritesByKind___204988 = undefined;
+    s.spritesByKind___19826 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 271; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
     r0 = r0.fields["spritesByKind"];
-    s.spritesByKind___204988 = (r0);
+    s.spritesByKind___19826 = (r0);
     r0 = (s.arg0 >= 0);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -52486,7 +52505,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___204988, s.arg0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___19826, s.arg0);
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -52500,8 +52519,8 @@ switch (step) {
     { step = 5; continue; }
     { step = 4; continue; }
   case 3:
-    s.tmp_6 = sprites_SpriteSet_sprites__P187332_mk(s);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___204988, s.arg0);
+    s.tmp_6 = sprites_SpriteSet_sprites__P2115_mk(s);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___19826, s.arg0);
     s.tmp_6.arg0 = r0;
     s.callLocIdx = 272; s.pc = 7; return s.tmp_6;
   case 7:
@@ -52513,12 +52532,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_allOfKind__P187192.info = {"start":1561,"length":234,"line":56,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game/sprites.ts","functionName":"allOfKind","argumentNames":["kind"]}
+sprites_allOfKind__P1975.info = {"start":1561,"length":234,"line":56,"column":4,"endLine":60,"endColumn":5,"fileName":"pxt_modules/game/sprites.ts","functionName":"allOfKind","argumentNames":["kind"]}
 
-function sprites_allOfKind__P187192_mk(s) {
+function sprites_allOfKind__P1975_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_allOfKind__P187192, depth: s.depth + 1,
+        parent: s, fn: sprites_allOfKind__P1975, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52527,7 +52546,7 @@ function sprites_allOfKind__P187192_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  spritesByKind___204988: undefined,
+  spritesByKind___19826: undefined,
   arg0: undefined,
 } }
 
@@ -52535,7 +52554,7 @@ function sprites_allOfKind__P187192_mk(s) {
 
 
 
-function sprites_SpriteSet_sprites__P187332(s) {
+function sprites_SpriteSet_sprites__P2115(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52550,8 +52569,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C187328_VT)) failedCast(r0);
-    s.tmp_0 = helpers_arraySlice__P185329_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
+    s.tmp_0 = helpers_arraySlice__P112_mk(s);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 0;
@@ -52565,12 +52584,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_sprites__P187332.info = {"start":787,"length":86,"line":33,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"sprites","argumentNames":["this"]}
+sprites_SpriteSet_sprites__P2115.info = {"start":787,"length":86,"line":33,"column":8,"endLine":35,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"sprites","argumentNames":["this"]}
 
-function sprites_SpriteSet_sprites__P187332_mk(s) {
+function sprites_SpriteSet_sprites__P2115_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_sprites__P187332, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_sprites__P2115, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52581,7 +52600,7 @@ function sprites_SpriteSet_sprites__P187332_mk(s) {
 
 
 
-function tiles_getTileLocation__P187561(s) {
+function tiles_getTileLocation__P2344(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52591,17 +52610,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___205014 = undefined;
+    s.scene___19852 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 981; s.pc = 8; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 988; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.scene___205014 = (r0);
+    s.scene___19852 = (r0);
     r0 = (s.arg0 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -52618,7 +52637,7 @@ switch (step) {
     r0 = s.tmp_1;
     { step = 4; continue; }
   case 3:
-    r0 = s.scene___205014.fields["tileMap"];
+    r0 = s.scene___19852.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -52632,24 +52651,24 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    s.tmp_5 = tiles_TileMap_getTile__P187546_mk(s);
-    r0 = s.scene___205014.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getTile__P2329_mk(s);
+    r0 = s.scene___19852.fields["tileMap"];
     s.tmp_5.arg0 = r0;
     s.tmp_5.arg1 = s.arg0;
     s.tmp_5.arg2 = s.arg1;
-    s.callLocIdx = 982; s.pc = 9; return s.tmp_5;
+    s.callLocIdx = 989; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getTileLocation__P187561.info = {"start":16285,"length":247,"line":515,"column":4,"endLine":519,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileLocation","argumentNames":["col","row"]}
+tiles_getTileLocation__P2344.info = {"start":16285,"length":247,"line":515,"column":4,"endLine":519,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileLocation","argumentNames":["col","row"]}
 
-function tiles_getTileLocation__P187561_mk(s) {
+function tiles_getTileLocation__P2344_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getTileLocation__P187561, depth: s.depth + 1,
+        parent: s, fn: tiles_getTileLocation__P2344, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52657,7 +52676,7 @@ function tiles_getTileLocation__P187561_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___205014: undefined,
+  scene___19852: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52666,7 +52685,7 @@ function tiles_getTileLocation__P187561_mk(s) {
 
 
 
-function tiles_TileMap_getTile__P187546(s) {
+function tiles_TileMap_getTile__P2329(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52683,27 +52702,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C187506_VT);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    r0 = pxsim_pxtcore_mkClassInstance(tiles_Location__C2289_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = tiles_Location_constructor__P187509_mk(s);
+    s.tmp_1 = tiles_Location_constructor__P2292_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 = 900; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 907; 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__P187546.info = {"start":7259,"length":111,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTile","argumentNames":["this","col","row"]}
+tiles_TileMap_getTile__P2329.info = {"start":7259,"length":111,"line":269,"column":8,"endLine":271,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTile","argumentNames":["this","col","row"]}
 
-function tiles_TileMap_getTile__P187546_mk(s) {
+function tiles_TileMap_getTile__P2329_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getTile__P187546, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getTile__P2329, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52716,7 +52735,7 @@ function tiles_TileMap_getTile__P187546_mk(s) {
 
 
 
-function tiles_setWallAt__P187560(s) {
+function tiles_setWallAt__P2343(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52726,18 +52745,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___205056 = undefined;
-    s.scale___205066 = undefined;
+    s.scene___19894 = undefined;
+    s.scale___19904 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 976; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 983; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___205056 = (r0);
+    s.scene___19894 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -52747,7 +52766,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___205056.fields["tileMap"];
+    r0 = s.scene___19894.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -52761,31 +52780,31 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    r0 = s.scene___205056.fields["tileMap"];
+    r0 = s.scene___19894.fields["tileMap"];
     s.tmp_5 = r0;
     r0 = s.tmp_5.fields["_scale"];
-    s.scale___205066 = (r0);
-    s.tmp_0 = tiles_TileMap_setWallAt__P187550_mk(s);
-    r0 = s.scene___205056.fields["tileMap"];
+    s.scale___19904 = (r0);
+    s.tmp_0 = tiles_TileMap_setWallAt__P2333_mk(s);
+    r0 = s.scene___19894.fields["tileMap"];
     s.tmp_0.arg0 = r0;
-    s.tmp_2 = tiles_Location_x__P187510_mk(s);
+    s.tmp_2 = tiles_Location_x__P2293_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 978; s.pc = 8; return s.tmp_2;
+    s.callLocIdx = 985; s.pc = 8; return s.tmp_2;
   case 8:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 >> s.scale___205066);
+    r0 = (s.tmp_1 >> s.scale___19904);
     s.tmp_0.arg1 = r0;
-    s.tmp_4 = tiles_Location_y__P187511_mk(s);
+    s.tmp_4 = tiles_Location_y__P2294_mk(s);
     s.tmp_4.arg0 = s.arg0;
-    s.callLocIdx = 979; s.pc = 9; return s.tmp_4;
+    s.callLocIdx = 986; s.pc = 9; return s.tmp_4;
   case 9:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 >> s.scale___205066);
+    r0 = (s.tmp_3 >> s.scale___19904);
     s.tmp_0.arg2 = r0;
     s.tmp_0.arg3 = s.arg1;
-    s.callLocIdx = 980; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 987; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 5:
@@ -52793,12 +52812,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_setWallAt__P187560.info = {"start":15717,"length":271,"line":499,"column":4,"endLine":504,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWallAt","argumentNames":["loc","on"]}
+tiles_setWallAt__P2343.info = {"start":15717,"length":271,"line":499,"column":4,"endLine":504,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWallAt","argumentNames":["loc","on"]}
 
-function tiles_setWallAt__P187560_mk(s) {
+function tiles_setWallAt__P2343_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_setWallAt__P187560, depth: s.depth + 1,
+        parent: s, fn: tiles_setWallAt__P2343, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52806,8 +52825,8 @@ function tiles_setWallAt__P187560_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  scene___205056: undefined,
-  scale___205066: undefined,
+  scene___19894: undefined,
+  scale___19904: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -52816,7 +52835,7 @@ function tiles_setWallAt__P187560_mk(s) {
 
 
 
-function tiles_TileMap_setWallAt__P187550(s) {
+function tiles_TileMap_setWallAt__P2333(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52834,13 +52853,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    s.tmp_3 = tiles_TileMapData_isOutsideMap__P187533_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_3 = tiles_TileMapData_isOutsideMap__P2316_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_3.arg0 = r0;
     s.tmp_3.arg1 = s.arg1;
     s.tmp_3.arg2 = s.arg2;
-    s.callLocIdx = 908; s.pc = 3; return s.tmp_3;
+    s.callLocIdx = 915; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -52850,13 +52869,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_4 = tiles_TileMapData_setWall__P187531_mk(s);
+    s.tmp_4 = tiles_TileMapData_setWall__P2314_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.arg1;
     s.tmp_4.arg2 = s.arg2;
     s.tmp_4.arg3 = s.arg3;
-    s.callLocIdx = 909; s.pc = 4; return s.tmp_4;
+    s.callLocIdx = 916; s.pc = 4; return s.tmp_4;
   case 4:
     r0 = s.retval;
   case 1:
@@ -52865,12 +52884,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMap_setWallAt__P187550.info = {"start":8206,"length":173,"line":297,"column":8,"endLine":300,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWallAt","argumentNames":["this","col","row","on"]}
+tiles_TileMap_setWallAt__P2333.info = {"start":8206,"length":173,"line":297,"column":8,"endLine":300,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWallAt","argumentNames":["this","col","row","on"]}
 
-function tiles_TileMap_setWallAt__P187550_mk(s) {
+function tiles_TileMap_setWallAt__P2333_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_setWallAt__P187550, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_setWallAt__P2333, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52887,7 +52906,7 @@ function tiles_TileMap_setWallAt__P187550_mk(s) {
 
 
 
-function tiles_TileMapData_setWall__P187531(s) {
+function tiles_TileMapData_setWall__P2314(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52905,7 +52924,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMapData__C187521_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMapData__C2304_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg3);
     if (!r0) { step = 1; continue; }
     r0 = 2;
@@ -52922,12 +52941,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-tiles_TileMapData_setWall__P187531.info = {"start":5326,"length":127,"line":191,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWall","argumentNames":["this","col","row","on"]}
+tiles_TileMapData_setWall__P2314.info = {"start":5326,"length":127,"line":191,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"setWall","argumentNames":["this","col","row","on"]}
 
-function tiles_TileMapData_setWall__P187531_mk(s) {
+function tiles_TileMapData_setWall__P2314_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMapData_setWall__P187531, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMapData_setWall__P2314, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -52941,7 +52960,7 @@ function tiles_TileMapData_setWall__P187531_mk(s) {
 
 
 
-function info_onCountdownEnd__P187432(s) {
+function info_onCountdownEnd__P2215(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52955,21 +52974,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_initHUD__P189492_mk(s);
-    s.callLocIdx = 809; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = info_initHUD__P4276_mk(s);
+    s.callLocIdx = 811; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = (globals.infoState___189446).fields["countdownEndHandler"] = (s.arg0);
+    r0 = (globals.infoState___4230).fields["countdownEndHandler"] = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_onCountdownEnd__P187432.info = {"start":10271,"length":127,"line":351,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"onCountdownEnd","argumentNames":["handler"]}
+info_onCountdownEnd__P2215.info = {"start":10271,"length":127,"line":351,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"onCountdownEnd","argumentNames":["handler"]}
 
-function info_onCountdownEnd__P187432_mk(s) {
+function info_onCountdownEnd__P2215_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_onCountdownEnd__P187432, depth: s.depth + 1,
+        parent: s, fn: info_onCountdownEnd__P2215, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -52979,7 +52998,7 @@ function info_onCountdownEnd__P187432_mk(s) {
 
 
 
-function info_startCountdown__P187430(s) {
+function info_startCountdown__P2213(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -52993,15 +53012,15 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = info_updateFlag__P189496_mk(s);
+    s.tmp_0 = info_updateFlag__P4280_mk(s);
     s.tmp_0.arg0 = 1;
     s.tmp_0.arg1 = true;
-    s.callLocIdx = 805; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 807; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = r0 = globals.infoState___189446;
-    s.tmp_4 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 806; s.pc = 2; return s.tmp_4;
+    s.tmp_0 = r0 = globals.infoState___4230;
+    s.tmp_4 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 808; s.pc = 2; return s.tmp_4;
   case 2:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -53012,17 +53031,17 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_5);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["gameEnd"] = (s.tmp_1);
-    r0 = (globals.infoState___189446).fields["countdownExpired"] = (false);
+    r0 = (globals.infoState___4230).fields["countdownExpired"] = (false);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_startCountdown__P187430.info = {"start":9395,"length":224,"line":326,"column":4,"endLine":330,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"startCountdown","argumentNames":["duration"]}
+info_startCountdown__P2213.info = {"start":9395,"length":224,"line":326,"column":4,"endLine":330,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"startCountdown","argumentNames":["duration"]}
 
-function info_startCountdown__P187430_mk(s) {
+function info_startCountdown__P2213_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_startCountdown__P187430, depth: s.depth + 1,
+        parent: s, fn: info_startCountdown__P2213, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53037,7 +53056,7 @@ function info_startCountdown__P187430_mk(s) {
 
 
 
-function timer_after__P188811(s) {
+function timer_after__P3594(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53052,22 +53071,22 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = setTimeout__P185629_mk(s);
+    s.tmp_0 = setTimeout__P412_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1740; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1747; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-timer_after__P188811.info = {"start":317,"length":96,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"after","argumentNames":["time","thenDo"]}
+timer_after__P3594.info = {"start":317,"length":96,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/Timers/timers.ts","functionName":"after","argumentNames":["time","thenDo"]}
 
-function timer_after__P188811_mk(s) {
+function timer_after__P3594_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: timer_after__P188811, depth: s.depth + 1,
+        parent: s, fn: timer_after__P3594, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53078,7 +53097,7 @@ function timer_after__P188811_mk(s) {
 
 
 
-function setTimeout__P185629(s) {
+function setTimeout__P412(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53093,7 +53112,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = control_setInterval__P185560_mk(s);
+    s.tmp_0 = control_setInterval__P343_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = 1;
@@ -53103,12 +53122,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-setTimeout__P185629.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__P412.info = {"start":610,"length":139,"line":26,"column":0,"endLine":28,"endColumn":1,"fileName":"pxt_modules/base/scheduling.ts","functionName":"setTimeout","argumentNames":["func","delay"]}
 
-function setTimeout__P185629_mk(s) {
+function setTimeout__P412_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: setTimeout__P185629, depth: s.depth + 1,
+        parent: s, fn: setTimeout__P412, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53119,7 +53138,7 @@ function setTimeout__P185629_mk(s) {
 
 
 
-function control_setInterval__P185560(s) {
+function control_setInterval__P343(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53129,7 +53148,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.interval___202021 = undefined;
+    s.interval___20478 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -53155,19 +53174,19 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    r0 = pxsim_numops_toBoolDecr(globals._intervals___189213);
+    r0 = pxsim_numops_toBoolDecr(globals._intervals___3997);
     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___189213 = (r0);
+    globals._intervals___3997 = (r0);
   case 5:
   case 6:
-    r0 = pxsim_pxtcore_mkClassInstance(control_Interval__C189214_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(control_Interval__C3998_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = control_Interval_constructor__P189217_mk(s);
+    s.tmp_1 = control_Interval_constructor__P4001_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -53175,25 +53194,25 @@ switch (step) {
     s.callLocIdx = 31; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    s.interval___202021 = (s.tmp_0);
-    r0 = s.interval___202021.fields["id"];
+    s.interval___20478 = (s.tmp_0);
+    r0 = s.interval___20478.fields["id"];
   case 7:
     return leave(s, r0)
   default: oops()
 } } }
-control_setInterval__P185560.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__P343.info = {"start":1554,"length":266,"line":54,"column":4,"endLine":59,"endColumn":5,"fileName":"pxt_modules/base/interval.ts","functionName":"setInterval","argumentNames":["func","delay","mode"]}
 
-function control_setInterval__P185560_mk(s) {
+function control_setInterval__P343_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_setInterval__P185560, depth: s.depth + 1,
+        parent: s, fn: control_setInterval__P343, 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___202021: undefined,
+  interval___20478: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -53203,7 +53222,7 @@ function control_setInterval__P185560_mk(s) {
 
 
 
-function control_Interval_constructor__P189217(s) {
+function control_Interval_constructor__P4001(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53221,8 +53240,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_Interval__C189214_VT)) failedCast(r0);
-    r0 = pxsim_Array__length(globals._intervals___189213);
+    if (!checkSubtype(r0, control_Interval__C3998_VT)) failedCast(r0);
+    r0 = pxsim_Array__length(globals._intervals___3997);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 == 0);
     s.tmp_0 = r0;
@@ -53231,8 +53250,8 @@ switch (step) {
     r0 = 1;
     { step = 2; continue; }
   case 1:
-    s.tmp_3 = r0 = globals._intervals___189213;
-    r0 = pxsim_Array__length(globals._intervals___189213);
+    s.tmp_3 = r0 = globals._intervals___3997;
+    r0 = pxsim_Array__length(globals._intervals___3997);
     s.tmp_5 = r0;
     r0 = (s.tmp_5 - 1);
     s.tmp_4 = r0;
@@ -53247,8 +53266,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___189213, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P202064);
+    r0 = pxsim_Array__push(globals._intervals___3997, s.arg0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P20521);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = pxsim.control.runInParallel(s.tmp_0);
@@ -53256,12 +53275,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_Interval_constructor__P189217.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__P4001.info = {"start":283,"length":367,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":["this","func","delay","mode"]}
 
-function control_Interval_constructor__P189217_mk(s) {
+function control_Interval_constructor__P4001_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_Interval_constructor__P189217, depth: s.depth + 1,
+        parent: s, fn: control_Interval_constructor__P4001, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53280,7 +53299,7 @@ function control_Interval_constructor__P189217_mk(s) {
 
 
 
-function inline__P202064(s) {
+function inline__P20521(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53290,7 +53309,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = control_Interval_work__P189215_mk(s);
+    s.tmp_0 = control_Interval_work__P3999_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.callLocIdx = 26; s.pc = 1; return s.tmp_0;
   case 1:
@@ -53299,12 +53318,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P202064.info = {"start":621,"length":17,"line":23,"column":34,"endLine":23,"endColumn":51,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":[]}
+inline__P20521.info = {"start":621,"length":17,"line":23,"column":34,"endLine":23,"endColumn":51,"fileName":"pxt_modules/base/interval.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P202064_mk(s) {
+function inline__P20521_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P202064, depth: s.depth + 1,
+        parent: s, fn: inline__P20521, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -53313,7 +53332,7 @@ function inline__P202064_mk(s) {
 
 
 
-function control_Interval_work__P189215(s) {
+function control_Interval_work__P3999(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53328,7 +53347,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, control_Interval__C189214_VT)) failedCast(r0);
+    if (!checkSubtype(r0, control_Interval__C3998_VT)) failedCast(r0);
     r0 = s.arg0.fields["mode"];
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.switch_eq(2, s.tmp_0);
@@ -53347,7 +53366,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 3; continue; }
-    s.tmp_3 = pause__P185619_mk(s);
+    s.tmp_3 = pause__P402_mk(s);
     r0 = s.arg0.fields["delay"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 27; s.pc = 13; return s.tmp_3;
@@ -53385,7 +53404,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 11; continue; }
-    s.tmp_2 = pause__P185619_mk(s);
+    s.tmp_2 = pause__P402_mk(s);
     r0 = s.arg0.fields["delay"];
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 29; s.pc = 15; return s.tmp_2;
@@ -53415,17 +53434,17 @@ switch (step) {
     { step = 8; continue; }
   case 11:
   case 12:
-    r0 = pxsim_Array_.removeElement(globals._intervals___189213, s.arg0);
+    r0 = pxsim_Array_.removeElement(globals._intervals___3997, s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control_Interval_work__P189215.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__P3999.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__P189215_mk(s) {
+function control_Interval_work__P3999_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_Interval_work__P189215, depth: s.depth + 1,
+        parent: s, fn: control_Interval_work__P3999, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53438,7 +53457,7 @@ function control_Interval_work__P189215_mk(s) {
 
 
 
-function info_stopCountdown__P187431(s) {
+function info_stopCountdown__P2214(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53448,24 +53467,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = info_updateFlag__P189496_mk(s);
+    s.tmp_0 = info_updateFlag__P4280_mk(s);
     s.tmp_0.arg0 = 1;
     s.tmp_0.arg1 = false;
-    s.callLocIdx = 808; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 810; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = (globals.infoState___189446).fields["gameEnd"] = (undefined);
-    r0 = (globals.infoState___189446).fields["countdownExpired"] = (true);
+    r0 = (globals.infoState___4230).fields["gameEnd"] = (undefined);
+    r0 = (globals.infoState___4230).fields["countdownExpired"] = (true);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-info_stopCountdown__P187431.info = {"start":9829,"length":170,"line":338,"column":4,"endLine":342,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"stopCountdown","argumentNames":[]}
+info_stopCountdown__P2214.info = {"start":9829,"length":170,"line":338,"column":4,"endLine":342,"endColumn":5,"fileName":"pxt_modules/game/info.ts","functionName":"stopCountdown","argumentNames":[]}
 
-function info_stopCountdown__P187431_mk(s) {
+function info_stopCountdown__P2214_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_stopCountdown__P187431, depth: s.depth + 1,
+        parent: s, fn: info_stopCountdown__P2214, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -53474,7 +53493,7 @@ function info_stopCountdown__P187431_mk(s) {
 
 
 
-function Sprite_setKind__P187288(s) {
+function Sprite_setKind__P2071(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53484,15 +53503,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.spritesByKind___205627 = undefined;
-    s.overlapMap___205656 = undefined;
+    s.spritesByKind___20571 = undefined;
+    s.overlapMap___20600 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = (s.arg1 == undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -53511,12 +53530,12 @@ switch (step) {
     { step = 15; continue; }
   case 3:
   case 4:
-    s.tmp_3 = game_currentScene__P187749_mk(s);
+    s.tmp_3 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 336; s.pc = 16; return s.tmp_3;
   case 16:
     r0 = s.retval;
     r0 = r0.fields["spritesByKind"];
-    s.spritesByKind___205627 = (r0);
+    s.spritesByKind___20571 = (r0);
     r0 = s.arg0.fields["_kind"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 >= 0);
@@ -53528,16 +53547,16 @@ switch (step) {
   case 5:
     r0 = s.arg0.fields["_kind"];
     s.tmp_2 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___205627, s.tmp_2);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20571, 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__P187335_mk(s);
+    s.tmp_4 = sprites_SpriteSet_remove__P2118_mk(s);
     r0 = s.arg0.fields["_kind"];
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___205627, s.tmp_5);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20571, s.tmp_5);
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = s.arg0;
     s.callLocIdx = 337; s.pc = 17; return s.tmp_4;
@@ -53549,7 +53568,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___205627, s.arg1);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20571, s.arg1);
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -53557,18 +53576,18 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 9; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteSet__C187328_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_SpriteSet__C2111_VT);
     s.tmp_4 = r0;
-    s.tmp_5 = sprites_SpriteSet_constructor__P187330_mk(s);
+    s.tmp_5 = sprites_SpriteSet_constructor__P2113_mk(s);
     s.tmp_5.arg0 = s.tmp_4;
     s.callLocIdx = 338; s.pc = 18; return s.tmp_5;
   case 18:
     r0 = s.retval;
-    r0 = pxsim_pxtrt.mapSetGeneric(s.spritesByKind___205627, s.arg1, s.tmp_4);
+    r0 = pxsim_pxtrt.mapSetGeneric(s.spritesByKind___20571, s.arg1, s.tmp_4);
   case 9:
   case 10:
-    s.tmp_0 = sprites_SpriteSet_add__P187333_mk(s);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___205627, s.arg1);
+    s.tmp_0 = sprites_SpriteSet_add__P2116_mk(s);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.spritesByKind___20571, s.arg1);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 339; s.pc = 19; return s.tmp_0;
@@ -53576,13 +53595,13 @@ switch (step) {
     r0 = s.retval;
   case 11:
   case 12:
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 340; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     r0 = r0.fields["overlapMap"];
-    s.overlapMap___205656 = (r0);
-    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___205656, s.arg1);
+    s.overlapMap___20600 = (r0);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___20600, s.arg1);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     s.tmp_1 = r0;
@@ -53590,7 +53609,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___205656;
+    s.tmp_3 = r0 = s.overlapMap___20600;
     s.tmp_4 = r0 = s.arg1;
     r0 = pxsim_Array__mk();
     s.tmp_5 = r0;
@@ -53598,7 +53617,7 @@ switch (step) {
   case 13:
   case 14:
     s.tmp_0 = r0 = s.arg0;
-    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___205656, s.arg1);
+    r0 = pxsim_pxtrt.mapGetGeneric(s.overlapMap___20600, s.arg1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_kindsOverlappedWith"] = (s.tmp_1);
     r0 = (s.arg0).fields["_kind"] = (s.arg1);
@@ -53607,12 +53626,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_setKind__P187288.info = {"start":10872,"length":663,"line":398,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setKind","argumentNames":["this","value"]}
+Sprite_setKind__P2071.info = {"start":10872,"length":663,"line":398,"column":4,"endLine":418,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"setKind","argumentNames":["this","value"]}
 
-function Sprite_setKind__P187288_mk(s) {
+function Sprite_setKind__P2071_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_setKind__P187288, depth: s.depth + 1,
+        parent: s, fn: Sprite_setKind__P2071, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53620,8 +53639,8 @@ function Sprite_setKind__P187288_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  spritesByKind___205627: undefined,
-  overlapMap___205656: undefined,
+  spritesByKind___20571: undefined,
+  overlapMap___20600: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -53630,7 +53649,7 @@ function Sprite_setKind__P187288_mk(s) {
 
 
 
-function sprites_SpriteSet_add__P187333(s) {
+function sprites_SpriteSet_add__P2116(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53646,7 +53665,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C187328_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -53677,12 +53696,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_add__P187333.info = {"start":1027,"length":263,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"add","argumentNames":["this","sprite"]}
+sprites_SpriteSet_add__P2116.info = {"start":1027,"length":263,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"add","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_add__P187333_mk(s) {
+function sprites_SpriteSet_add__P2116_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_add__P187333, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_add__P2116, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53698,7 +53717,7 @@ function sprites_SpriteSet_add__P187333_mk(s) {
 
 
 
-function sprites_SpriteSet_contains__P187336(s) {
+function sprites_SpriteSet_contains__P2119(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53714,7 +53733,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C187328_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
     r0 = s.arg0.fields["_sprites"];
     s.tmp_1 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_1, s.arg1, undefined);
@@ -53723,12 +53742,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_contains__P187336.info = {"start":2162,"length":100,"line":79,"column":8,"endLine":81,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"contains","argumentNames":["this","sprite"]}
+sprites_SpriteSet_contains__P2119.info = {"start":2162,"length":100,"line":79,"column":8,"endLine":81,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"contains","argumentNames":["this","sprite"]}
 
-function sprites_SpriteSet_contains__P187336_mk(s) {
+function sprites_SpriteSet_contains__P2119_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_contains__P187336, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_contains__P2119, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53740,7 +53759,7 @@ function sprites_SpriteSet_contains__P187336_mk(s) {
 
 
 
-function sprites_SpriteSet_constructor__P187330(s) {
+function sprites_SpriteSet_constructor__P2113(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53755,7 +53774,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C187328_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -53764,12 +53783,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_constructor__P187330.info = {"start":488,"length":57,"line":19,"column":8,"endLine":21,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"inline","argumentNames":["this"]}
+sprites_SpriteSet_constructor__P2113.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__P187330_mk(s) {
+function sprites_SpriteSet_constructor__P2113_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_constructor__P187330, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_constructor__P2113, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53780,7 +53799,7 @@ function sprites_SpriteSet_constructor__P187330_mk(s) {
 
 
 
-function scene_onOverlapTile__P187325(s) {
+function scene_onOverlapTile__P2108(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53790,7 +53809,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tileOverlapHandlers___205713 = undefined;
+    s.tileOverlapHandlers___20657 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -53826,15 +53845,15 @@ switch (step) {
     { step = 7; continue; }
   case 5:
   case 6:
-    s.tmp_5 = game_currentScene__P187749_mk(s);
+    s.tmp_5 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 523; s.pc = 8; return s.tmp_5;
   case 8:
     r0 = s.retval;
     r0 = r0.fields["tileOverlapHandlers"];
-    s.tileOverlapHandlers___205713 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_TileOverlapHandler__C187613_VT);
+    s.tileOverlapHandlers___20657 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_TileOverlapHandler__C2396_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_TileOverlapHandler_constructor__P187614_mk(s);
+    s.tmp_1 = scene_TileOverlapHandler_constructor__P2397_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
     s.tmp_1.arg1 = s.arg0;
     s.tmp_1.arg2 = s.arg1;
@@ -53842,18 +53861,18 @@ switch (step) {
     s.callLocIdx = 524; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.tileOverlapHandlers___205713, s.tmp_0);
+    r0 = pxsim_Array__push(s.tileOverlapHandlers___20657, s.tmp_0);
   case 7:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_onOverlapTile__P187325.info = {"start":2785,"length":432,"line":89,"column":4,"endLine":100,"endColumn":5,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"onOverlapTile","argumentNames":["kind","tile","handler"]}
+scene_onOverlapTile__P2108.info = {"start":2785,"length":432,"line":89,"column":4,"endLine":100,"endColumn":5,"fileName":"pxt_modules/game/spriteevents.ts","functionName":"onOverlapTile","argumentNames":["kind","tile","handler"]}
 
-function scene_onOverlapTile__P187325_mk(s) {
+function scene_onOverlapTile__P2108_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_onOverlapTile__P187325, depth: s.depth + 1,
+        parent: s, fn: scene_onOverlapTile__P2108, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -53861,7 +53880,7 @@ function scene_onOverlapTile__P187325_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  tileOverlapHandlers___205713: undefined,
+  tileOverlapHandlers___20657: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -53871,7 +53890,7 @@ function scene_onOverlapTile__P187325_mk(s) {
 
 
 
-function scene_TileOverlapHandler_constructor__P187614(s) {
+function scene_TileOverlapHandler_constructor__P2397(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53889,7 +53908,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_TileOverlapHandler__C187613_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_TileOverlapHandler__C2396_VT)) failedCast(r0);
     r0 = (s.arg0).fields["spriteKind"] = (s.arg1);
     r0 = (s.arg0).fields["tileKind"] = (s.arg2);
     r0 = (s.arg0).fields["handler"] = (s.arg3);
@@ -53897,12 +53916,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_TileOverlapHandler_constructor__P187614.info = {"start":1075,"length":180,"line":37,"column":8,"endLine":41,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","spriteKind","tileKind","handler"]}
+scene_TileOverlapHandler_constructor__P2397.info = {"start":1075,"length":180,"line":37,"column":8,"endLine":41,"endColumn":13,"fileName":"pxt_modules/game/scene.ts","functionName":"inline","argumentNames":["this","spriteKind","tileKind","handler"]}
 
-function scene_TileOverlapHandler_constructor__P187614_mk(s) {
+function scene_TileOverlapHandler_constructor__P2397_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_TileOverlapHandler_constructor__P187614, depth: s.depth + 1,
+        parent: s, fn: scene_TileOverlapHandler_constructor__P2397, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -53914,7 +53933,7 @@ function scene_TileOverlapHandler_constructor__P187614_mk(s) {
 
 
 
-function images_printCenter__P188862(s) {
+function images_printCenter__P3645(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53931,25 +53950,25 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_imagePrintCenter__P186976_mk(s);
+    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.tmp_0.arg3 = s.arg3;
     s.tmp_0.arg4 = undefined;
-    s.callLocIdx = 1780; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1787; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-images_printCenter__P188862.info = {"start":675,"length":123,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/arcade-text/images.ts","functionName":"printCenter","argumentNames":["i","text","y","color"]}
+images_printCenter__P3645.info = {"start":675,"length":123,"line":21,"column":4,"endLine":23,"endColumn":5,"fileName":"pxt_modules/arcade-text/images.ts","functionName":"printCenter","argumentNames":["i","text","y","color"]}
 
-function images_printCenter__P188862_mk(s) {
+function images_printCenter__P3645_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: images_printCenter__P188862, depth: s.depth + 1,
+        parent: s, fn: images_printCenter__P3645, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -53962,7 +53981,7 @@ function images_printCenter__P188862_mk(s) {
 
 
 
-function Math_map__P185488(s) {
+function Math_map__P271(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -53994,12 +54013,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_map__P185488.info = {"start":1093,"length":202,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/base/math.ts","functionName":"map","argumentNames":["value","fromLow","fromHigh","toLow","toHigh"]}
+Math_map__P271.info = {"start":1093,"length":202,"line":22,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/base/math.ts","functionName":"map","argumentNames":["value","fromLow","fromHigh","toLow","toHigh"]}
 
-function Math_map__P185488_mk(s) {
+function Math_map__P271_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_map__P185488, depth: s.depth + 1,
+        parent: s, fn: Math_map__P271, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54017,7 +54036,7 @@ function Math_map__P185488_mk(s) {
 
 
 
-function helpers_imageFillRect__P186945(s) {
+function helpers_imageFillRect__P1728(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54037,14 +54056,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = helpers_pack__P189316_mk(s);
+    s.tmp_2 = helpers_pack__P4100_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.tmp_2.arg1 = s.arg2;
     s.callLocIdx = 121; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = helpers_pack__P189316_mk(s);
+    s.tmp_4 = helpers_pack__P4100_mk(s);
     s.tmp_4.arg0 = s.arg3;
     s.tmp_4.arg1 = s.arg4;
     s.callLocIdx = 122; s.pc = 2; return s.tmp_4;
@@ -54056,12 +54075,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageFillRect__P186945.info = {"start":3650,"length":159,"line":131,"column":4,"endLine":133,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageFillRect","argumentNames":["img","x","y","w","h","c"]}
+helpers_imageFillRect__P1728.info = {"start":3650,"length":159,"line":131,"column":4,"endLine":133,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageFillRect","argumentNames":["img","x","y","w","h","c"]}
 
-function helpers_imageFillRect__P186945_mk(s) {
+function helpers_imageFillRect__P1728_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageFillRect__P186945, depth: s.depth + 1,
+        parent: s, fn: helpers_imageFillRect__P1728, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54080,7 +54099,7 @@ function helpers_imageFillRect__P186945_mk(s) {
 
 
 
-function scene_screenHeight__P187673(s) {
+function scene_screenHeight__P2456(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54090,16 +54109,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenHeight__P187673.info = {"start":876,"length":76,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenHeight","argumentNames":[]}
+scene_screenHeight__P2456.info = {"start":876,"length":76,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenHeight","argumentNames":[]}
 
-function scene_screenHeight__P187673_mk(s) {
+function scene_screenHeight__P2456_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenHeight__P187673, depth: s.depth + 1,
+        parent: s, fn: scene_screenHeight__P2456, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54107,7 +54126,7 @@ function scene_screenHeight__P187673_mk(s) {
 
 
 
-function scene_screenWidth__P187672(s) {
+function scene_screenWidth__P2455(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54117,16 +54136,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     return leave(s, r0)
   default: oops()
 } } }
-scene_screenWidth__P187672.info = {"start":604,"length":74,"line":30,"column":4,"endLine":32,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenWidth","argumentNames":[]}
+scene_screenWidth__P2455.info = {"start":604,"length":74,"line":30,"column":4,"endLine":32,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"screenWidth","argumentNames":[]}
 
-function scene_screenWidth__P187672_mk(s) {
+function scene_screenWidth__P2455_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_screenWidth__P187672, depth: s.depth + 1,
+        parent: s, fn: scene_screenWidth__P2455, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54134,7 +54153,7 @@ function scene_screenWidth__P187672_mk(s) {
 
 
 
-function helpers_imageDrawRect__P186948(s) {
+function helpers_imageDrawRect__P1731(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54173,7 +54192,7 @@ switch (step) {
     s.arg3 = (r0);
     r0 = (s.arg4 - 1);
     s.arg4 = (r0);
-    s.tmp_0 = helpers_imageDrawLine__P186947_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -54184,7 +54203,7 @@ switch (step) {
     s.callLocIdx = 125; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P186947_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
@@ -54195,7 +54214,7 @@ switch (step) {
     s.callLocIdx = 126; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P186947_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg1 + s.arg3);
     s.tmp_0.arg1 = r0;
@@ -54208,7 +54227,7 @@ switch (step) {
     s.callLocIdx = 127; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageDrawLine__P186947_mk(s);
+    s.tmp_0 = helpers_imageDrawLine__P1730_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = (s.arg1 + s.arg3);
     s.tmp_0.arg1 = r0;
@@ -54226,12 +54245,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_imageDrawRect__P186948.info = {"start":4141,"length":370,"line":140,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawRect","argumentNames":["img","x","y","w","h","c"]}
+helpers_imageDrawRect__P1731.info = {"start":4141,"length":370,"line":140,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"imageDrawRect","argumentNames":["img","x","y","w","h","c"]}
 
-function helpers_imageDrawRect__P186948_mk(s) {
+function helpers_imageDrawRect__P1731_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_imageDrawRect__P186948, depth: s.depth + 1,
+        parent: s, fn: helpers_imageDrawRect__P1731, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54247,7 +54266,7 @@ function helpers_imageDrawRect__P186948_mk(s) {
 
 
 
-function spriteutils_createRenderable__P188855(s) {
+function spriteutils_createRenderable__P3638(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54262,23 +54281,23 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_createRenderable__P187600_mk(s);
+    s.tmp_0 = scene_createRenderable__P2383_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 1779; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1786; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-spriteutils_createRenderable__P188855.info = {"start":4522,"length":137,"line":139,"column":4,"endLine":141,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"createRenderable","argumentNames":["index","handler"]}
+spriteutils_createRenderable__P3638.info = {"start":4522,"length":137,"line":139,"column":4,"endLine":141,"endColumn":5,"fileName":"pxt_modules/arcade-sprite-util/spriteutils.ts","functionName":"createRenderable","argumentNames":["index","handler"]}
 
-function spriteutils_createRenderable__P188855_mk(s) {
+function spriteutils_createRenderable__P3638_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: spriteutils_createRenderable__P188855, depth: s.depth + 1,
+        parent: s, fn: spriteutils_createRenderable__P3638, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54289,7 +54308,7 @@ function spriteutils_createRenderable__P188855_mk(s) {
 
 
 
-function ConnectionKind_create__P189019(s) {
+function ConnectionKind_create__P3802(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54299,26 +54318,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals.nextKind___191375 === undefined);
+    r0 = (globals.nextKind___6159 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.nextKind___191375 = (1);
+    globals.nextKind___6159 = (1);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals.nextKind___191375;
+    s.tmp_0 = r0 = globals.nextKind___6159;
     r0 = (s.tmp_0 + 1);
-    globals.nextKind___191375 = (r0);
+    globals.nextKind___6159 = (r0);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-ConnectionKind_create__P189019.info = {"start":412,"length":112,"line":13,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/tilemaps/overworld.ts","functionName":"create","argumentNames":[]}
+ConnectionKind_create__P3802.info = {"start":412,"length":112,"line":13,"column":4,"endLine":16,"endColumn":5,"fileName":"pxt_modules/tilemaps/overworld.ts","functionName":"create","argumentNames":[]}
 
-function ConnectionKind_create__P189019_mk(s) {
+function ConnectionKind_create__P3802_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ConnectionKind_create__P189019, depth: s.depth + 1,
+        parent: s, fn: ConnectionKind_create__P3802, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -54327,7 +54346,7 @@ function ConnectionKind_create__P189019_mk(s) {
 
 
 
-function color_FadeState_constructor__P191198(s) {
+function color_FadeState_constructor__P5982(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54344,19 +54363,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, color_FadeState__C191197_VT)) failedCast(r0);
+    if (!checkSubtype(r0, color_FadeState__C5981_VT)) failedCast(r0);
     r0 = (s.arg0).fields["state"] = (s.arg1);
     r0 = (s.arg0).fields["scene"] = (s.arg2);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-color_FadeState_constructor__P191198.info = {"start":5010,"length":96,"line":173,"column":8,"endLine":176,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this","state","scene"]}
+color_FadeState_constructor__P5982.info = {"start":5010,"length":96,"line":173,"column":8,"endLine":176,"endColumn":13,"fileName":"pxt_modules/Color Fading/fade.ts","functionName":"inline","argumentNames":["this","state","scene"]}
 
-function color_FadeState_constructor__P191198_mk(s) {
+function color_FadeState_constructor__P5982_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: color_FadeState_constructor__P191198, depth: s.depth + 1,
+        parent: s, fn: color_FadeState_constructor__P5982, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -54367,7 +54386,7 @@ function color_FadeState_constructor__P191198_mk(s) {
 
 
 
-function game_eventContext__P187752(s) {
+function game_eventContext__P2535(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54377,21 +54396,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_init__P189572_mk(s);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1146; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1153; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals._scene___189564.fields["eventContext"];
+    r0 = globals._scene___4348.fields["eventContext"];
     return leave(s, r0)
   default: oops()
 } } }
-game_eventContext__P187752.info = {"start":1084,"length":112,"line":40,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"eventContext","argumentNames":[]}
+game_eventContext__P2535.info = {"start":1084,"length":112,"line":40,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"eventContext","argumentNames":[]}
 
-function game_eventContext__P187752_mk(s) {
+function game_eventContext__P2535_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_eventContext__P187752, depth: s.depth + 1,
+        parent: s, fn: game_eventContext__P2535, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -54400,7 +54419,7 @@ function game_eventContext__P187752_mk(s) {
 
 
 
-function controller_pauseUntilAnyButtonIsPressed__P187170(s) {
+function controller_pauseUntilAnyButtonIsPressed__P1953(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54420,12 +54439,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_pauseUntilAnyButtonIsPressed__P187170.info = {"start":19144,"length":96,"line":583,"column":4,"endLine":585,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"pauseUntilAnyButtonIsPressed","argumentNames":[]}
+controller_pauseUntilAnyButtonIsPressed__P1953.info = {"start":19144,"length":96,"line":583,"column":4,"endLine":585,"endColumn":5,"fileName":"pxt_modules/game/controller.ts","functionName":"pauseUntilAnyButtonIsPressed","argumentNames":[]}
 
-function controller_pauseUntilAnyButtonIsPressed__P187170_mk(s) {
+function controller_pauseUntilAnyButtonIsPressed__P1953_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_pauseUntilAnyButtonIsPressed__P187170, depth: s.depth + 1,
+        parent: s, fn: controller_pauseUntilAnyButtonIsPressed__P1953, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54433,7 +54452,7 @@ function controller_pauseUntilAnyButtonIsPressed__P187170_mk(s) {
 
 
 
-function game_setWaitAnyButton__P187750(s) {
+function game_setWaitAnyButton__P2533(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54447,17 +54466,17 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    globals.__waitAnyButton___189568 = (s.arg0);
+    globals.__waitAnyButton___4352 = (s.arg0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_setWaitAnyButton__P187750.info = {"start":878,"length":83,"line":31,"column":4,"endLine":33,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"setWaitAnyButton","argumentNames":["f"]}
+game_setWaitAnyButton__P2533.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__P187750_mk(s) {
+function game_setWaitAnyButton__P2533_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_setWaitAnyButton__P187750, depth: s.depth + 1,
+        parent: s, fn: game_setWaitAnyButton__P2533, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -54466,7 +54485,7 @@ function game_setWaitAnyButton__P187750_mk(s) {
 
 
 
-function Math_abs__P185340(s) {
+function Math_abs__P123(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54495,12 +54514,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_abs__P185340.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__P123.info = {"start":15106,"length":77,"line":511,"column":4,"endLine":513,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"abs","argumentNames":["x"]}
 
-function Math_abs__P185340_mk(s) {
+function Math_abs__P123_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_abs__P185340, depth: s.depth + 1,
+        parent: s, fn: Math_abs__P123, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54511,7 +54530,7 @@ function Math_abs__P185340_mk(s) {
 
 
 
-function Math_sign__P185341(s) {
+function Math_sign__P124(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54546,12 +54565,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_sign__P185341.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__P124.info = {"start":15341,"length":125,"line":519,"column":4,"endLine":523,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"sign","argumentNames":["x"]}
 
-function Math_sign__P185341_mk(s) {
+function Math_sign__P124_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_sign__P185341, depth: s.depth + 1,
+        parent: s, fn: Math_sign__P124, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54562,7 +54581,7 @@ function Math_sign__P185341_mk(s) {
 
 
 
-function texteffects_TextEffect_constructor__P188050(s) {
+function texteffects_TextEffect_constructor__P2833(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54578,18 +54597,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, texteffects_TextEffect__C188048_VT)) failedCast(r0);
+    if (!checkSubtype(r0, texteffects_TextEffect__C2831_VT)) failedCast(r0);
     r0 = (s.arg0).fields["getState"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-texteffects_TextEffect_constructor__P188050.info = {"start":657,"length":133,"line":25,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["this","getState"]}
+texteffects_TextEffect_constructor__P2833.info = {"start":657,"length":133,"line":25,"column":8,"endLine":27,"endColumn":9,"fileName":"pxt_modules/game/texteffects.ts","functionName":"inline","argumentNames":["this","getState"]}
 
-function texteffects_TextEffect_constructor__P188050_mk(s) {
+function texteffects_TextEffect_constructor__P2833_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: texteffects_TextEffect_constructor__P188050, depth: s.depth + 1,
+        parent: s, fn: texteffects_TextEffect_constructor__P2833, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -54599,7 +54618,7 @@ function texteffects_TextEffect_constructor__P188050_mk(s) {
 
 
 
-function Math_FastRandom_constructor__P187805(s) {
+function Math_FastRandom_constructor__P2588(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54615,7 +54634,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C187803_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
     r0 = (s.arg1 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -54630,12 +54649,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_constructor__P187805.info = {"start":1425,"length":175,"line":44,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"inline","argumentNames":["this","seed"]}
+Math_FastRandom_constructor__P2588.info = {"start":1425,"length":175,"line":44,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"inline","argumentNames":["this","seed"]}
 
-function Math_FastRandom_constructor__P187805_mk(s) {
+function Math_FastRandom_constructor__P2588_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_constructor__P187805, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_constructor__P2588, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -54646,7 +54665,7 @@ function Math_FastRandom_constructor__P187805_mk(s) {
 
 
 
-function control_ramSize__P185552(s) {
+function control_ramSize__P335(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54671,12 +54690,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control_ramSize__P185552.info = {"start":5058,"length":100,"line":172,"column":4,"endLine":174,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
+control_ramSize__P335.info = {"start":5058,"length":100,"line":172,"column":4,"endLine":174,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"ramSize","argumentNames":[]}
 
-function control_ramSize__P185552_mk(s) {
+function control_ramSize__P335_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control_ramSize__P185552, depth: s.depth + 1,
+        parent: s, fn: control_ramSize__P335, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54686,7 +54705,7 @@ function control_ramSize__P185552_mk(s) {
 
 
 
-function control__ramSize__P189211(s) {
+function control__ramSize__P3995(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54700,12 +54719,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control__ramSize__P189211.info = {"start":4938,"length":60,"line":167,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
+control__ramSize__P3995.info = {"start":4938,"length":60,"line":167,"column":4,"endLine":169,"endColumn":5,"fileName":"pxt_modules/base/control.ts","functionName":"_ramSize","argumentNames":[]}
 
-function control__ramSize__P189211_mk(s) {
+function control__ramSize__P3995_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control__ramSize__P189211, depth: s.depth + 1,
+        parent: s, fn: control__ramSize__P3995, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -54713,7 +54732,7 @@ function control__ramSize__P189211_mk(s) {
 
 
 
-function game_consoleOverlay_listener__P189897(s) {
+function game_consoleOverlay_listener__P4681(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54728,7 +54747,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___189862);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -54748,39 +54767,39 @@ switch (step) {
     { step = 7; continue; }
   case 3:
   case 4:
-    s.tmp_4 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_5 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_6 = helpers_stringSplit__P185334_mk(s);
+    s.tmp_4 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_5 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_6 = helpers_stringSplit__P117_mk(s);
     s.tmp_6.arg0 = s.arg1;
     s.tmp_6.arg1 = "\n";
     s.tmp_6.arg2 = undefined;
-    s.callLocIdx = 1493; s.pc = 10; return s.tmp_6;
+    s.callLocIdx = 1500; s.pc = 10; return s.tmp_6;
   case 10:
     r0 = s.retval;
     s.tmp_5.arg0 = r0;
-    s.tmp_5.arg1 = inline__P206774;
-    s.callLocIdx = 1494; s.pc = 9; return s.tmp_5;
+    s.tmp_5.arg1 = inline__P21718;
+    s.callLocIdx = 1501; s.pc = 9; return s.tmp_5;
   case 9:
     r0 = s.retval;
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = inline__P206779;
-    s.callLocIdx = 1496; s.pc = 8; return s.tmp_4;
+    s.tmp_4.arg1 = inline__P21723;
+    s.callLocIdx = 1503; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array__length(globals.consoleStrings___189862);
+    r0 = pxsim_Array__length(globals.consoleStrings___4646);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > globals.consoleLines___189875);
+    r0 = (s.tmp_1 > globals.consoleLines___4659);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_2 = helpers_arraySplice__P185315_mk(s);
-    s.tmp_2.arg0 = globals.consoleStrings___189862;
+    s.tmp_2 = helpers_arraySplice__P98_mk(s);
+    s.tmp_2.arg0 = globals.consoleStrings___4646;
     s.tmp_2.arg1 = 0;
-    r0 = pxsim_Array__length(globals.consoleStrings___189862);
+    r0 = pxsim_Array__length(globals.consoleStrings___4646);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 - globals.consoleLines___189875);
+    r0 = (s.tmp_3 - globals.consoleLines___4659);
     s.tmp_2.arg2 = r0;
-    s.callLocIdx = 1497; s.pc = 11; return s.tmp_2;
+    s.callLocIdx = 1504; s.pc = 11; return s.tmp_2;
   case 11:
     r0 = s.retval;
   case 5:
@@ -54790,12 +54809,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_listener__P189897.info = {"start":787,"length":571,"line":26,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"listener","argumentNames":["priority","text"]}
+game_consoleOverlay_listener__P4681.info = {"start":787,"length":571,"line":26,"column":4,"endLine":42,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"listener","argumentNames":["priority","text"]}
 
-function game_consoleOverlay_listener__P189897_mk(s) {
+function game_consoleOverlay_listener__P4681_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_listener__P189897, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_listener__P4681, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54812,7 +54831,7 @@ function game_consoleOverlay_listener__P189897_mk(s) {
 
 
 
-function inline__P206774(s) {
+function inline__P21718(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54836,12 +54855,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206774.info = {"start":985,"length":14,"line":32,"column":20,"endLine":32,"endColumn":34,"fileName":"pxt_modules/game/console.ts","functionName":"inline","argumentNames":["line"]}
+inline__P21718.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__P206774_mk(s) {
+function inline__P21718_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206774, depth: s.depth + 1,
+        parent: s, fn: inline__P21718, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54853,7 +54872,7 @@ function inline__P206774_mk(s) {
 
 
 
-function inline__P206779(s) {
+function inline__P21723(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54863,45 +54882,45 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.j___206781 = undefined;
+    s.j___21725 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.j___206781 = (0);
+    s.j___21725 = (0);
   case 1:
-    s.tmp_1 = r0 = s.j___206781;
+    s.tmp_1 = r0 = s.j___21725;
     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___189862;
-    s.tmp_5 = helpers_stringSlice__P185332_mk(s);
+    s.tmp_3 = r0 = globals.consoleStrings___4646;
+    s.tmp_5 = helpers_stringSlice__P115_mk(s);
     s.tmp_5.arg0 = s.arg0;
-    s.tmp_5.arg1 = s.j___206781;
-    r0 = (s.j___206781 + globals.consoleColumns___189885);
+    s.tmp_5.arg1 = s.j___21725;
+    r0 = (s.j___21725 + globals.consoleColumns___4669);
     s.tmp_5.arg2 = r0;
-    s.callLocIdx = 1495; s.pc = 3; return s.tmp_5;
+    s.callLocIdx = 1502; s.pc = 3; return s.tmp_5;
   case 3:
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_Array__push(s.tmp_3, s.tmp_4);
-    r0 = (s.j___206781 + globals.consoleColumns___189885);
-    s.j___206781 = (r0);
+    r0 = (s.j___21725 + globals.consoleColumns___4669);
+    s.j___21725 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206779.info = {"start":1022,"length":189,"line":33,"column":21,"endLine":37,"endColumn":13,"fileName":"pxt_modules/game/console.ts","functionName":"inline","argumentNames":["line"]}
+inline__P21723.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__P206779_mk(s) {
+function inline__P21723_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206779, depth: s.depth + 1,
+        parent: s, fn: inline__P21723, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54909,7 +54928,7 @@ function inline__P206779_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  j___206781: undefined,
+  j___21725: undefined,
   arg0: undefined,
 } }
 
@@ -54917,7 +54936,7 @@ function inline__P206779_mk(s) {
 
 
 
-function console_addListener__P185589(s) {
+function console_addListener__P372(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54940,7 +54959,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = pxsim_Array_.indexOf(globals.listeners___189226, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals.listeners___4010, s.arg0, undefined);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > -1);
   case 2:
@@ -54951,18 +54970,18 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    r0 = pxsim_Array__push(globals.listeners___189226, s.arg0);
+    r0 = pxsim_Array__push(globals.listeners___4010, s.arg0);
   case 5:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-console_addListener__P185589.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__P372.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__P185589_mk(s) {
+function console_addListener__P372_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_addListener__P185589, depth: s.depth + 1,
+        parent: s, fn: console_addListener__P372, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -54975,7 +54994,7 @@ function console_addListener__P185589_mk(s) {
 
 
 
-function inline__P189225(s) {
+function inline__P4009(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -54995,12 +55014,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P189225.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__P4009.info = {"start":534,"length":85,"line":25,"column":8,"endLine":25,"endColumn":93,"fileName":"pxt_modules/base/console.ts","functionName":"inline","argumentNames":["priority","text"]}
 
-function inline__P189225_mk(s) {
+function inline__P4009_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P189225, depth: s.depth + 1,
+        parent: s, fn: inline__P4009, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -55010,7 +55029,7 @@ function inline__P189225_mk(s) {
 
 
 
-function scene_systemMenu_register__P187850(s) {
+function scene_systemMenu_register__P2633(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55020,16 +55039,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___189816);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_0 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_0.arg0 = globals.menu___187100;
+    s.tmp_0 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_0.arg0 = globals.menu___1883;
     s.tmp_0.arg1 = 2049;
-    s.tmp_0.arg2 = scene_systemMenu_showSystemMenu__P187851;
-    s.callLocIdx = 1480; s.pc = 4; return s.tmp_0;
+    s.tmp_0.arg2 = scene_systemMenu_showSystemMenu__P2634;
+    s.callLocIdx = 1487; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 3:
@@ -55037,12 +55056,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_register__P187850.info = {"start":12793,"length":193,"line":382,"column":4,"endLine":386,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"register","argumentNames":[]}
+scene_systemMenu_register__P2633.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__P187850_mk(s) {
+function scene_systemMenu_register__P2633_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_register__P187850, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_register__P2633, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -55051,7 +55070,7 @@ function scene_systemMenu_register__P187850_mk(s) {
 
 
 
-function scene_systemMenu_showSystemMenu__P187851(s) {
+function scene_systemMenu_showSystemMenu__P2634(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55061,28 +55080,28 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___189816);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
     if (!r0) { step = 1; continue; }
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_0 = game_pushScene__P187753_mk(s);
-    s.callLocIdx = 1481; s.pc = 4; return s.tmp_0;
+    s.tmp_0 = game_pushScene__P2536_mk(s);
+    s.callLocIdx = 1488; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_PauseMenu__C187839_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_PauseMenu__C2622_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_PauseMenu_constructor__P187840_mk(s);
+    s.tmp_1 = scene_systemMenu_PauseMenu_constructor__P2623_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = scene_systemMenu_buildOptionList__P187847;
+    s.tmp_1.arg1 = scene_systemMenu_buildOptionList__P2630;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1482; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1489; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    globals.instance___189816 = (s.tmp_0);
-    s.tmp_0 = scene_systemMenu_PauseMenu_show__P187841_mk(s);
-    s.tmp_0.arg0 = globals.instance___189816;
-    s.callLocIdx = 1483; s.pc = 6; return s.tmp_0;
+    globals.instance___4600 = (s.tmp_0);
+    s.tmp_0 = scene_systemMenu_PauseMenu_show__P2624_mk(s);
+    s.tmp_0.arg0 = globals.instance___4600;
+    s.callLocIdx = 1490; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
   case 3:
@@ -55090,12 +55109,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_showSystemMenu__P187851.info = {"start":12992,"length":172,"line":388,"column":4,"endLine":393,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"showSystemMenu","argumentNames":[]}
+scene_systemMenu_showSystemMenu__P2634.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__P187851_mk(s) {
+function scene_systemMenu_showSystemMenu__P2634_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_showSystemMenu__P187851, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_showSystemMenu__P2634, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55105,7 +55124,7 @@ function scene_systemMenu_showSystemMenu__P187851_mk(s) {
 
 
 
-function scene_systemMenu_buildOptionList__P187847(s) {
+function scene_systemMenu_buildOptionList__P2630(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55115,136 +55134,136 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.options___207439 = undefined;
+    s.options___22383 = undefined;
     r0 = pxsim_Array__mk();
-    s.options___207439 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C187831_VT);
+    s.options___22383 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.VOLUME_DOWN_ICON___187861;
-    s.tmp_1.arg2 = inline__P207447;
-    s.tmp_1.arg3 = scene_systemMenu_volumeDown__P189822;
-    s.callLocIdx = 1463; s.pc = 5; return s.tmp_1;
+    s.tmp_1.arg1 = globals.VOLUME_DOWN_ICON___2644;
+    s.tmp_1.arg2 = inline__P22391;
+    s.tmp_1.arg3 = scene_systemMenu_volumeDown__P4606;
+    s.callLocIdx = 1470; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C187831_VT);
+    r0 = pxsim_Array__push(s.options___22383, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.VOLUME_UP_ICON___187858;
-    s.tmp_1.arg2 = inline__P207461;
-    s.tmp_1.arg3 = scene_systemMenu_volumeUp__P189821;
-    s.callLocIdx = 1465; s.pc = 6; return s.tmp_1;
+    s.tmp_1.arg1 = globals.VOLUME_UP_ICON___2641;
+    s.tmp_1.arg2 = inline__P22405;
+    s.tmp_1.arg3 = scene_systemMenu_volumeUp__P4605;
+    s.callLocIdx = 1472; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_0);
+    r0 = pxsim_Array__push(s.options___22383, 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__C187831_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_1 = r0;
-    s.tmp_2 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_2 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_2.arg0 = s.tmp_1;
-    s.tmp_2.arg1 = globals.BRIGHTNESS_DOWN_ICON___187859;
-    s.tmp_2.arg2 = inline__P207476;
-    s.tmp_2.arg3 = scene_systemMenu_brightnessDown__P189824;
-    s.callLocIdx = 1468; s.pc = 7; return s.tmp_2;
+    s.tmp_2.arg1 = globals.BRIGHTNESS_DOWN_ICON___2642;
+    s.tmp_2.arg2 = inline__P22420;
+    s.tmp_2.arg3 = scene_systemMenu_brightnessDown__P4608;
+    s.callLocIdx = 1475; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_1);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C187831_VT);
+    r0 = pxsim_Array__push(s.options___22383, s.tmp_1);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.BRIGHTNESS_UP_ICON___187864;
-    s.tmp_1.arg2 = inline__P207491;
-    s.tmp_1.arg3 = scene_systemMenu_brightnessUp__P189823;
-    s.callLocIdx = 1470; s.pc = 8; return s.tmp_1;
+    s.tmp_1.arg1 = globals.BRIGHTNESS_UP_ICON___2647;
+    s.tmp_1.arg2 = inline__P22435;
+    s.tmp_1.arg3 = scene_systemMenu_brightnessUp__P4607;
+    s.callLocIdx = 1477; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_0);
+    r0 = pxsim_Array__push(s.options___22383, s.tmp_0);
   case 1:
   case 2:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C187831_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.STATS_ICON___187865;
-    s.tmp_1.arg2 = inline__P207506;
-    s.tmp_1.arg3 = scene_systemMenu_toggleStats__P189826;
-    s.callLocIdx = 1471; s.pc = 9; return s.tmp_1;
+    s.tmp_1.arg1 = globals.STATS_ICON___2648;
+    s.tmp_1.arg2 = inline__P22450;
+    s.tmp_1.arg3 = scene_systemMenu_toggleStats__P4610;
+    s.callLocIdx = 1478; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C187831_VT);
+    r0 = pxsim_Array__push(s.options___22383, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.CONSOLE_ICON___187863;
-    s.tmp_1.arg2 = inline__P207515;
-    s.tmp_1.arg3 = scene_systemMenu_toggleConsole__P189827;
-    s.callLocIdx = 1473; s.pc = 10; return s.tmp_1;
+    s.tmp_1.arg1 = globals.CONSOLE_ICON___2646;
+    s.tmp_1.arg2 = inline__P22459;
+    s.tmp_1.arg3 = scene_systemMenu_toggleConsole__P4611;
+    s.callLocIdx = 1480; s.pc = 10; return s.tmp_1;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_0);
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C187831_VT);
+    r0 = pxsim_Array__push(s.options___22383, s.tmp_0);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.SLEEP_ICON___187862;
-    s.tmp_1.arg2 = inline__P207524;
-    s.tmp_1.arg3 = scene_systemMenu_sleep__P189828;
-    s.callLocIdx = 1474; s.pc = 11; return s.tmp_1;
+    s.tmp_1.arg1 = globals.SLEEP_ICON___2645;
+    s.tmp_1.arg2 = inline__P22468;
+    s.tmp_1.arg3 = scene_systemMenu_sleep__P4612;
+    s.callLocIdx = 1481; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(globals.customMenuOptions___189817);
+    r0 = pxsim_Array__push(s.options___22383, s.tmp_0);
+    r0 = pxsim_numops_toBoolDecr(globals.customMenuOptions___4601);
     if (!r0) { step = 3; continue; }
-    s.tmp_0 = helpers_arrayConcat__P185328_mk(s);
-    s.tmp_0.arg0 = s.options___207439;
-    s.tmp_0.arg1 = globals.customMenuOptions___189817;
-    s.callLocIdx = 1475; s.pc = 12; return s.tmp_0;
+    s.tmp_0 = helpers_arrayConcat__P111_mk(s);
+    s.tmp_0.arg0 = s.options___22383;
+    s.tmp_0.arg1 = globals.customMenuOptions___4601;
+    s.callLocIdx = 1482; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.options___207439 = (r0);
+    s.options___22383 = (r0);
   case 3:
   case 4:
-    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C187831_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(scene_systemMenu_MenuOption__C2614_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P187832_mk(s);
+    s.tmp_1 = scene_systemMenu_MenuOption_constructor__P2615_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = globals.CLOSE_MENU_ICON___187860;
-    s.tmp_1.arg2 = inline__P207537;
-    s.tmp_1.arg3 = scene_systemMenu_closeMenu__P187846;
-    s.callLocIdx = 1476; s.pc = 13; return s.tmp_1;
+    s.tmp_1.arg1 = globals.CLOSE_MENU_ICON___2643;
+    s.tmp_1.arg2 = inline__P22481;
+    s.tmp_1.arg3 = scene_systemMenu_closeMenu__P2629;
+    s.callLocIdx = 1483; s.pc = 13; return s.tmp_1;
   case 13:
     r0 = s.retval;
-    r0 = pxsim_Array__push(s.options___207439, s.tmp_0);
-    r0 = s.options___207439;
+    r0 = pxsim_Array__push(s.options___22383, s.tmp_0);
+    r0 = s.options___22383;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_buildOptionList__P187847.info = {"start":10499,"length":1149,"line":334,"column":4,"endLine":354,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"buildOptionList","argumentNames":[]}
+scene_systemMenu_buildOptionList__P2630.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__P187847_mk(s) {
+function scene_systemMenu_buildOptionList__P2630_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_buildOptionList__P187847, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_buildOptionList__P2630, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  options___207439: undefined,
+  options___22383: undefined,
 } }
 
 
 
 
 
-function inline__P207447(s) {
+function inline__P22391(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55254,8 +55273,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = music_volume__P186810_mk(s);
-    s.callLocIdx = 1462; s.pc = 1; return s.tmp_3;
+    s.tmp_3 = music_volume__P1593_mk(s);
+    s.callLocIdx = 1469; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -55274,12 +55293,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207447.info = {"start":10644,"length":39,"line":337,"column":54,"endLine":337,"endColumn":93,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22391.info = {"start":10644,"length":39,"line":337,"column":54,"endLine":337,"endColumn":93,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207447_mk(s) {
+function inline__P22391_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207447, depth: s.depth + 1,
+        parent: s, fn: inline__P22391, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55291,7 +55310,7 @@ function inline__P207447_mk(s) {
 
 
 
-function inline__P207461(s) {
+function inline__P22405(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55301,8 +55320,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_3 = music_volume__P186810_mk(s);
-    s.callLocIdx = 1464; s.pc = 1; return s.tmp_3;
+    s.tmp_3 = music_volume__P1593_mk(s);
+    s.callLocIdx = 1471; s.pc = 1; return s.tmp_3;
   case 1:
     r0 = s.retval;
     s.tmp_2 = r0;
@@ -55321,12 +55340,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207461.info = {"start":10751,"length":37,"line":338,"column":52,"endLine":338,"endColumn":89,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22405.info = {"start":10751,"length":37,"line":338,"column":52,"endLine":338,"endColumn":89,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207461_mk(s) {
+function inline__P22405_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207461, depth: s.depth + 1,
+        parent: s, fn: inline__P22405, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55338,7 +55357,7 @@ function inline__P207461_mk(s) {
 
 
 
-function inline__P207476(s) {
+function inline__P22420(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55348,7 +55367,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.brightness___186941;
+    r0 = globals.brightness___1724;
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 1);
@@ -55365,12 +55384,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207476.info = {"start":10910,"length":48,"line":340,"column":62,"endLine":340,"endColumn":110,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22420.info = {"start":10910,"length":48,"line":340,"column":62,"endLine":340,"endColumn":110,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207476_mk(s) {
+function inline__P22420_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207476, depth: s.depth + 1,
+        parent: s, fn: inline__P22420, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55381,7 +55400,7 @@ function inline__P207476_mk(s) {
 
 
 
-function inline__P207491(s) {
+function inline__P22435(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55391,7 +55410,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = globals.brightness___186941;
+    r0 = globals.brightness___1724;
     s.tmp_2 = r0;
     if ((s.tmp_2) && (s.tmp_2).vtable) {
     setupResume(s, 1);
@@ -55408,12 +55427,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207491.info = {"start":11038,"length":46,"line":341,"column":60,"endLine":341,"endColumn":106,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22435.info = {"start":11038,"length":46,"line":341,"column":60,"endLine":341,"endColumn":106,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207491_mk(s) {
+function inline__P22435_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207491, depth: s.depth + 1,
+        parent: s, fn: inline__P22435, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55424,7 +55443,7 @@ function inline__P207491_mk(s) {
 
 
 
-function inline__P207506(s) {
+function inline__P22450(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55434,7 +55453,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.stats___187746);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
     if (!r0) { step = 1; continue; }
     r0 = "HIDE STATS";
     { step = 2; continue; }
@@ -55447,12 +55466,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207506.info = {"start":11160,"length":46,"line":343,"column":48,"endLine":343,"endColumn":94,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22450.info = {"start":11160,"length":46,"line":343,"column":48,"endLine":343,"endColumn":94,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207506_mk(s) {
+function inline__P22450_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207506, depth: s.depth + 1,
+        parent: s, fn: inline__P22450, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -55461,7 +55480,7 @@ function inline__P207506_mk(s) {
 
 
 
-function inline__P207515(s) {
+function inline__P22459(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55471,7 +55490,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___189862);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
     s.tmp_2 = r0;
@@ -55492,12 +55511,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207515.info = {"start":11273,"length":71,"line":344,"column":50,"endLine":344,"endColumn":121,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22459.info = {"start":11273,"length":71,"line":344,"column":50,"endLine":344,"endColumn":121,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207515_mk(s) {
+function inline__P22459_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207515, depth: s.depth + 1,
+        parent: s, fn: inline__P22459, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55510,7 +55529,7 @@ function inline__P207515_mk(s) {
 
 
 
-function inline__P207524(s) {
+function inline__P22468(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55524,12 +55543,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207524.info = {"start":11411,"length":13,"line":345,"column":48,"endLine":345,"endColumn":61,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22468.info = {"start":11411,"length":13,"line":345,"column":48,"endLine":345,"endColumn":61,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207524_mk(s) {
+function inline__P22468_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207524, depth: s.depth + 1,
+        parent: s, fn: inline__P22468, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55537,7 +55556,7 @@ function inline__P207524_mk(s) {
 
 
 
-function inline__P207537(s) {
+function inline__P22481(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55551,12 +55570,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207537.info = {"start":11590,"length":13,"line":351,"column":53,"endLine":351,"endColumn":66,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P22481.info = {"start":11590,"length":13,"line":351,"column":53,"endLine":351,"endColumn":66,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207537_mk(s) {
+function inline__P22481_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207537, depth: s.depth + 1,
+        parent: s, fn: inline__P22481, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55564,7 +55583,7 @@ function inline__P207537_mk(s) {
 
 
 
-function scene_systemMenu_setScreenBrightnessSupported__P189829(s) {
+function scene_systemMenu_setScreenBrightnessSupported__P4613(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55578,12 +55597,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setScreenBrightnessSupported__P189829.info = {"start":10398,"length":95,"line":330,"column":4,"endLine":332,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setScreenBrightnessSupported","argumentNames":[]}
+scene_systemMenu_setScreenBrightnessSupported__P4613.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__P189829_mk(s) {
+function scene_systemMenu_setScreenBrightnessSupported__P4613_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setScreenBrightnessSupported__P189829, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setScreenBrightnessSupported__P4613, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55591,7 +55610,7 @@ function scene_systemMenu_setScreenBrightnessSupported__P189829_mk(s) {
 
 
 
-function scene_systemMenu_sleep__P189828(s) {
+function scene_systemMenu_sleep__P4612(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55606,12 +55625,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_sleep__P189828.info = {"start":10072,"length":51,"line":316,"column":4,"endLine":318,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"sleep","argumentNames":[]}
+scene_systemMenu_sleep__P4612.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__P189828_mk(s) {
+function scene_systemMenu_sleep__P4612_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_sleep__P189828, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_sleep__P4612, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -55619,7 +55638,7 @@ function scene_systemMenu_sleep__P189828_mk(s) {
 
 
 
-function scene_systemMenu_toggleConsole__P189827(s) {
+function scene_systemMenu_toggleConsole__P4611(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55629,7 +55648,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___189862);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
     s.tmp_2 = r0;
@@ -55639,23 +55658,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__P187870_mk(s);
+    s.tmp_4 = game_consoleOverlay_setVisible__P2653_mk(s);
     s.tmp_4.arg0 = false;
     s.tmp_4.arg1 = undefined;
-    s.callLocIdx = 1456; s.pc = 3; return s.tmp_4;
+    s.callLocIdx = 1463; s.pc = 3; return s.tmp_4;
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    s.tmp_0 = game_consoleOverlay_setVisible__P187870_mk(s);
+    s.tmp_0 = game_consoleOverlay_setVisible__P2653_mk(s);
     s.tmp_0.arg0 = true;
     s.tmp_0.arg1 = undefined;
-    s.callLocIdx = 1457; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1464; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = console_log__P185586_mk(s);
+    s.tmp_0 = console_log__P369_mk(s);
     s.tmp_0.arg0 = "console";
-    s.callLocIdx = 1458; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1465; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 2:
@@ -55663,12 +55682,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_toggleConsole__P189827.info = {"start":9827,"length":239,"line":307,"column":4,"endLine":314,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"toggleConsole","argumentNames":[]}
+scene_systemMenu_toggleConsole__P4611.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__P189827_mk(s) {
+function scene_systemMenu_toggleConsole__P4611_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_toggleConsole__P189827, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_toggleConsole__P4611, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55681,7 +55700,7 @@ function scene_systemMenu_toggleConsole__P189827_mk(s) {
 
 
 
-function game_consoleOverlay_setVisible__P187870(s) {
+function game_consoleOverlay_setVisible__P2653(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55697,7 +55716,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     s.tmp_1 = r0 = s.arg0;
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___189862);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
     s.tmp_5 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_5);
     s.tmp_4 = r0;
@@ -55718,26 +55737,26 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    globals.consoleStrings___189862 = (s.tmp_6);
+    globals.consoleStrings___4646 = (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___189861 = (s.arg1);
+    globals.consoleColor___4645 = (s.arg1);
   case 5:
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_setVisible__P187870.info = {"start":562,"length":219,"line":19,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"setVisible","argumentNames":["value","col"]}
+game_consoleOverlay_setVisible__P2653.info = {"start":562,"length":219,"line":19,"column":4,"endLine":24,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"setVisible","argumentNames":["value","col"]}
 
-function game_consoleOverlay_setVisible__P187870_mk(s) {
+function game_consoleOverlay_setVisible__P2653_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_setVisible__P187870, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_setVisible__P2653, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -55754,7 +55773,7 @@ function game_consoleOverlay_setVisible__P187870_mk(s) {
 
 
 
-function console_log__P185586(s) {
+function console_log__P369(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55768,7 +55787,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = console_add__P185582_mk(s);
+    s.tmp_0 = console_add__P365_mk(s);
     s.tmp_0.arg0 = 1;
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 41; s.pc = 1; return s.tmp_0;
@@ -55778,12 +55797,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_log__P185586.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__P369.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__P185586_mk(s) {
+function console_log__P369_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_log__P185586, depth: s.depth + 1,
+        parent: s, fn: console_log__P369, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -55793,7 +55812,7 @@ function console_log__P185586_mk(s) {
 
 
 
-function console_add__P185582(s) {
+function console_add__P365(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55803,58 +55822,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.text___207576 = undefined;
-    s.i___207585 = undefined;
+    s.text___22520 = undefined;
+    s.i___22529 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    r0 = (s.arg0 < globals.minPriority___185581);
+    r0 = (s.arg0 < globals.minPriority___364);
     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__P185588_mk(s);
+    s.tmp_1 = console_inspect__P371_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___207576 = (r0);
-    if ((s.text___207576) && (s.text___207576).vtable) {
+    s.text___22520 = (r0);
+    if ((s.text___22520) && (s.text___22520).vtable) {
     setupResume(s, 7);
-    pxsim_String__stringConv(s.text___207576);
+    pxsim_String__stringConv(s.text___22520);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.text___207576) + ""; }
+    } else { s.retval = (s.text___22520) + ""; }
   case 7:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_String__concat(s.tmp_0, "\n");
-    s.text___207576 = (r0);
-    s.i___207585 = (0);
+    s.text___22520 = (r0);
+    s.i___22529 = (0);
   case 3:
-    s.tmp_1 = r0 = s.i___207585;
-    r0 = pxsim_Array__length(globals.listeners___189226);
+    s.tmp_1 = r0 = s.i___22529;
+    r0 = pxsim_Array__length(globals.listeners___4010);
     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___189226, s.i___207585);
+    r0 = pxsim_Array__getAt(globals.listeners___4010, s.i___22529);
     s.tmp_3.argL = r0;
     s.tmp_3.arg0 = s.arg0;
-    s.tmp_3.arg1 = s.text___207576;
+    s.tmp_3.arg1 = s.text___22520;
     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___207585 + 1);
-    s.i___207585 = (r0);
+    r0 = (s.i___22529 + 1);
+    s.i___22529 = (r0);
     { step = 3; continue; }
   case 4:
   case 5:
@@ -55862,19 +55881,19 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_add__P185582.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__P365.info = {"start":632,"length":317,"line":28,"column":4,"endLine":36,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"add","argumentNames":["priority","message"]}
 
-function console_add__P185582_mk(s) {
+function console_add__P365_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_add__P185582, depth: s.depth + 1,
+        parent: s, fn: console_add__P365, 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___207576: undefined,
-  i___207585: undefined,
+  text___22520: undefined,
+  i___22529: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -55883,7 +55902,7 @@ function console_add__P185582_mk(s) {
 
 
 
-function console_inspect__P185588(s) {
+function console_inspect__P371(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -55893,10 +55912,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.asArr___207616 = undefined;
-    s.asString___207634 = undefined;
-    s.keys___207646 = undefined;
-    s.snipped___207650 = undefined;
+    s.asArr___22560 = undefined;
+    s.asString___22578 = undefined;
+    s.keys___22590 = undefined;
+    s.snipped___22594 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -55937,15 +55956,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 5; continue; }
-    s.asArr___207616 = (s.arg0);
-    r0 = pxsim_Array__length(s.asArr___207616);
+    s.asArr___22560 = (s.arg0);
+    r0 = pxsim_Array__length(s.asArr___22560);
     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__P185318_mk(s);
-    s.tmp_2.arg0 = s.asArr___207616;
+    s.tmp_2 = helpers_arrayJoin__P101_mk(s);
+    s.tmp_2.arg0 = s.asArr___22560;
     s.tmp_2.arg1 = ",";
     s.callLocIdx = 42; s.pc = 19; return s.tmp_2;
   case 19:
@@ -55955,9 +55974,9 @@ switch (step) {
   case 3:
     r0 = pxsim_String_.mkEmpty();
     s.tmp_4 = r0;
-    s.tmp_7 = helpers_arrayJoin__P185318_mk(s);
-    s.tmp_8 = helpers_arraySlice__P185329_mk(s);
-    s.tmp_8.arg0 = s.asArr___207616;
+    s.tmp_7 = helpers_arrayJoin__P101_mk(s);
+    s.tmp_8 = helpers_arraySlice__P112_mk(s);
+    s.tmp_8.arg0 = s.asArr___22560;
     s.tmp_8.arg1 = 0;
     s.tmp_8.arg2 = s.arg1;
     s.callLocIdx = 43; s.pc = 21; return s.tmp_8;
@@ -55997,46 +56016,46 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     s.tmp_10 = r0;
     r0 = pxsim_String__concat(s.tmp_9, s.tmp_10);
-    s.asString___207634 = (r0);
-    r0 = (s.asString___207634 != "[object Object]");
+    s.asString___22578 = (r0);
+    r0 = (s.asString___22578 != "[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___207634 != "[Object]");
+    r0 = (s.asString___22578 != "[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___207634;
+    r0 = s.asString___22578;
     { step = 17; continue; }
   case 8:
   case 9:
     r0 = pxsim_pxtrt.keysOf(s.arg0);
-    s.keys___207646 = (r0);
-    r0 = pxsim_Array__length(s.keys___207646);
+    s.keys___22590 = (r0);
+    r0 = pxsim_Array__length(s.keys___22590);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 > s.arg1);
-    s.snipped___207650 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.snipped___207650);
+    s.snipped___22594 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.snipped___22594);
     if (!r0) { step = 10; continue; }
-    s.tmp_0 = helpers_arraySlice__P185329_mk(s);
-    s.tmp_0.arg0 = s.keys___207646;
+    s.tmp_0 = helpers_arraySlice__P112_mk(s);
+    s.tmp_0.arg0 = s.keys___22590;
     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___207646 = (r0);
+    s.keys___22590 = (r0);
   case 10:
   case 11:
-    r0 = pxsim_pxtcore_mkAction(1, inline__P207667);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P22611);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_numops_toBoolDecr(s.snipped___207650);
+    r0 = pxsim_numops_toBoolDecr(s.snipped___22594);
     if (!r0) { step = 12; continue; }
     r0 = "\n    ...";
     { step = 13; continue; }
@@ -56045,8 +56064,8 @@ switch (step) {
   case 13:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.tmp_7 = helpers_arrayReduce__P185327_mk(s);
-    s.tmp_7.arg0 = s.keys___207646;
+    s.tmp_7 = helpers_arrayReduce__P110_mk(s);
+    s.tmp_7.arg0 = s.keys___22590;
     s.tmp_7.arg1 = s.tmp_0;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_7.arg2 = r0;
@@ -56095,12 +56114,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-console_inspect__P185588.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__P371.info = {"start":2271,"length":1190,"line":81,"column":4,"endLine":114,"endColumn":5,"fileName":"pxt_modules/base/console.ts","functionName":"inspect","argumentNames":["obj","maxElements"]}
 
-function console_inspect__P185588_mk(s) {
+function console_inspect__P371_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: console_inspect__P185588, depth: s.depth + 1,
+        parent: s, fn: console_inspect__P371, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56113,10 +56132,10 @@ function console_inspect__P185588_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  asArr___207616: undefined,
-  asString___207634: undefined,
-  keys___207646: undefined,
-  snipped___207650: undefined,
+  asArr___22560: undefined,
+  asString___22578: undefined,
+  keys___22590: undefined,
+  snipped___22594: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -56125,7 +56144,7 @@ function console_inspect__P185588_mk(s) {
 
 
 
-function inline__P207667(s) {
+function inline__P22611(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56188,12 +56207,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207667.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__P22611.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__P207667_mk(s) {
+function inline__P22611_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207667, depth: s.depth + 1,
+        parent: s, fn: inline__P22611, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56211,7 +56230,7 @@ function inline__P207667_mk(s) {
 
 
 
-function helpers_arrayReduce__P185327(s) {
+function helpers_arrayReduce__P110(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56221,8 +56240,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___207694 = undefined;
-    s.i___207697 = undefined;
+    s.len___22638 = undefined;
+    s.i___22641 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -56230,43 +56249,43 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__length(s.arg0);
-    s.len___207694 = (r0);
-    s.i___207697 = (0);
+    s.len___22638 = (r0);
+    s.i___22641 = (0);
   case 1:
-    r0 = (s.i___207697 < s.len___207694);
+    r0 = (s.i___22641 < s.len___22638);
     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___207697);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___22641);
     s.tmp_1.arg1 = r0;
-    s.tmp_1.arg2 = s.i___207697;
+    s.tmp_1.arg2 = s.i___22641;
     setupLambda(s.tmp_1, s.tmp_1.argL);
     s.callLocIdx = 9; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.arg2 = (r0);
-    r0 = (s.i___207697 + 1);
-    s.i___207697 = (r0);
+    r0 = (s.i___22641 + 1);
+    s.i___22641 = (r0);
     { step = 1; continue; }
   case 2:
     r0 = s.arg2;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayReduce__P185327.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__P110.info = {"start":8316,"length":317,"line":280,"column":4,"endLine":286,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayReduce","argumentNames":["arr","callbackfn","initialValue"]}
 
-function helpers_arrayReduce__P185327_mk(s) {
+function helpers_arrayReduce__P110_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayReduce__P185327, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayReduce__P110, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  len___207694: undefined,
-  i___207697: undefined,
+  len___22638: undefined,
+  i___22641: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -56276,7 +56295,7 @@ function helpers_arrayReduce__P185327_mk(s) {
 
 
 
-function helpers_arrayJoin__P185318(s) {
+function helpers_arrayJoin__P101(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56286,9 +56305,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.r___207722 = undefined;
-    s.len___207723 = undefined;
-    s.i___207726 = undefined;
+    s.r___22666 = undefined;
+    s.len___22667 = undefined;
+    s.i___22670 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -56311,16 +56330,16 @@ switch (step) {
   case 3:
   case 4:
     r0 = pxsim_String_.mkEmpty();
-    s.r___207722 = (r0);
+    s.r___22666 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___207723 = (r0);
-    s.i___207726 = (0);
+    s.len___22667 = (r0);
+    s.i___22670 = (0);
   case 5:
-    r0 = (s.i___207726 < s.len___207723);
+    r0 = (s.i___22670 < s.len___22667);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    r0 = (s.i___207726 > 0);
+    r0 = (s.i___22670 > 0);
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBool(s.tmp_1);
     if (r0) { step = 6; continue; }
@@ -56333,12 +56352,12 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 8; continue; }
-    if ((s.r___207722) && (s.r___207722).vtable) {
+    if ((s.r___22666) && (s.r___22666).vtable) {
     setupResume(s, 15);
-    pxsim_String__stringConv(s.r___207722);
+    pxsim_String__stringConv(s.r___22666);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___207722) + ""; }
+    } else { s.retval = (s.r___22666) + ""; }
   case 15:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -56352,10 +56371,10 @@ switch (step) {
     r0 = s.retval;
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_3, s.tmp_4);
-    s.r___207722 = (r0);
+    s.r___22666 = (r0);
   case 8:
   case 9:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___207726);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___22670);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === undefined);
     s.tmp_0 = r0;
@@ -56364,7 +56383,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 11; continue; }
   case 10:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___207726);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___22670);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 === null);
   case 11:
@@ -56375,16 +56394,16 @@ switch (step) {
     r0 = pxsim_String_.mkEmpty();
     { step = 13; continue; }
   case 12:
-    r0 = pxsim_Array__getAt(s.arg0, s.i___207726);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___22670);
   case 13:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    if ((s.r___207722) && (s.r___207722).vtable) {
+    if ((s.r___22666) && (s.r___22666).vtable) {
     setupResume(s, 17);
-    pxsim_String__stringConv(s.r___207722);
+    pxsim_String__stringConv(s.r___22666);
     checkResumeConsumed();
     return;
-    } else { s.retval = (s.r___207722) + ""; }
+    } else { s.retval = (s.r___22666) + ""; }
   case 17:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -56398,21 +56417,21 @@ switch (step) {
     r0 = s.retval;
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_5, s.tmp_6);
-    s.r___207722 = (r0);
-    r0 = (s.i___207726 + 1);
-    s.i___207726 = (r0);
+    s.r___22666 = (r0);
+    r0 = (s.i___22670 + 1);
+    s.i___22670 = (r0);
     { step = 5; continue; }
   case 14:
-    r0 = s.r___207722;
+    r0 = s.r___22666;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayJoin__P185318.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__P101.info = {"start":4133,"length":432,"line":157,"column":4,"endLine":170,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayJoin","argumentNames":["arr","sep"]}
 
-function helpers_arrayJoin__P185318_mk(s) {
+function helpers_arrayJoin__P101_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayJoin__P185318, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayJoin__P101, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56421,9 +56440,9 @@ function helpers_arrayJoin__P185318_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  r___207722: undefined,
-  len___207723: undefined,
-  i___207726: undefined,
+  r___22666: undefined,
+  len___22667: undefined,
+  i___22670: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -56432,7 +56451,7 @@ function helpers_arrayJoin__P185318_mk(s) {
 
 
 
-function scene_systemMenu_toggleStats__P189826(s) {
+function scene_systemMenu_toggleStats__P4610(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56442,11 +56461,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.stats___187746);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
     s.tmp_0 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_0);
-    globals.stats___187746 = (r0);
-    r0 = pxsim_numops_toBoolDecr(globals.stats___187746);
+    globals.stats___2529 = (r0);
+    r0 = pxsim_numops_toBoolDecr(globals.stats___2529);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -56455,18 +56474,18 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = globals.control_EventContext_onStats___185604;
+    r0 = globals.control_EventContext_onStats___387;
   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___185604;
+    s.tmp_3.argL = globals.control_EventContext_onStats___387;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3.arg0 = r0;
     setupLambda(s.tmp_3, s.tmp_3.argL);
-    s.callLocIdx = 1454; s.pc = 5; return s.tmp_3;
+    s.callLocIdx = 1461; s.pc = 5; return s.tmp_3;
   case 5:
     r0 = s.retval;
   case 3:
@@ -56475,12 +56494,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_toggleStats__P189826.info = {"start":9642,"length":179,"line":300,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"toggleStats","argumentNames":[]}
+scene_systemMenu_toggleStats__P4610.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__P189826_mk(s) {
+function scene_systemMenu_toggleStats__P4610_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_toggleStats__P189826, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_toggleStats__P4610, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56492,7 +56511,7 @@ function scene_systemMenu_toggleStats__P189826_mk(s) {
 
 
 
-function scene_systemMenu_brightnessDown__P189824(s) {
+function scene_systemMenu_brightnessDown__P4608(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56502,24 +56521,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_setScreenBrightness__P189825_mk(s);
-    r0 = globals.brightness___186941;
+    s.tmp_0 = scene_systemMenu_setScreenBrightness__P4609_mk(s);
+    r0 = globals.brightness___1724;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 5);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1450; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1457; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_brightnessDown__P189824.info = {"start":9198,"length":87,"line":289,"column":4,"endLine":291,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"brightnessDown","argumentNames":[]}
+scene_systemMenu_brightnessDown__P4608.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__P189824_mk(s) {
+function scene_systemMenu_brightnessDown__P4608_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_brightnessDown__P189824, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_brightnessDown__P4608, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56529,7 +56548,7 @@ function scene_systemMenu_brightnessDown__P189824_mk(s) {
 
 
 
-function scene_systemMenu_setScreenBrightness__P189825(s) {
+function scene_systemMenu_setScreenBrightness__P4609(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56543,29 +56562,29 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = helpers_setScreenBrightness__P186952_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_setScreenBrightness__P1735_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1451; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1458; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = settings_writeNumber__P187046_mk(s);
+    s.tmp_0 = settings_writeNumber__P1829_mk(s);
     s.tmp_0.arg0 = "#brightness";
-    r0 = globals.brightness___186941;
+    r0 = globals.brightness___1724;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1453; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1460; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setScreenBrightness__P189825.info = {"start":9291,"length":345,"line":293,"column":4,"endLine":298,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setScreenBrightness","argumentNames":["b"]}
+scene_systemMenu_setScreenBrightness__P4609.info = {"start":9291,"length":345,"line":293,"column":4,"endLine":298,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setScreenBrightness","argumentNames":["b"]}
 
-function scene_systemMenu_setScreenBrightness__P189825_mk(s) {
+function scene_systemMenu_setScreenBrightness__P4609_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setScreenBrightness__P189825, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setScreenBrightness__P4609, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -56575,7 +56594,7 @@ function scene_systemMenu_setScreenBrightness__P189825_mk(s) {
 
 
 
-function helpers_setScreenBrightness__P186952(s) {
+function helpers_setScreenBrightness__P1735(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56590,7 +56609,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Math_clamp__P185339_mk(s);
+    s.tmp_0 = Math_clamp__P122_mk(s);
     s.tmp_0.arg0 = 10;
     s.tmp_0.arg1 = 100;
     r0 = (s.arg1 | 0);
@@ -56599,18 +56618,18 @@ switch (step) {
   case 1:
     r0 = s.retval;
     s.arg1 = (r0);
-    globals.brightness___186941 = (s.arg1);
-    r0 = pxsim_pxtcore.setScreenBrightness(globals.brightness___186941);
+    globals.brightness___1724 = (s.arg1);
+    r0 = pxsim_pxtcore.setScreenBrightness(globals.brightness___1724);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_setScreenBrightness__P186952.info = {"start":6243,"length":210,"line":211,"column":4,"endLine":215,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"setScreenBrightness","argumentNames":["img","b"]}
+helpers_setScreenBrightness__P1735.info = {"start":6243,"length":210,"line":211,"column":4,"endLine":215,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"setScreenBrightness","argumentNames":["img","b"]}
 
-function helpers_setScreenBrightness__P186952_mk(s) {
+function helpers_setScreenBrightness__P1735_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_setScreenBrightness__P186952, depth: s.depth + 1,
+        parent: s, fn: helpers_setScreenBrightness__P1735, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -56621,7 +56640,7 @@ function helpers_setScreenBrightness__P186952_mk(s) {
 
 
 
-function scene_systemMenu_brightnessUp__P189823(s) {
+function scene_systemMenu_brightnessUp__P4607(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56631,24 +56650,24 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_setScreenBrightness__P189825_mk(s);
-    r0 = globals.brightness___186941;
+    s.tmp_0 = scene_systemMenu_setScreenBrightness__P4609_mk(s);
+    r0 = globals.brightness___1724;
     s.tmp_1 = r0;
     r0 = (s.tmp_1 + 5);
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1448; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1455; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_brightnessUp__P189823.info = {"start":9107,"length":85,"line":285,"column":4,"endLine":287,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"brightnessUp","argumentNames":[]}
+scene_systemMenu_brightnessUp__P4607.info = {"start":9107,"length":85,"line":285,"column":4,"endLine":287,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"brightnessUp","argumentNames":[]}
 
-function scene_systemMenu_brightnessUp__P189823_mk(s) {
+function scene_systemMenu_brightnessUp__P4607_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_brightnessUp__P189823, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_brightnessUp__P4607, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -56658,7 +56677,7 @@ function scene_systemMenu_brightnessUp__P189823_mk(s) {
 
 
 
-function scene_systemMenu_volumeDown__P189822(s) {
+function scene_systemMenu_volumeDown__P4606(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56668,54 +56687,54 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.v___207922 = undefined;
-    s.remainder___207925 = undefined;
-    s.newVolume___207928 = undefined;
-    s.tmp_0 = music_volume__P186810_mk(s);
-    s.callLocIdx = 1445; s.pc = 3; return s.tmp_0;
+    s.v___22866 = undefined;
+    s.remainder___22869 = undefined;
+    s.newVolume___22872 = undefined;
+    s.tmp_0 = music_volume__P1593_mk(s);
+    s.callLocIdx = 1452; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.v___207922 = (r0);
-    r0 = (s.v___207922 % 32);
-    s.remainder___207925 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.remainder___207925);
+    s.v___22866 = (r0);
+    r0 = (s.v___22866 % 32);
+    s.remainder___22869 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.remainder___22869);
     if (!r0) { step = 1; continue; }
-    r0 = s.remainder___207925;
+    r0 = s.remainder___22869;
     { step = 2; continue; }
   case 1:
     r0 = 32;
   case 2:
     // jmp value (already in r0)
     s.tmp_0 = r0;
-    r0 = (s.v___207922 - s.tmp_0);
-    s.newVolume___207928 = (r0);
-    s.tmp_0 = scene_systemMenu_setVolume__P189820_mk(s);
-    s.tmp_0.arg0 = s.newVolume___207928;
-    s.callLocIdx = 1446; s.pc = 4; return s.tmp_0;
+    r0 = (s.v___22866 - s.tmp_0);
+    s.newVolume___22872 = (r0);
+    s.tmp_0 = scene_systemMenu_setVolume__P4604_mk(s);
+    s.tmp_0.arg0 = s.newVolume___22872;
+    s.callLocIdx = 1453; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_volumeDown__P189822.info = {"start":8914,"length":187,"line":278,"column":4,"endLine":283,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"volumeDown","argumentNames":[]}
+scene_systemMenu_volumeDown__P4606.info = {"start":8914,"length":187,"line":278,"column":4,"endLine":283,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"volumeDown","argumentNames":[]}
 
-function scene_systemMenu_volumeDown__P189822_mk(s) {
+function scene_systemMenu_volumeDown__P4606_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_volumeDown__P189822, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_volumeDown__P4606, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  v___207922: undefined,
-  remainder___207925: undefined,
-  newVolume___207928: undefined,
+  v___22866: undefined,
+  remainder___22869: undefined,
+  newVolume___22872: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_setVolume__P189820(s) {
+function scene_systemMenu_setVolume__P4604(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56729,33 +56748,33 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = music_setVolume__P186809_mk(s);
+    s.tmp_0 = music_setVolume__P1592_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1440; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1447; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = music_playTone__P186811_mk(s);
+    s.tmp_0 = music_playTone__P1594_mk(s);
     s.tmp_0.arg0 = 440;
     s.tmp_0.arg1 = 500;
-    s.callLocIdx = 1441; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1448; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = settings_writeNumber__P187046_mk(s);
+    s.tmp_0 = settings_writeNumber__P1829_mk(s);
     s.tmp_0.arg0 = "#volume";
     s.tmp_0.arg1 = s.arg0;
-    s.callLocIdx = 1442; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1449; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_setVolume__P189820.info = {"start":8565,"length":166,"line":265,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setVolume","argumentNames":["newVolume"]}
+scene_systemMenu_setVolume__P4604.info = {"start":8565,"length":166,"line":265,"column":4,"endLine":269,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setVolume","argumentNames":["newVolume"]}
 
-function scene_systemMenu_setVolume__P189820_mk(s) {
+function scene_systemMenu_setVolume__P4604_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_setVolume__P189820, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_setVolume__P4604, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -56765,7 +56784,7 @@ function scene_systemMenu_setVolume__P189820_mk(s) {
 
 
 
-function music_playTone__P186811(s) {
+function music_playTone__P1594(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56775,7 +56794,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.id___207854 = undefined;
+    s.id___22798 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -56800,7 +56819,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = music_playNoteCore__P189284_mk(s);
+    s.tmp_2 = music_playNoteCore__P4068_mk(s);
     s.tmp_2.arg0 = 0;
     s.tmp_2.arg1 = s.arg0;
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
@@ -56808,7 +56827,7 @@ switch (step) {
     s.callLocIdx = 74; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = pause__P185619_mk(s);
+    s.tmp_0 = pause__P402_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.arg1);
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 75; s.pc = 6; return s.tmp_0;
@@ -56816,13 +56835,13 @@ switch (step) {
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    r0 = (globals.playToneID___189286 + 1);
+    r0 = (globals.playToneID___4070 + 1);
     s.tmp_0 = r0;
-    globals.playToneID___189286 = (r0);
-    s.id___207854 = (s.tmp_0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P207860);
+    globals.playToneID___4070 = (r0);
+    s.id___22798 = (s.tmp_0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P22804);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.id___207854);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.id___22798);
     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);
@@ -56831,17 +56850,17 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-music_playTone__P186811.info = {"start":2591,"length":831,"line":83,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playTone","argumentNames":["frequency","ms"]}
+music_playTone__P1594.info = {"start":2591,"length":831,"line":83,"column":4,"endLine":108,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playTone","argumentNames":["frequency","ms"]}
 
-function music_playTone__P186811_mk(s) {
+function music_playTone__P1594_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_playTone__P186811, depth: s.depth + 1,
+        parent: s, fn: music_playTone__P1594, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  id___207854: undefined,
+  id___22798: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -56850,7 +56869,7 @@ function music_playTone__P186811_mk(s) {
 
 
 
-function inline__P207860(s) {
+function inline__P22804(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56860,14 +56879,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pos___207861 = undefined;
-    s.now___207871 = undefined;
-    s.d___207874 = undefined;
-    s.t___207878 = undefined;
+    s.pos___22805 = undefined;
+    s.now___22815 = undefined;
+    s.d___22818 = undefined;
+    s.t___22822 = undefined;
     r0 = pxsim.control.millis();
-    s.pos___207861 = (r0);
+    s.pos___22805 = (r0);
   case 1:
-    r0 = (s.caps[0] == globals.playToneID___189286);
+    r0 = (s.caps[0] == globals.playToneID___4070);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 2; continue; }
@@ -56883,30 +56902,30 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 6; continue; }
     r0 = pxsim.control.millis();
-    s.now___207871 = (r0);
-    r0 = (s.pos___207861 - s.now___207871);
-    s.d___207874 = (r0);
-    s.tmp_0 = Math_min__P185343_mk(s);
+    s.now___22815 = (r0);
+    r0 = (s.pos___22805 - s.now___22815);
+    s.d___22818 = (r0);
+    s.tmp_0 = Math_min__P126_mk(s);
     r0 = pxsim_pxtrt_ldlocRef(s.caps[1]);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = 500;
     s.callLocIdx = 76; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.t___207878 = (r0);
+    s.t___22822 = (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___207878);
+    r0 = (s.tmp_2 - s.t___22822);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stlocRef(s.tmp_0, s.tmp_1);
-    r0 = (s.pos___207861 + s.t___207878);
-    s.pos___207861 = (r0);
-    s.tmp_0 = music_playNoteCore__P189284_mk(s);
-    r0 = (s.d___207874 - 1);
+    r0 = (s.pos___22805 + s.t___22822);
+    s.pos___22805 = (r0);
+    s.tmp_0 = music_playNoteCore__P4068_mk(s);
+    r0 = (s.d___22818 - 1);
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.caps[2];
-    s.tmp_0.arg2 = s.t___207878;
+    s.tmp_0.arg2 = s.t___22822;
     s.callLocIdx = 77; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
@@ -56916,16 +56935,16 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = pause__P185619_mk(s);
-    r0 = (s.d___207874 + s.t___207878);
+    s.tmp_2 = pause__P402_mk(s);
+    r0 = (s.d___22818 + s.t___22822);
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 78; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = pause__P185619_mk(s);
-    r0 = (s.d___207874 + s.t___207878);
+    s.tmp_0 = pause__P402_mk(s);
+    r0 = (s.d___22818 + s.t___22822);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 - 100);
     s.tmp_0.arg0 = r0;
@@ -56939,27 +56958,27 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207860.info = {"start":2890,"length":515,"line":92,"column":34,"endLine":106,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
+inline__P22804.info = {"start":2890,"length":515,"line":92,"column":34,"endLine":106,"endColumn":13,"fileName":"pxt_modules/mixer/melody.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207860_mk(s) {
+function inline__P22804_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207860, depth: s.depth + 1,
+        parent: s, fn: inline__P22804, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  pos___207861: undefined,
-  now___207871: undefined,
-  d___207874: undefined,
-  t___207878: undefined,
+  pos___22805: undefined,
+  now___22815: undefined,
+  d___22818: undefined,
+  t___22822: undefined,
 } }
 
 
 
 
 
-function music_playNoteCore__P189284(s) {
+function music_playNoteCore__P4068(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -56969,7 +56988,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___207908 = undefined;
+    s.buf___22852 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -56977,16 +56996,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = pxsim.control.createBuffer(12);
-    s.buf___207908 = (r0);
-    s.tmp_0 = music_addNote__P189291_mk(s);
-    s.tmp_0.arg0 = s.buf___207908;
+    s.buf___22852 = (r0);
+    s.tmp_0 = music_addNote__P4075_mk(s);
+    s.tmp_0.arg0 = s.buf___22852;
     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__P186810_mk(s);
+    s.tmp_1 = music_volume__P1593_mk(s);
     s.callLocIdx = 72; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
@@ -56995,21 +57014,21 @@ switch (step) {
     s.callLocIdx = 73; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = pxsim.music.queuePlayInstructions(s.arg0, s.buf___207908);
+    r0 = pxsim.music.queuePlayInstructions(s.arg0, s.buf___22852);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-music_playNoteCore__P189284.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"]}
+music_playNoteCore__P4068.info = {"start":1877,"length":240,"line":66,"column":4,"endLine":70,"endColumn":5,"fileName":"pxt_modules/mixer/melody.ts","functionName":"playNoteCore","argumentNames":["when","frequency","ms"]}
 
-function music_playNoteCore__P189284_mk(s) {
+function music_playNoteCore__P4068_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_playNoteCore__P189284, depth: s.depth + 1,
+        parent: s, fn: music_playNoteCore__P4068, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  buf___207908: undefined,
+  buf___22852: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -57019,7 +57038,7 @@ function music_playNoteCore__P189284_mk(s) {
 
 
 
-function scene_systemMenu_volumeUp__P189821(s) {
+function scene_systemMenu_volumeUp__P4605(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57029,47 +57048,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.v___207822 = undefined;
-    s.remainder___207825 = undefined;
-    s.newVolume___207828 = undefined;
-    s.tmp_0 = music_volume__P186810_mk(s);
-    s.callLocIdx = 1443; s.pc = 1; return s.tmp_0;
+    s.v___22766 = undefined;
+    s.remainder___22769 = undefined;
+    s.newVolume___22772 = undefined;
+    s.tmp_0 = music_volume__P1593_mk(s);
+    s.callLocIdx = 1450; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.v___207822 = (r0);
-    r0 = (s.v___207822 % 32);
-    s.remainder___207825 = (r0);
-    r0 = (s.v___207822 + 32);
+    s.v___22766 = (r0);
+    r0 = (s.v___22766 % 32);
+    s.remainder___22769 = (r0);
+    r0 = (s.v___22766 + 32);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.remainder___207825);
-    s.newVolume___207828 = (r0);
-    s.tmp_0 = scene_systemMenu_setVolume__P189820_mk(s);
-    s.tmp_0.arg0 = s.newVolume___207828;
-    s.callLocIdx = 1444; s.pc = 2; return s.tmp_0;
+    r0 = (s.tmp_0 - s.remainder___22769);
+    s.newVolume___22772 = (r0);
+    s.tmp_0 = scene_systemMenu_setVolume__P4604_mk(s);
+    s.tmp_0.arg0 = s.newVolume___22772;
+    s.callLocIdx = 1451; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_volumeUp__P189821.info = {"start":8737,"length":171,"line":271,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"volumeUp","argumentNames":[]}
+scene_systemMenu_volumeUp__P4605.info = {"start":8737,"length":171,"line":271,"column":4,"endLine":276,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"volumeUp","argumentNames":[]}
 
-function scene_systemMenu_volumeUp__P189821_mk(s) {
+function scene_systemMenu_volumeUp__P4605_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_volumeUp__P189821, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_volumeUp__P4605, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  v___207822: undefined,
-  remainder___207825: undefined,
-  newVolume___207828: undefined,
+  v___22766: undefined,
+  remainder___22769: undefined,
+  newVolume___22772: undefined,
 } }
 
 
 
 
 
-function game_consoleOverlay_isVisible__P187868(s) {
+function game_consoleOverlay_isVisible__P2651(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57079,7 +57098,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___189862);
+    r0 = pxsim_numops_toBoolDecr(globals.consoleStrings___4646);
     s.tmp_2 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_2);
     s.tmp_1 = r0;
@@ -57089,12 +57108,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_consoleOverlay_isVisible__P187868.info = {"start":422,"length":68,"line":11,"column":4,"endLine":13,"endColumn":5,"fileName":"pxt_modules/game/console.ts","functionName":"isVisible","argumentNames":[]}
+game_consoleOverlay_isVisible__P2651.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__P187868_mk(s) {
+function game_consoleOverlay_isVisible__P2651_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_consoleOverlay_isVisible__P187868, depth: s.depth + 1,
+        parent: s, fn: game_consoleOverlay_isVisible__P2651, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57105,7 +57124,7 @@ function game_consoleOverlay_isVisible__P187868_mk(s) {
 
 
 
-function scene_systemMenu_closeMenu__P187846(s) {
+function scene_systemMenu_closeMenu__P2629(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57115,21 +57134,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.instance___189816);
+    r0 = pxsim_numops_toBoolDecr(globals.instance___4600);
     if (!r0) { step = 1; continue; }
-    s.tmp_0 = scene_systemMenu_PauseMenu_dispose__P187845_mk(s);
-    s.tmp_0.arg0 = globals.instance___189816;
-    s.callLocIdx = 1459; s.pc = 3; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_PauseMenu_dispose__P2628_mk(s);
+    s.tmp_0.arg0 = globals.instance___4600;
+    s.callLocIdx = 1466; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    globals.instance___189816 = (undefined);
-    s.tmp_0 = controller__setUserEventsEnabled__P187171_mk(s);
+    globals.instance___4600 = (undefined);
+    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
     s.tmp_0.arg0 = true;
-    s.callLocIdx = 1460; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1467; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = game_popScene__P187754_mk(s);
-    s.callLocIdx = 1461; s.pc = 5; return s.tmp_0;
+    s.tmp_0 = game_popScene__P2537_mk(s);
+    s.callLocIdx = 1468; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
   case 1:
@@ -57138,12 +57157,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_closeMenu__P187846.info = {"start":10129,"length":216,"line":320,"column":4,"endLine":327,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"closeMenu","argumentNames":[]}
+scene_systemMenu_closeMenu__P2629.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__P187846_mk(s) {
+function scene_systemMenu_closeMenu__P2629_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_closeMenu__P187846, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_closeMenu__P2629, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -57152,7 +57171,7 @@ function scene_systemMenu_closeMenu__P187846_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_dispose__P187845(s) {
+function scene_systemMenu_PauseMenu_dispose__P2628(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57167,16 +57186,16 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C187839_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_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__P185324_mk(s);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_1.arg0 = r0;
-    s.tmp_1.arg1 = inline__P207302;
-    s.callLocIdx = 1436; s.pc = 3; return s.tmp_1;
+    s.tmp_1.arg1 = inline__P22246;
+    s.callLocIdx = 1443; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["options"] = (undefined);
@@ -57186,12 +57205,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_dispose__P187845.info = {"start":7732,"length":165,"line":243,"column":8,"endLine":248,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_dispose__P2628.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__P187845_mk(s) {
+function scene_systemMenu_PauseMenu_dispose__P2628_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_dispose__P187845, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_dispose__P2628, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57202,7 +57221,7 @@ function scene_systemMenu_PauseMenu_dispose__P187845_mk(s) {
 
 
 
-function inline__P207302(s) {
+function inline__P22246(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57216,21 +57235,21 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = scene_systemMenu_MenuOption_dispose__P187838_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_dispose__P2621_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1435; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1442; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207302.info = {"start":7813,"length":16,"line":245,"column":37,"endLine":245,"endColumn":53,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["o"]}
+inline__P22246.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__P207302_mk(s) {
+function inline__P22246_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207302, depth: s.depth + 1,
+        parent: s, fn: inline__P22246, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -57240,7 +57259,7 @@ function inline__P207302_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_dispose__P187838(s) {
+function scene_systemMenu_MenuOption_dispose__P2621(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57255,25 +57274,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_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__P187304_mk(s);
+    s.tmp_1 = Sprite_destroy__P2087_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = undefined;
     s.tmp_1.arg2 = undefined;
-    s.callLocIdx = 1355; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1362; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_destroy__P187304_mk(s);
+    s.tmp_0 = Sprite_destroy__P2087_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
-    s.callLocIdx = 1356; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1363; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = (s.arg0).fields["card"] = (undefined);
@@ -57284,12 +57303,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_dispose__P187838.info = {"start":1812,"length":216,"line":77,"column":8,"endLine":84,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"dispose","argumentNames":["this"]}
+scene_systemMenu_MenuOption_dispose__P2621.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__P187838_mk(s) {
+function scene_systemMenu_MenuOption_dispose__P2621_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_dispose__P187838, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_dispose__P2621, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57300,7 +57319,7 @@ function scene_systemMenu_MenuOption_dispose__P187838_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_constructor__P187832(s) {
+function scene_systemMenu_MenuOption_constructor__P2615(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57318,7 +57337,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
     r0 = (s.arg0).fields["iconImage"] = (s.arg1);
     r0 = (s.arg0).fields["getText"] = (s.arg2);
     r0 = (s.arg0).fields["action"] = (s.arg3);
@@ -57326,12 +57345,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_constructor__P187832.info = {"start":786,"length":108,"line":38,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["this","iconImage","getText","action"]}
+scene_systemMenu_MenuOption_constructor__P2615.info = {"start":786,"length":108,"line":38,"column":8,"endLine":39,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["this","iconImage","getText","action"]}
 
-function scene_systemMenu_MenuOption_constructor__P187832_mk(s) {
+function scene_systemMenu_MenuOption_constructor__P2615_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_constructor__P187832, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_constructor__P2615, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -57343,7 +57362,7 @@ function scene_systemMenu_MenuOption_constructor__P187832_mk(s) {
 
 
 
-function helpers_screenBrightness__P186953(s) {
+function helpers_screenBrightness__P1736(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57357,16 +57376,16 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = globals.brightness___186941;
+    r0 = globals.brightness___1724;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_screenBrightness__P186953.info = {"start":6459,"length":98,"line":217,"column":4,"endLine":219,"endColumn":5,"fileName":"pxt_modules/screen/image.ts","functionName":"screenBrightness","argumentNames":["img"]}
+helpers_screenBrightness__P1736.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__P186953_mk(s) {
+function helpers_screenBrightness__P1736_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_screenBrightness__P186953, depth: s.depth + 1,
+        parent: s, fn: helpers_screenBrightness__P1736, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -57375,7 +57394,7 @@ function helpers_screenBrightness__P186953_mk(s) {
 
 
 
-function helpers_arrayConcat__P185328(s) {
+function helpers_arrayConcat__P111(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57385,74 +57404,74 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.out___207542 = undefined;
-    s.value___207545 = undefined;
-    s.unnamed8888___U2 = undefined;
-    s.unnamed8889___U3 = undefined;
-    s.value___207552 = undefined;
-    s.unnamed8890___U5 = undefined;
-    s.unnamed8891___U6 = undefined;
+    s.out___22486 = undefined;
+    s.value___22489 = undefined;
+    s.unnamed80___U2 = undefined;
+    s.unnamed81___U3 = undefined;
+    s.value___22496 = undefined;
+    s.unnamed82___U5 = undefined;
+    s.unnamed83___U6 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.out___207542 = (r0);
-    s.value___207545 = (undefined);
-    s.unnamed8888___U2 = (s.arg0);
-    s.unnamed8889___U3 = (0);
+    s.out___22486 = (r0);
+    s.value___22489 = (undefined);
+    s.unnamed80___U2 = (s.arg0);
+    s.unnamed81___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8889___U3;
-    r0 = pxsim_Array__length(s.unnamed8888___U2);
+    s.tmp_0 = r0 = s.unnamed81___U3;
+    r0 = pxsim_Array__length(s.unnamed80___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 2; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8888___U2, s.unnamed8889___U3);
-    s.value___207545 = (r0);
-    r0 = pxsim_Array__push(s.out___207542, s.value___207545);
-    r0 = (s.unnamed8889___U3 + 1);
-    s.unnamed8889___U3 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed80___U2, s.unnamed81___U3);
+    s.value___22489 = (r0);
+    r0 = pxsim_Array__push(s.out___22486, s.value___22489);
+    r0 = (s.unnamed81___U3 + 1);
+    s.unnamed81___U3 = (r0);
     { step = 1; continue; }
   case 2:
-    s.unnamed8888___U2 = (undefined);
-    s.value___207552 = (undefined);
-    s.unnamed8890___U5 = (s.arg1);
-    s.unnamed8891___U6 = (0);
+    s.unnamed80___U2 = (undefined);
+    s.value___22496 = (undefined);
+    s.unnamed82___U5 = (s.arg1);
+    s.unnamed83___U6 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed8891___U6;
-    r0 = pxsim_Array__length(s.unnamed8890___U5);
+    s.tmp_0 = r0 = s.unnamed83___U6;
+    r0 = pxsim_Array__length(s.unnamed82___U5);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8890___U5, s.unnamed8891___U6);
-    s.value___207552 = (r0);
-    r0 = pxsim_Array__push(s.out___207542, s.value___207552);
-    r0 = (s.unnamed8891___U6 + 1);
-    s.unnamed8891___U6 = (r0);
+    r0 = pxsim_Array__getAt(s.unnamed82___U5, s.unnamed83___U6);
+    s.value___22496 = (r0);
+    r0 = pxsim_Array__push(s.out___22486, s.value___22496);
+    r0 = (s.unnamed83___U6 + 1);
+    s.unnamed83___U6 = (r0);
     { step = 3; continue; }
   case 4:
-    s.unnamed8890___U5 = (undefined);
-    r0 = s.out___207542;
+    s.unnamed82___U5 = (undefined);
+    r0 = s.out___22486;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayConcat__P185328.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__P111.info = {"start":8639,"length":264,"line":288,"column":4,"endLine":297,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayConcat","argumentNames":["arr","otherArr"]}
 
-function helpers_arrayConcat__P185328_mk(s) {
+function helpers_arrayConcat__P111_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayConcat__P185328, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayConcat__P111, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  out___207542: undefined,
-  value___207545: undefined,
-  unnamed8888___U2: undefined,
-  unnamed8889___U3: undefined,
-  value___207552: undefined,
-  unnamed8890___U5: undefined,
-  unnamed8891___U6: undefined,
+  out___22486: undefined,
+  value___22489: undefined,
+  unnamed80___U2: undefined,
+  unnamed81___U3: undefined,
+  value___22496: undefined,
+  unnamed82___U5: undefined,
+  unnamed83___U6: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -57461,7 +57480,7 @@ function helpers_arrayConcat__P185328_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_show__P187841(s) {
+function scene_systemMenu_PauseMenu_show__P2624(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57471,34 +57490,34 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___206858 = undefined;
-    s.i___206859 = undefined;
+    s.current___21802 = undefined;
+    s.i___21803 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C187839_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_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 = 1368; s.pc = 3; return s.tmp_2;
+      s.callLocIdx = 1375; 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 = 1368; s.pc = 3; return s.tmp_2; }
-      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1368; s.pc = 3; return s.tmp_2;; }
-     else { s.callLocIdx = 1368; 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 = 1375; s.pc = 3; return s.tmp_2; }
+      else if (s.tmp_2.fn.isGetter) { s.tmp_2.stage2Call = true; s.callLocIdx = 1375; s.pc = 3; return s.tmp_2;; }
+     else { s.callLocIdx = 1375; s.pc = 3; return s.tmp_2; }
     }
   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___206859 = (0);
+    s.i___21803 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___206859;
+    s.tmp_1 = r0 = s.i___21803;
     r0 = s.arg0.fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -57509,22 +57528,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___206859);
-    s.current___206858 = (r0);
-    s.tmp_0 = scene_systemMenu_MenuOption_show__P187833_mk(s);
-    s.tmp_0.arg0 = s.current___206858;
-    s.callLocIdx = 1369; s.pc = 4; return s.tmp_0;
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___21803);
+    s.current___21802 = (r0);
+    s.tmp_0 = scene_systemMenu_MenuOption_show__P2616_mk(s);
+    s.tmp_0.arg0 = s.current___21802;
+    s.callLocIdx = 1376; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_MenuOption_setTheme__P187836_mk(s);
-    s.tmp_0.arg0 = s.current___206858;
+    s.tmp_0 = scene_systemMenu_MenuOption_setTheme__P2619_mk(s);
+    s.tmp_0.arg0 = s.current___21802;
     r0 = s.arg0.fields["theme"];
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1370; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1377; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_MenuOption_position__P187834_mk(s);
-    s.tmp_0.arg0 = s.current___206858;
+    s.tmp_0 = scene_systemMenu_MenuOption_position__P2617_mk(s);
+    s.tmp_0.arg0 = s.current___21802;
     s.tmp_2 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_2.arg0 = r0;
@@ -57534,12 +57553,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 = 1371; s.pc = 7; return s.tmp_2; }
+     else { s.callLocIdx = 1378; s.pc = 7; return s.tmp_2; }
     }
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_5 = r0 = s.i___206859;
+    s.tmp_5 = r0 = s.i___21803;
     s.tmp_7 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_7.arg0 = r0;
@@ -57549,7 +57568,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 = 1372; s.pc = 8; return s.tmp_7; }
+     else { s.callLocIdx = 1379; s.pc = 8; return s.tmp_7; }
     }
   case 8:
     r0 = s.retval;
@@ -57565,7 +57584,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 = 1373; s.pc = 9; return s.tmp_10; }
+     else { s.callLocIdx = 1380; s.pc = 9; return s.tmp_10; }
     }
   case 9:
     r0 = s.retval;
@@ -57579,7 +57598,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 = 1374; s.pc = 10; return s.tmp_12; }
+     else { s.callLocIdx = 1381; s.pc = 10; return s.tmp_12; }
     }
   case 10:
     r0 = s.retval;
@@ -57599,12 +57618,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 = 1375; s.pc = 11; return s.tmp_14; }
+     else { s.callLocIdx = 1382; s.pc = 11; return s.tmp_14; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_17 = r0 = s.i___206859;
+    s.tmp_17 = r0 = s.i___21803;
     s.tmp_19 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_19.arg0 = r0;
@@ -57614,7 +57633,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 = 1376; s.pc = 12; return s.tmp_19; }
+     else { s.callLocIdx = 1383; s.pc = 12; return s.tmp_19; }
     }
   case 12:
     r0 = s.retval;
@@ -57630,7 +57649,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 = 1377; s.pc = 13; return s.tmp_22; }
+     else { s.callLocIdx = 1384; s.pc = 13; return s.tmp_22; }
     }
   case 13:
     r0 = s.retval;
@@ -57644,7 +57663,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 = 1378; s.pc = 14; return s.tmp_24; }
+     else { s.callLocIdx = 1385; s.pc = 14; return s.tmp_24; }
     }
   case 14:
     r0 = s.retval;
@@ -57655,116 +57674,116 @@ switch (step) {
     s.tmp_15 = r0;
     r0 = (s.tmp_13 + s.tmp_15);
     s.tmp_0.arg2 = r0;
-    s.callLocIdx = 1379; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1386; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    r0 = (s.i___206859 + 1);
-    s.i___206859 = (r0);
+    r0 = (s.i___21803 + 1);
+    s.i___21803 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_0 = controller__setUserEventsEnabled__P187171_mk(s);
+    s.tmp_0 = controller__setUserEventsEnabled__P1954_mk(s);
     s.tmp_0.arg0 = false;
-    s.callLocIdx = 1380; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1387; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P206922);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21866);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.A___187094;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.A___1877;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1382; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 1389; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P206942);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21886);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.A___187094;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.A___1877;
     s.tmp_1.arg1 = 2052;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1384; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 1391; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
-    s.tmp_0 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_0.arg0 = globals.B___187095;
+    s.tmp_0 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_0.arg0 = globals.B___1878;
     s.tmp_0.arg1 = 2053;
-    s.tmp_0.arg2 = inline__P206971;
-    s.callLocIdx = 1386; s.pc = 18; return s.tmp_0;
+    s.tmp_0.arg2 = inline__P21915;
+    s.callLocIdx = 1393; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
-    s.tmp_0 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_0.arg0 = globals.menu___187100;
+    s.tmp_0 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_0.arg0 = globals.menu___1883;
     s.tmp_0.arg1 = 2053;
-    s.tmp_0.arg2 = inline__P206976;
-    s.callLocIdx = 1388; s.pc = 19; return s.tmp_0;
+    s.tmp_0.arg2 = inline__P21920;
+    s.callLocIdx = 1395; s.pc = 19; return s.tmp_0;
   case 19:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P206981);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21925);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.up___187097;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.up___1880;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1392; s.pc = 20; return s.tmp_1;
+    s.callLocIdx = 1399; s.pc = 20; return s.tmp_1;
   case 20:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P206993);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21937);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.left___187096;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.left___1879;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1395; s.pc = 21; return s.tmp_1;
+    s.callLocIdx = 1402; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P207002);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21946);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.down___187099;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.down___1882;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1399; s.pc = 22; return s.tmp_1;
+    s.callLocIdx = 1406; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P207018);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21962);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = controller_Button_onEvent__P187127_mk(s);
-    s.tmp_1.arg0 = globals.right___187098;
+    s.tmp_1 = controller_Button_onEvent__P1910_mk(s);
+    s.tmp_1.arg0 = globals.right___1881;
     s.tmp_1.arg1 = 2053;
     s.tmp_1.arg2 = s.tmp_0;
-    s.callLocIdx = 1402; s.pc = 23; return s.tmp_1;
+    s.callLocIdx = 1409; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkAction(1, inline__P207030);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P21974);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = game_onShade__P187764_mk(s);
+    s.tmp_1 = game_onShade__P2547_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1405; s.pc = 24; return s.tmp_1;
+    s.callLocIdx = 1412; s.pc = 24; return s.tmp_1;
   case 24:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P187843_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 0;
-    s.callLocIdx = 1406; s.pc = 25; return s.tmp_0;
+    s.callLocIdx = 1413; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_show__P187841.info = {"start":3296,"length":2241,"line":123,"column":8,"endLine":181,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"show","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_show__P2624.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__P187841_mk(s) {
+function scene_systemMenu_PauseMenu_show__P2624_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_show__P187841, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_show__P2624, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57791,8 +57810,8 @@ function scene_systemMenu_PauseMenu_show__P187841_mk(s) {
   tmp_22: undefined,
   tmp_23: undefined,
   tmp_24: undefined,
-  current___206858: undefined,
-  i___206859: undefined,
+  current___21802: undefined,
+  i___21803: undefined,
   arg0: undefined,
 } }
 
@@ -57800,7 +57819,7 @@ function scene_systemMenu_PauseMenu_show__P187841_mk(s) {
 
 
 
-function inline__P206922(s) {
+function inline__P21866(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57838,7 +57857,7 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = scene_systemMenu_MenuOption_setState__P187837_mk(s);
+    s.tmp_8 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_9 = r0;
     r0 = s.caps[0].fields["selection"];
@@ -57846,7 +57865,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 = 1381; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 1388; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
   case 5:
@@ -57854,12 +57873,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206922.info = {"start":4025,"length":170,"line":140,"column":50,"endLine":143,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21866.info = {"start":4025,"length":170,"line":140,"column":50,"endLine":143,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P206922_mk(s) {
+function inline__P21866_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206922, depth: s.depth + 1,
+        parent: s, fn: inline__P21866, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57878,7 +57897,7 @@ function inline__P206922_mk(s) {
 
 
 
-function inline__P206942(s) {
+function inline__P21886(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57916,7 +57935,7 @@ switch (step) {
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_8 = scene_systemMenu_MenuOption_setState__P187837_mk(s);
+    s.tmp_8 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_9 = r0;
     r0 = s.caps[0].fields["selection"];
@@ -57924,7 +57943,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 = 1383; s.pc = 6; return s.tmp_8;
+    s.callLocIdx = 1390; s.pc = 6; return s.tmp_8;
   case 6:
     r0 = s.retval;
     r0 = s.caps[0].fields["options"];
@@ -57940,12 +57959,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206942.info = {"start":4247,"length":247,"line":145,"column":48,"endLine":149,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21886.info = {"start":4247,"length":247,"line":145,"column":48,"endLine":149,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P206942_mk(s) {
+function inline__P21886_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206942, depth: s.depth + 1,
+        parent: s, fn: inline__P21886, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -57964,7 +57983,7 @@ function inline__P206942_mk(s) {
 
 
 
-function inline__P206971(s) {
+function inline__P21915(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -57974,20 +57993,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_closeMenu__P187846_mk(s);
-    s.callLocIdx = 1385; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_closeMenu__P2629_mk(s);
+    s.callLocIdx = 1392; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206971.info = {"start":4548,"length":50,"line":151,"column":50,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21915.info = {"start":4548,"length":50,"line":151,"column":50,"endLine":153,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P206971_mk(s) {
+function inline__P21915_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206971, depth: s.depth + 1,
+        parent: s, fn: inline__P21915, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -57996,7 +58015,7 @@ function inline__P206971_mk(s) {
 
 
 
-function inline__P206976(s) {
+function inline__P21920(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58006,20 +58025,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_closeMenu__P187846_mk(s);
-    s.callLocIdx = 1387; s.pc = 1; return s.tmp_0;
+    s.tmp_0 = scene_systemMenu_closeMenu__P2629_mk(s);
+    s.callLocIdx = 1394; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206976.info = {"start":4655,"length":50,"line":155,"column":53,"endLine":157,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21920.info = {"start":4655,"length":50,"line":155,"column":53,"endLine":157,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P206976_mk(s) {
+function inline__P21920_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206976, depth: s.depth + 1,
+        parent: s, fn: inline__P21920, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -58028,7 +58047,7 @@ function inline__P206976_mk(s) {
 
 
 
-function inline__P206981(s) {
+function inline__P21925(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58038,9 +58057,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P187843_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_max__P185342_mk(s);
+    s.tmp_1 = Math_max__P125_mk(s);
     s.tmp_1.arg0 = 0;
     r0 = s.caps[0].fields["selection"];
     s.tmp_2 = r0;
@@ -58053,30 +58072,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 = 1389; s.pc = 3; return s.tmp_4; }
+     else { s.callLocIdx = 1396; 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 = 1390; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1397; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1391; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1398; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206981.info = {"start":4760,"length":110,"line":159,"column":51,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21925.info = {"start":4760,"length":110,"line":159,"column":51,"endLine":161,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P206981_mk(s) {
+function inline__P21925_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206981, depth: s.depth + 1,
+        parent: s, fn: inline__P21925, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58089,7 +58108,7 @@ function inline__P206981_mk(s) {
 
 
 
-function inline__P206993(s) {
+function inline__P21937(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58099,31 +58118,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P187843_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_max__P185342_mk(s);
+    s.tmp_1 = Math_max__P125_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 = 1393; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1400; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1394; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1401; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P206993.info = {"start":4927,"length":89,"line":163,"column":53,"endLine":165,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21937.info = {"start":4927,"length":89,"line":163,"column":53,"endLine":165,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P206993_mk(s) {
+function inline__P21937_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P206993, depth: s.depth + 1,
+        parent: s, fn: inline__P21937, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58134,7 +58153,7 @@ function inline__P206993_mk(s) {
 
 
 
-function inline__P207002(s) {
+function inline__P21946(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58144,9 +58163,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P187843_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_min__P185343_mk(s);
+    s.tmp_1 = Math_min__P126_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -58164,30 +58183,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 = 1396; s.pc = 3; return s.tmp_6; }
+     else { s.callLocIdx = 1403; 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 = 1397; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1404; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1398; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1405; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207002.info = {"start":5073,"length":132,"line":167,"column":53,"endLine":169,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21946.info = {"start":5073,"length":132,"line":167,"column":53,"endLine":169,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207002_mk(s) {
+function inline__P21946_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207002, depth: s.depth + 1,
+        parent: s, fn: inline__P21946, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58202,7 +58221,7 @@ function inline__P207002_mk(s) {
 
 
 
-function inline__P207018(s) {
+function inline__P21962(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58212,9 +58231,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P187843_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_setSelection__P2626_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.tmp_1 = Math_min__P185343_mk(s);
+    s.tmp_1 = Math_min__P126_mk(s);
     r0 = s.caps[0].fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -58225,23 +58244,23 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 1);
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1400; s.pc = 2; return s.tmp_1;
+    s.callLocIdx = 1407; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1401; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1408; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207018.info = {"start":5263,"length":111,"line":171,"column":54,"endLine":173,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21962.info = {"start":5263,"length":111,"line":171,"column":54,"endLine":173,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207018_mk(s) {
+function inline__P21962_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207018, depth: s.depth + 1,
+        parent: s, fn: inline__P21962, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58254,7 +58273,7 @@ function inline__P207018_mk(s) {
 
 
 
-function inline__P207030(s) {
+function inline__P21974(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58264,26 +58283,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = scene_systemMenu_PauseMenu_onUpdate__P187842_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_onUpdate__P2625_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1403; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1410; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = scene_systemMenu_PauseMenu_drawText__P187844_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_drawText__P2627_mk(s);
     s.tmp_0.arg0 = s.caps[0];
-    s.callLocIdx = 1404; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1411; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-inline__P207030.info = {"start":5403,"length":87,"line":175,"column":25,"endLine":178,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
+inline__P21974.info = {"start":5403,"length":87,"line":175,"column":25,"endLine":178,"endColumn":13,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P207030_mk(s) {
+function inline__P21974_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P207030, depth: s.depth + 1,
+        parent: s, fn: inline__P21974, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -58292,7 +58311,7 @@ function inline__P207030_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_drawText__P187844(s) {
+function scene_systemMenu_PauseMenu_drawText__P2627(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58307,7 +58326,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C187839_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -58319,11 +58338,11 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_3 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_3.arg0 = globals.screen___187019;
+    s.tmp_3 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_3.arg0 = globals.screen___1802;
     s.tmp_3.arg1 = 0;
     s.tmp_3.arg2 = 0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_3.arg3 = r0;
     s.tmp_5 = if_cardsTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58334,7 +58353,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 = 1417; s.pc = 5; return s.tmp_5; }
+     else { s.callLocIdx = 1424; s.pc = 5; return s.tmp_5; }
     }
   case 5:
     r0 = s.retval;
@@ -58342,11 +58361,11 @@ switch (step) {
     r0 = (s.tmp_4 - 2);
     s.tmp_3.arg4 = r0;
     s.tmp_3.arg5 = 15;
-    s.callLocIdx = 1418; s.pc = 4; return s.tmp_3;
+    s.callLocIdx = 1425; s.pc = 4; return s.tmp_3;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrintCenter__P186976_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_1 = if_headerText_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -58356,7 +58375,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 = 1419; s.pc = 7; return s.tmp_1; }
+     else { s.callLocIdx = 1426; s.pc = 7; return s.tmp_1; }
     }
   case 7:
     r0 = s.retval;
@@ -58372,16 +58391,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 = 1420; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 1427; s.pc = 8; return s.tmp_2; }
     }
   case 8:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1421; s.pc = 6; return s.tmp_0;
+    s.callLocIdx = 1428; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_0.arg1 = 0;
     s.tmp_2 = if_infoTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58392,16 +58411,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 = 1422; s.pc = 10; return s.tmp_2; }
+     else { s.callLocIdx = 1429; 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___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_0.arg3 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_4 = r0;
     s.tmp_6 = if_infoTop_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58412,7 +58431,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 = 1423; s.pc = 11; return s.tmp_6; }
+     else { s.callLocIdx = 1430; s.pc = 11; return s.tmp_6; }
     }
   case 11:
     r0 = s.retval;
@@ -58422,11 +58441,11 @@ switch (step) {
     r0 = (s.tmp_3 + 6);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 15;
-    s.callLocIdx = 1424; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1431; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.tmp_0 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_1 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_1.arg0 = r0;
@@ -58436,7 +58455,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 = 1425; s.pc = 13; return s.tmp_1; }
+     else { s.callLocIdx = 1432; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
@@ -58450,12 +58469,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 = 1426; s.pc = 14; return s.tmp_2; }
+     else { s.callLocIdx = 1433; s.pc = 14; return s.tmp_2; }
     }
   case 14:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_3 = r0;
     s.tmp_6 = if_padding_1_mk(s);
     r0 = s.arg0.fields["theme"];
@@ -58466,7 +58485,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 = 1427; s.pc = 15; return s.tmp_6; }
+     else { s.callLocIdx = 1434; s.pc = 15; return s.tmp_6; }
     }
   case 15:
     r0 = s.retval;
@@ -58485,7 +58504,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 = 1428; s.pc = 17; return s.tmp_9; }
+     else { s.callLocIdx = 1435; s.pc = 17; return s.tmp_9; }
     }
   case 17:
     r0 = s.retval;
@@ -58496,7 +58515,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 = 1429; s.pc = 16; return s.tmp_8; }
+     else { s.callLocIdx = 1436; s.pc = 16; return s.tmp_8; }
     }
   case 16:
     r0 = s.retval;
@@ -58504,11 +58523,11 @@ switch (step) {
     r0 = (s.tmp_7 + 1);
     s.tmp_0.arg4 = r0;
     s.tmp_0.arg5 = 1;
-    s.callLocIdx = 1430; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1437; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
-    s.tmp_0 = helpers_imagePrintCenter__P186976_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imagePrintCenter__P1759_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     s.tmp_1 = if_getText_1_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
@@ -58518,12 +58537,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 = 1431; s.pc = 19; return s.tmp_1;
+      s.callLocIdx = 1438; 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 = 1431; s.pc = 19; return s.tmp_1; }
-      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1431; s.pc = 19; return s.tmp_1;; }
-     else { s.callLocIdx = 1431; 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 = 1438; s.pc = 19; return s.tmp_1; }
+      else if (s.tmp_1.fn.isGetter) { s.tmp_1.stage2Call = true; s.callLocIdx = 1438; s.pc = 19; return s.tmp_1;; }
+     else { s.callLocIdx = 1438; s.pc = 19; return s.tmp_1; }
     }
   case 19:
     r0 = s.retval;
@@ -58537,7 +58556,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 = 1432; s.pc = 20; return s.tmp_5; }
+     else { s.callLocIdx = 1439; s.pc = 20; return s.tmp_5; }
     }
   case 20:
     r0 = s.retval;
@@ -58554,12 +58573,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 = 1433; s.pc = 21; return s.tmp_6; }
+     else { s.callLocIdx = 1440; s.pc = 21; return s.tmp_6; }
     }
   case 21:
     r0 = s.retval;
     s.tmp_0.arg4 = r0;
-    s.callLocIdx = 1434; s.pc = 18; return s.tmp_0;
+    s.callLocIdx = 1441; s.pc = 18; return s.tmp_0;
   case 18:
     r0 = s.retval;
   case 3:
@@ -58567,12 +58586,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_drawText__P187844.info = {"start":6927,"length":795,"line":224,"column":8,"endLine":241,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"drawText","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_drawText__P2627.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__P187844_mk(s) {
+function scene_systemMenu_PauseMenu_drawText__P2627_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_drawText__P187844, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_drawText__P2627, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58591,7 +58610,7 @@ function scene_systemMenu_PauseMenu_drawText__P187844_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_setSelection__P187843(s) {
+function scene_systemMenu_PauseMenu_setSelection__P2626(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58607,7 +58626,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C187839_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
     r0 = s.arg0.fields["options"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -58627,7 +58646,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__P187837_mk(s);
+    s.tmp_6 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["selection"];
@@ -58635,7 +58654,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 = 1414; s.pc = 10; return s.tmp_6;
+    s.callLocIdx = 1421; s.pc = 10; return s.tmp_6;
   case 10:
     r0 = s.retval;
   case 3:
@@ -58649,9 +58668,9 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_4.arg0 = globals.A___187094;
-    if (!checkSubtype(s.tmp_4.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_4.arg0);
+    s.tmp_4 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_4.arg0 = globals.A___1877;
+    if (!checkSubtype(s.tmp_4.arg0, controller_Button__C1903_VT)) failedCast(s.tmp_4.arg0);
     s.tmp_4.fn = s.tmp_4.arg0.vtable.methods.isPressed;
     s.pc = 11; return s.tmp_4;
   case 11:
@@ -58666,7 +58685,7 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.tmp_6 = scene_systemMenu_MenuOption_setState__P187837_mk(s);
+    s.tmp_6 = scene_systemMenu_MenuOption_setState__P2620_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_7 = r0;
     r0 = s.arg0.fields["selection"];
@@ -58674,14 +58693,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 = 1415; s.pc = 12; return s.tmp_6;
+    s.callLocIdx = 1422; s.pc = 12; return s.tmp_6;
   case 12:
     r0 = s.retval;
   case 7:
   case 8:
-    s.tmp_0 = scene_systemMenu_PauseMenu_updateScrollTarget__P189819_mk(s);
+    s.tmp_0 = scene_systemMenu_PauseMenu_updateScrollTarget__P4603_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1416; s.pc = 13; return s.tmp_0;
+    s.callLocIdx = 1423; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
   case 9:
@@ -58689,12 +58708,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_setSelection__P187843.info = {"start":6436,"length":481,"line":208,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setSelection","argumentNames":["this","selection"]}
+scene_systemMenu_PauseMenu_setSelection__P2626.info = {"start":6436,"length":481,"line":208,"column":8,"endLine":222,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setSelection","argumentNames":["this","selection"]}
 
-function scene_systemMenu_PauseMenu_setSelection__P187843_mk(s) {
+function scene_systemMenu_PauseMenu_setSelection__P2626_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_setSelection__P187843, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_setSelection__P2626, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58713,7 +58732,7 @@ function scene_systemMenu_PauseMenu_setSelection__P187843_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_updateScrollTarget__P189819(s) {
+function scene_systemMenu_PauseMenu_updateScrollTarget__P4603(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58723,13 +58742,13 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.row___207248 = undefined;
+    s.row___22192 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C187839_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
     r0 = s.arg0.fields["selection"];
     s.tmp_0 = r0;
     s.tmp_2 = if_cardsPerRow_1_mk(s);
@@ -58741,23 +58760,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 = 1437; s.pc = 8; return s.tmp_2; }
+     else { s.callLocIdx = 1444; 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___207248 = (r0);
+    s.row___22192 = (r0);
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_1 = r0;
-    r0 = (s.row___207248 === s.tmp_1);
+    r0 = (s.row___22192 === 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___207248 - 1);
+    r0 = (s.row___22192 - 1);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_3 = r0;
@@ -58772,7 +58791,7 @@ switch (step) {
   case 4:
     r0 = s.arg0.fields["scrollRow"];
     s.tmp_6 = r0;
-    r0 = (s.row___207248 > s.tmp_6);
+    r0 = (s.row___22192 > s.tmp_6);
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 5; continue; }
@@ -58803,7 +58822,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 = 1438; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 1445; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
@@ -58817,7 +58836,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 = 1439; s.pc = 10; return s.tmp_7; }
+     else { s.callLocIdx = 1446; s.pc = 10; return s.tmp_7; }
     }
   case 10:
     r0 = s.retval;
@@ -58832,12 +58851,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_updateScrollTarget__P189819.info = {"start":7907,"length":458,"line":250,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"updateScrollTarget","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_updateScrollTarget__P4603.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__P189819_mk(s) {
+function scene_systemMenu_PauseMenu_updateScrollTarget__P4603_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_updateScrollTarget__P189819, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_updateScrollTarget__P4603, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -58849,7 +58868,7 @@ function scene_systemMenu_PauseMenu_updateScrollTarget__P189819_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  row___207248: undefined,
+  row___22192: undefined,
   arg0: undefined,
 } }
 
@@ -58857,7 +58876,7 @@ function scene_systemMenu_PauseMenu_updateScrollTarget__P189819_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_onUpdate__P187842(s) {
+function scene_systemMenu_PauseMenu_onUpdate__P2625(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -58867,22 +58886,22 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.t___207108 = undefined;
-    s.i___207112 = undefined;
-    s.dt___207141 = undefined;
+    s.t___22052 = undefined;
+    s.i___22056 = undefined;
+    s.dt___22085 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C187839_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
     r0 = pxsim.control.millis();
     s.tmp_0 = r0;
     r0 = (s.tmp_0 / 250);
-    s.t___207108 = (r0);
-    s.i___207112 = (0);
+    s.t___22052 = (r0);
+    s.i___22056 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___207112;
+    s.tmp_1 = r0 = s.i___22056;
     r0 = s.arg0.fields["options"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -58891,13 +58910,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__P187835_mk(s);
+    s.tmp_4 = scene_systemMenu_MenuOption_setOffset__P2618_mk(s);
     r0 = s.arg0.fields["options"];
     s.tmp_5 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_5, s.i___207112);
+    r0 = pxsim_Array__getAt(s.tmp_5, s.i___22056);
     s.tmp_4.arg0 = r0;
-    s.tmp_8 = r0 = s.t___207108;
-    s.tmp_11 = r0 = s.i___207112;
+    s.tmp_8 = r0 = s.t___22052;
+    s.tmp_11 = r0 = s.i___22056;
     s.tmp_13 = if_cardsPerRow_1_mk(s);
     r0 = s.arg0.fields["theme"];
     s.tmp_13.arg0 = r0;
@@ -58907,7 +58926,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 = 1407; s.pc = 11; return s.tmp_13; }
+     else { s.callLocIdx = 1414; s.pc = 11; return s.tmp_13; }
     }
   case 11:
     r0 = s.retval;
@@ -58922,15 +58941,15 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = (2 * s.tmp_6);
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 1408; s.pc = 10; return s.tmp_4;
+    s.callLocIdx = 1415; s.pc = 10; return s.tmp_4;
   case 10:
     r0 = s.retval;
-    r0 = (s.i___207112 + 1);
-    s.i___207112 = (r0);
+    r0 = (s.i___22056 + 1);
+    s.i___22056 = (r0);
     { step = 1; continue; }
   case 2:
-    s.tmp_1 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1409; s.pc = 12; return s.tmp_1;
+    s.tmp_1 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1416; s.pc = 12; return s.tmp_1;
   case 12:
     r0 = s.retval;
     r0 = r0.fields["eventContext"];
@@ -58938,7 +58957,7 @@ switch (step) {
     r0 = s.tmp_0.fields["deltaTimeMillis"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 / 1000);
-    s.dt___207141 = (r0);
+    s.dt___22085 = (r0);
     r0 = s.arg0.fields["scrollOffset"];
     s.tmp_1 = r0;
     r0 = s.arg0.fields["scrollTarget"];
@@ -58950,7 +58969,7 @@ switch (step) {
     s.tmp_3 = r0 = s.arg0;
     r0 = s.tmp_3.fields["scrollOffset"];
     s.tmp_5 = r0;
-    r0 = (s.dt___207141 * 100);
+    r0 = (s.dt___22085 * 100);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 + s.tmp_6);
     s.tmp_4 = r0;
@@ -58968,7 +58987,7 @@ switch (step) {
     s.tmp_3 = r0 = s.arg0;
     r0 = s.tmp_3.fields["scrollOffset"];
     s.tmp_5 = r0;
-    r0 = (s.dt___207141 * 100);
+    r0 = (s.dt___22085 * 100);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 - s.tmp_6);
     s.tmp_4 = r0;
@@ -58978,14 +58997,14 @@ switch (step) {
     { step = 9; continue; }
   case 5:
   case 6:
-    s.tmp_2 = Math_abs__P185340_mk(s);
+    s.tmp_2 = Math_abs__P123_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 = 1411; s.pc = 13; return s.tmp_2;
+    s.callLocIdx = 1418; s.pc = 13; return s.tmp_2;
   case 13:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -58998,16 +59017,16 @@ switch (step) {
     r0 = (s.arg0).fields["scrollOffset"] = (s.tmp_5);
   case 7:
   case 8:
-    s.tmp_0 = scene_Camera_offsetY__P187585_mk(s);
-    s.tmp_1 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1412; s.pc = 15; return s.tmp_1;
+    s.tmp_0 = scene_Camera_offsetY__P2368_mk(s);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1419; s.pc = 15; return s.tmp_1;
   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 = 1413; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1420; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
   case 9:
@@ -59015,12 +59034,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_onUpdate__P187842.info = {"start":5547,"length":879,"line":183,"column":8,"endLine":206,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"onUpdate","argumentNames":["this"]}
+scene_systemMenu_PauseMenu_onUpdate__P2625.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__P187842_mk(s) {
+function scene_systemMenu_PauseMenu_onUpdate__P2625_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_onUpdate__P187842, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_onUpdate__P2625, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59036,9 +59055,9 @@ function scene_systemMenu_PauseMenu_onUpdate__P187842_mk(s) {
   tmp_11: undefined,
   tmp_12: undefined,
   tmp_13: undefined,
-  t___207108: undefined,
-  i___207112: undefined,
-  dt___207141: undefined,
+  t___22052: undefined,
+  i___22056: undefined,
+  dt___22085: undefined,
   arg0: undefined,
 } }
 
@@ -59046,7 +59065,7 @@ function scene_systemMenu_PauseMenu_onUpdate__P187842_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setOffset__P187835(s) {
+function scene_systemMenu_MenuOption_setOffset__P2618(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59062,40 +59081,40 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_top__P187284_mk(s);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_top__P2067_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 = 1350; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1357; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
+    s.tmp_0 = Sprite_y__P2028_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P187244_mk(s);
+    s.tmp_1 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1351; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1358; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1352; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1359; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setOffset__P187835.info = {"start":1411,"length":123,"line":61,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setOffset","argumentNames":["this","offset"]}
+scene_systemMenu_MenuOption_setOffset__P2618.info = {"start":1411,"length":123,"line":61,"column":8,"endLine":64,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setOffset","argumentNames":["this","offset"]}
 
-function scene_systemMenu_MenuOption_setOffset__P187835_mk(s) {
+function scene_systemMenu_MenuOption_setOffset__P2618_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setOffset__P187835, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setOffset__P2618, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59107,7 +59126,7 @@ function scene_systemMenu_MenuOption_setOffset__P187835_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setState__P187837(s) {
+function scene_systemMenu_MenuOption_setState__P2620(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59123,7 +59142,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
     r0 = s.arg0.fields["state"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === s.arg1);
@@ -59134,9 +59153,9 @@ switch (step) {
   case 1:
   case 2:
     r0 = (s.arg0).fields["state"] = (s.arg1);
-    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P189818_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P4602_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1354; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1361; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
   case 3:
@@ -59144,12 +59163,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setState__P187837.info = {"start":1655,"length":147,"line":71,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setState","argumentNames":["this","state"]}
+scene_systemMenu_MenuOption_setState__P2620.info = {"start":1655,"length":147,"line":71,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setState","argumentNames":["this","state"]}
 
-function scene_systemMenu_MenuOption_setState__P187837_mk(s) {
+function scene_systemMenu_MenuOption_setState__P2620_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setState__P187837, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setState__P2620, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59161,7 +59180,7 @@ function scene_systemMenu_MenuOption_setState__P187837_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_updateCard__P189818(s) {
+function scene_systemMenu_MenuOption_updateCard__P4602(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59176,7 +59195,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
     r0 = s.arg0.fields["theme"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -59199,7 +59218,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 6; continue; }
   case 3:
-    s.tmp_4 = Sprite_setImage__P187273_mk(s);
+    s.tmp_4 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_4.arg0 = r0;
     s.tmp_5 = if_basicCard_1_mk(s);
@@ -59211,17 +59230,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 = 1357; s.pc = 9; return s.tmp_5; }
+     else { s.callLocIdx = 1364; s.pc = 9; return s.tmp_5; }
     }
   case 9:
     r0 = s.retval;
     s.tmp_4.arg1 = r0;
-    s.callLocIdx = 1358; s.pc = 8; return s.tmp_4;
+    s.callLocIdx = 1365; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     { step = 6; continue; }
   case 4:
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_selectedCard_1_mk(s);
@@ -59233,17 +59252,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 = 1359; s.pc = 11; return s.tmp_1; }
+     else { s.callLocIdx = 1366; s.pc = 11; return s.tmp_1; }
     }
   case 11:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1360; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1367; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
     { step = 6; continue; }
   case 5:
-    s.tmp_0 = Sprite_setImage__P187273_mk(s);
+    s.tmp_0 = Sprite_setImage__P2056_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_1 = if_activeCard_1_mk(s);
@@ -59255,39 +59274,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 = 1361; s.pc = 13; return s.tmp_1; }
+     else { s.callLocIdx = 1368; s.pc = 13; return s.tmp_1; }
     }
   case 13:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1362; s.pc = 12; return s.tmp_0;
+    s.callLocIdx = 1369; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
   case 6:
-    s.tmp_0 = Sprite_x__P187243_mk(s);
+    s.tmp_0 = Sprite_x__P2026_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_x__P187242_mk(s);
+    s.tmp_1 = Sprite_x__P2025_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1363; s.pc = 15; return s.tmp_1;
+    s.callLocIdx = 1370; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1364; s.pc = 14; return s.tmp_0;
+    s.callLocIdx = 1371; s.pc = 14; return s.tmp_0;
   case 14:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
+    s.tmp_0 = Sprite_y__P2028_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P187244_mk(s);
+    s.tmp_1 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1365; s.pc = 17; return s.tmp_1;
+    s.callLocIdx = 1372; s.pc = 17; return s.tmp_1;
   case 17:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1366; s.pc = 16; return s.tmp_0;
+    s.callLocIdx = 1373; s.pc = 16; return s.tmp_0;
   case 16:
     r0 = s.retval;
   case 7:
@@ -59295,12 +59314,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_updateCard__P189818.info = {"start":2038,"length":497,"line":86,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"updateCard","argumentNames":["this"]}
+scene_systemMenu_MenuOption_updateCard__P4602.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__P189818_mk(s) {
+function scene_systemMenu_MenuOption_updateCard__P4602_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_updateCard__P189818, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_updateCard__P4602, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59315,7 +59334,7 @@ function scene_systemMenu_MenuOption_updateCard__P189818_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_setTheme__P187836(s) {
+function scene_systemMenu_MenuOption_setTheme__P2619(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59331,23 +59350,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
     r0 = (s.arg0).fields["theme"] = (s.arg1);
-    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P189818_mk(s);
+    s.tmp_0 = scene_systemMenu_MenuOption_updateCard__P4602_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1353; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1360; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_setTheme__P187836.info = {"start":1544,"length":101,"line":66,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setTheme","argumentNames":["this","theme"]}
+scene_systemMenu_MenuOption_setTheme__P2619.info = {"start":1544,"length":101,"line":66,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"setTheme","argumentNames":["this","theme"]}
 
-function scene_systemMenu_MenuOption_setTheme__P187836_mk(s) {
+function scene_systemMenu_MenuOption_setTheme__P2619_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_setTheme__P187836, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_setTheme__P2619, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -59358,7 +59377,7 @@ function scene_systemMenu_MenuOption_setTheme__P187836_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_position__P187834(s) {
+function scene_systemMenu_MenuOption_position__P2617(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59375,58 +59394,58 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
     r0 = (s.arg0).fields["top"] = (s.arg2);
-    s.tmp_0 = Sprite_left__P187280_mk(s);
+    s.tmp_0 = Sprite_left__P2063_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1344; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1351; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = Sprite_top__P187284_mk(s);
+    s.tmp_0 = Sprite_top__P2067_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg2;
-    s.callLocIdx = 1345; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1352; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.tmp_0 = Sprite_x__P187243_mk(s);
+    s.tmp_0 = Sprite_x__P2026_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_x__P187242_mk(s);
+    s.tmp_1 = Sprite_x__P2025_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1346; s.pc = 4; return s.tmp_1;
+    s.callLocIdx = 1353; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1347; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1354; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.tmp_0 = Sprite_y__P187245_mk(s);
+    s.tmp_0 = Sprite_y__P2028_mk(s);
     r0 = s.arg0.fields["icon"];
     s.tmp_0.arg0 = r0;
-    s.tmp_1 = Sprite_y__P187244_mk(s);
+    s.tmp_1 = Sprite_y__P2027_mk(s);
     r0 = s.arg0.fields["card"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1348; s.pc = 6; return s.tmp_1;
+    s.callLocIdx = 1355; s.pc = 6; return s.tmp_1;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.callLocIdx = 1349; s.pc = 5; return s.tmp_0;
+    s.callLocIdx = 1356; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_position__P187834.info = {"start":1178,"length":223,"line":51,"column":8,"endLine":59,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"position","argumentNames":["this","left","top"]}
+scene_systemMenu_MenuOption_position__P2617.info = {"start":1178,"length":223,"line":51,"column":8,"endLine":59,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"position","argumentNames":["this","left","top"]}
 
-function scene_systemMenu_MenuOption_position__P187834_mk(s) {
+function scene_systemMenu_MenuOption_position__P2617_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_position__P187834, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_position__P2617, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59439,7 +59458,7 @@ function scene_systemMenu_MenuOption_position__P187834_mk(s) {
 
 
 
-function scene_systemMenu_MenuOption_show__P187833(s) {
+function scene_systemMenu_MenuOption_show__P2616(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59454,7 +59473,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C187831_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_MenuOption__C2614_VT)) failedCast(r0);
     r0 = s.arg0.fields["theme"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -59468,21 +59487,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 = 1339; s.pc = 3; return s.tmp_1; }
+     else { s.callLocIdx = 1346; s.pc = 3; return s.tmp_1; }
     }
   case 3:
     r0 = s.retval;
     { step = 2; continue; }
   case 1:
-    r0 = globals.CARD_NORMAL___187855;
+    r0 = globals.CARD_NORMAL___2638;
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.tmp_3 = r0 = s.arg0;
-    s.tmp_5 = sprites_create__P187191_mk(s);
+    s.tmp_5 = sprites_create__P1974_mk(s);
     s.tmp_5.arg0 = s.tmp_2;
     s.tmp_5.arg1 = undefined;
-    s.callLocIdx = 1340; s.pc = 4; return s.tmp_5;
+    s.callLocIdx = 1347; s.pc = 4; return s.tmp_5;
   case 4:
     r0 = s.retval;
     s.tmp_4 = r0;
@@ -59497,16 +59516,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 = 1341; s.pc = 5; return s.tmp_0; }
+     else { s.callLocIdx = 1348; s.pc = 5; return s.tmp_0; }
     }
   case 5:
     r0 = s.retval;
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = sprites_create__P187191_mk(s);
+    s.tmp_2 = sprites_create__P1974_mk(s);
     r0 = s.arg0.fields["iconImage"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = undefined;
-    s.callLocIdx = 1342; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 1349; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -59521,7 +59540,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 = 1343; s.pc = 7; return s.tmp_0; }
+     else { s.callLocIdx = 1350; s.pc = 7; return s.tmp_0; }
     }
   case 7:
     r0 = s.retval;
@@ -59530,12 +59549,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_MenuOption_show__P187833.info = {"start":904,"length":264,"line":41,"column":8,"endLine":49,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"show","argumentNames":["this"]}
+scene_systemMenu_MenuOption_show__P2616.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__P187833_mk(s) {
+function scene_systemMenu_MenuOption_show__P2616_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_MenuOption_show__P187833, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_MenuOption_show__P2616, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59550,7 +59569,7 @@ function scene_systemMenu_MenuOption_show__P187833_mk(s) {
 
 
 
-function game_onShade__P187764(s) {
+function game_onShade__P2547(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59564,9 +59583,9 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_init__P189572_mk(s);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1216; s.pc = 4; return s.tmp_0;
+    s.callLocIdx = 1223; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg0);
@@ -59578,11 +59597,11 @@ switch (step) {
     { step = 3; continue; }
   case 1:
   case 2:
-    s.tmp_2 = scene_createRenderable__P187600_mk(s);
+    s.tmp_2 = scene_createRenderable__P2383_mk(s);
     s.tmp_2.arg0 = 80;
     s.tmp_2.arg1 = s.arg0;
     s.tmp_2.arg2 = undefined;
-    s.callLocIdx = 1217; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1224; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
   case 3:
@@ -59590,12 +59609,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_onShade__P187764.info = {"start":9934,"length":145,"line":320,"column":4,"endLine":324,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"onShade","argumentNames":["a"]}
+game_onShade__P2547.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__P187764_mk(s) {
+function game_onShade__P2547_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_onShade__P187764, depth: s.depth + 1,
+        parent: s, fn: game_onShade__P2547, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59607,7 +59626,7 @@ function game_onShade__P187764_mk(s) {
 
 
 
-function scene_systemMenu_PauseMenu_constructor__P187840(s) {
+function scene_systemMenu_PauseMenu_constructor__P2623(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59624,7 +59643,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C187839_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_systemMenu_PauseMenu__C2622_VT)) failedCast(r0);
     r0 = (s.arg0).fields["generator"] = (s.arg1);
     s.tmp_0 = r0 = s.arg2;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -59632,13 +59651,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_1 = scene_systemMenu_buildMenuTheme__P187848_mk(s);
-    r0 = pxsim_ImageMethods.width(globals.CARD_NORMAL___187855);
+    s.tmp_1 = scene_systemMenu_buildMenuTheme__P2631_mk(s);
+    r0 = pxsim_ImageMethods.width(globals.CARD_NORMAL___2638);
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = 3;
     s.tmp_1.arg2 = undefined;
     s.tmp_1.arg3 = undefined;
-    s.callLocIdx = 1367; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1374; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
   case 2:
@@ -59652,12 +59671,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_PauseMenu_constructor__P187840.info = {"start":3029,"length":257,"line":116,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["this","generator","theme"]}
+scene_systemMenu_PauseMenu_constructor__P2623.info = {"start":3029,"length":257,"line":116,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"inline","argumentNames":["this","generator","theme"]}
 
-function scene_systemMenu_PauseMenu_constructor__P187840_mk(s) {
+function scene_systemMenu_PauseMenu_constructor__P2623_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_PauseMenu_constructor__P187840, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_PauseMenu_constructor__P2623, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59671,7 +59690,7 @@ function scene_systemMenu_PauseMenu_constructor__P187840_mk(s) {
 
 
 
-function scene_systemMenu_buildMenuTheme__P187848(s) {
+function scene_systemMenu_buildMenuTheme__P2631(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59681,7 +59700,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.cardsPerRow___207957 = undefined;
+    s.cardsPerRow___22901 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -59689,19 +59708,19 @@ switch (step) {
       s.arg3 = (s.lambdaArgs[3]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     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___207957 = (r0);
+    s.cardsPerRow___22901 = (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___186962;
+    r0 = globals.font8___1745;
   case 2:
     // jmp value (already in r0)
     s.tmp_1 = r0;
@@ -59712,9 +59731,9 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    s.tmp_1 = image_doubledFont__P186965_mk(s);
+    s.tmp_1 = image_doubledFont__P1748_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.callLocIdx = 1477; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1484; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
   case 4:
@@ -59725,12 +59744,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___207957);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "cardsPerRow", s.cardsPerRow___22901);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_3 = r0;
-    r0 = (s.cardsPerRow___207957 * s.arg0);
+    r0 = (s.cardsPerRow___22901 * s.arg0);
     s.tmp_5 = r0;
-    r0 = (s.cardsPerRow___207957 - 1);
+    r0 = (s.cardsPerRow___22901 - 1);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 * s.arg1);
     s.tmp_6 = r0;
@@ -59751,7 +59770,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 = 1478; s.pc = 6; return s.tmp_11; }
+     else { s.callLocIdx = 1485; s.pc = 6; return s.tmp_11; }
     }
   case 6:
     r0 = s.retval;
@@ -59761,7 +59780,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___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_14 = r0;
     s.tmp_16 = if_charHeight_1_mk(s);
     s.tmp_16.arg0 = s.arg2;
@@ -59771,7 +59790,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 = 1479; s.pc = 7; return s.tmp_16; }
+     else { s.callLocIdx = 1486; s.pc = 7; return s.tmp_16; }
     }
   case 7:
     r0 = s.retval;
@@ -59782,19 +59801,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___187856);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "activeCard", globals.CARD_ACTIVE___187857);
-    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "basicCard", globals.CARD_NORMAL___187855);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "selectedCard", globals.CARD_SELECTED___2639);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "activeCard", globals.CARD_ACTIVE___2640);
+    r0 = pxsim_pxtrt.mapSetByString(s.tmp_0, "basicCard", globals.CARD_NORMAL___2638);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_buildMenuTheme__P187848.info = {"start":11654,"length":906,"line":356,"column":4,"endLine":375,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"buildMenuTheme","argumentNames":["cardWidth","cardSpacing","infoFont","headerFont"]}
+scene_systemMenu_buildMenuTheme__P2631.info = {"start":11654,"length":906,"line":356,"column":4,"endLine":375,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"buildMenuTheme","argumentNames":["cardWidth","cardSpacing","infoFont","headerFont"]}
 
-function scene_systemMenu_buildMenuTheme__P187848_mk(s) {
+function scene_systemMenu_buildMenuTheme__P2631_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_buildMenuTheme__P187848, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_buildMenuTheme__P2631, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -59813,7 +59832,7 @@ function scene_systemMenu_buildMenuTheme__P187848_mk(s) {
   tmp_14: undefined,
   tmp_15: undefined,
   tmp_16: undefined,
-  cardsPerRow___207957: undefined,
+  cardsPerRow___22901: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -59824,7 +59843,7 @@ function scene_systemMenu_buildMenuTheme__P187848_mk(s) {
 
 
 
-function image_doubledFont__P186965(s) {
+function image_doubledFont__P1748(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59838,7 +59857,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = image_scaledFont__P186966_mk(s);
+    s.tmp_0 = image_scaledFont__P1749_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = 2;
     s.callLocIdx = 130; s.pc = 1; return s.tmp_0;
@@ -59847,12 +59866,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-image_doubledFont__P186965.info = {"start":12008,"length":82,"line":146,"column":4,"endLine":148,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"doubledFont","argumentNames":["f"]}
+image_doubledFont__P1748.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__P186965_mk(s) {
+function image_doubledFont__P1748_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_doubledFont__P186965, depth: s.depth + 1,
+        parent: s, fn: image_doubledFont__P1748, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -59862,7 +59881,7 @@ function image_doubledFont__P186965_mk(s) {
 
 
 
-function image_scaledFont__P186966(s) {
+function image_scaledFont__P1749(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -59977,12 +59996,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-image_scaledFont__P186966.info = {"start":12096,"length":331,"line":150,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"scaledFont","argumentNames":["f","size"]}
+image_scaledFont__P1749.info = {"start":12096,"length":331,"line":150,"column":4,"endLine":160,"endColumn":5,"fileName":"pxt_modules/screen/text.ts","functionName":"scaledFont","argumentNames":["f","size"]}
 
-function image_scaledFont__P186966_mk(s) {
+function image_scaledFont__P1749_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: image_scaledFont__P186966, depth: s.depth + 1,
+        parent: s, fn: image_scaledFont__P1749, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60008,7 +60027,7 @@ function image_scaledFont__P186966_mk(s) {
 
 
 
-function scene_systemMenu_initScreen__P189831(s) {
+function scene_systemMenu_initScreen__P4615(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60018,21 +60037,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.brightness___208037 = undefined;
-    s.tmp_0 = settings_readNumber__P187050_mk(s);
+    s.brightness___22981 = undefined;
+    s.tmp_0 = settings_readNumber__P1833_mk(s);
     s.tmp_0.arg0 = "#brightness";
-    s.callLocIdx = 1486; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1493; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.brightness___208037 = (r0);
-    r0 = (s.brightness___208037 !== undefined);
+    s.brightness___22981 = (r0);
+    r0 = (s.brightness___22981 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_setScreenBrightness__P186952_mk(s);
-    s.tmp_1.arg0 = globals.screen___187019;
-    s.tmp_1.arg1 = s.brightness___208037;
-    s.callLocIdx = 1487; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = helpers_setScreenBrightness__P1735_mk(s);
+    s.tmp_1.arg0 = globals.screen___1802;
+    s.tmp_1.arg1 = s.brightness___22981;
+    s.callLocIdx = 1494; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
   case 1:
@@ -60041,23 +60060,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_initScreen__P189831.info = {"start":13388,"length":175,"line":405,"column":4,"endLine":409,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"initScreen","argumentNames":[]}
+scene_systemMenu_initScreen__P4615.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__P189831_mk(s) {
+function scene_systemMenu_initScreen__P4615_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_initScreen__P189831, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_initScreen__P4615, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  brightness___208037: undefined,
+  brightness___22981: undefined,
 } }
 
 
 
 
 
-function scene_systemMenu_initVolume__P189830(s) {
+function scene_systemMenu_initVolume__P4614(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60067,20 +60086,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.vol___208047 = undefined;
-    s.tmp_0 = settings_readNumber__P187050_mk(s);
+    s.vol___22991 = undefined;
+    s.tmp_0 = settings_readNumber__P1833_mk(s);
     s.tmp_0.arg0 = "#volume";
-    s.callLocIdx = 1484; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1491; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.vol___208047 = (r0);
-    r0 = (s.vol___208047 !== undefined);
+    s.vol___22991 = (r0);
+    r0 = (s.vol___22991 !== undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = music_setVolume__P186809_mk(s);
-    s.tmp_1.arg0 = s.vol___208047;
-    s.callLocIdx = 1485; s.pc = 4; return s.tmp_1;
+    s.tmp_1 = music_setVolume__P1592_mk(s);
+    s.tmp_1.arg0 = s.vol___22991;
+    s.callLocIdx = 1492; s.pc = 4; return s.tmp_1;
   case 4:
     r0 = s.retval;
   case 1:
@@ -60089,23 +60108,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_systemMenu_initVolume__P189830.info = {"start":13238,"length":144,"line":399,"column":4,"endLine":403,"endColumn":5,"fileName":"pxt_modules/game/systemmenu.ts","functionName":"initVolume","argumentNames":[]}
+scene_systemMenu_initVolume__P4614.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__P189830_mk(s) {
+function scene_systemMenu_initVolume__P4614_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_systemMenu_initVolume__P189830, depth: s.depth + 1,
+        parent: s, fn: scene_systemMenu_initVolume__P4614, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  vol___208047: undefined,
+  vol___22991: undefined,
 } }
 
 
 
 
 
-function game_currentScene__P187749(s) {
+function game_currentScene__P2532(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60115,21 +60134,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = game_init__P189572_mk(s);
+    s.tmp_0 = game_init__P4356_mk(s);
     s.tmp_0.arg0 = undefined;
-    s.callLocIdx = 1143; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1150; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    r0 = globals._scene___189564;
+    r0 = globals._scene___4348;
     return leave(s, r0)
   default: oops()
 } } }
-game_currentScene__P187749.info = {"start":667,"length":90,"line":22,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"currentScene","argumentNames":[]}
+game_currentScene__P2532.info = {"start":667,"length":90,"line":22,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"currentScene","argumentNames":[]}
 
-function game_currentScene__P187749_mk(s) {
+function game_currentScene__P2532_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_currentScene__P187749, depth: s.depth + 1,
+        parent: s, fn: game_currentScene__P2532, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60138,7 +60157,7 @@ function game_currentScene__P187749_mk(s) {
 
 
 
-function game_addScenePopHandler__P187768(s) {
+function game_addScenePopHandler__P2551(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60152,35 +60171,35 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___189567);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePopHandlers___4351);
     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___189567 = (r0);
+    globals._scenePopHandlers___4351 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(globals._scenePopHandlers___189567, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals._scenePopHandlers___4351, 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___189567, s.arg0);
+    r0 = pxsim_Array__push(globals._scenePopHandlers___4351, s.arg0);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_addScenePopHandler__P187768.info = {"start":11754,"length":237,"line":368,"column":4,"endLine":372,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"addScenePopHandler","argumentNames":["handler"]}
+game_addScenePopHandler__P2551.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__P187768_mk(s) {
+function game_addScenePopHandler__P2551_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_addScenePopHandler__P187768, depth: s.depth + 1,
+        parent: s, fn: game_addScenePopHandler__P2551, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60191,7 +60210,7 @@ function game_addScenePopHandler__P187768_mk(s) {
 
 
 
-function game_addScenePushHandler__P187766(s) {
+function game_addScenePushHandler__P2549(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60205,35 +60224,35 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___189566);
+    r0 = pxsim_numops_toBoolDecr(globals._scenePushHandlers___4350);
     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___189566 = (r0);
+    globals._scenePushHandlers___4350 = (r0);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(globals._scenePushHandlers___189566, s.arg0, undefined);
+    r0 = pxsim_Array_.indexOf(globals._scenePushHandlers___4350, 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___189566, s.arg0);
+    r0 = pxsim_Array__push(globals._scenePushHandlers___4350, s.arg0);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_addScenePushHandler__P187766.info = {"start":10753,"length":242,"line":344,"column":4,"endLine":348,"endColumn":5,"fileName":"pxt_modules/game/game.ts","functionName":"addScenePushHandler","argumentNames":["handler"]}
+game_addScenePushHandler__P2549.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__P187766_mk(s) {
+function game_addScenePushHandler__P2549_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_addScenePushHandler__P187766, depth: s.depth + 1,
+        parent: s, fn: game_addScenePushHandler__P2549, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60244,7 +60263,7 @@ function game_addScenePushHandler__P187766_mk(s) {
 
 
 
-function Fx8__P185361(s) {
+function Fx8__P144(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60264,12 +60283,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx8__P185361.info = {"start":42,"length":68,"line":4,"column":0,"endLine":6,"endColumn":1,"fileName":"pxt_modules/base/fixed.ts","functionName":"Fx8","argumentNames":["v"]}
+Fx8__P144.info = {"start":42,"length":68,"line":4,"column":0,"endLine":6,"endColumn":1,"fileName":"pxt_modules/base/fixed.ts","functionName":"Fx8","argumentNames":["v"]}
 
-function Fx8__P185361_mk(s) {
+function Fx8__P144_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx8__P185361, depth: s.depth + 1,
+        parent: s, fn: Fx8__P144, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60279,7 +60298,7 @@ function Fx8__P185361_mk(s) {
 
 
 
-function SpriteKind_create__P187344(s) {
+function SpriteKind_create__P2127(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60289,26 +60308,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = (globals.nextKind___189417 === undefined);
+    r0 = (globals.nextKind___4201 === undefined);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    globals.nextKind___189417 = (1000);
+    globals.nextKind___4201 = (1000);
   case 1:
   case 2:
-    s.tmp_0 = r0 = globals.nextKind___189417;
+    s.tmp_0 = r0 = globals.nextKind___4201;
     r0 = (s.tmp_0 + 1);
-    globals.nextKind___189417 = (r0);
+    globals.nextKind___4201 = (r0);
     r0 = s.tmp_0;
     return leave(s, r0)
   default: oops()
 } } }
-SpriteKind_create__P187344.info = {"start":750,"length":112,"line":25,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/game/spritekind.ts","functionName":"create","argumentNames":[]}
+SpriteKind_create__P2127.info = {"start":750,"length":112,"line":25,"column":4,"endLine":28,"endColumn":5,"fileName":"pxt_modules/game/spritekind.ts","functionName":"create","argumentNames":[]}
 
-function SpriteKind_create__P187344_mk(s) {
+function SpriteKind_create__P2127_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: SpriteKind_create__P187344, depth: s.depth + 1,
+        parent: s, fn: SpriteKind_create__P2127, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60317,7 +60336,7 @@ function SpriteKind_create__P187344_mk(s) {
 
 
 
-function controller_Button_constructor__P187126(s) {
+function controller_Button_constructor__P1909(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60334,7 +60353,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
     r0 = (s.arg0).fields["id"] = (s.arg1);
     r0 = (s.arg0).fields["_pressed"] = (false);
     r0 = (s.arg0).fields["repeatDelay"] = (undefined);
@@ -60344,13 +60363,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__P208123);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P23067);
     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__P208130);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P23074);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
     r0 = s.arg0.fields["id"];
@@ -60369,12 +60388,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_constructor__P187126.info = {"start":1589,"length":863,"line":67,"column":8,"endLine":83,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","id","configKey"]}
+controller_Button_constructor__P1909.info = {"start":1589,"length":863,"line":67,"column":8,"endLine":83,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":["this","id","configKey"]}
 
-function controller_Button_constructor__P187126_mk(s) {
+function controller_Button_constructor__P1909_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_constructor__P187126, depth: s.depth + 1,
+        parent: s, fn: controller_Button_constructor__P1909, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60388,7 +60407,7 @@ function controller_Button_constructor__P187126_mk(s) {
 
 
 
-function inline__P208123(s) {
+function inline__P23067(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60398,7 +60417,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller_Button_setPressed__P187131_mk(s);
+    s.tmp_0 = controller_Button_setPressed__P1914_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = false;
     s.callLocIdx = 181; s.pc = 1; return s.tmp_0;
@@ -60408,12 +60427,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P208123.info = {"start":2211,"length":28,"line":77,"column":66,"endLine":77,"endColumn":94,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
+inline__P23067.info = {"start":2211,"length":28,"line":77,"column":66,"endLine":77,"endColumn":94,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P208123_mk(s) {
+function inline__P23067_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P208123, depth: s.depth + 1,
+        parent: s, fn: inline__P23067, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60422,7 +60441,7 @@ function inline__P208123_mk(s) {
 
 
 
-function inline__P208130(s) {
+function inline__P23074(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60432,7 +60451,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_0 = controller_Button_setPressed__P187131_mk(s);
+    s.tmp_0 = controller_Button_setPressed__P1914_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = true;
     s.callLocIdx = 182; s.pc = 1; return s.tmp_0;
@@ -60442,12 +60461,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P208130.info = {"start":2313,"length":27,"line":78,"column":68,"endLine":78,"endColumn":95,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
+inline__P23074.info = {"start":2313,"length":27,"line":78,"column":68,"endLine":78,"endColumn":95,"fileName":"pxt_modules/game/controller.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P208130_mk(s) {
+function inline__P23074_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P208130, depth: s.depth + 1,
+        parent: s, fn: inline__P23074, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -60456,7 +60475,7 @@ function inline__P208130_mk(s) {
 
 
 
-function controller_setupButton__P189399(s) {
+function controller_setupButton__P4183(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60475,12 +60494,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_setupButton__P189399.info = {"start":983,"length":93,"line":47,"column":4,"endLine":49,"endColumn":6,"fileName":"pxt_modules/game/controller.ts","functionName":"setupButton","argumentNames":["buttonId","key"]}
+controller_setupButton__P4183.info = {"start":983,"length":93,"line":47,"column":4,"endLine":49,"endColumn":6,"fileName":"pxt_modules/game/controller.ts","functionName":"setupButton","argumentNames":["buttonId","key"]}
 
-function controller_setupButton__P189399_mk(s) {
+function controller_setupButton__P4183_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_setupButton__P189399, depth: s.depth + 1,
+        parent: s, fn: controller_setupButton__P4183, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -60490,7 +60509,7 @@ function controller_setupButton__P189399_mk(s) {
 
 
 
-function controller_Button_setPressed__P187131(s) {
+function controller_Button_setPressed__P1914(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60506,14 +60525,14 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C1903_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__P186922_mk(s);
+    s.tmp_2 = power_poke__P1705_mk(s);
     s.callLocIdx = 185; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
@@ -60521,7 +60540,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = controller_Controller_connected__P187160_mk(s);
+    s.tmp_1 = controller_Controller_connected__P1943_mk(s);
     r0 = s.arg0.fields["_owner"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = true;
@@ -60536,7 +60555,7 @@ 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__P189401_mk(s);
+    s.tmp_0 = controller_Button_raiseButtonDown__P4185_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 187; s.pc = 9; return s.tmp_0;
   case 9:
@@ -60544,7 +60563,7 @@ switch (step) {
     { step = 4; continue; }
   case 3:
     r0 = (s.arg0).fields["_repeatCount"] = (0);
-    s.tmp_0 = controller_Button_raiseButtonUp__P189400_mk(s);
+    s.tmp_0 = controller_Button_raiseButtonUp__P4184_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 188; s.pc = 10; return s.tmp_0;
   case 10:
@@ -60556,12 +60575,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_setPressed__P187131.info = {"start":4600,"length":507,"line":148,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"setPressed","argumentNames":["this","pressed"]}
+controller_Button_setPressed__P1914.info = {"start":4600,"length":507,"line":148,"column":8,"endLine":162,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"setPressed","argumentNames":["this","pressed"]}
 
-function controller_Button_setPressed__P187131_mk(s) {
+function controller_Button_setPressed__P1914_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_setPressed__P187131, depth: s.depth + 1,
+        parent: s, fn: controller_Button_setPressed__P1914, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60574,7 +60593,7 @@ function controller_Button_setPressed__P187131_mk(s) {
 
 
 
-function controller_Button_raiseButtonDown__P189401(s) {
+function controller_Button_raiseButtonDown__P4185(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60589,8 +60608,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___189393);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___4177);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -60605,12 +60624,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonDown__P189401.info = {"start":2672,"length":205,"line":92,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonDown","argumentNames":["this"]}
+controller_Button_raiseButtonDown__P4185.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__P189401_mk(s) {
+function controller_Button_raiseButtonDown__P4185_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonDown__P189401, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonDown__P4185, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60620,7 +60639,7 @@ function controller_Button_raiseButtonDown__P189401_mk(s) {
 
 
 
-function controller_Button_raiseButtonUp__P189400(s) {
+function controller_Button_raiseButtonUp__P4184(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60635,8 +60654,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
-    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___189393);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
+    r0 = pxsim_numops_toBoolDecr(globals._userEventsEnabled___4177);
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["id"];
     s.tmp_0 = r0;
@@ -60651,12 +60670,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_raiseButtonUp__P189400.info = {"start":2462,"length":200,"line":85,"column":8,"endLine":90,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"raiseButtonUp","argumentNames":["this"]}
+controller_Button_raiseButtonUp__P4184.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__P189400_mk(s) {
+function controller_Button_raiseButtonUp__P4184_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_raiseButtonUp__P189400, depth: s.depth + 1,
+        parent: s, fn: controller_Button_raiseButtonUp__P4184, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -60666,7 +60685,7 @@ function controller_Button_raiseButtonUp__P189400_mk(s) {
 
 
 
-function controller_Controller_connected__P187160(s) {
+function controller_Controller_connected__P1943(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60682,7 +60701,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["_connected"];
     s.tmp_1 = r0;
     r0 = (s.arg1 != s.tmp_1);
@@ -60710,12 +60729,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Controller_connected__P187160.info = {"start":12550,"length":261,"line":405,"column":8,"endLine":410,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"connected","argumentNames":["this","value"]}
+controller_Controller_connected__P1943.info = {"start":12550,"length":261,"line":405,"column":8,"endLine":410,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"connected","argumentNames":["this","value"]}
 
-function controller_Controller_connected__P187160_mk(s) {
+function controller_Controller_connected__P1943_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_connected__P187160, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_connected__P1943, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -60728,7 +60747,7 @@ function controller_Controller_connected__P187160_mk(s) {
 
 
 
-function controller_Controller_id__P187147(s) {
+function controller_Controller_id__P1930(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60743,18 +60762,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["_id"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_id__P187147.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__P187147.isGetter = true;
+controller_Controller_id__P1930.info = {"start":8841,"length":49,"line":276,"column":8,"endLine":278,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"id","argumentNames":["this"]}
+controller_Controller_id__P1930.isGetter = true;
 
-function controller_Controller_id__P187147_mk(s) {
+function controller_Controller_id__P1930_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_id__P187147, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_id__P1930, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -60763,7 +60782,7 @@ function controller_Controller_id__P187147_mk(s) {
 
 
 
-function controller_Controller_connected__P187159(s) {
+function controller_Controller_connected__P1942(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60778,18 +60797,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Controller__C187140_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Controller__C1923_VT)) failedCast(r0);
     r0 = s.arg0.fields["_connected"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-controller_Controller_connected__P187159.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__P187159.isGetter = true;
+controller_Controller_connected__P1942.info = {"start":12477,"length":63,"line":401,"column":8,"endLine":403,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"connected","argumentNames":["this"]}
+controller_Controller_connected__P1942.isGetter = true;
 
-function controller_Controller_connected__P187159_mk(s) {
+function controller_Controller_connected__P1942_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Controller_connected__P187159, depth: s.depth + 1,
+        parent: s, fn: controller_Controller_connected__P1942, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -60798,7 +60817,7 @@ function controller_Controller_connected__P187159_mk(s) {
 
 
 
-function settings_initScopes__P189366(s) {
+function settings_initScopes__P4150(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60808,17 +60827,17 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.rn___208208 = undefined;
-    s.tmp_1 = settings_runNumber__P187042_mk(s);
+    s.rn___23152 = undefined;
+    s.tmp_1 = settings_runNumber__P1825_mk(s);
     s.callLocIdx = 159; s.pc = 1; return s.tmp_1;
   case 1:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 1);
-    s.rn___208208 = (r0);
-    s.tmp_0 = settings_writeNumber__P187046_mk(s);
-    s.tmp_0.arg0 = globals.RUN_KEY___189354;
-    s.tmp_0.arg1 = s.rn___208208;
+    s.rn___23152 = (r0);
+    s.tmp_0 = settings_writeNumber__P1829_mk(s);
+    s.tmp_0.arg0 = globals.RUN_KEY___4138;
+    s.tmp_0.arg1 = s.rn___23152;
     s.callLocIdx = 160; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
@@ -60827,8 +60846,8 @@ switch (step) {
     r0 = (s.tmp_1 & 2147483647);
     s.tmp_0 = r0;
     r0 = pxsim_pxtcore.seedAddRandom(s.tmp_0);
-    r0 = pxsim_pxtcore.seedAddRandom(s.rn___208208);
-    s.tmp_0 = settings_setScope__P189365_mk(s);
+    r0 = pxsim_pxtcore.seedAddRandom(s.rn___23152);
+    s.tmp_0 = settings_setScope__P4149_mk(s);
     r0 = pxsim_pxtcore.programName();
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 161; s.pc = 3; return s.tmp_0;
@@ -60838,23 +60857,23 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_initScopes__P189366.info = {"start":1104,"length":230,"line":41,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"initScopes","argumentNames":[]}
+settings_initScopes__P4150.info = {"start":1104,"length":230,"line":41,"column":4,"endLine":49,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"initScopes","argumentNames":[]}
 
-function settings_initScopes__P189366_mk(s) {
+function settings_initScopes__P4150_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_initScopes__P189366, depth: s.depth + 1,
+        parent: s, fn: settings_initScopes__P4150, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  rn___208208: undefined,
+  rn___23152: undefined,
 } }
 
 
 
 
 
-function settings_setScope__P189365(s) {
+function settings_setScope__P4149(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60864,7 +60883,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.currScope___208237 = undefined;
+    s.currScope___23181 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
@@ -60889,19 +60908,19 @@ switch (step) {
     r0 = pxsim_pxtrt.panic(922);
   case 3:
   case 4:
-    s.tmp_0 = settings_readString__P187049_mk(s);
-    s.tmp_0.arg0 = globals.SCOPE_KEY___189355;
+    s.tmp_0 = settings_readString__P1832_mk(s);
+    s.tmp_0.arg0 = globals.SCOPE_KEY___4139;
     s.callLocIdx = 157; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.currScope___208237 = (r0);
-    r0 = (s.currScope___208237 != s.arg0);
+    s.currScope___23181 = (r0);
+    r0 = (s.currScope___23181 != 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__P187045_mk(s);
-    s.tmp_0.arg0 = globals.SCOPE_KEY___189355;
+    s.tmp_0 = settings_writeString__P1828_mk(s);
+    s.tmp_0.arg0 = globals.SCOPE_KEY___4139;
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 158; s.pc = 8; return s.tmp_0;
   case 8:
@@ -60912,18 +60931,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_setScope__P189365.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__P4149.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__P189365_mk(s) {
+function settings_setScope__P4149_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_setScope__P189365, depth: s.depth + 1,
+        parent: s, fn: settings_setScope__P4149, 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___208237: undefined,
+  currScope___23181: undefined,
   arg0: undefined,
 } }
 
@@ -60931,7 +60950,7 @@ function settings_setScope__P189365_mk(s) {
 
 
 
-function settings_readString__P187049(s) {
+function settings_readString__P1832(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60941,14 +60960,14 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.buf___208258 = undefined;
+    s.buf___23202 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = pxsim.settings._get(s.arg0);
-    s.buf___208258 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.buf___208258);
+    s.buf___23202 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.buf___23202);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -60958,7 +60977,7 @@ switch (step) {
     { step = 3; continue; }
     { step = 2; continue; }
   case 1:
-    r0 = pxsim.BufferMethods.toString(s.buf___208258);
+    r0 = pxsim.BufferMethods.toString(s.buf___23202);
     { step = 3; continue; }
   case 2:
     r0 = undefined;
@@ -60966,16 +60985,16 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_readString__P187049.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__P1832.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__P187049_mk(s) {
+function settings_readString__P1832_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_readString__P187049, depth: s.depth + 1,
+        parent: s, fn: settings_readString__P1832, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  buf___208258: undefined,
+  buf___23202: undefined,
   arg0: undefined,
 } }
 
@@ -60983,7 +61002,7 @@ function settings_readString__P187049_mk(s) {
 
 
 
-function settings_writeString__P187045(s) {
+function settings_writeString__P1828(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -60998,7 +61017,7 @@ switch (step) {
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = settings_writeBuffer__P187044_mk(s);
+    s.tmp_0 = settings_writeBuffer__P1827_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = pxsim.control.createBufferFromUTF8(s.arg1);
     s.tmp_0.arg1 = r0;
@@ -61009,12 +61028,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_writeString__P187045.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__P1828.info = {"start":1895,"length":125,"line":75,"column":4,"endLine":77,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"writeString","argumentNames":["key","value"]}
 
-function settings_writeString__P187045_mk(s) {
+function settings_writeString__P1828_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_writeString__P187045, depth: s.depth + 1,
+        parent: s, fn: settings_writeString__P1828, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61025,7 +61044,7 @@ function settings_writeString__P187045_mk(s) {
 
 
 
-function settings_runNumber__P187042(s) {
+function settings_runNumber__P1825(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61035,8 +61054,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tmp_1 = settings_readNumber__P187050_mk(s);
-    s.tmp_1.arg0 = globals.RUN_KEY___189354;
+    s.tmp_1 = settings_readNumber__P1833_mk(s);
+    s.tmp_1.arg0 = globals.RUN_KEY___4138;
     s.callLocIdx = 156; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
@@ -61054,12 +61073,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-settings_runNumber__P187042.info = {"start":745,"length":75,"line":27,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"runNumber","argumentNames":[]}
+settings_runNumber__P1825.info = {"start":745,"length":75,"line":27,"column":4,"endLine":29,"endColumn":5,"fileName":"pxt_modules/settings/settings.ts","functionName":"runNumber","argumentNames":[]}
 
-function settings_runNumber__P187042_mk(s) {
+function settings_runNumber__P1825_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: settings_runNumber__P187042, depth: s.depth + 1,
+        parent: s, fn: settings_runNumber__P1825, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61070,7 +61089,7 @@ function settings_runNumber__P187042_mk(s) {
 
 
 
-function control___screen_setupUpdate__P186981(s) {
+function control___screen_setupUpdate__P1764(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61084,8 +61103,8 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    globals.__updated___189323 = (true);
-    globals.__update___189321 = (s.arg0);
+    globals.__updated___4107 = (true);
+    globals.__update___4105 = (s.arg0);
     s.tmp_0 = lambda_1_mk(s);
     s.tmp_0.argL = s.arg0;
     setupLambda(s.tmp_0, s.tmp_0.argL);
@@ -61096,12 +61115,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-control___screen_setupUpdate__P186981.info = {"start":198,"length":125,"line":10,"column":4,"endLine":14,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"setupUpdate","argumentNames":["update"]}
+control___screen_setupUpdate__P1764.info = {"start":198,"length":125,"line":10,"column":4,"endLine":14,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"setupUpdate","argumentNames":["update"]}
 
-function control___screen_setupUpdate__P186981_mk(s) {
+function control___screen_setupUpdate__P1764_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control___screen_setupUpdate__P186981, depth: s.depth + 1,
+        parent: s, fn: control___screen_setupUpdate__P1764, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61111,7 +61130,7 @@ function control___screen_setupUpdate__P186981_mk(s) {
 
 
 
-function control___screen_update__P186980(s) {
+function control___screen_update__P1763(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61121,27 +61140,27 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    r0 = pxsim_numops_toBoolDecr(globals.__update___189321);
+    r0 = pxsim_numops_toBoolDecr(globals.__update___4105);
     if (!r0) { step = 1; continue; }
     s.tmp_0 = lambda_1_mk(s);
-    s.tmp_0.argL = globals.__update___189321;
+    s.tmp_0.argL = globals.__update___4105;
     setupLambda(s.tmp_0, s.tmp_0.argL);
     s.callLocIdx = 151; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
   case 1:
   case 2:
-    globals.__updated___189323 = (true);
+    globals.__updated___4107 = (true);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-control___screen_update__P186980.info = {"start":90,"length":102,"line":4,"column":4,"endLine":8,"endColumn":5,"fileName":"pxt_modules/screen/frame.ts","functionName":"update","argumentNames":[]}
+control___screen_update__P1763.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__P186980_mk(s) {
+function control___screen_update__P1763_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: control___screen_update__P186980, depth: s.depth + 1,
+        parent: s, fn: control___screen_update__P1763, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
 } }
@@ -61150,7 +61169,7 @@ function control___screen_update__P186980_mk(s) {
 
 
 
-function pause__P185619(s) {
+function pause__P402(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61174,12 +61193,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-pause__P185619.info = {"start":246,"length":57,"line":7,"column":0,"endLine":9,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
+pause__P402.info = {"start":246,"length":57,"line":7,"column":0,"endLine":9,"endColumn":1,"fileName":"pxt_modules/base/pause.ts","functionName":"pause","argumentNames":["ms"]}
 
-function pause__P185619_mk(s) {
+function pause__P402_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: pause__P185619, depth: s.depth + 1,
+        parent: s, fn: pause__P402, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -61188,7 +61207,7 @@ function pause__P185619_mk(s) {
 
 
 
-function sprites_SpriteSet_toString__P187339(s) {
+function sprites_SpriteSet_toString__P2122(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61203,7 +61222,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C187328_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C2111_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_1 = r0;
     r0 = s.arg0.fields["_sprites"];
@@ -61225,12 +61244,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteSet_toString__P187339.info = {"start":2577,"length":66,"line":97,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"toString","argumentNames":["this"]}
+sprites_SpriteSet_toString__P2122.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__P187339_mk(s) {
+function sprites_SpriteSet_toString__P2122_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_toString__P187339, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_toString__P2122, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61244,7 +61263,7 @@ function sprites_SpriteSet_toString__P187339_mk(s) {
 
 
 
-function sprites_SpriteSet_length__P187331(s) {
+function sprites_SpriteSet_length__P2114(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61259,20 +61278,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteSet__C187328_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteSet__C2111_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__P187331.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__P187331.isGetter = true;
+sprites_SpriteSet_length__P2114.info = {"start":628,"length":65,"line":26,"column":8,"endLine":28,"endColumn":9,"fileName":"pxt_modules/game/spriteset.ts","functionName":"length","argumentNames":["this"]}
+sprites_SpriteSet_length__P2114.isGetter = true;
 
-function sprites_SpriteSet_length__P187331_mk(s) {
+function sprites_SpriteSet_length__P2114_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteSet_length__P187331, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteSet_length__P2114, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -61282,7 +61301,7 @@ function sprites_SpriteSet_length__P187331_mk(s) {
 
 
 
-function game_Dialog_drawTextCore__P187721(s) {
+function game_Dialog_drawTextCore__P2504(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61292,20 +61311,20 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.lines___208304 = undefined;
-    s.availableWidth___208310 = undefined;
-    s.availableHeight___208313 = undefined;
-    s.charactersPerRow___208316 = undefined;
-    s.rowsOfCharacters___208324 = undefined;
-    s.textLeft___208330 = undefined;
-    s.textTop___208349 = undefined;
-    s.row___208366 = undefined;
+    s.lines___23251 = undefined;
+    s.availableWidth___23257 = undefined;
+    s.availableHeight___23260 = undefined;
+    s.charactersPerRow___23263 = undefined;
+    s.rowsOfCharacters___23271 = undefined;
+    s.textLeft___23277 = undefined;
+    s.textTop___23296 = undefined;
+    s.row___23313 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_Dialog__C187711_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_Dialog__C2494_VT)) failedCast(r0);
     r0 = s.arg0.fields["chunks"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -61335,20 +61354,20 @@ switch (step) {
     r0 = s.arg0.fields["chunkIndex"];
     s.tmp_7 = r0;
     r0 = pxsim_Array__getAt(s.tmp_6, s.tmp_7);
-    s.lines___208304 = (r0);
-    s.tmp_0 = game_BaseDialog_textAreaWidth__P189543_mk(s);
+    s.lines___23251 = (r0);
+    s.tmp_0 = game_BaseDialog_textAreaWidth__P4327_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1101; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1108; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
-    s.availableWidth___208310 = (r0);
-    s.tmp_0 = game_BaseDialog_textAreaHeight__P189544_mk(s);
+    s.availableWidth___23257 = (r0);
+    s.tmp_0 = game_BaseDialog_textAreaHeight__P4328_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1102; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1109; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.availableHeight___208313 = (r0);
-    s.tmp_1 = r0 = s.availableWidth___208310;
+    s.availableHeight___23260 = (r0);
+    s.tmp_1 = r0 = s.availableWidth___23257;
     s.tmp_3 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_3.arg0 = r0;
@@ -61358,7 +61377,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1103; s.pc = 10; return s.tmp_3; }
+     else { s.callLocIdx = 1110; s.pc = 10; return s.tmp_3; }
     }
   case 10:
     r0 = s.retval;
@@ -61366,18 +61385,18 @@ switch (step) {
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.charactersPerRow___208316 = (r0);
-    s.tmp_1 = r0 = s.availableHeight___208313;
-    s.tmp_3 = game_BaseDialog_rowHeight__P189542_mk(s);
+    s.charactersPerRow___23263 = (r0);
+    s.tmp_1 = r0 = s.availableHeight___23260;
+    s.tmp_3 = game_BaseDialog_rowHeight__P4326_mk(s);
     s.tmp_3.arg0 = s.arg0;
-    s.callLocIdx = 1104; s.pc = 11; return s.tmp_3;
+    s.callLocIdx = 1111; s.pc = 11; return s.tmp_3;
   case 11:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = (s.tmp_1 / s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.floor(s.tmp_0);
-    s.rowsOfCharacters___208324 = (r0);
+    s.rowsOfCharacters___23271 = (r0);
     r0 = s.arg0.fields["innerLeft"];
     s.tmp_2 = r0;
     r0 = (1 + s.tmp_2);
@@ -61386,8 +61405,8 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_1 + s.tmp_3);
     s.tmp_0 = r0;
-    s.tmp_6 = r0 = s.availableWidth___208310;
-    s.tmp_8 = r0 = s.charactersPerRow___208316;
+    s.tmp_6 = r0 = s.availableWidth___23257;
+    s.tmp_8 = r0 = s.charactersPerRow___23263;
     s.tmp_10 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_10.arg0 = r0;
@@ -61397,7 +61416,7 @@ switch (step) {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["charWidth"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["charWidth"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 1105; s.pc = 12; return s.tmp_10; }
+     else { s.callLocIdx = 1112; s.pc = 12; return s.tmp_10; }
     }
   case 12:
     r0 = s.retval;
@@ -61409,7 +61428,7 @@ switch (step) {
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
     r0 = (s.tmp_0 + s.tmp_4);
-    s.textLeft___208330 = (r0);
+    s.textLeft___23277 = (r0);
     r0 = s.arg0.fields["innerTop"];
     s.tmp_2 = r0;
     r0 = (1 + s.tmp_2);
@@ -61418,11 +61437,11 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_1 + s.tmp_3);
     s.tmp_0 = r0;
-    s.tmp_6 = r0 = s.availableHeight___208313;
-    s.tmp_8 = r0 = s.rowsOfCharacters___208324;
-    s.tmp_10 = game_BaseDialog_rowHeight__P189542_mk(s);
+    s.tmp_6 = r0 = s.availableHeight___23260;
+    s.tmp_8 = r0 = s.rowsOfCharacters___23271;
+    s.tmp_10 = game_BaseDialog_rowHeight__P4326_mk(s);
     s.tmp_10.arg0 = s.arg0;
-    s.callLocIdx = 1106; s.pc = 13; return s.tmp_10;
+    s.callLocIdx = 1113; s.pc = 13; return s.tmp_10;
   case 13:
     r0 = s.retval;
     s.tmp_9 = r0;
@@ -61433,27 +61452,27 @@ switch (step) {
     r0 = (s.tmp_5 >> 1);
     s.tmp_4 = r0;
     r0 = (s.tmp_0 + s.tmp_4);
-    s.textTop___208349 = (r0);
-    s.row___208366 = (0);
+    s.textTop___23296 = (r0);
+    s.row___23313 = (0);
   case 5:
-    s.tmp_1 = r0 = s.row___208366;
-    r0 = pxsim_Array__length(s.lines___208304);
+    s.tmp_1 = r0 = s.row___23313;
+    r0 = pxsim_Array__length(s.lines___23251);
     s.tmp_2 = r0;
     r0 = (s.tmp_1 < s.tmp_2);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
-    s.tmp_3 = helpers_imagePrint__P186977_mk(s);
+    s.tmp_3 = helpers_imagePrint__P1760_mk(s);
     r0 = s.arg0.fields["image"];
     s.tmp_3.arg0 = r0;
-    r0 = pxsim_Array__getAt(s.lines___208304, s.row___208366);
+    r0 = pxsim_Array__getAt(s.lines___23251, s.row___23313);
     s.tmp_3.arg1 = r0;
-    s.tmp_3.arg2 = s.textLeft___208330;
-    s.tmp_4 = r0 = s.textTop___208349;
-    s.tmp_6 = r0 = s.row___208366;
-    s.tmp_8 = game_BaseDialog_rowHeight__P189542_mk(s);
+    s.tmp_3.arg2 = s.textLeft___23277;
+    s.tmp_4 = r0 = s.textTop___23296;
+    s.tmp_6 = r0 = s.row___23313;
+    s.tmp_8 = game_BaseDialog_rowHeight__P4326_mk(s);
     s.tmp_8.arg0 = s.arg0;
-    s.callLocIdx = 1107; s.pc = 15; return s.tmp_8;
+    s.callLocIdx = 1114; s.pc = 15; return s.tmp_8;
   case 15:
     r0 = s.retval;
     s.tmp_7 = r0;
@@ -61466,11 +61485,11 @@ switch (step) {
     r0 = s.arg0.fields["font"];
     s.tmp_3.arg5 = r0;
     s.tmp_3.arg6 = undefined;
-    s.callLocIdx = 1108; s.pc = 14; return s.tmp_3;
+    s.callLocIdx = 1115; s.pc = 14; return s.tmp_3;
   case 14:
     r0 = s.retval;
-    r0 = (s.row___208366 + 1);
-    s.row___208366 = (r0);
+    r0 = (s.row___23313 + 1);
+    s.row___23313 = (r0);
     { step = 5; continue; }
   case 6:
   case 7:
@@ -61478,12 +61497,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-game_Dialog_drawTextCore__P187721.info = {"start":7183,"length":978,"line":233,"column":8,"endLine":253,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
+game_Dialog_drawTextCore__P2504.info = {"start":7183,"length":978,"line":233,"column":8,"endLine":253,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"drawTextCore","argumentNames":["this"]}
 
-function game_Dialog_drawTextCore__P187721_mk(s) {
+function game_Dialog_drawTextCore__P2504_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_Dialog_drawTextCore__P187721, depth: s.depth + 1,
+        parent: s, fn: game_Dialog_drawTextCore__P2504, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61496,14 +61515,14 @@ function game_Dialog_drawTextCore__P187721_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  lines___208304: undefined,
-  availableWidth___208310: undefined,
-  availableHeight___208313: undefined,
-  charactersPerRow___208316: undefined,
-  rowsOfCharacters___208324: undefined,
-  textLeft___208330: undefined,
-  textTop___208349: undefined,
-  row___208366: undefined,
+  lines___23251: undefined,
+  availableWidth___23257: undefined,
+  availableHeight___23260: undefined,
+  charactersPerRow___23263: undefined,
+  rowsOfCharacters___23271: undefined,
+  textLeft___23277: undefined,
+  textTop___23296: undefined,
+  row___23313: undefined,
   arg0: undefined,
 } }
 
@@ -61511,7 +61530,7 @@ function game_Dialog_drawTextCore__P187721_mk(s) {
 
 
 
-function game_BaseDialog_setText__P187708(s) {
+function game_BaseDialog_setText__P2491(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61527,17 +61546,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, game_BaseDialog__C187694_VT)) failedCast(r0);
+    if (!checkSubtype(r0, game_BaseDialog__C2477_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-game_BaseDialog_setText__P187708.info = {"start":1670,"length":77,"line":66,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
+game_BaseDialog_setText__P2491.info = {"start":1670,"length":77,"line":66,"column":8,"endLine":68,"endColumn":9,"fileName":"pxt_modules/game/textDialogs.ts","functionName":"setText","argumentNames":["this","rawString"]}
 
-function game_BaseDialog_setText__P187708_mk(s) {
+function game_BaseDialog_setText__P2491_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: game_BaseDialog_setText__P187708, depth: s.depth + 1,
+        parent: s, fn: game_BaseDialog_setText__P2491, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -61547,7 +61566,7 @@ function game_BaseDialog_setText__P187708_mk(s) {
 
 
 
-function music_Melody_toString__P186824(s) {
+function music_Melody_toString__P1607(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61562,17 +61581,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, music_Melody__C186815_VT)) failedCast(r0);
+    if (!checkSubtype(r0, music_Melody__C1598_VT)) failedCast(r0);
     r0 = s.arg0.fields["_text"];
     return leave(s, r0)
   default: oops()
 } } }
-music_Melody_toString__P186824.info = {"start":9640,"length":53,"line":303,"column":8,"endLine":305,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"toString","argumentNames":["this"]}
+music_Melody_toString__P1607.info = {"start":9640,"length":53,"line":303,"column":8,"endLine":305,"endColumn":9,"fileName":"pxt_modules/mixer/melody.ts","functionName":"toString","argumentNames":["this"]}
 
-function music_Melody_toString__P186824_mk(s) {
+function music_Melody_toString__P1607_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: music_Melody_toString__P186824, depth: s.depth + 1,
+        parent: s, fn: music_Melody_toString__P1607, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -61581,7 +61600,7 @@ function music_Melody_toString__P186824_mk(s) {
 
 
 
-function sprites_SpriteMap_toString__P187319(s) {
+function sprites_SpriteMap_toString__P2102(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61596,7 +61615,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C187311_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
     r0 = s.arg0.fields["buckets"];
@@ -61616,10 +61635,10 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, " buckets, ");
     s.tmp_1 = r0;
-    s.tmp_10 = helpers_arrayFilter__P185325_mk(s);
+    s.tmp_10 = helpers_arrayFilter__P108_mk(s);
     r0 = s.arg0.fields["buckets"];
     s.tmp_10.arg0 = r0;
-    s.tmp_10.arg1 = inline__P208406;
+    s.tmp_10.arg1 = inline__P23353;
     s.callLocIdx = 518; s.pc = 2; return s.tmp_10;
   case 2:
     r0 = s.retval;
@@ -61641,12 +61660,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_toString__P187319.info = {"start":4109,"length":123,"line":112,"column":8,"endLine":114,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"toString","argumentNames":["this"]}
+sprites_SpriteMap_toString__P2102.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__P187319_mk(s) {
+function sprites_SpriteMap_toString__P2102_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_toString__P187319, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_toString__P2102, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61666,7 +61685,7 @@ function sprites_SpriteMap_toString__P187319_mk(s) {
 
 
 
-function inline__P208406(s) {
+function inline__P23353(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61690,12 +61709,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P208406.info = {"start":4196,"length":8,"line":113,"column":74,"endLine":113,"endColumn":82,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["b"]}
+inline__P23353.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__P208406_mk(s) {
+function inline__P23353_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P208406, depth: s.depth + 1,
+        parent: s, fn: inline__P23353, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61707,7 +61726,7 @@ function inline__P208406_mk(s) {
 
 
 
-function ArcadePhysicsEngine_moveSprite__P187404(s) {
+function ArcadePhysicsEngine_moveSprite__P2187(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61717,9 +61736,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___208444 = undefined;
-    s.maxDist___208454 = undefined;
-    s.ms___208474 = undefined;
+    s.tm___23391 = undefined;
+    s.maxDist___23401 = undefined;
+    s.ms___23421 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -61728,7 +61747,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = s.arg1.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.arg1).fields["_lastX"] = (s.tmp_0);
@@ -61757,19 +61776,19 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    s.tmp_4 = game_currentScene__P187749_mk(s);
+    s.tmp_4 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 736; s.pc = 16; return s.tmp_4;
   case 16:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___208444 = (r0);
-    s.tmp_0 = r0 = s.tm___208444;
+    s.tm___23391 = (r0);
+    s.tmp_0 = r0 = s.tm___23391;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 1; continue; }
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.tm___208444.fields["_map"];
+    r0 = s.tm___23391.fields["_map"];
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -61795,8 +61814,8 @@ switch (step) {
     r0 = (s.tmp_8 + 128);
     s.tmp_9 = r0;
     r0 = (s.tmp_9 >> 8);
-    s.maxDist___208454 = (r0);
-    s.tmp_2 = Math_abs__P185340_mk(s);
+    s.maxDist___23401 = (r0);
+    s.tmp_2 = Math_abs__P123_mk(s);
     r0 = (s.arg2 + 128);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 8);
@@ -61805,14 +61824,14 @@ switch (step) {
   case 17:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 <= s.maxDist___208454);
+    r0 = (s.tmp_1 <= s.maxDist___23401);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 5; continue; }
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_5 = Math_abs__P185340_mk(s);
+    s.tmp_5 = Math_abs__P123_mk(s);
     r0 = (s.arg3 + 128);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 >> 8);
@@ -61821,15 +61840,15 @@ switch (step) {
   case 18:
     r0 = s.retval;
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 <= s.maxDist___208454);
+    r0 = (s.tmp_4 <= s.maxDist___23401);
   case 6:
     // jmp value (already in r0)
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C187388_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C2171_VT);
     s.tmp_8 = r0;
-    s.tmp_9 = MovingSprite_constructor__P187389_mk(s);
+    s.tmp_9 = MovingSprite_constructor__P2172_mk(s);
     s.tmp_9.arg0 = s.tmp_8;
     s.tmp_9.arg1 = s.arg1;
     r0 = s.arg1.fields["_vx"];
@@ -61843,18 +61862,18 @@ switch (step) {
     s.callLocIdx = 743; s.pc = 19; return s.tmp_9;
   case 19:
     r0 = s.retval;
-    s.ms___208474 = (s.tmp_8);
-    s.tmp_0 = ArcadePhysicsEngine_tilemapCollisions__P189439_mk(s);
+    s.ms___23421 = (s.tmp_8);
+    s.tmp_0 = ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.ms___208474;
-    s.tmp_0.arg2 = s.tm___208444;
+    s.tmp_0.arg1 = s.ms___23421;
+    s.tmp_0.arg2 = s.tm___23391;
     s.callLocIdx = 744; s.pc = 20; return s.tmp_0;
   case 20:
     r0 = s.retval;
     { step = 12; continue; }
   case 7:
-    s.tmp_1 = tiles_TileMap_isOnWall__P187555_mk(s);
-    s.tmp_1.arg0 = s.tm___208444;
+    s.tmp_1 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_1.arg0 = s.tm___23391;
     s.tmp_1.arg1 = s.arg1;
     s.callLocIdx = 745; s.pc = 21; return s.tmp_1;
   case 21:
@@ -61865,10 +61884,10 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 9; continue; }
   case 8:
-    s.tmp_4 = ArcadePhysicsEngine_canResolveClipping__P189441_mk(s);
+    s.tmp_4 = ArcadePhysicsEngine_canResolveClipping__P4225_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = s.arg1;
-    s.tmp_4.arg2 = s.tm___208444;
+    s.tmp_4.arg2 = s.tm___23391;
     s.callLocIdx = 746; s.pc = 22; return s.tmp_4;
   case 22:
     r0 = s.retval;
@@ -61904,12 +61923,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_moveSprite__P187404.info = {"start":21785,"length":1276,"line":642,"column":4,"endLine":675,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
+ArcadePhysicsEngine_moveSprite__P2187.info = {"start":21785,"length":1276,"line":642,"column":4,"endLine":675,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"moveSprite","argumentNames":["this","s","dx","dy"]}
 
-function ArcadePhysicsEngine_moveSprite__P187404_mk(s) {
+function ArcadePhysicsEngine_moveSprite__P2187_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_moveSprite__P187404, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_moveSprite__P2187, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -61921,9 +61940,9 @@ function ArcadePhysicsEngine_moveSprite__P187404_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  tm___208444: undefined,
-  maxDist___208454: undefined,
-  ms___208474: undefined,
+  tm___23391: undefined,
+  maxDist___23401: undefined,
+  ms___23421: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -61934,7 +61953,7 @@ function ArcadePhysicsEngine_moveSprite__P187404_mk(s) {
 
 
 
-function ArcadePhysicsEngine_canResolveClipping__P189441(s) {
+function ArcadePhysicsEngine_canResolveClipping__P4225(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -61944,19 +61963,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.hbox___208519 = undefined;
-    s.sz___208522 = undefined;
-    s.maxMove___208527 = undefined;
-    s.origY___208529 = undefined;
-    s.origX___208532 = undefined;
-    s.l___208535 = undefined;
-    s.r___208540 = undefined;
-    s.t___208545 = undefined;
-    s.b___208550 = undefined;
-    s.offset___208555 = undefined;
-    s.offset___208580 = undefined;
-    s.offset___208611 = undefined;
-    s.offset___208636 = undefined;
+    s.hbox___23466 = undefined;
+    s.sz___23469 = undefined;
+    s.maxMove___23474 = undefined;
+    s.origY___23476 = undefined;
+    s.origX___23479 = undefined;
+    s.l___23482 = undefined;
+    s.r___23487 = undefined;
+    s.t___23492 = undefined;
+    s.b___23497 = undefined;
+    s.offset___23502 = undefined;
+    s.offset___23527 = undefined;
+    s.offset___23558 = undefined;
+    s.offset___23583 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -61964,7 +61983,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.isStatic(s.tmp_3);
@@ -61975,7 +61994,7 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_4 = Sprite_setHitbox__P187274_mk(s);
+    s.tmp_4 = Sprite_setHitbox__P2057_mk(s);
     s.tmp_4.arg0 = s.arg1;
     s.callLocIdx = 748; s.pc = 20; return s.tmp_4;
   case 20:
@@ -61983,23 +62002,23 @@ switch (step) {
   case 1:
   case 2:
     r0 = s.arg1.fields["_hitbox"];
-    s.hbox___208519 = (r0);
+    s.hbox___23466 = (r0);
     r0 = s.arg2.fields["_scale"];
     s.tmp_0 = r0;
     r0 = (1 << s.tmp_0);
-    s.sz___208522 = (r0);
-    s.tmp_0 = ArcadePhysicsEngine_maxStep__P187396_mk(s);
+    s.sz___23469 = (r0);
+    s.tmp_0 = ArcadePhysicsEngine_maxStep__P2179_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 750; s.pc = 21; return s.tmp_0;
   case 21:
     r0 = s.retval;
-    s.maxMove___208527 = (r0);
+    s.maxMove___23474 = (r0);
     r0 = s.arg1.fields["_y"];
-    s.origY___208529 = (r0);
+    s.origY___23476 = (r0);
     r0 = s.arg1.fields["_x"];
-    s.origX___208532 = (r0);
-    s.tmp_1 = game_Hitbox_left__P187183_mk(s);
-    s.tmp_1.arg0 = s.hbox___208519;
+    s.origX___23479 = (r0);
+    s.tmp_1 = game_Hitbox_left__P1966_mk(s);
+    s.tmp_1.arg0 = s.hbox___23466;
     s.callLocIdx = 751; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
@@ -62007,9 +62026,9 @@ switch (step) {
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.l___208535 = (r0);
-    s.tmp_1 = game_Hitbox_right__P187185_mk(s);
-    s.tmp_1.arg0 = s.hbox___208519;
+    s.l___23482 = (r0);
+    s.tmp_1 = game_Hitbox_right__P1968_mk(s);
+    s.tmp_1.arg0 = s.hbox___23466;
     s.callLocIdx = 753; s.pc = 23; return s.tmp_1;
   case 23:
     r0 = s.retval;
@@ -62017,9 +62036,9 @@ switch (step) {
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.r___208540 = (r0);
-    s.tmp_1 = game_Hitbox_top__P187184_mk(s);
-    s.tmp_1.arg0 = s.hbox___208519;
+    s.r___23487 = (r0);
+    s.tmp_1 = game_Hitbox_top__P1967_mk(s);
+    s.tmp_1.arg0 = s.hbox___23466;
     s.callLocIdx = 755; s.pc = 24; return s.tmp_1;
   case 24:
     r0 = s.retval;
@@ -62027,9 +62046,9 @@ switch (step) {
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.t___208545 = (r0);
-    s.tmp_1 = game_Hitbox_bottom__P187186_mk(s);
-    s.tmp_1.arg0 = s.hbox___208519;
+    s.t___23492 = (r0);
+    s.tmp_1 = game_Hitbox_bottom__P1969_mk(s);
+    s.tmp_1.arg0 = s.hbox___23466;
     s.callLocIdx = 757; s.pc = 25; return s.tmp_1;
   case 25:
     r0 = s.retval;
@@ -62037,26 +62056,26 @@ switch (step) {
     r0 = (s.tmp_0 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
-    s.b___208550 = (r0);
-    r0 = (s.b___208550 + 1);
+    s.b___23497 = (r0);
+    r0 = (s.b___23497 + 1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.sz___208522);
-    s.offset___208555 = (r0);
-    r0 = (s.offset___208555 <= s.maxMove___208527);
+    r0 = (s.tmp_0 % s.sz___23469);
+    s.offset___23502 = (r0);
+    r0 = (s.offset___23502 <= s.maxMove___23474);
     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___208555 * 256);
+    r0 = (s.offset___23502 * 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__P187555_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
     s.callLocIdx = 761; s.pc = 26; return s.tmp_3;
@@ -62073,35 +62092,35 @@ switch (step) {
     { step = 19; continue; }
     { step = 4; continue; }
   case 3:
-    r0 = (s.arg1).fields["_y"] = (s.origY___208529);
+    r0 = (s.arg1).fields["_y"] = (s.origY___23476);
   case 4:
   case 5:
   case 6:
-    r0 = (s.t___208545 / s.sz___208522);
+    r0 = (s.t___23492 / s.sz___23469);
     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___208522);
+    r0 = (s.tmp_1 * s.sz___23469);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.t___208545);
-    s.offset___208580 = (r0);
-    r0 = (s.offset___208580 <= s.maxMove___208527);
+    r0 = (s.tmp_0 - s.t___23492);
+    s.offset___23527 = (r0);
+    r0 = (s.offset___23527 <= s.maxMove___23474);
     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___208580 * 256);
+    r0 = (s.offset___23527 * 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__P187555_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
     s.callLocIdx = 764; s.pc = 27; return s.tmp_3;
@@ -62118,29 +62137,29 @@ switch (step) {
     { step = 19; continue; }
     { step = 8; continue; }
   case 7:
-    r0 = (s.arg1).fields["_y"] = (s.origY___208529);
+    r0 = (s.arg1).fields["_y"] = (s.origY___23476);
   case 8:
   case 9:
   case 10:
-    r0 = (s.r___208540 + 1);
+    r0 = (s.r___23487 + 1);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 % s.sz___208522);
-    s.offset___208611 = (r0);
-    r0 = (s.offset___208611 <= s.maxMove___208527);
+    r0 = (s.tmp_0 % s.sz___23469);
+    s.offset___23558 = (r0);
+    r0 = (s.offset___23558 <= s.maxMove___23474);
     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___208611 * 256);
+    r0 = (s.offset___23558 * 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__P187555_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
     s.callLocIdx = 767; s.pc = 28; return s.tmp_3;
@@ -62157,35 +62176,35 @@ switch (step) {
     { step = 19; continue; }
     { step = 12; continue; }
   case 11:
-    r0 = (s.arg1).fields["_x"] = (s.origX___208532);
+    r0 = (s.arg1).fields["_x"] = (s.origX___23479);
   case 12:
   case 13:
   case 14:
-    r0 = (s.l___208535 / s.sz___208522);
+    r0 = (s.l___23482 / s.sz___23469);
     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___208522);
+    r0 = (s.tmp_1 * s.sz___23469);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.l___208535);
-    s.offset___208636 = (r0);
-    r0 = (s.offset___208636 <= s.maxMove___208527);
+    r0 = (s.tmp_0 - s.l___23482);
+    s.offset___23583 = (r0);
+    r0 = (s.offset___23583 <= s.maxMove___23474);
     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___208636 * 256);
+    r0 = (s.offset___23583 * 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__P187555_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
     s.tmp_3.arg0 = s.arg2;
     s.tmp_3.arg1 = s.arg1;
     s.callLocIdx = 770; s.pc = 29; return s.tmp_3;
@@ -62202,7 +62221,7 @@ switch (step) {
     { step = 19; continue; }
     { step = 16; continue; }
   case 15:
-    r0 = (s.arg1).fields["_x"] = (s.origX___208532);
+    r0 = (s.arg1).fields["_x"] = (s.origX___23479);
   case 16:
   case 17:
   case 18:
@@ -62211,12 +62230,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_canResolveClipping__P189441.info = {"start":23157,"length":2135,"line":678,"column":4,"endLine":749,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"canResolveClipping","argumentNames":["this","s","tm"]}
+ArcadePhysicsEngine_canResolveClipping__P4225.info = {"start":23157,"length":2135,"line":678,"column":4,"endLine":749,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"canResolveClipping","argumentNames":["this","s","tm"]}
 
-function ArcadePhysicsEngine_canResolveClipping__P189441_mk(s) {
+function ArcadePhysicsEngine_canResolveClipping__P4225_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_canResolveClipping__P189441, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_canResolveClipping__P4225, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -62224,19 +62243,19 @@ function ArcadePhysicsEngine_canResolveClipping__P189441_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  hbox___208519: undefined,
-  sz___208522: undefined,
-  maxMove___208527: undefined,
-  origY___208529: undefined,
-  origX___208532: undefined,
-  l___208535: undefined,
-  r___208540: undefined,
-  t___208545: undefined,
-  b___208550: undefined,
-  offset___208555: undefined,
-  offset___208580: undefined,
-  offset___208611: undefined,
-  offset___208636: undefined,
+  hbox___23466: undefined,
+  sz___23469: undefined,
+  maxMove___23474: undefined,
+  origY___23476: undefined,
+  origX___23479: undefined,
+  l___23482: undefined,
+  r___23487: undefined,
+  t___23492: undefined,
+  b___23497: undefined,
+  offset___23502: undefined,
+  offset___23527: undefined,
+  offset___23558: undefined,
+  offset___23583: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -62246,7 +62265,7 @@ function ArcadePhysicsEngine_canResolveClipping__P189441_mk(s) {
 
 
 
-function Sprite_isStatic__P187275(s) {
+function Sprite_isStatic__P2058(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62261,19 +62280,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187275.info = {"start":8266,"length":57,"line":299,"column":4,"endLine":301,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isStatic","argumentNames":["this"]}
+Sprite_isStatic__P2058.info = {"start":8266,"length":57,"line":299,"column":4,"endLine":301,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isStatic","argumentNames":["this"]}
 
-function Sprite_isStatic__P187275_mk(s) {
+function Sprite_isStatic__P2058_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isStatic__P187275, depth: s.depth + 1,
+        parent: s, fn: Sprite_isStatic__P2058, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -62283,7 +62302,7 @@ function Sprite_isStatic__P187275_mk(s) {
 
 
 
-function ArcadePhysicsEngine_tilemapCollisions__P189439(s) {
+function ArcadePhysicsEngine_tilemapCollisions__P4223(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -62293,38 +62312,38 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.s___208675 = undefined;
-    s.hbox___208698 = undefined;
-    s.tileScale___208701 = undefined;
-    s.tileSize___208704 = undefined;
-    s.xDiff___208708 = undefined;
-    s.yDiff___208715 = undefined;
-    s.overlappedTiles___208722 = undefined;
-    s.right___208727 = undefined;
-    s.x0___208731 = undefined;
-    s.collidedTiles___208746 = undefined;
-    s.y___208748 = undefined;
-    s.y0___208762 = undefined;
-    s.obstacle___208778 = undefined;
-    s.collisionDirection___208812 = undefined;
-    s.tile___208838 = undefined;
-    s.unnamed8916___U15 = undefined;
-    s.unnamed8917___U16 = undefined;
-    s.down___208916 = undefined;
-    s.y0___208920 = undefined;
-    s.collidedTiles___208935 = undefined;
-    s.overlappedTiles___208937 = undefined;
-    s.x___208939 = undefined;
-    s.x0___208949 = undefined;
-    s.obstacle___208963 = undefined;
-    s.collisionDirection___208997 = undefined;
-    s.tile___209023 = undefined;
-    s.unnamed8918___U26 = undefined;
-    s.unnamed8919___U27 = undefined;
-    s.x___209098 = undefined;
-    s.x0___209108 = undefined;
-    s.y___209118 = undefined;
-    s.y0___209128 = undefined;
+    s.s___23622 = undefined;
+    s.hbox___23645 = undefined;
+    s.tileScale___23648 = undefined;
+    s.tileSize___23651 = undefined;
+    s.xDiff___23655 = undefined;
+    s.yDiff___23662 = undefined;
+    s.overlappedTiles___23669 = undefined;
+    s.right___23674 = undefined;
+    s.x0___23678 = undefined;
+    s.collidedTiles___23693 = undefined;
+    s.y___23695 = undefined;
+    s.y0___23709 = undefined;
+    s.obstacle___23725 = undefined;
+    s.collisionDirection___23759 = undefined;
+    s.tile___23785 = undefined;
+    s.unnamed108___U15 = undefined;
+    s.unnamed109___U16 = undefined;
+    s.down___23863 = undefined;
+    s.y0___23867 = undefined;
+    s.collidedTiles___23882 = undefined;
+    s.overlappedTiles___23884 = undefined;
+    s.x___23886 = undefined;
+    s.x0___23896 = undefined;
+    s.obstacle___23910 = undefined;
+    s.collisionDirection___23944 = undefined;
+    s.tile___23970 = undefined;
+    s.unnamed110___U26 = undefined;
+    s.unnamed111___U27 = undefined;
+    s.x___24045 = undefined;
+    s.x0___24055 = undefined;
+    s.y___24065 = undefined;
+    s.y0___24075 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -62332,18 +62351,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = s.arg1.fields["sprite"];
-    s.s___208675 = (r0);
-    r0 = s.s___208675.fields["flags"];
+    s.s___23622 = (r0);
+    r0 = s.s___23622.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__P187555_mk(s);
+    s.tmp_3 = tiles_TileMap_isOnWall__P2338_mk(s);
     s.tmp_3.arg0 = s.arg2;
-    s.tmp_3.arg1 = s.s___208675;
+    s.tmp_3.arg1 = s.s___23622;
     s.callLocIdx = 629; s.pc = 84; return s.tmp_3;
   case 84:
     r0 = s.retval;
@@ -62353,7 +62372,7 @@ switch (step) {
     { step = 83; continue; }
     { step = 2; continue; }
   case 1:
-    s.tmp_4 = r0 = s.s___208675;
+    s.tmp_4 = r0 = s.s___23622;
     r0 = s.tmp_4.fields["flags"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 & -257);
@@ -62362,7 +62381,7 @@ switch (step) {
   case 2:
   case 3:
   case 4:
-    r0 = s.s___208675.fields["_image"];
+    r0 = s.s___23622.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.isStatic(s.tmp_3);
     s.tmp_2 = r0;
@@ -62372,43 +62391,43 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_4 = Sprite_setHitbox__P187274_mk(s);
-    s.tmp_4.arg0 = s.s___208675;
+    s.tmp_4 = Sprite_setHitbox__P2057_mk(s);
+    s.tmp_4.arg0 = s.s___23622;
     s.callLocIdx = 631; s.pc = 85; return s.tmp_4;
   case 85:
     r0 = s.retval;
   case 5:
   case 6:
-    r0 = s.s___208675.fields["_hitbox"];
-    s.hbox___208698 = (r0);
+    r0 = s.s___23622.fields["_hitbox"];
+    s.hbox___23645 = (r0);
     r0 = s.arg2.fields["_scale"];
-    s.tileScale___208701 = (r0);
-    r0 = (1 << s.tileScale___208701);
-    s.tileSize___208704 = (r0);
-    r0 = s.s___208675.fields["_x"];
+    s.tileScale___23648 = (r0);
+    r0 = (1 << s.tileScale___23648);
+    s.tileSize___23651 = (r0);
+    r0 = s.s___23622.fields["_x"];
     s.tmp_0 = r0;
-    r0 = s.s___208675.fields["_lastX"];
+    r0 = s.s___23622.fields["_lastX"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.xDiff___208708 = (r0);
-    r0 = s.s___208675.fields["_y"];
+    s.xDiff___23655 = (r0);
+    r0 = s.s___23622.fields["_y"];
     s.tmp_0 = r0;
-    r0 = s.s___208675.fields["_lastY"];
+    r0 = s.s___23622.fields["_lastY"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.yDiff___208715 = (r0);
+    s.yDiff___23662 = (r0);
     r0 = pxsim_Array__mk();
-    s.overlappedTiles___208722 = (r0);
-    r0 = (s.xDiff___208708 !== 0);
+    s.overlappedTiles___23669 = (r0);
+    r0 = (s.xDiff___23655 !== 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 39; continue; }
-    r0 = (s.xDiff___208708 > 0);
-    s.right___208727 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.right___208727);
+    r0 = (s.xDiff___23655 > 0);
+    s.right___23674 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.right___23674);
     if (!r0) { step = 7; continue; }
-    s.tmp_1 = game_Hitbox_right__P187185_mk(s);
-    s.tmp_1.arg0 = s.hbox___208698;
+    s.tmp_1 = game_Hitbox_right__P1968_mk(s);
+    s.tmp_1.arg0 = s.hbox___23645;
     s.callLocIdx = 635; s.pc = 86; return s.tmp_1;
   case 86:
     r0 = s.retval;
@@ -62416,8 +62435,8 @@ switch (step) {
     r0 = (s.tmp_0 + 256);
     { step = 8; continue; }
   case 7:
-    s.tmp_3 = game_Hitbox_left__P187183_mk(s);
-    s.tmp_3.arg0 = s.hbox___208698;
+    s.tmp_3 = game_Hitbox_left__P1966_mk(s);
+    s.tmp_3.arg0 = s.hbox___23645;
     s.callLocIdx = 637; s.pc = 87; return s.tmp_3;
   case 87:
     r0 = s.retval;
@@ -62428,30 +62447,30 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 128);
     s.tmp_5 = r0;
-    r0 = (s.tileScale___208701 + 8);
+    r0 = (s.tileScale___23648 + 8);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 >> s.tmp_6);
-    s.x0___208731 = (r0);
+    s.x0___23678 = (r0);
     r0 = pxsim_Array__mk();
-    s.collidedTiles___208746 = (r0);
-    s.tmp_1 = game_Hitbox_top__P187184_mk(s);
-    s.tmp_1.arg0 = s.hbox___208698;
+    s.collidedTiles___23693 = (r0);
+    s.tmp_1 = game_Hitbox_top__P1967_mk(s);
+    s.tmp_1.arg0 = s.hbox___23645;
     s.callLocIdx = 641; s.pc = 88; return s.tmp_1;
   case 88:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.yDiff___208715);
-    s.y___208748 = (r0);
+    r0 = (s.tmp_0 - s.yDiff___23662);
+    s.y___23695 = (r0);
   case 9:
-    s.tmp_1 = r0 = s.y___208748;
-    s.tmp_3 = r0 = s.tileSize___208704;
-    s.tmp_6 = game_Hitbox_bottom__P187186_mk(s);
-    s.tmp_6.arg0 = s.hbox___208698;
+    s.tmp_1 = r0 = s.y___23695;
+    s.tmp_3 = r0 = s.tileSize___23651;
+    s.tmp_6 = game_Hitbox_bottom__P1969_mk(s);
+    s.tmp_6.arg0 = s.hbox___23645;
     s.callLocIdx = 643; s.pc = 89; return s.tmp_6;
   case 89:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.yDiff___208715);
+    r0 = (s.tmp_5 - s.yDiff___23662);
     s.tmp_4 = r0;
     r0 = (s.tmp_3 << 8);
     s.tmp_7 = r0;
@@ -62461,15 +62480,15 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 14; continue; }
-    s.tmp_10 = Fx_min__P185378_mk(s);
-    s.tmp_10.arg0 = s.y___208748;
-    s.tmp_12 = game_Hitbox_bottom__P187186_mk(s);
-    s.tmp_12.arg0 = s.hbox___208698;
+    s.tmp_10 = Fx_min__P161_mk(s);
+    s.tmp_10.arg0 = s.y___23695;
+    s.tmp_12 = game_Hitbox_bottom__P1969_mk(s);
+    s.tmp_12.arg0 = s.hbox___23645;
     s.callLocIdx = 646; s.pc = 91; return s.tmp_12;
   case 91:
     r0 = s.retval;
     s.tmp_11 = r0;
-    r0 = (s.tmp_11 - s.yDiff___208715);
+    r0 = (s.tmp_11 - s.yDiff___23662);
     s.tmp_10.arg1 = r0;
     s.callLocIdx = 648; s.pc = 90; return s.tmp_10;
   case 90:
@@ -62477,33 +62496,33 @@ switch (step) {
     s.tmp_9 = r0;
     r0 = (s.tmp_9 + 128);
     s.tmp_8 = r0;
-    r0 = (s.tileScale___208701 + 8);
+    r0 = (s.tileScale___23648 + 8);
     s.tmp_13 = r0;
     r0 = (s.tmp_8 >> s.tmp_13);
-    s.y0___208762 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P187553_mk(s);
+    s.y0___23709 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P2336_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.tmp_1.arg1 = s.x0___208731;
-    s.tmp_1.arg2 = s.y0___208762;
+    s.tmp_1.arg1 = s.x0___23678;
+    s.tmp_1.arg2 = s.y0___23709;
     s.callLocIdx = 651; s.pc = 92; return s.tmp_1;
   case 92:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 12; continue; }
-    s.tmp_2 = tiles_TileMap_getObstacle__P187554_mk(s);
+    s.tmp_2 = tiles_TileMap_getObstacle__P2337_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___208731;
-    s.tmp_2.arg2 = s.y0___208762;
+    s.tmp_2.arg1 = s.x0___23678;
+    s.tmp_2.arg2 = s.y0___23709;
     s.callLocIdx = 652; s.pc = 93; return s.tmp_2;
   case 93:
     r0 = s.retval;
-    s.obstacle___208778 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P208786);
+    s.obstacle___23725 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P23733);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___208778);
-    s.tmp_4 = helpers_arraySome__P185322_mk(s);
-    s.tmp_4.arg0 = s.collidedTiles___208746;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___23725);
+    s.tmp_4 = helpers_arraySome__P105_mk(s);
+    s.tmp_4.arg0 = s.collidedTiles___23693;
     s.tmp_4.arg1 = s.tmp_0;
     s.callLocIdx = 653; s.pc = 94; return s.tmp_4;
   case 94:
@@ -62515,33 +62534,33 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 10; continue; }
-    r0 = pxsim_Array__push(s.collidedTiles___208746, s.obstacle___208778);
+    r0 = pxsim_Array__push(s.collidedTiles___23693, s.obstacle___23725);
   case 10:
   case 11:
     { step = 13; continue; }
   case 12:
-    s.tmp_0 = r0 = s.overlappedTiles___208722;
-    s.tmp_2 = tiles_TileMap_getTile__P187546_mk(s);
+    s.tmp_0 = r0 = s.overlappedTiles___23669;
+    s.tmp_2 = tiles_TileMap_getTile__P2329_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___208731;
-    s.tmp_2.arg2 = s.y0___208762;
+    s.tmp_2.arg1 = s.x0___23678;
+    s.tmp_2.arg2 = s.y0___23709;
     s.callLocIdx = 654; 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___208704 << 8);
+    r0 = (s.tileSize___23651 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.y___208748);
-    s.y___208748 = (r0);
+    r0 = (s.tmp_0 + s.y___23695);
+    s.y___23695 = (r0);
     { step = 9; continue; }
   case 14:
-    r0 = pxsim_Array__length(s.collidedTiles___208746);
+    r0 = pxsim_Array__length(s.collidedTiles___23693);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 37; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.right___208727);
+    r0 = pxsim_numops_toBoolDecr(s.right___23674);
     if (!r0) { step = 15; continue; }
     r0 = 2;
     { step = 16; continue; }
@@ -62550,23 +62569,23 @@ switch (step) {
   case 16:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.collisionDirection___208812 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.right___208727);
+    s.collisionDirection___23759 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.right___23674);
     if (!r0) { step = 17; continue; }
-    r0 = (s.x0___208731 << s.tileScale___208701);
+    r0 = (s.x0___23678 << s.tileScale___23648);
     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___208698.fields["width"];
+    r0 = s.hbox___23645.fields["width"];
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
     { step = 18; continue; }
   case 17:
-    r0 = (s.x0___208731 + 1);
+    r0 = (s.x0___23678 + 1);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 << s.tileScale___208701);
+    r0 = (s.tmp_5 << s.tileScale___23648);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 * 256);
     s.tmp_6 = r0;
@@ -62574,44 +62593,44 @@ switch (step) {
   case 18:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.s___208675;
-    r0 = s.hbox___208698.fields["ox"];
+    s.tmp_8 = r0 = s.s___23622;
+    r0 = s.hbox___23645.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___208838 = (undefined);
-    s.unnamed8916___U15 = (s.collidedTiles___208746);
-    s.unnamed8917___U16 = (0);
+    s.tile___23785 = (undefined);
+    s.unnamed108___U15 = (s.collidedTiles___23693);
+    s.unnamed109___U16 = (0);
   case 19:
-    s.tmp_0 = r0 = s.unnamed8917___U16;
-    r0 = pxsim_Array__length(s.unnamed8916___U15);
+    s.tmp_0 = r0 = s.unnamed109___U16;
+    r0 = pxsim_Array__length(s.unnamed108___U15);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8916___U15, s.unnamed8917___U16);
-    s.tile___208838 = (r0);
-    s.tmp_2 = Sprite_registerObstacle__P187302_mk(s);
-    s.tmp_2.arg0 = s.s___208675;
-    s.tmp_2.arg1 = s.collisionDirection___208812;
-    s.tmp_2.arg2 = s.tile___208838;
+    r0 = pxsim_Array__getAt(s.unnamed108___U15, s.unnamed109___U16);
+    s.tile___23785 = (r0);
+    s.tmp_2 = Sprite_registerObstacle__P2085_mk(s);
+    s.tmp_2.arg0 = s.s___23622;
+    s.tmp_2.arg1 = s.collisionDirection___23759;
+    s.tmp_2.arg2 = s.tile___23785;
     s.tmp_2.arg3 = s.arg2;
     s.callLocIdx = 660; s.pc = 96; return s.tmp_2;
   case 96:
     r0 = s.retval;
-    r0 = (s.unnamed8917___U16 + 1);
-    s.unnamed8917___U16 = (r0);
+    r0 = (s.unnamed109___U16 + 1);
+    s.unnamed109___U16 = (r0);
     { step = 19; continue; }
   case 20:
-    s.unnamed8916___U15 = (undefined);
-    r0 = s.s___208675.fields["flags"];
+    s.unnamed108___U15 = (undefined);
+    r0 = s.s___23622.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__P187304_mk(s);
-    s.tmp_2.arg0 = s.s___208675;
+    s.tmp_2 = Sprite_destroy__P2087_mk(s);
+    s.tmp_2.arg0 = s.s___23622;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
     s.callLocIdx = 661; s.pc = 97; return s.tmp_2;
@@ -62619,7 +62638,7 @@ switch (step) {
     r0 = s.retval;
     { step = 36; continue; }
   case 21:
-    r0 = s.s___208675.fields["_vx"];
+    r0 = s.s___23622.fields["_vx"];
     s.tmp_1 = r0;
     r0 = s.arg1.fields["cachedVx"];
     s.tmp_2 = r0;
@@ -62627,13 +62646,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 32; continue; }
-    r0 = s.s___208675.fields["flags"];
+    r0 = s.s___23622.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___208727);
+    r0 = pxsim_numops_toBoolDecr(s.right___23674);
     s.tmp_6 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_6);
     s.tmp_5 = r0;
@@ -62642,8 +62661,8 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 23; continue; }
   case 22:
-    s.tmp_8 = Sprite_vx__P187246_mk(s);
-    s.tmp_8.arg0 = s.s___208675;
+    s.tmp_8 = Sprite_vx__P2029_mk(s);
+    s.tmp_8.arg0 = s.s___23622;
     s.callLocIdx = 662; s.pc = 98; return s.tmp_8;
   case 98:
     r0 = s.retval;
@@ -62657,14 +62676,14 @@ switch (step) {
     r0 = s.tmp_9;
     { step = 27; continue; }
   case 24:
-    s.tmp_10 = r0 = s.right___208727;
+    s.tmp_10 = r0 = s.right___23674;
     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__P187246_mk(s);
-    s.tmp_12.arg0 = s.s___208675;
+    s.tmp_12 = Sprite_vx__P2029_mk(s);
+    s.tmp_12.arg0 = s.s___23622;
     s.callLocIdx = 663; s.pc = 99; return s.tmp_12;
   case 99:
     r0 = s.retval;
@@ -62679,8 +62698,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___208675;
-    r0 = s.s___208675.fields["_vx"];
+    s.tmp_15 = r0 = s.s___23622;
+    r0 = s.s___23622.fields["_vx"];
     s.tmp_17 = r0;
     r0 = (0 - s.tmp_17);
     s.tmp_16 = r0;
@@ -62702,12 +62721,12 @@ switch (step) {
     { step = 31; continue; }
   case 30:
     r0 = (s.arg1).fields["dx"] = (0);
-    r0 = (s.s___208675).fields["_vx"] = (0);
+    r0 = (s.s___23622).fields["_vx"] = (0);
   case 31:
     { step = 35; continue; }
   case 32:
-    s.tmp_2 = Math_sign__P185341_mk(s);
-    r0 = s.s___208675.fields["_vx"];
+    s.tmp_2 = Math_sign__P124_mk(s);
+    r0 = s.s___23622.fields["_vx"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 128);
     s.tmp_4 = r0;
@@ -62717,7 +62736,7 @@ switch (step) {
   case 100:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_6 = Math_sign__P185341_mk(s);
+    s.tmp_6 = Math_sign__P124_mk(s);
     r0 = s.arg1.fields["cachedVx"];
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 128);
@@ -62741,16 +62760,16 @@ switch (step) {
   case 38:
   case 39:
   case 40:
-    r0 = (s.yDiff___208715 !== 0);
+    r0 = (s.yDiff___23662 !== 0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 73; continue; }
-    r0 = (s.yDiff___208715 > 0);
-    s.down___208916 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.down___208916);
+    r0 = (s.yDiff___23662 > 0);
+    s.down___23863 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.down___23863);
     if (!r0) { step = 41; continue; }
-    s.tmp_1 = game_Hitbox_bottom__P187186_mk(s);
-    s.tmp_1.arg0 = s.hbox___208698;
+    s.tmp_1 = game_Hitbox_bottom__P1969_mk(s);
+    s.tmp_1.arg0 = s.hbox___23645;
     s.callLocIdx = 671; s.pc = 102; return s.tmp_1;
   case 102:
     r0 = s.retval;
@@ -62758,8 +62777,8 @@ switch (step) {
     r0 = (s.tmp_0 + 256);
     { step = 42; continue; }
   case 41:
-    s.tmp_3 = game_Hitbox_top__P187184_mk(s);
-    s.tmp_3.arg0 = s.hbox___208698;
+    s.tmp_3 = game_Hitbox_top__P1967_mk(s);
+    s.tmp_3.arg0 = s.hbox___23645;
     s.callLocIdx = 673; s.pc = 103; return s.tmp_3;
   case 103:
     r0 = s.retval;
@@ -62770,25 +62789,25 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 + 128);
     s.tmp_5 = r0;
-    r0 = (s.tileScale___208701 + 8);
+    r0 = (s.tileScale___23648 + 8);
     s.tmp_6 = r0;
     r0 = (s.tmp_5 >> s.tmp_6);
-    s.y0___208920 = (r0);
+    s.y0___23867 = (r0);
     r0 = pxsim_Array__mk();
-    s.collidedTiles___208935 = (r0);
+    s.collidedTiles___23882 = (r0);
     r0 = pxsim_Array__mk();
-    s.overlappedTiles___208937 = (r0);
-    s.tmp_0 = game_Hitbox_left__P187183_mk(s);
-    s.tmp_0.arg0 = s.hbox___208698;
+    s.overlappedTiles___23884 = (r0);
+    s.tmp_0 = game_Hitbox_left__P1966_mk(s);
+    s.tmp_0.arg0 = s.hbox___23645;
     s.callLocIdx = 677; s.pc = 104; return s.tmp_0;
   case 104:
     r0 = s.retval;
-    s.x___208939 = (r0);
+    s.x___23886 = (r0);
   case 43:
-    s.tmp_1 = r0 = s.x___208939;
-    s.tmp_3 = r0 = s.tileSize___208704;
-    s.tmp_5 = game_Hitbox_right__P187185_mk(s);
-    s.tmp_5.arg0 = s.hbox___208698;
+    s.tmp_1 = r0 = s.x___23886;
+    s.tmp_3 = r0 = s.tileSize___23651;
+    s.tmp_5 = game_Hitbox_right__P1968_mk(s);
+    s.tmp_5.arg0 = s.hbox___23645;
     s.callLocIdx = 678; s.pc = 105; return s.tmp_5;
   case 105:
     r0 = s.retval;
@@ -62801,10 +62820,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 48; continue; }
-    s.tmp_9 = Fx_min__P185378_mk(s);
-    s.tmp_9.arg0 = s.x___208939;
-    s.tmp_10 = game_Hitbox_right__P187185_mk(s);
-    s.tmp_10.arg0 = s.hbox___208698;
+    s.tmp_9 = Fx_min__P161_mk(s);
+    s.tmp_9.arg0 = s.x___23886;
+    s.tmp_10 = game_Hitbox_right__P1968_mk(s);
+    s.tmp_10.arg0 = s.hbox___23645;
     s.callLocIdx = 680; s.pc = 107; return s.tmp_10;
   case 107:
     r0 = s.retval;
@@ -62815,33 +62834,33 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___208701 + 8);
+    r0 = (s.tileScale___23648 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.x0___208949 = (r0);
-    s.tmp_1 = tiles_TileMap_isObstacle__P187553_mk(s);
+    s.x0___23896 = (r0);
+    s.tmp_1 = tiles_TileMap_isObstacle__P2336_mk(s);
     s.tmp_1.arg0 = s.arg2;
-    s.tmp_1.arg1 = s.x0___208949;
-    s.tmp_1.arg2 = s.y0___208920;
+    s.tmp_1.arg1 = s.x0___23896;
+    s.tmp_1.arg2 = s.y0___23867;
     s.callLocIdx = 684; s.pc = 108; return s.tmp_1;
   case 108:
     r0 = s.retval;
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 46; continue; }
-    s.tmp_2 = tiles_TileMap_getObstacle__P187554_mk(s);
+    s.tmp_2 = tiles_TileMap_getObstacle__P2337_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___208949;
-    s.tmp_2.arg2 = s.y0___208920;
+    s.tmp_2.arg1 = s.x0___23896;
+    s.tmp_2.arg2 = s.y0___23867;
     s.callLocIdx = 685; s.pc = 109; return s.tmp_2;
   case 109:
     r0 = s.retval;
-    s.obstacle___208963 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P208971);
+    s.obstacle___23910 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P23918);
     s.tmp_0 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___208963);
-    s.tmp_4 = helpers_arraySome__P185322_mk(s);
-    s.tmp_4.arg0 = s.collidedTiles___208935;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.obstacle___23910);
+    s.tmp_4 = helpers_arraySome__P105_mk(s);
+    s.tmp_4.arg0 = s.collidedTiles___23882;
     s.tmp_4.arg1 = s.tmp_0;
     s.callLocIdx = 686; s.pc = 110; return s.tmp_4;
   case 110:
@@ -62853,33 +62872,33 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_1);
     if (!r0) { step = 44; continue; }
-    r0 = pxsim_Array__push(s.collidedTiles___208935, s.obstacle___208963);
+    r0 = pxsim_Array__push(s.collidedTiles___23882, s.obstacle___23910);
   case 44:
   case 45:
     { step = 47; continue; }
   case 46:
-    s.tmp_0 = r0 = s.overlappedTiles___208937;
-    s.tmp_2 = tiles_TileMap_getTile__P187546_mk(s);
+    s.tmp_0 = r0 = s.overlappedTiles___23884;
+    s.tmp_2 = tiles_TileMap_getTile__P2329_mk(s);
     s.tmp_2.arg0 = s.arg2;
-    s.tmp_2.arg1 = s.x0___208949;
-    s.tmp_2.arg2 = s.y0___208920;
+    s.tmp_2.arg1 = s.x0___23896;
+    s.tmp_2.arg2 = s.y0___23867;
     s.callLocIdx = 687; 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___208704 << 8);
+    r0 = (s.tileSize___23651 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.x___208939);
-    s.x___208939 = (r0);
+    r0 = (s.tmp_0 + s.x___23886);
+    s.x___23886 = (r0);
     { step = 43; continue; }
   case 48:
-    r0 = pxsim_Array__length(s.collidedTiles___208935);
+    r0 = pxsim_Array__length(s.collidedTiles___23882);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 71; continue; }
-    r0 = pxsim_numops_toBoolDecr(s.down___208916);
+    r0 = pxsim_numops_toBoolDecr(s.down___23863);
     if (!r0) { step = 49; continue; }
     r0 = 3;
     { step = 50; continue; }
@@ -62888,23 +62907,23 @@ switch (step) {
   case 50:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.collisionDirection___208997 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.down___208916);
+    s.collisionDirection___23944 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.down___23863);
     if (!r0) { step = 51; continue; }
-    r0 = (s.y0___208920 << s.tileScale___208701);
+    r0 = (s.y0___23867 << s.tileScale___23648);
     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___208698.fields["height"];
+    r0 = s.hbox___23645.fields["height"];
     s.tmp_3 = r0;
     r0 = (s.tmp_0 - s.tmp_3);
     { step = 52; continue; }
   case 51:
-    r0 = (s.y0___208920 + 1);
+    r0 = (s.y0___23867 + 1);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 << s.tileScale___208701);
+    r0 = (s.tmp_5 << s.tileScale___23648);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 * 256);
     s.tmp_6 = r0;
@@ -62912,44 +62931,44 @@ switch (step) {
   case 52:
     // jmp value (already in r0)
     s.tmp_7 = r0;
-    s.tmp_8 = r0 = s.s___208675;
-    r0 = s.hbox___208698.fields["oy"];
+    s.tmp_8 = r0 = s.s___23622;
+    r0 = s.hbox___23645.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___209023 = (undefined);
-    s.unnamed8918___U26 = (s.collidedTiles___208935);
-    s.unnamed8919___U27 = (0);
+    s.tile___23970 = (undefined);
+    s.unnamed110___U26 = (s.collidedTiles___23882);
+    s.unnamed111___U27 = (0);
   case 53:
-    s.tmp_0 = r0 = s.unnamed8919___U27;
-    r0 = pxsim_Array__length(s.unnamed8918___U26);
+    s.tmp_0 = r0 = s.unnamed111___U27;
+    r0 = pxsim_Array__length(s.unnamed110___U26);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 54; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8918___U26, s.unnamed8919___U27);
-    s.tile___209023 = (r0);
-    s.tmp_2 = Sprite_registerObstacle__P187302_mk(s);
-    s.tmp_2.arg0 = s.s___208675;
-    s.tmp_2.arg1 = s.collisionDirection___208997;
-    s.tmp_2.arg2 = s.tile___209023;
+    r0 = pxsim_Array__getAt(s.unnamed110___U26, s.unnamed111___U27);
+    s.tile___23970 = (r0);
+    s.tmp_2 = Sprite_registerObstacle__P2085_mk(s);
+    s.tmp_2.arg0 = s.s___23622;
+    s.tmp_2.arg1 = s.collisionDirection___23944;
+    s.tmp_2.arg2 = s.tile___23970;
     s.tmp_2.arg3 = s.arg2;
     s.callLocIdx = 693; s.pc = 112; return s.tmp_2;
   case 112:
     r0 = s.retval;
-    r0 = (s.unnamed8919___U27 + 1);
-    s.unnamed8919___U27 = (r0);
+    r0 = (s.unnamed111___U27 + 1);
+    s.unnamed111___U27 = (r0);
     { step = 53; continue; }
   case 54:
-    s.unnamed8918___U26 = (undefined);
-    r0 = s.s___208675.fields["flags"];
+    s.unnamed110___U26 = (undefined);
+    r0 = s.s___23622.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__P187304_mk(s);
-    s.tmp_2.arg0 = s.s___208675;
+    s.tmp_2 = Sprite_destroy__P2087_mk(s);
+    s.tmp_2.arg0 = s.s___23622;
     s.tmp_2.arg1 = undefined;
     s.tmp_2.arg2 = undefined;
     s.callLocIdx = 694; s.pc = 113; return s.tmp_2;
@@ -62957,7 +62976,7 @@ switch (step) {
     r0 = s.retval;
     { step = 70; continue; }
   case 55:
-    r0 = s.s___208675.fields["_vy"];
+    r0 = s.s___23622.fields["_vy"];
     s.tmp_1 = r0;
     r0 = s.arg1.fields["cachedVy"];
     s.tmp_2 = r0;
@@ -62965,13 +62984,13 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 66; continue; }
-    r0 = s.s___208675.fields["flags"];
+    r0 = s.s___23622.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___208916);
+    r0 = pxsim_numops_toBoolDecr(s.down___23863);
     s.tmp_6 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_6);
     s.tmp_5 = r0;
@@ -62980,8 +62999,8 @@ switch (step) {
     r0 = s.tmp_5;
     { step = 57; continue; }
   case 56:
-    s.tmp_8 = Sprite_vy__P187248_mk(s);
-    s.tmp_8.arg0 = s.s___208675;
+    s.tmp_8 = Sprite_vy__P2031_mk(s);
+    s.tmp_8.arg0 = s.s___23622;
     s.callLocIdx = 695; s.pc = 114; return s.tmp_8;
   case 114:
     r0 = s.retval;
@@ -62995,14 +63014,14 @@ switch (step) {
     r0 = s.tmp_9;
     { step = 61; continue; }
   case 58:
-    s.tmp_10 = r0 = s.down___208916;
+    s.tmp_10 = r0 = s.down___23863;
     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__P187248_mk(s);
-    s.tmp_12.arg0 = s.s___208675;
+    s.tmp_12 = Sprite_vy__P2031_mk(s);
+    s.tmp_12.arg0 = s.s___23622;
     s.callLocIdx = 696; s.pc = 115; return s.tmp_12;
   case 115:
     r0 = s.retval;
@@ -63017,8 +63036,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___208675;
-    r0 = s.s___208675.fields["_vy"];
+    s.tmp_15 = r0 = s.s___23622;
+    r0 = s.s___23622.fields["_vy"];
     s.tmp_17 = r0;
     r0 = (0 - s.tmp_17);
     s.tmp_16 = r0;
@@ -63040,12 +63059,12 @@ switch (step) {
     { step = 65; continue; }
   case 64:
     r0 = (s.arg1).fields["dy"] = (0);
-    r0 = (s.s___208675).fields["_vy"] = (0);
+    r0 = (s.s___23622).fields["_vy"] = (0);
   case 65:
     { step = 69; continue; }
   case 66:
-    s.tmp_2 = Math_sign__P185341_mk(s);
-    r0 = s.s___208675.fields["_vy"];
+    s.tmp_2 = Math_sign__P124_mk(s);
+    r0 = s.s___23622.fields["_vy"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 128);
     s.tmp_4 = r0;
@@ -63055,7 +63074,7 @@ switch (step) {
   case 116:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_6 = Math_sign__P185341_mk(s);
+    s.tmp_6 = Math_sign__P124_mk(s);
     r0 = s.arg1.fields["cachedVy"];
     s.tmp_7 = r0;
     r0 = (s.tmp_7 + 128);
@@ -63079,17 +63098,17 @@ switch (step) {
   case 72:
   case 73:
   case 74:
-    s.tmp_0 = game_Hitbox_left__P187183_mk(s);
-    s.tmp_0.arg0 = s.hbox___208698;
+    s.tmp_0 = game_Hitbox_left__P1966_mk(s);
+    s.tmp_0.arg0 = s.hbox___23645;
     s.callLocIdx = 704; s.pc = 118; return s.tmp_0;
   case 118:
     r0 = s.retval;
-    s.x___209098 = (r0);
+    s.x___24045 = (r0);
   case 75:
-    s.tmp_1 = r0 = s.x___209098;
-    s.tmp_3 = r0 = s.tileSize___208704;
-    s.tmp_5 = game_Hitbox_right__P187185_mk(s);
-    s.tmp_5.arg0 = s.hbox___208698;
+    s.tmp_1 = r0 = s.x___24045;
+    s.tmp_3 = r0 = s.tileSize___23651;
+    s.tmp_5 = game_Hitbox_right__P1968_mk(s);
+    s.tmp_5.arg0 = s.hbox___23645;
     s.callLocIdx = 705; s.pc = 119; return s.tmp_5;
   case 119:
     r0 = s.retval;
@@ -63102,10 +63121,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 80; continue; }
-    s.tmp_9 = Fx_min__P185378_mk(s);
-    s.tmp_9.arg0 = s.x___209098;
-    s.tmp_10 = game_Hitbox_right__P187185_mk(s);
-    s.tmp_10.arg0 = s.hbox___208698;
+    s.tmp_9 = Fx_min__P161_mk(s);
+    s.tmp_9.arg0 = s.x___24045;
+    s.tmp_10 = game_Hitbox_right__P1968_mk(s);
+    s.tmp_10.arg0 = s.hbox___23645;
     s.callLocIdx = 707; s.pc = 121; return s.tmp_10;
   case 121:
     r0 = s.retval;
@@ -63116,21 +63135,21 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___208701 + 8);
+    r0 = (s.tileScale___23648 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.x0___209108 = (r0);
-    s.tmp_0 = game_Hitbox_top__P187184_mk(s);
-    s.tmp_0.arg0 = s.hbox___208698;
+    s.x0___24055 = (r0);
+    s.tmp_0 = game_Hitbox_top__P1967_mk(s);
+    s.tmp_0.arg0 = s.hbox___23645;
     s.callLocIdx = 711; s.pc = 122; return s.tmp_0;
   case 122:
     r0 = s.retval;
-    s.y___209118 = (r0);
+    s.y___24065 = (r0);
   case 76:
-    s.tmp_1 = r0 = s.y___209118;
-    s.tmp_3 = r0 = s.tileSize___208704;
-    s.tmp_5 = game_Hitbox_bottom__P187186_mk(s);
-    s.tmp_5.arg0 = s.hbox___208698;
+    s.tmp_1 = r0 = s.y___24065;
+    s.tmp_3 = r0 = s.tileSize___23651;
+    s.tmp_5 = game_Hitbox_bottom__P1969_mk(s);
+    s.tmp_5.arg0 = s.hbox___23645;
     s.callLocIdx = 712; s.pc = 123; return s.tmp_5;
   case 123:
     r0 = s.retval;
@@ -63143,10 +63162,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 79; continue; }
-    s.tmp_9 = Fx_min__P185378_mk(s);
-    s.tmp_9.arg0 = s.y___209118;
-    s.tmp_10 = game_Hitbox_bottom__P187186_mk(s);
-    s.tmp_10.arg0 = s.hbox___208698;
+    s.tmp_9 = Fx_min__P161_mk(s);
+    s.tmp_9.arg0 = s.y___24065;
+    s.tmp_10 = game_Hitbox_bottom__P1969_mk(s);
+    s.tmp_10.arg0 = s.hbox___23645;
     s.callLocIdx = 714; s.pc = 125; return s.tmp_10;
   case 125:
     r0 = s.retval;
@@ -63157,14 +63176,14 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 + 128);
     s.tmp_7 = r0;
-    r0 = (s.tileScale___208701 + 8);
+    r0 = (s.tileScale___23648 + 8);
     s.tmp_11 = r0;
     r0 = (s.tmp_7 >> s.tmp_11);
-    s.y0___209128 = (r0);
-    s.tmp_3 = tiles_TileMap_isObstacle__P187553_mk(s);
+    s.y0___24075 = (r0);
+    s.tmp_3 = tiles_TileMap_isObstacle__P2336_mk(s);
     s.tmp_3.arg0 = s.arg2;
-    s.tmp_3.arg1 = s.x0___209108;
-    s.tmp_3.arg2 = s.y0___209128;
+    s.tmp_3.arg1 = s.x0___24055;
+    s.tmp_3.arg2 = s.y0___24075;
     s.callLocIdx = 718; s.pc = 126; return s.tmp_3;
   case 126:
     r0 = s.retval;
@@ -63175,11 +63194,11 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 77; continue; }
-    s.tmp_4 = r0 = s.overlappedTiles___208722;
-    s.tmp_6 = tiles_TileMap_getTile__P187546_mk(s);
+    s.tmp_4 = r0 = s.overlappedTiles___23669;
+    s.tmp_6 = tiles_TileMap_getTile__P2329_mk(s);
     s.tmp_6.arg0 = s.arg2;
-    s.tmp_6.arg1 = s.x0___209108;
-    s.tmp_6.arg2 = s.y0___209128;
+    s.tmp_6.arg1 = s.x0___24055;
+    s.tmp_6.arg2 = s.y0___24075;
     s.callLocIdx = 719; s.pc = 127; return s.tmp_6;
   case 127:
     r0 = s.retval;
@@ -63187,26 +63206,26 @@ switch (step) {
     r0 = pxsim_Array__push(s.tmp_4, s.tmp_5);
   case 77:
   case 78:
-    r0 = (s.tileSize___208704 << 8);
+    r0 = (s.tileSize___23651 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.y___209118);
-    s.y___209118 = (r0);
+    r0 = (s.tmp_0 + s.y___24065);
+    s.y___24065 = (r0);
     { step = 76; continue; }
   case 79:
-    r0 = (s.tileSize___208704 << 8);
+    r0 = (s.tileSize___23651 << 8);
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 + s.x___209098);
-    s.x___209098 = (r0);
+    r0 = (s.tmp_0 + s.x___24045);
+    s.x___24045 = (r0);
     { step = 75; continue; }
   case 80:
-    r0 = pxsim_Array__length(s.overlappedTiles___208722);
+    r0 = pxsim_Array__length(s.overlappedTiles___23669);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 81; continue; }
-    s.tmp_1 = ArcadePhysicsEngine_tilemapOverlaps__P189440_mk(s);
+    s.tmp_1 = ArcadePhysicsEngine_tilemapOverlaps__P4224_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_1.arg1 = s.s___208675;
-    s.tmp_1.arg2 = s.overlappedTiles___208722;
+    s.tmp_1.arg1 = s.s___23622;
+    s.tmp_1.arg2 = s.overlappedTiles___23669;
     s.callLocIdx = 722; s.pc = 128; return s.tmp_1;
   case 128:
     r0 = s.retval;
@@ -63217,12 +63236,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_tilemapCollisions__P189439.info = {"start":11859,"length":8619,"line":370,"column":4,"endLine":606,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapCollisions","argumentNames":["this","movingSprite","tm"]}
+ArcadePhysicsEngine_tilemapCollisions__P4223.info = {"start":11859,"length":8619,"line":370,"column":4,"endLine":606,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapCollisions","argumentNames":["this","movingSprite","tm"]}
 
-function ArcadePhysicsEngine_tilemapCollisions__P189439_mk(s) {
+function ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_tilemapCollisions__P189439, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_tilemapCollisions__P4223, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63242,38 +63261,38 @@ function ArcadePhysicsEngine_tilemapCollisions__P189439_mk(s) {
   tmp_15: undefined,
   tmp_16: undefined,
   tmp_17: undefined,
-  s___208675: undefined,
-  hbox___208698: undefined,
-  tileScale___208701: undefined,
-  tileSize___208704: undefined,
-  xDiff___208708: undefined,
-  yDiff___208715: undefined,
-  overlappedTiles___208722: undefined,
-  right___208727: undefined,
-  x0___208731: undefined,
-  collidedTiles___208746: undefined,
-  y___208748: undefined,
-  y0___208762: undefined,
-  obstacle___208778: undefined,
-  collisionDirection___208812: undefined,
-  tile___208838: undefined,
-  unnamed8916___U15: undefined,
-  unnamed8917___U16: undefined,
-  down___208916: undefined,
-  y0___208920: undefined,
-  collidedTiles___208935: undefined,
-  overlappedTiles___208937: undefined,
-  x___208939: undefined,
-  x0___208949: undefined,
-  obstacle___208963: undefined,
-  collisionDirection___208997: undefined,
-  tile___209023: undefined,
-  unnamed8918___U26: undefined,
-  unnamed8919___U27: undefined,
-  x___209098: undefined,
-  x0___209108: undefined,
-  y___209118: undefined,
-  y0___209128: undefined,
+  s___23622: undefined,
+  hbox___23645: undefined,
+  tileScale___23648: undefined,
+  tileSize___23651: undefined,
+  xDiff___23655: undefined,
+  yDiff___23662: undefined,
+  overlappedTiles___23669: undefined,
+  right___23674: undefined,
+  x0___23678: undefined,
+  collidedTiles___23693: undefined,
+  y___23695: undefined,
+  y0___23709: undefined,
+  obstacle___23725: undefined,
+  collisionDirection___23759: undefined,
+  tile___23785: undefined,
+  unnamed108___U15: undefined,
+  unnamed109___U16: undefined,
+  down___23863: undefined,
+  y0___23867: undefined,
+  collidedTiles___23882: undefined,
+  overlappedTiles___23884: undefined,
+  x___23886: undefined,
+  x0___23896: undefined,
+  obstacle___23910: undefined,
+  collisionDirection___23944: undefined,
+  tile___23970: undefined,
+  unnamed110___U26: undefined,
+  unnamed111___U27: undefined,
+  x___24045: undefined,
+  x0___24055: undefined,
+  y___24065: undefined,
+  y0___24075: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -63283,7 +63302,7 @@ function ArcadePhysicsEngine_tilemapCollisions__P189439_mk(s) {
 
 
 
-function inline__P208786(s) {
+function inline__P23733(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63305,12 +63324,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P208786.info = {"start":13980,"length":39,"line":434,"column":44,"endLine":434,"endColumn":83,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
+inline__P23733.info = {"start":13980,"length":39,"line":434,"column":44,"endLine":434,"endColumn":83,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P208786_mk(s) {
+function inline__P23733_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P208786, depth: s.depth + 1,
+        parent: s, fn: inline__P23733, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63321,7 +63340,7 @@ function inline__P208786_mk(s) {
 
 
 
-function inline__P208971(s) {
+function inline__P23918(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63343,12 +63362,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P208971.info = {"start":17215,"length":39,"line":516,"column":44,"endLine":516,"endColumn":83,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
+inline__P23918.info = {"start":17215,"length":39,"line":516,"column":44,"endLine":516,"endColumn":83,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["o"]}
 
-function inline__P208971_mk(s) {
+function inline__P23918_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P208971, depth: s.depth + 1,
+        parent: s, fn: inline__P23918, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63359,7 +63378,7 @@ function inline__P208971_mk(s) {
 
 
 
-function ArcadePhysicsEngine_tilemapOverlaps__P189440(s) {
+function ArcadePhysicsEngine_tilemapOverlaps__P4224(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63369,11 +63388,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.alreadyHandled___209167 = undefined;
-    s.tile___209170 = undefined;
-    s.unnamed8920___U2 = undefined;
-    s.unnamed8921___U3 = undefined;
-    s.tileOverlapHandlers___209191 = undefined;
+    s.alreadyHandled___24114 = undefined;
+    s.tile___24117 = undefined;
+    s.unnamed112___U2 = undefined;
+    s.unnamed113___U3 = undefined;
+    s.tileOverlapHandlers___24138 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -63381,25 +63400,25 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
-    s.alreadyHandled___209167 = (r0);
-    s.tile___209170 = (undefined);
-    s.unnamed8920___U2 = (s.arg2);
-    s.unnamed8921___U3 = (0);
+    s.alreadyHandled___24114 = (r0);
+    s.tile___24117 = (undefined);
+    s.unnamed112___U2 = (s.arg2);
+    s.unnamed113___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8921___U3;
-    r0 = pxsim_Array__length(s.unnamed8920___U2);
+    s.tmp_0 = r0 = s.unnamed113___U3;
+    r0 = pxsim_Array__length(s.unnamed112___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 7; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8920___U2, s.unnamed8921___U3);
-    s.tile___209170 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P209174);
+    r0 = pxsim_Array__getAt(s.unnamed112___U2, s.unnamed113___U3);
+    s.tile___24117 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P24121);
     s.tmp_2 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.tile___209170);
-    s.tmp_4 = helpers_arraySome__P185322_mk(s);
-    s.tmp_4.arg0 = s.alreadyHandled___209167;
+    r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.tile___24117);
+    s.tmp_4 = helpers_arraySome__P105_mk(s);
+    s.tmp_4.arg0 = s.alreadyHandled___24114;
     s.tmp_4.arg1 = s.tmp_2;
     s.callLocIdx = 727; s.pc = 8; return s.tmp_4;
   case 8:
@@ -63410,26 +63429,26 @@ switch (step) {
     { step = 6; continue; }
   case 2:
   case 3:
-    r0 = pxsim_Array__push(s.alreadyHandled___209167, s.tile___209170);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    r0 = pxsim_Array__push(s.alreadyHandled___24114, s.tile___24117);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 728; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     r0 = r0.fields["tileOverlapHandlers"];
-    s.tileOverlapHandlers___209191 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tileOverlapHandlers___209191);
+    s.tileOverlapHandlers___24138 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tileOverlapHandlers___24138);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_pxtcore_mkAction(2, inline__P209199);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P24146);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tile___209170);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P209213);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.tile___24117);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P24160);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg1);
-    r0 = pxsim_pxtrt_stclo(s.tmp_1, 1, s.tile___209170);
-    s.tmp_2 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_3.arg0 = s.tileOverlapHandlers___209191;
+    r0 = pxsim_pxtrt_stclo(s.tmp_1, 1, s.tile___24117);
+    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_3.arg0 = s.tileOverlapHandlers___24138;
     s.tmp_3.arg1 = s.tmp_0;
     s.callLocIdx = 731; s.pc = 11; return s.tmp_3;
   case 11:
@@ -63442,32 +63461,32 @@ switch (step) {
   case 4:
   case 5:
   case 6:
-    r0 = (s.unnamed8921___U3 + 1);
-    s.unnamed8921___U3 = (r0);
+    r0 = (s.unnamed113___U3 + 1);
+    s.unnamed113___U3 = (r0);
     { step = 1; continue; }
   case 7:
-    s.unnamed8920___U2 = (undefined);
+    s.unnamed112___U2 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_tilemapOverlaps__P189440.info = {"start":20755,"length":699,"line":614,"column":4,"endLine":630,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapOverlaps","argumentNames":["this","sprite","overlappedTiles"]}
+ArcadePhysicsEngine_tilemapOverlaps__P4224.info = {"start":20755,"length":699,"line":614,"column":4,"endLine":630,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"tilemapOverlaps","argumentNames":["this","sprite","overlappedTiles"]}
 
-function ArcadePhysicsEngine_tilemapOverlaps__P189440_mk(s) {
+function ArcadePhysicsEngine_tilemapOverlaps__P4224_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_tilemapOverlaps__P189440, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_tilemapOverlaps__P4224, 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___209167: undefined,
-  tile___209170: undefined,
-  unnamed8920___U2: undefined,
-  unnamed8921___U3: undefined,
-  tileOverlapHandlers___209191: undefined,
+  alreadyHandled___24114: undefined,
+  tile___24117: undefined,
+  unnamed112___U2: undefined,
+  unnamed113___U3: undefined,
+  tileOverlapHandlers___24138: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -63477,7 +63496,7 @@ function ArcadePhysicsEngine_tilemapOverlaps__P189440_mk(s) {
 
 
 
-function inline__P209174(s) {
+function inline__P24121(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63514,12 +63533,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209174.info = {"start":20968,"length":45,"line":618,"column":36,"endLine":618,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["l"]}
+inline__P24121.info = {"start":20968,"length":45,"line":618,"column":36,"endLine":618,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["l"]}
 
-function inline__P209174_mk(s) {
+function inline__P24121_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209174, depth: s.depth + 1,
+        parent: s, fn: inline__P24121, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63534,7 +63553,7 @@ function inline__P209174_mk(s) {
 
 
 
-function inline__P209199(s) {
+function inline__P24146(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63561,7 +63580,7 @@ switch (step) {
   case 1:
     r0 = s.arg0.fields["tileKind"];
     s.tmp_3 = r0;
-    s.tmp_5 = tiles_getTileImage__P187562_mk(s);
+    s.tmp_5 = tiles_getTileImage__P2345_mk(s);
     s.tmp_5.arg0 = s.caps[1];
     s.callLocIdx = 730; s.pc = 3; return s.tmp_5;
   case 3:
@@ -63575,12 +63594,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209199.info = {"start":21282,"length":81,"line":626,"column":28,"endLine":626,"endColumn":109,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24146.info = {"start":21282,"length":81,"line":626,"column":28,"endLine":626,"endColumn":109,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209199_mk(s) {
+function inline__P24146_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209199, depth: s.depth + 1,
+        parent: s, fn: inline__P24146, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63596,7 +63615,7 @@ function inline__P209199_mk(s) {
 
 
 
-function inline__P209213(s) {
+function inline__P24160(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63629,12 +63648,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209213.info = {"start":21394,"length":28,"line":627,"column":29,"endLine":627,"endColumn":57,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24160.info = {"start":21394,"length":28,"line":627,"column":29,"endLine":627,"endColumn":57,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209213_mk(s) {
+function inline__P24160_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209213, depth: s.depth + 1,
+        parent: s, fn: inline__P24160, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -63644,7 +63663,7 @@ function inline__P209213_mk(s) {
 
 
 
-function tiles_getTileImage__P187562(s) {
+function tiles_getTileImage__P2345(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63654,16 +63673,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___209220 = undefined;
+    s.scene___24167 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 983; s.pc = 6; return s.tmp_0;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 990; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.scene___209220 = (r0);
+    s.scene___24167 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg0);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -63673,7 +63692,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    r0 = s.scene___209220.fields["tileMap"];
+    r0 = s.scene___24167.fields["tileMap"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     s.tmp_2 = r0;
@@ -63683,32 +63702,32 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     if (!r0) { step = 3; continue; }
-    r0 = pxsim.image.ofBuffer(_hex209230);
+    r0 = pxsim.image.ofBuffer(_hex24177);
     { step = 5; continue; }
   case 3:
   case 4:
-    s.tmp_5 = tiles_TileMap_getTileImage__P187556_mk(s);
-    r0 = s.scene___209220.fields["tileMap"];
+    s.tmp_5 = tiles_TileMap_getTileImage__P2339_mk(s);
+    r0 = s.scene___24167.fields["tileMap"];
     s.tmp_5.arg0 = r0;
-    s.tmp_6 = tiles_Location_tileSet__P187512_mk(s);
+    s.tmp_6 = tiles_Location_tileSet__P2295_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.callLocIdx = 984; s.pc = 8; return s.tmp_6;
+    s.callLocIdx = 991; s.pc = 8; return s.tmp_6;
   case 8:
     r0 = s.retval;
     s.tmp_5.arg1 = r0;
-    s.callLocIdx = 985; s.pc = 7; return s.tmp_5;
+    s.callLocIdx = 992; s.pc = 7; return s.tmp_5;
   case 7:
     r0 = s.retval;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-tiles_getTileImage__P187562.info = {"start":16636,"length":207,"line":525,"column":4,"endLine":529,"endColumn":5,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getTileImage","argumentNames":["loc"]}
+tiles_getTileImage__P2345.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__P187562_mk(s) {
+function tiles_getTileImage__P2345_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_getTileImage__P187562, depth: s.depth + 1,
+        parent: s, fn: tiles_getTileImage__P2345, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63717,16 +63736,16 @@ function tiles_getTileImage__P187562_mk(s) {
   tmp_4: undefined,
   tmp_5: undefined,
   tmp_6: undefined,
-  scene___209220: undefined,
+  scene___24167: undefined,
   arg0: undefined,
 } }
 
-const _hex209230 = pxsim.BufferMethods.createBufferFromHex("8704000000000000")
+const _hex24177 = pxsim.BufferMethods.createBufferFromHex("8704000000000000")
 
 
 
 
-function tiles_Location_tileSet__P187512(s) {
+function tiles_Location_tileSet__P2295(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63741,27 +63760,27 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_Location__C187506_VT)) failedCast(r0);
-    s.tmp_0 = tiles_TileMap_getTileIndex__P187547_mk(s);
+    if (!checkSubtype(r0, tiles_Location__C2289_VT)) failedCast(r0);
+    s.tmp_0 = tiles_TileMap_getTileIndex__P2330_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 = 874; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 881; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_Location_tileSet__P187512.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__P187512.isGetter = true;
+tiles_Location_tileSet__P2295.info = {"start":981,"length":101,"line":43,"column":8,"endLine":45,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"tileSet","argumentNames":["this"]}
+tiles_Location_tileSet__P2295.isGetter = true;
 
-function tiles_Location_tileSet__P187512_mk(s) {
+function tiles_Location_tileSet__P2295_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_Location_tileSet__P187512, depth: s.depth + 1,
+        parent: s, fn: tiles_Location_tileSet__P2295, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -63771,7 +63790,7 @@ function tiles_Location_tileSet__P187512_mk(s) {
 
 
 
-function tiles_TileMap_getObstacle__P187554(s) {
+function tiles_TileMap_getObstacle__P2337(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63781,8 +63800,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.index___209340 = undefined;
-    s.tile___209352 = undefined;
+    s.index___24287 = undefined;
+    s.tile___24299 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -63790,13 +63809,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
-    s.tmp_1 = tiles_TileMapData_isOutsideMap__P187533_mk(s);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
+    s.tmp_1 = tiles_TileMapData_isOutsideMap__P2316_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 = 946; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 953; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     s.tmp_0 = r0;
@@ -63805,31 +63824,31 @@ switch (step) {
     r0 = 0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = tiles_TileMapData_getTile__P187527_mk(s);
+    s.tmp_2 = tiles_TileMapData_getTile__P2310_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 = 947; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 954; 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___209340 = (s.tmp_3);
-    s.tmp_0 = tiles_TileMapData_getTileImage__P187530_mk(s);
+    s.index___24287 = (s.tmp_3);
+    s.tmp_0 = tiles_TileMapData_getTileImage__P2313_mk(s);
     r0 = s.arg0.fields["_map"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = s.index___209340;
-    s.callLocIdx = 948; s.pc = 5; return s.tmp_0;
+    s.tmp_0.arg1 = s.index___24287;
+    s.callLocIdx = 955; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.tile___209352 = (r0);
-    r0 = pxsim_pxtcore_mkClassInstance(sprites_StaticObstacle__C187363_VT);
+    s.tile___24299 = (r0);
+    r0 = pxsim_pxtcore_mkClassInstance(sprites_StaticObstacle__C2146_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = sprites_StaticObstacle_constructor__P187369_mk(s);
+    s.tmp_1 = sprites_StaticObstacle_constructor__P2152_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.tmp_1.arg1 = s.tile___209352;
+    s.tmp_1.arg1 = s.tile___24299;
     s.tmp_2 = r0 = s.arg2;
     r0 = s.arg0.fields["_scale"];
     s.tmp_3 = r0;
@@ -63842,20 +63861,20 @@ switch (step) {
     s.tmp_1.arg3 = r0;
     r0 = s.arg0.fields["_layer"];
     s.tmp_1.arg4 = r0;
-    s.tmp_1.arg5 = s.index___209340;
-    s.callLocIdx = 952; s.pc = 6; return s.tmp_1;
+    s.tmp_1.arg5 = s.index___24287;
+    s.callLocIdx = 959; 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__P187554.info = {"start":12642,"length":410,"line":411,"column":8,"endLine":421,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getObstacle","argumentNames":["this","col","row"]}
+tiles_TileMap_getObstacle__P2337.info = {"start":12642,"length":410,"line":411,"column":8,"endLine":421,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"getObstacle","argumentNames":["this","col","row"]}
 
-function tiles_TileMap_getObstacle__P187554_mk(s) {
+function tiles_TileMap_getObstacle__P2337_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_getObstacle__P187554, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_getObstacle__P2337, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -63863,8 +63882,8 @@ function tiles_TileMap_getObstacle__P187554_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  index___209340: undefined,
-  tile___209352: undefined,
+  index___24287: undefined,
+  tile___24299: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -63874,7 +63893,7 @@ function tiles_TileMap_getObstacle__P187554_mk(s) {
 
 
 
-function tiles_TileMap_layer__P187542(s) {
+function tiles_TileMap_layer__P2325(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63889,18 +63908,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, tiles_TileMap__C187534_VT)) failedCast(r0);
+    if (!checkSubtype(r0, tiles_TileMap__C2317_VT)) failedCast(r0);
     r0 = s.arg0.fields["_layer"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-tiles_TileMap_layer__P187542.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__P187542.isGetter = true;
+tiles_TileMap_layer__P2325.info = {"start":6897,"length":63,"line":251,"column":8,"endLine":253,"endColumn":9,"fileName":"pxt_modules/game/tilemap.ts","functionName":"layer","argumentNames":["this"]}
+tiles_TileMap_layer__P2325.isGetter = true;
 
-function tiles_TileMap_layer__P187542_mk(s) {
+function tiles_TileMap_layer__P2325_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: tiles_TileMap_layer__P187542, depth: s.depth + 1,
+        parent: s, fn: tiles_TileMap_layer__P2325, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -63909,7 +63928,7 @@ function tiles_TileMap_layer__P187542_mk(s) {
 
 
 
-function sprites_StaticObstacle_constructor__P187369(s) {
+function sprites_StaticObstacle_constructor__P2152(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63929,7 +63948,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C187363_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
     r0 = (s.arg0).fields["image"] = (s.arg1);
     r0 = (s.arg0).fields["layer"] = (s.arg4);
     r0 = (s.arg0).fields["top"] = (s.arg2);
@@ -63939,12 +63958,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_constructor__P187369.info = {"start":563,"length":261,"line":28,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"inline","argumentNames":["this","image","top","left","layer","tileIndex"]}
+sprites_StaticObstacle_constructor__P2152.info = {"start":563,"length":261,"line":28,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"inline","argumentNames":["this","image","top","left","layer","tileIndex"]}
 
-function sprites_StaticObstacle_constructor__P187369_mk(s) {
+function sprites_StaticObstacle_constructor__P2152_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_constructor__P187369, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_constructor__P2152, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -63958,7 +63977,7 @@ function sprites_StaticObstacle_constructor__P187369_mk(s) {
 
 
 
-function Sprite_registerObstacle__P187302(s) {
+function Sprite_registerObstacle__P2085(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -63968,10 +63987,10 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.collisionHandlers___209253 = undefined;
-    s.wallCollisionHandlers___209260 = undefined;
-    s.wallHandlersToRun___209285 = undefined;
-    s.asTileLocation___209298 = undefined;
+    s.collisionHandlers___24200 = undefined;
+    s.wallCollisionHandlers___24207 = undefined;
+    s.wallHandlersToRun___24232 = undefined;
+    s.asTileLocation___24245 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -63980,11 +63999,11 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_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__P187749_mk(s);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 413; s.pc = 9; return s.tmp_1;
   case 9:
     r0 = s.retval;
@@ -64004,24 +64023,24 @@ switch (step) {
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_Array__getAt(s.tmp_0, s.tmp_2);
-    s.collisionHandlers___209253 = (r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.collisionHandlers___24200 = (r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 415; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = r0.fields["wallCollisionHandlers"];
-    s.wallCollisionHandlers___209260 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.collisionHandlers___209253);
+    s.wallCollisionHandlers___24207 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.collisionHandlers___24200);
     if (!r0) { step = 1; continue; }
-    r0 = pxsim_pxtcore_mkAction(1, inline__P209268);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P24215);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P209274);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P24221);
     s.tmp_1 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_1, 0, s.arg0);
-    s.tmp_2 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_3 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_3.arg0 = s.collisionHandlers___209253;
+    s.tmp_2 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_3 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_3.arg0 = s.collisionHandlers___24200;
     s.tmp_3.arg1 = s.tmp_0;
     s.callLocIdx = 417; s.pc = 13; return s.tmp_3;
   case 13:
@@ -64033,7 +64052,7 @@ switch (step) {
     r0 = s.retval;
   case 1:
   case 2:
-    r0 = pxsim_numops_toBoolDecr(s.wallCollisionHandlers___209260);
+    r0 = pxsim_numops_toBoolDecr(s.wallCollisionHandlers___24207);
     if (!r0) { step = 7; continue; }
     s.tmp_0 = r0 = s.arg3;
     r0 = pxsim_numops_toBool(s.tmp_0);
@@ -64041,7 +64060,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 4; continue; }
   case 3:
-    s.tmp_1 = game_currentScene__P187749_mk(s);
+    s.tmp_1 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 420; s.pc = 14; return s.tmp_1;
   case 14:
     r0 = s.retval;
@@ -64050,21 +64069,21 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_2 = r0;
     s.arg3 = (s.tmp_2);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P209287);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P24234);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    s.tmp_1 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_1.arg0 = s.wallCollisionHandlers___209260;
+    s.tmp_1 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_1.arg0 = s.wallCollisionHandlers___24207;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 422; s.pc = 15; return s.tmp_1;
   case 15:
     r0 = s.retval;
-    s.wallHandlersToRun___209285 = (r0);
-    r0 = pxsim_Array__length(s.wallHandlersToRun___209285);
+    s.wallHandlersToRun___24232 = (r0);
+    r0 = pxsim_Array__length(s.wallHandlersToRun___24232);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    s.tmp_1 = tiles_TileMap_getTile__P187546_mk(s);
+    s.tmp_1 = tiles_TileMap_getTile__P2329_mk(s);
     s.tmp_1.arg0 = s.arg3;
     s.tmp_3 = if_left_1_mk(s);
     s.tmp_3.arg0 = s.arg2;
@@ -64103,13 +64122,13 @@ switch (step) {
     s.callLocIdx = 427; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
-    s.asTileLocation___209298 = (r0);
-    r0 = pxsim_pxtcore_mkAction(2, inline__P209314);
+    s.asTileLocation___24245 = (r0);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P24261);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.asTileLocation___209298);
-    s.tmp_1 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_1.arg0 = s.wallHandlersToRun___209285;
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.asTileLocation___24245);
+    s.tmp_1 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_1.arg0 = s.wallHandlersToRun___24232;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 429; s.pc = 19; return s.tmp_1;
   case 19:
@@ -64122,12 +64141,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_registerObstacle__P187302.info = {"start":26932,"length":965,"line":817,"column":4,"endLine":837,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"registerObstacle","argumentNames":["this","direction","other","tm"]}
+Sprite_registerObstacle__P2085.info = {"start":26932,"length":965,"line":817,"column":4,"endLine":837,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"registerObstacle","argumentNames":["this","direction","other","tm"]}
 
-function Sprite_registerObstacle__P187302_mk(s) {
+function Sprite_registerObstacle__P2085_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_registerObstacle__P187302, depth: s.depth + 1,
+        parent: s, fn: Sprite_registerObstacle__P2085, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64137,10 +64156,10 @@ function Sprite_registerObstacle__P187302_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  collisionHandlers___209253: undefined,
-  wallCollisionHandlers___209260: undefined,
-  wallHandlersToRun___209285: undefined,
-  asTileLocation___209298: undefined,
+  collisionHandlers___24200: undefined,
+  wallCollisionHandlers___24207: undefined,
+  wallHandlersToRun___24232: undefined,
+  asTileLocation___24245: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -64151,7 +64170,7 @@ function Sprite_registerObstacle__P187302_mk(s) {
 
 
 
-function inline__P209268(s) {
+function inline__P24215(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64173,12 +64192,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209268.info = {"start":27330,"length":26,"line":824,"column":24,"endLine":824,"endColumn":50,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24215.info = {"start":27330,"length":26,"line":824,"column":24,"endLine":824,"endColumn":50,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209268_mk(s) {
+function inline__P24215_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209268, depth: s.depth + 1,
+        parent: s, fn: inline__P24215, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64189,7 +64208,7 @@ function inline__P209268_mk(s) {
 
 
 
-function inline__P209274(s) {
+function inline__P24221(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64221,12 +64240,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209274.info = {"start":27383,"length":20,"line":825,"column":25,"endLine":825,"endColumn":45,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24221.info = {"start":27383,"length":20,"line":825,"column":25,"endLine":825,"endColumn":45,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209274_mk(s) {
+function inline__P24221_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209274, depth: s.depth + 1,
+        parent: s, fn: inline__P24221, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64236,7 +64255,7 @@ function inline__P209274_mk(s) {
 
 
 
-function inline__P209287(s) {
+function inline__P24234(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64258,12 +64277,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209287.info = {"start":27589,"length":32,"line":830,"column":24,"endLine":830,"endColumn":56,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24234.info = {"start":27589,"length":32,"line":830,"column":24,"endLine":830,"endColumn":56,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209287_mk(s) {
+function inline__P24234_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209287, depth: s.depth + 1,
+        parent: s, fn: inline__P24234, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -64274,7 +64293,7 @@ function inline__P209287_mk(s) {
 
 
 
-function inline__P209314(s) {
+function inline__P24261(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64307,12 +64326,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209314.info = {"start":27829,"length":36,"line":834,"column":29,"endLine":834,"endColumn":65,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24261.info = {"start":27829,"length":36,"line":834,"column":29,"endLine":834,"endColumn":65,"fileName":"pxt_modules/game/sprite.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209314_mk(s) {
+function inline__P24261_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209314, depth: s.depth + 1,
+        parent: s, fn: inline__P24261, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64322,7 +64341,7 @@ function inline__P209314_mk(s) {
 
 
 
-function Fx_min__P185378(s) {
+function Fx_min__P161(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64353,12 +64372,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_min__P185378.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__P161.info = {"start":1675,"length":117,"line":50,"column":4,"endLine":55,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"min","argumentNames":["a","b"]}
 
-function Fx_min__P185378_mk(s) {
+function Fx_min__P161_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_min__P185378, depth: s.depth + 1,
+        parent: s, fn: Fx_min__P161, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64369,7 +64388,7 @@ function Fx_min__P185378_mk(s) {
 
 
 
-function Fx_iadd__P185370(s) {
+function Fx_iadd__P153(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64390,12 +64409,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_iadd__P185370.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__P153.info = {"start":634,"length":110,"line":23,"column":4,"endLine":25,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"iadd","argumentNames":["a","b"]}
 
-function Fx_iadd__P185370_mk(s) {
+function Fx_iadd__P153_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_iadd__P185370, depth: s.depth + 1,
+        parent: s, fn: Fx_iadd__P153, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -64406,7 +64425,7 @@ function Fx_iadd__P185370_mk(s) {
 
 
 
-function helpers_arraySome__P185322(s) {
+function helpers_arraySome__P105(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64416,26 +64435,26 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.len___209322 = undefined;
-    s.i___209325 = undefined;
+    s.len___24269 = undefined;
+    s.i___24272 = 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___209322 = (r0);
-    s.i___209325 = (0);
+    s.len___24269 = (r0);
+    s.i___24272 = (0);
   case 1:
-    r0 = (s.i___209325 < s.len___209322);
+    r0 = (s.i___24272 < s.len___24269);
     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___209325);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___24272);
     s.tmp_2.arg0 = r0;
-    s.tmp_2.arg1 = s.i___209325;
+    s.tmp_2.arg1 = s.i___24272;
     setupLambda(s.tmp_2, s.tmp_2.argL);
     s.callLocIdx = 5; s.pc = 6; return s.tmp_2;
   case 6:
@@ -64447,8 +64466,8 @@ switch (step) {
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.i___209325 + 1);
-    s.i___209325 = (r0);
+    r0 = (s.i___24272 + 1);
+    s.i___24272 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = false;
@@ -64456,18 +64475,18 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arraySome__P185322.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__P105.info = {"start":6833,"length":296,"line":238,"column":4,"endLine":244,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arraySome","argumentNames":["arr","callbackfn"]}
 
-function helpers_arraySome__P185322_mk(s) {
+function helpers_arraySome__P105_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arraySome__P185322, depth: s.depth + 1,
+        parent: s, fn: helpers_arraySome__P105, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  len___209322: undefined,
-  i___209325: undefined,
+  len___24269: undefined,
+  i___24272: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -64476,7 +64495,7 @@ function helpers_arraySome__P185322_mk(s) {
 
 
 
-function MovingSprite_constructor__P187389(s) {
+function MovingSprite_constructor__P2172(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64498,7 +64517,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, MovingSprite__C187388_VT)) failedCast(r0);
+    if (!checkSubtype(r0, MovingSprite__C2171_VT)) failedCast(r0);
     r0 = (s.arg0).fields["sprite"] = (s.arg1);
     r0 = (s.arg0).fields["cachedVx"] = (s.arg2);
     r0 = (s.arg0).fields["cachedVy"] = (s.arg3);
@@ -64510,12 +64529,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-MovingSprite_constructor__P187389.info = {"start":678,"length":313,"line":30,"column":4,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","sprite","cachedVx","cachedVy","dx","dy","xStep","yStep"]}
+MovingSprite_constructor__P2172.info = {"start":678,"length":313,"line":30,"column":4,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["this","sprite","cachedVx","cachedVy","dx","dy","xStep","yStep"]}
 
-function MovingSprite_constructor__P187389_mk(s) {
+function MovingSprite_constructor__P2172_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: MovingSprite_constructor__P187389, depth: s.depth + 1,
+        parent: s, fn: MovingSprite_constructor__P2172, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -64531,7 +64550,7 @@ function MovingSprite_constructor__P187389_mk(s) {
 
 
 
-function ArcadePhysicsEngine_move__P187402(s) {
+function ArcadePhysicsEngine_move__P2185(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -64541,33 +64560,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.dtf___209411 = undefined;
-    s.dt2___209418 = undefined;
-    s.scene___209422 = undefined;
-    s.tileMap___209425 = undefined;
-    s.movingSprites___209428 = undefined;
-    s.MAX_STEP_COUNT___209459 = undefined;
-    s.overlapHandlers___209471 = undefined;
-    s.selected___209478 = undefined;
-    s.buffers___209479 = undefined;
-    s.count___209483 = undefined;
-    s.currMovers___209493 = undefined;
-    s.remainingMovers___209500 = undefined;
-    s.ms___209505 = undefined;
-    s.unnamed8910___U13 = undefined;
-    s.unnamed8911___U14 = undefined;
-    s.s___209507 = undefined;
-    s.stepX___209600 = undefined;
-    s.stepY___209614 = undefined;
+    s.dtf___24358 = undefined;
+    s.dt2___24365 = undefined;
+    s.scene___24369 = undefined;
+    s.tileMap___24372 = undefined;
+    s.movingSprites___24375 = undefined;
+    s.MAX_STEP_COUNT___24406 = undefined;
+    s.overlapHandlers___24418 = undefined;
+    s.selected___24425 = undefined;
+    s.buffers___24426 = undefined;
+    s.count___24430 = undefined;
+    s.currMovers___24440 = undefined;
+    s.remainingMovers___24447 = undefined;
+    s.ms___24452 = undefined;
+    s.unnamed102___U13 = undefined;
+    s.unnamed103___U14 = undefined;
+    s.s___24454 = undefined;
+    s.stepX___24547 = undefined;
+    s.stepY___24561 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
-    s.tmp_0 = Fx_min__P185378_mk(s);
-    s.tmp_0.arg0 = globals.MAX_TIME_STEP___187385;
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    s.tmp_0 = Fx_min__P161_mk(s);
+    s.tmp_0.arg0 = globals.MAX_TIME_STEP___2168;
     r0 = (s.arg1 * 1000);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 * 256);
@@ -64577,43 +64596,43 @@ switch (step) {
     s.callLocIdx = 552; s.pc = 47; return s.tmp_0;
   case 47:
     r0 = s.retval;
-    s.dtf___209411 = (r0);
-    r0 = pxsim.Math_.idiv(s.dtf___209411, 2);
-    s.dt2___209418 = (r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.dtf___24358 = (r0);
+    r0 = pxsim.Math_.idiv(s.dtf___24358, 2);
+    s.dt2___24365 = (r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 554; s.pc = 48; return s.tmp_0;
   case 48:
     r0 = s.retval;
-    s.scene___209422 = (r0);
-    r0 = s.scene___209422.fields["tileMap"];
-    s.tileMap___209425 = (r0);
-    r0 = pxsim_pxtcore_mkAction(3, inline__P209430);
+    s.scene___24369 = (r0);
+    r0 = s.scene___24369.fields["tileMap"];
+    s.tileMap___24372 = (r0);
+    r0 = pxsim_pxtcore_mkAction(3, inline__P24377);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg0);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.dtf___209411);
-    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.dt2___209418);
-    s.tmp_1 = helpers_arrayMap__P185321_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 1, s.dtf___24358);
+    r0 = pxsim_pxtrt_stclo(s.tmp_0, 2, s.dt2___24365);
+    s.tmp_1 = helpers_arrayMap__P104_mk(s);
     r0 = s.arg0.fields["sprites"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 556; s.pc = 49; return s.tmp_1;
   case 49:
     r0 = s.retval;
-    s.movingSprites___209428 = (r0);
-    s.tmp_0 = helpers_arrayForEach__P185324_mk(s);
+    s.movingSprites___24375 = (r0);
+    s.tmp_0 = helpers_arrayForEach__P107_mk(s);
     r0 = s.arg0.fields["sprites"];
     s.tmp_0.arg0 = r0;
-    s.tmp_0.arg1 = inline__P209442;
+    s.tmp_0.arg1 = inline__P24389;
     s.callLocIdx = 560; s.pc = 50; return s.tmp_0;
   case 50:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_clear__P187317_mk(s);
+    s.tmp_0 = sprites_SpriteMap_clear__P2100_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 561; s.pc = 51; return s.tmp_0;
   case 51:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_resizeBuckets__P187316_mk(s);
+    s.tmp_0 = sprites_SpriteMap_resizeBuckets__P2099_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["sprites"];
@@ -64629,7 +64648,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_5, s.tmp_4);
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.imul(s.tmp_2, s.dtf___209411);
+    r0 = pxsim.Math_.imul(s.tmp_2, s.dtf___24358);
     s.tmp_6 = r0;
     r0 = (s.tmp_6 >> 8);
     s.tmp_1 = r0;
@@ -64638,34 +64657,34 @@ switch (step) {
     r0 = (s.tmp_0 + 128);
     s.tmp_7 = r0;
     r0 = (s.tmp_7 >> 8);
-    s.MAX_STEP_COUNT___209459 = (r0);
-    s.tmp_0 = helpers_arraySlice__P185329_mk(s);
-    r0 = s.scene___209422.fields["overlapHandlers"];
+    s.MAX_STEP_COUNT___24406 = (r0);
+    s.tmp_0 = helpers_arraySlice__P112_mk(s);
+    r0 = s.scene___24369.fields["overlapHandlers"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = undefined;
     s.tmp_0.arg2 = undefined;
     s.callLocIdx = 567; s.pc = 53; return s.tmp_0;
   case 53:
     r0 = s.retval;
-    s.overlapHandlers___209471 = (r0);
-    s.selected___209478 = (0);
+    s.overlapHandlers___24418 = (r0);
+    s.selected___24425 = (0);
     r0 = pxsim_Array__mk();
     s.tmp_0 = r0;
-    r0 = pxsim_Array__push(s.tmp_0, s.movingSprites___209428);
+    r0 = pxsim_Array__push(s.tmp_0, s.movingSprites___24375);
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
     r0 = pxsim_Array__push(s.tmp_0, s.tmp_1);
-    s.buffers___209479 = (s.tmp_0);
-    s.count___209483 = (0);
+    s.buffers___24426 = (s.tmp_0);
+    s.count___24430 = (0);
   case 1:
-    r0 = (s.count___209483 < s.MAX_STEP_COUNT___209459);
+    r0 = (s.count___24430 < s.MAX_STEP_COUNT___24406);
     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___209479, s.selected___209478);
+    r0 = pxsim_Array__getAt(s.buffers___24426, s.selected___24425);
     s.tmp_2 = r0;
     r0 = pxsim_Array__length(s.tmp_2);
     s.tmp_1 = r0;
@@ -64675,43 +64694,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___209479, s.selected___209478);
-    s.currMovers___209493 = (r0);
-    r0 = (s.selected___209478 ^ 1);
-    s.selected___209478 = (r0);
-    r0 = pxsim_Array__getAt(s.buffers___209479, s.selected___209478);
-    s.remainingMovers___209500 = (r0);
-    s.ms___209505 = (undefined);
-    s.unnamed8910___U13 = (s.currMovers___209493);
-    s.unnamed8911___U14 = (0);
+    r0 = pxsim_Array__getAt(s.buffers___24426, s.selected___24425);
+    s.currMovers___24440 = (r0);
+    r0 = (s.selected___24425 ^ 1);
+    s.selected___24425 = (r0);
+    r0 = pxsim_Array__getAt(s.buffers___24426, s.selected___24425);
+    s.remainingMovers___24447 = (r0);
+    s.ms___24452 = (undefined);
+    s.unnamed102___U13 = (s.currMovers___24440);
+    s.unnamed103___U14 = (0);
   case 4:
-    s.tmp_0 = r0 = s.unnamed8911___U14;
-    r0 = pxsim_Array__length(s.unnamed8910___U13);
+    s.tmp_0 = r0 = s.unnamed103___U14;
+    r0 = pxsim_Array__length(s.unnamed102___U13);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 43; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8910___U13, s.unnamed8911___U14);
-    s.ms___209505 = (r0);
-    r0 = s.ms___209505.fields["sprite"];
-    s.s___209507 = (r0);
-    r0 = s.ms___209505.fields["cachedVx"];
+    r0 = pxsim_Array__getAt(s.unnamed102___U13, s.unnamed103___U14);
+    s.ms___24452 = (r0);
+    r0 = s.ms___24452.fields["sprite"];
+    s.s___24454 = (r0);
+    r0 = s.ms___24452.fields["cachedVx"];
     s.tmp_1 = r0;
-    r0 = s.s___209507.fields["_vx"];
+    r0 = s.s___24454.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___209507.fields["_vx"];
+    r0 = s.s___24454.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___209505).fields["dx"] = (0);
+    r0 = (s.ms___24452).fields["dx"] = (0);
     { step = 14; continue; }
   case 5:
-    r0 = s.s___209507.fields["_vx"];
+    r0 = s.s___24454.fields["_vx"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -64720,7 +64739,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 7; continue; }
   case 6:
-    r0 = s.ms___209505.fields["cachedVx"];
+    r0 = s.ms___24452.fields["cachedVx"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
   case 7:
@@ -64731,7 +64750,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 11; continue; }
   case 8:
-    r0 = s.s___209507.fields["_vx"];
+    r0 = s.s___24454.fields["_vx"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > 0);
     s.tmp_4 = r0;
@@ -64740,7 +64759,7 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 10; continue; }
   case 9:
-    r0 = s.ms___209505.fields["cachedVx"];
+    r0 = s.ms___24452.fields["cachedVx"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 < 0);
   case 10:
@@ -64752,14 +64771,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___209505;
-    r0 = s.ms___209505.fields["dx"];
+    s.tmp_9 = r0 = s.ms___24452;
+    r0 = s.ms___24452.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___209505;
-    r0 = s.ms___209505.fields["xStep"];
+    s.tmp_0 = r0 = s.ms___24452;
+    r0 = s.ms___24452.fields["xStep"];
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
@@ -64767,29 +64786,29 @@ switch (step) {
   case 12:
   case 13:
   case 14:
-    r0 = s.s___209507.fields["_vx"];
+    r0 = s.s___24454.fields["_vx"];
     s.tmp_0 = r0;
-    r0 = (s.ms___209505).fields["cachedVx"] = (s.tmp_0);
+    r0 = (s.ms___24452).fields["cachedVx"] = (s.tmp_0);
   case 15:
   case 16:
-    r0 = s.ms___209505.fields["cachedVy"];
+    r0 = s.ms___24452.fields["cachedVy"];
     s.tmp_1 = r0;
-    r0 = s.s___209507.fields["_vy"];
+    r0 = s.s___24454.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___209507.fields["_vy"];
+    r0 = s.s___24454.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___209505).fields["dy"] = (0);
+    r0 = (s.ms___24452).fields["dy"] = (0);
     { step = 26; continue; }
   case 17:
-    r0 = s.s___209507.fields["_vy"];
+    r0 = s.s___24454.fields["_vy"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -64798,7 +64817,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    r0 = s.ms___209505.fields["cachedVy"];
+    r0 = s.ms___24452.fields["cachedVy"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 > 0);
   case 19:
@@ -64809,7 +64828,7 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 23; continue; }
   case 20:
-    r0 = s.s___209507.fields["_vy"];
+    r0 = s.s___24454.fields["_vy"];
     s.tmp_5 = r0;
     r0 = (s.tmp_5 > 0);
     s.tmp_4 = r0;
@@ -64818,7 +64837,7 @@ switch (step) {
     r0 = s.tmp_4;
     { step = 22; continue; }
   case 21:
-    r0 = s.ms___209505.fields["cachedVy"];
+    r0 = s.ms___24452.fields["cachedVy"];
     s.tmp_6 = r0;
     r0 = (s.tmp_6 < 0);
   case 22:
@@ -64830,14 +64849,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___209505;
-    r0 = s.ms___209505.fields["dy"];
+    s.tmp_9 = r0 = s.ms___24452;
+    r0 = s.ms___24452.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___209505;
-    r0 = s.ms___209505.fields["yStep"];
+    s.tmp_0 = r0 = s.ms___24452;
+    r0 = s.ms___24452.fields["yStep"];
     s.tmp_2 = r0;
     r0 = (0 - s.tmp_2);
     s.tmp_1 = r0;
@@ -64845,20 +64864,20 @@ switch (step) {
   case 24:
   case 25:
   case 26:
-    r0 = s.s___209507.fields["_vy"];
+    r0 = s.s___24454.fields["_vy"];
     s.tmp_0 = r0;
-    r0 = (s.ms___209505).fields["cachedVy"] = (s.tmp_0);
+    r0 = (s.ms___24452).fields["cachedVy"] = (s.tmp_0);
   case 27:
   case 28:
-    s.tmp_2 = Fx_abs__P185377_mk(s);
-    r0 = s.ms___209505.fields["xStep"];
+    s.tmp_2 = Fx_abs__P160_mk(s);
+    r0 = s.ms___24452.fields["xStep"];
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 572; s.pc = 54; return s.tmp_2;
   case 54:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Fx_abs__P185377_mk(s);
-    r0 = s.ms___209505.fields["dx"];
+    s.tmp_4 = Fx_abs__P160_mk(s);
+    r0 = s.ms___24452.fields["dx"];
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 573; s.pc = 55; return s.tmp_4;
   case 55:
@@ -64868,23 +64887,23 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 29; continue; }
-    r0 = s.ms___209505.fields["dx"];
+    r0 = s.ms___24452.fields["dx"];
     { step = 30; continue; }
   case 29:
-    r0 = s.ms___209505.fields["xStep"];
+    r0 = s.ms___24452.fields["xStep"];
   case 30:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.stepX___209600 = (s.tmp_5);
-    s.tmp_2 = Fx_abs__P185377_mk(s);
-    r0 = s.ms___209505.fields["yStep"];
+    s.stepX___24547 = (s.tmp_5);
+    s.tmp_2 = Fx_abs__P160_mk(s);
+    r0 = s.ms___24452.fields["yStep"];
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 574; s.pc = 56; return s.tmp_2;
   case 56:
     r0 = s.retval;
     s.tmp_1 = r0;
-    s.tmp_4 = Fx_abs__P185377_mk(s);
-    r0 = s.ms___209505.fields["dy"];
+    s.tmp_4 = Fx_abs__P160_mk(s);
+    r0 = s.ms___24452.fields["dy"];
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 575; s.pc = 57; return s.tmp_4;
   case 57:
@@ -64894,45 +64913,45 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 31; continue; }
-    r0 = s.ms___209505.fields["dy"];
+    r0 = s.ms___24452.fields["dy"];
     { step = 32; continue; }
   case 31:
-    r0 = s.ms___209505.fields["yStep"];
+    r0 = s.ms___24452.fields["yStep"];
   case 32:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.stepY___209614 = (s.tmp_5);
-    s.tmp_0 = r0 = s.ms___209505;
-    r0 = s.ms___209505.fields["dx"];
+    s.stepY___24561 = (s.tmp_5);
+    s.tmp_0 = r0 = s.ms___24452;
+    r0 = s.ms___24452.fields["dx"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.stepX___209600);
+    r0 = (s.tmp_2 - s.stepX___24547);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["dx"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.ms___209505;
-    r0 = s.ms___209505.fields["dy"];
+    s.tmp_0 = r0 = s.ms___24452;
+    r0 = s.ms___24452.fields["dy"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.stepY___209614);
+    r0 = (s.tmp_2 - s.stepY___24561);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["dy"] = (s.tmp_1);
-    r0 = s.s___209507.fields["_x"];
+    r0 = s.s___24454.fields["_x"];
     s.tmp_0 = r0;
-    r0 = (s.s___209507).fields["_lastX"] = (s.tmp_0);
-    r0 = s.s___209507.fields["_y"];
+    r0 = (s.s___24454).fields["_lastX"] = (s.tmp_0);
+    r0 = s.s___24454.fields["_y"];
     s.tmp_0 = r0;
-    r0 = (s.s___209507).fields["_lastY"] = (s.tmp_0);
-    s.tmp_0 = r0 = s.s___209507;
-    r0 = s.s___209507.fields["_x"];
+    r0 = (s.s___24454).fields["_lastY"] = (s.tmp_0);
+    s.tmp_0 = r0 = s.s___24454;
+    r0 = s.s___24454.fields["_x"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.stepX___209600);
+    r0 = (s.tmp_2 + s.stepX___24547);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_x"] = (s.tmp_1);
-    s.tmp_0 = r0 = s.s___209507;
-    r0 = s.s___209507.fields["_y"];
+    s.tmp_0 = r0 = s.s___24454;
+    r0 = s.s___24454.fields["_y"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.stepY___209614);
+    r0 = (s.tmp_2 + s.stepY___24561);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_y"] = (s.tmp_1);
-    r0 = s.s___209507.fields["flags"];
+    r0 = s.s___24454.fields["flags"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 515);
     s.tmp_2 = r0;
@@ -64942,20 +64961,20 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 37; continue; }
-    s.tmp_4 = sprites_SpriteMap_insertAABB__P187318_mk(s);
+    s.tmp_4 = sprites_SpriteMap_insertAABB__P2101_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_4.arg0 = r0;
-    s.tmp_4.arg1 = s.s___209507;
+    s.tmp_4.arg1 = s.s___24454;
     s.callLocIdx = 580; s.pc = 58; return s.tmp_4;
   case 58:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tileMap___209425;
+    s.tmp_0 = r0 = s.tileMap___24372;
     r0 = pxsim_numops_toBool(s.tmp_0);
     if (r0) { step = 33; continue; }
     r0 = s.tmp_0;
     { step = 34; continue; }
   case 33:
-    r0 = s.tileMap___209425.fields["_map"];
+    r0 = s.tileMap___24372.fields["_map"];
     s.tmp_4 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_4);
     s.tmp_3 = r0;
@@ -64969,10 +64988,10 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 35; continue; }
-    s.tmp_6 = ArcadePhysicsEngine_tilemapCollisions__P189439_mk(s);
+    s.tmp_6 = ArcadePhysicsEngine_tilemapCollisions__P4223_mk(s);
     s.tmp_6.arg0 = s.arg0;
-    s.tmp_6.arg1 = s.ms___209505;
-    s.tmp_6.arg2 = s.tileMap___209425;
+    s.tmp_6.arg1 = s.ms___24452;
+    s.tmp_6.arg2 = s.tileMap___24372;
     s.callLocIdx = 582; s.pc = 59; return s.tmp_6;
   case 59:
     r0 = s.retval;
@@ -64980,70 +64999,70 @@ switch (step) {
   case 36:
   case 37:
   case 38:
-    s.tmp_2 = Fx_abs__P185377_mk(s);
-    r0 = s.ms___209505.fields["dx"];
+    s.tmp_2 = Fx_abs__P160_mk(s);
+    r0 = s.ms___24452.fields["dx"];
     s.tmp_2.arg0 = r0;
     s.callLocIdx = 583; s.pc = 60; return s.tmp_2;
   case 60:
     r0 = s.retval;
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > globals.MIN_MOVE_GAP___187387);
+    r0 = (s.tmp_1 > globals.MIN_MOVE_GAP___2170);
     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__P185377_mk(s);
-    r0 = s.ms___209505.fields["dy"];
+    s.tmp_4 = Fx_abs__P160_mk(s);
+    r0 = s.ms___24452.fields["dy"];
     s.tmp_4.arg0 = r0;
     s.callLocIdx = 584; s.pc = 61; return s.tmp_4;
   case 61:
     r0 = s.retval;
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 > globals.MIN_MOVE_GAP___187387);
+    r0 = (s.tmp_3 > globals.MIN_MOVE_GAP___2170);
   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___209500, s.ms___209505);
+    r0 = pxsim_Array__push(s.remainingMovers___24447, s.ms___24452);
   case 41:
   case 42:
-    r0 = (s.unnamed8911___U14 + 1);
-    s.unnamed8911___U14 = (r0);
+    r0 = (s.unnamed103___U14 + 1);
+    s.unnamed103___U14 = (r0);
     { step = 4; continue; }
   case 43:
-    s.unnamed8910___U13 = (undefined);
-    s.tmp_0 = ArcadePhysicsEngine_spriteCollisions__P189438_mk(s);
+    s.unnamed102___U13 = (undefined);
+    s.tmp_0 = ArcadePhysicsEngine_spriteCollisions__P4222_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.currMovers___209493;
-    s.tmp_0.arg2 = s.overlapHandlers___209471;
+    s.tmp_0.arg1 = s.currMovers___24440;
+    s.tmp_0.arg2 = s.overlapHandlers___24418;
     s.callLocIdx = 585; s.pc = 62; return s.tmp_0;
   case 62:
     r0 = s.retval;
   case 44:
-    r0 = pxsim_Array__length(s.currMovers___209493);
+    r0 = pxsim_Array__length(s.currMovers___24440);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 45; continue; }
-    r0 = pxsim_Array_.pop(s.currMovers___209493);
+    r0 = pxsim_Array_.pop(s.currMovers___24440);
     { step = 44; continue; }
   case 45:
-    r0 = (s.count___209483 + 1);
-    s.count___209483 = (r0);
+    r0 = (s.count___24430 + 1);
+    s.count___24430 = (r0);
     { step = 1; continue; }
   case 46:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_move__P187402.info = {"start":2551,"length":3971,"line":109,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
+ArcadePhysicsEngine_move__P2185.info = {"start":2551,"length":3971,"line":109,"column":4,"endLine":211,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"move","argumentNames":["this","dt"]}
 
-function ArcadePhysicsEngine_move__P187402_mk(s) {
+function ArcadePhysicsEngine_move__P2185_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_move__P187402, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_move__P2185, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65057,24 +65076,24 @@ function ArcadePhysicsEngine_move__P187402_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  dtf___209411: undefined,
-  dt2___209418: undefined,
-  scene___209422: undefined,
-  tileMap___209425: undefined,
-  movingSprites___209428: undefined,
-  MAX_STEP_COUNT___209459: undefined,
-  overlapHandlers___209471: undefined,
-  selected___209478: undefined,
-  buffers___209479: undefined,
-  count___209483: undefined,
-  currMovers___209493: undefined,
-  remainingMovers___209500: undefined,
-  ms___209505: undefined,
-  unnamed8910___U13: undefined,
-  unnamed8911___U14: undefined,
-  s___209507: undefined,
-  stepX___209600: undefined,
-  stepY___209614: undefined,
+  dtf___24358: undefined,
+  dt2___24365: undefined,
+  scene___24369: undefined,
+  tileMap___24372: undefined,
+  movingSprites___24375: undefined,
+  MAX_STEP_COUNT___24406: undefined,
+  overlapHandlers___24418: undefined,
+  selected___24425: undefined,
+  buffers___24426: undefined,
+  count___24430: undefined,
+  currMovers___24440: undefined,
+  remainingMovers___24447: undefined,
+  ms___24452: undefined,
+  unnamed102___U13: undefined,
+  unnamed103___U14: undefined,
+  s___24454: undefined,
+  stepX___24547: undefined,
+  stepY___24561: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -65083,7 +65102,7 @@ function ArcadePhysicsEngine_move__P187402_mk(s) {
 
 
 
-function inline__P209430(s) {
+function inline__P24377(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65097,7 +65116,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = ArcadePhysicsEngine_createMovingSprite__P189437_mk(s);
+    s.tmp_0 = ArcadePhysicsEngine_createMovingSprite__P4221_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.tmp_0.arg2 = s.caps[1];
@@ -65108,12 +65127,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209430.info = {"start":2943,"length":51,"line":121,"column":17,"endLine":121,"endColumn":68,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["sprite"]}
+inline__P24377.info = {"start":2943,"length":51,"line":121,"column":17,"endLine":121,"endColumn":68,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["sprite"]}
 
-function inline__P209430_mk(s) {
+function inline__P24377_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209430, depth: s.depth + 1,
+        parent: s, fn: inline__P24377, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -65123,7 +65142,7 @@ function inline__P209430_mk(s) {
 
 
 
-function inline__P209442(s) {
+function inline__P24389(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65137,7 +65156,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_1 = Sprite_vx__P187246_mk(s);
+    s.tmp_1 = Sprite_vx__P2029_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 557; s.pc = 5; return s.tmp_1;
   case 5:
@@ -65148,7 +65167,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 2; continue; }
   case 1:
-    s.tmp_2 = Sprite_vy__P187248_mk(s);
+    s.tmp_2 = Sprite_vy__P2031_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 558; s.pc = 6; return s.tmp_2;
   case 6:
@@ -65158,7 +65177,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 3; continue; }
-    s.tmp_4 = Sprite_clearObstacles__P187301_mk(s);
+    s.tmp_4 = Sprite_clearObstacles__P2084_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.callLocIdx = 559; s.pc = 7; return s.tmp_4;
   case 7:
@@ -65169,12 +65188,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209442.info = {"start":3077,"length":66,"line":124,"column":29,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["s"]}
+inline__P24389.info = {"start":3077,"length":66,"line":124,"column":29,"endLine":126,"endColumn":9,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["s"]}
 
-function inline__P209442_mk(s) {
+function inline__P24389_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209442, depth: s.depth + 1,
+        parent: s, fn: inline__P24389, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65188,7 +65207,7 @@ function inline__P209442_mk(s) {
 
 
 
-function ArcadePhysicsEngine_spriteCollisions__P189438(s) {
+function ArcadePhysicsEngine_spriteCollisions__P4222(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65198,18 +65217,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ms___209715 = undefined;
-    s.unnamed8912___U1 = undefined;
-    s.unnamed8913___U2 = undefined;
-    s.sprite___209717 = undefined;
-    s.overSprites___209724 = undefined;
-    s.overlapper___209732 = undefined;
-    s.unnamed8914___U6 = undefined;
-    s.unnamed8915___U7 = undefined;
-    s.thisKind___209738 = undefined;
-    s.otherKind___209742 = undefined;
-    s.higher___209755 = undefined;
-    s.lower___209764 = undefined;
+    s.ms___24662 = undefined;
+    s.unnamed104___U1 = undefined;
+    s.unnamed105___U2 = undefined;
+    s.sprite___24664 = undefined;
+    s.overSprites___24671 = undefined;
+    s.overlapper___24679 = undefined;
+    s.unnamed106___U6 = undefined;
+    s.unnamed107___U7 = undefined;
+    s.thisKind___24685 = undefined;
+    s.otherKind___24689 = undefined;
+    s.higher___24702 = undefined;
+    s.lower___24711 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -65217,7 +65236,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = pxsim_Array__length(s.arg2);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -65229,20 +65248,20 @@ switch (step) {
     { step = 21; continue; }
   case 1:
   case 2:
-    s.ms___209715 = (undefined);
-    s.unnamed8912___U1 = (s.arg1);
-    s.unnamed8913___U2 = (0);
+    s.ms___24662 = (undefined);
+    s.unnamed104___U1 = (s.arg1);
+    s.unnamed105___U2 = (0);
   case 3:
-    s.tmp_0 = r0 = s.unnamed8913___U2;
-    r0 = pxsim_Array__length(s.unnamed8912___U1);
+    s.tmp_0 = r0 = s.unnamed105___U2;
+    r0 = pxsim_Array__length(s.unnamed104___U1);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8912___U1, s.unnamed8913___U2);
-    s.ms___209715 = (r0);
-    r0 = s.ms___209715.fields["sprite"];
-    s.sprite___209717 = (r0);
-    r0 = s.sprite___209717.fields["flags"];
+    r0 = pxsim_Array__getAt(s.unnamed104___U1, s.unnamed105___U2);
+    s.ms___24662 = (r0);
+    r0 = s.ms___24662.fields["sprite"];
+    s.sprite___24664 = (r0);
+    r0 = s.sprite___24664.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 515);
     s.tmp_0 = r0;
@@ -65251,27 +65270,27 @@ switch (step) {
     { step = 19; continue; }
   case 4:
   case 5:
-    s.tmp_2 = sprites_SpriteMap_overlaps__P187314_mk(s);
+    s.tmp_2 = sprites_SpriteMap_overlaps__P2097_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_2.arg0 = r0;
-    r0 = s.ms___209715.fields["sprite"];
+    r0 = s.ms___24662.fields["sprite"];
     s.tmp_2.arg1 = r0;
     s.callLocIdx = 623; s.pc = 22; return s.tmp_2;
   case 22:
     r0 = s.retval;
-    s.overSprites___209724 = (r0);
-    s.overlapper___209732 = (undefined);
-    s.unnamed8914___U6 = (s.overSprites___209724);
-    s.unnamed8915___U7 = (0);
+    s.overSprites___24671 = (r0);
+    s.overlapper___24679 = (undefined);
+    s.unnamed106___U6 = (s.overSprites___24671);
+    s.unnamed107___U7 = (0);
   case 6:
-    s.tmp_0 = r0 = s.unnamed8915___U7;
-    r0 = pxsim_Array__length(s.unnamed8914___U6);
+    s.tmp_0 = r0 = s.unnamed107___U7;
+    r0 = pxsim_Array__length(s.unnamed106___U6);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 18; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8914___U6, s.unnamed8915___U7);
-    s.overlapper___209732 = (r0);
-    r0 = s.overlapper___209732.fields["flags"];
+    r0 = pxsim_Array__getAt(s.unnamed106___U6, s.unnamed107___U7);
+    s.overlapper___24679 = (r0);
+    r0 = s.overlapper___24679.fields["flags"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & 515);
     s.tmp_2 = r0;
@@ -65280,13 +65299,13 @@ switch (step) {
     { step = 17; continue; }
   case 7:
   case 8:
-    r0 = s.sprite___209717.fields["_kind"];
-    s.thisKind___209738 = (r0);
-    r0 = s.overlapper___209732.fields["_kind"];
-    s.otherKind___209742 = (r0);
-    r0 = s.sprite___209717.fields["_kindsOverlappedWith"];
+    r0 = s.sprite___24664.fields["_kind"];
+    s.thisKind___24685 = (r0);
+    r0 = s.overlapper___24679.fields["_kind"];
+    s.otherKind___24689 = (r0);
+    r0 = s.sprite___24664.fields["_kindsOverlappedWith"];
     s.tmp_2 = r0;
-    r0 = pxsim_Array_.indexOf(s.tmp_2, s.otherKind___209742, undefined);
+    r0 = pxsim_Array_.indexOf(s.tmp_2, s.otherKind___24689, undefined);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === -1);
     s.tmp_0 = r0;
@@ -65295,37 +65314,37 @@ switch (step) {
     { step = 17; continue; }
   case 9:
   case 10:
-    r0 = s.sprite___209717.fields["id"];
+    r0 = s.sprite___24664.fields["id"];
     s.tmp_4 = r0;
-    r0 = s.overlapper___209732.fields["id"];
+    r0 = s.overlapper___24679.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___209717;
+    r0 = s.sprite___24664;
     { step = 12; continue; }
   case 11:
-    r0 = s.overlapper___209732;
+    r0 = s.overlapper___24679;
   case 12:
     // jmp value (already in r0)
     s.tmp_6 = r0;
-    s.higher___209755 = (s.tmp_6);
-    r0 = (s.higher___209755 === s.sprite___209717);
+    s.higher___24702 = (s.tmp_6);
+    r0 = (s.higher___24702 === s.sprite___24664);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 13; continue; }
-    r0 = s.overlapper___209732;
+    r0 = s.overlapper___24679;
     { step = 14; continue; }
   case 13:
-    r0 = s.sprite___209717;
+    r0 = s.sprite___24664;
   case 14:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.lower___209764 = (s.tmp_1);
-    r0 = s.higher___209755.fields["_overlappers"];
+    s.lower___24711 = (s.tmp_1);
+    r0 = s.higher___24702.fields["_overlappers"];
     s.tmp_2 = r0;
-    r0 = s.lower___209764.fields["id"];
+    r0 = s.lower___24711.fields["id"];
     s.tmp_3 = r0;
     r0 = pxsim_Array_.indexOf(s.tmp_2, s.tmp_3, undefined);
     s.tmp_1 = r0;
@@ -65333,19 +65352,19 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 15; continue; }
-    r0 = pxsim_pxtcore_mkAction(2, inline__P209784);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P24731);
     s.tmp_4 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.thisKind___209738);
-    r0 = pxsim_pxtrt_stclo(s.tmp_4, 1, s.otherKind___209742);
-    r0 = pxsim_pxtcore_mkAction(5, inline__P209806);
+    r0 = pxsim_pxtrt_stclo(s.tmp_4, 0, s.thisKind___24685);
+    r0 = pxsim_pxtrt_stclo(s.tmp_4, 1, s.otherKind___24689);
+    r0 = pxsim_pxtcore_mkAction(5, inline__P24753);
     s.tmp_5 = r0;
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.higher___209755);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 1, s.lower___209764);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 2, s.sprite___209717);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 3, s.overlapper___209732);
-    r0 = pxsim_pxtrt_stclo(s.tmp_5, 4, s.thisKind___209738);
-    s.tmp_6 = helpers_arrayForEach__P185324_mk(s);
-    s.tmp_7 = helpers_arrayFilter__P185325_mk(s);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 0, s.higher___24702);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 1, s.lower___24711);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 2, s.sprite___24664);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 3, s.overlapper___24679);
+    r0 = pxsim_pxtrt_stclo(s.tmp_5, 4, s.thisKind___24685);
+    s.tmp_6 = helpers_arrayForEach__P107_mk(s);
+    s.tmp_7 = helpers_arrayFilter__P108_mk(s);
     s.tmp_7.arg0 = s.arg2;
     s.tmp_7.arg1 = s.tmp_4;
     s.callLocIdx = 626; s.pc = 24; return s.tmp_7;
@@ -65359,28 +65378,28 @@ switch (step) {
   case 15:
   case 16:
   case 17:
-    r0 = (s.unnamed8915___U7 + 1);
-    s.unnamed8915___U7 = (r0);
+    r0 = (s.unnamed107___U7 + 1);
+    s.unnamed107___U7 = (r0);
     { step = 6; continue; }
   case 18:
-    s.unnamed8914___U6 = (undefined);
+    s.unnamed106___U6 = (undefined);
   case 19:
-    r0 = (s.unnamed8913___U2 + 1);
-    s.unnamed8913___U2 = (r0);
+    r0 = (s.unnamed105___U2 + 1);
+    s.unnamed105___U2 = (r0);
     { step = 3; continue; }
   case 20:
-    s.unnamed8912___U1 = (undefined);
+    s.unnamed104___U1 = (undefined);
   case 21:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_spriteCollisions__P189438.info = {"start":9599,"length":2254,"line":324,"column":4,"endLine":368,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"spriteCollisions","argumentNames":["this","movedSprites","handlers"]}
+ArcadePhysicsEngine_spriteCollisions__P4222.info = {"start":9599,"length":2254,"line":324,"column":4,"endLine":368,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"spriteCollisions","argumentNames":["this","movedSprites","handlers"]}
 
-function ArcadePhysicsEngine_spriteCollisions__P189438_mk(s) {
+function ArcadePhysicsEngine_spriteCollisions__P4222_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_spriteCollisions__P189438, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_spriteCollisions__P4222, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65390,18 +65409,18 @@ function ArcadePhysicsEngine_spriteCollisions__P189438_mk(s) {
   tmp_5: undefined,
   tmp_6: undefined,
   tmp_7: undefined,
-  ms___209715: undefined,
-  unnamed8912___U1: undefined,
-  unnamed8913___U2: undefined,
-  sprite___209717: undefined,
-  overSprites___209724: undefined,
-  overlapper___209732: undefined,
-  unnamed8914___U6: undefined,
-  unnamed8915___U7: undefined,
-  thisKind___209738: undefined,
-  otherKind___209742: undefined,
-  higher___209755: undefined,
-  lower___209764: undefined,
+  ms___24662: undefined,
+  unnamed104___U1: undefined,
+  unnamed105___U2: undefined,
+  sprite___24664: undefined,
+  overSprites___24671: undefined,
+  overlapper___24679: undefined,
+  unnamed106___U6: undefined,
+  unnamed107___U7: undefined,
+  thisKind___24685: undefined,
+  otherKind___24689: undefined,
+  higher___24702: undefined,
+  lower___24711: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -65411,7 +65430,7 @@ function ArcadePhysicsEngine_spriteCollisions__P189438_mk(s) {
 
 
 
-function inline__P209784(s) {
+function inline__P24731(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65468,12 +65487,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209784.info = {"start":10958,"length":137,"line":350,"column":32,"endLine":351,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24731.info = {"start":10958,"length":137,"line":350,"column":32,"endLine":351,"endColumn":81,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209784_mk(s) {
+function inline__P24731_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209784, depth: s.depth + 1,
+        parent: s, fn: inline__P24731, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65491,7 +65510,7 @@ function inline__P209784_mk(s) {
 
 
 
-function inline__P209806(s) {
+function inline__P24753(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65510,7 +65529,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__P209816);
+    r0 = pxsim_pxtcore_mkAction(6, inline__P24763);
     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]);
@@ -65523,12 +65542,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209806.info = {"start":11155,"length":648,"line":353,"column":33,"endLine":364,"endColumn":25,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
+inline__P24753.info = {"start":11155,"length":648,"line":353,"column":33,"endLine":364,"endColumn":25,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":["h"]}
 
-function inline__P209806_mk(s) {
+function inline__P24753_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209806, depth: s.depth + 1,
+        parent: s, fn: inline__P24753, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65539,7 +65558,7 @@ function inline__P209806_mk(s) {
 
 
 
-function inline__P209816(s) {
+function inline__P24763(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65615,12 +65634,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209816.info = {"start":11276,"length":499,"line":355,"column":50,"endLine":363,"endColumn":29,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":[]}
+inline__P24763.info = {"start":11276,"length":499,"line":355,"column":50,"endLine":363,"endColumn":29,"fileName":"pxt_modules/game/physics.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P209816_mk(s) {
+function inline__P24763_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209816, depth: s.depth + 1,
+        parent: s, fn: inline__P24763, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65641,7 +65660,7 @@ function inline__P209816_mk(s) {
 
 
 
-function sprites_SpriteMap_overlaps__P187314(s) {
+function sprites_SpriteMap_overlaps__P2097(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65651,47 +65670,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.n___209849 = undefined;
-    s.o___209853 = undefined;
+    s.n___24796 = undefined;
+    s.o___24800 = 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__C187311_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_neighbors__P187313_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_neighbors__P2096_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.callLocIdx = 491; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.n___209849 = (r0);
-    r0 = pxsim_pxtcore_mkAction(1, inline__P209855);
+    s.n___24796 = (r0);
+    r0 = pxsim_pxtcore_mkAction(1, inline__P24802);
     s.tmp_0 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_0, 0, s.arg1);
-    s.tmp_1 = helpers_arrayFilter__P185325_mk(s);
-    s.tmp_1.arg0 = s.n___209849;
+    s.tmp_1 = helpers_arrayFilter__P108_mk(s);
+    s.tmp_1.arg0 = s.n___24796;
     s.tmp_1.arg1 = s.tmp_0;
     s.callLocIdx = 493; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
-    s.o___209853 = (r0);
-    r0 = s.o___209853;
+    s.o___24800 = (r0);
+    r0 = s.o___24800;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_overlaps__P187314.info = {"start":923,"length":189,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"overlaps","argumentNames":["this","sprite"]}
+sprites_SpriteMap_overlaps__P2097.info = {"start":923,"length":189,"line":30,"column":8,"endLine":34,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"overlaps","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_overlaps__P187314_mk(s) {
+function sprites_SpriteMap_overlaps__P2097_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_overlaps__P187314, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_overlaps__P2097, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
-  n___209849: undefined,
-  o___209853: undefined,
+  n___24796: undefined,
+  o___24800: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -65700,7 +65719,7 @@ function sprites_SpriteMap_overlaps__P187314_mk(s) {
 
 
 
-function inline__P209855(s) {
+function inline__P24802(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65714,7 +65733,7 @@ switch (step) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
-    s.tmp_0 = Sprite_overlapsWith__P187297_mk(s);
+    s.tmp_0 = Sprite_overlapsWith__P2080_mk(s);
     s.tmp_0.arg0 = s.caps[0];
     s.tmp_0.arg1 = s.arg0;
     s.callLocIdx = 492; s.pc = 1; return s.tmp_0;
@@ -65723,12 +65742,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P209855.info = {"start":1037,"length":41,"line":32,"column":31,"endLine":32,"endColumn":72,"fileName":"pxt_modules/game/spritemap.ts","functionName":"inline","argumentNames":["neighbor"]}
+inline__P24802.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__P209855_mk(s) {
+function inline__P24802_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P209855, depth: s.depth + 1,
+        parent: s, fn: inline__P24802, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -65738,7 +65757,7 @@ function inline__P209855_mk(s) {
 
 
 
-function sprites_SpriteMap_neighbors__P187313(s) {
+function sprites_SpriteMap_neighbors__P2096(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65748,112 +65767,112 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.n___209897 = undefined;
-    s.layer___209899 = undefined;
+    s.n___24844 = undefined;
+    s.layer___24846 = 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__C187311_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
     r0 = pxsim_Array__mk();
-    s.n___209897 = (r0);
+    s.n___24844 = (r0);
     r0 = s.arg1.fields["layer"];
-    s.layer___209899 = (r0);
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P189416_mk(s);
+    s.layer___24846 = (r0);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_left__P187279_mk(s);
+    s.tmp_1 = Sprite_left__P2062_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.callLocIdx = 479; s.pc = 2; return s.tmp_1;
   case 2:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_top__P187283_mk(s);
+    s.tmp_2 = Sprite_top__P2066_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 480; s.pc = 3; return s.tmp_2;
   case 3:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___209899;
-    s.tmp_0.arg4 = s.n___209897;
+    s.tmp_0.arg3 = s.layer___24846;
+    s.tmp_0.arg4 = s.n___24844;
     s.callLocIdx = 481; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P189416_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_left__P187279_mk(s);
+    s.tmp_1 = Sprite_left__P2062_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.callLocIdx = 482; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_bottom__P187285_mk(s);
+    s.tmp_2 = Sprite_bottom__P2068_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 483; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___209899;
-    s.tmp_0.arg4 = s.n___209897;
+    s.tmp_0.arg3 = s.layer___24846;
+    s.tmp_0.arg4 = s.n___24844;
     s.callLocIdx = 484; s.pc = 4; return s.tmp_0;
   case 4:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P189416_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_right__P187281_mk(s);
+    s.tmp_1 = Sprite_right__P2064_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.callLocIdx = 485; s.pc = 8; return s.tmp_1;
   case 8:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_top__P187283_mk(s);
+    s.tmp_2 = Sprite_top__P2066_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 486; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___209899;
-    s.tmp_0.arg4 = s.n___209897;
+    s.tmp_0.arg3 = s.layer___24846;
+    s.tmp_0.arg4 = s.n___24844;
     s.callLocIdx = 487; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P189416_mk(s);
+    s.tmp_0 = sprites_SpriteMap_mergeAtKey__P4200_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_1 = Sprite_right__P187281_mk(s);
+    s.tmp_1 = Sprite_right__P2064_mk(s);
     s.tmp_1.arg0 = s.arg1;
     s.callLocIdx = 488; s.pc = 11; return s.tmp_1;
   case 11:
     r0 = s.retval;
     s.tmp_0.arg1 = r0;
-    s.tmp_2 = Sprite_bottom__P187285_mk(s);
+    s.tmp_2 = Sprite_bottom__P2068_mk(s);
     s.tmp_2.arg0 = s.arg1;
     s.callLocIdx = 489; s.pc = 12; return s.tmp_2;
   case 12:
     r0 = s.retval;
     s.tmp_0.arg2 = r0;
-    s.tmp_0.arg3 = s.layer___209899;
-    s.tmp_0.arg4 = s.n___209897;
+    s.tmp_0.arg3 = s.layer___24846;
+    s.tmp_0.arg4 = s.n___24844;
     s.callLocIdx = 490; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
-    r0 = pxsim_Array_.removeElement(s.n___209897, s.arg1);
-    r0 = s.n___209897;
+    r0 = pxsim_Array_.removeElement(s.n___24844, s.arg1);
+    r0 = s.n___24844;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_neighbors__P187313.info = {"start":376,"length":442,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"neighbors","argumentNames":["this","sprite"]}
+sprites_SpriteMap_neighbors__P2096.info = {"start":376,"length":442,"line":15,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"neighbors","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_neighbors__P187313_mk(s) {
+function sprites_SpriteMap_neighbors__P2096_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_neighbors__P187313, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_neighbors__P2096, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  n___209897: undefined,
-  layer___209899: undefined,
+  n___24844: undefined,
+  layer___24846: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -65862,7 +65881,7 @@ function sprites_SpriteMap_neighbors__P187313_mk(s) {
 
 
 
-function sprites_SpriteMap_mergeAtKey__P189416(s) {
+function sprites_SpriteMap_mergeAtKey__P4200(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65872,11 +65891,11 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.k___209940 = undefined;
-    s.bucket___209945 = undefined;
-    s.sprite___209952 = undefined;
-    s.unnamed8908___U3 = undefined;
-    s.unnamed8909___U4 = undefined;
+    s.k___24887 = undefined;
+    s.bucket___24892 = undefined;
+    s.sprite___24899 = undefined;
+    s.unnamed100___U3 = undefined;
+    s.unnamed101___U4 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -65886,33 +65905,33 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C187311_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_key__P189414_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_key__P4198_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.callLocIdx = 517; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.k___209940 = (r0);
+    s.k___24887 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___209940);
-    s.bucket___209945 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.bucket___209945);
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___24887);
+    s.bucket___24892 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.bucket___24892);
     if (!r0) { step = 7; continue; }
-    s.sprite___209952 = (undefined);
-    s.unnamed8908___U3 = (s.bucket___209945);
-    s.unnamed8909___U4 = (0);
+    s.sprite___24899 = (undefined);
+    s.unnamed100___U3 = (s.bucket___24892);
+    s.unnamed101___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8909___U4;
-    r0 = pxsim_Array__length(s.unnamed8908___U3);
+    s.tmp_0 = r0 = s.unnamed101___U4;
+    r0 = pxsim_Array__length(s.unnamed100___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8908___U3, s.unnamed8909___U4);
-    s.sprite___209952 = (r0);
-    r0 = s.sprite___209952.fields["layer"];
+    r0 = pxsim_Array__getAt(s.unnamed100___U3, s.unnamed101___U4);
+    s.sprite___24899 = (r0);
+    r0 = s.sprite___24899.fields["layer"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 & s.arg3);
     s.tmp_2 = r0;
@@ -65921,7 +65940,7 @@ switch (step) {
     r0 = s.tmp_2;
     { step = 3; continue; }
   case 2:
-    r0 = pxsim_Array_.indexOf(s.arg4, s.sprite___209952, undefined);
+    r0 = pxsim_Array_.indexOf(s.arg4, s.sprite___24899, undefined);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 < 0);
   case 3:
@@ -65929,26 +65948,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___209952);
+    r0 = pxsim_Array__push(s.arg4, s.sprite___24899);
   case 4:
   case 5:
-    r0 = (s.unnamed8909___U4 + 1);
-    s.unnamed8909___U4 = (r0);
+    r0 = (s.unnamed101___U4 + 1);
+    s.unnamed101___U4 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed8908___U3 = (undefined);
+    s.unnamed100___U3 = (undefined);
   case 7:
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_mergeAtKey__P189416.info = {"start":3715,"length":384,"line":101,"column":8,"endLine":110,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"mergeAtKey","argumentNames":["this","x","y","layer","n"]}
+sprites_SpriteMap_mergeAtKey__P4200.info = {"start":3715,"length":384,"line":101,"column":8,"endLine":110,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"mergeAtKey","argumentNames":["this","x","y","layer","n"]}
 
-function sprites_SpriteMap_mergeAtKey__P189416_mk(s) {
+function sprites_SpriteMap_mergeAtKey__P4200_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_mergeAtKey__P189416, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_mergeAtKey__P4200, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -65956,11 +65975,11 @@ function sprites_SpriteMap_mergeAtKey__P189416_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  k___209940: undefined,
-  bucket___209945: undefined,
-  sprite___209952: undefined,
-  unnamed8908___U3: undefined,
-  unnamed8909___U4: undefined,
+  k___24887: undefined,
+  bucket___24892: undefined,
+  sprite___24899: undefined,
+  unnamed100___U3: undefined,
+  unnamed101___U4: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -65972,7 +65991,7 @@ function sprites_SpriteMap_mergeAtKey__P189416_mk(s) {
 
 
 
-function sprites_SpriteMap_key__P189414(s) {
+function sprites_SpriteMap_key__P4198(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -65982,8 +66001,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.xi___209973 = undefined;
-    s.yi___209985 = undefined;
+    s.xi___24920 = undefined;
+    s.yi___24932 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -65991,8 +66010,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C187311_VT)) failedCast(r0);
-    s.tmp_0 = Math_clamp__P185339_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    s.tmp_0 = Math_clamp__P122_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg0.fields["columnCount"];
     s.tmp_0.arg1 = r0;
@@ -66003,8 +66022,8 @@ switch (step) {
     s.callLocIdx = 505; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.xi___209973 = (r0);
-    s.tmp_0 = Math_clamp__P185339_mk(s);
+    s.xi___24920 = (r0);
+    s.tmp_0 = Math_clamp__P122_mk(s);
     s.tmp_0.arg0 = 0;
     r0 = s.arg0.fields["rowCount"];
     s.tmp_0.arg1 = r0;
@@ -66015,28 +66034,28 @@ switch (step) {
     s.callLocIdx = 506; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
-    s.yi___209985 = (r0);
-    s.tmp_0 = r0 = s.xi___209973;
+    s.yi___24932 = (r0);
+    s.tmp_0 = r0 = s.xi___24920;
     r0 = s.arg0.fields["columnCount"];
     s.tmp_2 = r0;
-    r0 = (s.yi___209985 * s.tmp_2);
+    r0 = (s.yi___24932 * s.tmp_2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_key__P189414.info = {"start":2592,"length":270,"line":76,"column":8,"endLine":80,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"key","argumentNames":["this","x","y"]}
+sprites_SpriteMap_key__P4198.info = {"start":2592,"length":270,"line":76,"column":8,"endLine":80,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"key","argumentNames":["this","x","y"]}
 
-function sprites_SpriteMap_key__P189414_mk(s) {
+function sprites_SpriteMap_key__P4198_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_key__P189414, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_key__P4198, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  xi___209973: undefined,
-  yi___209985: undefined,
+  xi___24920: undefined,
+  yi___24932: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -66046,7 +66065,7 @@ function sprites_SpriteMap_key__P189414_mk(s) {
 
 
 
-function Sprite_overlapsWith__P187297(s) {
+function Sprite_overlapsWith__P2080(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66062,7 +66081,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = (s.arg1 == s.arg0);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -66095,13 +66114,13 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = s.arg0.fields["_image"];
     s.tmp_6 = r0;
-    s.tmp_9 = Sprite_left__P187279_mk(s);
+    s.tmp_9 = Sprite_left__P2062_mk(s);
     s.tmp_9.arg0 = s.arg0;
     s.callLocIdx = 409; s.pc = 8; return s.tmp_9;
   case 8:
     r0 = s.retval;
     s.tmp_8 = r0;
-    s.tmp_11 = Sprite_left__P187279_mk(s);
+    s.tmp_11 = Sprite_left__P2062_mk(s);
     s.tmp_11.arg0 = s.arg1;
     s.callLocIdx = 410; s.pc = 9; return s.tmp_11;
   case 9:
@@ -66109,13 +66128,13 @@ switch (step) {
     s.tmp_10 = r0;
     r0 = (s.tmp_8 - s.tmp_10);
     s.tmp_7 = r0;
-    s.tmp_14 = Sprite_top__P187283_mk(s);
+    s.tmp_14 = Sprite_top__P2066_mk(s);
     s.tmp_14.arg0 = s.arg0;
     s.callLocIdx = 411; s.pc = 10; return s.tmp_14;
   case 10:
     r0 = s.retval;
     s.tmp_13 = r0;
-    s.tmp_16 = Sprite_top__P187283_mk(s);
+    s.tmp_16 = Sprite_top__P2066_mk(s);
     s.tmp_16.arg0 = s.arg1;
     s.callLocIdx = 412; s.pc = 11; return s.tmp_16;
   case 11:
@@ -66128,12 +66147,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_overlapsWith__P187297.info = {"start":24476,"length":434,"line":748,"column":4,"endLine":756,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"overlapsWith","argumentNames":["this","other"]}
+Sprite_overlapsWith__P2080.info = {"start":24476,"length":434,"line":748,"column":4,"endLine":756,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"overlapsWith","argumentNames":["this","other"]}
 
-function Sprite_overlapsWith__P187297_mk(s) {
+function Sprite_overlapsWith__P2080_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_overlapsWith__P187297, depth: s.depth + 1,
+        parent: s, fn: Sprite_overlapsWith__P2080, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66160,7 +66179,7 @@ function Sprite_overlapsWith__P187297_mk(s) {
 
 
 
-function ArcadePhysicsEngine_createMovingSprite__P189437(s) {
+function ArcadePhysicsEngine_createMovingSprite__P4221(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66170,16 +66189,16 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ovx___210187 = undefined;
-    s.ovy___210192 = undefined;
-    s.fx___210219 = undefined;
-    s.c___210226 = undefined;
-    s.fy___210269 = undefined;
-    s.c___210276 = undefined;
-    s.dx___210315 = undefined;
-    s.dy___210324 = undefined;
-    s.xStep___210333 = undefined;
-    s.yStep___210335 = undefined;
+    s.ovx___25134 = undefined;
+    s.ovy___25139 = undefined;
+    s.fx___25166 = undefined;
+    s.c___25173 = undefined;
+    s.fy___25216 = undefined;
+    s.c___25223 = undefined;
+    s.dx___25262 = undefined;
+    s.dy___25271 = undefined;
+    s.xStep___25280 = undefined;
+    s.yStep___25282 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -66188,23 +66207,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
-    s.tmp_0 = ArcadePhysicsEngine_constrain__P189442_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    s.tmp_0 = ArcadePhysicsEngine_constrain__P4226_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 586; s.pc = 25; return s.tmp_0;
   case 25:
     r0 = s.retval;
-    s.ovx___210187 = (r0);
-    s.tmp_0 = ArcadePhysicsEngine_constrain__P189442_mk(s);
+    s.ovx___25134 = (r0);
+    s.tmp_0 = ArcadePhysicsEngine_constrain__P4226_mk(s);
     s.tmp_0.arg0 = s.arg0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_0.arg1 = r0;
     s.callLocIdx = 587; s.pc = 26; return s.tmp_0;
   case 26:
     r0 = s.retval;
-    s.ovy___210192 = (r0);
+    s.ovy___25139 = (r0);
     r0 = s.arg1.fields["_x"];
     s.tmp_0 = r0;
     r0 = (s.arg1).fields["_lastX"] = (s.tmp_0);
@@ -66242,21 +66261,21 @@ switch (step) {
     r0 = (s.tmp_3 >> 8);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 1000);
-    s.fx___210219 = (r0);
+    s.fx___25166 = (r0);
     r0 = s.arg1.fields["_vx"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.fx___210219);
-    s.c___210226 = (r0);
-    r0 = (s.c___210226 < 0);
+    r0 = (s.tmp_0 - s.fx___25166);
+    s.c___25173 = (r0);
+    r0 = (s.c___25173 < 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__P185378_mk(s);
+    s.tmp_3 = Fx_min__P161_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.fx___210219);
+    r0 = (s.tmp_4 + s.fx___25166);
     s.tmp_3.arg1 = r0;
     s.callLocIdx = 595; s.pc = 27; return s.tmp_3;
   case 27:
@@ -66265,16 +66284,16 @@ switch (step) {
     r0 = (s.tmp_1).fields["_vx"] = (s.tmp_2);
     { step = 5; continue; }
   case 2:
-    r0 = (s.c___210226 > 0);
+    r0 = (s.c___25173 > 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__P185379_mk(s);
+    s.tmp_3 = Fx_max__P162_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.fx___210219);
+    r0 = (s.tmp_4 - s.fx___25166);
     s.tmp_3.arg1 = r0;
     s.callLocIdx = 597; s.pc = 28; return s.tmp_3;
   case 28:
@@ -66320,21 +66339,21 @@ switch (step) {
     r0 = (s.tmp_3 >> 8);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_1, 1000);
-    s.fy___210269 = (r0);
+    s.fy___25216 = (r0);
     r0 = s.arg1.fields["_vy"];
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.fy___210269);
-    s.c___210276 = (r0);
-    r0 = (s.c___210276 < 0);
+    r0 = (s.tmp_0 - s.fy___25216);
+    s.c___25223 = (r0);
+    r0 = (s.c___25223 < 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__P185378_mk(s);
+    s.tmp_3 = Fx_min__P161_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 + s.fy___210269);
+    r0 = (s.tmp_4 + s.fy___25216);
     s.tmp_3.arg1 = r0;
     s.callLocIdx = 605; s.pc = 29; return s.tmp_3;
   case 29:
@@ -66343,16 +66362,16 @@ switch (step) {
     r0 = (s.tmp_1).fields["_vy"] = (s.tmp_2);
     { step = 13; continue; }
   case 10:
-    r0 = (s.c___210276 > 0);
+    r0 = (s.c___25223 > 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__P185378_mk(s);
+    s.tmp_3 = Fx_min__P161_mk(s);
     s.tmp_3.arg0 = 0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_4 = r0;
-    r0 = (s.tmp_4 - s.fy___210269);
+    r0 = (s.tmp_4 - s.fy___25216);
     s.tmp_3.arg1 = r0;
     s.callLocIdx = 607; s.pc = 30; return s.tmp_3;
   case 30:
@@ -66368,7 +66387,7 @@ switch (step) {
   case 15:
   case 16:
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_2 = ArcadePhysicsEngine_constrain__P189442_mk(s);
+    s.tmp_2 = ArcadePhysicsEngine_constrain__P4226_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg1.fields["_vx"];
     s.tmp_2.arg1 = r0;
@@ -66378,7 +66397,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["_vx"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg1;
-    s.tmp_2 = ArcadePhysicsEngine_constrain__P189442_mk(s);
+    s.tmp_2 = ArcadePhysicsEngine_constrain__P4226_mk(s);
     s.tmp_2.arg0 = s.arg0;
     r0 = s.arg1.fields["_vy"];
     s.tmp_2.arg1 = r0;
@@ -66389,29 +66408,29 @@ switch (step) {
     r0 = (s.tmp_0).fields["_vy"] = (s.tmp_1);
     r0 = s.arg1.fields["_vx"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.ovx___210187);
+    r0 = (s.tmp_2 + s.ovx___25134);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.imul(s.tmp_1, s.arg3);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 8);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 1000);
-    s.dx___210315 = (r0);
+    s.dx___25262 = (r0);
     r0 = s.arg1.fields["_vy"];
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 + s.ovy___210192);
+    r0 = (s.tmp_2 + s.ovy___25139);
     s.tmp_1 = r0;
     r0 = pxsim.Math_.imul(s.tmp_1, s.arg3);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 8);
     s.tmp_0 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, 1000);
-    s.dy___210324 = (r0);
-    s.xStep___210333 = (s.dx___210315);
-    s.yStep___210335 = (s.dy___210324);
+    s.dy___25271 = (r0);
+    s.xStep___25280 = (s.dx___25262);
+    s.yStep___25282 = (s.dy___25271);
   case 17:
-    s.tmp_2 = Fx_abs__P185377_mk(s);
-    s.tmp_2.arg0 = s.xStep___210333;
+    s.tmp_2 = Fx_abs__P160_mk(s);
+    s.tmp_2.arg0 = s.xStep___25280;
     s.callLocIdx = 616; s.pc = 33; return s.tmp_2;
   case 33:
     r0 = s.retval;
@@ -66425,8 +66444,8 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 19; continue; }
   case 18:
-    s.tmp_5 = Fx_abs__P185377_mk(s);
-    s.tmp_5.arg0 = s.yStep___210335;
+    s.tmp_5 = Fx_abs__P160_mk(s);
+    s.tmp_5.arg0 = s.yStep___25282;
     s.callLocIdx = 617; s.pc = 34; return s.tmp_5;
   case 34:
     r0 = s.retval;
@@ -66439,8 +66458,8 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_7);
     if (!r0) { step = 24; continue; }
-    s.tmp_10 = Fx_abs__P185377_mk(s);
-    s.tmp_10.arg0 = s.xStep___210333;
+    s.tmp_10 = Fx_abs__P160_mk(s);
+    s.tmp_10.arg0 = s.xStep___25280;
     s.callLocIdx = 618; s.pc = 35; return s.tmp_10;
   case 35:
     r0 = s.retval;
@@ -66451,12 +66470,12 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_8);
     if (!r0) { step = 20; continue; }
-    r0 = pxsim.Math_.idiv(s.xStep___210333, 2);
-    s.xStep___210333 = (r0);
+    r0 = pxsim.Math_.idiv(s.xStep___25280, 2);
+    s.xStep___25280 = (r0);
   case 20:
   case 21:
-    s.tmp_2 = Fx_abs__P185377_mk(s);
-    s.tmp_2.arg0 = s.yStep___210335;
+    s.tmp_2 = Fx_abs__P160_mk(s);
+    s.tmp_2.arg0 = s.yStep___25282;
     s.callLocIdx = 620; s.pc = 36; return s.tmp_2;
   case 36:
     r0 = s.retval;
@@ -66467,25 +66486,25 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 22; continue; }
-    r0 = pxsim.Math_.idiv(s.yStep___210335, 2);
-    s.yStep___210335 = (r0);
+    r0 = pxsim.Math_.idiv(s.yStep___25282, 2);
+    s.yStep___25282 = (r0);
   case 22:
   case 23:
     { step = 17; continue; }
   case 24:
-    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C187388_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(MovingSprite__C2171_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = MovingSprite_constructor__P187389_mk(s);
+    s.tmp_1 = MovingSprite_constructor__P2172_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___210315;
-    s.tmp_1.arg5 = s.dy___210324;
-    s.tmp_1.arg6 = s.xStep___210333;
-    s.tmp_1.arg7 = s.yStep___210335;
+    s.tmp_1.arg4 = s.dx___25262;
+    s.tmp_1.arg5 = s.dy___25271;
+    s.tmp_1.arg6 = s.xStep___25280;
+    s.tmp_1.arg7 = s.yStep___25282;
     s.callLocIdx = 622; s.pc = 37; return s.tmp_1;
   case 37:
     r0 = s.retval;
@@ -66493,12 +66512,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_createMovingSprite__P189437.info = {"start":6528,"length":3065,"line":213,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"createMovingSprite","argumentNames":["this","sprite","dtMs","dt2"]}
+ArcadePhysicsEngine_createMovingSprite__P4221.info = {"start":6528,"length":3065,"line":213,"column":4,"endLine":322,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"createMovingSprite","argumentNames":["this","sprite","dtMs","dt2"]}
 
-function ArcadePhysicsEngine_createMovingSprite__P189437_mk(s) {
+function ArcadePhysicsEngine_createMovingSprite__P4221_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_createMovingSprite__P189437, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_createMovingSprite__P4221, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66512,16 +66531,16 @@ function ArcadePhysicsEngine_createMovingSprite__P189437_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  ovx___210187: undefined,
-  ovy___210192: undefined,
-  fx___210219: undefined,
-  c___210226: undefined,
-  fy___210269: undefined,
-  c___210276: undefined,
-  dx___210315: undefined,
-  dy___210324: undefined,
-  xStep___210333: undefined,
-  yStep___210335: undefined,
+  ovx___25134: undefined,
+  ovy___25139: undefined,
+  fx___25166: undefined,
+  c___25173: undefined,
+  fy___25216: undefined,
+  c___25223: undefined,
+  dx___25262: undefined,
+  dy___25271: undefined,
+  xStep___25280: undefined,
+  yStep___25282: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -66532,7 +66551,7 @@ function ArcadePhysicsEngine_createMovingSprite__P189437_mk(s) {
 
 
 
-function ArcadePhysicsEngine_constrain__P189442(s) {
+function ArcadePhysicsEngine_constrain__P4226(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66548,9 +66567,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
-    s.tmp_0 = Fx_max__P185379_mk(s);
-    s.tmp_1 = Fx_min__P185378_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    s.tmp_0 = Fx_max__P162_mk(s);
+    s.tmp_1 = Fx_min__P161_mk(s);
     r0 = s.arg0.fields["maxVelocity"];
     s.tmp_1.arg0 = r0;
     s.tmp_1.arg1 = s.arg1;
@@ -66566,12 +66585,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_constrain__P189442.info = {"start":25298,"length":191,"line":751,"column":4,"endLine":759,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"constrain","argumentNames":["this","v"]}
+ArcadePhysicsEngine_constrain__P4226.info = {"start":25298,"length":191,"line":751,"column":4,"endLine":759,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"constrain","argumentNames":["this","v"]}
 
-function ArcadePhysicsEngine_constrain__P189442_mk(s) {
+function ArcadePhysicsEngine_constrain__P4226_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_constrain__P189442, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_constrain__P4226, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66583,7 +66602,7 @@ function ArcadePhysicsEngine_constrain__P189442_mk(s) {
 
 
 
-function Fx_max__P185379(s) {
+function Fx_max__P162(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66614,12 +66633,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_max__P185379.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__P162.info = {"start":1797,"length":117,"line":56,"column":4,"endLine":61,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"max","argumentNames":["a","b"]}
 
-function Fx_max__P185379_mk(s) {
+function Fx_max__P162_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_max__P185379, depth: s.depth + 1,
+        parent: s, fn: Fx_max__P162, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -66630,7 +66649,7 @@ function Fx_max__P185379_mk(s) {
 
 
 
-function Fx_compare__P185376(s) {
+function Fx_compare__P159(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66649,12 +66668,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_compare__P185376.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__P159.info = {"start":1395,"length":106,"line":41,"column":4,"endLine":43,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"compare","argumentNames":["a","b"]}
 
-function Fx_compare__P185376_mk(s) {
+function Fx_compare__P159_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_compare__P185376, depth: s.depth + 1,
+        parent: s, fn: Fx_compare__P159, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -66664,7 +66683,7 @@ function Fx_compare__P185376_mk(s) {
 
 
 
-function sprites_SpriteMap_insertAABB__P187318(s) {
+function sprites_SpriteMap_insertAABB__P2101(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66674,31 +66693,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.left___210005 = undefined;
-    s.top___210008 = undefined;
-    s.xn___210011 = undefined;
-    s.yn___210022 = undefined;
-    s.x___210033 = undefined;
-    s.y___210038 = undefined;
+    s.left___24952 = undefined;
+    s.top___24955 = undefined;
+    s.xn___24958 = undefined;
+    s.yn___24969 = undefined;
+    s.x___24980 = undefined;
+    s.y___24985 = 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__C187311_VT)) failedCast(r0);
-    s.tmp_0 = Sprite_left__P187279_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    s.tmp_0 = Sprite_left__P2062_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.callLocIdx = 508; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.left___210005 = (r0);
-    s.tmp_0 = Sprite_top__P187283_mk(s);
+    s.left___24952 = (r0);
+    s.tmp_0 = Sprite_top__P2066_mk(s);
     s.tmp_0.arg0 = s.arg1;
     s.callLocIdx = 509; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.top___210008 = (r0);
+    s.top___24955 = (r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_3);
@@ -66712,7 +66731,7 @@ switch (step) {
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_5);
-    s.xn___210011 = (r0);
+    s.xn___24958 = (r0);
     r0 = s.arg1.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
@@ -66726,30 +66745,30 @@ switch (step) {
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_5 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_5);
-    s.yn___210022 = (r0);
-    s.x___210033 = (0);
+    s.yn___24969 = (r0);
+    s.x___24980 = (0);
   case 1:
-    r0 = (s.x___210033 <= s.xn___210011);
+    r0 = (s.x___24980 <= s.xn___24958);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.y___210038 = (0);
+    s.y___24985 = (0);
   case 2:
-    r0 = (s.y___210038 <= s.yn___210022);
+    r0 = (s.y___24985 <= s.yn___24969);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_1 = sprites_SpriteMap_insertAtKey__P189415_mk(s);
+    s.tmp_1 = sprites_SpriteMap_insertAtKey__P4199_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    s.tmp_2 = r0 = s.left___210005;
-    s.tmp_4 = Math_min__P185343_mk(s);
+    s.tmp_2 = r0 = s.left___24952;
+    s.tmp_4 = Math_min__P126_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___210033 * s.tmp_6);
+    r0 = (s.x___24980 * s.tmp_6);
     s.tmp_4.arg1 = r0;
     s.callLocIdx = 513; s.pc = 8; return s.tmp_4;
   case 8:
@@ -66757,15 +66776,15 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1.arg1 = r0;
-    s.tmp_7 = r0 = s.top___210008;
-    s.tmp_9 = Math_min__P185343_mk(s);
+    s.tmp_7 = r0 = s.top___24955;
+    s.tmp_9 = Math_min__P126_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___210038 * s.tmp_11);
+    r0 = (s.y___24985 * s.tmp_11);
     s.tmp_9.arg1 = r0;
     s.callLocIdx = 515; s.pc = 9; return s.tmp_9;
   case 9:
@@ -66777,24 +66796,24 @@ switch (step) {
     s.callLocIdx = 516; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
-    r0 = (s.y___210038 + 1);
-    s.y___210038 = (r0);
+    r0 = (s.y___24985 + 1);
+    s.y___24985 = (r0);
     { step = 2; continue; }
   case 3:
-    r0 = (s.x___210033 + 1);
-    s.x___210033 = (r0);
+    r0 = (s.x___24980 + 1);
+    s.x___24980 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_insertAABB__P187318.info = {"start":3184,"length":521,"line":91,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"insertAABB","argumentNames":["this","sprite"]}
+sprites_SpriteMap_insertAABB__P2101.info = {"start":3184,"length":521,"line":91,"column":8,"endLine":99,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"insertAABB","argumentNames":["this","sprite"]}
 
-function sprites_SpriteMap_insertAABB__P187318_mk(s) {
+function sprites_SpriteMap_insertAABB__P2101_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_insertAABB__P187318, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_insertAABB__P2101, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66808,12 +66827,12 @@ function sprites_SpriteMap_insertAABB__P187318_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  left___210005: undefined,
-  top___210008: undefined,
-  xn___210011: undefined,
-  yn___210022: undefined,
-  x___210033: undefined,
-  y___210038: undefined,
+  left___24952: undefined,
+  top___24955: undefined,
+  xn___24958: undefined,
+  yn___24969: undefined,
+  x___24980: undefined,
+  y___24985: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -66822,7 +66841,7 @@ function sprites_SpriteMap_insertAABB__P187318_mk(s) {
 
 
 
-function sprites_SpriteMap_insertAtKey__P189415(s) {
+function sprites_SpriteMap_insertAtKey__P4199(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66832,8 +66851,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.k___210073 = undefined;
-    s.bucket___210078 = undefined;
+    s.k___25020 = undefined;
+    s.bucket___25025 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -66842,20 +66861,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C187311_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_key__P189414_mk(s);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_key__P4198_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
     s.tmp_0.arg2 = s.arg2;
     s.callLocIdx = 507; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
-    s.k___210073 = (r0);
+    s.k___25020 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___210073);
-    s.bucket___210078 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.bucket___210078);
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___25020);
+    s.bucket___25025 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.bucket___25025);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
@@ -66863,40 +66882,40 @@ switch (step) {
     if (!r0) { step = 1; continue; }
     r0 = s.arg0.fields["buckets"];
     s.tmp_2 = r0;
-    s.tmp_3 = r0 = s.k___210073;
+    s.tmp_3 = r0 = s.k___25020;
     r0 = pxsim_Array__mk();
     s.tmp_4 = r0;
     r0 = pxsim_Array_.setAt(s.tmp_2, s.tmp_3, s.tmp_4);
-    s.bucket___210078 = (s.tmp_4);
+    s.bucket___25025 = (s.tmp_4);
   case 1:
   case 2:
-    r0 = pxsim_Array_.indexOf(s.bucket___210078, s.arg3, undefined);
+    r0 = pxsim_Array_.indexOf(s.bucket___25025, 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___210078, s.arg3);
+    r0 = pxsim_Array__push(s.bucket___25025, s.arg3);
   case 3:
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_insertAtKey__P189415.info = {"start":2872,"length":302,"line":82,"column":8,"endLine":89,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"insertAtKey","argumentNames":["this","x","y","sprite"]}
+sprites_SpriteMap_insertAtKey__P4199.info = {"start":2872,"length":302,"line":82,"column":8,"endLine":89,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"insertAtKey","argumentNames":["this","x","y","sprite"]}
 
-function sprites_SpriteMap_insertAtKey__P189415_mk(s) {
+function sprites_SpriteMap_insertAtKey__P4199_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_insertAtKey__P189415, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_insertAtKey__P4199, 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___210073: undefined,
-  bucket___210078: undefined,
+  k___25020: undefined,
+  bucket___25025: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -66907,7 +66926,7 @@ function sprites_SpriteMap_insertAtKey__P189415_mk(s) {
 
 
 
-function sprites_SpriteMap_clear__P187317(s) {
+function sprites_SpriteMap_clear__P2100(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66922,7 +66941,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C187311_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -66931,12 +66950,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_clear__P187317.info = {"start":2532,"length":50,"line":72,"column":8,"endLine":74,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"clear","argumentNames":["this"]}
+sprites_SpriteMap_clear__P2100.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__P187317_mk(s) {
+function sprites_SpriteMap_clear__P2100_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_clear__P187317, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_clear__P2100, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -66947,7 +66966,7 @@ function sprites_SpriteMap_clear__P187317_mk(s) {
 
 
 
-function sprites_SpriteMap_resizeBuckets__P187316(s) {
+function sprites_SpriteMap_resizeBuckets__P2099(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66957,107 +66976,107 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.maxWidth___210110 = undefined;
-    s.maxHeight___210111 = undefined;
-    s.sprite___210113 = undefined;
-    s.unnamed8906___U3 = undefined;
-    s.unnamed8907___U4 = undefined;
-    s.tMap___210129 = undefined;
-    s.areaWidth___210133 = undefined;
-    s.areaHeight___210140 = undefined;
+    s.maxWidth___25057 = undefined;
+    s.maxHeight___25058 = undefined;
+    s.sprite___25060 = undefined;
+    s.unnamed98___U3 = undefined;
+    s.unnamed99___U4 = undefined;
+    s.tMap___25076 = undefined;
+    s.areaWidth___25080 = undefined;
+    s.areaHeight___25087 = 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__C187311_VT)) failedCast(r0);
-    s.maxWidth___210110 = (0);
-    s.maxHeight___210111 = (0);
-    s.sprite___210113 = (undefined);
-    s.unnamed8906___U3 = (s.arg1);
-    s.unnamed8907___U4 = (0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    s.maxWidth___25057 = (0);
+    s.maxHeight___25058 = (0);
+    s.sprite___25060 = (undefined);
+    s.unnamed98___U3 = (s.arg1);
+    s.unnamed99___U4 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8907___U4;
-    r0 = pxsim_Array__length(s.unnamed8906___U3);
+    s.tmp_0 = r0 = s.unnamed99___U4;
+    r0 = pxsim_Array__length(s.unnamed98___U3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 6; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8906___U3, s.unnamed8907___U4);
-    s.sprite___210113 = (r0);
-    r0 = s.sprite___210113.fields["_image"];
+    r0 = pxsim_Array__getAt(s.unnamed98___U3, s.unnamed99___U4);
+    s.sprite___25060 = (r0);
+    r0 = s.sprite___25060.fields["_image"];
     s.tmp_4 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_4);
     s.tmp_3 = r0;
-    r0 = (s.tmp_3 > s.maxWidth___210110);
+    r0 = (s.tmp_3 > s.maxWidth___25057);
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
     if (!r0) { step = 2; continue; }
-    r0 = s.sprite___210113.fields["_image"];
+    r0 = s.sprite___25060.fields["_image"];
     s.tmp_5 = r0;
     r0 = pxsim_ImageMethods.width(s.tmp_5);
-    s.maxWidth___210110 = (r0);
+    s.maxWidth___25057 = (r0);
   case 2:
   case 3:
-    r0 = s.sprite___210113.fields["_image"];
+    r0 = s.sprite___25060.fields["_image"];
     s.tmp_2 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_2);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 > s.maxHeight___210111);
+    r0 = (s.tmp_1 > s.maxHeight___25058);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    r0 = s.sprite___210113.fields["_image"];
+    r0 = s.sprite___25060.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
-    s.maxHeight___210111 = (r0);
+    s.maxHeight___25058 = (r0);
   case 4:
   case 5:
-    r0 = (s.unnamed8907___U4 + 1);
-    s.unnamed8907___U4 = (r0);
+    r0 = (s.unnamed99___U4 + 1);
+    s.unnamed99___U4 = (r0);
     { step = 1; continue; }
   case 6:
-    s.unnamed8906___U3 = (undefined);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.unnamed98___U3 = (undefined);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 500; s.pc = 11; return s.tmp_0;
   case 11:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tMap___210129 = (r0);
-    r0 = pxsim_numops_toBoolDecr(s.tMap___210129);
+    s.tMap___25076 = (r0);
+    r0 = pxsim_numops_toBoolDecr(s.tMap___25076);
     if (!r0) { step = 7; continue; }
-    s.tmp_0 = tiles_TileMap_areaWidth__P187540_mk(s);
-    s.tmp_0.arg0 = s.tMap___210129;
+    s.tmp_0 = tiles_TileMap_areaWidth__P2323_mk(s);
+    s.tmp_0.arg0 = s.tMap___25076;
     s.callLocIdx = 501; s.pc = 12; return s.tmp_0;
   case 12:
     r0 = s.retval;
     { step = 8; continue; }
   case 7:
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
   case 8:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.areaWidth___210133 = (s.tmp_1);
-    r0 = pxsim_numops_toBoolDecr(s.tMap___210129);
+    s.areaWidth___25080 = (s.tmp_1);
+    r0 = pxsim_numops_toBoolDecr(s.tMap___25076);
     if (!r0) { step = 9; continue; }
-    s.tmp_0 = tiles_TileMap_areaHeight__P187541_mk(s);
-    s.tmp_0.arg0 = s.tMap___210129;
+    s.tmp_0 = tiles_TileMap_areaHeight__P2324_mk(s);
+    s.tmp_0.arg0 = s.tMap___25076;
     s.callLocIdx = 502; s.pc = 13; return s.tmp_0;
   case 13:
     r0 = s.retval;
     { step = 10; continue; }
   case 9:
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
   case 10:
     // jmp value (already in r0)
     s.tmp_1 = r0;
-    s.areaHeight___210140 = (s.tmp_1);
+    s.areaHeight___25087 = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_clamp__P185339_mk(s);
+    s.tmp_2 = Math_clamp__P122_mk(s);
     s.tmp_2.arg0 = 8;
-    r0 = (s.areaWidth___210133 >> 2);
+    r0 = (s.areaWidth___25080 >> 2);
     s.tmp_2.arg1 = r0;
-    r0 = (s.maxWidth___210110 * 2);
+    r0 = (s.maxWidth___25057 * 2);
     s.tmp_2.arg2 = r0;
     s.callLocIdx = 503; s.pc = 14; return s.tmp_2;
   case 14:
@@ -67065,11 +67084,11 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["cellWidth"] = (s.tmp_1);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_clamp__P185339_mk(s);
+    s.tmp_2 = Math_clamp__P122_mk(s);
     s.tmp_2.arg0 = 8;
-    r0 = (s.areaHeight___210140 >> 2);
+    r0 = (s.areaHeight___25087 >> 2);
     s.tmp_2.arg1 = r0;
-    r0 = (s.maxHeight___210111 * 2);
+    r0 = (s.maxHeight___25058 * 2);
     s.tmp_2.arg2 = r0;
     s.callLocIdx = 504; s.pc = 15; return s.tmp_2;
   case 15:
@@ -67079,25 +67098,25 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_2 = r0;
-    r0 = pxsim.Math_.idiv(s.areaHeight___210140, s.tmp_2);
+    r0 = pxsim.Math_.idiv(s.areaHeight___25087, 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___210133, s.tmp_2);
+    r0 = pxsim.Math_.idiv(s.areaWidth___25080, 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__P187316.info = {"start":1696,"length":826,"line":52,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"resizeBuckets","argumentNames":["this","sprites"]}
+sprites_SpriteMap_resizeBuckets__P2099.info = {"start":1696,"length":826,"line":52,"column":8,"endLine":70,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"resizeBuckets","argumentNames":["this","sprites"]}
 
-function sprites_SpriteMap_resizeBuckets__P187316_mk(s) {
+function sprites_SpriteMap_resizeBuckets__P2099_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_resizeBuckets__P187316, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_resizeBuckets__P2099, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67105,14 +67124,14 @@ function sprites_SpriteMap_resizeBuckets__P187316_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  maxWidth___210110: undefined,
-  maxHeight___210111: undefined,
-  sprite___210113: undefined,
-  unnamed8906___U3: undefined,
-  unnamed8907___U4: undefined,
-  tMap___210129: undefined,
-  areaWidth___210133: undefined,
-  areaHeight___210140: undefined,
+  maxWidth___25057: undefined,
+  maxHeight___25058: undefined,
+  sprite___25060: undefined,
+  unnamed98___U3: undefined,
+  unnamed99___U4: undefined,
+  tMap___25076: undefined,
+  areaWidth___25080: undefined,
+  areaHeight___25087: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67121,7 +67140,7 @@ function sprites_SpriteMap_resizeBuckets__P187316_mk(s) {
 
 
 
-function Sprite_clearObstacles__P187301(s) {
+function Sprite_clearObstacles__P2084(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67136,7 +67155,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
     r0 = pxsim_Array__mk();
     s.tmp_1 = r0;
@@ -67145,12 +67164,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_clearObstacles__P187301.info = {"start":26872,"length":54,"line":813,"column":4,"endLine":815,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"clearObstacles","argumentNames":["this"]}
+Sprite_clearObstacles__P2084.info = {"start":26872,"length":54,"line":813,"column":4,"endLine":815,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"clearObstacles","argumentNames":["this"]}
 
-function Sprite_clearObstacles__P187301_mk(s) {
+function Sprite_clearObstacles__P2084_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_clearObstacles__P187301, depth: s.depth + 1,
+        parent: s, fn: Sprite_clearObstacles__P2084, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67161,7 +67180,7 @@ function Sprite_clearObstacles__P187301_mk(s) {
 
 
 
-function Fx_idiv__P185375(s) {
+function Fx_idiv__P158(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67180,12 +67199,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_idiv__P185375.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__P158.info = {"start":1279,"length":111,"line":38,"column":4,"endLine":40,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"idiv","argumentNames":["a","b"]}
 
-function Fx_idiv__P185375_mk(s) {
+function Fx_idiv__P158_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_idiv__P185375, depth: s.depth + 1,
+        parent: s, fn: Fx_idiv__P158, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -67195,7 +67214,7 @@ function Fx_idiv__P185375_mk(s) {
 
 
 
-function Fx_div__P185374(s) {
+function Fx_div__P157(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67216,12 +67235,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Fx_div__P185374.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__P157.info = {"start":1145,"length":129,"line":35,"column":4,"endLine":37,"endColumn":5,"fileName":"pxt_modules/base/fixed.ts","functionName":"div","argumentNames":["a","b"]}
 
-function Fx_div__P185374_mk(s) {
+function Fx_div__P157_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Fx_div__P185374, depth: s.depth + 1,
+        parent: s, fn: Fx_div__P157, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -67232,7 +67251,7 @@ function Fx_div__P185374_mk(s) {
 
 
 
-function helpers_arrayMap__P185321(s) {
+function helpers_arrayMap__P104(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67242,58 +67261,58 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.res___210404 = undefined;
-    s.len___210406 = undefined;
-    s.i___210409 = undefined;
+    s.res___25351 = undefined;
+    s.len___25353 = undefined;
+    s.i___25356 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = pxsim_Array__mk();
-    s.res___210404 = (r0);
+    s.res___25351 = (r0);
     r0 = pxsim_Array__length(s.arg0);
-    s.len___210406 = (r0);
-    s.i___210409 = (0);
+    s.len___25353 = (r0);
+    s.i___25356 = (0);
   case 1:
-    r0 = (s.i___210409 < s.len___210406);
+    r0 = (s.i___25356 < s.len___25353);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_1 = r0 = s.res___210404;
+    s.tmp_1 = r0 = s.res___25351;
     s.tmp_3 = lambda_3_mk(s);
     s.tmp_3.argL = s.arg1;
-    r0 = pxsim_Array__getAt(s.arg0, s.i___210409);
+    r0 = pxsim_Array__getAt(s.arg0, s.i___25356);
     s.tmp_3.arg0 = r0;
-    s.tmp_3.arg1 = s.i___210409;
+    s.tmp_3.arg1 = s.i___25356;
     setupLambda(s.tmp_3, s.tmp_3.argL);
     s.callLocIdx = 4; s.pc = 3; return s.tmp_3;
   case 3:
     r0 = s.retval;
     s.tmp_2 = r0;
     r0 = pxsim_Array__push(s.tmp_1, s.tmp_2);
-    r0 = (s.i___210409 + 1);
-    s.i___210409 = (r0);
+    r0 = (s.i___25356 + 1);
+    s.i___25356 = (r0);
     { step = 1; continue; }
   case 2:
-    r0 = s.res___210404;
+    r0 = s.res___25351;
     return leave(s, r0)
   default: oops()
 } } }
-helpers_arrayMap__P185321.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__P104.info = {"start":6528,"length":299,"line":229,"column":4,"endLine":236,"endColumn":5,"fileName":"pxt_modules/base/pxt-helpers.ts","functionName":"arrayMap","argumentNames":["arr","callbackfn"]}
 
-function helpers_arrayMap__P185321_mk(s) {
+function helpers_arrayMap__P104_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: helpers_arrayMap__P185321, depth: s.depth + 1,
+        parent: s, fn: helpers_arrayMap__P104, 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___210404: undefined,
-  len___210406: undefined,
-  i___210409: undefined,
+  res___25351: undefined,
+  len___25353: undefined,
+  i___25356: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67302,7 +67321,7 @@ function helpers_arrayMap__P185321_mk(s) {
 
 
 
-function ArcadePhysicsEngine_draw__P187401(s) {
+function ArcadePhysicsEngine_draw__P2184(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67317,8 +67336,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
-    s.tmp_0 = sprites_SpriteMap_draw__P187315_mk(s);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
+    s.tmp_0 = sprites_SpriteMap_draw__P2098_mk(s);
     r0 = s.arg0.fields["map"];
     s.tmp_0.arg0 = r0;
     s.callLocIdx = 550; s.pc = 1; return s.tmp_0;
@@ -67328,12 +67347,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_draw__P187401.info = {"start":2506,"length":39,"line":105,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"draw","argumentNames":["this"]}
+ArcadePhysicsEngine_draw__P2184.info = {"start":2506,"length":39,"line":105,"column":4,"endLine":107,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"draw","argumentNames":["this"]}
 
-function ArcadePhysicsEngine_draw__P187401_mk(s) {
+function ArcadePhysicsEngine_draw__P2184_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_draw__P187401, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_draw__P2184, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -67343,7 +67362,7 @@ function ArcadePhysicsEngine_draw__P187401_mk(s) {
 
 
 
-function sprites_SpriteMap_draw__P187315(s) {
+function sprites_SpriteMap_draw__P2098(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67353,70 +67372,70 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.x___210436 = undefined;
-    s.y___210442 = undefined;
-    s.left___210448 = undefined;
-    s.top___210453 = undefined;
-    s.k___210458 = undefined;
-    s.b___210463 = undefined;
+    s.x___25383 = undefined;
+    s.y___25389 = undefined;
+    s.left___25395 = undefined;
+    s.top___25400 = undefined;
+    s.k___25405 = undefined;
+    s.b___25410 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_SpriteMap__C187311_VT)) failedCast(r0);
-    s.x___210436 = (0);
+    if (!checkSubtype(r0, sprites_SpriteMap__C2094_VT)) failedCast(r0);
+    s.x___25383 = (0);
   case 1:
     r0 = s.arg0.fields["columnCount"];
     s.tmp_1 = r0;
-    r0 = (s.x___210436 < s.tmp_1);
+    r0 = (s.x___25383 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 8; continue; }
-    s.y___210442 = (0);
+    s.y___25389 = (0);
   case 2:
     r0 = s.arg0.fields["rowCount"];
     s.tmp_1 = r0;
-    r0 = (s.y___210442 < s.tmp_1);
+    r0 = (s.y___25389 < 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___210436 * s.tmp_2);
-    s.left___210448 = (r0);
+    r0 = (s.x___25383 * s.tmp_2);
+    s.left___25395 = (r0);
     r0 = s.arg0.fields["cellHeight"];
     s.tmp_0 = r0;
-    r0 = (s.y___210442 * s.tmp_0);
-    s.top___210453 = (r0);
-    s.tmp_0 = sprites_SpriteMap_key__P189414_mk(s);
+    r0 = (s.y___25389 * s.tmp_0);
+    s.top___25400 = (r0);
+    s.tmp_0 = sprites_SpriteMap_key__P4198_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = s.left___210448;
-    s.tmp_0.arg2 = s.top___210453;
+    s.tmp_0.arg1 = s.left___25395;
+    s.tmp_0.arg2 = s.top___25400;
     s.callLocIdx = 494; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
-    s.k___210458 = (r0);
+    s.k___25405 = (r0);
     r0 = s.arg0.fields["buckets"];
     s.tmp_0 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_0, s.k___210458);
-    s.b___210463 = (r0);
-    s.tmp_0 = r0 = s.b___210463;
+    r0 = pxsim_Array__getAt(s.tmp_0, s.k___25405);
+    s.b___25410 = (r0);
+    s.tmp_0 = r0 = s.b___25410;
     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___210463);
+    r0 = pxsim_Array__length(s.b___25410);
   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__P186948_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
-    s.tmp_2.arg1 = s.left___210448;
-    s.tmp_2.arg2 = s.top___210453;
+    s.tmp_2 = helpers_imageDrawRect__P1731_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
+    s.tmp_2.arg1 = s.left___25395;
+    s.tmp_2.arg2 = s.top___25400;
     r0 = s.arg0.fields["cellWidth"];
     s.tmp_2.arg3 = r0;
     r0 = s.arg0.fields["cellHeight"];
@@ -67427,34 +67446,34 @@ switch (step) {
     r0 = s.retval;
   case 5:
   case 6:
-    r0 = (s.y___210442 + 1);
-    s.y___210442 = (r0);
+    r0 = (s.y___25389 + 1);
+    s.y___25389 = (r0);
     { step = 2; continue; }
   case 7:
-    r0 = (s.x___210436 + 1);
-    s.x___210436 = (r0);
+    r0 = (s.x___25383 + 1);
+    s.x___25383 = (r0);
     { step = 1; continue; }
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_SpriteMap_draw__P187315.info = {"start":1122,"length":496,"line":36,"column":8,"endLine":47,"endColumn":9,"fileName":"pxt_modules/game/spritemap.ts","functionName":"draw","argumentNames":["this"]}
+sprites_SpriteMap_draw__P2098.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__P187315_mk(s) {
+function sprites_SpriteMap_draw__P2098_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_SpriteMap_draw__P187315, depth: s.depth + 1,
+        parent: s, fn: sprites_SpriteMap_draw__P2098, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  x___210436: undefined,
-  y___210442: undefined,
-  left___210448: undefined,
-  top___210453: undefined,
-  k___210458: undefined,
-  b___210463: undefined,
+  x___25383: undefined,
+  y___25389: undefined,
+  left___25395: undefined,
+  top___25400: undefined,
+  k___25405: undefined,
+  b___25410: undefined,
   arg0: undefined,
 } }
 
@@ -67462,7 +67481,7 @@ function sprites_SpriteMap_draw__P187315_mk(s) {
 
 
 
-function ArcadePhysicsEngine_removeSprite__P187400(s) {
+function ArcadePhysicsEngine_removeSprite__P2183(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67478,7 +67497,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_VT)) failedCast(r0);
     r0 = s.arg0.fields["sprites"];
     s.tmp_0 = r0;
     r0 = pxsim_Array_.removeElement(s.tmp_0, s.arg1);
@@ -67486,12 +67505,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_removeSprite__P187400.info = {"start":2420,"length":80,"line":101,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
+ArcadePhysicsEngine_removeSprite__P2183.info = {"start":2420,"length":80,"line":101,"column":4,"endLine":103,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"removeSprite","argumentNames":["this","sprite"]}
 
-function ArcadePhysicsEngine_removeSprite__P187400_mk(s) {
+function ArcadePhysicsEngine_removeSprite__P2183_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_removeSprite__P187400, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_removeSprite__P2183, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -67502,7 +67521,7 @@ function ArcadePhysicsEngine_removeSprite__P187400_mk(s) {
 
 
 
-function ArcadePhysicsEngine_addSprite__P187399(s) {
+function ArcadePhysicsEngine_addSprite__P2182(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67512,31 +67531,31 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.tm___210500 = undefined;
+    s.tm___25447 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, ArcadePhysicsEngine__C187390_VT)) failedCast(r0);
+    if (!checkSubtype(r0, ArcadePhysicsEngine__C2173_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__P187749_mk(s);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 548; s.pc = 5; return s.tmp_0;
   case 5:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___210500 = (r0);
-    s.tmp_0 = r0 = s.tm___210500;
+    s.tm___25447 = (r0);
+    s.tmp_0 = r0 = s.tm___25447;
     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__P187555_mk(s);
-    s.tmp_1.arg0 = s.tm___210500;
+    s.tmp_1 = tiles_TileMap_isOnWall__P2338_mk(s);
+    s.tmp_1.arg0 = s.tm___25447;
     s.tmp_1.arg1 = s.arg1;
     s.callLocIdx = 549; s.pc = 6; return s.tmp_1;
   case 6:
@@ -67558,12 +67577,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-ArcadePhysicsEngine_addSprite__P187399.info = {"start":2194,"length":220,"line":93,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
+ArcadePhysicsEngine_addSprite__P2182.info = {"start":2194,"length":220,"line":93,"column":4,"endLine":99,"endColumn":5,"fileName":"pxt_modules/game/physics.ts","functionName":"addSprite","argumentNames":["this","sprite"]}
 
-function ArcadePhysicsEngine_addSprite__P187399_mk(s) {
+function ArcadePhysicsEngine_addSprite__P2182_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: ArcadePhysicsEngine_addSprite__P187399, depth: s.depth + 1,
+        parent: s, fn: ArcadePhysicsEngine_addSprite__P2182, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67571,7 +67590,7 @@ function ArcadePhysicsEngine_addSprite__P187399_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  tm___210500: undefined,
+  tm___25447: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67580,7 +67599,7 @@ function ArcadePhysicsEngine_addSprite__P187399_mk(s) {
 
 
 
-function scene_BackgroundLayer_constructor__P187499(s) {
+function scene_BackgroundLayer_constructor__P2282(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67598,12 +67617,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_BackgroundLayer__C187492_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_BackgroundLayer__C2275_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P185342_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
     s.tmp_2.arg0 = 1;
     s.tmp_2.arg1 = s.arg1;
-    s.callLocIdx = 869; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 876; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -67646,12 +67665,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_BackgroundLayer_constructor__P187499.info = {"start":1936,"length":1117,"line":72,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["this","distance","alignment","img"]}
+scene_BackgroundLayer_constructor__P2282.info = {"start":1936,"length":1117,"line":72,"column":8,"endLine":97,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"inline","argumentNames":["this","distance","alignment","img"]}
 
-function scene_BackgroundLayer_constructor__P187499_mk(s) {
+function scene_BackgroundLayer_constructor__P2282_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_BackgroundLayer_constructor__P187499, depth: s.depth + 1,
+        parent: s, fn: scene_BackgroundLayer_constructor__P2282, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67666,7 +67685,7 @@ function scene_BackgroundLayer_constructor__P187499_mk(s) {
 
 
 
-function scene_Camera_y__P187587(s) {
+function scene_Camera_y__P2370(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67681,10 +67700,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetY"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
@@ -67692,13 +67711,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_y__P187587.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__P187587.isGetter = true;
+scene_Camera_y__P2370.info = {"start":1398,"length":79,"line":49,"column":8,"endLine":51,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"y","argumentNames":["this"]}
+scene_Camera_y__P2370.isGetter = true;
 
-function scene_Camera_y__P187587_mk(s) {
+function scene_Camera_y__P2370_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_y__P187587, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_y__P2370, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67710,7 +67729,7 @@ function scene_Camera_y__P187587_mk(s) {
 
 
 
-function scene_Camera_x__P187586(s) {
+function scene_Camera_x__P2369(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67725,10 +67744,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetX"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 1);
     s.tmp_1 = r0;
@@ -67736,13 +67755,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_x__P187586.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__P187586.isGetter = true;
+scene_Camera_x__P2369.info = {"start":1311,"length":78,"line":46,"column":8,"endLine":48,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"x","argumentNames":["this"]}
+scene_Camera_x__P2369.isGetter = true;
 
-function scene_Camera_x__P187586_mk(s) {
+function scene_Camera_x__P2369_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_x__P187586, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_x__P2369, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67754,7 +67773,7 @@ function scene_Camera_x__P187586_mk(s) {
 
 
 
-function particles_ParticleSource___draw__P187901(s) {
+function particles_ParticleSource___draw__P2684(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67764,18 +67783,18 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___210780 = undefined;
-    s.left___210783 = undefined;
-    s.top___210793 = undefined;
+    s.current___25727 = undefined;
+    s.left___25730 = undefined;
+    s.top___25740 = 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__C187895_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
     r0 = s.arg0.fields["head"];
-    s.current___210780 = (r0);
+    s.current___25727 = (r0);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -67793,7 +67812,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.left___210783 = (s.tmp_4);
+    s.left___25730 = (s.tmp_4);
     r0 = s.arg0.fields["pFlags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 4);
@@ -67811,49 +67830,49 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.top___210793 = (s.tmp_4);
+    s.top___25740 = (s.tmp_4);
   case 5:
-    r0 = pxsim_numops_toBoolDecr(s.current___210780);
+    r0 = pxsim_numops_toBoolDecr(s.current___25727);
     if (!r0) { step = 8; continue; }
-    r0 = s.current___210780.fields["lifespan"];
+    r0 = s.current___25727.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__P189920_mk(s);
+    s.tmp_2 = particles_ParticleSource_drawParticle__P4704_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.tmp_2.arg1 = s.current___210780;
-    s.tmp_2.arg2 = s.left___210783;
-    s.tmp_2.arg3 = s.top___210793;
-    s.callLocIdx = 1520; s.pc = 9; return s.tmp_2;
+    s.tmp_2.arg1 = s.current___25727;
+    s.tmp_2.arg2 = s.left___25730;
+    s.tmp_2.arg3 = s.top___25740;
+    s.callLocIdx = 1527; s.pc = 9; return s.tmp_2;
   case 9:
     r0 = s.retval;
   case 6:
   case 7:
-    r0 = s.current___210780.fields["next"];
-    s.current___210780 = (r0);
+    r0 = s.current___25727.fields["next"];
+    s.current___25727 = (r0);
     { step = 5; continue; }
   case 8:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource___draw__P187901.info = {"start":3199,"length":468,"line":111,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"__draw","argumentNames":["this","camera"]}
+particles_ParticleSource___draw__P2684.info = {"start":3199,"length":468,"line":111,"column":8,"endLine":121,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"__draw","argumentNames":["this","camera"]}
 
-function particles_ParticleSource___draw__P187901_mk(s) {
+function particles_ParticleSource___draw__P2684_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource___draw__P187901, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource___draw__P2684, 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___210780: undefined,
-  left___210783: undefined,
-  top___210793: undefined,
+  current___25727: undefined,
+  left___25730: undefined,
+  top___25740: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -67862,7 +67881,7 @@ function particles_ParticleSource___draw__P187901_mk(s) {
 
 
 
-function particles_ParticleSource_drawParticle__P189920(s) {
+function particles_ParticleSource_drawParticle__P4704(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67880,8 +67899,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleSource__C187895_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleFactory__C187931_v1_4_mk(s);
+    if (!checkSubtype(r0, particles_ParticleSource__C2678_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleFactory__C2714_v1_4_mk(s);
     r0 = s.arg0.fields["_factory"];
     s.tmp_0.arg0 = r0;
     s.tmp_0.arg1 = s.arg1;
@@ -67893,7 +67912,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__C187931_VT)) failedCast(s.tmp_0.arg0);
+    if (!checkSubtype(s.tmp_0.arg0, particles_ParticleFactory__C2714_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:
@@ -67902,12 +67921,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleSource_drawParticle__P189920.info = {"start":8598,"length":174,"line":286,"column":8,"endLine":288,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"drawParticle","argumentNames":["this","p","screenLeft","screenTop"]}
+particles_ParticleSource_drawParticle__P4704.info = {"start":8598,"length":174,"line":286,"column":8,"endLine":288,"endColumn":9,"fileName":"pxt_modules/game/particles.ts","functionName":"drawParticle","argumentNames":["this","p","screenLeft","screenTop"]}
 
-function particles_ParticleSource_drawParticle__P189920_mk(s) {
+function particles_ParticleSource_drawParticle__P4704_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleSource_drawParticle__P189920, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleSource_drawParticle__P4704, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67922,7 +67941,7 @@ function particles_ParticleSource_drawParticle__P189920_mk(s) {
 
 
 
-function particles_ParticleFactory_drawParticle__P187934(s) {
+function particles_ParticleFactory_drawParticle__P2717(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67940,8 +67959,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ParticleFactory__C187931_VT)) failedCast(r0);
-    s.tmp_0 = r0 = globals.screen___187019;
+    if (!checkSubtype(r0, particles_ParticleFactory__C2714_VT)) failedCast(r0);
+    s.tmp_0 = r0 = globals.screen___1802;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -67955,12 +67974,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ParticleFactory_drawParticle__P187934.info = {"start":2265,"length":118,"line":85,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
+particles_ParticleFactory_drawParticle__P2717.info = {"start":2265,"length":118,"line":85,"column":8,"endLine":87,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
 
-function particles_ParticleFactory_drawParticle__P187934_mk(s) {
+function particles_ParticleFactory_drawParticle__P2717_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ParticleFactory_drawParticle__P187934, depth: s.depth + 1,
+        parent: s, fn: particles_ParticleFactory_drawParticle__P2717, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -67977,7 +67996,7 @@ function particles_ParticleFactory_drawParticle__P187934_mk(s) {
 
 
 
-function particles_ShapeFactory_createParticle__P187961(s) {
+function particles_ShapeFactory_createParticle__P2744(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -67987,47 +68006,47 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___210580 = undefined;
+    s.p___25527 = 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__C187957_VT)) failedCast(r0);
-    s.tmp_0 = particles_AreaFactory_createParticle__P187947_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
+    s.tmp_0 = particles_AreaFactory_createParticle__P2730_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1614; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1621; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.p___210580 = (r0);
-    s.tmp_0 = r0 = s.p___210580;
-    s.tmp_2 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.p___25527 = (r0);
+    s.tmp_0 = r0 = s.p___25527;
+    s.tmp_2 = Math_FastRandom_randomRange__P2590_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 1;
     s.tmp_2.arg2 = 14;
-    s.callLocIdx = 1615; s.pc = 2; return s.tmp_2;
+    s.callLocIdx = 1622; 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___210580;
+    r0 = s.p___25527;
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_createParticle__P187961.info = {"start":7505,"length":178,"line":239,"column":8,"endLine":243,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_ShapeFactory_createParticle__P2744.info = {"start":7505,"length":178,"line":239,"column":8,"endLine":243,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_ShapeFactory_createParticle__P187961_mk(s) {
+function particles_ShapeFactory_createParticle__P2744_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_createParticle__P187961, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_createParticle__P2744, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
   tmp_2: undefined,
-  p___210580: undefined,
+  p___25527: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -68036,7 +68055,7 @@ function particles_ShapeFactory_createParticle__P187961_mk(s) {
 
 
 
-function particles_AreaFactory_createParticle__P187947(s) {
+function particles_AreaFactory_createParticle__P2730(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68046,42 +68065,42 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___210592 = undefined;
+    s.p___25539 = 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__C187941_VT)) failedCast(r0);
-    s.tmp_0 = particles_SprayFactory_createParticle__P187937_mk(s);
+    if (!checkSubtype(r0, particles_AreaFactory__C2724_VT)) failedCast(r0);
+    s.tmp_0 = particles_SprayFactory_createParticle__P2720_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1596; s.pc = 3; return s.tmp_0;
+    s.callLocIdx = 1603; s.pc = 3; return s.tmp_0;
   case 3:
     r0 = s.retval;
-    s.p___210592 = (r0);
-    s.tmp_0 = r0 = s.p___210592;
-    s.tmp_2 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.p___25539 = (r0);
+    s.tmp_0 = r0 = s.p___25539;
+    s.tmp_2 = Math_FastRandom_randomRange__P2590_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 = 1597; s.pc = 4; return s.tmp_2;
+    s.callLocIdx = 1604; 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___210592;
-    s.tmp_4 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.tmp_0 = r0 = s.p___25539;
+    s.tmp_4 = Math_FastRandom_randomRange__P2590_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 = 1598; s.pc = 5; return s.tmp_4;
+    s.callLocIdx = 1605; s.pc = 5; return s.tmp_4;
   case 5:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -68091,7 +68110,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = (s.tmp_3 - s.tmp_5);
     s.tmp_2 = r0;
-    r0 = s.p___210592.fields["_x"];
+    r0 = s.p___25539.fields["_x"];
     s.tmp_7 = r0;
     r0 = (s.tmp_2 << 8);
     s.tmp_8 = r0;
@@ -68106,7 +68125,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 = 1601; s.pc = 6; return s.tmp_1; }
+     else { s.callLocIdx = 1608; s.pc = 6; return s.tmp_1; }
     }
   case 6:
     r0 = s.retval;
@@ -68121,7 +68140,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 = 1602; s.pc = 7; return s.tmp_3; }
+     else { s.callLocIdx = 1609; s.pc = 7; return s.tmp_3; }
     }
   case 7:
     r0 = s.retval;
@@ -68133,36 +68152,36 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.tmp_5 = r0 = s.p___210592;
-    s.tmp_9 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.tmp_5 = r0 = s.p___25539;
+    s.tmp_9 = Math_FastRandom_randomRange__P2590_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 = 1600; s.pc = 8; return s.tmp_9;
+    s.callLocIdx = 1607; 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___210592.fields["_y"];
+    r0 = s.p___25539.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___210592;
+    r0 = s.p___25539;
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_createParticle__P187947.info = {"start":4334,"length":426,"line":148,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_AreaFactory_createParticle__P2730.info = {"start":4334,"length":426,"line":148,"column":8,"endLine":156,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_AreaFactory_createParticle__P187947_mk(s) {
+function particles_AreaFactory_createParticle__P2730_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_createParticle__P187947, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_createParticle__P2730, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68176,7 +68195,7 @@ function particles_AreaFactory_createParticle__P187947_mk(s) {
   tmp_9: undefined,
   tmp_10: undefined,
   tmp_11: undefined,
-  p___210592: undefined,
+  p___25539: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -68185,7 +68204,7 @@ function particles_AreaFactory_createParticle__P187947_mk(s) {
 
 
 
-function particles_SprayFactory_createParticle__P187937(s) {
+function particles_SprayFactory_createParticle__P2720(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68195,39 +68214,39 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.p___210640 = undefined;
-    s.angle___210644 = undefined;
+    s.p___25587 = undefined;
+    s.angle___25591 = 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__C187935_VT)) failedCast(r0);
-    s.tmp_0 = particles_ParticleFactory_createParticle__P187933_mk(s);
+    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
+    s.tmp_0 = particles_ParticleFactory_createParticle__P2716_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.tmp_0.arg1 = s.arg1;
-    s.callLocIdx = 1585; s.pc = 1; return s.tmp_0;
+    s.callLocIdx = 1592; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.p___210640 = (r0);
+    s.p___25587 = (r0);
     r0 = s.arg0.fields["minAngle"];
     s.tmp_1 = r0;
-    s.tmp_3 = Math_FastRandom_randomRange__P187807_mk(s);
-    s.tmp_3.arg0 = globals.galois___189934;
+    s.tmp_3 = Math_FastRandom_randomRange__P2590_mk(s);
+    s.tmp_3.arg0 = globals.galois___4718;
     s.tmp_3.arg1 = 0;
     r0 = s.arg0.fields["spread"];
     s.tmp_3.arg2 = r0;
-    s.callLocIdx = 1586; s.pc = 2; return s.tmp_3;
+    s.callLocIdx = 1593; 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___210644 = (r0);
-    s.tmp_0 = r0 = s.p___210640;
-    r0 = pxsim_Array__getAt(globals.cachedSin___189929, s.angle___210644);
+    s.angle___25591 = (r0);
+    s.tmp_0 = r0 = s.p___25587;
+    r0 = pxsim_Array__getAt(globals.cachedSin___4713, s.angle___25591);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["speed"];
     s.tmp_3 = r0;
@@ -68236,8 +68255,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___210640;
-    r0 = pxsim_Array__getAt(globals.cachedCos___189930, s.angle___210644);
+    s.tmp_0 = r0 = s.p___25587;
+    r0 = pxsim_Array__getAt(globals.cachedCos___4714, s.angle___25591);
     s.tmp_2 = r0;
     r0 = s.arg0.fields["speed"];
     s.tmp_3 = r0;
@@ -68246,24 +68265,24 @@ switch (step) {
     r0 = (s.tmp_4 >> 8);
     s.tmp_1 = r0;
     r0 = (s.tmp_0).fields["vy"] = (s.tmp_1);
-    r0 = s.p___210640;
+    r0 = s.p___25587;
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_createParticle__P187937.info = {"start":2851,"length":333,"line":105,"column":8,"endLine":113,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
+particles_SprayFactory_createParticle__P2720.info = {"start":2851,"length":333,"line":105,"column":8,"endLine":113,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"createParticle","argumentNames":["this","anchor"]}
 
-function particles_SprayFactory_createParticle__P187937_mk(s) {
+function particles_SprayFactory_createParticle__P2720_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_createParticle__P187937, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_createParticle__P2720, 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___210640: undefined,
-  angle___210644: undefined,
+  p___25587: undefined,
+  angle___25591: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -68272,7 +68291,7 @@ function particles_SprayFactory_createParticle__P187937_mk(s) {
 
 
 
-function effects_ScreenEffect_startScreenEffect__P188012(s) {
+function effects_ScreenEffect_startScreenEffect__P2795(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68289,7 +68308,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ScreenEffect__C188010_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ScreenEffect__C2793_VT)) failedCast(r0);
     r0 = s.arg0.fields["sourceFactory"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -68308,10 +68327,10 @@ switch (step) {
     r0 = s.tmp_3;
     { step = 4; continue; }
   case 3:
-    s.tmp_4 = particles_ParticleSource_enabled__P187907_mk(s);
+    s.tmp_4 = particles_ParticleSource_enabled__P2690_mk(s);
     r0 = s.arg0.fields["source"];
     s.tmp_4.arg0 = r0;
-    s.callLocIdx = 1627; s.pc = 14; return s.tmp_4;
+    s.callLocIdx = 1634; s.pc = 14; return s.tmp_4;
   case 14:
     r0 = s.retval;
   case 4:
@@ -68329,16 +68348,16 @@ switch (step) {
     { step = 13; continue; }
   case 7:
   case 8:
-    s.tmp_0 = effects_ScreenEffect_endScreenEffect__P188013_mk(s);
+    s.tmp_0 = effects_ScreenEffect_endScreenEffect__P2796_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1628; s.pc = 15; return s.tmp_0;
+    s.callLocIdx = 1635; s.pc = 15; return s.tmp_0;
   case 15:
     r0 = s.retval;
-    r0 = pxsim_pxtcore_mkClassInstance(effects_SceneAnchor__C189962_VT);
+    r0 = pxsim_pxtcore_mkClassInstance(effects_SceneAnchor__C4746_VT);
     s.tmp_0 = r0;
-    s.tmp_1 = effects_SceneAnchor_constructor__P189967_mk(s);
+    s.tmp_1 = effects_SceneAnchor_constructor__P4751_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1629; s.pc = 16; return s.tmp_1;
+    s.callLocIdx = 1636; s.pc = 16; return s.tmp_1;
   case 16:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.arg2);
@@ -68357,12 +68376,12 @@ switch (step) {
     s.tmp_5.arg2 = s.tmp_2;
     if (!s.tmp_5.arg0.vtable.iface) {
       setupLambda(s.tmp_5, pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "sourceFactory"), 3);
-      s.callLocIdx = 1630; s.pc = 17; return s.tmp_5;
+      s.callLocIdx = 1637; s.pc = 17; return s.tmp_5;
     } else {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["sourceFactory"];
-      if (s.tmp_5.fn == null) { setupLambda(s.tmp_5, s.tmp_5.arg0.fields["sourceFactory"], 3); s.callLocIdx = 1630; s.pc = 17; return s.tmp_5; }
-      else if (s.tmp_5.fn.isGetter) { s.tmp_5.stage2Call = true; s.callLocIdx = 1630; s.pc = 17; return s.tmp_5;; }
-     else { s.callLocIdx = 1630; s.pc = 17; return s.tmp_5; }
+      if (s.tmp_5.fn == null) { setupLambda(s.tmp_5, s.tmp_5.arg0.fields["sourceFactory"], 3); s.callLocIdx = 1637; s.pc = 17; return s.tmp_5; }
+      else if (s.tmp_5.fn.isGetter) { s.tmp_5.stage2Call = true; s.callLocIdx = 1637; s.pc = 17; return s.tmp_5;; }
+     else { s.callLocIdx = 1637; s.pc = 17; return s.tmp_5; }
     }
   case 17:
     r0 = s.retval;
@@ -68383,12 +68402,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ScreenEffect_startScreenEffect__P188012.info = {"start":3680,"length":601,"line":97,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"startScreenEffect","argumentNames":["this","duration","particlesPerSecond"]}
+effects_ScreenEffect_startScreenEffect__P2795.info = {"start":3680,"length":601,"line":97,"column":8,"endLine":112,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"startScreenEffect","argumentNames":["this","duration","particlesPerSecond"]}
 
-function effects_ScreenEffect_startScreenEffect__P188012_mk(s) {
+function effects_ScreenEffect_startScreenEffect__P2795_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ScreenEffect_startScreenEffect__P188012, depth: s.depth + 1,
+        parent: s, fn: effects_ScreenEffect_startScreenEffect__P2795, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68406,7 +68425,7 @@ function effects_ScreenEffect_startScreenEffect__P188012_mk(s) {
 
 
 
-function effects_SceneAnchor_constructor__P189967(s) {
+function effects_SceneAnchor_constructor__P4751(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68421,10 +68440,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C189962_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1623; s.pc = 1; return s.tmp_2;
+    s.tmp_2 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1630; s.pc = 1; return s.tmp_2;
   case 1:
     r0 = s.retval;
     r0 = r0.fields["camera"];
@@ -68434,12 +68453,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_constructor__P189967.info = {"start":2296,"length":79,"line":55,"column":8,"endLine":57,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this"]}
+effects_SceneAnchor_constructor__P4751.info = {"start":2296,"length":79,"line":55,"column":8,"endLine":57,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"inline","argumentNames":["this"]}
 
-function effects_SceneAnchor_constructor__P189967_mk(s) {
+function effects_SceneAnchor_constructor__P4751_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_constructor__P189967, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_constructor__P4751, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68451,7 +68470,7 @@ function effects_SceneAnchor_constructor__P189967_mk(s) {
 
 
 
-function effects_ScreenEffect_endScreenEffect__P188013(s) {
+function effects_ScreenEffect_endScreenEffect__P2796(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68466,15 +68485,15 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ScreenEffect__C188010_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_ScreenEffect__C2793_VT)) failedCast(r0);
     r0 = s.arg0.fields["source"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = particles_ParticleSource_destroy__P187909_mk(s);
+    s.tmp_1 = particles_ParticleSource_destroy__P2692_mk(s);
     r0 = s.arg0.fields["source"];
     s.tmp_1.arg0 = r0;
-    s.callLocIdx = 1631; s.pc = 3; return s.tmp_1;
+    s.callLocIdx = 1638; s.pc = 3; return s.tmp_1;
   case 3:
     r0 = s.retval;
     r0 = (s.arg0).fields["source"] = (undefined);
@@ -68484,12 +68503,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ScreenEffect_endScreenEffect__P188013.info = {"start":4677,"length":160,"line":122,"column":8,"endLine":127,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"endScreenEffect","argumentNames":["this"]}
+effects_ScreenEffect_endScreenEffect__P2796.info = {"start":4677,"length":160,"line":122,"column":8,"endLine":127,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"endScreenEffect","argumentNames":["this"]}
 
-function effects_ScreenEffect_endScreenEffect__P188013_mk(s) {
+function effects_ScreenEffect_endScreenEffect__P2796_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ScreenEffect_endScreenEffect__P188013, depth: s.depth + 1,
+        parent: s, fn: effects_ScreenEffect_endScreenEffect__P2796, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68500,7 +68519,7 @@ function effects_ScreenEffect_endScreenEffect__P188013_mk(s) {
 
 
 
-function effects_ImageEffect_startScreenEffect__P188037(s) {
+function effects_ImageEffect_startScreenEffect__P2820(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68510,7 +68529,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.wasRunning___210732 = undefined;
+    s.wasRunning___25679 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -68518,9 +68537,9 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_ImageEffect__C188033_VT)) failedCast(r0);
-    s.tmp_4 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1649; s.pc = 8; return s.tmp_4;
+    if (!checkSubtype(r0, effects_ImageEffect__C2816_VT)) failedCast(r0);
+    s.tmp_4 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1656; s.pc = 8; return s.tmp_4;
   case 8:
     r0 = s.retval;
     r0 = r0.fields["background"];
@@ -68547,7 +68566,7 @@ switch (step) {
     r0 = s.arg0.fields["times"];
     s.tmp_9 = r0;
     r0 = (s.tmp_9 != undefined);
-    s.wasRunning___210732 = (r0);
+    s.wasRunning___25679 = (r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     if (!r0) { step = 3; continue; }
     r0 = s.arg1;
@@ -68558,13 +68577,13 @@ switch (step) {
     // jmp value (already in r0)
     s.tmp_0 = r0;
     r0 = (s.arg0).fields["times"] = (s.tmp_0);
-    r0 = pxsim_numops_toBoolDecr(s.wasRunning___210732);
+    r0 = pxsim_numops_toBoolDecr(s.wasRunning___25679);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 5; continue; }
-    r0 = pxsim_pxtcore_mkAction(2, inline__P210745);
+    r0 = pxsim_pxtcore_mkAction(2, inline__P25692);
     s.tmp_2 = r0;
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 0, s.arg0);
     r0 = pxsim_pxtrt_stclo(s.tmp_2, 1, s.arg2);
@@ -68576,12 +68595,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-effects_ImageEffect_startScreenEffect__P188037.info = {"start":1457,"length":637,"line":41,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"startScreenEffect","argumentNames":["this","times","delay"]}
+effects_ImageEffect_startScreenEffect__P2820.info = {"start":1457,"length":637,"line":41,"column":8,"endLine":56,"endColumn":9,"fileName":"pxt_modules/game/effects.ts","functionName":"startScreenEffect","argumentNames":["this","times","delay"]}
 
-function effects_ImageEffect_startScreenEffect__P188037_mk(s) {
+function effects_ImageEffect_startScreenEffect__P2820_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_ImageEffect_startScreenEffect__P188037, depth: s.depth + 1,
+        parent: s, fn: effects_ImageEffect_startScreenEffect__P2820, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68593,7 +68612,7 @@ function effects_ImageEffect_startScreenEffect__P188037_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  wasRunning___210732: undefined,
+  wasRunning___25679: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -68603,7 +68622,7 @@ function effects_ImageEffect_startScreenEffect__P188037_mk(s) {
 
 
 
-function inline__P210745(s) {
+function inline__P25692(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68620,14 +68639,14 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 4; continue; }
-    s.tmp_2 = effects_ImageEffect_change__P188036_mk(s);
+    s.tmp_2 = effects_ImageEffect_change__P2819_mk(s);
     s.tmp_2.arg0 = s.caps[0];
-    s.tmp_3 = scene_backgroundImage__P187677_mk(s);
-    s.callLocIdx = 1651; s.pc = 6; return s.tmp_3;
+    s.tmp_3 = scene_backgroundImage__P2460_mk(s);
+    s.callLocIdx = 1658; s.pc = 6; return s.tmp_3;
   case 6:
     r0 = s.retval;
     s.tmp_2.arg1 = r0;
-    s.callLocIdx = 1652; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1659; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
     r0 = pxsim_numops_toBoolDecr(s.caps[1]);
@@ -68639,9 +68658,9 @@ switch (step) {
   case 3:
     // jmp value (already in r0)
     s.tmp_0 = r0;
-    s.tmp_1 = pause__P185619_mk(s);
+    s.tmp_1 = pause__P402_mk(s);
     s.tmp_1.arg0 = s.tmp_0;
-    s.callLocIdx = 1653; s.pc = 7; return s.tmp_1;
+    s.callLocIdx = 1660; s.pc = 7; return s.tmp_1;
   case 7:
     r0 = s.retval;
     s.tmp_0 = r0 = s.caps[0];
@@ -68657,12 +68676,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-inline__P210745.info = {"start":1764,"length":304,"line":47,"column":38,"endLine":54,"endColumn":17,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":[]}
+inline__P25692.info = {"start":1764,"length":304,"line":47,"column":38,"endLine":54,"endColumn":17,"fileName":"pxt_modules/game/effects.ts","functionName":"inline","argumentNames":[]}
 
-function inline__P210745_mk(s) {
+function inline__P25692_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: inline__P210745, depth: s.depth + 1,
+        parent: s, fn: inline__P25692, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68674,7 +68693,7 @@ function inline__P210745_mk(s) {
 
 
 
-function scene_backgroundImage__P187677(s) {
+function scene_backgroundImage__P2460(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68684,37 +68703,37 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.scene___210764 = undefined;
-    s.tmp_0 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1051; s.pc = 1; return s.tmp_0;
+    s.scene___25711 = undefined;
+    s.tmp_0 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 1058; s.pc = 1; return s.tmp_0;
   case 1:
     r0 = s.retval;
-    s.scene___210764 = (r0);
-    s.tmp_0 = scene_Background_image__P187488_mk(s);
-    r0 = s.scene___210764.fields["background"];
+    s.scene___25711 = (r0);
+    s.tmp_0 = scene_Background_image__P2271_mk(s);
+    r0 = s.scene___25711.fields["background"];
     s.tmp_0.arg0 = r0;
-    s.callLocIdx = 1052; s.pc = 2; return s.tmp_0;
+    s.callLocIdx = 1059; s.pc = 2; return s.tmp_0;
   case 2:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_backgroundImage__P187677.info = {"start":2273,"length":130,"line":90,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"backgroundImage","argumentNames":[]}
+scene_backgroundImage__P2460.info = {"start":2273,"length":130,"line":90,"column":4,"endLine":93,"endColumn":5,"fileName":"pxt_modules/game/scenes.ts","functionName":"backgroundImage","argumentNames":[]}
 
-function scene_backgroundImage__P187677_mk(s) {
+function scene_backgroundImage__P2460_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_backgroundImage__P187677, depth: s.depth + 1,
+        parent: s, fn: scene_backgroundImage__P2460, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
-  scene___210764: undefined,
+  scene___25711: undefined,
 } }
 
 
 
 
 
-function scene_Background_hasBackgroundImage__P187490(s) {
+function scene_Background_hasBackgroundImage__P2273(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68729,7 +68748,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Background__C187482_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Background__C2265_VT)) failedCast(r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
@@ -68742,12 +68761,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Background_hasBackgroundImage__P187490.info = {"start":1081,"length":75,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"hasBackgroundImage","argumentNames":["this"]}
+scene_Background_hasBackgroundImage__P2273.info = {"start":1081,"length":75,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/background.ts","functionName":"hasBackgroundImage","argumentNames":["this"]}
 
-function scene_Background_hasBackgroundImage__P187490_mk(s) {
+function scene_Background_hasBackgroundImage__P2273_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Background_hasBackgroundImage__P187490, depth: s.depth + 1,
+        parent: s, fn: scene_Background_hasBackgroundImage__P2273, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68760,7 +68779,7 @@ function scene_Background_hasBackgroundImage__P187490_mk(s) {
 
 
 
-function info_PlayerInfo_id__P187457(s) {
+function info_PlayerInfo_id__P2240(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68775,17 +68794,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, info_PlayerInfo__C187443_VT)) failedCast(r0);
+    if (!checkSubtype(r0, info_PlayerInfo__C2226_VT)) failedCast(r0);
     r0 = s.arg0.fields["_player"];
     return leave(s, r0)
   default: oops()
 } } }
-info_PlayerInfo_id__P187457.info = {"start":17259,"length":57,"line":568,"column":8,"endLine":570,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"id","argumentNames":["this"]}
+info_PlayerInfo_id__P2240.info = {"start":17259,"length":57,"line":568,"column":8,"endLine":570,"endColumn":9,"fileName":"pxt_modules/game/info.ts","functionName":"id","argumentNames":["this"]}
 
-function info_PlayerInfo_id__P187457_mk(s) {
+function info_PlayerInfo_id__P2240_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: info_PlayerInfo_id__P187457, depth: s.depth + 1,
+        parent: s, fn: info_PlayerInfo_id__P2240, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -68794,7 +68813,7 @@ function info_PlayerInfo_id__P187457_mk(s) {
 
 
 
-function Sprite_toString__P187307(s) {
+function Sprite_toString__P2090(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68809,7 +68828,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = pxsim_String_.mkEmpty();
     s.tmp_9 = r0;
     r0 = s.arg0.fields["id"];
@@ -68827,7 +68846,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = pxsim_String__concat(s.tmp_8, "(");
     s.tmp_7 = r0;
-    s.tmp_14 = Sprite_x__P187242_mk(s);
+    s.tmp_14 = Sprite_x__P2025_mk(s);
     s.tmp_14.arg0 = s.arg0;
     s.callLocIdx = 475; s.pc = 2; return s.tmp_14;
   case 2:
@@ -68846,7 +68865,7 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_String__concat(s.tmp_6, ",");
     s.tmp_5 = r0;
-    s.tmp_17 = Sprite_y__P187244_mk(s);
+    s.tmp_17 = Sprite_y__P2027_mk(s);
     s.tmp_17.arg0 = s.arg0;
     s.callLocIdx = 476; s.pc = 4; return s.tmp_17;
   case 4:
@@ -68865,7 +68884,7 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = pxsim_String__concat(s.tmp_4, ")->(");
     s.tmp_3 = r0;
-    s.tmp_20 = Sprite_vx__P187246_mk(s);
+    s.tmp_20 = Sprite_vx__P2029_mk(s);
     s.tmp_20.arg0 = s.arg0;
     s.callLocIdx = 477; s.pc = 6; return s.tmp_20;
   case 6:
@@ -68884,7 +68903,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_23 = Sprite_vy__P187248_mk(s);
+    s.tmp_23 = Sprite_vy__P2031_mk(s);
     s.tmp_23.arg0 = s.arg0;
     s.callLocIdx = 478; s.pc = 8; return s.tmp_23;
   case 8:
@@ -68905,12 +68924,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_toString__P187307.info = {"start":33194,"length":93,"line":980,"column":4,"endLine":982,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"toString","argumentNames":["this"]}
+Sprite_toString__P2090.info = {"start":33194,"length":93,"line":980,"column":4,"endLine":982,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"toString","argumentNames":["this"]}
 
-function Sprite_toString__P187307_mk(s) {
+function Sprite_toString__P2090_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_toString__P187307, depth: s.depth + 1,
+        parent: s, fn: Sprite_toString__P2090, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -68943,7 +68962,7 @@ function Sprite_toString__P187307_mk(s) {
 
 
 
-function Sprite___update__P187295(s) {
+function Sprite___update__P2078(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -68953,8 +68972,8 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.bounce___210904 = undefined;
-    s.tm___210909 = undefined;
+    s.bounce___25848 = undefined;
+    s.tm___25853 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -68962,7 +68981,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = s.arg0.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 !== undefined);
@@ -68984,7 +69003,7 @@ 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__P187305_mk(s);
+    s.tmp_0 = Sprite__destroyCore__P2088_mk(s);
     s.tmp_0.arg0 = s.arg0;
     s.callLocIdx = 379; s.pc = 33; return s.tmp_0;
   case 33:
@@ -69002,7 +69021,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_2 = Sprite_isOutOfScreen__P187293_mk(s);
+    s.tmp_2 = Sprite_isOutOfScreen__P2076_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
     s.callLocIdx = 380; s.pc = 34; return s.tmp_2;
@@ -69013,7 +69032,7 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 7; continue; }
-    s.tmp_4 = Sprite_destroy__P187304_mk(s);
+    s.tmp_4 = Sprite_destroy__P2087_mk(s);
     s.tmp_4.arg0 = s.arg0;
     s.tmp_4.arg1 = undefined;
     s.tmp_4.arg2 = undefined;
@@ -69025,13 +69044,13 @@ switch (step) {
     r0 = s.arg0.fields["flags"];
     s.tmp_0 = r0;
     r0 = (s.tmp_0 & 32);
-    s.bounce___210904 = (r0);
-    s.tmp_0 = game_currentScene__P187749_mk(s);
+    s.bounce___25848 = (r0);
+    s.tmp_0 = game_currentScene__P2532_mk(s);
     s.callLocIdx = 382; s.pc = 36; return s.tmp_0;
   case 36:
     r0 = s.retval;
     r0 = r0.fields["tileMap"];
-    s.tm___210909 = (r0);
+    s.tm___25853 = (r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 8);
@@ -69041,13 +69060,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 9:
-    s.tmp_2 = r0 = s.bounce___210904;
+    s.tmp_2 = r0 = s.bounce___25848;
     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___210909);
+    r0 = pxsim_numops_toBoolDecr(s.tm___25853);
     s.tmp_3 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_3);
   case 11:
@@ -69059,7 +69078,7 @@ switch (step) {
     s.tmp_5 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_5);
     if (!r0) { step = 29; continue; }
-    s.tmp_8 = Sprite_left__P187279_mk(s);
+    s.tmp_8 = Sprite_left__P2062_mk(s);
     s.tmp_8.arg0 = s.arg0;
     s.callLocIdx = 383; s.pc = 37; return s.tmp_8;
   case 37:
@@ -69071,18 +69090,18 @@ switch (step) {
     s.tmp_6 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_6);
     if (!r0) { step = 15; continue; }
-    s.tmp_10 = Sprite_left__P187280_mk(s);
+    s.tmp_10 = Sprite_left__P2063_mk(s);
     s.tmp_10.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_10.arg1 = r0;
     s.callLocIdx = 386; s.pc = 38; return s.tmp_10;
   case 38:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___210904);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___25848);
     if (!r0) { step = 13; continue; }
-    s.tmp_0 = Sprite_vx__P187247_mk(s);
+    s.tmp_0 = Sprite_vx__P2030_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vx__P187246_mk(s);
+    s.tmp_2 = Sprite_vx__P2029_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 387; s.pc = 40; return s.tmp_2;
   case 40:
@@ -69097,7 +69116,7 @@ switch (step) {
   case 14:
     { step = 20; continue; }
   case 15:
-    s.tmp_2 = Sprite_right__P187281_mk(s);
+    s.tmp_2 = Sprite_right__P2064_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 389; s.pc = 41; return s.tmp_2;
   case 41:
@@ -69105,7 +69124,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_4 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_3 = r0;
@@ -69113,22 +69132,22 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 18; continue; }
-    s.tmp_6 = Sprite_right__P187282_mk(s);
+    s.tmp_6 = Sprite_right__P2065_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetX"];
     s.tmp_7 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6.arg1 = r0;
     s.callLocIdx = 392; s.pc = 42; return s.tmp_6;
   case 42:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___210904);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___25848);
     if (!r0) { step = 16; continue; }
-    s.tmp_0 = Sprite_vx__P187247_mk(s);
+    s.tmp_0 = Sprite_vx__P2030_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vx__P187246_mk(s);
+    s.tmp_2 = Sprite_vx__P2029_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 393; s.pc = 44; return s.tmp_2;
   case 44:
@@ -69144,7 +69163,7 @@ switch (step) {
   case 18:
   case 19:
   case 20:
-    s.tmp_2 = Sprite_top__P187283_mk(s);
+    s.tmp_2 = Sprite_top__P2066_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 395; s.pc = 45; return s.tmp_2;
   case 45:
@@ -69156,18 +69175,18 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 23; continue; }
-    s.tmp_4 = Sprite_top__P187284_mk(s);
+    s.tmp_4 = Sprite_top__P2067_mk(s);
     s.tmp_4.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_4.arg1 = r0;
     s.callLocIdx = 398; s.pc = 46; return s.tmp_4;
   case 46:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___210904);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___25848);
     if (!r0) { step = 21; continue; }
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vy__P187248_mk(s);
+    s.tmp_2 = Sprite_vy__P2031_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 399; s.pc = 48; return s.tmp_2;
   case 48:
@@ -69182,7 +69201,7 @@ switch (step) {
   case 22:
     { step = 28; continue; }
   case 23:
-    s.tmp_2 = Sprite_bottom__P187285_mk(s);
+    s.tmp_2 = Sprite_bottom__P2068_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 401; s.pc = 49; return s.tmp_2;
   case 49:
@@ -69190,7 +69209,7 @@ switch (step) {
     s.tmp_1 = r0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_4 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
     s.tmp_3 = r0;
@@ -69198,22 +69217,22 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 26; continue; }
-    s.tmp_6 = Sprite_bottom__P187286_mk(s);
+    s.tmp_6 = Sprite_bottom__P2069_mk(s);
     s.tmp_6.arg0 = s.arg0;
     r0 = s.arg1.fields["_offsetY"];
     s.tmp_7 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_8 = r0;
     r0 = (s.tmp_7 + s.tmp_8);
     s.tmp_6.arg1 = r0;
     s.callLocIdx = 404; s.pc = 50; return s.tmp_6;
   case 50:
     r0 = s.retval;
-    r0 = pxsim_numops_toBoolDecr(s.bounce___210904);
+    r0 = pxsim_numops_toBoolDecr(s.bounce___25848);
     if (!r0) { step = 24; continue; }
-    s.tmp_0 = Sprite_vy__P187249_mk(s);
+    s.tmp_0 = Sprite_vy__P2032_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_2 = Sprite_vy__P187248_mk(s);
+    s.tmp_2 = Sprite_vy__P2031_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 405; s.pc = 52; return s.tmp_2;
   case 52:
@@ -69256,12 +69275,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___update__P187295.info = {"start":22253,"length":1390,"line":682,"column":4,"endLine":721,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
+Sprite___update__P2078.info = {"start":22253,"length":1390,"line":682,"column":4,"endLine":721,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
 
-function Sprite___update__P187295_mk(s) {
+function Sprite___update__P2078_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___update__P187295, depth: s.depth + 1,
+        parent: s, fn: Sprite___update__P2078, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69274,8 +69293,8 @@ function Sprite___update__P187295_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  bounce___210904: undefined,
-  tm___210909: undefined,
+  bounce___25848: undefined,
+  tm___25853: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -69285,7 +69304,7 @@ function Sprite___update__P187295_mk(s) {
 
 
 
-function Sprite_isOutOfScreen__P187293(s) {
+function Sprite_isOutOfScreen__P2076(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69295,15 +69314,15 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___210986 = undefined;
-    s.oy___210994 = undefined;
+    s.ox___25930 = undefined;
+    s.oy___25938 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -69317,7 +69336,7 @@ switch (step) {
   case 2:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.ox___210986 = (s.tmp_2);
+    s.ox___25930 = (s.tmp_2);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -69331,14 +69350,14 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___210994 = (s.tmp_2);
-    s.tmp_3 = Sprite_right__P187281_mk(s);
+    s.oy___25938 = (s.tmp_2);
+    s.tmp_3 = Sprite_right__P2064_mk(s);
     s.tmp_3.arg0 = s.arg0;
     s.callLocIdx = 348; s.pc = 11; return s.tmp_3;
   case 11:
     r0 = s.retval;
     s.tmp_2 = r0;
-    r0 = (s.tmp_2 - s.ox___210986);
+    r0 = (s.tmp_2 - s.ox___25930);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 < 0);
     s.tmp_0 = r0;
@@ -69347,13 +69366,13 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 6; continue; }
   case 5:
-    s.tmp_6 = Sprite_bottom__P187285_mk(s);
+    s.tmp_6 = Sprite_bottom__P2068_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.callLocIdx = 349; s.pc = 12; return s.tmp_6;
   case 12:
     r0 = s.retval;
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.oy___210994);
+    r0 = (s.tmp_5 - s.oy___25938);
     s.tmp_4 = r0;
     r0 = (s.tmp_4 < 0);
   case 6:
@@ -69364,15 +69383,15 @@ switch (step) {
     r0 = s.tmp_7;
     { step = 8; continue; }
   case 7:
-    s.tmp_10 = Sprite_left__P187279_mk(s);
+    s.tmp_10 = Sprite_left__P2062_mk(s);
     s.tmp_10.arg0 = s.arg0;
     s.callLocIdx = 350; s.pc = 13; return s.tmp_10;
   case 13:
     r0 = s.retval;
     s.tmp_9 = r0;
-    r0 = (s.tmp_9 - s.ox___210986);
+    r0 = (s.tmp_9 - s.ox___25930);
     s.tmp_8 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_11 = r0;
     r0 = (s.tmp_8 > s.tmp_11);
   case 8:
@@ -69383,15 +69402,15 @@ switch (step) {
     r0 = s.tmp_12;
     { step = 10; continue; }
   case 9:
-    s.tmp_15 = Sprite_top__P187283_mk(s);
+    s.tmp_15 = Sprite_top__P2066_mk(s);
     s.tmp_15.arg0 = s.arg0;
     s.callLocIdx = 351; s.pc = 14; return s.tmp_15;
   case 14:
     r0 = s.retval;
     s.tmp_14 = r0;
-    r0 = (s.tmp_14 - s.oy___210994);
+    r0 = (s.tmp_14 - s.oy___25938);
     s.tmp_13 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_16 = r0;
     r0 = (s.tmp_13 > s.tmp_16);
   case 10:
@@ -69401,12 +69420,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_isOutOfScreen__P187293.info = {"start":20500,"length":358,"line":636,"column":4,"endLine":640,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isOutOfScreen","argumentNames":["this","camera"]}
+Sprite_isOutOfScreen__P2076.info = {"start":20500,"length":358,"line":636,"column":4,"endLine":640,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"isOutOfScreen","argumentNames":["this","camera"]}
 
-function Sprite_isOutOfScreen__P187293_mk(s) {
+function Sprite_isOutOfScreen__P2076_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_isOutOfScreen__P187293, depth: s.depth + 1,
+        parent: s, fn: Sprite_isOutOfScreen__P2076, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69426,8 +69445,8 @@ function Sprite_isOutOfScreen__P187293_mk(s) {
   tmp_15: undefined,
   tmp_16: undefined,
   tmp_17: undefined,
-  ox___210986: undefined,
-  oy___210994: undefined,
+  ox___25930: undefined,
+  oy___25938: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -69436,7 +69455,7 @@ function Sprite_isOutOfScreen__P187293_mk(s) {
 
 
 
-function Sprite_data__P187259(s) {
+function Sprite_data__P2042(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69452,18 +69471,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = (s.arg0).fields["_data"] = (s.arg1);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-Sprite_data__P187259.info = {"start":4292,"length":56,"line":165,"column":4,"endLine":167,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this","value"]}
+Sprite_data__P2042.info = {"start":4292,"length":56,"line":165,"column":4,"endLine":167,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"data","argumentNames":["this","value"]}
 
-function Sprite_data__P187259_mk(s) {
+function Sprite_data__P2042_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite_data__P187259, depth: s.depth + 1,
+        parent: s, fn: Sprite_data__P2042, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -69473,7 +69492,7 @@ function Sprite_data__P187259_mk(s) {
 
 
 
-function sprites_BaseSprite___update__P187083(s) {
+function sprites_BaseSprite___update__P1866(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69490,17 +69509,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C187075_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___update__P187083.info = {"start":1027,"length":46,"line":45,"column":8,"endLine":45,"endColumn":54,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
+sprites_BaseSprite___update__P1866.info = {"start":1027,"length":46,"line":45,"column":8,"endLine":45,"endColumn":54,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__update","argumentNames":["this","camera","dt"]}
 
-function sprites_BaseSprite___update__P187083_mk(s) {
+function sprites_BaseSprite___update__P1866_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___update__P187083, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___update__P1866, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -69511,7 +69530,7 @@ function sprites_BaseSprite___update__P187083_mk(s) {
 
 
 
-function sprites_BaseSprite___draw__P187081(s) {
+function sprites_BaseSprite___draw__P1864(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69527,10 +69546,10 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C187075_VT)) failedCast(r0);
-    s.tmp_1 = sprites_BaseSprite__C187075_v0_1_mk(s);
+    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
+    s.tmp_1 = sprites_BaseSprite__C1858_v0_1_mk(s);
     s.tmp_1.arg0 = s.arg0;
-    if (!checkSubtype(s.tmp_1.arg0, sprites_BaseSprite__C187075_VT)) failedCast(s.tmp_1.arg0);
+    if (!checkSubtype(s.tmp_1.arg0, sprites_BaseSprite__C1858_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:
@@ -69538,10 +69557,10 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_2 = sprites_BaseSprite__C187075_v2_2_mk(s);
+    s.tmp_2 = sprites_BaseSprite__C1858_v2_2_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.tmp_2.arg1 = s.arg1;
-    if (!checkSubtype(s.tmp_2.arg0, sprites_BaseSprite__C187075_VT)) failedCast(s.tmp_2.arg0);
+    if (!checkSubtype(s.tmp_2.arg0, sprites_BaseSprite__C1858_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:
@@ -69552,12 +69571,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___draw__P187081.info = {"start":840,"length":131,"line":37,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__draw","argumentNames":["this","camera"]}
+sprites_BaseSprite___draw__P1864.info = {"start":840,"length":131,"line":37,"column":8,"endLine":41,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__draw","argumentNames":["this","camera"]}
 
-function sprites_BaseSprite___draw__P187081_mk(s) {
+function sprites_BaseSprite___draw__P1864_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___draw__P187081, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___draw__P1864, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69570,7 +69589,7 @@ function sprites_BaseSprite___draw__P187081_mk(s) {
 
 
 
-function sprites_BaseSprite___drawCore__P187082(s) {
+function sprites_BaseSprite___drawCore__P1865(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69586,17 +69605,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C187075_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___drawCore__P187082.info = {"start":981,"length":36,"line":43,"column":8,"endLine":43,"endColumn":44,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+sprites_BaseSprite___drawCore__P1865.info = {"start":981,"length":36,"line":43,"column":8,"endLine":43,"endColumn":44,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function sprites_BaseSprite___drawCore__P187082_mk(s) {
+function sprites_BaseSprite___drawCore__P1865_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___drawCore__P187082, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___drawCore__P1865, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
   arg1: undefined,
@@ -69606,7 +69625,7 @@ function sprites_BaseSprite___drawCore__P187082_mk(s) {
 
 
 
-function sprites_BaseSprite___visible__P187078(s) {
+function sprites_BaseSprite___visible__P1861(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69621,17 +69640,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_BaseSprite__C187075_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_BaseSprite__C1858_VT)) failedCast(r0);
     r0 = true;
     return leave(s, r0)
   default: oops()
 } } }
-sprites_BaseSprite___visible__P187078.info = {"start":524,"length":57,"line":22,"column":8,"endLine":24,"endColumn":9,"fileName":"pxt_modules/game/basesprite.ts","functionName":"__visible","argumentNames":["this"]}
+sprites_BaseSprite___visible__P1861.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__P187078_mk(s) {
+function sprites_BaseSprite___visible__P1861_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_BaseSprite___visible__P187078, depth: s.depth + 1,
+        parent: s, fn: sprites_BaseSprite___visible__P1861, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -69640,7 +69659,7 @@ function sprites_BaseSprite___visible__P187078_mk(s) {
 
 
 
-function controller_AnyButton_isPressed__P189405(s) {
+function controller_AnyButton_isPressed__P4189(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69650,36 +69669,36 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ctrl___211042 = undefined;
-    s.b___211046 = undefined;
-    s.unnamed8904___U2 = undefined;
-    s.unnamed8905___U3 = undefined;
+    s.ctrl___25986 = undefined;
+    s.b___25990 = undefined;
+    s.unnamed96___U2 = undefined;
+    s.unnamed97___U3 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_AnyButton__C189403_VT)) failedCast(r0);
-    s.tmp_0 = controller__player1__P187134_mk(s);
+    if (!checkSubtype(r0, controller_AnyButton__C4187_VT)) failedCast(r0);
+    s.tmp_0 = controller__player1__P1917_mk(s);
     s.callLocIdx = 190; s.pc = 6; return s.tmp_0;
   case 6:
     r0 = s.retval;
-    s.ctrl___211042 = (r0);
-    s.b___211046 = (undefined);
-    r0 = s.ctrl___211042.fields["buttons"];
-    s.unnamed8904___U2 = (r0);
-    s.unnamed8905___U3 = (0);
+    s.ctrl___25986 = (r0);
+    s.b___25990 = (undefined);
+    r0 = s.ctrl___25986.fields["buttons"];
+    s.unnamed96___U2 = (r0);
+    s.unnamed97___U3 = (0);
   case 1:
-    s.tmp_0 = r0 = s.unnamed8905___U3;
-    r0 = pxsim_Array__length(s.unnamed8904___U2);
+    s.tmp_0 = r0 = s.unnamed97___U3;
+    r0 = pxsim_Array__length(s.unnamed96___U2);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 < s.tmp_1);
     if (!r0) { step = 4; continue; }
-    r0 = pxsim_Array__getAt(s.unnamed8904___U2, s.unnamed8905___U3);
-    s.b___211046 = (r0);
-    s.tmp_3 = controller_Button__C187120_v0_1_mk(s);
-    s.tmp_3.arg0 = s.b___211046;
-    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C187120_VT)) failedCast(s.tmp_3.arg0);
+    r0 = pxsim_Array__getAt(s.unnamed96___U2, s.unnamed97___U3);
+    s.b___25990 = (r0);
+    s.tmp_3 = controller_Button__C1903_v0_1_mk(s);
+    s.tmp_3.arg0 = s.b___25990;
+    if (!checkSubtype(s.tmp_3.arg0, controller_Button__C1903_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:
@@ -69691,31 +69710,31 @@ switch (step) {
     { step = 5; continue; }
   case 2:
   case 3:
-    r0 = (s.unnamed8905___U3 + 1);
-    s.unnamed8905___U3 = (r0);
+    r0 = (s.unnamed97___U3 + 1);
+    s.unnamed97___U3 = (r0);
     { step = 1; continue; }
   case 4:
-    s.unnamed8904___U2 = (undefined);
+    s.unnamed96___U2 = (undefined);
     r0 = false;
   case 5:
     return leave(s, r0)
   default: oops()
 } } }
-controller_AnyButton_isPressed__P189405.info = {"start":5874,"length":202,"line":185,"column":8,"endLine":192,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"isPressed","argumentNames":["this"]}
+controller_AnyButton_isPressed__P4189.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__P189405_mk(s) {
+function controller_AnyButton_isPressed__P4189_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_AnyButton_isPressed__P189405, depth: s.depth + 1,
+        parent: s, fn: controller_AnyButton_isPressed__P4189, 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___211042: undefined,
-  b___211046: undefined,
-  unnamed8904___U2: undefined,
-  unnamed8905___U3: undefined,
+  ctrl___25986: undefined,
+  b___25990: undefined,
+  unnamed96___U2: undefined,
+  unnamed97___U3: undefined,
   arg0: undefined,
 } }
 
@@ -69723,7 +69742,7 @@ function controller_AnyButton_isPressed__P189405_mk(s) {
 
 
 
-function controller_Button_toString__P187125(s) {
+function controller_Button_toString__P1908(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69738,7 +69757,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, controller_Button__C187120_VT)) failedCast(r0);
+    if (!checkSubtype(r0, controller_Button__C1903_VT)) failedCast(r0);
     r0 = s.arg0.fields["_pressed"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
@@ -69778,12 +69797,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-controller_Button_toString__P187125.info = {"start":1479,"length":100,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game/controller.ts","functionName":"toString","argumentNames":["this"]}
+controller_Button_toString__P1908.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__P187125_mk(s) {
+function controller_Button_toString__P1908_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: controller_Button_toString__P187125, depth: s.depth + 1,
+        parent: s, fn: controller_Button_toString__P1908, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69799,7 +69818,7 @@ function controller_Button_toString__P187125_mk(s) {
 
 
 
-function effects_SceneAnchor_height__P189966(s) {
+function effects_SceneAnchor_height__P4750(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69814,18 +69833,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C189962_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_height__P189966.info = {"start":2634,"length":58,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"height","argumentNames":["this"]}
-effects_SceneAnchor_height__P189966.isGetter = true;
+effects_SceneAnchor_height__P4750.info = {"start":2634,"length":58,"line":71,"column":8,"endLine":73,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"height","argumentNames":["this"]}
+effects_SceneAnchor_height__P4750.isGetter = true;
 
-function effects_SceneAnchor_height__P189966_mk(s) {
+function effects_SceneAnchor_height__P4750_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_height__P189966, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_height__P4750, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -69834,7 +69853,7 @@ function effects_SceneAnchor_height__P189966_mk(s) {
 
 
 
-function effects_SceneAnchor_width__P189965(s) {
+function effects_SceneAnchor_width__P4749(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69849,18 +69868,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C189962_VT)) failedCast(r0);
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_width__P189965.info = {"start":2568,"length":56,"line":67,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"width","argumentNames":["this"]}
-effects_SceneAnchor_width__P189965.isGetter = true;
+effects_SceneAnchor_width__P4749.info = {"start":2568,"length":56,"line":67,"column":8,"endLine":69,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"width","argumentNames":["this"]}
+effects_SceneAnchor_width__P4749.isGetter = true;
 
-function effects_SceneAnchor_width__P189965_mk(s) {
+function effects_SceneAnchor_width__P4749_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_width__P189965, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_width__P4749, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -69869,7 +69888,7 @@ function effects_SceneAnchor_width__P189965_mk(s) {
 
 
 
-function effects_SceneAnchor_y__P189964(s) {
+function effects_SceneAnchor_y__P4748(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69884,12 +69903,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C189962_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
     r0 = s.arg0.fields["camera"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_offsetY"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.height(globals.screen___187019);
+    r0 = pxsim_ImageMethods.height(globals.screen___1802);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
@@ -69897,13 +69916,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_y__P189964.info = {"start":2476,"length":82,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"y","argumentNames":["this"]}
-effects_SceneAnchor_y__P189964.isGetter = true;
+effects_SceneAnchor_y__P4748.info = {"start":2476,"length":82,"line":63,"column":8,"endLine":65,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"y","argumentNames":["this"]}
+effects_SceneAnchor_y__P4748.isGetter = true;
 
-function effects_SceneAnchor_y__P189964_mk(s) {
+function effects_SceneAnchor_y__P4748_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_y__P189964, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_y__P4748, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69916,7 +69935,7 @@ function effects_SceneAnchor_y__P189964_mk(s) {
 
 
 
-function effects_SceneAnchor_x__P189963(s) {
+function effects_SceneAnchor_x__P4747(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69931,12 +69950,12 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, effects_SceneAnchor__C189962_VT)) failedCast(r0);
+    if (!checkSubtype(r0, effects_SceneAnchor__C4746_VT)) failedCast(r0);
     r0 = s.arg0.fields["camera"];
     s.tmp_1 = r0;
     r0 = s.tmp_1.fields["_offsetX"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.width(globals.screen___187019);
+    r0 = pxsim_ImageMethods.width(globals.screen___1802);
     s.tmp_3 = r0;
     r0 = (s.tmp_3 >> 1);
     s.tmp_2 = r0;
@@ -69944,13 +69963,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-effects_SceneAnchor_x__P189963.info = {"start":2385,"length":81,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"x","argumentNames":["this"]}
-effects_SceneAnchor_x__P189963.isGetter = true;
+effects_SceneAnchor_x__P4747.info = {"start":2385,"length":81,"line":59,"column":8,"endLine":61,"endColumn":9,"fileName":"pxt_modules/game/particleeffects.ts","functionName":"x","argumentNames":["this"]}
+effects_SceneAnchor_x__P4747.isGetter = true;
 
-function effects_SceneAnchor_x__P189963_mk(s) {
+function effects_SceneAnchor_x__P4747_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: effects_SceneAnchor_x__P189963, depth: s.depth + 1,
+        parent: s, fn: effects_SceneAnchor_x__P4747, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -69963,7 +69982,7 @@ function effects_SceneAnchor_x__P189963_mk(s) {
 
 
 
-function sprites_StaticObstacle_width__P187373(s) {
+function sprites_StaticObstacle_width__P2156(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -69978,20 +69997,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C187363_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_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__P187373.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__P187373.isGetter = true;
+sprites_StaticObstacle_width__P2156.info = {"start":1088,"length":68,"line":48,"column":8,"endLine":50,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"width","argumentNames":["this"]}
+sprites_StaticObstacle_width__P2156.isGetter = true;
 
-function sprites_StaticObstacle_width__P187373_mk(s) {
+function sprites_StaticObstacle_width__P2156_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_width__P187373, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_width__P2156, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -70001,7 +70020,7 @@ function sprites_StaticObstacle_width__P187373_mk(s) {
 
 
 
-function sprites_StaticObstacle_height__P187372(s) {
+function sprites_StaticObstacle_height__P2155(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70016,20 +70035,20 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C187363_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_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__P187372.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__P187372.isGetter = true;
+sprites_StaticObstacle_height__P2155.info = {"start":1008,"length":70,"line":44,"column":8,"endLine":46,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"height","argumentNames":["this"]}
+sprites_StaticObstacle_height__P2155.isGetter = true;
 
-function sprites_StaticObstacle_height__P187372_mk(s) {
+function sprites_StaticObstacle_height__P2155_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_height__P187372, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_height__P2155, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -70039,7 +70058,7 @@ function sprites_StaticObstacle_height__P187372_mk(s) {
 
 
 
-function sprites_StaticObstacle_y__P187371(s) {
+function sprites_StaticObstacle_y__P2154(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70054,7 +70073,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C187363_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
     r0 = s.arg0.fields["top"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["image"];
@@ -70067,13 +70086,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_y__P187371.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__P187371.isGetter = true;
+sprites_StaticObstacle_y__P2154.info = {"start":921,"length":77,"line":40,"column":8,"endLine":42,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"y","argumentNames":["this"]}
+sprites_StaticObstacle_y__P2154.isGetter = true;
 
-function sprites_StaticObstacle_y__P187371_mk(s) {
+function sprites_StaticObstacle_y__P2154_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_y__P187371, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_y__P2154, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70086,7 +70105,7 @@ function sprites_StaticObstacle_y__P187371_mk(s) {
 
 
 
-function sprites_StaticObstacle_x__P187370(s) {
+function sprites_StaticObstacle_x__P2153(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70101,7 +70120,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, sprites_StaticObstacle__C187363_VT)) failedCast(r0);
+    if (!checkSubtype(r0, sprites_StaticObstacle__C2146_VT)) failedCast(r0);
     r0 = s.arg0.fields["left"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["image"];
@@ -70114,13 +70133,13 @@ switch (step) {
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-sprites_StaticObstacle_x__P187370.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__P187370.isGetter = true;
+sprites_StaticObstacle_x__P2153.info = {"start":834,"length":77,"line":36,"column":8,"endLine":38,"endColumn":9,"fileName":"pxt_modules/game/obstacle.ts","functionName":"x","argumentNames":["this"]}
+sprites_StaticObstacle_x__P2153.isGetter = true;
 
-function sprites_StaticObstacle_x__P187370_mk(s) {
+function sprites_StaticObstacle_x__P2153_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: sprites_StaticObstacle_x__P187370, depth: s.depth + 1,
+        parent: s, fn: sprites_StaticObstacle_x__P2153, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70133,7 +70152,7 @@ function sprites_StaticObstacle_x__P187370_mk(s) {
 
 
 
-function blockMenu_MenuSprite___drawCore__P188928(s) {
+function blockMenu_MenuSprite___drawCore__P3711(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70149,13 +70168,13 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["background"];
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 1; continue; }
-    s.tmp_1 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_1.arg0 = globals.screen___187019;
+    s.tmp_1 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_1.arg0 = globals.screen___1802;
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["left"];
     s.tmp_1.arg1 = r0;
@@ -70170,7 +70189,7 @@ switch (step) {
     s.tmp_1.arg4 = r0;
     r0 = s.arg0.fields["background"];
     s.tmp_1.arg5 = r0;
-    s.callLocIdx = 1971; s.pc = 5; return s.tmp_1;
+    s.callLocIdx = 1978; s.pc = 5; return s.tmp_1;
   case 5:
     r0 = s.retval;
   case 1:
@@ -70181,16 +70200,16 @@ switch (step) {
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 3; continue; }
-    s.tmp_2 = blockMenu_MenuSprite_drawGridMenu__P191324_mk(s);
+    s.tmp_2 = blockMenu_MenuSprite_drawGridMenu__P6108_mk(s);
     s.tmp_2.arg0 = s.arg0;
-    s.callLocIdx = 1972; s.pc = 6; return s.tmp_2;
+    s.callLocIdx = 1979; s.pc = 6; return s.tmp_2;
   case 6:
     r0 = s.retval;
     { step = 4; continue; }
   case 3:
-    s.tmp_0 = blockMenu_MenuSprite_drawListMenu__P191325_mk(s);
+    s.tmp_0 = blockMenu_MenuSprite_drawListMenu__P6109_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.callLocIdx = 1973; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1980; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
   case 4:
@@ -70198,12 +70217,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite___drawCore__P188928.info = {"start":5414,"length":510,"line":176,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+blockMenu_MenuSprite___drawCore__P3711.info = {"start":5414,"length":510,"line":176,"column":8,"endLine":193,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function blockMenu_MenuSprite___drawCore__P188928_mk(s) {
+function blockMenu_MenuSprite___drawCore__P3711_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite___drawCore__P188928, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite___drawCore__P3711, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70216,7 +70235,7 @@ function blockMenu_MenuSprite___drawCore__P188928_mk(s) {
 
 
 
-function blockMenu_MenuSprite_drawListMenu__P191325(s) {
+function blockMenu_MenuSprite_drawListMenu__P6109(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70226,33 +70245,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___211136 = undefined;
-    s.top___211137 = undefined;
-    s.left___211144 = undefined;
-    s.i___211151 = undefined;
+    s.current___26087 = undefined;
+    s.top___26088 = undefined;
+    s.left___26095 = undefined;
+    s.i___26102 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["top"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___211137 = (r0);
+    s.top___26088 = (r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["left"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.left___211144 = (r0);
-    s.i___211151 = (0);
+    s.left___26095 = (r0);
+    s.i___26102 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___211151;
+    s.tmp_1 = r0 = s.i___26102;
     r0 = s.arg0.fields["labels"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -70263,26 +70282,26 @@ switch (step) {
     if (!r0) { step = 4; continue; }
     r0 = s.arg0.fields["labels"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_4, s.i___211151);
-    s.current___211136 = (r0);
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___26102);
+    s.current___26087 = (r0);
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
-    r0 = (s.i___211151 === s.tmp_1);
+    r0 = (s.i___26102 === s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
-    r0 = (s.left___211144 - 1);
+    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
+    r0 = (s.left___26095 - 1);
     s.tmp_2.arg1 = r0;
-    r0 = (s.top___211137 - 1);
+    r0 = (s.top___26088 - 1);
     s.tmp_2.arg2 = r0;
-    r0 = s.current___211136.fields["width"];
+    r0 = s.current___26087.fields["width"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_2.arg3 = r0;
     s.tmp_5 = if_charHeight_1_mk(s);
-    r0 = s.current___211136.fields["font"];
+    r0 = s.current___26087.fields["font"];
     s.tmp_5.arg0 = r0;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "charHeight");
@@ -70290,7 +70309,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1983; s.pc = 6; return s.tmp_5; }
+     else { s.callLocIdx = 1990; s.pc = 6; return s.tmp_5; }
     }
   case 6:
     r0 = s.retval;
@@ -70299,33 +70318,33 @@ switch (step) {
     s.tmp_2.arg4 = r0;
     r0 = s.arg0.fields["cursorBackground"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 1984; s.pc = 5; return s.tmp_2;
+    s.callLocIdx = 1991; s.pc = 5; return s.tmp_2;
   case 5:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P191328_mk(s);
-    s.tmp_0.arg0 = s.current___211136;
-    s.tmp_0.arg1 = s.left___211144;
-    s.tmp_0.arg2 = s.top___211137;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
+    s.tmp_0.arg0 = s.current___26087;
+    s.tmp_0.arg1 = s.left___26095;
+    s.tmp_0.arg2 = s.top___26088;
     r0 = s.arg0.fields["cursorForeground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1985; s.pc = 7; return s.tmp_0;
+    s.callLocIdx = 1992; s.pc = 7; return s.tmp_0;
   case 7:
     r0 = s.retval;
     { step = 3; continue; }
   case 2:
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P191328_mk(s);
-    s.tmp_0.arg0 = s.current___211136;
-    s.tmp_0.arg1 = s.left___211144;
-    s.tmp_0.arg2 = s.top___211137;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
+    s.tmp_0.arg0 = s.current___26087;
+    s.tmp_0.arg1 = s.left___26095;
+    s.tmp_0.arg2 = s.top___26088;
     r0 = s.arg0.fields["foreground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1986; s.pc = 8; return s.tmp_0;
+    s.callLocIdx = 1993; s.pc = 8; return s.tmp_0;
   case 8:
     r0 = s.retval;
   case 3:
-    s.tmp_0 = r0 = s.top___211137;
+    s.tmp_0 = r0 = s.top___26088;
     s.tmp_3 = if_charHeight_1_mk(s);
-    r0 = s.current___211136.fields["font"];
+    r0 = s.current___26087.fields["font"];
     s.tmp_3.arg0 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
@@ -70333,7 +70352,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1987; s.pc = 9; return s.tmp_3; }
+     else { s.callLocIdx = 1994; s.pc = 9; return s.tmp_3; }
     }
   case 9:
     r0 = s.retval;
@@ -70343,21 +70362,21 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___211137 = (r0);
-    r0 = (s.i___211151 + 1);
-    s.i___211151 = (r0);
+    s.top___26088 = (r0);
+    r0 = (s.i___26102 + 1);
+    s.i___26102 = (r0);
     { step = 1; continue; }
   case 4:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_drawListMenu__P191325.info = {"start":7514,"length":733,"line":242,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawListMenu","argumentNames":["this"]}
+blockMenu_MenuSprite_drawListMenu__P6109.info = {"start":7514,"length":733,"line":242,"column":8,"endLine":260,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawListMenu","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_drawListMenu__P191325_mk(s) {
+function blockMenu_MenuSprite_drawListMenu__P6109_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_drawListMenu__P191325, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_drawListMenu__P6109, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70365,10 +70384,10 @@ function blockMenu_MenuSprite_drawListMenu__P191325_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  current___211136: undefined,
-  top___211137: undefined,
-  left___211144: undefined,
-  i___211151: undefined,
+  current___26087: undefined,
+  top___26088: undefined,
+  left___26095: undefined,
+  i___26102: undefined,
   arg0: undefined,
 } }
 
@@ -70376,7 +70395,7 @@ function blockMenu_MenuSprite_drawListMenu__P191325_mk(s) {
 
 
 
-function blockMenu_ScrollingLabel_draw__P191328(s) {
+function blockMenu_ScrollingLabel_draw__P6112(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70386,9 +70405,9 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.startIndex___211210 = undefined;
-    s.letterOffset___211218 = undefined;
-    s.i___211325 = undefined;
+    s.startIndex___26161 = undefined;
+    s.letterOffset___26169 = undefined;
+    s.i___26276 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -70397,7 +70416,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C191326_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_ScrollingLabel__C6110_VT)) failedCast(r0);
     r0 = s.arg0.fields["offset"];
     s.tmp_0 = r0;
     s.tmp_2 = if_charWidth_1_mk(s);
@@ -70409,14 +70428,14 @@ switch (step) {
       s.tmp_2.fn = s.tmp_2.arg0.vtable.iface["charWidth"];
       if (s.tmp_2.fn == null) { s.retval = s.tmp_2.arg0.fields["charWidth"]; }
       else if (!s.tmp_2.fn.isGetter) { s.retval = bind(s.tmp_2); }
-     else { s.callLocIdx = 1994; s.pc = 17; return s.tmp_2; }
+     else { s.callLocIdx = 2001; s.pc = 17; return s.tmp_2; }
     }
   case 17:
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = pxsim.Math_.idiv(s.tmp_0, s.tmp_1);
-    s.startIndex___211210 = (r0);
-    s.tmp_1 = r0 = s.startIndex___211210;
+    s.startIndex___26161 = (r0);
+    s.tmp_1 = r0 = s.startIndex___26161;
     s.tmp_3 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_3.arg0 = r0;
@@ -70426,7 +70445,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charWidth"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charWidth"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1995; s.pc = 18; return s.tmp_3; }
+     else { s.callLocIdx = 2002; s.pc = 18; return s.tmp_3; }
     }
   case 18:
     r0 = s.retval;
@@ -70436,7 +70455,7 @@ switch (step) {
     r0 = s.arg0.fields["offset"];
     s.tmp_4 = r0;
     r0 = (s.tmp_0 - s.tmp_4);
-    s.letterOffset___211218 = (r0);
+    s.letterOffset___26169 = (r0);
     r0 = s.arg0.fields["scrolling"];
     s.tmp_2 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_2);
@@ -70475,11 +70494,11 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_3).fields["stage"] = (s.tmp_4);
     s.tmp_0 = r0 = s.arg0;
-    s.tmp_2 = Math_max__P185342_mk(s);
+    s.tmp_2 = Math_max__P125_mk(s);
     r0 = s.arg0.fields["maxOffset"];
     s.tmp_2.arg0 = r0;
     s.tmp_2.arg1 = 0;
-    s.callLocIdx = 1996; s.pc = 19; return s.tmp_2;
+    s.callLocIdx = 2003; s.pc = 19; return s.tmp_2;
   case 19:
     r0 = s.retval;
     s.tmp_1 = r0;
@@ -70504,11 +70523,11 @@ switch (step) {
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 6; continue; }
     s.tmp_2 = r0 = s.arg0;
-    s.tmp_4 = Math_max__P185342_mk(s);
+    s.tmp_4 = Math_max__P125_mk(s);
     r0 = s.arg0.fields["maxOffset"];
     s.tmp_4.arg0 = r0;
     s.tmp_4.arg1 = 0;
-    s.callLocIdx = 1997; s.pc = 20; return s.tmp_4;
+    s.callLocIdx = 2004; s.pc = 20; return s.tmp_4;
   case 20:
     r0 = s.retval;
     s.tmp_3 = r0;
@@ -70519,8 +70538,8 @@ switch (step) {
     s.tmp_0 = r0 = s.arg0;
     r0 = s.tmp_0.fields["timer"];
     s.tmp_2 = r0;
-    s.tmp_4 = game_currentScene__P187749_mk(s);
-    s.callLocIdx = 1998; s.pc = 21; return s.tmp_4;
+    s.tmp_4 = game_currentScene__P2532_mk(s);
+    s.callLocIdx = 2005; s.pc = 21; return s.tmp_4;
   case 21:
     r0 = s.retval;
     r0 = r0.fields["eventContext"];
@@ -70550,37 +70569,37 @@ switch (step) {
   case 10:
   case 11:
   case 12:
-    r0 = pxsim_numops_toBoolDecr(s.letterOffset___211218);
+    r0 = pxsim_numops_toBoolDecr(s.letterOffset___26169);
     if (!r0) { step = 13; continue; }
     r0 = s.arg0.fields["partialCanvas"];
     s.tmp_0 = r0;
     r0 = pxsim_ImageMethods.fill(s.tmp_0, 0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
     r0 = s.arg0.fields["partialCanvas"];
     s.tmp_0.arg0 = r0;
     r0 = s.arg0.fields["text"];
     s.tmp_1 = r0;
-    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___211210);
+    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___26161);
     s.tmp_0.arg1 = r0;
-    s.tmp_0.arg2 = s.letterOffset___211218;
+    s.tmp_0.arg2 = s.letterOffset___26169;
     s.tmp_0.arg3 = 0;
     s.tmp_0.arg4 = s.arg3;
     r0 = s.arg0.fields["font"];
     s.tmp_0.arg5 = r0;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 1999; s.pc = 22; return s.tmp_0;
+    s.callLocIdx = 2006; s.pc = 22; return s.tmp_0;
   case 22:
     r0 = s.retval;
     r0 = s.arg0.fields["partialCanvas"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___187019, s.tmp_0, s.arg1, s.arg2);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, s.tmp_0, s.arg1, s.arg2);
     { step = 14; continue; }
   case 13:
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     r0 = s.arg0.fields["text"];
     s.tmp_1 = r0;
-    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___211210);
+    r0 = pxsim_String_.charAt(s.tmp_1, s.startIndex___26161);
     s.tmp_0.arg1 = r0;
     s.tmp_0.arg2 = s.arg1;
     s.tmp_0.arg3 = s.arg2;
@@ -70588,28 +70607,28 @@ switch (step) {
     r0 = s.arg0.fields["font"];
     s.tmp_0.arg5 = r0;
     s.tmp_0.arg6 = undefined;
-    s.callLocIdx = 2000; s.pc = 23; return s.tmp_0;
+    s.callLocIdx = 2007; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
   case 14:
-    s.i___211325 = (1);
+    s.i___26276 = (1);
   case 15:
     r0 = s.arg0.fields["maxCharacters"];
     s.tmp_1 = r0;
-    r0 = (s.i___211325 < s.tmp_1);
+    r0 = (s.i___26276 < s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 16; continue; }
-    s.tmp_2 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
+    s.tmp_2 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
     r0 = s.arg0.fields["text"];
     s.tmp_3 = r0;
-    r0 = (s.startIndex___211210 + s.i___211325);
+    r0 = (s.startIndex___26161 + s.i___26276);
     s.tmp_4 = r0;
     r0 = pxsim_String_.charAt(s.tmp_3, s.tmp_4);
     s.tmp_2.arg1 = r0;
     s.tmp_6 = r0 = s.arg1;
-    s.tmp_8 = r0 = s.i___211325;
+    s.tmp_8 = r0 = s.i___26276;
     s.tmp_10 = if_charWidth_1_mk(s);
     r0 = s.arg0.fields["font"];
     s.tmp_10.arg0 = r0;
@@ -70619,7 +70638,7 @@ switch (step) {
       s.tmp_10.fn = s.tmp_10.arg0.vtable.iface["charWidth"];
       if (s.tmp_10.fn == null) { s.retval = s.tmp_10.arg0.fields["charWidth"]; }
       else if (!s.tmp_10.fn.isGetter) { s.retval = bind(s.tmp_10); }
-     else { s.callLocIdx = 2001; s.pc = 25; return s.tmp_10; }
+     else { s.callLocIdx = 2008; s.pc = 25; return s.tmp_10; }
     }
   case 25:
     r0 = s.retval;
@@ -70628,30 +70647,30 @@ switch (step) {
     s.tmp_7 = r0;
     r0 = (s.tmp_6 + s.tmp_7);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 + s.letterOffset___211218);
+    r0 = (s.tmp_5 + s.letterOffset___26169);
     s.tmp_2.arg2 = r0;
     s.tmp_2.arg3 = s.arg2;
     s.tmp_2.arg4 = s.arg3;
     r0 = s.arg0.fields["font"];
     s.tmp_2.arg5 = r0;
     s.tmp_2.arg6 = undefined;
-    s.callLocIdx = 2002; s.pc = 24; return s.tmp_2;
+    s.callLocIdx = 2009; s.pc = 24; return s.tmp_2;
   case 24:
     r0 = s.retval;
-    r0 = (s.i___211325 + 1);
-    s.i___211325 = (r0);
+    r0 = (s.i___26276 + 1);
+    s.i___26276 = (r0);
     { step = 15; continue; }
   case 16:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_ScrollingLabel_draw__P191328.info = {"start":9505,"length":1769,"line":301,"column":8,"endLine":349,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"draw","argumentNames":["this","left","top","color"]}
+blockMenu_ScrollingLabel_draw__P6112.info = {"start":9505,"length":1769,"line":301,"column":8,"endLine":349,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"draw","argumentNames":["this","left","top","color"]}
 
-function blockMenu_ScrollingLabel_draw__P191328_mk(s) {
+function blockMenu_ScrollingLabel_draw__P6112_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_ScrollingLabel_draw__P191328, depth: s.depth + 1,
+        parent: s, fn: blockMenu_ScrollingLabel_draw__P6112, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70664,9 +70683,9 @@ function blockMenu_ScrollingLabel_draw__P191328_mk(s) {
   tmp_8: undefined,
   tmp_9: undefined,
   tmp_10: undefined,
-  startIndex___211210: undefined,
-  letterOffset___211218: undefined,
-  i___211325: undefined,
+  startIndex___26161: undefined,
+  letterOffset___26169: undefined,
+  i___26276: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -70677,7 +70696,7 @@ function blockMenu_ScrollingLabel_draw__P191328_mk(s) {
 
 
 
-function blockMenu_MenuSprite_drawGridMenu__P191324(s) {
+function blockMenu_MenuSprite_drawGridMenu__P6108(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70687,33 +70706,33 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.current___211357 = undefined;
-    s.top___211358 = undefined;
-    s.left___211365 = undefined;
-    s.i___211372 = undefined;
+    s.current___26308 = undefined;
+    s.top___26309 = undefined;
+    s.left___26316 = undefined;
+    s.i___26323 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["top"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___211358 = (r0);
+    s.top___26309 = (r0);
     r0 = s.arg0.fields["metrics"];
     r0 = r0.fields["left"];
     s.tmp_0 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.left___211365 = (r0);
-    s.i___211372 = (0);
+    s.left___26316 = (r0);
+    s.i___26323 = (0);
   case 1:
-    s.tmp_1 = r0 = s.i___211372;
+    s.tmp_1 = r0 = s.i___26323;
     r0 = s.arg0.fields["labels"];
     s.tmp_3 = r0;
     r0 = pxsim_Array__length(s.tmp_3);
@@ -70724,26 +70743,26 @@ switch (step) {
     if (!r0) { step = 6; continue; }
     r0 = s.arg0.fields["labels"];
     s.tmp_4 = r0;
-    r0 = pxsim_Array__getAt(s.tmp_4, s.i___211372);
-    s.current___211357 = (r0);
+    r0 = pxsim_Array__getAt(s.tmp_4, s.i___26323);
+    s.current___26308 = (r0);
     r0 = s.arg0.fields["selectedIndex"];
     s.tmp_1 = r0;
-    r0 = (s.i___211372 === s.tmp_1);
+    r0 = (s.i___26323 === s.tmp_1);
     s.tmp_0 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_0);
     if (!r0) { step = 2; continue; }
-    s.tmp_2 = helpers_imageFillRect__P186945_mk(s);
-    s.tmp_2.arg0 = globals.screen___187019;
-    r0 = (s.left___211365 - 1);
+    s.tmp_2 = helpers_imageFillRect__P1728_mk(s);
+    s.tmp_2.arg0 = globals.screen___1802;
+    r0 = (s.left___26316 - 1);
     s.tmp_2.arg1 = r0;
-    r0 = (s.top___211358 - 1);
+    r0 = (s.top___26309 - 1);
     s.tmp_2.arg2 = r0;
-    r0 = s.current___211357.fields["width"];
+    r0 = s.current___26308.fields["width"];
     s.tmp_3 = r0;
     r0 = (s.tmp_3 + 2);
     s.tmp_2.arg3 = r0;
     s.tmp_5 = if_charHeight_1_mk(s);
-    r0 = s.current___211357.fields["font"];
+    r0 = s.current___26308.fields["font"];
     s.tmp_5.arg0 = r0;
     if (!s.tmp_5.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_5.arg0, "charHeight");
@@ -70751,7 +70770,7 @@ switch (step) {
       s.tmp_5.fn = s.tmp_5.arg0.vtable.iface["charHeight"];
       if (s.tmp_5.fn == null) { s.retval = s.tmp_5.arg0.fields["charHeight"]; }
       else if (!s.tmp_5.fn.isGetter) { s.retval = bind(s.tmp_5); }
-     else { s.callLocIdx = 1978; s.pc = 8; return s.tmp_5; }
+     else { s.callLocIdx = 1985; s.pc = 8; return s.tmp_5; }
     }
   case 8:
     r0 = s.retval;
@@ -70760,31 +70779,31 @@ switch (step) {
     s.tmp_2.arg4 = r0;
     r0 = s.arg0.fields["cursorBackground"];
     s.tmp_2.arg5 = r0;
-    s.callLocIdx = 1979; s.pc = 7; return s.tmp_2;
+    s.callLocIdx = 1986; s.pc = 7; return s.tmp_2;
   case 7:
     r0 = s.retval;
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P191328_mk(s);
-    s.tmp_0.arg0 = s.current___211357;
-    s.tmp_0.arg1 = s.left___211365;
-    s.tmp_0.arg2 = s.top___211358;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
+    s.tmp_0.arg0 = s.current___26308;
+    s.tmp_0.arg1 = s.left___26316;
+    s.tmp_0.arg2 = s.top___26309;
     r0 = s.arg0.fields["cursorForeground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1980; s.pc = 9; return s.tmp_0;
+    s.callLocIdx = 1987; s.pc = 9; return s.tmp_0;
   case 9:
     r0 = s.retval;
     { step = 3; continue; }
   case 2:
-    s.tmp_0 = blockMenu_ScrollingLabel_draw__P191328_mk(s);
-    s.tmp_0.arg0 = s.current___211357;
-    s.tmp_0.arg1 = s.left___211365;
-    s.tmp_0.arg2 = s.top___211358;
+    s.tmp_0 = blockMenu_ScrollingLabel_draw__P6112_mk(s);
+    s.tmp_0.arg0 = s.current___26308;
+    s.tmp_0.arg1 = s.left___26316;
+    s.tmp_0.arg2 = s.top___26309;
     r0 = s.arg0.fields["foreground"];
     s.tmp_0.arg3 = r0;
-    s.callLocIdx = 1981; s.pc = 10; return s.tmp_0;
+    s.callLocIdx = 1988; s.pc = 10; return s.tmp_0;
   case 10:
     r0 = s.retval;
   case 3:
-    r0 = (s.i___211372 % 2);
+    r0 = (s.i___26323 % 2);
     s.tmp_1 = r0;
     r0 = (s.tmp_1 === 1);
     s.tmp_0 = r0;
@@ -70796,10 +70815,10 @@ switch (step) {
     r0 = s.arg0.fields["padding"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
-    s.left___211365 = (r0);
-    s.tmp_0 = r0 = s.top___211358;
+    s.left___26316 = (r0);
+    s.tmp_0 = r0 = s.top___26309;
     s.tmp_3 = if_charHeight_1_mk(s);
-    r0 = s.current___211357.fields["font"];
+    r0 = s.current___26308.fields["font"];
     s.tmp_3.arg0 = r0;
     if (!s.tmp_3.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_3.arg0, "charHeight");
@@ -70807,7 +70826,7 @@ switch (step) {
       s.tmp_3.fn = s.tmp_3.arg0.vtable.iface["charHeight"];
       if (s.tmp_3.fn == null) { s.retval = s.tmp_3.arg0.fields["charHeight"]; }
       else if (!s.tmp_3.fn.isGetter) { s.retval = bind(s.tmp_3); }
-     else { s.callLocIdx = 1982; s.pc = 11; return s.tmp_3; }
+     else { s.callLocIdx = 1989; s.pc = 11; return s.tmp_3; }
     }
   case 11:
     r0 = s.retval;
@@ -70817,33 +70836,33 @@ switch (step) {
     r0 = (s.tmp_2 + s.tmp_4);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.top___211358 = (r0);
+    s.top___26309 = (r0);
     { step = 5; continue; }
   case 4:
-    s.tmp_0 = r0 = s.left___211365;
-    r0 = s.current___211357.fields["width"];
+    s.tmp_0 = r0 = s.left___26316;
+    r0 = s.current___26308.fields["width"];
     s.tmp_2 = r0;
     r0 = s.arg0.fields["padding"];
     s.tmp_3 = r0;
     r0 = (s.tmp_2 + s.tmp_3);
     s.tmp_1 = r0;
     r0 = (s.tmp_0 + s.tmp_1);
-    s.left___211365 = (r0);
+    s.left___26316 = (r0);
   case 5:
-    r0 = (s.i___211372 + 1);
-    s.i___211372 = (r0);
+    r0 = (s.i___26323 + 1);
+    s.i___26323 = (r0);
     { step = 1; continue; }
   case 6:
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite_drawGridMenu__P191324.info = {"start":6552,"length":952,"line":215,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawGridMenu","argumentNames":["this"]}
+blockMenu_MenuSprite_drawGridMenu__P6108.info = {"start":6552,"length":952,"line":215,"column":8,"endLine":240,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"drawGridMenu","argumentNames":["this"]}
 
-function blockMenu_MenuSprite_drawGridMenu__P191324_mk(s) {
+function blockMenu_MenuSprite_drawGridMenu__P6108_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite_drawGridMenu__P191324, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite_drawGridMenu__P6108, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -70851,10 +70870,10 @@ function blockMenu_MenuSprite_drawGridMenu__P191324_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  current___211357: undefined,
-  top___211358: undefined,
-  left___211365: undefined,
-  i___211372: undefined,
+  current___26308: undefined,
+  top___26309: undefined,
+  left___26316: undefined,
+  i___26323: undefined,
   arg0: undefined,
 } }
 
@@ -70862,7 +70881,7 @@ function blockMenu_MenuSprite_drawGridMenu__P191324_mk(s) {
 
 
 
-function blockMenu_MenuSprite___visible__P188927(s) {
+function blockMenu_MenuSprite___visible__P3710(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70877,17 +70896,17 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, blockMenu_MenuSprite__C188909_VT)) failedCast(r0);
+    if (!checkSubtype(r0, blockMenu_MenuSprite__C3692_VT)) failedCast(r0);
     r0 = s.arg0.fields["open"];
     return leave(s, r0)
   default: oops()
 } } }
-blockMenu_MenuSprite___visible__P188927.info = {"start":5342,"length":62,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__visible","argumentNames":["this"]}
+blockMenu_MenuSprite___visible__P3710.info = {"start":5342,"length":62,"line":172,"column":8,"endLine":174,"endColumn":9,"fileName":"pxt_modules/block-menu/menu.ts","functionName":"__visible","argumentNames":["this"]}
 
-function blockMenu_MenuSprite___visible__P188927_mk(s) {
+function blockMenu_MenuSprite___visible__P3710_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: blockMenu_MenuSprite___visible__P188927, depth: s.depth + 1,
+        parent: s, fn: blockMenu_MenuSprite___visible__P3710, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -70896,7 +70915,7 @@ function blockMenu_MenuSprite___visible__P188927_mk(s) {
 
 
 
-function scene_Camera_top__P187590(s) {
+function scene_Camera_top__P2373(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70911,18 +70930,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetY"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_top__P187590.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__P187590.isGetter = true;
+scene_Camera_top__P2373.info = {"start":1638,"length":58,"line":58,"column":8,"endLine":60,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"top","argumentNames":["this"]}
+scene_Camera_top__P2373.isGetter = true;
 
-function scene_Camera_top__P187590_mk(s) {
+function scene_Camera_top__P2373_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_top__P187590, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_top__P2373, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -70931,7 +70950,7 @@ function scene_Camera_top__P187590_mk(s) {
 
 
 
-function scene_Camera_left__P187588(s) {
+function scene_Camera_left__P2371(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70946,18 +70965,18 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Camera__C187577_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Camera__C2360_VT)) failedCast(r0);
     r0 = s.arg0.fields["drawOffsetX"];
     return leaveAccessor(s, r0)
   default: oops()
 } } }
-scene_Camera_left__P187588.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__P187588.isGetter = true;
+scene_Camera_left__P2371.info = {"start":1486,"length":59,"line":52,"column":8,"endLine":54,"endColumn":9,"fileName":"pxt_modules/game/camera.ts","functionName":"left","argumentNames":["this"]}
+scene_Camera_left__P2371.isGetter = true;
 
-function scene_Camera_left__P187588_mk(s) {
+function scene_Camera_left__P2371_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Camera_left__P187588, depth: s.depth + 1,
+        parent: s, fn: scene_Camera_left__P2371, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   arg0: undefined,
 } }
@@ -70966,7 +70985,7 @@ function scene_Camera_left__P187588_mk(s) {
 
 
 
-function particles_ShapeFactory_drawParticle__P187960(s) {
+function particles_ShapeFactory_drawParticle__P2743(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -70976,7 +70995,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.pImage___211458 = undefined;
+    s.pImage___26409 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -70985,23 +71004,23 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_ShapeFactory__C187957_VT)) failedCast(r0);
-    s.tmp_1 = Math_FastRandom_pickRandom__P187808_mk(s);
+    if (!checkSubtype(r0, particles_ShapeFactory__C2740_VT)) failedCast(r0);
+    s.tmp_1 = Math_FastRandom_pickRandom__P2591_mk(s);
     r0 = s.arg0.fields["galois"];
     s.tmp_1.arg0 = r0;
     r0 = s.arg0.fields["sources"];
     s.tmp_1.arg1 = r0;
-    s.callLocIdx = 1609; s.pc = 1; return s.tmp_1;
+    s.callLocIdx = 1616; 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___211458 = (r0);
+    s.pImage___26409 = (r0);
     r0 = s.arg1.fields["color"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.replace(s.pImage___211458, 15, s.tmp_0);
-    s.tmp_0 = r0 = globals.screen___187019;
-    s.tmp_1 = r0 = s.pImage___211458;
+    r0 = pxsim_ImageMethods.replace(s.pImage___26409, 15, s.tmp_0);
+    s.tmp_0 = r0 = globals.screen___1802;
+    s.tmp_1 = r0 = s.pImage___26409;
     r0 = s.arg0.fields["ox"];
     s.tmp_4 = r0;
     r0 = (s.arg2 - s.tmp_4);
@@ -71023,12 +71042,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_ShapeFactory_drawParticle__P187960.info = {"start":7172,"length":323,"line":229,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
+particles_ShapeFactory_drawParticle__P2743.info = {"start":7172,"length":323,"line":229,"column":8,"endLine":237,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
 
-function particles_ShapeFactory_drawParticle__P187960_mk(s) {
+function particles_ShapeFactory_drawParticle__P2743_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_ShapeFactory_drawParticle__P187960, depth: s.depth + 1,
+        parent: s, fn: particles_ShapeFactory_drawParticle__P2743, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71040,7 +71059,7 @@ function particles_ShapeFactory_drawParticle__P187960_mk(s) {
   tmp_7: undefined,
   tmp_8: undefined,
   tmp_9: undefined,
-  pImage___211458: undefined,
+  pImage___26409: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -71051,7 +71070,7 @@ function particles_ShapeFactory_drawParticle__P187960_mk(s) {
 
 
 
-function Math_FastRandom_pickRandom__P187808(s) {
+function Math_FastRandom_pickRandom__P2591(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71067,7 +71086,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Math_FastRandom__C187803_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Math_FastRandom__C2586_VT)) failedCast(r0);
     r0 = pxsim_numops_toBoolDecr(s.arg1);
     s.tmp_1 = r0;
     r0 = pxsim_Boolean__bang(s.tmp_1);
@@ -71090,14 +71109,14 @@ switch (step) {
   case 3:
   case 4:
     s.tmp_4 = r0 = s.arg1;
-    s.tmp_6 = Math_FastRandom_randomRange__P187807_mk(s);
+    s.tmp_6 = Math_FastRandom_randomRange__P2590_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 = 1338; s.pc = 6; return s.tmp_6;
+    s.callLocIdx = 1345; s.pc = 6; return s.tmp_6;
   case 6:
     r0 = s.retval;
     s.tmp_5 = r0;
@@ -71106,12 +71125,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Math_FastRandom_pickRandom__P187808.info = {"start":2358,"length":192,"line":70,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"pickRandom","argumentNames":["this","list"]}
+Math_FastRandom_pickRandom__P2591.info = {"start":2358,"length":192,"line":70,"column":8,"endLine":75,"endColumn":9,"fileName":"pxt_modules/game/mathUtil.ts","functionName":"pickRandom","argumentNames":["this","list"]}
 
-function Math_FastRandom_pickRandom__P187808_mk(s) {
+function Math_FastRandom_pickRandom__P2591_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Math_FastRandom_pickRandom__P187808, depth: s.depth + 1,
+        parent: s, fn: Math_FastRandom_pickRandom__P2591, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71129,7 +71148,7 @@ function Math_FastRandom_pickRandom__P187808_mk(s) {
 
 
 
-function particles_AreaFactory_drawParticle__P187948(s) {
+function particles_AreaFactory_drawParticle__P2731(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71139,7 +71158,7 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.col___211504 = undefined;
+    s.col___26455 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
@@ -71148,7 +71167,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_AreaFactory__C187941_VT)) failedCast(r0);
+    if (!checkSubtype(r0, particles_AreaFactory__C2724_VT)) failedCast(r0);
     r0 = s.arg1.fields["lifespan"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 > 500);
@@ -71175,8 +71194,8 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_5 = r0;
-    s.col___211504 = (s.tmp_5);
-    s.tmp_0 = r0 = globals.screen___187019;
+    s.col___26455 = (s.tmp_5);
+    s.tmp_0 = r0 = globals.screen___1802;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -71185,17 +71204,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___211504);
+    r0 = pxsim_ImageMethods.setPixel(s.tmp_0, s.tmp_1, s.tmp_3, s.col___26455);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-particles_AreaFactory_drawParticle__P187948.info = {"start":4770,"length":222,"line":158,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
+particles_AreaFactory_drawParticle__P2731.info = {"start":4770,"length":222,"line":158,"column":8,"endLine":163,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","p","x","y"]}
 
-function particles_AreaFactory_drawParticle__P187948_mk(s) {
+function particles_AreaFactory_drawParticle__P2731_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_AreaFactory_drawParticle__P187948, depth: s.depth + 1,
+        parent: s, fn: particles_AreaFactory_drawParticle__P2731, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71203,7 +71222,7 @@ function particles_AreaFactory_drawParticle__P187948_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   tmp_5: undefined,
-  col___211504: undefined,
+  col___26455: undefined,
   arg0: undefined,
   arg1: undefined,
   arg2: undefined,
@@ -71214,7 +71233,7 @@ function particles_AreaFactory_drawParticle__P187948_mk(s) {
 
 
 
-function particles_SprayFactory_drawParticle__P187938(s) {
+function particles_SprayFactory_drawParticle__P2721(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71232,8 +71251,8 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, particles_SprayFactory__C187935_VT)) failedCast(r0);
-    s.tmp_0 = r0 = globals.screen___187019;
+    if (!checkSubtype(r0, particles_SprayFactory__C2718_VT)) failedCast(r0);
+    s.tmp_0 = r0 = globals.screen___1802;
     r0 = (s.arg2 + 128);
     s.tmp_2 = r0;
     r0 = (s.tmp_2 >> 8);
@@ -71247,12 +71266,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-particles_SprayFactory_drawParticle__P187938.info = {"start":3194,"length":118,"line":115,"column":8,"endLine":117,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
+particles_SprayFactory_drawParticle__P2721.info = {"start":3194,"length":118,"line":115,"column":8,"endLine":117,"endColumn":9,"fileName":"pxt_modules/game/particlefactories.ts","functionName":"drawParticle","argumentNames":["this","particle","x","y"]}
 
-function particles_SprayFactory_drawParticle__P187938_mk(s) {
+function particles_SprayFactory_drawParticle__P2721_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: particles_SprayFactory_drawParticle__P187938, depth: s.depth + 1,
+        parent: s, fn: particles_SprayFactory_drawParticle__P2721, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71269,7 +71288,7 @@ function particles_SprayFactory_drawParticle__P187938_mk(s) {
 
 
 
-function scene_Renderable___drawCore__P187598(s) {
+function scene_Renderable___drawCore__P2381(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71285,19 +71304,19 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C187595_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C2378_VT)) failedCast(r0);
     s.tmp_0 = if_handler_3_mk(s);
     s.tmp_0.arg0 = s.arg0;
-    s.tmp_0.arg1 = globals.screen___187019;
+    s.tmp_0.arg1 = globals.screen___1802;
     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 = 1014; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 1021; 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 = 1014; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1014; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1014; 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 = 1021; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1021; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 1021; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
@@ -71305,12 +71324,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable___drawCore__P187598.info = {"start":390,"length":86,"line":14,"column":8,"endLine":16,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+scene_Renderable___drawCore__P2381.info = {"start":390,"length":86,"line":14,"column":8,"endLine":16,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function scene_Renderable___drawCore__P187598_mk(s) {
+function scene_Renderable___drawCore__P2381_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable___drawCore__P187598, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable___drawCore__P2381, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -71321,7 +71340,7 @@ function scene_Renderable___drawCore__P187598_mk(s) {
 
 
 
-function scene_Renderable___visible__P187597(s) {
+function scene_Renderable___visible__P2380(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71336,29 +71355,29 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, scene_Renderable__C187595_VT)) failedCast(r0);
+    if (!checkSubtype(r0, scene_Renderable__C2378_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 = 1013; s.pc = 1; return s.tmp_0;
+      s.callLocIdx = 1020; 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 = 1013; s.pc = 1; return s.tmp_0; }
-      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1013; s.pc = 1; return s.tmp_0;; }
-     else { s.callLocIdx = 1013; 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 = 1020; s.pc = 1; return s.tmp_0; }
+      else if (s.tmp_0.fn.isGetter) { s.tmp_0.stage2Call = true; s.callLocIdx = 1020; s.pc = 1; return s.tmp_0;; }
+     else { s.callLocIdx = 1020; s.pc = 1; return s.tmp_0; }
     }
   case 1:
     r0 = s.retval;
     return leave(s, r0)
   default: oops()
 } } }
-scene_Renderable___visible__P187597.info = {"start":305,"length":75,"line":10,"column":8,"endLine":12,"endColumn":9,"fileName":"pxt_modules/game/renderable.ts","functionName":"__visible","argumentNames":["this"]}
+scene_Renderable___visible__P2380.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__P187597_mk(s) {
+function scene_Renderable___visible__P2380_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: scene_Renderable___visible__P187597, depth: s.depth + 1,
+        parent: s, fn: scene_Renderable___visible__P2380, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   arg0: undefined,
@@ -71368,7 +71387,7 @@ function scene_Renderable___visible__P187597_mk(s) {
 
 
 
-function Sprite___drawCore__P187294(s) {
+function Sprite___drawCore__P2077(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71378,21 +71397,21 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    s.ox___211542 = undefined;
-    s.oy___211550 = undefined;
-    s.l___211558 = undefined;
-    s.t___211562 = undefined;
-    s.font___211577 = undefined;
-    s.tx___211581 = undefined;
-    s.ty___211583 = undefined;
+    s.ox___26486 = undefined;
+    s.oy___26494 = undefined;
+    s.l___26502 = undefined;
+    s.t___26506 = undefined;
+    s.font___26521 = undefined;
+    s.tx___26525 = undefined;
+    s.ty___26527 = undefined;
     if (s.lambdaArgs) {
       s.arg0 = (s.lambdaArgs[0]);
       s.arg1 = (s.lambdaArgs[1]);
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
-    s.tmp_1 = Sprite_isOutOfScreen__P187293_mk(s);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
+    s.tmp_1 = Sprite_isOutOfScreen__P2076_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.tmp_1.arg1 = s.arg1;
     s.callLocIdx = 352; s.pc = 20; return s.tmp_1;
@@ -71417,7 +71436,7 @@ switch (step) {
   case 4:
     // jmp value (already in r0)
     s.tmp_4 = r0;
-    s.ox___211542 = (s.tmp_4);
+    s.ox___26486 = (s.tmp_4);
     r0 = s.arg0.fields["flags"];
     s.tmp_1 = r0;
     r0 = (s.tmp_1 & 512);
@@ -71431,35 +71450,35 @@ switch (step) {
   case 6:
     // jmp value (already in r0)
     s.tmp_2 = r0;
-    s.oy___211550 = (s.tmp_2);
-    s.tmp_1 = Sprite_left__P187279_mk(s);
+    s.oy___26494 = (s.tmp_2);
+    s.tmp_1 = Sprite_left__P2062_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 353; s.pc = 21; return s.tmp_1;
   case 21:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.ox___211542);
-    s.l___211558 = (r0);
-    s.tmp_1 = Sprite_top__P187283_mk(s);
+    r0 = (s.tmp_0 - s.ox___26486);
+    s.l___26502 = (r0);
+    s.tmp_1 = Sprite_top__P2066_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 354; s.pc = 22; return s.tmp_1;
   case 22:
     r0 = s.retval;
     s.tmp_0 = r0;
-    r0 = (s.tmp_0 - s.oy___211550);
-    s.t___211562 = (r0);
+    r0 = (s.tmp_0 - s.oy___26494);
+    s.t___26506 = (r0);
     r0 = s.arg0.fields["_image"];
     s.tmp_0 = r0;
-    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___187019, s.tmp_0, s.l___211558, s.t___211562);
+    r0 = pxsim_ImageMethods.drawTransparentImage(globals.screen___1802, s.tmp_0, s.l___26502, s.t___26506);
     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___211577 = (globals.font5___186967);
-    s.tx___211581 = (s.l___211558);
-    s.tmp_1 = r0 = s.t___211562;
+    s.font___26521 = (globals.font5___1750);
+    s.tx___26525 = (s.l___26502);
+    s.tmp_1 = r0 = s.t___26506;
     r0 = s.arg0.fields["_image"];
     s.tmp_3 = r0;
     r0 = pxsim_ImageMethods.height(s.tmp_3);
@@ -71467,12 +71486,12 @@ switch (step) {
     r0 = (s.tmp_1 + s.tmp_2);
     s.tmp_0 = r0;
     r0 = (s.tmp_0 + 2);
-    s.ty___211583 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
+    s.ty___26527 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
     r0 = pxsim_String_.mkEmpty();
     s.tmp_3 = r0;
-    s.tmp_7 = Sprite_x__P187242_mk(s);
+    s.tmp_7 = Sprite_x__P2025_mk(s);
     s.tmp_7.arg0 = s.arg0;
     s.callLocIdx = 356; s.pc = 24; return s.tmp_7;
   case 24:
@@ -71493,7 +71512,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_11 = Sprite_y__P187244_mk(s);
+    s.tmp_11 = Sprite_y__P2027_mk(s);
     s.tmp_11.arg0 = s.arg0;
     s.callLocIdx = 357; s.pc = 26; return s.tmp_11;
   case 26:
@@ -71512,17 +71531,17 @@ 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___211581;
-    s.tmp_0.arg3 = s.ty___211583;
+    s.tmp_0.arg2 = s.tx___26525;
+    s.tmp_0.arg3 = s.ty___26527;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___211577;
+    s.tmp_0.arg5 = s.font___26521;
     s.tmp_0.arg6 = undefined;
     s.callLocIdx = 358; s.pc = 23; return s.tmp_0;
   case 23:
     r0 = s.retval;
-    s.tmp_0 = r0 = s.tx___211581;
+    s.tmp_0 = r0 = s.tx___26525;
     s.tmp_2 = if_charWidth_1_mk(s);
-    s.tmp_2.arg0 = s.font___211577;
+    s.tmp_2.arg0 = s.font___26521;
     if (!s.tmp_2.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_2.arg0, "charWidth");
     } else {
@@ -71535,8 +71554,8 @@ switch (step) {
     r0 = s.retval;
     s.tmp_1 = r0;
     r0 = (s.tmp_0 - s.tmp_1);
-    s.tx___211581 = (r0);
-    s.tmp_1 = Sprite_vx__P187246_mk(s);
+    s.tx___26525 = (r0);
+    s.tmp_1 = Sprite_vx__P2029_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 360; s.pc = 29; return s.tmp_1;
   case 29:
@@ -71547,7 +71566,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 8; continue; }
   case 7:
-    s.tmp_2 = Sprite_vy__P187248_mk(s);
+    s.tmp_2 = Sprite_vy__P2031_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 361; s.pc = 30; return s.tmp_2;
   case 30:
@@ -71557,9 +71576,9 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 9; continue; }
-    s.tmp_4 = r0 = s.ty___211583;
+    s.tmp_4 = r0 = s.ty___26527;
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = s.font___211577;
+    s.tmp_7.arg0 = s.font___26521;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "charHeight");
     } else {
@@ -71574,10 +71593,10 @@ switch (step) {
     r0 = (s.tmp_6 + 2);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
-    s.ty___211583 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_6 = Sprite_vx__P187246_mk(s);
+    s.ty___26527 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_6 = Sprite_vx__P2029_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.callLocIdx = 363; s.pc = 33; return s.tmp_6;
   case 33:
@@ -71598,7 +71617,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_10 = Sprite_vy__P187248_mk(s);
+    s.tmp_10 = Sprite_vy__P2031_mk(s);
     s.tmp_10.arg0 = s.arg0;
     s.callLocIdx = 364; s.pc = 35; return s.tmp_10;
   case 35:
@@ -71617,17 +71636,17 @@ 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___211581;
-    s.tmp_0.arg3 = s.ty___211583;
+    s.tmp_0.arg2 = s.tx___26525;
+    s.tmp_0.arg3 = s.ty___26527;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___211577;
+    s.tmp_0.arg5 = s.font___26521;
     s.tmp_0.arg6 = undefined;
     s.callLocIdx = 365; s.pc = 32; return s.tmp_0;
   case 32:
     r0 = s.retval;
   case 9:
   case 10:
-    s.tmp_1 = Sprite_ax__P187250_mk(s);
+    s.tmp_1 = Sprite_ax__P2033_mk(s);
     s.tmp_1.arg0 = s.arg0;
     s.callLocIdx = 366; s.pc = 37; return s.tmp_1;
   case 37:
@@ -71638,7 +71657,7 @@ switch (step) {
     r0 = s.tmp_0;
     { step = 12; continue; }
   case 11:
-    s.tmp_2 = Sprite_ay__P187252_mk(s);
+    s.tmp_2 = Sprite_ay__P2035_mk(s);
     s.tmp_2.arg0 = s.arg0;
     s.callLocIdx = 367; s.pc = 38; return s.tmp_2;
   case 38:
@@ -71648,9 +71667,9 @@ switch (step) {
     s.tmp_3 = r0;
     r0 = pxsim_numops_toBoolDecr(s.tmp_3);
     if (!r0) { step = 13; continue; }
-    s.tmp_4 = r0 = s.ty___211583;
+    s.tmp_4 = r0 = s.ty___26527;
     s.tmp_7 = if_charHeight_1_mk(s);
-    s.tmp_7.arg0 = s.font___211577;
+    s.tmp_7.arg0 = s.font___26521;
     if (!s.tmp_7.arg0.vtable.iface) {
       s.retval = pxsim_pxtrt.mapGetByString(s.tmp_7.arg0, "charHeight");
     } else {
@@ -71665,10 +71684,10 @@ switch (step) {
     r0 = (s.tmp_6 + 2);
     s.tmp_5 = r0;
     r0 = (s.tmp_4 + s.tmp_5);
-    s.ty___211583 = (r0);
-    s.tmp_0 = helpers_imagePrint__P186977_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_6 = Sprite_ax__P187250_mk(s);
+    s.ty___26527 = (r0);
+    s.tmp_0 = helpers_imagePrint__P1760_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_6 = Sprite_ax__P2033_mk(s);
     s.tmp_6.arg0 = s.arg0;
     s.callLocIdx = 369; s.pc = 41; return s.tmp_6;
   case 41:
@@ -71689,7 +71708,7 @@ switch (step) {
     s.tmp_2 = r0;
     r0 = pxsim_String__concat(s.tmp_2, ",");
     s.tmp_1 = r0;
-    s.tmp_10 = Sprite_ay__P187252_mk(s);
+    s.tmp_10 = Sprite_ay__P2035_mk(s);
     s.tmp_10.arg0 = s.arg0;
     s.callLocIdx = 370; s.pc = 43; return s.tmp_10;
   case 43:
@@ -71708,10 +71727,10 @@ 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___211581;
-    s.tmp_0.arg3 = s.ty___211583;
+    s.tmp_0.arg2 = s.tx___26525;
+    s.tmp_0.arg3 = s.ty___26527;
     s.tmp_0.arg4 = 1;
-    s.tmp_0.arg5 = s.font___211577;
+    s.tmp_0.arg5 = s.font___26521;
     s.tmp_0.arg6 = undefined;
     s.callLocIdx = 371; s.pc = 40; return s.tmp_0;
   case 40:
@@ -71720,11 +71739,11 @@ switch (step) {
   case 14:
   case 15:
   case 16:
-    r0 = pxsim_numops_toBoolDecr(globals.debug___187745);
+    r0 = pxsim_numops_toBoolDecr(globals.debug___2528);
     if (!r0) { step = 17; continue; }
-    s.tmp_0 = helpers_imageDrawRect__P186948_mk(s);
-    s.tmp_0.arg0 = globals.screen___187019;
-    s.tmp_3 = game_Hitbox_left__P187183_mk(s);
+    s.tmp_0 = helpers_imageDrawRect__P1731_mk(s);
+    s.tmp_0.arg0 = globals.screen___1802;
+    s.tmp_3 = game_Hitbox_left__P1966_mk(s);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_3.arg0 = r0;
     s.callLocIdx = 372; s.pc = 46; return s.tmp_3;
@@ -71735,9 +71754,9 @@ switch (step) {
     s.tmp_4 = r0;
     r0 = (s.tmp_4 >> 8);
     s.tmp_1 = r0;
-    r0 = (s.tmp_1 - s.ox___211542);
+    r0 = (s.tmp_1 - s.ox___26486);
     s.tmp_0.arg1 = r0;
-    s.tmp_7 = game_Hitbox_top__P187184_mk(s);
+    s.tmp_7 = game_Hitbox_top__P1967_mk(s);
     r0 = s.arg0.fields["_hitbox"];
     s.tmp_7.arg0 = r0;
     s.callLocIdx = 374; s.pc = 47; return s.tmp_7;
@@ -71748,7 +71767,7 @@ switch (step) {
     s.tmp_8 = r0;
     r0 = (s.tmp_8 >> 8);
     s.tmp_5 = r0;
-    r0 = (s.tmp_5 - s.oy___211550);
+    r0 = (s.tmp_5 - s.oy___26494);
     s.tmp_0.arg2 = r0;
     r0 = s.arg0.fields["_hitbox"];
     r0 = r0.fields["width"];
@@ -71775,12 +71794,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___drawCore__P187294.info = {"start":20864,"length":1383,"line":642,"column":4,"endLine":680,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
+Sprite___drawCore__P2077.info = {"start":20864,"length":1383,"line":642,"column":4,"endLine":680,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__drawCore","argumentNames":["this","camera"]}
 
-function Sprite___drawCore__P187294_mk(s) {
+function Sprite___drawCore__P2077_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___drawCore__P187294, depth: s.depth + 1,
+        parent: s, fn: Sprite___drawCore__P2077, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71795,13 +71814,13 @@ function Sprite___drawCore__P187294_mk(s) {
   tmp_10: undefined,
   tmp_11: undefined,
   tmp_12: undefined,
-  ox___211542: undefined,
-  oy___211550: undefined,
-  l___211558: undefined,
-  t___211562: undefined,
-  font___211577: undefined,
-  tx___211581: undefined,
-  ty___211583: undefined,
+  ox___26486: undefined,
+  oy___26494: undefined,
+  l___26502: undefined,
+  t___26506: undefined,
+  font___26521: undefined,
+  tx___26525: undefined,
+  ty___26527: undefined,
   arg0: undefined,
   arg1: undefined,
 } }
@@ -71810,7 +71829,7 @@ function Sprite___drawCore__P187294_mk(s) {
 
 
 
-function Sprite___visible__P187276(s) {
+function Sprite___visible__P2059(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -71825,7 +71844,7 @@ switch (step) {
       s.lambdaArgs = null;
     }
     r0 = s.arg0;
-    if (!checkSubtype(r0, Sprite__C187233_VT)) failedCast(r0);
+    if (!checkSubtype(r0, Sprite__C2016_VT)) failedCast(r0);
     r0 = s.arg0.fields["flags"];
     s.tmp_2 = r0;
     r0 = (s.tmp_2 & 128);
@@ -71836,12 +71855,12 @@ switch (step) {
     return leave(s, r0)
   default: oops()
 } } }
-Sprite___visible__P187276.info = {"start":8329,"length":72,"line":303,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__visible","argumentNames":["this"]}
+Sprite___visible__P2059.info = {"start":8329,"length":72,"line":303,"column":4,"endLine":305,"endColumn":5,"fileName":"pxt_modules/game/sprite.ts","functionName":"__visible","argumentNames":["this"]}
 
-function Sprite___visible__P187276_mk(s) {
+function Sprite___visible__P2059_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: Sprite___visible__P187276, depth: s.depth + 1,
+        parent: s, fn: Sprite___visible__P2059, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
   tmp_0: undefined,
   tmp_1: undefined,
@@ -71852,7 +71871,7 @@ function Sprite___visible__P187276_mk(s) {
 
 
 
-function lambda_4_mk(s) {
+function if_target_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71863,13 +71882,10 @@ function lambda_4_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
-  arg3: undefined,
 } }
 
 
-function lambda_2_mk(s) {
+function if_self_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71880,11 +71896,10 @@ function lambda_2_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
-  arg1: undefined,
 } }
 
 
-function if_comparator_3_mk(s) {
+function if_turnRate_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71895,12 +71910,10 @@ function if_comparator_3_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
-  arg1: undefined,
-  arg2: undefined,
 } }
 
 
-function if_target_1_mk(s) {
+function if_rate_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71914,7 +71927,7 @@ function if_target_1_mk(s) {
 } }
 
 
-function if_self_1_mk(s) {
+function if_handler_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71928,7 +71941,7 @@ function if_self_1_mk(s) {
 } }
 
 
-function if_turnRate_1_mk(s) {
+function lambda_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71942,7 +71955,7 @@ function if_turnRate_1_mk(s) {
 } }
 
 
-function if_rate_1_mk(s) {
+function if_condition_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71956,7 +71969,7 @@ function if_rate_1_mk(s) {
 } }
 
 
-function if_handler_1_mk(s) {
+function lambda_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71967,10 +71980,12 @@ function if_handler_1_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
 } }
 
 
-function lambda_1_mk(s) {
+function lambda_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71981,10 +71996,13 @@ function lambda_1_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
+  arg1: undefined,
+  arg2: undefined,
+  arg3: undefined,
 } }
 
 
-function if_condition_1_mk(s) {
+function lambda_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -71995,10 +72013,11 @@ function if_condition_1_mk(s) {
   tmp_3: undefined,
   tmp_4: undefined,
   arg0: undefined,
+  arg1: undefined,
 } }
 
 
-function lambda_3_mk(s) {
+function if_comparator_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72056,7 +72075,7 @@ function if_borderWidth_1_mk(s) {
 } }
 
 
-function PhysicsEngine__C187376_v2_4_mk(s) {
+function PhysicsEngine__C2159_v2_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72073,7 +72092,7 @@ function PhysicsEngine__C187376_v2_4_mk(s) {
 } }
 
 
-function PhysicsEngine__C187376_v0_2_mk(s) {
+function PhysicsEngine__C2159_v0_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72244,7 +72263,7 @@ function if_flags_1_mk(s) {
 } }
 
 
-function particles_ParticleFactory__C187931_v0_2_mk(s) {
+function particles_ParticleFactory__C2714_v0_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72259,7 +72278,7 @@ function particles_ParticleFactory__C187931_v0_2_mk(s) {
 } }
 
 
-function particles_ParticleSource__C187895_v4_3_mk(s) {
+function particles_ParticleSource__C2678_v4_3_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72303,7 +72322,7 @@ function if_y_1_mk(s) {
 } }
 
 
-function PhysicsEngine__C187376_v4_2_mk(s) {
+function PhysicsEngine__C2159_v4_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72334,7 +72353,7 @@ function if___update_3_mk(s) {
 } }
 
 
-function PhysicsEngine__C187376_v3_1_mk(s) {
+function PhysicsEngine__C2159_v3_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72391,7 +72410,7 @@ function if_id_1_mk(s) {
 } }
 
 
-function controller_Button__C187120_v0_1_mk(s) {
+function controller_Button__C1903_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72546,7 +72565,7 @@ function if_colorPrompt_1_mk(s) {
 } }
 
 
-function game_Dialog__C187711_v1_2_mk(s) {
+function game_Dialog__C2494_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72561,7 +72580,7 @@ function game_Dialog__C187711_v1_2_mk(s) {
 } }
 
 
-function game_BaseDialog__C187694_v0_1_mk(s) {
+function game_BaseDialog__C2477_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72575,7 +72594,7 @@ function game_BaseDialog__C187694_v0_1_mk(s) {
 } }
 
 
-function game_BaseDialog__C187694_v2_1_mk(s) {
+function game_BaseDialog__C2477_v2_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72621,7 +72640,7 @@ function if_sourceFactory_3_mk(s) {
 } }
 
 
-function PhysicsEngine__C187376_v1_2_mk(s) {
+function PhysicsEngine__C2159_v1_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72664,7 +72683,7 @@ function if_startScreenEffect_1_mk(s) {
 } }
 
 
-function game_GameOverDialog__C187733_v0_1_mk(s) {
+function game_GameOverDialog__C2516_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -72678,7 +72697,7 @@ function game_GameOverDialog__C187733_v0_1_mk(s) {
 } }
 
 
-function game_GameOverDialog__C187733_v2_1_mk(s) {
+function game_GameOverDialog__C2516_v2_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -73062,7 +73081,7 @@ function if_top_1_mk(s) {
 } }
 
 
-function particles_ParticleFactory__C187931_v1_4_mk(s) {
+function particles_ParticleFactory__C2714_v1_4_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -73109,7 +73128,7 @@ function if_updateSay_3_mk(s) {
 } }
 
 
-function sprites_BaseSprite__C187075_v0_1_mk(s) {
+function sprites_BaseSprite__C1858_v0_1_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -73123,7 +73142,7 @@ function sprites_BaseSprite__C187075_v0_1_mk(s) {
 } }
 
 
-function sprites_BaseSprite__C187075_v2_2_mk(s) {
+function sprites_BaseSprite__C1858_v2_2_mk(s) {
     checkStack(s.depth);
     return {
         parent: s, fn: null, depth: s.depth + 1,
@@ -73237,14 +73256,14 @@ function if_width_1_mk(s) {
   arg0: undefined,
 } }
 
-const controller_Button__C187120_VT = mkVTable({
+const controller_Button__C1903_VT = mkVTable({
   name: "Button",
   numFields: 7,
   classNo: 16,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "isPressed": controller_Button_isPressed__P187129,
+    "isPressed": controller_Button_isPressed__P1912,
   },
   iface: {
     "_owner": null,
@@ -73261,26 +73280,26 @@ const controller_Button__C187120_VT = mkVTable({
     "set/_pressedElasped": null,
     "_repeatCount": null,
     "set/_repeatCount": null,
-    "toString": controller_Button_toString__P187125,
-    "raiseButtonUp": controller_Button_raiseButtonUp__P189400,
-    "raiseButtonDown": controller_Button_raiseButtonDown__P189401,
-    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P189402,
-    "onEvent": controller_Button_onEvent__P187127,
-    "isPressed": controller_Button_isPressed__P187129,
-    "pressureLevel": controller_Button_pressureLevel__P187130,
-    "setPressed": controller_Button_setPressed__P187131,
-    "__update": controller_Button___update__P187132,
+    "toString": controller_Button_toString__P1908,
+    "raiseButtonUp": controller_Button_raiseButtonUp__P4184,
+    "raiseButtonDown": controller_Button_raiseButtonDown__P4185,
+    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P4186,
+    "onEvent": controller_Button_onEvent__P1910,
+    "isPressed": controller_Button_isPressed__P1912,
+    "pressureLevel": controller_Button_pressureLevel__P1913,
+    "setPressed": controller_Button_setPressed__P1914,
+    "__update": controller_Button___update__P1915,
   },
-  toStringMethod: controller_Button_toString__P187125,
+  toStringMethod: controller_Button_toString__P1908,
 });
-const controller_AnyButton__C189403_VT = mkVTable({
+const controller_AnyButton__C4187_VT = mkVTable({
   name: "AnyButton",
   numFields: 7,
   classNo: 17,
   lastSubtypeNo: 17,
   maxBgInstances: null,
   methods: {
-    "isPressed": controller_AnyButton_isPressed__P189405,
+    "isPressed": controller_AnyButton_isPressed__P4189,
   },
   iface: {
     "_owner": null,
@@ -73297,18 +73316,18 @@ const controller_AnyButton__C189403_VT = mkVTable({
     "set/_pressedElasped": null,
     "_repeatCount": null,
     "set/_repeatCount": null,
-    "isPressed": controller_AnyButton_isPressed__P189405,
-    "toString": controller_Button_toString__P187125,
-    "raiseButtonUp": controller_Button_raiseButtonUp__P189400,
-    "raiseButtonDown": controller_Button_raiseButtonDown__P189401,
-    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P189402,
-    "onEvent": controller_Button_onEvent__P187127,
-    "pressureLevel": controller_Button_pressureLevel__P187130,
-    "setPressed": controller_Button_setPressed__P187131,
-    "__update": controller_Button___update__P187132,
+    "isPressed": controller_AnyButton_isPressed__P4189,
+    "toString": controller_Button_toString__P1908,
+    "raiseButtonUp": controller_Button_raiseButtonUp__P4184,
+    "raiseButtonDown": controller_Button_raiseButtonDown__P4185,
+    "raiseButtonRepeat": controller_Button_raiseButtonRepeat__P4186,
+    "onEvent": controller_Button_onEvent__P1910,
+    "pressureLevel": controller_Button_pressureLevel__P1913,
+    "setPressed": controller_Button_setPressed__P1914,
+    "__update": controller_Button___update__P1915,
   },
 });
-const Math_FastRandom__C187803_VT = mkVTable({
+const Math_FastRandom__C2586_VT = mkVTable({
   name: "FastRandom",
   numFields: 2,
   classNo: 18,
@@ -73321,12 +73340,12 @@ const Math_FastRandom__C187803_VT = mkVTable({
     "set/lfsr": null,
     "seed": null,
     "set/seed": null,
-    "next": Math_FastRandom_next__P187806,
-    "randomRange": Math_FastRandom_randomRange__P187807,
-    "pickRandom": Math_FastRandom_pickRandom__P187808,
+    "next": Math_FastRandom_next__P2589,
+    "randomRange": Math_FastRandom_randomRange__P2590,
+    "pickRandom": Math_FastRandom_pickRandom__P2591,
   },
 });
-const texteffects_TextEffect__C188048_VT = mkVTable({
+const texteffects_TextEffect__C2831_VT = mkVTable({
   name: "TextEffect",
   numFields: 1,
   classNo: 19,
@@ -73339,7 +73358,7 @@ const texteffects_TextEffect__C188048_VT = mkVTable({
     "set/getState": null,
   },
 });
-const color_FadeState__C191197_VT = mkVTable({
+const color_FadeState__C5981_VT = mkVTable({
   name: "FadeState",
   numFields: 2,
   classNo: 20,
@@ -73354,42 +73373,42 @@ const color_FadeState__C191197_VT = mkVTable({
     "set/scene": null,
   },
 });
-const sprites_BaseSprite__C187075_VT = mkVTable({
+const sprites_BaseSprite__C1858_VT = mkVTable({
   name: "BaseSprite",
   numFields: 2,
   classNo: 21,
   lastSubtypeNo: 25,
   maxBgInstances: null,
   methods: {
-    "__visible": sprites_BaseSprite___visible__P187078,
-    "__draw": sprites_BaseSprite___draw__P187081,
-    "__drawCore": sprites_BaseSprite___drawCore__P187082,
-    "__update": sprites_BaseSprite___update__P187083,
+    "__visible": sprites_BaseSprite___visible__P1861,
+    "__draw": sprites_BaseSprite___draw__P1864,
+    "__drawCore": sprites_BaseSprite___drawCore__P1865,
+    "__update": sprites_BaseSprite___update__P1866,
   },
   iface: {
     "_z": null,
     "set/_z": null,
     "id": null,
     "set/id": null,
-    "__visible": sprites_BaseSprite___visible__P187078,
-    "z": sprites_BaseSprite_z__P187079,
-    "set/z": sprites_BaseSprite_z__P187080,
-    "__draw": sprites_BaseSprite___draw__P187081,
-    "__drawCore": sprites_BaseSprite___drawCore__P187082,
-    "__update": sprites_BaseSprite___update__P187083,
+    "__visible": sprites_BaseSprite___visible__P1861,
+    "z": sprites_BaseSprite_z__P1862,
+    "set/z": sprites_BaseSprite_z__P1863,
+    "__draw": sprites_BaseSprite___draw__P1864,
+    "__drawCore": sprites_BaseSprite___drawCore__P1865,
+    "__update": sprites_BaseSprite___update__P1866,
   },
 });
-const Sprite__C187233_VT = mkVTable({
+const Sprite__C2016_VT = mkVTable({
   name: "Sprite",
   numFields: 26,
   classNo: 22,
   lastSubtypeNo: 22,
   maxBgInstances: null,
   methods: {
-    "__visible": Sprite___visible__P187276,
-    "__draw": sprites_BaseSprite___draw__P187081,
-    "__drawCore": Sprite___drawCore__P187294,
-    "__update": Sprite___update__P187295,
+    "__visible": Sprite___visible__P2059,
+    "__draw": sprites_BaseSprite___draw__P1864,
+    "__drawCore": Sprite___drawCore__P2077,
+    "__update": Sprite___update__P2078,
   },
   iface: {
     "_z": null,
@@ -73444,69 +73463,183 @@ const Sprite__C187233_VT = mkVTable({
     "set/flags": null,
     "destroyHandler": null,
     "set/destroyHandler": null,
-    "x": Sprite_x__P187242,
-    "set/x": Sprite_x__P187243,
-    "y": Sprite_y__P187244,
-    "set/y": Sprite_y__P187245,
-    "vx": Sprite_vx__P187246,
-    "set/vx": Sprite_vx__P187247,
-    "vy": Sprite_vy__P187248,
-    "set/vy": Sprite_vy__P187249,
-    "ax": Sprite_ax__P187250,
-    "set/ax": Sprite_ax__P187251,
-    "ay": Sprite_ay__P187252,
-    "set/ay": Sprite_ay__P187253,
-    "fx": Sprite_fx__P187254,
-    "set/fx": Sprite_fx__P187255,
-    "fy": Sprite_fy__P187256,
-    "set/fy": Sprite_fy__P187257,
-    "data": Sprite_data__P187258,
-    "set/data": Sprite_data__P187259,
-    "image": Sprite_image__P187272,
-    "setImage": Sprite_setImage__P187273,
-    "setHitbox": Sprite_setHitbox__P187274,
-    "isStatic": Sprite_isStatic__P187275,
-    "__visible": Sprite___visible__P187276,
-    "width": Sprite_width__P187277,
-    "height": Sprite_height__P187278,
-    "left": Sprite_left__P187279,
-    "set/left": Sprite_left__P187280,
-    "right": Sprite_right__P187281,
-    "set/right": Sprite_right__P187282,
-    "top": Sprite_top__P187283,
-    "set/top": Sprite_top__P187284,
-    "bottom": Sprite_bottom__P187285,
-    "set/bottom": Sprite_bottom__P187286,
-    "kind": Sprite_kind__P187287,
-    "setKind": Sprite_setKind__P187288,
-    "setPosition": Sprite_setPosition__P187289,
-    "setVelocity": Sprite_setVelocity__P187290,
-    "isOutOfScreen": Sprite_isOutOfScreen__P187293,
-    "__drawCore": Sprite___drawCore__P187294,
-    "__update": Sprite___update__P187295,
-    "setFlag": Sprite_setFlag__P187296,
-    "overlapsWith": Sprite_overlapsWith__P187297,
-    "isHittingTile": Sprite_isHittingTile__P187298,
-    "clearObstacles": Sprite_clearObstacles__P187301,
-    "registerObstacle": Sprite_registerObstacle__P187302,
-    "destroy": Sprite_destroy__P187304,
-    "_destroyCore": Sprite__destroyCore__P187305,
-    "follow": Sprite_follow__P187306,
-    "toString": Sprite_toString__P187307,
-    "z": sprites_BaseSprite_z__P187079,
-    "set/z": sprites_BaseSprite_z__P187080,
-    "__draw": sprites_BaseSprite___draw__P187081,
+    "x": Sprite_x__P2025,
+    "set/x": Sprite_x__P2026,
+    "y": Sprite_y__P2027,
+    "set/y": Sprite_y__P2028,
+    "vx": Sprite_vx__P2029,
+    "set/vx": Sprite_vx__P2030,
+    "vy": Sprite_vy__P2031,
+    "set/vy": Sprite_vy__P2032,
+    "ax": Sprite_ax__P2033,
+    "set/ax": Sprite_ax__P2034,
+    "ay": Sprite_ay__P2035,
+    "set/ay": Sprite_ay__P2036,
+    "fx": Sprite_fx__P2037,
+    "set/fx": Sprite_fx__P2038,
+    "fy": Sprite_fy__P2039,
+    "set/fy": Sprite_fy__P2040,
+    "data": Sprite_data__P2041,
+    "set/data": Sprite_data__P2042,
+    "image": Sprite_image__P2055,
+    "setImage": Sprite_setImage__P2056,
+    "setHitbox": Sprite_setHitbox__P2057,
+    "isStatic": Sprite_isStatic__P2058,
+    "__visible": Sprite___visible__P2059,
+    "width": Sprite_width__P2060,
+    "height": Sprite_height__P2061,
+    "left": Sprite_left__P2062,
+    "set/left": Sprite_left__P2063,
+    "right": Sprite_right__P2064,
+    "set/right": Sprite_right__P2065,
+    "top": Sprite_top__P2066,
+    "set/top": Sprite_top__P2067,
+    "bottom": Sprite_bottom__P2068,
+    "set/bottom": Sprite_bottom__P2069,
+    "kind": Sprite_kind__P2070,
+    "setKind": Sprite_setKind__P2071,
+    "setPosition": Sprite_setPosition__P2072,
+    "setVelocity": Sprite_setVelocity__P2073,
+    "isOutOfScreen": Sprite_isOutOfScreen__P2076,
+    "__drawCore": Sprite___drawCore__P2077,
+    "__update": Sprite___update__P2078,
+    "setFlag": Sprite_setFlag__P2079,
+    "overlapsWith": Sprite_overlapsWith__P2080,
+    "isHittingTile": Sprite_isHittingTile__P2081,
+    "clearObstacles": Sprite_clearObstacles__P2084,
+    "registerObstacle": Sprite_registerObstacle__P2085,
+    "destroy": Sprite_destroy__P2087,
+    "_destroyCore": Sprite__destroyCore__P2088,
+    "follow": Sprite_follow__P2089,
+    "toString": Sprite_toString__P2090,
+    "z": sprites_BaseSprite_z__P1862,
+    "set/z": sprites_BaseSprite_z__P1863,
+    "__draw": sprites_BaseSprite___draw__P1864,
   },
-  toStringMethod: Sprite_toString__P187307,
+  toStringMethod: Sprite_toString__P2090,
 });
-const tiles_TileMap__C187534_VT = mkVTable({
-  name: "TileMap",
-  numFields: 3,
+const control_EventContext__C384_VT = mkVTable({
+  name: "EventContext",
+  numFields: 9,
   classNo: 26,
   lastSubtypeNo: 26,
   maxBgInstances: null,
   methods: {
   },
+  iface: {
+    "handlers": null,
+    "set/handlers": null,
+    "frameCallbacks": null,
+    "set/frameCallbacks": null,
+    "frameWorker": null,
+    "set/frameWorker": null,
+    "framesInSample": null,
+    "set/framesInSample": null,
+    "timeInSample": null,
+    "set/timeInSample": null,
+    "deltaTimeMillis": null,
+    "set/deltaTimeMillis": null,
+    "prevTimeMillis": null,
+    "set/prevTimeMillis": null,
+    "idleCallbacks": null,
+    "set/idleCallbacks": null,
+    "runningCallbacks": null,
+    "set/runningCallbacks": null,
+    "deltaTime": control_EventContext_deltaTime__P389,
+    "runCallbacks": control_EventContext_runCallbacks__P4029,
+    "registerFrameCallbacks": control_EventContext_registerFrameCallbacks__P4030,
+    "register": control_EventContext_register__P390,
+    "unregister": control_EventContext_unregister__P391,
+    "registerFrameHandler": control_EventContext_registerFrameHandler__P392,
+    "registerHandler": control_EventContext_registerHandler__P394,
+  },
+});
+const sprites_FollowingSprite__C1972_VT = mkVTable({
+  name: "FollowingSprite",
+  numFields: 4,
+  classNo: 27,
+  lastSubtypeNo: 27,
+  maxBgInstances: null,
+  methods: {
+  },
+  iface: {
+    "self": null,
+    "set/self": null,
+    "target": null,
+    "set/target": null,
+    "rate": null,
+    "set/rate": null,
+    "turnRate": null,
+    "set/turnRate": null,
+  },
+});
+const control_FrameCallback__C381_VT = mkVTable({
+  name: "FrameCallback",
+  numFields: 2,
+  classNo: 28,
+  lastSubtypeNo: 28,
+  maxBgInstances: null,
+  methods: {
+  },
+  iface: {
+    "order": null,
+    "set/order": null,
+    "handler": null,
+    "set/handler": null,
+  },
+});
+const control_PollEvent__C4003_VT = mkVTable({
+  name: "PollEvent",
+  numFields: 6,
+  classNo: 29,
+  lastSubtypeNo: 29,
+  maxBgInstances: null,
+  methods: {
+  },
+  iface: {
+    "eid": null,
+    "set/eid": null,
+    "vid": null,
+    "set/vid": null,
+    "start": null,
+    "set/start": null,
+    "timeOut": null,
+    "set/timeOut": null,
+    "condition": null,
+    "set/condition": null,
+    "once": null,
+    "set/once": null,
+  },
+});
+const control_EventHandler__C4024_VT = mkVTable({
+  name: "EventHandler",
+  numFields: 4,
+  classNo: 30,
+  lastSubtypeNo: 30,
+  maxBgInstances: null,
+  methods: {
+  },
+  iface: {
+    "src": null,
+    "set/src": null,
+    "value": null,
+    "set/value": null,
+    "handler": null,
+    "set/handler": null,
+    "flags": null,
+    "set/flags": null,
+    "register": control_EventHandler_register__P4025,
+    "unregister": control_EventHandler_unregister__P4026,
+  },
+});
+const tiles_TileMap__C2317_VT = mkVTable({
+  name: "TileMap",
+  numFields: 3,
+  classNo: 31,
+  lastSubtypeNo: 31,
+  maxBgInstances: null,
+  methods: {
+  },
   iface: {
     "_scale": null,
     "set/_scale": null,
@@ -73514,36 +73647,36 @@ const tiles_TileMap__C187534_VT = mkVTable({
     "set/_layer": null,
     "_map": null,
     "set/_map": null,
-    "scale": tiles_TileMap_scale__P187536,
-    "set/scale": tiles_TileMap_scale__P187537,
-    "data": tiles_TileMap_data__P189508,
-    "offsetX": tiles_TileMap_offsetX__P187538,
-    "offsetY": tiles_TileMap_offsetY__P187539,
-    "areaWidth": tiles_TileMap_areaWidth__P187540,
-    "areaHeight": tiles_TileMap_areaHeight__P187541,
-    "layer": tiles_TileMap_layer__P187542,
-    "enabled": tiles_TileMap_enabled__P187544,
-    "setData": tiles_TileMap_setData__P187545,
-    "getTile": tiles_TileMap_getTile__P187546,
-    "getTileIndex": tiles_TileMap_getTileIndex__P187547,
-    "setTileAt": tiles_TileMap_setTileAt__P187548,
-    "getImageType": tiles_TileMap_getImageType__P187549,
-    "setWallAt": tiles_TileMap_setWallAt__P187550,
-    "getTilesByType": tiles_TileMap_getTilesByType__P187551,
-    "sampleTilesByType": tiles_TileMap_sampleTilesByType__P187552,
-    "isInvalidIndex": tiles_TileMap_isInvalidIndex__P189509,
-    "draw": tiles_TileMap_draw__P189510,
-    "isObstacle": tiles_TileMap_isObstacle__P187553,
-    "getObstacle": tiles_TileMap_getObstacle__P187554,
-    "isOnWall": tiles_TileMap_isOnWall__P187555,
-    "getTileImage": tiles_TileMap_getTileImage__P187556,
+    "scale": tiles_TileMap_scale__P2319,
+    "set/scale": tiles_TileMap_scale__P2320,
+    "data": tiles_TileMap_data__P4292,
+    "offsetX": tiles_TileMap_offsetX__P2321,
+    "offsetY": tiles_TileMap_offsetY__P2322,
+    "areaWidth": tiles_TileMap_areaWidth__P2323,
+    "areaHeight": tiles_TileMap_areaHeight__P2324,
+    "layer": tiles_TileMap_layer__P2325,
+    "enabled": tiles_TileMap_enabled__P2327,
+    "setData": tiles_TileMap_setData__P2328,
+    "getTile": tiles_TileMap_getTile__P2329,
+    "getTileIndex": tiles_TileMap_getTileIndex__P2330,
+    "setTileAt": tiles_TileMap_setTileAt__P2331,
+    "getImageType": tiles_TileMap_getImageType__P2332,
+    "setWallAt": tiles_TileMap_setWallAt__P2333,
+    "getTilesByType": tiles_TileMap_getTilesByType__P2334,
+    "sampleTilesByType": tiles_TileMap_sampleTilesByType__P2335,
+    "isInvalidIndex": tiles_TileMap_isInvalidIndex__P4293,
+    "draw": tiles_TileMap_draw__P4294,
+    "isObstacle": tiles_TileMap_isObstacle__P2336,
+    "getObstacle": tiles_TileMap_getObstacle__P2337,
+    "isOnWall": tiles_TileMap_isOnWall__P2338,
+    "getTileImage": tiles_TileMap_getTileImage__P2339,
   },
 });
-const tiles_Location__C187506_VT = mkVTable({
+const tiles_Location__C2289_VT = mkVTable({
   name: "Location",
   numFields: 3,
-  classNo: 27,
-  lastSubtypeNo: 27,
+  classNo: 32,
+  lastSubtypeNo: 32,
   maxBgInstances: null,
   methods: {
   },
@@ -73554,19 +73687,19 @@ const tiles_Location__C187506_VT = mkVTable({
     "set/_col": null,
     "tileMap": null,
     "set/tileMap": null,
-    "col": tiles_Location_col__P187507,
-    "row": tiles_Location_row__P187508,
-    "x": tiles_Location_x__P187510,
-    "y": tiles_Location_y__P187511,
-    "tileSet": tiles_Location_tileSet__P187512,
-    "place": tiles_Location_place__P187513,
+    "col": tiles_Location_col__P2290,
+    "row": tiles_Location_row__P2291,
+    "x": tiles_Location_x__P2293,
+    "y": tiles_Location_y__P2294,
+    "tileSet": tiles_Location_tileSet__P2295,
+    "place": tiles_Location_place__P2296,
   },
 });
-const tiles_TileMapData__C187521_VT = mkVTable({
+const tiles_TileMapData__C2304_VT = mkVTable({
   name: "TileMapData",
   numFields: 7,
-  classNo: 28,
-  lastSubtypeNo: 28,
+  classNo: 33,
+  lastSubtypeNo: 33,
   maxBgInstances: null,
   methods: {
   },
@@ -73585,24 +73718,24 @@ const tiles_TileMapData__C187521_VT = mkVTable({
     "set/_width": null,
     "_height": null,
     "set/_height": null,
-    "width": tiles_TileMapData_width__P187523,
-    "height": tiles_TileMapData_height__P187524,
-    "scale": tiles_TileMapData_scale__P187525,
-    "set/scale": tiles_TileMapData_scale__P187526,
-    "getTile": tiles_TileMapData_getTile__P187527,
-    "setTile": tiles_TileMapData_setTile__P187528,
-    "getTileset": tiles_TileMapData_getTileset__P187529,
-    "getTileImage": tiles_TileMapData_getTileImage__P187530,
-    "setWall": tiles_TileMapData_setWall__P187531,
-    "isWall": tiles_TileMapData_isWall__P187532,
-    "isOutsideMap": tiles_TileMapData_isOutsideMap__P187533,
+    "width": tiles_TileMapData_width__P2306,
+    "height": tiles_TileMapData_height__P2307,
+    "scale": tiles_TileMapData_scale__P2308,
+    "set/scale": tiles_TileMapData_scale__P2309,
+    "getTile": tiles_TileMapData_getTile__P2310,
+    "setTile": tiles_TileMapData_setTile__P2311,
+    "getTileset": tiles_TileMapData_getTileset__P2312,
+    "getTileImage": tiles_TileMapData_getTileImage__P2313,
+    "setWall": tiles_TileMapData_setWall__P2314,
+    "isWall": tiles_TileMapData_isWall__P2315,
+    "isOutsideMap": tiles_TileMapData_isOutsideMap__P2316,
   },
 });
-const Heap__C188863_VT = mkVTable({
+const Heap__C3646_VT = mkVTable({
   name: "Heap",
   numFields: 2,
-  classNo: 29,
-  lastSubtypeNo: 29,
+  classNo: 34,
+  lastSubtypeNo: 34,
   maxBgInstances: null,
   methods: {
   },
@@ -73611,21 +73744,21 @@ const Heap__C188863_VT = mkVTable({
     "set/store": null,
     "comparator": null,
     "set/comparator": null,
-    "percolateDown": Heap_percolateDown__P191290,
-    "percolateUp": Heap_percolateUp__P191291,
-    "push": Heap_push__P188865,
-    "pop": Heap_pop__P188866,
-    "length": Heap_length__P188868,
-    "parent": Heap_parent__P191292,
-    "leftChild": Heap_leftChild__P191293,
-    "rightChild": Heap_rightChild__P191294,
+    "percolateDown": Heap_percolateDown__P6074,
+    "percolateUp": Heap_percolateUp__P6075,
+    "push": Heap_push__P3648,
+    "pop": Heap_pop__P3649,
+    "length": Heap_length__P3651,
+    "parent": Heap_parent__P6076,
+    "leftChild": Heap_leftChild__P6077,
+    "rightChild": Heap_rightChild__P6078,
   },
 });
-const scene_PrioritizedLocation__C191295_VT = mkVTable({
+const scene_PrioritizedLocation__C6079_VT = mkVTable({
   name: "PrioritizedLocation",
   numFields: 3,
-  classNo: 30,
-  lastSubtypeNo: 30,
+  classNo: 35,
+  lastSubtypeNo: 35,
   maxBgInstances: null,
   methods: {
   },
@@ -73638,11 +73771,11 @@ const scene_PrioritizedLocation__C191295_VT = mkVTable({
     "set/extraCost": null,
   },
 });
-const scene_LocationNode__C191297_VT = mkVTable({
+const scene_LocationNode__C6081_VT = mkVTable({
   name: "LocationNode",
   numFields: 4,
-  classNo: 31,
-  lastSubtypeNo: 31,
+  classNo: 36,
+  lastSubtypeNo: 36,
   maxBgInstances: null,
   methods: {
   },
@@ -73657,121 +73790,7 @@ const scene_LocationNode__C191297_VT = mkVTable({
     "set/lastCost": null,
   },
 });
-const control_EventContext__C185601_VT = mkVTable({
-  name: "EventContext",
-  numFields: 9,
-  classNo: 32,
-  lastSubtypeNo: 32,
-  maxBgInstances: null,
-  methods: {
-  },
-  iface: {
-    "handlers": null,
-    "set/handlers": null,
-    "frameCallbacks": null,
-    "set/frameCallbacks": null,
-    "frameWorker": null,
-    "set/frameWorker": null,
-    "framesInSample": null,
-    "set/framesInSample": null,
-    "timeInSample": null,
-    "set/timeInSample": null,
-    "deltaTimeMillis": null,
-    "set/deltaTimeMillis": null,
-    "prevTimeMillis": null,
-    "set/prevTimeMillis": null,
-    "idleCallbacks": null,
-    "set/idleCallbacks": null,
-    "runningCallbacks": null,
-    "set/runningCallbacks": null,
-    "deltaTime": control_EventContext_deltaTime__P185606,
-    "runCallbacks": control_EventContext_runCallbacks__P189245,
-    "registerFrameCallbacks": control_EventContext_registerFrameCallbacks__P189246,
-    "register": control_EventContext_register__P185607,
-    "unregister": control_EventContext_unregister__P185608,
-    "registerFrameHandler": control_EventContext_registerFrameHandler__P185609,
-    "registerHandler": control_EventContext_registerHandler__P185611,
-  },
-});
-const sprites_FollowingSprite__C187189_VT = mkVTable({
-  name: "FollowingSprite",
-  numFields: 4,
-  classNo: 33,
-  lastSubtypeNo: 33,
-  maxBgInstances: null,
-  methods: {
-  },
-  iface: {
-    "self": null,
-    "set/self": null,
-    "target": null,
-    "set/target": null,
-    "rate": null,
-    "set/rate": null,
-    "turnRate": null,
-    "set/turnRate": null,
-  },
-});
-const control_FrameCallback__C185598_VT = mkVTable({
-  name: "FrameCallback",
-  numFields: 2,
-  classNo: 34,
-  lastSubtypeNo: 34,
-  maxBgInstances: null,
-  methods: {
-  },
-  iface: {
-    "order": null,
-    "set/order": null,
-    "handler": null,
-    "set/handler": null,
-  },
-});
-const control_PollEvent__C189219_VT = mkVTable({
-  name: "PollEvent",
-  numFields: 6,
-  classNo: 35,
-  lastSubtypeNo: 35,
-  maxBgInstances: null,
-  methods: {
-  },
-  iface: {
-    "eid": null,
-    "set/eid": null,
-    "vid": null,
-    "set/vid": null,
-    "start": null,
-    "set/start": null,
-    "timeOut": null,
-    "set/timeOut": null,
-    "condition": null,
-    "set/condition": null,
-    "once": null,
-    "set/once": null,
-  },
-});
-const control_EventHandler__C189240_VT = mkVTable({
-  name: "EventHandler",
-  numFields: 4,
-  classNo: 36,
-  lastSubtypeNo: 36,
-  maxBgInstances: null,
-  methods: {
-  },
-  iface: {
-    "src": null,
-    "set/src": null,
-    "value": null,
-    "set/value": null,
-    "handler": null,
-    "set/handler": null,
-    "flags": null,
-    "set/flags": null,
-    "register": control_EventHandler_register__P189241,
-    "unregister": control_EventHandler_unregister__P189242,
-  },
-});
-const scene_GameForeverHandler__C187615_VT = mkVTable({
+const scene_GameForeverHandler__C2398_VT = mkVTable({
   name: "GameForeverHandler",
   numFields: 2,
   classNo: 37,
@@ -73786,28 +73805,28 @@ const scene_GameForeverHandler__C187615_VT = mkVTable({
     "set/handler": null,
   },
 });
-const PhysicsEngine__C187376_VT = mkVTable({
+const PhysicsEngine__C2159_VT = mkVTable({
   name: "PhysicsEngine",
   numFields: 0,
   classNo: 38,
   lastSubtypeNo: 39,
   maxBgInstances: null,
   methods: {
-    "addSprite": PhysicsEngine_addSprite__P187378,
-    "removeSprite": PhysicsEngine_removeSprite__P187379,
-    "moveSprite": PhysicsEngine_moveSprite__P187380,
-    "draw": PhysicsEngine_draw__P187381,
-    "move": PhysicsEngine_move__P187382,
+    "addSprite": PhysicsEngine_addSprite__P2161,
+    "removeSprite": PhysicsEngine_removeSprite__P2162,
+    "moveSprite": PhysicsEngine_moveSprite__P2163,
+    "draw": PhysicsEngine_draw__P2164,
+    "move": PhysicsEngine_move__P2165,
   },
   iface: {
-    "addSprite": PhysicsEngine_addSprite__P187378,
-    "removeSprite": PhysicsEngine_removeSprite__P187379,
-    "moveSprite": PhysicsEngine_moveSprite__P187380,
-    "draw": PhysicsEngine_draw__P187381,
-    "move": PhysicsEngine_move__P187382,
+    "addSprite": PhysicsEngine_addSprite__P2161,
+    "removeSprite": PhysicsEngine_removeSprite__P2162,
+    "moveSprite": PhysicsEngine_moveSprite__P2163,
+    "draw": PhysicsEngine_draw__P2164,
+    "move": PhysicsEngine_move__P2165,
   },
 });
-const scene_Scene__C187636_VT = mkVTable({
+const scene_Scene__C2419_VT = mkVTable({
   name: "Scene",
   numFields: 23,
   classNo: 40,
@@ -73862,15 +73881,15 @@ const scene_Scene__C187636_VT = mkVTable({
     "set/_data": null,
     "previousScene": null,
     "set/previousScene": null,
-    "init": scene_Scene_init__P187658,
-    "data": scene_Scene_data__P187659,
-    "millis": scene_Scene_millis__P187660,
-    "addSprite": scene_Scene_addSprite__P187661,
-    "destroy": scene_Scene_destroy__P187662,
-    "render": scene_Scene_render__P187663,
+    "init": scene_Scene_init__P2441,
+    "data": scene_Scene_data__P2442,
+    "millis": scene_Scene_millis__P2443,
+    "addSprite": scene_Scene_addSprite__P2444,
+    "destroy": scene_Scene_destroy__P2445,
+    "render": scene_Scene_render__P2446,
   },
 });
-const info_PlayerInfo__C187443_VT = mkVTable({
+const info_PlayerInfo__C2226_VT = mkVTable({
   name: "PlayerInfo",
   numFields: 12,
   classNo: 41,
@@ -73903,21 +73922,21 @@ const info_PlayerInfo__C187443_VT = mkVTable({
     "set/left": null,
     "up": null,
     "set/up": null,
-    "init": info_PlayerInfo_init__P189498,
-    "getState": info_PlayerInfo_getState__P187456,
-    "id": info_PlayerInfo_id__P187457,
-    "score": info_PlayerInfo_score__P187458,
-    "setScore": info_PlayerInfo_setScore__P187459,
-    "changeScoreBy": info_PlayerInfo_changeScoreBy__P187460,
-    "hasScore": info_PlayerInfo_hasScore__P187461,
-    "hasLife": info_PlayerInfo_hasLife__P187465,
-    "raiseLifeZero": info_PlayerInfo_raiseLifeZero__P187467,
-    "drawPlayer": info_PlayerInfo_drawPlayer__P187468,
-    "drawScore": info_PlayerInfo_drawScore__P187469,
-    "drawLives": info_PlayerInfo_drawLives__P187470,
+    "init": info_PlayerInfo_init__P4282,
+    "getState": info_PlayerInfo_getState__P2239,
+    "id": info_PlayerInfo_id__P2240,
+    "score": info_PlayerInfo_score__P2241,
+    "setScore": info_PlayerInfo_setScore__P2242,
+    "changeScoreBy": info_PlayerInfo_changeScoreBy__P2243,
+    "hasScore": info_PlayerInfo_hasScore__P2244,
+    "hasLife": info_PlayerInfo_hasLife__P2248,
+    "raiseLifeZero": info_PlayerInfo_raiseLifeZero__P2250,
+    "drawPlayer": info_PlayerInfo_drawPlayer__P2251,
+    "drawScore": info_PlayerInfo_drawScore__P2252,
+    "drawLives": info_PlayerInfo_drawLives__P2253,
   },
 });
-const info_InfoState__C189443_VT = mkVTable({
+const info_InfoState__C4227_VT = mkVTable({
   name: "InfoState",
   numFields: 10,
   classNo: 42,
@@ -73948,17 +73967,17 @@ const info_InfoState__C189443_VT = mkVTable({
     "set/countdownEndHandler": null,
   },
 });
-const scene_Renderable__C187595_VT = mkVTable({
+const scene_Renderable__C2378_VT = mkVTable({
   name: "Renderable",
   numFields: 4,
   classNo: 23,
   lastSubtypeNo: 23,
   maxBgInstances: null,
   methods: {
-    "__visible": scene_Renderable___visible__P187597,
-    "__draw": sprites_BaseSprite___draw__P187081,
-    "__drawCore": scene_Renderable___drawCore__P187598,
-    "__update": sprites_BaseSprite___update__P187083,
+    "__visible": scene_Renderable___visible__P2380,
+    "__draw": sprites_BaseSprite___draw__P1864,
+    "__drawCore": scene_Renderable___drawCore__P2381,
+    "__update": sprites_BaseSprite___update__P1866,
   },
   iface: {
     "_z": null,
@@ -73969,15 +73988,15 @@ const scene_Renderable__C187595_VT = mkVTable({
     "set/handler": null,
     "shouldBeVisible": null,
     "set/shouldBeVisible": null,
-    "__visible": scene_Renderable___visible__P187597,
-    "__drawCore": scene_Renderable___drawCore__P187598,
-    "z": sprites_BaseSprite_z__P187079,
-    "set/z": sprites_BaseSprite_z__P187080,
-    "__draw": sprites_BaseSprite___draw__P187081,
-    "__update": sprites_BaseSprite___update__P187083,
+    "__visible": scene_Renderable___visible__P2380,
+    "__drawCore": scene_Renderable___drawCore__P2381,
+    "z": sprites_BaseSprite_z__P1862,
+    "set/z": sprites_BaseSprite_z__P1863,
+    "__draw": sprites_BaseSprite___draw__P1864,
+    "__update": sprites_BaseSprite___update__P1866,
   },
 });
-const info_PlayerState__C187414_VT = mkVTable({
+const info_PlayerState__C2197_VT = mkVTable({
   name: "PlayerState",
   numFields: 3,
   classNo: 43,
@@ -73994,7 +74013,7 @@ const info_PlayerState__C187414_VT = mkVTable({
     "set/lifeZeroHandler": null,
   },
 });
-const controller_Controller__C187140_VT = mkVTable({
+const controller_Controller__C1923_VT = mkVTable({
   name: "Controller",
   numFields: 5,
   classNo: 44,
@@ -74013,22 +74032,22 @@ const controller_Controller__C187140_VT = mkVTable({
     "set/_id": null,
     "_connected": null,
     "set/_connected": null,
-    "_controlledSprites": controller_Controller__controlledSprites__P187145,
-    "set/_controlledSprites": controller_Controller__controlledSprites__P187146,
-    "id": controller_Controller_id__P187147,
-    "left": controller_Controller_left__P187149,
-    "right": controller_Controller_right__P187150,
-    "up": controller_Controller_up__P187151,
-    "down": controller_Controller_down__P187152,
-    "moveSprite": controller_Controller_moveSprite__P187156,
-    "button": controller_Controller_button__P189408,
-    "connected": controller_Controller_connected__P187159,
-    "set/connected": controller_Controller_connected__P187160,
-    "__preUpdate": controller_Controller___preUpdate__P187164,
-    "__update": controller_Controller___update__P187165,
+    "_controlledSprites": controller_Controller__controlledSprites__P1928,
+    "set/_controlledSprites": controller_Controller__controlledSprites__P1929,
+    "id": controller_Controller_id__P1930,
+    "left": controller_Controller_left__P1932,
+    "right": controller_Controller_right__P1933,
+    "up": controller_Controller_up__P1934,
+    "down": controller_Controller_down__P1935,
+    "moveSprite": controller_Controller_moveSprite__P1939,
+    "button": controller_Controller_button__P4192,
+    "connected": controller_Controller_connected__P1942,
+    "set/connected": controller_Controller_connected__P1943,
+    "__preUpdate": controller_Controller___preUpdate__P1947,
+    "__update": controller_Controller___update__P1948,
   },
 });
-const controller_ControlledSprite__C187136_VT = mkVTable({
+const controller_ControlledSprite__C1919_VT = mkVTable({
   name: "ControlledSprite",
   numFields: 4,
   classNo: 45,
@@ -74047,7 +74066,7 @@ const controller_ControlledSprite__C187136_VT = mkVTable({
     "set/vy": null,
   },
 });
-const character_CharacterState__C191357_VT = mkVTable({
+const character_CharacterState__C6141_VT = mkVTable({
   name: "CharacterState",
   numFields: 12,
   classNo: 46,
@@ -74080,15 +74099,15 @@ const character_CharacterState__C191357_VT = mkVTable({
     "set/manualFlags": null,
     "sprite": null,
     "set/sprite": null,
-    "setFrames": character_CharacterState_setFrames__P191358,
-    "setLoopFrames": character_CharacterState_setLoopFrames__P191359,
-    "update": character_CharacterState_update__P191361,
-    "setEnabled": character_CharacterState_setEnabled__P191363,
-    "setManualFlags": character_CharacterState_setManualFlags__P191364,
-    "pickRule": character_CharacterState_pickRule__P191366,
+    "setFrames": character_CharacterState_setFrames__P6142,
+    "setLoopFrames": character_CharacterState_setLoopFrames__P6143,
+    "update": character_CharacterState_update__P6145,
+    "setEnabled": character_CharacterState_setEnabled__P6147,
+    "setManualFlags": character_CharacterState_setManualFlags__P6148,
+    "pickRule": character_CharacterState_pickRule__P6150,
   },
 });
-const character_CharacterAnimationSceneState__C191352_VT = mkVTable({
+const character_CharacterAnimationSceneState__C6136_VT = mkVTable({
   name: "CharacterAnimationSceneState",
   numFields: 1,
   classNo: 47,
@@ -74099,10 +74118,10 @@ const character_CharacterAnimationSceneState__C191352_VT = mkVTable({
   iface: {
     "characters": null,
     "set/characters": null,
-    "update": character_CharacterAnimationSceneState_update__P191353,
+    "update": character_CharacterAnimationSceneState_update__P6137,
   },
 });
-const effects_ImageEffect__C188033_VT = mkVTable({
+const effects_ImageEffect__C2816_VT = mkVTable({
   name: "ImageEffect",
   numFields: 4,
   classNo: 48,
@@ -74119,12 +74138,12 @@ const effects_ImageEffect__C188033_VT = mkVTable({
     "set/fastRandom": null,
     "times": null,
     "set/times": null,
-    "applyTo": effects_ImageEffect_applyTo__P188035,
-    "change": effects_ImageEffect_change__P188036,
-    "startScreenEffect": effects_ImageEffect_startScreenEffect__P188037,
+    "applyTo": effects_ImageEffect_applyTo__P2818,
+    "change": effects_ImageEffect_change__P2819,
+    "startScreenEffect": effects_ImageEffect_startScreenEffect__P2820,
   },
 });
-const effects_ParticleEffect__C188006_VT = mkVTable({
+const effects_ParticleEffect__C2789_VT = mkVTable({
   name: "ParticleEffect",
   numFields: 3,
   classNo: 49,
@@ -74139,11 +74158,11 @@ const effects_ParticleEffect__C188006_VT = mkVTable({
     "set/defaultRate": null,
     "defaultLifespan": null,
     "set/defaultLifespan": null,
-    "start": effects_ParticleEffect_start__P188008,
-    "destroy": effects_ParticleEffect_destroy__P188009,
+    "start": effects_ParticleEffect_start__P2791,
+    "destroy": effects_ParticleEffect_destroy__P2792,
   },
 });
-const effects_ScreenEffect__C188010_VT = mkVTable({
+const effects_ScreenEffect__C2793_VT = mkVTable({
   name: "ScreenEffect",
   numFields: 5,
   classNo: 50,
@@ -74162,36 +74181,36 @@ const effects_ScreenEffect__C188010_VT = mkVTable({
     "set/source": null,
     "sceneDefaultRate": null,
     "set/sceneDefaultRate": null,
-    "startScreenEffect": effects_ScreenEffect_startScreenEffect__P188012,
-    "endScreenEffect": effects_ScreenEffect_endScreenEffect__P188013,
-    "start": effects_ParticleEffect_start__P188008,
-    "destroy": effects_ParticleEffect_destroy__P188009,
+    "startScreenEffect": effects_ScreenEffect_startScreenEffect__P2795,
+    "endScreenEffect": effects_ScreenEffect_endScreenEffect__P2796,
+    "start": effects_ParticleEffect_start__P2791,
+    "destroy": effects_ParticleEffect_destroy__P2792,
   },
 });
-const particles_ParticleFactory__C187931_VT = mkVTable({
+const particles_ParticleFactory__C2714_VT = mkVTable({
   name: "ParticleFactory",
   numFields: 0,
   classNo: 51,
   lastSubtypeNo: 55,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ParticleFactory_createParticle__P187933,
-    "drawParticle": particles_ParticleFactory_drawParticle__P187934,
+    "createParticle": particles_ParticleFactory_createParticle__P2716,
+    "drawParticle": particles_ParticleFactory_drawParticle__P2717,
   },
   iface: {
-    "createParticle": particles_ParticleFactory_createParticle__P187933,
-    "drawParticle": particles_ParticleFactory_drawParticle__P187934,
+    "createParticle": particles_ParticleFactory_createParticle__P2716,
+    "drawParticle": particles_ParticleFactory_drawParticle__P2717,
   },
 });
-const particles_SprayFactory__C187935_VT = mkVTable({
+const particles_SprayFactory__C2718_VT = mkVTable({
   name: "SprayFactory",
   numFields: 3,
   classNo: 52,
   lastSubtypeNo: 55,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_SprayFactory_createParticle__P187937,
-    "drawParticle": particles_SprayFactory_drawParticle__P187938,
+    "createParticle": particles_SprayFactory_createParticle__P2720,
+    "drawParticle": particles_SprayFactory_drawParticle__P2721,
   },
   iface: {
     "speed": null,
@@ -74200,21 +74219,21 @@ const particles_SprayFactory__C187935_VT = mkVTable({
     "set/minAngle": null,
     "spread": null,
     "set/spread": null,
-    "createParticle": particles_SprayFactory_createParticle__P187937,
-    "drawParticle": particles_SprayFactory_drawParticle__P187938,
-    "setSpeed": particles_SprayFactory_setSpeed__P187939,
-    "setDirection": particles_SprayFactory_setDirection__P187940,
+    "createParticle": particles_SprayFactory_createParticle__P2720,
+    "drawParticle": particles_SprayFactory_drawParticle__P2721,
+    "setSpeed": particles_SprayFactory_setSpeed__P2722,
+    "setDirection": particles_SprayFactory_setDirection__P2723,
   },
 });
-const particles_AreaFactory__C187941_VT = mkVTable({
+const particles_AreaFactory__C2724_VT = mkVTable({
   name: "AreaFactory",
   numFields: 8,
   classNo: 53,
   lastSubtypeNo: 55,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_AreaFactory_createParticle__P187947,
-    "drawParticle": particles_AreaFactory_drawParticle__P187948,
+    "createParticle": particles_AreaFactory_createParticle__P2730,
+    "drawParticle": particles_AreaFactory_drawParticle__P2731,
   },
   iface: {
     "speed": null,
@@ -74233,21 +74252,21 @@ const particles_AreaFactory__C187941_VT = mkVTable({
     "set/maxLifespan": null,
     "galois": null,
     "set/galois": null,
-    "createParticle": particles_AreaFactory_createParticle__P187947,
-    "drawParticle": particles_AreaFactory_drawParticle__P187948,
-    "setSpeed": particles_SprayFactory_setSpeed__P187939,
-    "setDirection": particles_SprayFactory_setDirection__P187940,
+    "createParticle": particles_AreaFactory_createParticle__P2730,
+    "drawParticle": particles_AreaFactory_drawParticle__P2731,
+    "setSpeed": particles_SprayFactory_setSpeed__P2722,
+    "setDirection": particles_SprayFactory_setDirection__P2723,
   },
 });
-const particles_ShapeFactory__C187957_VT = mkVTable({
+const particles_ShapeFactory__C2740_VT = mkVTable({
   name: "ShapeFactory",
   numFields: 11,
   classNo: 54,
   lastSubtypeNo: 55,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ShapeFactory_createParticle__P187961,
-    "drawParticle": particles_ShapeFactory_drawParticle__P187960,
+    "createParticle": particles_ShapeFactory_createParticle__P2744,
+    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
   },
   iface: {
     "speed": null,
@@ -74272,22 +74291,22 @@ const particles_ShapeFactory__C187957_VT = mkVTable({
     "set/ox": null,
     "oy": null,
     "set/oy": null,
-    "addShape": particles_ShapeFactory_addShape__P187959,
-    "drawParticle": particles_ShapeFactory_drawParticle__P187960,
-    "createParticle": particles_ShapeFactory_createParticle__P187961,
-    "setSpeed": particles_SprayFactory_setSpeed__P187939,
-    "setDirection": particles_SprayFactory_setDirection__P187940,
+    "addShape": particles_ShapeFactory_addShape__P2742,
+    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
+    "createParticle": particles_ShapeFactory_createParticle__P2744,
+    "setSpeed": particles_SprayFactory_setSpeed__P2722,
+    "setDirection": particles_SprayFactory_setDirection__P2723,
   },
 });
-const particles_ConfettiFactory__C187962_VT = mkVTable({
+const particles_ConfettiFactory__C2745_VT = mkVTable({
   name: "ConfettiFactory",
   numFields: 11,
   classNo: 55,
   lastSubtypeNo: 55,
   maxBgInstances: null,
   methods: {
-    "createParticle": particles_ShapeFactory_createParticle__P187961,
-    "drawParticle": particles_ShapeFactory_drawParticle__P187960,
+    "createParticle": particles_ShapeFactory_createParticle__P2744,
+    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
   },
   iface: {
     "speed": null,
@@ -74312,25 +74331,25 @@ const particles_ConfettiFactory__C187962_VT = mkVTable({
     "set/ox": null,
     "oy": null,
     "set/oy": null,
-    "addShape": particles_ShapeFactory_addShape__P187959,
-    "drawParticle": particles_ShapeFactory_drawParticle__P187960,
-    "createParticle": particles_ShapeFactory_createParticle__P187961,
-    "setSpeed": particles_SprayFactory_setSpeed__P187939,
-    "setDirection": particles_SprayFactory_setDirection__P187940,
+    "addShape": particles_ShapeFactory_addShape__P2742,
+    "drawParticle": particles_ShapeFactory_drawParticle__P2743,
+    "createParticle": particles_ShapeFactory_createParticle__P2744,
+    "setSpeed": particles_SprayFactory_setSpeed__P2722,
+    "setDirection": particles_SprayFactory_setDirection__P2723,
   },
 });
-const particles_ParticleSource__C187895_VT = mkVTable({
+const particles_ParticleSource__C2678_VT = mkVTable({
   name: "ParticleSource",
   numFields: 13,
   classNo: 24,
   lastSubtypeNo: 24,
   maxBgInstances: null,
   methods: {
-    "__visible": sprites_BaseSprite___visible__P187078,
-    "__draw": particles_ParticleSource___draw__P187901,
-    "__drawCore": sprites_BaseSprite___drawCore__P187082,
-    "__update": sprites_BaseSprite___update__P187083,
-    "updateParticle": particles_ParticleSource_updateParticle__P189919,
+    "__visible": sprites_BaseSprite___visible__P1861,
+    "__draw": particles_ParticleSource___draw__P2684,
+    "__drawCore": sprites_BaseSprite___drawCore__P1865,
+    "__update": sprites_BaseSprite___update__P1866,
+    "updateParticle": particles_ParticleSource_updateParticle__P4703,
   },
   iface: {
     "_z": null,
@@ -74359,28 +74378,28 @@ const particles_ParticleSource__C187895_VT = mkVTable({
     "set/ax": null,
     "ay": null,
     "set/ay": null,
-    "__draw": particles_ParticleSource___draw__P187901,
-    "_update": particles_ParticleSource__update__P187902,
-    "_prune": particles_ParticleSource__prune__P187903,
-    "setAcceleration": particles_ParticleSource_setAcceleration__P187904,
-    "setRelativeToCamera": particles_ParticleSource_setRelativeToCamera__P187906,
-    "enabled": particles_ParticleSource_enabled__P187907,
-    "set/enabled": particles_ParticleSource_enabled__P187908,
-    "destroy": particles_ParticleSource_destroy__P187909,
-    "clear": particles_ParticleSource_clear__P187910,
-    "setAnchor": particles_ParticleSource_setAnchor__P187911,
-    "setRate": particles_ParticleSource_setRate__P187912,
-    "setFactory": particles_ParticleSource_setFactory__P187914,
-    "updateParticle": particles_ParticleSource_updateParticle__P189919,
-    "drawParticle": particles_ParticleSource_drawParticle__P189920,
-    "__visible": sprites_BaseSprite___visible__P187078,
-    "z": sprites_BaseSprite_z__P187079,
-    "set/z": sprites_BaseSprite_z__P187080,
-    "__drawCore": sprites_BaseSprite___drawCore__P187082,
-    "__update": sprites_BaseSprite___update__P187083,
+    "__draw": particles_ParticleSource___draw__P2684,
+    "_update": particles_ParticleSource__update__P2685,
+    "_prune": particles_ParticleSource__prune__P2686,
+    "setAcceleration": particles_ParticleSource_setAcceleration__P2687,
+    "setRelativeToCamera": particles_ParticleSource_setRelativeToCamera__P2689,
+    "enabled": particles_ParticleSource_enabled__P2690,
+    "set/enabled": particles_ParticleSource_enabled__P2691,
+    "destroy": particles_ParticleSource_destroy__P2692,
+    "clear": particles_ParticleSource_clear__P2693,
+    "setAnchor": particles_ParticleSource_setAnchor__P2694,
+    "setRate": particles_ParticleSource_setRate__P2695,
+    "setFactory": particles_ParticleSource_setFactory__P2697,
+    "updateParticle": particles_ParticleSource_updateParticle__P4703,
+    "drawParticle": particles_ParticleSource_drawParticle__P4704,
+    "__visible": sprites_BaseSprite___visible__P1861,
+    "z": sprites_BaseSprite_z__P1862,
+    "set/z": sprites_BaseSprite_z__P1863,
+    "__drawCore": sprites_BaseSprite___drawCore__P1865,
+    "__update": sprites_BaseSprite___update__P1866,
   },
 });
-const particles_Particle__C187876_VT = mkVTable({
+const particles_Particle__C2659_VT = mkVTable({
   name: "Particle",
   numFields: 8,
   classNo: 56,
@@ -74407,7 +74426,7 @@ const particles_Particle__C187876_VT = mkVTable({
     "set/color": null,
   },
 });
-const scene_Camera__C187577_VT = mkVTable({
+const scene_Camera__C2360_VT = mkVTable({
   name: "Camera",
   numFields: 8,
   classNo: 57,
@@ -74432,18 +74451,18 @@ const scene_Camera__C187577_VT = mkVTable({
     "set/shakeDuration": null,
     "shakeAmplitude": null,
     "set/shakeAmplitude": null,
-    "offsetX": scene_Camera_offsetX__P187582,
-    "set/offsetX": scene_Camera_offsetX__P187583,
-    "offsetY": scene_Camera_offsetY__P187584,
-    "set/offsetY": scene_Camera_offsetY__P187585,
-    "x": scene_Camera_x__P187586,
-    "y": scene_Camera_y__P187587,
-    "left": scene_Camera_left__P187588,
-    "top": scene_Camera_top__P187590,
-    "update": scene_Camera_update__P187593,
+    "offsetX": scene_Camera_offsetX__P2365,
+    "set/offsetX": scene_Camera_offsetX__P2366,
+    "offsetY": scene_Camera_offsetY__P2367,
+    "set/offsetY": scene_Camera_offsetY__P2368,
+    "x": scene_Camera_x__P2369,
+    "y": scene_Camera_y__P2370,
+    "left": scene_Camera_left__P2371,
+    "top": scene_Camera_top__P2373,
+    "update": scene_Camera_update__P2376,
   },
 });
-const scene_Background__C187482_VT = mkVTable({
+const scene_Background__C2265_VT = mkVTable({
   name: "Background",
   numFields: 4,
   classNo: 58,
@@ -74460,13 +74479,13 @@ const scene_Background__C187482_VT = mkVTable({
     "set/camera": null,
     "_layers": null,
     "set/_layers": null,
-    "image": scene_Background_image__P187488,
-    "set/image": scene_Background_image__P187489,
-    "hasBackgroundImage": scene_Background_hasBackgroundImage__P187490,
-    "draw": scene_Background_draw__P187491,
+    "image": scene_Background_image__P2271,
+    "set/image": scene_Background_image__P2272,
+    "hasBackgroundImage": scene_Background_hasBackgroundImage__P2273,
+    "draw": scene_Background_draw__P2274,
   },
 });
-const scene_BackgroundLayer__C187492_VT = mkVTable({
+const scene_BackgroundLayer__C2275_VT = mkVTable({
   name: "BackgroundLayer",
   numFields: 6,
   classNo: 59,
@@ -74487,21 +74506,21 @@ const scene_BackgroundLayer__C187492_VT = mkVTable({
     "set/alignX": null,
     "alignY": null,
     "set/alignY": null,
-    "draw": scene_BackgroundLayer_draw__P187500,
+    "draw": scene_BackgroundLayer_draw__P2283,
   },
 });
-const ArcadePhysicsEngine__C187390_VT = mkVTable({
+const ArcadePhysicsEngine__C2173_VT = mkVTable({
   name: "ArcadePhysicsEngine",
   numFields: 6,
   classNo: 39,
   lastSubtypeNo: 39,
   maxBgInstances: null,
   methods: {
-    "addSprite": ArcadePhysicsEngine_addSprite__P187399,
-    "removeSprite": ArcadePhysicsEngine_removeSprite__P187400,
-    "moveSprite": ArcadePhysicsEngine_moveSprite__P187404,
-    "draw": ArcadePhysicsEngine_draw__P187401,
-    "move": ArcadePhysicsEngine_move__P187402,
+    "addSprite": ArcadePhysicsEngine_addSprite__P2182,
+    "removeSprite": ArcadePhysicsEngine_removeSprite__P2183,
+    "moveSprite": ArcadePhysicsEngine_moveSprite__P2187,
+    "draw": ArcadePhysicsEngine_draw__P2184,
+    "move": ArcadePhysicsEngine_move__P2185,
   },
   iface: {
     "sprites": null,
@@ -74516,26 +74535,26 @@ const ArcadePhysicsEngine__C187390_VT = mkVTable({
     "set/minSingleStep": null,
     "maxSingleStep": null,
     "set/maxSingleStep": null,
-    "maxSpeed": ArcadePhysicsEngine_maxSpeed__P187392,
-    "set/maxSpeed": ArcadePhysicsEngine_maxSpeed__P187393,
-    "minStep": ArcadePhysicsEngine_minStep__P187394,
-    "set/minStep": ArcadePhysicsEngine_minStep__P187395,
-    "maxStep": ArcadePhysicsEngine_maxStep__P187396,
-    "set/maxStep": ArcadePhysicsEngine_maxStep__P187397,
-    "addSprite": ArcadePhysicsEngine_addSprite__P187399,
-    "removeSprite": ArcadePhysicsEngine_removeSprite__P187400,
-    "draw": ArcadePhysicsEngine_draw__P187401,
-    "move": ArcadePhysicsEngine_move__P187402,
-    "createMovingSprite": ArcadePhysicsEngine_createMovingSprite__P189437,
-    "spriteCollisions": ArcadePhysicsEngine_spriteCollisions__P189438,
-    "tilemapCollisions": ArcadePhysicsEngine_tilemapCollisions__P189439,
-    "tilemapOverlaps": ArcadePhysicsEngine_tilemapOverlaps__P189440,
-    "moveSprite": ArcadePhysicsEngine_moveSprite__P187404,
-    "canResolveClipping": ArcadePhysicsEngine_canResolveClipping__P189441,
-    "constrain": ArcadePhysicsEngine_constrain__P189442,
+    "maxSpeed": ArcadePhysicsEngine_maxSpeed__P2175,
+    "set/maxSpeed": ArcadePhysicsEngine_maxSpeed__P2176,
+    "minStep": ArcadePhysicsEngine_minStep__P2177,
+    "set/minStep": ArcadePhysicsEngine_minStep__P2178,
+    "maxStep": ArcadePhysicsEngine_maxStep__P2179,
+    "set/maxStep": ArcadePhysicsEngine_maxStep__P2180,
+    "addSprite": ArcadePhysicsEngine_addSprite__P2182,
+    "removeSprite": ArcadePhysicsEngine_removeSprite__P2183,
+    "draw": ArcadePhysicsEngine_draw__P2184,
+    "move": ArcadePhysicsEngine_move__P2185,
+    "createMovingSprite": ArcadePhysicsEngine_createMovingSprite__P4221,
+    "spriteCollisions": ArcadePhysicsEngine_spriteCollisions__P4222,
+    "tilemapCollisions": ArcadePhysicsEngine_tilemapCollisions__P4223,
+    "tilemapOverlaps": ArcadePhysicsEngine_tilemapOverlaps__P4224,
+    "moveSprite": ArcadePhysicsEngine_moveSprite__P2187,
+    "canResolveClipping": ArcadePhysicsEngine_canResolveClipping__P4225,
+    "constrain": ArcadePhysicsEngine_constrain__P4226,
   },
 });
-const sprites_SpriteMap__C187311_VT = mkVTable({
+const sprites_SpriteMap__C2094_VT = mkVTable({
   name: "SpriteMap",
   numFields: 5,
   classNo: 60,
@@ -74554,20 +74573,20 @@ const sprites_SpriteMap__C187311_VT = mkVTable({
     "set/columnCount": null,
     "buckets": null,
     "set/buckets": null,
-    "neighbors": sprites_SpriteMap_neighbors__P187313,
-    "overlaps": sprites_SpriteMap_overlaps__P187314,
-    "draw": sprites_SpriteMap_draw__P187315,
-    "resizeBuckets": sprites_SpriteMap_resizeBuckets__P187316,
-    "clear": sprites_SpriteMap_clear__P187317,
-    "key": sprites_SpriteMap_key__P189414,
-    "insertAtKey": sprites_SpriteMap_insertAtKey__P189415,
-    "insertAABB": sprites_SpriteMap_insertAABB__P187318,
-    "mergeAtKey": sprites_SpriteMap_mergeAtKey__P189416,
-    "toString": sprites_SpriteMap_toString__P187319,
+    "neighbors": sprites_SpriteMap_neighbors__P2096,
+    "overlaps": sprites_SpriteMap_overlaps__P2097,
+    "draw": sprites_SpriteMap_draw__P2098,
+    "resizeBuckets": sprites_SpriteMap_resizeBuckets__P2099,
+    "clear": sprites_SpriteMap_clear__P2100,
+    "key": sprites_SpriteMap_key__P4198,
+    "insertAtKey": sprites_SpriteMap_insertAtKey__P4199,
+    "insertAABB": sprites_SpriteMap_insertAABB__P2101,
+    "mergeAtKey": sprites_SpriteMap_mergeAtKey__P4200,
+    "toString": sprites_SpriteMap_toString__P2102,
   },
-  toStringMethod: sprites_SpriteMap_toString__P187319,
+  toStringMethod: sprites_SpriteMap_toString__P2102,
 });
-const music_Melody__C186815_VT = mkVTable({
+const music_Melody__C1598_VT = mkVTable({
   name: "Melody",
   numFields: 2,
   classNo: 61,
@@ -74580,16 +74599,16 @@ const music_Melody__C186815_VT = mkVTable({
     "set/_text": null,
     "_player": null,
     "set/_player": null,
-    "stop": music_Melody_stop__P186820,
-    "registerMelody": music_Melody_registerMelody__P189287,
-    "unregisterMelody": music_Melody_unregisterMelody__P189288,
-    "playCore": music_Melody_playCore__P189289,
-    "play": music_Melody_play__P186822,
-    "toString": music_Melody_toString__P186824,
+    "stop": music_Melody_stop__P1603,
+    "registerMelody": music_Melody_registerMelody__P4071,
+    "unregisterMelody": music_Melody_unregisterMelody__P4072,
+    "playCore": music_Melody_playCore__P4073,
+    "play": music_Melody_play__P1605,
+    "toString": music_Melody_toString__P1607,
   },
-  toStringMethod: music_Melody_toString__P186824,
+  toStringMethod: music_Melody_toString__P1607,
 });
-const character_CharacterAnimation__C191355_VT = mkVTable({
+const character_CharacterAnimation__C6139_VT = mkVTable({
   name: "CharacterAnimation",
   numFields: 5,
   classNo: 62,
@@ -74610,7 +74629,7 @@ const character_CharacterAnimation__C191355_VT = mkVTable({
     "set/rule": null,
   },
 });
-const color_Fade__C188768_VT = mkVTable({
+const color_Fade__C3551_VT = mkVTable({
   name: "Fade",
   numFields: 4,
   classNo: 63,
@@ -74627,16 +74646,16 @@ const color_Fade__C188768_VT = mkVTable({
     "set/_startPalette": null,
     "_endPalette": null,
     "set/_endPalette": null,
-    "startPalette": color_Fade_startPalette__P188770,
-    "isActive": color_Fade_isActive__P188772,
-    "start": color_Fade_start__P188773,
-    "setStartPalette": color_Fade_setStartPalette__P188776,
-    "setEndPalette": color_Fade_setEndPalette__P188778,
-    "step": color_Fade_step__P188780,
-    "pauseUntilDone": color_Fade_pauseUntilDone__P188782,
+    "startPalette": color_Fade_startPalette__P3553,
+    "isActive": color_Fade_isActive__P3555,
+    "start": color_Fade_start__P3556,
+    "setStartPalette": color_Fade_setStartPalette__P3559,
+    "setEndPalette": color_Fade_setEndPalette__P3561,
+    "step": color_Fade_step__P3563,
+    "pauseUntilDone": color_Fade_pauseUntilDone__P3565,
   },
 });
-const color_ColorBuffer__C188707_VT = mkVTable({
+const color_ColorBuffer__C3490_VT = mkVTable({
   name: "ColorBuffer",
   numFields: 2,
   classNo: 64,
@@ -74649,13 +74668,13 @@ const color_ColorBuffer__C188707_VT = mkVTable({
     "set/layout": null,
     "buf": null,
     "set/buf": null,
-    "stride": color_ColorBuffer_stride__P188712,
-    "length": color_ColorBuffer_length__P188713,
-    "color": color_ColorBuffer_color__P188714,
-    "setColor": color_ColorBuffer_setColor__P188715,
+    "stride": color_ColorBuffer_stride__P3495,
+    "length": color_ColorBuffer_length__P3496,
+    "color": color_ColorBuffer_color__P3497,
+    "setColor": color_ColorBuffer_setColor__P3498,
   },
 });
-const color_Palette__C188747_VT = mkVTable({
+const color_Palette__C3530_VT = mkVTable({
   name: "Palette",
   numFields: 2,
   classNo: 65,
@@ -74668,13 +74687,13 @@ const color_Palette__C188747_VT = mkVTable({
     "set/layout": null,
     "buf": null,
     "set/buf": null,
-    "stride": color_ColorBuffer_stride__P188712,
-    "length": color_ColorBuffer_length__P188713,
-    "color": color_ColorBuffer_color__P188714,
-    "setColor": color_ColorBuffer_setColor__P188715,
+    "stride": color_ColorBuffer_stride__P3495,
+    "length": color_ColorBuffer_length__P3496,
+    "color": color_ColorBuffer_color__P3497,
+    "setColor": color_ColorBuffer_setColor__P3498,
   },
 });
-const game_NumberPrompt__C187791_VT = mkVTable({
+const game_NumberPrompt__C2574_VT = mkVTable({
   name: "NumberPrompt",
   numFields: 15,
   classNo: 66,
@@ -74713,35 +74732,35 @@ const game_NumberPrompt__C187791_VT = mkVTable({
     "set/blink": null,
     "frameCount": null,
     "set/frameCount": null,
-    "show": game_NumberPrompt_show__P187797,
-    "draw": game_NumberPrompt_draw__P189798,
-    "drawPromptText": game_NumberPrompt_drawPromptText__P189799,
-    "drawInputarea": game_NumberPrompt_drawInputarea__P189800,
-    "drawNumpad": game_NumberPrompt_drawNumpad__P189801,
-    "drawBottomBar": game_NumberPrompt_drawBottomBar__P189802,
-    "updateButtons": game_NumberPrompt_updateButtons__P189803,
-    "updateCursor": game_NumberPrompt_updateCursor__P189804,
-    "updateSelectedInput": game_NumberPrompt_updateSelectedInput__P189805,
-    "updateKeyboard": game_NumberPrompt_updateKeyboard__P189806,
-    "drawInput": game_NumberPrompt_drawInput__P189807,
-    "registerHandlers": game_NumberPrompt_registerHandlers__P189808,
-    "moveVertical": game_NumberPrompt_moveVertical__P189809,
-    "moveHorizontal": game_NumberPrompt_moveHorizontal__P189810,
-    "confirm": game_NumberPrompt_confirm__P189811,
-    "delete": game_NumberPrompt_delete__P189812,
-    "changeInputIndex": game_NumberPrompt_changeInputIndex__P189813,
+    "show": game_NumberPrompt_show__P2580,
+    "draw": game_NumberPrompt_draw__P4582,
+    "drawPromptText": game_NumberPrompt_drawPromptText__P4583,
+    "drawInputarea": game_NumberPrompt_drawInputarea__P4584,
+    "drawNumpad": game_NumberPrompt_drawNumpad__P4585,
+    "drawBottomBar": game_NumberPrompt_drawBottomBar__P4586,
+    "updateButtons": game_NumberPrompt_updateButtons__P4587,
+    "updateCursor": game_NumberPrompt_updateCursor__P4588,
+    "updateSelectedInput": game_NumberPrompt_updateSelectedInput__P4589,
+    "updateKeyboard": game_NumberPrompt_updateKeyboard__P4590,
+    "drawInput": game_NumberPrompt_drawInput__P4591,
+    "registerHandlers": game_NumberPrompt_registerHandlers__P4592,
+    "moveVertical": game_NumberPrompt_moveVertical__P4593,
+    "moveHorizontal": game_NumberPrompt_moveHorizontal__P4594,
+    "confirm": game_NumberPrompt_confirm__P4595,
+    "delete": game_NumberPrompt_delete__P4596,
+    "changeInputIndex": game_NumberPrompt_changeInputIndex__P4597,
   },
 });
-const game_BaseDialog__C187694_VT = mkVTable({
+const game_BaseDialog__C2477_VT = mkVTable({
   name: "BaseDialog",
   numFields: 11,
   classNo: 67,
   lastSubtypeNo: 69,
   maxBgInstances: null,
   methods: {
-    "update": game_BaseDialog_update__P187707,
-    "setText": game_BaseDialog_setText__P187708,
-    "drawTextCore": game_BaseDialog_drawTextCore__P187709,
+    "update": game_BaseDialog_update__P2490,
+    "setText": game_BaseDialog_setText__P2491,
+    "drawTextCore": game_BaseDialog_drawTextCore__P2492,
   },
   iface: {
     "image": null,
@@ -74766,31 +74785,31 @@ const game_BaseDialog__C187694_VT = mkVTable({
     "set/font": null,
     "textColor": null,
     "set/textColor": null,
-    "update": game_BaseDialog_update__P187707,
-    "setText": game_BaseDialog_setText__P187708,
-    "drawTextCore": game_BaseDialog_drawTextCore__P187709,
-    "drawCursorRow": game_BaseDialog_drawCursorRow__P187710,
-    "drawBorder": game_BaseDialog_drawBorder__P189537,
-    "fastFill": game_BaseDialog_fastFill__P189538,
-    "clearInterior": game_BaseDialog_clearInterior__P189539,
-    "drawPartial": game_BaseDialog_drawPartial__P189540,
-    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P189541,
-    "rowHeight": game_BaseDialog_rowHeight__P189542,
-    "textAreaWidth": game_BaseDialog_textAreaWidth__P189543,
-    "textAreaHeight": game_BaseDialog_textAreaHeight__P189544,
-    "setFont": game_BaseDialog_setFont__P189545,
+    "update": game_BaseDialog_update__P2490,
+    "setText": game_BaseDialog_setText__P2491,
+    "drawTextCore": game_BaseDialog_drawTextCore__P2492,
+    "drawCursorRow": game_BaseDialog_drawCursorRow__P2493,
+    "drawBorder": game_BaseDialog_drawBorder__P4321,
+    "fastFill": game_BaseDialog_fastFill__P4322,
+    "clearInterior": game_BaseDialog_clearInterior__P4323,
+    "drawPartial": game_BaseDialog_drawPartial__P4324,
+    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P4325,
+    "rowHeight": game_BaseDialog_rowHeight__P4326,
+    "textAreaWidth": game_BaseDialog_textAreaWidth__P4327,
+    "textAreaHeight": game_BaseDialog_textAreaHeight__P4328,
+    "setFont": game_BaseDialog_setFont__P4329,
   },
 });
-const game_Dialog__C187711_VT = mkVTable({
+const game_Dialog__C2494_VT = mkVTable({
   name: "Dialog",
   numFields: 13,
   classNo: 68,
   lastSubtypeNo: 68,
   maxBgInstances: null,
   methods: {
-    "update": game_BaseDialog_update__P187707,
-    "setText": game_Dialog_setText__P187720,
-    "drawTextCore": game_Dialog_drawTextCore__P187721,
+    "update": game_BaseDialog_update__P2490,
+    "setText": game_Dialog_setText__P2503,
+    "drawTextCore": game_Dialog_drawTextCore__P2504,
   },
   iface: {
     "image": null,
@@ -74819,37 +74838,37 @@ const game_Dialog__C187711_VT = mkVTable({
     "set/chunks": null,
     "chunkIndex": null,
     "set/chunkIndex": null,
-    "hasNext": game_Dialog_hasNext__P187715,
-    "hasPrev": game_Dialog_hasPrev__P187716,
-    "nextPage": game_Dialog_nextPage__P187717,
-    "prevPage": game_Dialog_prevPage__P187718,
-    "chunkText": game_Dialog_chunkText__P187719,
-    "setText": game_Dialog_setText__P187720,
-    "drawTextCore": game_Dialog_drawTextCore__P187721,
-    "update": game_BaseDialog_update__P187707,
-    "drawCursorRow": game_BaseDialog_drawCursorRow__P187710,
-    "drawBorder": game_BaseDialog_drawBorder__P189537,
-    "fastFill": game_BaseDialog_fastFill__P189538,
-    "clearInterior": game_BaseDialog_clearInterior__P189539,
-    "drawPartial": game_BaseDialog_drawPartial__P189540,
-    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P189541,
-    "rowHeight": game_BaseDialog_rowHeight__P189542,
-    "textAreaWidth": game_BaseDialog_textAreaWidth__P189543,
-    "textAreaHeight": game_BaseDialog_textAreaHeight__P189544,
-    "setFont": game_BaseDialog_setFont__P189545,
+    "hasNext": game_Dialog_hasNext__P2498,
+    "hasPrev": game_Dialog_hasPrev__P2499,
+    "nextPage": game_Dialog_nextPage__P2500,
+    "prevPage": game_Dialog_prevPage__P2501,
+    "chunkText": game_Dialog_chunkText__P2502,
+    "setText": game_Dialog_setText__P2503,
+    "drawTextCore": game_Dialog_drawTextCore__P2504,
+    "update": game_BaseDialog_update__P2490,
+    "drawCursorRow": game_BaseDialog_drawCursorRow__P2493,
+    "drawBorder": game_BaseDialog_drawBorder__P4321,
+    "fastFill": game_BaseDialog_fastFill__P4322,
+    "clearInterior": game_BaseDialog_clearInterior__P4323,
+    "drawPartial": game_BaseDialog_drawPartial__P4324,
+    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P4325,
+    "rowHeight": game_BaseDialog_rowHeight__P4326,
+    "textAreaWidth": game_BaseDialog_textAreaWidth__P4327,
+    "textAreaHeight": game_BaseDialog_textAreaHeight__P4328,
+    "setFont": game_BaseDialog_setFont__P4329,
   },
 });
-const blockMenu_MenuSprite__C188909_VT = mkVTable({
+const blockMenu_MenuSprite__C3692_VT = mkVTable({
   name: "MenuSprite",
   numFields: 14,
   classNo: 25,
   lastSubtypeNo: 25,
   maxBgInstances: null,
   methods: {
-    "__visible": blockMenu_MenuSprite___visible__P188927,
-    "__draw": sprites_BaseSprite___draw__P187081,
-    "__drawCore": blockMenu_MenuSprite___drawCore__P188928,
-    "__update": sprites_BaseSprite___update__P187083,
+    "__visible": blockMenu_MenuSprite___visible__P3710,
+    "__draw": sprites_BaseSprite___draw__P1864,
+    "__drawCore": blockMenu_MenuSprite___drawCore__P3711,
+    "__update": sprites_BaseSprite___update__P1866,
   },
   iface: {
     "_z": null,
@@ -74880,32 +74899,32 @@ const blockMenu_MenuSprite__C188909_VT = mkVTable({
     "set/padding": null,
     "metrics": null,
     "set/metrics": null,
-    "setOptions": blockMenu_MenuSprite_setOptions__P188912,
-    "setColors": blockMenu_MenuSprite_setColors__P188913,
-    "setStyle": blockMenu_MenuSprite_setStyle__P188914,
-    "setLocation": blockMenu_MenuSprite_setLocation__P188915,
-    "selectedMenuOption": blockMenu_MenuSprite_selectedMenuOption__P188916,
-    "selectedMenuIndex": blockMenu_MenuSprite_selectedMenuIndex__P188917,
-    "setSelectedIndex": blockMenu_MenuSprite_setSelectedIndex__P188918,
-    "moveSelectionVertical": blockMenu_MenuSprite_moveSelectionVertical__P188919,
-    "moveSelectionHorizontal": blockMenu_MenuSprite_moveSelectionHorizontal__P188920,
-    "next": blockMenu_MenuSprite_next__P188921,
-    "previous": blockMenu_MenuSprite_previous__P188922,
-    "setMenuOpen": blockMenu_MenuSprite_setMenuOpen__P188925,
-    "destroy": blockMenu_MenuSprite_destroy__P188926,
-    "__visible": blockMenu_MenuSprite___visible__P188927,
-    "__drawCore": blockMenu_MenuSprite___drawCore__P188928,
-    "getMaxLabelWidth": blockMenu_MenuSprite_getMaxLabelWidth__P191322,
-    "recreateLabels": blockMenu_MenuSprite_recreateLabels__P191323,
-    "drawGridMenu": blockMenu_MenuSprite_drawGridMenu__P191324,
-    "drawListMenu": blockMenu_MenuSprite_drawListMenu__P191325,
-    "z": sprites_BaseSprite_z__P187079,
-    "set/z": sprites_BaseSprite_z__P187080,
-    "__draw": sprites_BaseSprite___draw__P187081,
-    "__update": sprites_BaseSprite___update__P187083,
+    "setOptions": blockMenu_MenuSprite_setOptions__P3695,
+    "setColors": blockMenu_MenuSprite_setColors__P3696,
+    "setStyle": blockMenu_MenuSprite_setStyle__P3697,
+    "setLocation": blockMenu_MenuSprite_setLocation__P3698,
+    "selectedMenuOption": blockMenu_MenuSprite_selectedMenuOption__P3699,
+    "selectedMenuIndex": blockMenu_MenuSprite_selectedMenuIndex__P3700,
+    "setSelectedIndex": blockMenu_MenuSprite_setSelectedIndex__P3701,
+    "moveSelectionVertical": blockMenu_MenuSprite_moveSelectionVertical__P3702,
+    "moveSelectionHorizontal": blockMenu_MenuSprite_moveSelectionHorizontal__P3703,
+    "next": blockMenu_MenuSprite_next__P3704,
+    "previous": blockMenu_MenuSprite_previous__P3705,
+    "setMenuOpen": blockMenu_MenuSprite_setMenuOpen__P3708,
+    "destroy": blockMenu_MenuSprite_destroy__P3709,
+    "__visible": blockMenu_MenuSprite___visible__P3710,
+    "__drawCore": blockMenu_MenuSprite___drawCore__P3711,
+    "getMaxLabelWidth": blockMenu_MenuSprite_getMaxLabelWidth__P6106,
+    "recreateLabels": blockMenu_MenuSprite_recreateLabels__P6107,
+    "drawGridMenu": blockMenu_MenuSprite_drawGridMenu__P6108,
+    "drawListMenu": blockMenu_MenuSprite_drawListMenu__P6109,
+    "z": sprites_BaseSprite_z__P1862,
+    "set/z": sprites_BaseSprite_z__P1863,
+    "__draw": sprites_BaseSprite___draw__P1864,
+    "__update": sprites_BaseSprite___update__P1866,
   },
 });
-const blockMenu__BlockMenuState__C188930_VT = mkVTable({
+const blockMenu__BlockMenuState__C3713_VT = mkVTable({
   name: "_BlockMenuState",
   numFields: 3,
   classNo: 70,
@@ -74920,11 +74939,11 @@ const blockMenu__BlockMenuState__C188930_VT = mkVTable({
     "set/handlers": null,
     "controlsEnabled": null,
     "set/controlsEnabled": null,
-    "addHandler": blockMenu__BlockMenuState_addHandler__P188935,
-    "destroy": blockMenu__BlockMenuState_destroy__P188937,
+    "addHandler": blockMenu__BlockMenuState_addHandler__P3718,
+    "destroy": blockMenu__BlockMenuState_destroy__P3720,
   },
 });
-const blockMenu_LayoutMetrics__C191317_VT = mkVTable({
+const blockMenu_LayoutMetrics__C6101_VT = mkVTable({
   name: "LayoutMetrics",
   numFields: 4,
   classNo: 71,
@@ -74943,7 +74962,7 @@ const blockMenu_LayoutMetrics__C191317_VT = mkVTable({
     "set/height": null,
   },
 });
-const blockMenu_ScrollingLabel__C191326_VT = mkVTable({
+const blockMenu_ScrollingLabel__C6110_VT = mkVTable({
   name: "ScrollingLabel",
   numFields: 11,
   classNo: 72,
@@ -74974,11 +74993,11 @@ const blockMenu_ScrollingLabel__C191326_VT = mkVTable({
     "set/partialCanvas": null,
     "text": null,
     "set/text": null,
-    "setScrolling": blockMenu_ScrollingLabel_setScrolling__P191327,
-    "draw": blockMenu_ScrollingLabel_draw__P191328,
+    "setScrolling": blockMenu_ScrollingLabel_setScrolling__P6111,
+    "draw": blockMenu_ScrollingLabel_draw__P6112,
   },
 });
-const game_Hitbox__C187176_VT = mkVTable({
+const game_Hitbox__C1959_VT = mkVTable({
   name: "Hitbox",
   numFields: 5,
   classNo: 73,
@@ -74997,13 +75016,13 @@ const game_Hitbox__C187176_VT = mkVTable({
     "set/width": null,
     "height": null,
     "set/height": null,
-    "left": game_Hitbox_left__P187183,
-    "top": game_Hitbox_top__P187184,
-    "right": game_Hitbox_right__P187185,
-    "bottom": game_Hitbox_bottom__P187186,
+    "left": game_Hitbox_left__P1966,
+    "top": game_Hitbox_top__P1967,
+    "right": game_Hitbox_right__P1968,
+    "bottom": game_Hitbox_bottom__P1969,
   },
 });
-const sprites_SpriteSet__C187328_VT = mkVTable({
+const sprites_SpriteSet__C2111_VT = mkVTable({
   name: "SpriteSet",
   numFields: 1,
   classNo: 74,
@@ -75014,16 +75033,16 @@ const sprites_SpriteSet__C187328_VT = mkVTable({
   iface: {
     "_sprites": null,
     "set/_sprites": null,
-    "length": sprites_SpriteSet_length__P187331,
-    "sprites": sprites_SpriteSet_sprites__P187332,
-    "add": sprites_SpriteSet_add__P187333,
-    "remove": sprites_SpriteSet_remove__P187335,
-    "contains": sprites_SpriteSet_contains__P187336,
-    "toString": sprites_SpriteSet_toString__P187339,
+    "length": sprites_SpriteSet_length__P2114,
+    "sprites": sprites_SpriteSet_sprites__P2115,
+    "add": sprites_SpriteSet_add__P2116,
+    "remove": sprites_SpriteSet_remove__P2118,
+    "contains": sprites_SpriteSet_contains__P2119,
+    "toString": sprites_SpriteSet_toString__P2122,
   },
-  toStringMethod: sprites_SpriteSet_toString__P187339,
+  toStringMethod: sprites_SpriteSet_toString__P2122,
 });
-const scene_OverlapHandler__C187609_VT = mkVTable({
+const scene_OverlapHandler__C2392_VT = mkVTable({
   name: "OverlapHandler",
   numFields: 3,
   classNo: 75,
@@ -75040,16 +75059,16 @@ const scene_OverlapHandler__C187609_VT = mkVTable({
     "set/handler": null,
   },
 });
-const game_GameOverDialog__C187733_VT = mkVTable({
+const game_GameOverDialog__C2516_VT = mkVTable({
   name: "GameOverDialog",
   numFields: 16,
   classNo: 69,
   lastSubtypeNo: 69,
   maxBgInstances: null,
   methods: {
-    "update": game_GameOverDialog_update__P187736,
-    "setText": game_BaseDialog_setText__P187708,
-    "drawTextCore": game_GameOverDialog_drawTextCore__P187737,
+    "update": game_GameOverDialog_update__P2519,
+    "setText": game_BaseDialog_setText__P2491,
+    "drawTextCore": game_GameOverDialog_drawTextCore__P2520,
   },
   iface: {
     "image": null,
@@ -75084,23 +75103,23 @@ const game_GameOverDialog__C187733_VT = mkVTable({
     "set/score": null,
     "highScore": null,
     "set/highScore": null,
-    "displayCursor": game_GameOverDialog_displayCursor__P187735,
-    "update": game_GameOverDialog_update__P187736,
-    "drawTextCore": game_GameOverDialog_drawTextCore__P187737,
-    "setText": game_BaseDialog_setText__P187708,
-    "drawCursorRow": game_BaseDialog_drawCursorRow__P187710,
-    "drawBorder": game_BaseDialog_drawBorder__P189537,
-    "fastFill": game_BaseDialog_fastFill__P189538,
-    "clearInterior": game_BaseDialog_clearInterior__P189539,
-    "drawPartial": game_BaseDialog_drawPartial__P189540,
-    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P189541,
-    "rowHeight": game_BaseDialog_rowHeight__P189542,
-    "textAreaWidth": game_BaseDialog_textAreaWidth__P189543,
-    "textAreaHeight": game_BaseDialog_textAreaHeight__P189544,
-    "setFont": game_BaseDialog_setFont__P189545,
+    "displayCursor": game_GameOverDialog_displayCursor__P2518,
+    "update": game_GameOverDialog_update__P2519,
+    "drawTextCore": game_GameOverDialog_drawTextCore__P2520,
+    "setText": game_BaseDialog_setText__P2491,
+    "drawCursorRow": game_BaseDialog_drawCursorRow__P2493,
+    "drawBorder": game_BaseDialog_drawBorder__P4321,
+    "fastFill": game_BaseDialog_fastFill__P4322,
+    "clearInterior": game_BaseDialog_clearInterior__P4323,
+    "drawPartial": game_BaseDialog_drawPartial__P4324,
+    "cursorRowHeight": game_BaseDialog_cursorRowHeight__P4325,
+    "rowHeight": game_BaseDialog_rowHeight__P4326,
+    "textAreaWidth": game_BaseDialog_textAreaWidth__P4327,
+    "textAreaHeight": game_BaseDialog_textAreaHeight__P4328,
+    "setFont": game_BaseDialog_setFont__P4329,
   },
 });
-const music_MelodyPlayer__C186825_VT = mkVTable({
+const music_MelodyPlayer__C1608_VT = mkVTable({
   name: "MelodyPlayer",
   numFields: 2,
   classNo: 76,
@@ -75113,12 +75132,12 @@ const music_MelodyPlayer__C186825_VT = mkVTable({
     "set/melody": null,
     "onPlayFinished": null,
     "set/onPlayFinished": null,
-    "stop": music_MelodyPlayer_stop__P186829,
-    "queuePlayInstructions": music_MelodyPlayer_queuePlayInstructions__P189292,
-    "play": music_MelodyPlayer_play__P186830,
+    "stop": music_MelodyPlayer_stop__P1612,
+    "queuePlayInstructions": music_MelodyPlayer_queuePlayInstructions__P4076,
+    "play": music_MelodyPlayer_play__P1613,
   },
 });
-const scene_PathFollowingSprite__C191306_VT = mkVTable({
+const scene_PathFollowingSprite__C6090_VT = mkVTable({
   name: "PathFollowingSprite",
   numFields: 5,
   classNo: 77,
@@ -75139,7 +75158,7 @@ const scene_PathFollowingSprite__C191306_VT = mkVTable({
     "set/speed": null,
   },
 });
-const control_Interval__C189214_VT = mkVTable({
+const control_Interval__C3998_VT = mkVTable({
   name: "Interval",
   numFields: 4,
   classNo: 78,
@@ -75156,10 +75175,10 @@ const control_Interval__C189214_VT = mkVTable({
     "set/delay": null,
     "mode": null,
     "set/mode": null,
-    "work": control_Interval_work__P189215,
+    "work": control_Interval_work__P3999,
   },
 });
-const scene_TileOverlapHandler__C187613_VT = mkVTable({
+const scene_TileOverlapHandler__C2396_VT = mkVTable({
   name: "TileOverlapHandler",
   numFields: 3,
   classNo: 79,
@@ -75176,7 +75195,7 @@ const scene_TileOverlapHandler__C187613_VT = mkVTable({
     "set/handler": null,
   },
 });
-const scene_systemMenu_PauseMenu__C187839_VT = mkVTable({
+const scene_systemMenu_PauseMenu__C2622_VT = mkVTable({
   name: "PauseMenu",
   numFields: 7,
   classNo: 80,
@@ -75199,15 +75218,15 @@ const scene_systemMenu_PauseMenu__C187839_VT = mkVTable({
     "set/scrollOffset": null,
     "generator": null,
     "set/generator": null,
-    "show": scene_systemMenu_PauseMenu_show__P187841,
-    "onUpdate": scene_systemMenu_PauseMenu_onUpdate__P187842,
-    "setSelection": scene_systemMenu_PauseMenu_setSelection__P187843,
-    "drawText": scene_systemMenu_PauseMenu_drawText__P187844,
-    "dispose": scene_systemMenu_PauseMenu_dispose__P187845,
-    "updateScrollTarget": scene_systemMenu_PauseMenu_updateScrollTarget__P189819,
+    "show": scene_systemMenu_PauseMenu_show__P2624,
+    "onUpdate": scene_systemMenu_PauseMenu_onUpdate__P2625,
+    "setSelection": scene_systemMenu_PauseMenu_setSelection__P2626,
+    "drawText": scene_systemMenu_PauseMenu_drawText__P2627,
+    "dispose": scene_systemMenu_PauseMenu_dispose__P2628,
+    "updateScrollTarget": scene_systemMenu_PauseMenu_updateScrollTarget__P4603,
   },
 });
-const scene_systemMenu_MenuOption__C187831_VT = mkVTable({
+const scene_systemMenu_MenuOption__C2614_VT = mkVTable({
   name: "MenuOption",
   numFields: 8,
   classNo: 81,
@@ -75232,16 +75251,16 @@ const scene_systemMenu_MenuOption__C187831_VT = mkVTable({
     "set/getText": null,
     "action": null,
     "set/action": null,
-    "show": scene_systemMenu_MenuOption_show__P187833,
-    "position": scene_systemMenu_MenuOption_position__P187834,
-    "setOffset": scene_systemMenu_MenuOption_setOffset__P187835,
-    "setTheme": scene_systemMenu_MenuOption_setTheme__P187836,
-    "setState": scene_systemMenu_MenuOption_setState__P187837,
-    "dispose": scene_systemMenu_MenuOption_dispose__P187838,
-    "updateCard": scene_systemMenu_MenuOption_updateCard__P189818,
+    "show": scene_systemMenu_MenuOption_show__P2616,
+    "position": scene_systemMenu_MenuOption_position__P2617,
+    "setOffset": scene_systemMenu_MenuOption_setOffset__P2618,
+    "setTheme": scene_systemMenu_MenuOption_setTheme__P2619,
+    "setState": scene_systemMenu_MenuOption_setState__P2620,
+    "dispose": scene_systemMenu_MenuOption_dispose__P2621,
+    "updateCard": scene_systemMenu_MenuOption_updateCard__P4602,
   },
 });
-const MovingSprite__C187388_VT = mkVTable({
+const MovingSprite__C2171_VT = mkVTable({
   name: "MovingSprite",
   numFields: 7,
   classNo: 82,
@@ -75266,7 +75285,7 @@ const MovingSprite__C187388_VT = mkVTable({
     "set/yStep": null,
   },
 });
-const sprites_StaticObstacle__C187363_VT = mkVTable({
+const sprites_StaticObstacle__C2146_VT = mkVTable({
   name: "StaticObstacle",
   numFields: 5,
   classNo: 83,
@@ -75285,13 +75304,13 @@ const sprites_StaticObstacle__C187363_VT = mkVTable({
     "set/top": null,
     "left": null,
     "set/left": null,
-    "x": sprites_StaticObstacle_x__P187370,
-    "y": sprites_StaticObstacle_y__P187371,
-    "height": sprites_StaticObstacle_height__P187372,
-    "width": sprites_StaticObstacle_width__P187373,
+    "x": sprites_StaticObstacle_x__P2153,
+    "y": sprites_StaticObstacle_y__P2154,
+    "height": sprites_StaticObstacle_height__P2155,
+    "width": sprites_StaticObstacle_width__P2156,
   },
 });
-const effects_SceneAnchor__C189962_VT = mkVTable({
+const effects_SceneAnchor__C4746_VT = mkVTable({
   name: "SceneAnchor",
   numFields: 1,
   classNo: 84,
@@ -75302,14 +75321,14 @@ const effects_SceneAnchor__C189962_VT = mkVTable({
   iface: {
     "camera": null,
     "set/camera": null,
-    "x": effects_SceneAnchor_x__P189963,
-    "y": effects_SceneAnchor_y__P189964,
-    "width": effects_SceneAnchor_width__P189965,
-    "height": effects_SceneAnchor_height__P189966,
+    "x": effects_SceneAnchor_x__P4747,
+    "y": effects_SceneAnchor_y__P4748,
+    "width": effects_SceneAnchor_width__P4749,
+    "height": effects_SceneAnchor_height__P4750,
   },
 });
 
-const breakpoints = setupDebugger(1, ["NPC___426659","Map___426662","SurvivedPlayer___426665","SurvivedNPC___426668","loading___426789","message___426820","tile12___189161","last_15___426836","in_game___426863","paths___426761","player_made_it___426897","selected_option___426850","user_fish_count___427054","user_shark_count___427011","transparency16___189149","tile2___189151","tile3___189152","tile4___189153","tile8___189157","tile9___189158","tile11___189160","in_menu___427320","loading_start_time___427512","sprite_map___427230","last_score_time___427304","shortest_distance___427302","sprite_closest_sprite___427300","map___427146","sprite_player_fish___427125","tile1___189150","tile5___189154","tile6___189155","tile7___189156","tile10___189159","tile14___189162","tile13___189163","tile15___189164","tile16___189165","left_fish_animations___426674","right_fish_animations___426683","local_choice___426692","sprite_fish___426697","location___426744","sprite_shark___427184"])
+const breakpoints = setupDebugger(1, ["NPC___88584","Map___88587","SurvivedPlayer___88590","SurvivedNPC___88593","loading___88729","message___88760","tile12___3945","last_15___88776","in_game___88803","paths___88701","player_made_it___88837","selected_option___88790","user_fish_count___88985","user_shark_count___88942","transparency16___3933","tile2___3935","tile3___3936","tile4___3937","tile8___3941","tile9___3942","tile11___3944","in_menu___89253","loading_start_time___89457","sprite_map___89161","last_score_time___89237","shortest_distance___89235","sprite_closest_sprite___89233","map___89077","sprite_player_fish___89056","tile1___3934","tile5___3938","tile6___3939","tile7___3940","tile10___3943","tile14___3946","tile13___3947","tile15___3948","tile16___3949","left_fish_animations___88599","right_fish_animations___88614","local_choice___88629","sprite_fish___88637","location___88684","sprite_shark___89115"])
 
-return _main___P427962
+return _main___P90087
 })
diff --git a/assets/version.txt b/assets/version.txt
index 7e099ec..a77d7d9 100644
--- a/assets/version.txt
+++ b/assets/version.txt
@@ -1 +1 @@
-1.2.6
\ No newline at end of file
+1.2.7
\ No newline at end of file
diff --git a/pxt.json b/pxt.json
index 0884473..2c36a76 100644
--- a/pxt.json
+++ b/pxt.json
@@ -1,6 +1,6 @@
 {
     "name": "Fishy Fishy Cross my Ocean! v1.2.2 attempt 3",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "description": "",
     "dependencies": {
         "device": "*",