Fixed bad macros.

jacobly0 · jacobly0 · commit 497520e7604a · 2017-07-24T12:13:12.000-04:00
diff --git a/examples/gfx_rletsprite/src/main.c b/examples/gfx_rletsprite/src/main.c
@@ -39,7 +39,7 @@ void main(void) {
     gfx_Begin();
 
     /* Set up the palette for our sprites */
-    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal);
+    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal, 0);
     gfx_palette[255] = gfx_RGBTo1555(192, 192, 192);
 
     /* Set a centered 192*192 clip region, bordered by gray and filled with color index 0 */
diff --git a/examples/gfx_sprite/src/main.c b/examples/gfx_sprite/src/main.c
@@ -18,7 +18,7 @@ void main(void) {
     gfx_Begin();
     
     /* Set up the palette for our sprites */
-    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal);
+    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal, 0);
     
     /* Fill the screen with color index 0 */
     gfx_FillScreen(0);
diff --git a/examples/gfx_sprite_compress/src/main.c b/examples/gfx_sprite_compress/src/main.c
@@ -29,7 +29,7 @@ void main(void) {
     gfx_Begin();
 
     /* Set up the palette */
-    gfx_SetPalette(all_gfx_pal, sizeof_all_gfx_pal);
+    gfx_SetPalette(all_gfx_pal, sizeof_all_gfx_pal, 0);
     gfx_FillScreen(0);
 
     /* Draw the decompressed sprite */
diff --git a/examples/gfx_sprite_keys/src/main.c b/examples/gfx_sprite_keys/src/main.c
@@ -42,7 +42,7 @@ void main(void) {
     gfx_Begin();
     
     /* Set up the palette for our sprites */
-    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal);
+    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal, 0);
     
     /* Start at 0, 0 */
     x = 0;
diff --git a/examples/gfx_sprite_rotate/src/main.c b/examples/gfx_sprite_rotate/src/main.c
@@ -18,7 +18,7 @@ void main(void) {
     gfx_Begin();
     
     /* Setup the palette used by the sprites*/
-    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal);
+    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal, 0);
     
     gfx_Sprite(ubuntu, 42, 42);
     gfx_Sprite(gfx_FlipSpriteY(ubuntu, sprite_buffer), 74, 74);
diff --git a/examples/gfx_sprite_rotate_scale/src/main.c b/examples/gfx_sprite_rotate_scale/src/main.c
@@ -23,7 +23,7 @@ void main(void) {
     gfx_Begin();
     
     /* Setup the palette used by the sprites*/
-    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal);
+    gfx_SetPalette(logo_gfx_pal, sizeof_logo_gfx_pal, 0);
 
     /* Loop for a bunch of times */
     for (x = 0; ++x;) {
diff --git a/examples/gfx_sprites_appvar/src/main.c b/examples/gfx_sprites_appvar/src/main.c
@@ -25,7 +25,7 @@ void main(void) {
     gfx_Begin();
     
     /* Set up the palette for the sprite */
-    gfx_SetPalette(all_gfx_pal, sizeof_all_gfx_pal);
+    gfx_SetPalette(all_gfx_pal, sizeof_all_gfx_pal, 0);
     
     /* Fill the screen with color index 0 */
     gfx_FillScreen(0);
diff --git a/examples/gfx_tilemap/src/main.c b/examples/gfx_tilemap/src/main.c
@@ -53,7 +53,7 @@ void main(void) {
     gfx_Begin();
     
     /* Set up the palette */
-    gfx_SetPalette(tiles_gfx_pal, sizeof_tiles_gfx_pal);
+    gfx_SetPalette(tiles_gfx_pal, sizeof_tiles_gfx_pal, 0);
     gfx_SetColor(gfx_white);
     
     /* Draw to buffer to avoid tearing */
diff --git a/examples/gfx_tilemap_appvar/src/main.c b/examples/gfx_tilemap_appvar/src/main.c
@@ -57,7 +57,7 @@ void main(void) {
     gfx_Begin();
     
     /* Set up the palette */
-    gfx_SetPalette(tiles_gfx_pal, sizeof_tiles_gfx_pal);
+    gfx_SetPalette(tiles_gfx_pal, sizeof_tiles_gfx_pal, 0);
     gfx_SetColor(gfx_white);
     
     /* Draw to buffer to avoid tearing */
diff --git a/examples/gfx_tilemap_compress/src/main.c b/examples/gfx_tilemap_compress/src/main.c
@@ -70,7 +70,7 @@ void main(void) {
     gfx_Begin();
 
     /* Set up the palette */
-    gfx_SetPalette(tiles_gfx_pal, sizeof_tiles_gfx_pal);
+    gfx_SetPalette(tiles_gfx_pal, sizeof_tiles_gfx_pal, 0);
     gfx_SetColor(gfx_white);
 
     /* Draw to buffer to avoid tearing */
diff --git a/src/graphx/graphx.asm b/src/graphx/graphx.asm
@@ -345,14 +345,10 @@ _Begin:
 	ld	(UseLargeFont_SMC),a \.r    ; store the jump offset for later
 	ld	(hl),0                      ; jump nowhere if false
 	call	_boot_ClearVRAM             ; clear the screen
-	pop	bc
-	pop	de
-	ld	a,e                         ; a = bpp mode
-	push	de
-	push	bc
 	ld	hl,currDrawBuffer
 _:	ld	de,vram
 	ld	(hl),de                     ; set the current draw to the screen
+	ld	a,lcdBpp8
 	ld	(mpLcdCtrl),a
 	ld	l,mpLcdIcr&$FF
 	ld	(hl),4                      ; allow interrupts status for double buffering
diff --git a/src/graphx/graphx.h b/src/graphx/graphx.h
@@ -247,16 +247,9 @@ gfx_rletsprite_t *name = (gfx_rletsprite_t *)name##_data
 
 /**
  * Initializes the graphics library setup
- * @param mode Mode to start the library in
- * @see gfx_mode_t
  */
-int gfx_Begin(gfx_mode_t mode);
+int gfx_Begin();
     
-/**
- * Helper macro to easily initialize the graphics library setup
- */
-#define gfx_Begin() gfx_Begin(0x27)
-
 /**
  * Closes the graphics setup
  *
@@ -472,14 +465,6 @@ void gfx_SetDefaultPalette(gfx_mode_t mode);
  */
 void gfx_SetPalette(uint16_t *palette, uint24_t size, uint8_t offset);
 
-/**
- * Helper macro to initialize the palette with a default offset of 0
- *
- * @param palette Pointer to palette to use
- * @param size Size of palette to store
- */
-#define gfx_SetPalette(palette, size) gfx_SetPalette(palette, size, 0)
-
 /**
  * Fills the screen with a given palette index
  *
