From d5666cd3a6b94cfccb6cccf3dc9de143ef720c62 Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Fri, 20 Apr 2018 13:04:39 -0700
Subject: [PATCH] First pass at inventory menu rendering

---
 Art/Block_001.xcf                             | Bin 696 -> 763 bytes
 Art/block_001.gif                             | Bin 87 -> 104 bytes
 GSCats.xcodeproj/project.pbxproj              |   2 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +++
 SpriteBank00.bin                              | Bin 1826 -> 1851 bytes
 gamemanager.s                                 |   2 +
 gameobject.s                                  |   2 +-
 gscats.2mg                                    | Bin 819264 -> 819264 bytes
 gscats.s                                      |   1 +
 inventory.s                                   |  67 ++++++++++++++++++
 spritebank.s                                  |   2 +-
 11 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 GSCats.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 inventory.s

diff --git a/Art/Block_001.xcf b/Art/Block_001.xcf
index 6188cc2a69669740396cdf501d7f72263b10a4e2..dd1805d3bc77078246090d6c44e4e884304adf26 100644
GIT binary patch
delta 84
gcmdnN`kQq^5+lpT<Ul5O0d_vNf9!0$6cPOF0DH|7DgXcg

delta 17
Ycmey(x`TB>5+n1*<Ul5tdPW9z05#bJrT_o{

diff --git a/Art/block_001.gif b/Art/block_001.gif
index 79025513c05fe28ecf28d6d09c159c00b736ae68..dca532ba929219fb88b409c7bedf281015590804 100644
GIT binary patch
delta 40
ycmV+@0N4LlXpluCAb7gmYB0)qrj_;HtZBF02ZbW}nH{RBn~1p)3p%ut0029e))L$R

delta 23
fcmc}@pWrIQU$N`XKZ8@AtM^*GKD#@flffDQfwKy`

diff --git a/GSCats.xcodeproj/project.pbxproj b/GSCats.xcodeproj/project.pbxproj
index 875780a..923f376 100644
--- a/GSCats.xcodeproj/project.pbxproj
+++ b/GSCats.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXFileReference section */
+		700B5E6F2069831000B31C00 /* inventory.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = inventory.s; sourceTree = "<group>"; };
 		700C39C51F2E5CA800C24F9C /* tables.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = tables.s; sourceTree = "<group>"; };
 		700F21DE1F43E31300D7007D /* input.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = input.s; sourceTree = "<group>"; };
 		700F21DF1F4A364600D7007D /* projectile.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = projectile.s; sourceTree = "<group>"; };
@@ -54,6 +55,7 @@
 				700C39C51F2E5CA800C24F9C /* tables.s */,
 				70E266E31F6F262D005AC7E4 /* circleTable.s */,
 				70F0869F1F413A89002446C3 /* player.s */,
+				700B5E6F2069831000B31C00 /* inventory.s */,
 				700F21DF1F4A364600D7007D /* projectile.s */,
 				70A80FB01F43D7F200BD34C9 /* gamemanager.s */,
 				70E554C41F807ADB00F3C871 /* spritebank.s */,
diff --git a/GSCats.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GSCats.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/GSCats.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/SpriteBank00.bin b/SpriteBank00.bin
index 6da7fb8278ff20f724dd981086f9366e78c7e483..edcef809f3df96948f6eff260f556c07a3dd193b 100644
GIT binary patch
delta 204
zcmZ3)x0_GEdo|ap8cqfVh7#7l%q+~B69pDe&SBhH|Ns9Zg~bavKQu2mWMG}i&LDjY
n2&^+58Kr^Z3_x)PgscPg1=TVM847aN^2zp$x|>y*{;~i7P#I8Z

delta 48
zcmV-00MGxs4x$baOREa1d<g&m09ys*1M311kr1N=|NlE_2a&;qk<bZ~7Xl}dv$?ZA
G0{sM)G!gRv

diff --git a/gamemanager.s b/gamemanager.s
index c3095a8..f0ad2c3 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -50,6 +50,8 @@ beginGameplay:
 	jsr clipTerrain
 	jsl renderTerrainSpans
 
+	jsr renderInventory
+
 gameplayLoop:
 	jsr syncVBL
 	BORDER_COLOR #$0
diff --git a/gameobject.s b/gameobject.s
index ed191b3..02b9cbf 100644
--- a/gameobject.s
+++ b/gameobject.s
@@ -56,7 +56,7 @@ placeGameObjectOnTerrain:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; vramPtr
 ;
-; PARAML0 = Pointer to gameobject data
+; PARAML0 = Pointer to X,Y (16 bits each)
 ; X => Offset to upper left corner of VRAM, or -1 if offscreen
 ;
 ; Trashes SCRATCHL
diff --git a/gscats.2mg b/gscats.2mg
index 565db7d2a798e3e7806d1572900b30b89191d202..3ed4c1338b026c2b145cd4e9d20541e2457a1352 100644
GIT binary patch
delta 1525
zcmb_cUrbw77(e%3`sbFGRRJwD%MQfFVPssk5WvP1>`2GP)&|*wEWv65=iIUZSsH^R
zrj4XoG`Uj)dWY79Z9&>)H*s!R(}yL5_+X<;FvbTlMy3yLwJfFJQb-iPb6dt9eDoyW
zIp6(#|9<Cu=iG(Jp@qnyFZUV3)6WSugnmb6rts*+SN*-+eO<3~o;)r|2qEJ#G9Z@;
z?YQX*k6!Tjj_6KZ%|*Abk%;J?$8M!;2X@^c7i7DOTG7YDkKNF;097Y18<Lj|T;da<
z3>lIqV%#rcZJwsihz{9~lnt7CC@PO=Dkmxhino$SzTlqWIIntoo_nvloovy-(dB+u
zbS$y$cD5y~9jjh-bDrzuyh&G_tFV|thQEa}p+WV3#a&ge-{hvJ3WfdQ?d{+2)mbq&
zIlCyiWD{~O!*I!+oD*;aING&#{QqFJ{9j4uJ8p6OQ%{;0x%sJFp)omlo5L@wm)5yO
zt~>e023J?j+0;pqZ-06;h<~oY`zvt5R*%g0@W8P8t;p|faS_c!>;`<CL<H;^(wc}Q
z;JG2KndAg~Z%8}L*8Gsx!d8KNU|(3#+SR=lzK&~G-4@>2>LNKS{xOJ0Wei0w1o2O@
z*2%J58qyjesz*XS7Y4NvdW?-|jdqSoRhn1*$ii2Ky(IVST#ZBaqr2V2Zk?-n;77+A
z{@GTVNI-Lw+BA=HHpNY@y9xf#8fztin43h_5*$(*NdRYU^`F9K-YyYPyu=b6amb$`
zrJKM`6Wc5i?y)jvO;#Ys0^3Q<MFNoV8m>QIUdr5DLT>B;hoMvp)K$C6`FGy*lC&S?
z)@vEBMM(qNf4o%GOH>vmra%@@plVS81kx0dq5?>Zj(~DsPt`@bLGL0rf6W>=wZX>k
z3+L%fhG-jfCQGzDwZNDeq42G1V^k~X8vBCFu05ibYj>QlMa_Umjo5T*=3EK<^Yjy7
zhyuZxaT@cG3HBWNwG6QfJ>Sb(h&p7T9HP*fG>QbnY}ygW*%7J~d#7ZGbTB>2+Z!Nc
z$G)>V&W=%KOz*LhC22d7gb5nJo?xVKw0{;Ms3x6IPWrSgQT)CHyxCrT?(==;COI=U
zS<?tD9sFj2N8zPa@UE>bdOJXY0IMDVbDs|n_?T}w%fB9ECH}$<!)#qmWC$F=U@sKJ
z1A4Pt32TRk1TM1kVj~U!oG<$!FjAGpm`eW&LXt7@kYMNQe*J{N3J3H<P<LRrwnhu7
zD;2zh3#pqGyt7KTuLZSnnlr}6Y0nzCst5M)b>X*Y9O}jI<i)nl3|OVI&+{U?&`Ku>
z0J&W<sSI(*W)wB1vZU>S9YxKlQgA9u<M@=V_+}Z~*>|760{fa6zQ`it_g9Q)X-#Lk
z+~2<p-F0BZZ%w@Kz#`%qj!@Oq4a1r99d;f>04W18fEYncAZ8E|!~#-2-(k0o{R>li
BGhF}x

delta 1321
zcmYjQZ%kWN6hH5kmcH_U7h$sn%`Rj!0||Q)#OiQ%*dg24XmI-={a`hYd)vYoF?^6j
zX|gnnSzcy>@rkQu(;&QMH*C|`^uv;dXkrt$5I^`~M#ub<reQ!?C62|2=e?HAo1Ayg
z`<-)s=l9ONFCA-3$J(y!uuqKdtd#+N2dC+X(DG`a|KPC$UHgw7R#gCS+yXl^mc#hY
z8Y|6mL}-4w&u=9ic&3>4El9wsAEqH&4YKWil!jc$b_1S+VDw=cjN35p^hJB}qFpdP
zve}_5c_bnHBGs+3)R5#3E1<2h)QY4PSSl}R>x}%J^nWRA7X-f^oDtsN)<GYzP|vM_
zz424V=1cWnL-sBE^^F-}zu-^qofWEF<w5%&wk1)~1J{HvCf~ZB(hJvw4`+N|3*zL}
zja|w2z7fcalWDt0|EwU)3*E^#{t_Ct2`>G#BtBm~6d^xXkzG~9sB8r19sQ;xKKZPd
zavxRfq=&|A#5c%WsA?mh5As%;w~=25xoYmKgS^e$fu2*+i@ZZ8F0o;vgQD2q)VcQb
zVpCoc&fz|<jz3^zkIcO^FOwf5WGGCq?b!(VDa`ko)aM6zGg9@c(0ld-kFrDNihKA7
zQ){`OW&)7kJ?-)40`T2Q<+0ckh~*!j_PE0VxY11&dD?@aLrwo~Y7;Fq#5-wSMudE&
z)=4jSQu2YEXs4k>CylKc0%*-NMDA8Le&W1C-YLn^{L~dc=?<R<t()Q`jLl80g_2&`
z)VW7Ssb*mZO?YVt884AD6(!=<5^%KyNC_2NwP9bqr$T)9&7$~19nyv7Ra1BNg`!`Q
zGOwBr(x8J~iw+`4Q$&gmB5f9e&Yu=l7d?o67yat?UAv&SREj$$R@qdR@-;S<qkNUQ
za7{%SzFXcf<Lj1ZzTrjV1?IYRz5cbh6Y;o%lpmiODS=DD|AC_n1x}5zgpcAehI$5g
zmMXU1n_)i6++mbF%J7^r5Q|Khk1cZ#N10YUNi9p&*35{gG-1hBd~0_P4>N7pI&m#W
zGYY7-aTX%JNbG*kzy$#8rXJCb_VFCm0(}PlFa6f@Sl<twH18zkat2_b_4~94^1?D^
z*VS3s`td59NIqgRt&^vs=DuuXDSqjRe&i)V>rC6JIdvZmeQb`!T(bz^7|nmq>|Il=
zsR=9ss19R^lGg*)959GuScq70^QL<6>r_`}4%9}Y3}PfRw<#%Z!vV4Fd{qCZO02K7
zN>(C#jO87PG1j|+)%w%bV#6zMvsqLyd;Ol|-N<58E&KGIWZq<L9}S`0NAglx>JB?0
w?nvdRH>W_{nJN{ha!kLih*!?|6cNpaR)%IrbD))@Ing9E7h1)PPmxdk2kF!1<^TWy

diff --git a/gscats.s b/gscats.s
index b786fbe..d1e9fd2 100644
--- a/gscats.s
+++ b/gscats.s
@@ -46,6 +46,7 @@ quitGame:
 .include "gamemanager.s"
 .include "input.s"
 .include "projectile.s"
+.include "inventory.s"
 
 endMainBank2:
 
diff --git a/inventory.s b/inventory.s
new file mode 100644
index 0000000..f433409
--- /dev/null
+++ b/inventory.s
@@ -0,0 +1,67 @@
+;
+;  inventory
+;  Code and data structures related to the weapons inventory and store
+;
+;  Created by Quinn Dunki on 8/13/17
+;
+
+
+INVENTORY_ITEMS = 6
+ITEM_WIDTH = 16		; In pixels
+ICON_WIDTH = 8		; In pixels
+ICON_ORIGIN = (ITEM_WIDTH-ICON_WIDTH)/4	; In bytes
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; renderInventory
+;
+;
+renderInventory:
+	SAVE_AXY
+
+	; Compute initial VRAM position
+	ldy #(8192 + (160*10 + (160*ICON_ORIGIN + ICON_ORIGIN)))
+	ldx #0
+
+renderInventoryLoop:
+	jsr renderInventoryItem
+
+	tya		; Advance VRAM pointer
+	clc
+	adc #ITEM_WIDTH/2
+	tay
+
+	inx
+	cpx #INVENTORY_ITEMS
+	bne renderInventoryLoop
+
+RESTORE_AXY
+	rts
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; renderInventoryItem
+;
+; X = Item index
+; Y = VRAM pos
+;
+renderInventoryItem:
+	SAVE_AXY
+
+	phy
+	phx
+	lda #1
+	clc
+	jsr DrawSpriteBank
+
+	plx
+	ply
+	txa
+	clc
+	jsr DrawSpriteBank
+
+RESTORE_AXY
+	rts
+
+renderInventoryItemParam:
+	.word 0,20
+
diff --git a/spritebank.s b/spritebank.s
index 3064d1d..dc71519 100644
--- a/spritebank.s
+++ b/spritebank.s
@@ -8,7 +8,7 @@ DrawSpriteBank :
 	  	 JMP 	 (SpriteBankBank,X) 	 ; Bank Number Table
 	  	  	  	 
 SpriteBankNum :
- 	 .dbyt 	 $0000,$0500,$0400,$0100,$0200,$0600,$0300 	 
+ 	 .dbyt 	 $0000,$0400,$0500,$0100,$0200,$0600,$0300 	 
 	  	  	  	 
 SpriteBankBank :
  	 .addr 	 SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00