Update documentation and colors

5 files changed, 49 insertions, 54 deletions

diff --git a/src/gba/gba.h b/src/gba/gba.h
index 37b8a4c..d607eee 100644
--- a/src/gba/gba.h
+++ b/src/gba/gba.h
@@ -101,15 +101,15 @@ typedef Color Palette[16];
 #define RGB15(R,G,B) (u16)(((B) << 10) | ((G) << 5) | (R))
 
 // Some nice default colors.
-#define COLOR_BLACK  RGB15(0,  0, 0)
-#define COLOR_RED    RGB15(31, 0,10)
-#define COLOR_GREEN  RGB15(31, 0,10)
-#define COLOR_YELLOW RGB15(31, 0,10)
-#define COLOR_BLUE   RGB15(2, 17,31)
-#define COLOR_PURPLE RGB15(2, 17,31)
-#define COLOR_CYAN   RGB15(0, 27,30)
-#define COLOR_GREY   RGB15(16,17,19)
-#define COLOR_WHITE  RGB15(28,28,28)
+#define COLOR_BLACK  RGB15( 0,  0,  0)
+#define COLOR_RED    RGB15(31,  0, 10)
+#define COLOR_GREEN  RGB15( 0, 31, 18)
+#define COLOR_YELLOW RGB15(31, 31,  0)
+#define COLOR_BLUE   RGB15( 2, 17, 31)
+#define COLOR_PURPLE RGB15(15,  7, 31)
+#define COLOR_CYAN   RGB15( 0, 27, 30)
+#define COLOR_GREY   RGB15(16, 17, 19)
+#define COLOR_WHITE  RGB15(28, 28, 28)
 
 //
 // Tile memory access.
diff --git a/src/main.c b/src/main.c
index f99371d..522ef70 100644
--- a/src/main.c
+++ b/src/main.c
@@ -92,7 +92,7 @@ test_icn(void) {
 
     for (size_t y = 10; y < 20; y++) {
         for (size_t x = 10; x < 20; x++) {
-            draw_icn(8 + x * 8, 2 + y * 8, tile, 5, 0, 1);
+            draw_icn(8 + x * 8, 2 + y * 8, tile, 7, 0, 1);
         }
     }
 }
diff --git a/src/renderer.c b/src/renderer.c
index 172ea22..495585e 100644
--- a/src/renderer.c
+++ b/src/renderer.c
@@ -18,6 +18,32 @@
 #include "renderer.h"
 #include "text.h"
 
+// The frontbuffs,eer is located at the beginning of the VRAM, and requires 20KB of
+// video memory for 32 * 20 tiles at 4bpp.
+#define FRONTBUF ((u32*)(MEM_VRAM))
+
+// Adjust both of these if the location of the map changes. Each screnblock
+// requires less than 2KB.
+#define FRONTBUF_TILEMAP ((u16*)(MEM_VRAM + KB(20)))
+#define FRONTBUF_SB      10
+
+// The backbuffer is located at the end of the VRAM. This can allow us to use
+// more backgrounds but eats into the available memory for sprites. This should
+// be fine for non sprite intensive applications. If more sprite memory is
+// needed, the backbuffer can be located at the end of the background memory
+// instead (64KB - 20KB).
+#define BACKBUF  ((u32*)(MEM_VRAM + KB(96) - KB(20)))
+
+// The font data is located at the end of the frontbuffer memory, after the tile
+// map and requires 8KB for 256 8x8 characters at 4bpp. This, along with the
+// tilemap information allow us to store the frontbuffer and font for a text
+// background in the first 2 charblocks (32KB).
+#define FONT_DATA    ((u32*)(MEM_VRAM + KB(96) - KB(8)))
+#define FONT_TILEMAP ((u16*)(MEM_VRAM + KB(96) - KB(8) - KB(1)))
+#define FONT_SB      15
+#define FONT_OFFSET  192
+
+
 // Keep track of which tiles need to be copied to the frontbuffer.
 static u32 dirty_tiles[21] = {0};
 
diff --git a/src/renderer.h b/src/renderer.h
index f47b364..cf490d3 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -3,31 +3,6 @@
 
 #include "gba/gba.h"
 
-// The frontbuffs,eer is located at the beginning of the VRAM, and requires 20KB of
-// video memory for 32 * 20 tiles at 4bpp.
-#define FRONTBUF ((u32*)(MEM_VRAM))
-
-// Adjust both of these if the location of the map changes. Each screnblock
-// requires less than 2KB.
-#define FRONTBUF_TILEMAP ((u16*)(MEM_VRAM + KB(20)))
-#define FRONTBUF_SB      10
-
-// The backbuffer is located at the end of the VRAM. This can allow us to use
-// more backgrounds but eats into the available memory for sprites. This should
-// be fine for non sprite intensive applications. If more sprite memory is
-// needed, the backbuffer can be located at the end of the background memory
-// instead (64KB - 20KB).
-#define BACKBUF  ((u32*)(MEM_VRAM + KB(96) - KB(20)))
-
-// The font data is located at the end of the frontbuffer memory, after the tile
-// map and requires 8KB for 256 8x8 characters at 4bpp. This, along with the
-// tilemap information allow us to store the frontbuffer and font for a text
-// background in the first 2 charblocks (32KB).
-#define FONT_DATA    ((u32*)(MEM_VRAM + KB(96) - KB(8)))
-#define FONT_TILEMAP ((u16*)(MEM_VRAM + KB(96) - KB(8) - KB(1)))
-#define FONT_SB      15
-#define FONT_OFFSET  192
-
 // Draws a pixel to the given (x, y) position on the framebuffer. All drawing
 // functions use paletted colors (clr: 0-15).
 void draw_pixel(size_t x, size_t y, u8 clr);
@@ -44,7 +19,14 @@ void draw_filled_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr);
 // Fills the framebuffer with the given color.
 void screen_fill(u8 clr);
 
-// Copies the content of dirty tiles from the backbuffer into the frontbuffer.
+// Draws a chr sprite (16 * u8). The first 8 bytes correspond to ch0 and the
+// last 8 to ch1.
+void draw_chr(size_t x, size_t y, u8 *sprite, u8 flip_x, u8 flip_y);
+
+// Draws a 1bpp icn sprite in the given color.
+void draw_icn(size_t x, size_t y, u8 *sprite, u8 clr, u8 flip_x, u8 flip_y);
+
+// Copies data and performs page flipping if needed.
 // To be called exactly once at the beginning of the VBlank.
 void flip_buffer(void);
 
diff --git a/src/renderer_m4.c b/src/renderer_m4.c
index 4cca97c..21dc192 100644
--- a/src/renderer_m4.c
+++ b/src/renderer_m4.c
@@ -186,22 +186,6 @@ draw_filled_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
     screen_updated = true;
 }
 
-IWRAM_CODE
-static inline
-u64
-decode_tile_u64(u32 *data) {
-    u64 mask =
-        (((u64)*data >> 0)  * 0xF & 0xF) << 0  |
-        (((u64)*data >> 4)  * 0xF & 0xF) << 8  |
-        (((u64)*data >> 8)  * 0xF & 0xF) << 16 |
-        (((u64)*data >> 12) * 0xF & 0xF) << 24 |
-        (((u64)*data >> 16) * 0xF & 0xF) << 32 |
-        (((u64)*data >> 20) * 0xF & 0xF) << 40 |
-        (((u64)*data >> 24) * 0xF & 0xF) << 48 |
-        (((u64)*data >> 28) * 0xF & 0xF) << 56;
-    return mask;
-}
-
 static u32 dec_nibble[] = {
     0x00000000, 0x01000000, 0x00010000, 0x01010000,
     0x00000100, 0x01000100, 0x00010100, 0x01010100,
@@ -349,7 +333,7 @@ flip_buffer(void) {
 
 #include "font.h"
 
-// Font rendering function for the text engine..
+// Font rendering function for the text engine.
 void
 txt_drawc(char c, size_t x, size_t y, u8 clr) {
     u8 *tile = font_icn;
@@ -370,7 +354,10 @@ renderer_init(void) {
     PAL_BUFFER_BG[2] = COLOR_RED;
     PAL_BUFFER_BG[3] = COLOR_BLUE;
     PAL_BUFFER_BG[4] = COLOR_CYAN;
-    PAL_BUFFER_BG[5] = COLOR_GREY;
+    PAL_BUFFER_BG[5] = COLOR_PURPLE;
+    PAL_BUFFER_BG[6] = COLOR_YELLOW;
+    PAL_BUFFER_BG[7] = COLOR_GREEN;
+    PAL_BUFFER_BG[8] = COLOR_GREY;
 
     // Initialize text engine.
     txt_init(txt_drawc);