Merge branch 'develop-0.16' of https://github.com/catseye/SixtyPical into save-block

eg/c64/demo-game/demo-game.60p

@@ -419,13 +419,11 @@ static byte save_x : 0
         call dispatch_logic
 
         if c {
-            // Player died!  Want no dead!  Break out of the loop (this is a bit awkward.)
+            // Player died!  Want no dead!
             call clear_screen
             copy game_state_game_over, dispatch_game_state
-            ld x, 15
-        } else {
-            ld x, save_x
         }
+        ld x, save_x
 
         copy pos, actor_pos + x
         copy delta, actor_delta + x

loadngo.sh

@@ -5,21 +5,21 @@ usage="Usage: loadngo.sh (c64|vic20|atari2600) [--dry-run] <source.60p>"
 arch="$1"
 shift 1
 if [ "X$arch" = "Xc64" ]; then
-  prelude='c64'
+  output_format='c64-basic-prg'
   if [ -e vicerc ]; then
     emu="x64 -config vicerc"
   else
     emu="x64"
   fi
 elif [ "X$arch" = "Xvic20" ]; then
-  prelude='vic20'
+  output_format='vic20-basic-prg'
   if [ -e vicerc ]; then
     emu="xvic -config vicerc"
   else
     emu="xvic"
   fi
 elif [ "X$arch" = "Xatari2600" ]; then
-  prelude='atari2600'
+  output_format='atari2600-cart'
   emu='stella'
 else
   echo $usage && exit 1
@@ -38,7 +38,7 @@ fi
 ### do it ###
 
 out=/tmp/a-out.prg
-bin/sixtypical --traceback --prelude=$prelude $src > $out || exit 1
+bin/sixtypical --traceback --output-format=$output_format $src > $out || exit 1
 ls -la $out
 $emu $out
 rm -f $out