From 95eb0ff24ef5c5626f5f10a364b2d2f1d3d00d9e Mon Sep 17 00:00:00 2001
From: ABelliqueux <contact@arthus.net>
Date: Mon, 16 Aug 2021 12:13:33 +0200
Subject: [PATCH] Change VAGbank struc

---
 include/sound.h |  4 ++++
 src/main.c      | 43 +++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/include/sound.h b/include/sound.h
index be9b9dd..cb03aa3 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -17,6 +17,10 @@ typedef struct VAGsound {
     u_long spu_channel;      // SPU voice to playback to
     u_long spu_address;      // SPU address for memory freeing spu mem
     } VAGsound;
+typedef struct VAGbank {
+    u_int index;
+    VAGsound samples[];
+} VAGbank;
 // VAG header struct (see fileformat47.pdf, p.209)
 typedef struct VAGhdr {                // All the values in this header must be big endian
         char id[4];                    // VAGp         4 bytes -> 1 char * 4
diff --git a/src/main.c b/src/main.c
index 4175ea0..984a993 100644
--- a/src/main.c
+++ b/src/main.c
@@ -123,23 +123,18 @@ extern u_char _binary_VAG_5_punc_vag_start;
 extern u_char _binary_VAG_7_wron_vag_start;
 extern u_char _binary_VAG_8_yooo_vag_start;
 // soundBank
-VAGsound VAGBank[VAG_NBR] = {
-      { &_binary_VAG_0_come_vag_start,
-        SPU_00CH, 0 },  
-      { &_binary_VAG_1_cuek_vag_start,
-        SPU_01CH, 0 },   
-      { &_binary_VAG_2_erro_vag_start,
-        SPU_02CH, 0 },   
-      { &_binary_VAG_3_hehe_vag_start,
-        SPU_03CH, 0 },   
-      { &_binary_VAG_4_m4a1_vag_start,
-        SPU_04CH, 0 },  
-      { &_binary_VAG_5_punc_vag_start,
-        SPU_05CH, 0 },   
-      { &_binary_VAG_7_wron_vag_start,
-        SPU_06CH, 0 },   
-      { &_binary_VAG_8_yooo_vag_start,
-        SPU_07CH, 0 }
+VAGbank VAGBank = {
+    8,
+    {
+        { &_binary_VAG_0_come_vag_start, SPU_00CH, 0 },  
+        { &_binary_VAG_1_cuek_vag_start, SPU_01CH, 0 },   
+        { &_binary_VAG_2_erro_vag_start, SPU_02CH, 0 },   
+        { &_binary_VAG_3_hehe_vag_start, SPU_03CH, 0 },   
+        { &_binary_VAG_4_m4a1_vag_start, SPU_04CH, 0 },  
+        { &_binary_VAG_5_punc_vag_start, SPU_05CH, 0 },   
+        { &_binary_VAG_7_wron_vag_start, SPU_06CH, 0 },   
+        { &_binary_VAG_8_yooo_vag_start, SPU_07CH, 0 }
+    }
 };
 // XA playback
 XAbank XABank = {
@@ -257,7 +252,7 @@ int main() {
     //~ spuCDsetup(&spuSettings);
     XAsetup();
     for (u_short vag = 0; vag < VAG_NBR; vag++ ){
-        VAGBank[vag].spu_address = setSPUtransfer(&voiceAttributes, &VAGBank[vag]);
+        VAGBank.samples[vag].spu_address = setSPUtransfer(&voiceAttributes, &VAGBank.samples[vag]);
     }
     sample = 0;
     setXAsample(&XABank.samples[sample], &filter);
@@ -344,14 +339,14 @@ int main() {
         // TODO : put in a function
         // Reset player/prop pos
         if(curLvl.actorPtr->pos.vy >= 200){
-            playSFX(&voiceAttributes, &VAGBank[6]);
+            playSFX(&voiceAttributes,  &VAGBank.samples[6]);
             copyVector(&curLvl.actorPtr->body->position, &actorStartPos );
             copyVector(&curLvl.actorPtr->rot, &actorStartRot );
             curLvl.curNode = actorStartNode;
             curLvl.levelPtr = curLvl.curNode->plane;
         }        
         if(curLvl.propPtr->pos.vy >= 200){
-            playSFX(&voiceAttributes, &VAGBank[3]);
+            playSFX(&voiceAttributes,  &VAGBank.samples[3]);
             copyVector(&curLvl.propPtr->body->position, &propStartPos );
             copyVector(&curLvl.propPtr->rot, &propStartRot );
             curLvl.propPtr->node = propStartNode;
@@ -553,7 +548,7 @@ void callback() {
         } else {
             curLvl.actorPtr->isPrism = 1;
         }
-        playSFX(&voiceAttributes, &VAGBank[0]);
+        playSFX(&voiceAttributes,  &VAGBank.samples[0]);
         //~ timer = 10;
         lastPad = PAD;
     }
@@ -561,7 +556,7 @@ void callback() {
         lastPad = PAD;
     }
     if ( PAD & Square && !( lastPad & Square ) ){
-        playSFX(&voiceAttributes, &VAGBank[7]);
+        playSFX(&voiceAttributes,  &VAGBank.samples[7]);
         //~ sample = 0;
         //~ setXAsample(&XABank.samples[sample], &filter);
         lastPad = PAD;
@@ -576,14 +571,14 @@ void callback() {
             curLvl.actorPtr->body->gForce.vy = -200;
         }
         timer = 10;
-        playSFX(&voiceAttributes, &VAGBank[4]);
+        playSFX(&voiceAttributes,  &VAGBank.samples[4]);
         lastPad = PAD;
     }
     if ( !(PAD & Cross) && lastPad & Cross ) {
         lastPad = PAD;
     }
     if ( PAD & Circle && !(PAD & lastPad) ){
-        playSFX(&voiceAttributes, &VAGBank[5]);
+        playSFX(&voiceAttributes,  &VAGBank.samples[5]);
         lastPad = PAD;
     }
     if ( !(PAD & Circle) && lastPad & Circle ) {