Merge branch 'master' of https://github.com/yeastplume/aloevera

yeastplume · Feb 20, 2020 · 4939636 · 4939636
2 parents b41e194 + 7ed116c
commit 4939636
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/ex_002.md b/docs/ex_002.md
@@ -73,7 +73,7 @@ The rules and constraints for formatting an Imageset will vary depending on scre
 In 1BPP Layer modes, foreground and background colors for each onscreen tile can be specified during the Tilemap stage. We'll be looking at Tilemaps in the next example, but for now we'll just format this Imageset to 1BPP and not worry too hard about the Palette:
 
 ```.sh
-aloevera -p project.av format text_set_1 palette_1 1
+aloevera -p project.av imageset format text_set_1 palette_1 1
 ```
 
 The first 2 arguments are the ids of the Imageset and Palette specified in earlier commands, while the `1` specifies a target pixel depth of 1BPP (use `aloevera imageset format --help` to see all possible values).
@@ -84,7 +84,7 @@ That should be it for our Imageset import! As before, let's run the `asm` comman
 
 ```.sh
 aloevera -p project.av asm ./output/
-aloevera -p project.av asm -f basic./output/
+aloevera -p project.av asm -f basic ./output/
 ```
 
 Since the X16 starts up in Mode 0, i.e. 1BPP Tiled-Text Mode, we should just be able to replace the cold-boot tileset data with our assembled data and watch the font change. Code to do this is found in the [tile_text sample](../samples/tile_text), and the results are as follows:

diff --git a/docs/ex_004.md b/docs/ex_004.md
@@ -27,7 +27,7 @@ The 'multiple of 16' rule is perhaps the most confusing here. VERA stores palett
 The code and makefile for this example can be found in the [tile_wall sample](../samples/tile_wall), and we'll rush through the Aloevera commands here as there should be nothing new. The Palette can be imported directly from the image data, and the only difference is that we're going to set the tile width/heights to 16 x 16 and we'll format the Imageset to 4BPP, since we have fewer than 16 colours in the palette:
 
 ```.sh
-aloevera -p project.av palette import tile_w all_pal tile_wall-imageset-4bpp.png
+aloevera -p project.av palette import tile_wall_pal tile_wall-imageset-4bpp.png
 aloevera -p project.av imageset import wall_tiles 16 16 tile_wall-imageset-4bpp.png
 aloevera -p project.av imageset format wall_tiles tile_wall_pal 4
 ```