fix tile text sample

yeastplume · Jun 10, 2020 · 8b77330 · 8b77330
1 parent 18dbfc1
commit 8b77330
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/samples/Makefile.vars b/samples/Makefile.vars
@@ -4,5 +4,5 @@
 ALOEVERA = "../../target/debug/aloevera"
 X16_EMU = "../../../x16-emulator/x16emu"
 X16_ROM = "../../../x16-rom/build/x16/rom.bin"
-X16_EMU_FLAGS = -run -scale 2
-#DEBUG = -debug 092B
+X16_EMU_FLAGS = -run -scale 4
+#DEBUG = -debug 9000
diff --git a/samples/tile_text/tile_text.bas b/samples/tile_text/tile_text.bas
@@ -3,7 +3,7 @@
 20 FOR I = 0 TO 511
 40 READ A:POKE $9F23,A:NEXT I
 50 REM PUT THIS BACK FOR JUST TILE BASE RESULT
-60 REM GOTO 1000
+60 GOTO 1000
 100 REM POKE TILEMAP DATA INTO MAP BASE
 101 REM START AT BASE + A02 AS PER PANE DATA
 110 LET C = 0

diff --git a/samples/tile_text/tile_text.s b/samples/tile_text/tile_text.s
@@ -6,21 +6,15 @@ VERA_DATA_PORT = $9F23
 
 .code
 jmp start
-.proc load_tileset
-	lda #$0
-	sta VERA_ADDR
-	lda #$F8
-	sta VERA_ADDR + 1
-	lda #$10
-	sta VERA_ADDR + 2
-
+.proc load_imageset
+	v_address_set $F800, 1
 	set_const_16 $00, imageset
 
-	TARGET = 512 ;loop until 512 reached
+	TARGET = 512 ;loop until size reached
 
 	loop:
 		lda ($00),y
-		sta VERA_DATA_PORT
+		sta VERA_DATA0
 		add_constant_16 $00, 1
 		loop_till_eq_16 $00, (imageset + TARGET), loop
 	rts
@@ -62,14 +56,12 @@ jmp start
 .endproc
 
 start:
-	jsr load_tileset
-	jsr load_tilemap; comment out if you just want to see the tileset result
+	jsr load_imageset
+	jsr load_tilemap; comment out if you just want to see the imageset result
 	rts
 
 .segment "RODATA"
 imageset:
 	.include "output/imagesets/text_set_1.ca65.inc"
 tilemap:
 	.include "output/tilemaps/tilemap_1.ca65.inc"
-	; Or comment out above and comment in below to observe 256 color text mode
-	;.include "output/tilemaps/tilemap_2.ca65.inc"