Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added value for bard sound length

This commit is contained in:
Frank 2024-10-21 08:58:49 -04:00
parent a55c75d350
commit 544b76fbbf
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/bard_music.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_BARD_MUSIC_H #ifndef GUARD_BARD_MUSIC_H
#define GUARD_BARD_MUSIC_H #define GUARD_BARD_MUSIC_H
#define BARD_SOUND_MAX_LENGTH 6
struct BardSound struct BardSound
{ {
/*0x00*/ u8 songLengthId; /*0x00*/ u8 songLengthId;
@ -26,8 +28,8 @@ struct BardSong
/*0x06*/ u16 volume; /*0x06*/ u16 volume;
/*0x08*/ s16 pitch; /*0x08*/ s16 pitch;
/*0x0A*/ s16 voiceInflection; /*0x0A*/ s16 voiceInflection;
/*0x0C*/ u16 lyrics[6]; /*0x0C*/ u16 lyrics[BARD_SOUND_MAX_LENGTH];
/*0x18*/ struct BardPhoneme phonemes[6]; /*0x18*/ struct BardPhoneme phonemes[BARD_SOUND_MAX_LENGTH];
/*0x30*/ const struct BardSound *sound; /*0x30*/ const struct BardSound *sound;
}; };

2
src/bard_music.c
View File

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

2
src/data/bard_music/moves.h
View File

@ -5,7 +5,7 @@
const u16 gNumBardWords_Moves = MOVES_COUNT; 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] = { [MOVE_NONE] = {
NULL_BARD_SOUND, NULL_BARD_SOUND,
NULL_BARD_SOUND, NULL_BARD_SOUND,

2
src/data/bard_music/pokemon.h
View File

@ -3,7 +3,7 @@
const u16 gNumBardWords_Species = NUM_SPECIES; 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] = { [SPECIES_NONE] = {
NULL_BARD_SOUND, NULL_BARD_SOUND,
NULL_BARD_SOUND, NULL_BARD_SOUND,