From c29ddd74c181f639b6c90417b98d1a15a5b1eb4f Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Mon, 11 Jun 2018 16:00:02 -0600
Subject: [PATCH] Firing of selected weapon type

---
 gscats.2mg   | Bin 819264 -> 819264 bytes
 player.s     |   2 ++
 projectile.s |  20 +++++++++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/gscats.2mg b/gscats.2mg
index 1e358644866eda2920655043004b6986c2db9005..55920f6cf1404d1016b5d9d5c294815c7fa98fbd 100644
GIT binary patch
delta 2243
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
TwIEKAIuI9#`|Wn8XV3ouwya-l

delta 2271
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

diff --git a/player.s b/player.s
index 1fb06e0..c0350e9 100644
--- a/player.s
+++ b/player.s
@@ -173,6 +173,8 @@ playerFire:
 	sta projectileParams+4
 	lda playerData+PD_POWER,y
 	sta projectileParams+6
+	lda playerData+PD_CURRWEAPON,y
+	sta projectileParams+8
 	jsr fireProjectile
 
 	pla
diff --git a/projectile.s b/projectile.s
index 1d03f85..b030530 100644
--- a/projectile.s
+++ b/projectile.s
@@ -92,6 +92,7 @@ projectileParams:
 	.word 0		; Starting pos Y
 	.word 0		; Initial angle
 	.word 0		; Initial power
+	.word 0		; Type
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -157,6 +158,9 @@ fireProjectile:
 	jsr mult88
 	sta projectileData+JD_VY,y
 
+	lda projectileParams+8		; Type
+	sta projectileData+JD_TYPE,y
+
 	lda #1
 	sta projectileData+JD_NEW,y
 	stz projectileActive
@@ -373,12 +377,18 @@ DNANGLE = $ffaf
 ;
 ;
 renderProjectiles:
-	pha
+	SAVE_AY
+
 	lda projectileData
 	bpl renderProjectilesDoIt
 	jmp renderProjectilesDone
 
 renderProjectilesDoIt:
+
+	lda projectileData+JD_TYPE
+	tay
+	PROJECTILETYPEPTR_Y
+
 	lda #projectileData
 	sta PARAML0
 
@@ -393,7 +403,7 @@ renderProjectilesDoIt:
 	bmi renderProjectilesFlat
 
 renderProjectilesUpAngle:
-	lda #4		; Up angle
+	lda projectileTypes+PT_FRAME0,y		; Up angle
 	bra renderProjectilesGoSprite
 
 renderProjectilesNegYPosX:
@@ -401,7 +411,7 @@ renderProjectilesNegYPosX:
 	bpl renderProjectilesFlat
 
 renderProjectilesDownAngle:
-	lda #6		; Down angle
+	lda projectileTypes+PT_FRAME2,y		; Down angle
 	bra renderProjectilesGoSprite
 
 renderProjectilesNegX:
@@ -419,13 +429,13 @@ renderProjectilesNegYNegX:
 	bra renderProjectilesUpAngle
 
 renderProjectilesFlat:
-	lda #5		; Flat
+	lda projectileTypes+PT_FRAME1,y		; Flat
 
 renderProjectilesGoSprite:
 	jsr renderGameObject
 	
 renderProjectilesDone:
-	pla
+	RESTORE_AY
 	rts