Fixed warp mario holding in cannon using wrong sprite at room start.

Fixed blocks occasionally getting bumped when Mario falls to the side of them.

Author: HelloFangaming

objects/obj_blockparent.object.gmx

@@ -133,6 +133,7 @@ vspeed = 2
 if ready = 0
 and collision_rectangle(bbox_left,bbox_bottom,bbox_right,bbox_bottom+1,obj_mario,0,0)
 and obj_mario.state = 2
+and obj_mario.vspeed <= 0
 {
 
     //The block is hit

objects/obj_warpmario.object.gmx

@@ -106,11 +106,32 @@ gravity = 0.25
           <argument>
             <kind>1</kind>
             <string>///Launch Mario out of a diagonal pipe cannon
+
+//Explosion sound
 audio_play_sound(snd_explode,0,0)
+
+//Launch up and to the right
 hspeed = 4
 vspeed = -4
+
+//Make visible
 visible = 1
 
+//Choose the appropriate sprite
+if holding = 0
+    sprite_index = scr_mariorunjump()
+else
+    sprite_index = scr_mariohold()
+
+//Do not animate
+image_speed = 0
+
+//Choose the appropriate image index
+image_index = 0
+
+//Face right
+direct = 1
+
 //Enable gravity
 alarm[3] = 30
 </string>
@@ -136,9 +157,24 @@ alarm[3] = 30
           <argument>
             <kind>1</kind>
             <string>///Launch Mario out of a pipe cannon
+
+//Explosion sound
 audio_play_sound(snd_explode,0,0)
+
+//Launch upwards
 vspeed = -4
+
+//Make visible
 visible = 1
+
+//Choose the appropriate sprite
+sprite_index = scr_mariowarp()
+
+//Do not animate
+image_speed = 0
+
+//Choose the appropriate image index
+image_index = 0
 </string>
           </argument>
         </arguments>
@@ -447,21 +483,6 @@ if cannon = 0
     //Stop moving
     speed = 0
 
-    //Choose the appropriate sprite
-    if holding = 0
-        sprite_index = scr_mariorunjump()
-    else
-        sprite_index = scr_mariohold()
-
-    //Do not animate
-    image_speed = 0
-
-    //Choose the appropriate image index
-    image_index = 0
-
-    //Face right
-    direct = 1
-
     //Begin launch
     alarm[2] = 30
 
@@ -500,15 +521,6 @@ if cannon = 0
     //Stop moving
     speed = 0
 
-    //Choose the appropriate sprite
-    sprite_index = scr_mariowarp()
-
-    //Do not animate
-    image_speed = 0
-
-    //Choose the appropriate image index
-    image_index = 0
-
     //Begin launch
     alarm[1] = 16