From b2bf898e724902d152dd44010b9063ece70ee07d Mon Sep 17 00:00:00 2001
From: Jaidyn Ann <jadedctrl@teknik.io>
Date: Thu, 8 Oct 2020 22:58:25 -0500
Subject: [PATCH] New tiles; figuring out PPU bg attribute table

---
 Makefile       |   2 ++
 doc/screen.png | Bin 0 -> 5451 bytes
 sbp.mfk        |  27 ++++++++++++++-------------
 sbp.nes        | Bin 40976 -> 40976 bytes
 tileset.chr    | Bin 8192 -> 8192 bytes
 5 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 doc/screen.png

diff --git a/Makefile b/Makefile
index 5635260..0ce1161 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,4 @@
+test:  all
+	tenes -scale -reset sbp.nes
 all:
 	millfork -t nes_small sbp.mfk
diff --git a/doc/screen.png b/doc/screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c3605e10da0b07ddd378e2eca62505cd233d7d4
GIT binary patch
literal 5451
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
I8+_!y0Ai^QjQ{`u

literal 0
HcmV?d00001

diff --git a/sbp.mfk b/sbp.mfk
index 60433f8..02ac01f 100644
--- a/sbp.mfk
+++ b/sbp.mfk
@@ -49,15 +49,22 @@ volatile Gamestate gamestate // the current Gamestate
 // CONSTANTS
 // ============================================================================
 const array pallete = [
-  $22,$29,$1A,$0F,  $22,$36,$17,$0F,  $22,$30,$21,$0F,  $22,$27,$17,$0F, 
+  $22,$29,$1A,$0F,
+  // construction-blocks
+  $00,$06,$07,$16,
+  // construction-bricks
+  $16,$06,$07,$00,
+  $22,$27,$17,$0F, 
   $22,$1C,$15,$14,
   $0F,$18,$28,$0F,   // sam
   $0F,$28,$29,$0F,  // enemies
   $03,$07,$05,$03  // angry owo
 ]
 
+// palette selections for the 16x16 ppu tiles
+// %DownRight DownLeft TopRight TopLeft
 const array attribute = [
-  %00000101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101,
+  %01010101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101,
   %00000101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101,
   %00000101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101, %00000101
 ]
@@ -164,8 +171,6 @@ void nmi() {
 }
 
 // run at each interrupt request
-// ``an irq temporarily stops a program, running an interupt handler instead''
-// thanks wikipedia
 // do I know when these are called on the nes? absolutely not
 // at reset? maybe?
 void irq() {
@@ -380,8 +385,8 @@ macro void load_ingame_attr_table() {
 	byte i
 	read_ppu_status() // read PPU status to reset the high/low latch
 	ppu_set_addr(ppu_nametable_0_attr_ram) // point the PPU to nametable 0's attribute table
-	for i,0,until,$10 {
-		ppu_write_data(attribute[i])
+	for i,0,until,$37 {
+		ppu_write_data(attribute[0])
 	}
 }
 
@@ -440,9 +445,6 @@ inline void load_sky_background() {
 	word xx
 	read_ppu_status() // read PPU status to reset the high/low latch
 	ppu_set_addr(ppu_nametable_ram) // point the PPU to palette ram
-	for xx,0,until,$0060 {
-		ppu_write_data($92) // $00 = sky
-	}
 	for xx,0,until,$0300 {
 		ppu_write_data($00) // $00 = sky
 	}
@@ -459,19 +461,18 @@ macro void draw_score_text_background() {
 
 macro void draw_boundaries_background() {
 	byte i
-	
 	//draw top boundary
 	read_ppu_status() // read PPU status to reset the high/low latch
 	ppu_set_addr(ppu_nametable_ram+$40) // point the PPU to the top boundary's start
 	for i,0,until,$20 {
-		ppu_write_data($81) //write the top boundary tile
+		ppu_write_data($80) //write the top boundary tile
 	}
 	
 	//draw bottom boundary
 	read_ppu_status() // read PPU status to reset the high/low latch
 	ppu_set_addr(ppu_nametable_ram+$02C0) // point the PPU to the top boundary's start
-	for i,0,until,$20 {
-		ppu_write_data($80) //write the bottom boundary tile
+	for i,0,until,$80 {
+		ppu_write_data($83) //write the bottom boundary tile
 	}
 }
 
diff --git a/sbp.nes b/sbp.nes
index e69ff48739644bd99eebfe177eb9f937743dff05..d602ee4870db9f3b64b8e1343586613907d7e3d1 100644
GIT binary patch
delta 984
zcmY*X-%C?b9KYw>Uz@t!$?kr*ZtQHLIWdAtQz@JkBr(DlA$*7tVXOWCUxGHbqYDux
z=Sc`0Yd1PV;P6R7RIG<<5qpZ>!azZKP?G4$Zs%@yX@~p$-t+l>zTfZpp6~Y*HerE%
z=U&{JO1RQV)SsnXi9_Q#)Qi!toQ@2o;G%FYz|q4w8KV7kl5%q#VhSLnW!^zVQ3)Ym
zhH}_j_O8O0b28fZ>Rv;u9$9R>!M4$~MYZW|2C5!g)MhDK4{W0svkflY;M(h4gpOHM
zM2{HPs>k)}=643Y{aN%W#}17$X|J0}03hhgko#cZUhh<~wIUech)=Msmu>lFcaf_I
z{RdK!n->z@wzX<o;aRKDu-d-l8}Rko5zd0Yman;y51fs3)gyyX?0h5!&x3Aq2X;L8
zo*!9%ogYb_?ch?*Y6Mprs$W(sYpc)l)_pZyV{JOJTRdBe)E(5ay8653pz5m8TyJr0
z0AvS-fRF6KuvQy}N`aNfa<khVwkAOk9|q$j&cA2QqVUjjkVWAv^YzE?GC^0!q|l|#
z;G$TOjKM;)E@45Jv53-SMd<WDpJvtLpdO6z)h2pa4lZyo@qru)f#%w&p>k+-FHc%U
z?_*ykNd+uXh-LZ)yJ;RP^fPW@e;0a`qoX#pW>ahbs3d!DY8>@VCI7E%nmsxd>S2$I
zZTyhctir@oGAj;&o8+T-9sb0`DP00RWI%ca*2x#C2ZRYPM}doU$`dzAGex!1WH^>(
zR#!*DhAj*_PN9dvmQ$!Q=&>L%<g1{c{E-Kl9&n8IhNe@PPhptCAceWq+tgAj9*u<*
zPLln8N#>##0!mc#sY<X*QMzIZFN^#b*>b3oD2jca(8^cG<w-K?j7rD&AbUGchMoSE
z&h(GK(Dp=-<2ch~DmbxiE-oxATC$tT>{_yDuU&hYnT-vz<>bUPx3)~v?OqvnZpwcF
DY(`@^

delta 1092
zcmZ`%&ubGw6yDk0>?Tdqjb`)Hn9Oc%ZBb|uEm|r~Z$%gFrL^=EL__=w%%RY<&BhcB
zB+f|?2_cJ)SZJsSIS7STbU|VNfP#wHQUn|E(vxvEyZuFR*qt}u`{vEO_q{2t(IxVo
znY*{3c(O@2vxuoG1!r?`N`*mHgSt@iV7eHj@NSW(;Z8P*sUii*1R#vhFVhgiDukhV
zOsT$_uW@dv$ipq4=F_7_(_|C-Y#7g*R9Fk^(D-9gYgO3_4CBG<39j4Xq?*)NE|{#O
zNxIi)S_zgv4Etsl;jbLIS0;bA<whcaQac$Zak}smGtg<!TQ1G1CyiarrBlWZ8Uokk
zsfEg^I;(>wqmZSKESZ(A3RP#X?r;^V%qj{h1OH9M;#lK2XL()w5sVdKdrN`#dG37{
z*ysHQexM+pK1=2vx@V4E8h`h`FrGZB>8G424OJbr%8%Bfjbgj}s1_x{HEq!!RV8bK
zSQ8uJw&<cJ>TXN)gO-RGm<pJbEqb<U3oGI)M>))rwpv%)?K~M9H+zZx(s3}0V$22z
zq3_HcuR90F7Rfz<#0~PpNi@m!iCC>T>YP4Ya%-H*YP{-zRa9ns1JCoMS~aAF`Wd4G
z@76+3DO%Y^pV{DCyKj+Nq`|lAiD(i1v{ldRcC|^&svM?O9)DE3a6uJtQ|%<y1M@jN
zVN;tnwRu1#$@>)(aC#wmJkLCN#3HT5y&kd%(3k@RDv!~9$0)dquw#T4^Jv>K0B)fm
z_Y8bNZ@7zK41MEdFo0M-b$#PuMXYz|&J~^{)}z?4lR)Po^b**42t@+DCPXjz%U}j=
z^21~fIwx+A<kKpXR_U|~(khjHnSPZ{$o&yP9tsNbpd`rWiH-V2A=D=bef<K%I~d1*
z#<X{2^{w;L1J0j!=TZeExdN-b*`L99tCh*b;&iLkqR4O%8;fQ35;m@ojXy3Bz{g{m
ejP0a|{koTl#fWXKr$QvI9UV%ow^k*W!TkfD@r9-U

diff --git a/tileset.chr b/tileset.chr
index c313e3e280d21b9ac6a76391e6e3caa20e350198..79d06dd68bd7313749546b4512c43b73d022bf53 100644
GIT binary patch
delta 80
zcmZp0XmHrTC}Dp%O@e`e;s1XiA(3|Y|NNOV=Y#OW#>R&rJRb@kLc#yW{rms({Qdj?
V|G|U*|MT%}Hk3TiHravYBLI>lEvEng

delta 92
zcmZp0XmHrTC?Ws<e?^6yJk$UG{~3UQ6-dj;Rs3*(@)t}tWO=F$<gm-jRa8I)8G!VI
c9~E+PK>GjTGzp+Sux^R8!~ZusN?c$A0JRz`3IG5A