Use 16 color palette for BG1

vivi168 · Sep 27, 2022 · b47038e · b47038e
1 parent bbf5cb6
commit b47038e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 8 deletions.
diff --git a/assets.asm b/assets.asm
@@ -3,7 +3,6 @@
 
 null_byte: .db 00
 
-bg1_tiles:     .incbin assets/bg1.tiles
 bg2_tiles:     .incbin assets/bg2.tiles
 
 bg1_pal:       .incbin assets/bg1.pal

diff --git a/assets/bg1.pal b/assets/bg1.pal
diff --git a/assets/bg1.png b/assets/bg1.png
diff --git a/assets/bg1.tiles b/assets/bg1.tiles
diff --git a/define.inc b/define.inc
@@ -1,7 +1,6 @@
 .define STACK_TOP 1fff
 
 ; assets
-.define BG1_TILES_SIZE      01a0
 .define BG1_SCBR_SIZE_HALF  3000
 .define BG1_SCBR_SIZE       6000
 .define BG2_TILES_SIZE      02e0

diff --git a/superfx/main.asm b/superfx/main.asm
@@ -42,7 +42,9 @@ GSU_clear_buffer:
     nop
 
 
-
+; todo -> argument
+; x0, y0 -> length
+; color
 GSU_Plot_line:
     ;; test plotting
 
@@ -51,7 +53,7 @@ GSU_Plot_line:
     cmode
 
     ; then set COLOR (color, getc)
-    ibt r0,#07
+    ibt r0,#0b
     color
 
     ; then set x, y (r1, r2)

diff --git a/vectors.asm b/vectors.asm
@@ -61,7 +61,6 @@ FastReset:
 
 ;  ---- DMA Transfers
 
-    .call VRAM_DMA_TRANSFER 0000, bg1_tiles, BG1_TILES_SIZE
     .call VRAM_DMA_TRANSFER 3000, bg2_tiles, BG2_TILES_SIZE           ; VRAM[0x2000] (word step)
 
     ; should design a tilemap corresponding to tiles drawn by super FX
@@ -118,10 +117,8 @@ FastNmi_ROM:
     ; find way to transfer full buffer during NMI
     ; split transfer over multiple frame.
     ; .call VRAM_DMA_TRANSFER 0000, screen_base, 1780
-    ; .call VRAM_DMA_TRANSFER 0000, bg1_tiles, BG1_TILES_SIZE
-    ; .call VRAM_DMA_TRANSFER 2800, bg1_buffer, BG1_BUFFER_SIZE
-    ; jsr @TransferOamBuffer ; should relocate this to RAM as well
 
+    ; jsr @TransferOamBuffer ; should relocate this to RAM as well
     ; jsr @ReadJoyPad1 ; should relocate this to RAM as well
 
     inc @vblank_disable