diff options
| -rw-r--r-- | init.gbasm | 2 | ||||
| -rw-r--r-- | main.gbasm | 26 | ||||
| -rw-r--r-- | scripts/generate-tiledata.py | 4 | ||||
| -rw-r--r-- | sprites/bg/heart.png | bin | 0 -> 126 bytes | |||
| -rw-r--r-- | tiles.gbasm | 2 | ||||
| -rw-r--r-- | tileset.gbasm | 4 |
6 files changed, 27 insertions, 11 deletions
@@ -64,7 +64,7 @@ Empty_VRAM: ; (Clear screen) LD $reg_interrupt_enable, A ; LYC - LD A, $0a + LD A, $09 LD $reg_lyc, A ; Set STAT interrupt to LYC = LY @@ -32,25 +32,33 @@ VBLANK_Entrypoint: LD $reg_viewport_y, A LD $reg_viewport_x, A - LD HL, $9c00 - LD A, $99 + LD HL, $9c01 + LD A, $mem_bunny_health CALL =Print_8bit + LD A, $68 + LD (HL), A + CALL =Display_Prepared_Block CALL =Display_Object CALL $OAM_DMA_Transfer_routine - RETI -STAT_Entrypoint: + LD A, $mem_prepared_viewport_x + LD B, A + LD A, $mem_prepared_viewport_y + LD C, A LD A, $reg_lcd_controller AND $9f OR $02 - LD $reg_lcd_controller, A + EI + HALT + RETI - LD A, $mem_prepared_viewport_x +STAT_Entrypoint: + LD $reg_lcd_controller, A + LD A, B LD $reg_viewport_x, A - - LD A, $mem_prepared_viewport_y + LD A, C LD $reg_viewport_y, A CALL =Object_Interactions_Check @@ -61,7 +69,7 @@ STAT_Entrypoint: CALL =Prepare_Scrolling_Map CALL =Display_Entities - RETI + RET .INCLUDE "tiles.gbasm" .INCLUDE "rng.gbasm" diff --git a/scripts/generate-tiledata.py b/scripts/generate-tiledata.py index 25c79ce..d0a963b 100644 --- a/scripts/generate-tiledata.py +++ b/scripts/generate-tiledata.py @@ -19,6 +19,10 @@ get_sprite_png_parse_output("./sprites/bg/stairs.png") print("\n\t; Carrot") get_sprite_png_parse_output("./sprites/bg/carrot.png") +print("Small_sprites:") +print("\n\t; Heart") +get_sprite_png_parse_output("./sprites/bg/heart.png") + sprite_idx = 0x02 print("\nOBJ_Tile_Image_Data:") print("\n\t; Bunny side") diff --git a/sprites/bg/heart.png b/sprites/bg/heart.png Binary files differnew file mode 100644 index 0000000..cd787da --- /dev/null +++ b/sprites/bg/heart.png diff --git a/tiles.gbasm b/tiles.gbasm index 6c902d4..48c5f91 100644 --- a/tiles.gbasm +++ b/tiles.gbasm @@ -24,7 +24,7 @@ Load_Tile: CALL =Load_Number_Font LD HL, $9200 LD DE, =BG_Tile_Image_Data - LD BC, $0480 + LD BC, $0490 CALL =memcpy RET diff --git a/tileset.gbasm b/tileset.gbasm index 854e33e..235521b 100644 --- a/tileset.gbasm +++ b/tileset.gbasm @@ -77,6 +77,10 @@ BG_Tile_Image_Data: .DB $00, $00, $30, $30, $58, $68, $b4, $fc, $fe, $aa, $ac, $f4, $58, $b8, $a0, $e0 ; 0x65 .DB $1f, $10, $1f, $10, $3e, $21, $3c, $23, $7b, $47, $7c, $4c, $70, $70, $00, $00 ; 0x66 .DB $c0, $40, $a0, $60, $20, $e0, $c0, $c0, $00, $00, $00, $00, $00, $00, $00, $00 ; 0x67 +Small_sprites: + + ; Heart + .DB $00, $00, $6c, $6c, $fe, $fe, $fe, $fe, $7c, $7c, $38, $38, $10, $10, $00, $00 ; 0x68 OBJ_Tile_Image_Data: |
