diff options
-rw-r--r-- | include/data/bard_music/bard_sounds.h | 52 | ||||
-rw-r--r-- | src/data/bard_music/actions.h (renamed from include/data/bard_music/actions.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/adjectives.h (renamed from include/data/bard_music/adjectives.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/bard_sounds.h | 52 | ||||
-rw-r--r-- | src/data/bard_music/battle.h (renamed from include/data/bard_music/battle.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/conditions.h (renamed from include/data/bard_music/conditions.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/default_sound.h (renamed from include/data/bard_music/default_sound.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/endings.h (renamed from include/data/bard_music/endings.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/events.h (renamed from include/data/bard_music/events.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/feelings.h (renamed from include/data/bard_music/feelings.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/greetings.h (renamed from include/data/bard_music/greetings.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/hobbies.h (renamed from include/data/bard_music/hobbies.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/length_table.h (renamed from include/data/bard_music/length_table.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/lifestyle.h (renamed from include/data/bard_music/lifestyle.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/misc.h (renamed from include/data/bard_music/misc.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/moves.h (renamed from include/data/bard_music/moves.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/people.h (renamed from include/data/bard_music/people.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/pokemon.h (renamed from include/data/bard_music/pokemon.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/speech.h (renamed from include/data/bard_music/speech.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/status.h (renamed from include/data/bard_music/status.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/time.h (renamed from include/data/bard_music/time.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/trainer.h (renamed from include/data/bard_music/trainer.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/trendysaying.h (renamed from include/data/bard_music/trendysaying.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/voices.h (renamed from include/data/bard_music/voices.h) | 0 | ||||
-rw-r--r-- | src/data/bard_music/word_pitch.h (renamed from include/data/bard_music/word_pitch.h) | 0 | ||||
-rw-r--r-- | src/data/battle_moves.h (renamed from include/data/battle_moves.h) | 0 | ||||
-rw-r--r-- | src/data/decoration/description.h (renamed from include/data/decoration/description.h) | 0 | ||||
-rw-r--r-- | src/data/decoration/header.h (renamed from include/data/decoration/header.h) | 0 | ||||
-rw-r--r-- | src/data/decoration/icon.h (renamed from include/data/decoration/icon.h) | 0 | ||||
-rw-r--r-- | src/data/decoration/tilemaps.h (renamed from include/data/decoration/tilemaps.h) | 0 | ||||
-rw-r--r-- | src/data/decoration/tiles.h (renamed from include/data/decoration/tiles.h) | 0 | ||||
-rw-r--r-- | src/data/item_icon_table.h (renamed from include/data/item_icon_table.h) | 0 | ||||
-rw-r--r-- | src/data/items.h (renamed from include/data/items.h) | 0 | ||||
-rw-r--r-- | src/data/pokedex_orders.h (renamed from include/data/pokedex_orders.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/base_stats.h (renamed from include/data/pokemon/base_stats.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/cry_ids.h (renamed from include/data/pokemon/cry_ids.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/egg_moves.h (renamed from include/data/pokemon/egg_moves.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/evolution.h (renamed from include/data/pokemon/evolution.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/experience_tables.h (renamed from include/data/pokemon/experience_tables.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/item_effects.h (renamed from include/data/pokemon/item_effects.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/level_up_learnset_pointers.h (renamed from include/data/pokemon/level_up_learnset_pointers.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/level_up_learnsets.h (renamed from include/data/pokemon/level_up_learnsets.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/tmhm_learnsets.h (renamed from include/data/pokemon/tmhm_learnsets.h) | 0 | ||||
-rw-r--r-- | src/data/pokemon/trainer_class_lookups.h (renamed from include/data/pokemon/trainer_class_lookups.h) | 0 | ||||
-rw-r--r-- | src/data/region_map/region_map_entries.h (renamed from include/data/region_map/region_map_entries.h) | 0 | ||||
-rw-r--r-- | src/data/text/abilities.h (renamed from include/data/text/abilities.h) | 0 | ||||
-rw-r--r-- | src/data/text/item_descriptions.h (renamed from include/data/text/item_descriptions.h) | 0 |
47 files changed, 52 insertions, 52 deletions
diff --git a/include/data/bard_music/bard_sounds.h b/include/data/bard_music/bard_sounds.h deleted file mode 100644 index 94923b099..000000000 --- a/include/data/bard_music/bard_sounds.h +++ /dev/null @@ -1,52 +0,0 @@ -#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 diff --git a/include/data/bard_music/actions.h b/src/data/bard_music/actions.h index fd8e63061..fd8e63061 100644 --- a/include/data/bard_music/actions.h +++ b/src/data/bard_music/actions.h diff --git a/include/data/bard_music/adjectives.h b/src/data/bard_music/adjectives.h index e56efaa24..e56efaa24 100644 --- a/include/data/bard_music/adjectives.h +++ b/src/data/bard_music/adjectives.h diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h new file mode 100644 index 000000000..4a0911726 --- /dev/null +++ b/src/data/bard_music/bard_sounds.h @@ -0,0 +1,52 @@ +#ifndef GUARD_BARD_SOUNDS_TABLE_H +#define GUARD_BARD_SOUNDS_TABLE_H + +#define NULL_BARD_SOUND { 0xff } + +#include "pokemon.h" +#include "moves.h" +#include "trainer.h" +#include "status.h" +#include "battle.h" +#include "greetings.h" +#include "people.h" +#include "voices.h" +#include "speech.h" +#include "endings.h" +#include "feelings.h" +#include "conditions.h" +#include "actions.h" +#include "lifestyle.h" +#include "hobbies.h" +#include "time.h" +#include "misc.h" +#include "adjectives.h" +#include "events.h" +#include "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 diff --git a/include/data/bard_music/battle.h b/src/data/bard_music/battle.h index 19d032f56..19d032f56 100644 --- a/include/data/bard_music/battle.h +++ b/src/data/bard_music/battle.h diff --git a/include/data/bard_music/conditions.h b/src/data/bard_music/conditions.h index d79cc100b..d79cc100b 100644 --- a/include/data/bard_music/conditions.h +++ b/src/data/bard_music/conditions.h diff --git a/include/data/bard_music/default_sound.h b/src/data/bard_music/default_sound.h index ad4008e16..ad4008e16 100644 --- a/include/data/bard_music/default_sound.h +++ b/src/data/bard_music/default_sound.h diff --git a/include/data/bard_music/endings.h b/src/data/bard_music/endings.h index 7e4304521..7e4304521 100644 --- a/include/data/bard_music/endings.h +++ b/src/data/bard_music/endings.h diff --git a/include/data/bard_music/events.h b/src/data/bard_music/events.h index 70960e15d..70960e15d 100644 --- a/include/data/bard_music/events.h +++ b/src/data/bard_music/events.h diff --git a/include/data/bard_music/feelings.h b/src/data/bard_music/feelings.h index cdab88639..cdab88639 100644 --- a/include/data/bard_music/feelings.h +++ b/src/data/bard_music/feelings.h diff --git a/include/data/bard_music/greetings.h b/src/data/bard_music/greetings.h index 22af4dd5c..22af4dd5c 100644 --- a/include/data/bard_music/greetings.h +++ b/src/data/bard_music/greetings.h diff --git a/include/data/bard_music/hobbies.h b/src/data/bard_music/hobbies.h index 66fdbc0c7..66fdbc0c7 100644 --- a/include/data/bard_music/hobbies.h +++ b/src/data/bard_music/hobbies.h diff --git a/include/data/bard_music/length_table.h b/src/data/bard_music/length_table.h index 144c70dfc..144c70dfc 100644 --- a/include/data/bard_music/length_table.h +++ b/src/data/bard_music/length_table.h diff --git a/include/data/bard_music/lifestyle.h b/src/data/bard_music/lifestyle.h index 7054283f4..7054283f4 100644 --- a/include/data/bard_music/lifestyle.h +++ b/src/data/bard_music/lifestyle.h diff --git a/include/data/bard_music/misc.h b/src/data/bard_music/misc.h index 84e1d5530..84e1d5530 100644 --- a/include/data/bard_music/misc.h +++ b/src/data/bard_music/misc.h diff --git a/include/data/bard_music/moves.h b/src/data/bard_music/moves.h index 6bb350a7c..6bb350a7c 100644 --- a/include/data/bard_music/moves.h +++ b/src/data/bard_music/moves.h diff --git a/include/data/bard_music/people.h b/src/data/bard_music/people.h index 2db017080..2db017080 100644 --- a/include/data/bard_music/people.h +++ b/src/data/bard_music/people.h diff --git a/include/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h index 693005360..693005360 100644 --- a/include/data/bard_music/pokemon.h +++ b/src/data/bard_music/pokemon.h diff --git a/include/data/bard_music/speech.h b/src/data/bard_music/speech.h index d0d4abb11..d0d4abb11 100644 --- a/include/data/bard_music/speech.h +++ b/src/data/bard_music/speech.h diff --git a/include/data/bard_music/status.h b/src/data/bard_music/status.h index 418fe639a..418fe639a 100644 --- a/include/data/bard_music/status.h +++ b/src/data/bard_music/status.h diff --git a/include/data/bard_music/time.h b/src/data/bard_music/time.h index 5755353a0..5755353a0 100644 --- a/include/data/bard_music/time.h +++ b/src/data/bard_music/time.h diff --git a/include/data/bard_music/trainer.h b/src/data/bard_music/trainer.h index a59689b6c..a59689b6c 100644 --- a/include/data/bard_music/trainer.h +++ b/src/data/bard_music/trainer.h diff --git a/include/data/bard_music/trendysaying.h b/src/data/bard_music/trendysaying.h index 4830725ad..4830725ad 100644 --- a/include/data/bard_music/trendysaying.h +++ b/src/data/bard_music/trendysaying.h diff --git a/include/data/bard_music/voices.h b/src/data/bard_music/voices.h index 868ebaecf..868ebaecf 100644 --- a/include/data/bard_music/voices.h +++ b/src/data/bard_music/voices.h diff --git a/include/data/bard_music/word_pitch.h b/src/data/bard_music/word_pitch.h index 54a87acc9..54a87acc9 100644 --- a/include/data/bard_music/word_pitch.h +++ b/src/data/bard_music/word_pitch.h diff --git a/include/data/battle_moves.h b/src/data/battle_moves.h index 00a6f7fdb..00a6f7fdb 100644 --- a/include/data/battle_moves.h +++ b/src/data/battle_moves.h diff --git a/include/data/decoration/description.h b/src/data/decoration/description.h index ba4c3dd54..ba4c3dd54 100644 --- a/include/data/decoration/description.h +++ b/src/data/decoration/description.h diff --git a/include/data/decoration/header.h b/src/data/decoration/header.h index 64bed1c7e..64bed1c7e 100644 --- a/include/data/decoration/header.h +++ b/src/data/decoration/header.h diff --git a/include/data/decoration/icon.h b/src/data/decoration/icon.h index 1f11bc19f..1f11bc19f 100644 --- a/include/data/decoration/icon.h +++ b/src/data/decoration/icon.h diff --git a/include/data/decoration/tilemaps.h b/src/data/decoration/tilemaps.h index 1cca7ae0b..1cca7ae0b 100644 --- a/include/data/decoration/tilemaps.h +++ b/src/data/decoration/tilemaps.h diff --git a/include/data/decoration/tiles.h b/src/data/decoration/tiles.h index 6b3ed699f..6b3ed699f 100644 --- a/include/data/decoration/tiles.h +++ b/src/data/decoration/tiles.h diff --git a/include/data/item_icon_table.h b/src/data/item_icon_table.h index 0a24c0572..0a24c0572 100644 --- a/include/data/item_icon_table.h +++ b/src/data/item_icon_table.h diff --git a/include/data/items.h b/src/data/items.h index 49f981faf..49f981faf 100644 --- a/include/data/items.h +++ b/src/data/items.h diff --git a/include/data/pokedex_orders.h b/src/data/pokedex_orders.h index 61fbd289c..61fbd289c 100644 --- a/include/data/pokedex_orders.h +++ b/src/data/pokedex_orders.h diff --git a/include/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index bc6572b46..bc6572b46 100644 --- a/include/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h diff --git a/include/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h index 1c1c32dde..1c1c32dde 100644 --- a/include/data/pokemon/cry_ids.h +++ b/src/data/pokemon/cry_ids.h diff --git a/include/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 3d74868b4..3d74868b4 100644 --- a/include/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h diff --git a/include/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 8629ac9b1..8629ac9b1 100644 --- a/include/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h diff --git a/include/data/pokemon/experience_tables.h b/src/data/pokemon/experience_tables.h index 58474b6f1..58474b6f1 100644 --- a/include/data/pokemon/experience_tables.h +++ b/src/data/pokemon/experience_tables.h diff --git a/include/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 6ba0d694e..6ba0d694e 100644 --- a/include/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h diff --git a/include/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 0f648526c..0f648526c 100644 --- a/include/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h diff --git a/include/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 062873aee..062873aee 100644 --- a/include/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h diff --git a/include/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index f14478863..f14478863 100644 --- a/include/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h diff --git a/include/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index ec4dbf0fb..ec4dbf0fb 100644 --- a/include/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h diff --git a/include/data/region_map/region_map_entries.h b/src/data/region_map/region_map_entries.h index 9c7e3f2fc..9c7e3f2fc 100644 --- a/include/data/region_map/region_map_entries.h +++ b/src/data/region_map/region_map_entries.h diff --git a/include/data/text/abilities.h b/src/data/text/abilities.h index 3a1e989d2..3a1e989d2 100644 --- a/include/data/text/abilities.h +++ b/src/data/text/abilities.h diff --git a/include/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 8683978d7..8683978d7 100644 --- a/include/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h |