git.y1.nz

commit c99cabc69d9fdf8e2caff01b42c8d663d6bcd6bf
parent 761897e385ea06de05a227b96e91c78c6db723b9
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Thu, 27 Oct 2022 20:02:46 -0700

Merge pull request #433 from bbbbbr/examples_fix_isr_vector

Fix isr_vector no image displayed to show ISR effect
Diffstat:
M
gbdk-lib/examples/ap/template_minimal/Makefile
2
+-
M
gbdk-lib/examples/gb/isr_vector/lcd_isr_wobble.c
70
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
A
gbdk-lib/examples/gb/isr_vector/res/blanktile.bin
0

A
gbdk-lib/examples/gb/isr_vector/res/gbdk2020.bin
0

A
gbdk-lib/examples/gb/isr_vector/res/gbdk2020_map.bin
0

5 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/gbdk-lib/examples/ap/template_minimal/Makefile b/gbdk-lib/examples/ap/template_minimal/Makefile
@@ -9,7 +9,7 @@ GBDK_HOME = ../../../
 LCC = $(GBDK_HOME)bin/lcc -msm83:ap
 
 # You can uncomment the line below to turn on debug output
-# LCC = $(LCC) -debug
+# LCC += -debug
 
 # You can set the name of the .pocket ROM file here
 PROJECTNAME    = Example
diff --git a/gbdk-lib/examples/gb/isr_vector/lcd_isr_wobble.c b/gbdk-lib/examples/gb/isr_vector/lcd_isr_wobble.c
@@ -1,22 +1,85 @@
-#include <gb/gb.h>
+#include <gbdk/platform.h>
+#include <gbdk/incbin.h>
+#include <stdint.h>
+
+
+// Include for using ISR_VECTOR()
 #include <gb/isr.h>
 
+void init_gfx();
+
+// Wobble Look up Table
 const uint8_t scanline_offsets_tbl[] = {0, 1, 2, 3, 3, 2, 1, 0, 0, 1, 2, 3, 3, 2, 1, 0};
 const uint8_t * scanline_offsets = scanline_offsets_tbl;
 
+// Create the ISR Function
 void scanline_isr() CRITICAL INTERRUPT {
     SCX_REG = scanline_offsets[LY_REG & (uint8_t)7];
 }
+// Then set the LCD Status (scanline) interrupt to call the ISR function
+// directly without using the GBDK interrupt dispatcher
 ISR_VECTOR(VECTOR_STAT, scanline_isr)
 
+// Note:
+//    The LCD STAT vector (@ref VECTOR_STAT) cannot be used
+//    in the same program as `stdio.h` since they install
+//    an ISR vector to the same location.
+
+
 void main() {
-    LCDC_REG |= LCDCF_BG8000;
+
+    // Load the background image
+    init_gfx();
+
+    // Set up the interrupt and enable it
     STAT_REG = STATF_MODE00;
     set_interrupts(VBL_IFLAG | LCD_IFLAG);
+
+    // Show the background
     SHOW_BKG;
 
     while (TRUE) {
         wait_vbl_done();        
         scanline_offsets = &scanline_offsets_tbl[(uint8_t)(sys_time >> 2) & 0x07u];
     }
-}
-
+}
+
+
+
+// ==== Below just loads the background graphics ====
+
+// Some graphics of a game boy
+INCBIN(logo_tiles_data, "res/gbdk2020.bin") // Variable name to use, Path to file
+INCBIN_EXTERN(logo_tiles_data)              // Extern declarations for binary data
+
+INCBIN(logo_map, "res/gbdk2020_map.bin")
+INCBIN_EXTERN(logo_map)
+
+INCBIN(blank_tile_data, "res/blanktile.bin")
+INCBIN_EXTERN(blank_tile_data)
+
+
+#define TILE_BYTES 16 // 16 bytes per background tile
+
+// Since incbin just includes a binary file (the logo tiles)
+// a map needs to be created for them. For this example
+// the tiles are non-deduplciated, so a array of incrementing
+// values can be used. There are 84 tiles.
+#define LOGO_MAP_WIDTH  7u
+#define LOGO_MAP_HEIGHT 12u
+#define LOGO_MAP_X      (20u - LOGO_MAP_WIDTH) / 2u  // Center on X axis
+#define LOGO_MAP_Y      (18u - LOGO_MAP_HEIGHT) / 2u // Center on Y axis
+
+void init_gfx() {
+    // Load a single clear background tile at location 0x80 and clear/fill the map with it
+    set_bkg_data(0x80u, 1u, blank_tile_data); // The first 0x80u here is the tile ID
+    fill_bkg_rect(0u, 0u, DEVICE_SCREEN_BUFFER_WIDTH, DEVICE_SCREEN_BUFFER_HEIGHT, 0x80u);   // The last 0x80u here is the tile ID 
+
+    // Load logo background tiles and map
+    // They start at 0u
+    set_bkg_data(0u, INCBIN_SIZE(logo_tiles_data) / TILE_BYTES, logo_tiles_data);
+    set_bkg_tiles(LOGO_MAP_X, LOGO_MAP_Y,
+                  LOGO_MAP_WIDTH, LOGO_MAP_HEIGHT,
+                  logo_map);
+}
+
diff --git a/gbdk-lib/examples/gb/isr_vector/res/blanktile.bin b/gbdk-lib/examples/gb/isr_vector/res/blanktile.bin
Binary files differ.
diff --git a/gbdk-lib/examples/gb/isr_vector/res/gbdk2020.bin b/gbdk-lib/examples/gb/isr_vector/res/gbdk2020.bin
Binary files differ.
diff --git a/gbdk-lib/examples/gb/isr_vector/res/gbdk2020_map.bin b/gbdk-lib/examples/gb/isr_vector/res/gbdk2020_map.bin
Binary files differ.

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.