missing comma in cc65 output

yeastplume · Feb 21, 2020 · 2ff3ef5 · 2ff3ef5
1 parent 87b9076
commit 2ff3ef5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/samples/bitmap/Makefile b/samples/bitmap/Makefile
@@ -12,6 +12,7 @@ project.av: $(RESOURCES)
 	$(ALOEVERA) -p project.av bitmap init kq5_bmp kq5_screen
 	$(ALOEVERA) -p project.av asm ./output/ all
 	$(ALOEVERA) -p project.av asm -f basic ./output/ all
+	#$(ALOEVERA) -p project.av asm -f cc65 ./output/ all
 	#$(ALOEVERA) create sd_image kq5.img
 	#$(ALOEVERA) -p project.av asm -f bin ./output/ select -a 0x2200 kq5_bmp kq5_bmp.bin
 

diff --git a/samples/sprites/Makefile b/samples/sprites/Makefile
@@ -12,7 +12,6 @@ project.av: $(RESOURCES)
 	$(ALOEVERA) -p project.av sprite init terra_sprite terra_imageset
 	$(ALOEVERA) -p project.av asm ./output/ all
 	$(ALOEVERA) -p project.av asm -f basic ./output/ all
-	$(ALOEVERA) -p project.av asm -f cc65 ./output/ all
 	$(ALOEVERA) -p project.av asm -f bin ./output/ all
 #	$(ALOEVERA) create sd_image terra.img
 #	$(ALOEVERA) -p project.av asm -f bin ./output/ -s terra.img all

diff --git a/samples/tile_text/Makefile b/samples/tile_text/Makefile
@@ -13,6 +13,7 @@ project.av: $(RESOURCES)
 	$(ALOEVERA) -p project.av tilemap load -p palette_tilemap -x 1 -y 10 -c 6 tilemap_1 tilemap-banner-1bpp.png
 	$(ALOEVERA) -p project.av asm ./output/ all
 	$(ALOEVERA) -p project.av asm -f basic ./output/ all
+#	$(ALOEVERA) -p project.av asm -f cc65 ./output/ all
 
 generate_resources: project.av
 

diff --git a/vera/src/asm.rs b/vera/src/asm.rs
@@ -233,7 +233,7 @@ impl AssembledPrimitive {
 						.into());
 					}
 				};
-				if j < 7 && index < self.data.len() - 1 {
+				if (j < 7 || out_format == AsmFormat::Cc65) && index < self.data.len() - 1 {
 					curval += ",";
 				}
 			}