From 4c52d9590ec77c7157d4f8be850e86b3456cf646 Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Wed, 14 Aug 2024 21:58:15 +0200
Subject: [PATCH] More music

---
 dino.asm |  38 ++++++++++++++++++++++++++++++++++++--
 dino.xex | Bin 9697 -> 9745 bytes
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/dino.asm b/dino.asm
index 7ce3dc0..ffe2565 100644
--- a/dino.asm
+++ b/dino.asm
@@ -42,7 +42,7 @@ swap_table=$0600    ; table for swap bytes in left characters :)
 ;---------------------------------------------------
     org $2000
 PLAYER
-    ins 'music/pl_2000.bin'  ; MPT player $2000
+    ins 'music/pl_2000.bin',+6  ; MPT player $2000
 
     org $2800
 PMgraph
@@ -116,6 +116,7 @@ FirstSTART
     jsr ClearScreen
     jsr GenerateCharsets
     jsr GenerateClouds
+    jsr PrepareMusicPlayer
     ;AnyKey
     jsr SetGameScreen
 NewGame    
@@ -123,6 +124,7 @@ NewGame
     jsr SetStart        
     jsr WorldToScreen
     jsr FadeColorsIN
+    jsr PlayInGameMusic
     jsr GameR
     jsr GameOverR
     AnyKey
@@ -132,6 +134,7 @@ NewGame
     jsr SetStart        
     jsr WorldToScreen
     jsr FadeColorsIN
+    jsr PlayInGameMusic
     jsr GameL
     jsr GameOverL
     AnyKey
@@ -1299,6 +1302,37 @@ pressed
     beq @-
     rts   
 .endp
+;--------------------------------------------------
+.proc PrepareMusicPlayer
+    jsr StopMusic
+    VMAIN VBLinterrupt,7       ; jsr SetVBL
+    rts
+.endp
+.proc PlayInGameMusic
+    lda #$00
+    ldy #<MUSIC1_DATA
+    ldx #>MUSIC1_DATA
+    jmp PLAYER  ; rts
+.endp
+.proc PlayGameOverMusic
+    lda #$00
+    ldy #<MUSIC2_DATA
+    ldx #>MUSIC2_DATA
+    jmp PLAYER  ; rts
+.endp
+.proc StopMusic
+    lda #$02
+    jmp PLAYER  ; rts
+.endp
+.proc VBLinterrupt
+    jsr PLAYER+3
+    pla
+    tay
+    pla
+    tax
+    pla
+    rti
+.endp  
 ;--------------------------------------------------
     icl 'artwork/shapes.asm'
 ;--------------------------------------------------
@@ -1334,7 +1368,7 @@ screen
 MUSIC1_DATA
     ins 'music/ingame.mpt',+6  ; ingame music
 MUSIC2_DATA
-    ins 'music/game over.mpt',+6  ; bame over music
+    ins 'music/game over.mpt',+6  ; game over music
 
 
     run FirstSTART
diff --git a/dino.xex b/dino.xex
index 16fc19498454f024171a194c36de6a8783b23b8e..294392d51e5689784cbb7bc17b1abc73b7a91acc 100644
GIT binary patch
delta 665
zcmY+9UuaTM9LK%hi(6Oc#MvH3&~LgJS%G>Lr}tE{mnbh3Q3N8(qCyIyjT+TcXl@I<
zP@IQ~7|12fD~Ny2Sj328P+<eH(Mv?25EVpDBDR<H=Q_2q^YA@izTe;H$2m3sJ>l*U
z^|Y{OK|>YESIrO=kT|&FfH4lHc+m6UbHN7>EOPL|3z&y-JM416ejXZLpuOPQ+Ai7Q
zaHl=v73}s<ll<#SPFIe?BOL5DkF0Yr<CF#QmpW;BWooR;l*qh?Rj2IRj2I;n#ufM@
z2g~j@Jl}1$D)2R@9NaqDgpX}T&3(cWQExj)u{k8>kyt=t5&PLwyu?YWsmSx1&Bmm`
z@A?u+MXJ8aN(fqoY>h>mr6!$<Ldx|z+8+2GQr`ZFweBED_Kp00fHKNd<-j+EUCpw~
zyQzjFORz=ju;frZkLm?fFSa#Q&Y^N1l?$j`Y$?939n=z(C8)H$LYE1CtUXQTFrypR
z+(fZk&+cHm?qtWtb%Cxwypl2q|Il6NpF<^e<7$bn(83{iiBT@>PN;CLhr?C<P8{#m
z;Ws@$|06H;=UT|b24eDTAY+~c(?LkQcONx;pOaOw+p(BPP;6Q@NX+b{ZT5-ntzj)e
zD<6EALo<do7$jB0C5k$M1>?ZpB%jDgyxaxB&mmcrP)T7y1&ZON%T1$J1ZW7S!<n!T
upEvq7i|?u{gy4DOWIxLqtpg6T_jq9R$k~e%sCDpYpM{=73nbik!}t%`HV~8m

delta 583
zcmbQ}^U!;O3j1EQ|Nj{jc5GDL&Bj=>`5~JMW8h3<g>)l@P-6vFYXx&tg$tGnJB<~#
zSt(=~D##cqm{==3w^I0Jsi1=-b;wY`0VWk;<)deq0Mhf#bZPqqe}zet<2jTpJ{v34
zo2>Nd{lc_V<fzDpKPwq~S*|F&HCgF^5Mlue`D6e!UouuWX%5xAlS4@hs5!@EWeloH
zkmdk{5Xd~ALz`JS?HRc$ZF;M0daG@EYbN_~g<H=wUc}JWwD+Nb0m}*nC(~z5%bFfI
zTzH?L0FhX!)!Gb_WLvSUSz)f}v1X`(*9kzkKj6}0ueDj}VDUF;vLLqzW9?)$ZX@MN
zn|D<<@2YLy)j-LFbCovds%*|x+nlR`kdv#q6}f9|*4Emb6urQFu6FWr?s&$^$?QDp
zY%Vsf4LgG;oA89fnEgCa>?f>&qUWq9f8a?ItFt-D^r7S=^95!fJM)t)K&s1p0mEcl
z{<z7fct63F9_C9C1}iNBE9JHXD-GRj#oxrJ-e<g$p|z#8wYS!$wSA?)B9^&j26LAi
zoD%rHfO##~rJ0pB9RlAKBsM=5$Yx~pp6o9qHF=tl7hBKlRXb~ICqEM^6T5Qd&X*^D
d-mu81@QCP`*jPir<RW2Z<~p0!%`=26g#e}z>=6I}