From 9b68519aff843e8a51dfba5ff1389339a3137a83 Mon Sep 17 00:00:00 2001
From: Michal Moskal <michal.moskal@microsoft.com>
Date: Sat, 2 Apr 2016 18:09:31 -0700
Subject: [PATCH] Disable two image blocks - they crash block injection

---
 libs/microbit-devices/shims.d.ts | 4 ++--
 libs/microbit/images.cpp         | 4 ++--
 libs/microbit/shims.d.ts         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/microbit-devices/shims.d.ts b/libs/microbit-devices/shims.d.ts
index a8ef14f4..7745a194 100644
--- a/libs/microbit-devices/shims.d.ts
+++ b/libs/microbit-devices/shims.d.ts
@@ -43,7 +43,7 @@ declare namespace devices {
      * @param name TODO
      * @param body TODO
      */
-    //% help=devices/on-gamepad-button weight=40 shim=micro_bit::onGamepadButton
+    //% help=devices/on-gamepad-button weight=40
     //% weight=25
     //% blockId=devices_gamepad_event block="on gamepad button|%NAME" icon="\uf11b" shim=devices::onGamepadButton
     function onGamepadButton(name: MesDpadButtonInfo, body: () => void): void;
@@ -59,7 +59,7 @@ declare namespace devices {
      * Registers code to run when the device notifies about a change of signal strength.
      * @param body TODO
      */
-    //% shim=micro_bit::onSignalStrengthChanged weight=23 help=devices/on-signal-strength-changed
+    //% weight=23 help=devices/on-signal-strength-changed
     //% blockId=devices_signal_strength_changed_event block="on signal strength changed" icon="\uf012" shim=devices::onSignalStrengthChanged
     function onSignalStrengthChanged(body: () => void): void;
 }
diff --git a/libs/microbit/images.cpp b/libs/microbit/images.cpp
index 6ee28086..92b1b74e 100644
--- a/libs/microbit/images.cpp
+++ b/libs/microbit/images.cpp
@@ -27,7 +27,7 @@ namespace ImageMethods {
      * @param xOffset TODO
      */
     //% help=images/show-image weight=80 async
-    //% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8
+    //% BUGblockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8
     void showImage(Image i, int xOffset = 0) {
       uBit.display.print(MicroBitImage(i), -xOffset, 0, 0);
     }
@@ -38,7 +38,7 @@ namespace ImageMethods {
      * @param interval time between each animation step in milli seconds, eg: 200
      */
     //% help=images/show-image weight=79 async
-    //% blockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8
+    //% BUGblockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8
     void scrollImage(Image id, int frameOffset = 0, int interval = 200) {
       MicroBitImage i(id);
       if (i.getWidth() <= 5)
diff --git a/libs/microbit/shims.d.ts b/libs/microbit/shims.d.ts
index 52adeccd..0852cea2 100644
--- a/libs/microbit/shims.d.ts
+++ b/libs/microbit/shims.d.ts
@@ -111,7 +111,7 @@ declare interface Image {
      * @param xOffset TODO
      */
     //% help=images/show-image weight=80 async
-    //% blockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8 xOffset.defl=0 shim=ImageMethods::showImage
+    //% BUGblockId=device_show_image_offset block="show image %sprite|at offset %offset" blockGap=8 xOffset.defl=0 shim=ImageMethods::showImage
     showImage(xOffset?: number): void;
 
     /**
@@ -120,7 +120,7 @@ declare interface Image {
      * @param interval time between each animation step in milli seconds, eg: 200
      */
     //% help=images/show-image weight=79 async
-    //% blockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8 frameOffset.defl=0 interval.defl=200 shim=ImageMethods::scrollImage
+    //% BUGblockId=device_scroll_image block="scroll image %sprite|with offset %frameoffset|and interval (ms) %delay" blockGap=8 frameOffset.defl=0 interval.defl=200 shim=ImageMethods::scrollImage
     scrollImage(frameOffset?: number, interval?: number): void;
 
     /**