ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Slight reorganization of data includes

Browse Source
This commit is contained in:
PikalaxALT 2017-10-28 15:43:50 -04:00
parent 175e2e6b37
commit 6e5dcf19f7
3 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/data/bard_music/bard_sounds.h Normal file
View File

@ -0,0 +1,52 @@
#ifndef GUARD_BARD_SOUNDS_TABLE_H
#define GUARD_BARD_SOUNDS_TABLE_H
#define NULL_BARD_SOUND { 0xff }
#include "data/bard_music/pokemon.h"
#include "data/bard_music/moves.h"
#include "data/bard_music/trainer.h"
#include "data/bard_music/status.h"
#include "data/bard_music/battle.h"
#include "data/bard_music/greetings.h"
#include "data/bard_music/people.h"
#include "data/bard_music/voices.h"
#include "data/bard_music/speech.h"
#include "data/bard_music/endings.h"
#include "data/bard_music/feelings.h"
#include "data/bard_music/conditions.h"
#include "data/bard_music/actions.h"
#include "data/bard_music/lifestyle.h"
#include "data/bard_music/hobbies.h"
#include "data/bard_music/time.h"
#include "data/bard_music/misc.h"
#include "data/bard_music/adjectives.h"
#include "data/bard_music/events.h"
#include "data/bard_music/trendysaying.h"
const struct BardSound (*const gBardSoundsTable[])[6] = {
NULL,
gBardSounds_Trainer,
gBardSounds_Status,
gBardSounds_Battle,
gBardSounds_Greetings,
gBardSounds_People,
gBardSounds_Voices,
gBardSounds_Speech,
gBardSounds_Endings,
gBardSounds_Feelings,
gBardSounds_Conditions,
gBardSounds_Actions,
gBardSounds_Lifestyle,
gBardSounds_Hobbies,
gBardSounds_Time,
gBardSounds_Misc,
gBardSounds_Adjectives,
gBardSounds_Events,
NULL,
NULL,
gBardSounds_TrendySaying,
NULL
};
#endif //GUARD_BARD_SOUNDS_TABLE_H

29
include/data/bard_music/bard_sounds_table.h
View File

@ -1,29 +0,0 @@
#ifndef GUARD_BARD_SOUNDS_TABLE_H
#define GUARD_BARD_SOUNDS_TABLE_H
const struct BardSound (*const gBardSoundsTable[])[6] = {
NULL,
gBardSounds_Trainer,
gBardSounds_Status,
gBardSounds_Battle,
gBardSounds_Greetings,
gBardSounds_People,
gBardSounds_Voices,
gBardSounds_Speech,
gBardSounds_Endings,
gBardSounds_Feelings,
gBardSounds_Conditions,
gBardSounds_Actions,
gBardSounds_Lifestyle,
gBardSounds_Hobbies,
gBardSounds_Time,
gBardSounds_Misc,
gBardSounds_Adjectives,
gBardSounds_Events,
NULL,
NULL,
gBardSounds_TrendySaying,
NULL
};
#endif //GUARD_BARD_SOUNDS_TABLE_H

24
src/bard_music.c
View File

@ -4,29 +4,7 @@
#include "bard_music.h"
#include "easy_chat.h"
#define NULL_BARD_SOUND {0xff, 0, 0, 0, 0}
#include "data/bard_music/pokemon.h"
#include "data/bard_music/moves.h"
#include "data/bard_music/trainer.h"
#include "data/bard_music/status.h"
#include "data/bard_music/battle.h"
#include "data/bard_music/greetings.h"
#include "data/bard_music/people.h"
#include "data/bard_music/voices.h"
#include "data/bard_music/speech.h"
#include "data/bard_music/endings.h"
#include "data/bard_music/feelings.h"
#include "data/bard_music/conditions.h"
#include "data/bard_music/actions.h"
#include "data/bard_music/lifestyle.h"
#include "data/bard_music/hobbies.h"
#include "data/bard_music/time.h"
#include "data/bard_music/misc.h"
#include "data/bard_music/adjectives.h"
#include "data/bard_music/events.h"
#include "data/bard_music/trendysaying.h"
#include "data/bard_music/bard_sounds_table.h"
#include "data/bard_music/bard_sounds.h"
#include "data/bard_music/word_pitch.h"
#include "data/bard_music/default_sound.h"
#include "data/bard_music/length_table.h"