atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Index gBardSoundsTable

Browse source
This commit is contained in:
GriffinR 2021-01-14 03:53:32 -05:00
parent 46e0a0607d
commit 8e06d5679c
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bard_music.c
View file

@ -25,8 +25,8 @@ const struct BardSound *GetWordSounds(u16 word)
{ {
return gBardSound_InvalidWord; return gBardSound_InvalidWord;
} }
category = word >> 9; category = EC_GROUP(word);
subword = word & 0x1ff; subword = EC_INDEX(word);
switch (category) switch (category)
{ {
case EC_GROUP_POKEMON: case EC_GROUP_POKEMON:

46
src/data/bard_music/bard_sounds.h
View file

@ -24,29 +24,29 @@
#include "events.h" #include "events.h"
#include "trendysaying.h" #include "trendysaying.h"
const struct BardSound (*const gBardSoundsTable[])[6] = { const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = {
NULL, [EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokemon
gBardSounds_Trainer, [EC_GROUP_TRAINER] = gBardSounds_Trainer,
gBardSounds_Status, [EC_GROUP_STATUS] = gBardSounds_Status,
gBardSounds_Battle, [EC_GROUP_BATTLE] = gBardSounds_Battle,
gBardSounds_Greetings, [EC_GROUP_GREETINGS] = gBardSounds_Greetings,
gBardSounds_People, [EC_GROUP_PEOPLE] = gBardSounds_People,
gBardSounds_Voices, [EC_GROUP_VOICES] = gBardSounds_Voices,
gBardSounds_Speech, [EC_GROUP_SPEECH] = gBardSounds_Speech,
gBardSounds_Endings, [EC_GROUP_ENDINGS] = gBardSounds_Endings,
gBardSounds_Feelings, [EC_GROUP_FEELINGS] = gBardSounds_Feelings,
gBardSounds_Conditions, [EC_GROUP_CONDITIONS] = gBardSounds_Conditions,
gBardSounds_Actions, [EC_GROUP_ACTIONS] = gBardSounds_Actions,
gBardSounds_Lifestyle, [EC_GROUP_LIFESTYLE] = gBardSounds_Lifestyle,
gBardSounds_Hobbies, [EC_GROUP_HOBBIES] = gBardSounds_Hobbies,
gBardSounds_Time, [EC_GROUP_TIME] = gBardSounds_Time,
gBardSounds_Misc, [EC_GROUP_MISC] = gBardSounds_Misc,
gBardSounds_Adjectives, [EC_GROUP_ADJECTIVES] = gBardSounds_Adjectives,
gBardSounds_Events, [EC_GROUP_EVENTS] = gBardSounds_Events,
NULL, [EC_GROUP_MOVE_1] = NULL, // Handled by gBardSounds_Moves
NULL, [EC_GROUP_MOVE_2] = NULL, // Handled by gBardSounds_Moves
gBardSounds_TrendySaying, [EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying,
NULL [EC_GROUP_POKEMON_2] = NULL // Handled by gBardSounds_Pokemon
}; };
#endif //GUARD_BARD_SOUNDS_TABLE_H #endif //GUARD_BARD_SOUNDS_TABLE_H