Merge pull request pret#2052 from fdeblasio/bardDefine

Added define value for bard sound length
GriffinRichards · Oct 21, 2024 · e45fe13 · e45fe13
2 parents a55c75d + 544b76f
commit e45fe13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/include/bard_music.h b/include/bard_music.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_BARD_MUSIC_H
 #define GUARD_BARD_MUSIC_H
 
+#define BARD_SOUND_MAX_LENGTH 6
+
 struct BardSound
 {
     /*0x00*/ u8 songLengthId;
@@ -26,8 +28,8 @@ struct BardSong
     /*0x06*/ u16 volume;
     /*0x08*/ s16 pitch;
     /*0x0A*/ s16 voiceInflection;
-    /*0x0C*/ u16 lyrics[6];
-    /*0x18*/ struct BardPhoneme phonemes[6];
+    /*0x0C*/ u16 lyrics[BARD_SOUND_MAX_LENGTH];
+    /*0x18*/ struct BardPhoneme phonemes[BARD_SOUND_MAX_LENGTH];
     /*0x30*/ const struct BardSound *sound;
 };
 

diff --git a/src/bard_music.c b/src/bard_music.c
@@ -48,7 +48,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word)
     const struct BardSound *sound;
 
     song->length = 0;
-    for (i = 0; i < 6; i ++)
+    for (i = 0; i < BARD_SOUND_MAX_LENGTH; i ++)
     {
         sound = &song->sound[i];
         if (sound->songLengthId != 0xFF)

diff --git a/src/data/bard_music/moves.h b/src/data/bard_music/moves.h
@@ -5,7 +5,7 @@
 
 const u16 gNumBardWords_Moves = MOVES_COUNT;
 
-const struct BardSound gBardSounds_Moves[MOVES_COUNT][6] = {
+const struct BardSound gBardSounds_Moves[MOVES_COUNT][BARD_SOUND_MAX_LENGTH] = {
     [MOVE_NONE] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,

diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h
@@ -3,7 +3,7 @@
 
 const u16 gNumBardWords_Species = NUM_SPECIES;
 
-const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = {
+const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][BARD_SOUND_MAX_LENGTH] = {
     [SPECIES_NONE] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,