From 26ef40553c651560afb2ac9ba1f9a6c1aad4bc8d Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 23 Aug 2018 02:32:34 -0500 Subject: [PATCH] Move data from include to src --- include/data/bard_music/bard_sounds.h | 52 ------------------- {include => src}/data/bard_music/actions.h | 0 {include => src}/data/bard_music/adjectives.h | 0 src/data/bard_music/bard_sounds.h | 52 +++++++++++++++++++ {include => src}/data/bard_music/battle.h | 0 {include => src}/data/bard_music/conditions.h | 0 .../data/bard_music/default_sound.h | 0 {include => src}/data/bard_music/endings.h | 0 {include => src}/data/bard_music/events.h | 0 {include => src}/data/bard_music/feelings.h | 0 {include => src}/data/bard_music/greetings.h | 0 {include => src}/data/bard_music/hobbies.h | 0 .../data/bard_music/length_table.h | 0 {include => src}/data/bard_music/lifestyle.h | 0 {include => src}/data/bard_music/misc.h | 0 {include => src}/data/bard_music/moves.h | 0 {include => src}/data/bard_music/people.h | 0 {include => src}/data/bard_music/pokemon.h | 0 {include => src}/data/bard_music/speech.h | 0 {include => src}/data/bard_music/status.h | 0 {include => src}/data/bard_music/time.h | 0 {include => src}/data/bard_music/trainer.h | 0 .../data/bard_music/trendysaying.h | 0 {include => src}/data/bard_music/voices.h | 0 {include => src}/data/bard_music/word_pitch.h | 0 {include => src}/data/battle_moves.h | 0 .../data/decoration/description.h | 0 {include => src}/data/decoration/header.h | 0 {include => src}/data/decoration/icon.h | 0 {include => src}/data/decoration/tilemaps.h | 0 {include => src}/data/decoration/tiles.h | 0 {include => src}/data/item_icon_table.h | 0 {include => src}/data/items.h | 0 {include => src}/data/pokedex_orders.h | 0 {include => src}/data/pokemon/base_stats.h | 0 {include => src}/data/pokemon/cry_ids.h | 0 {include => src}/data/pokemon/egg_moves.h | 0 {include => src}/data/pokemon/evolution.h | 0 .../data/pokemon/experience_tables.h | 0 {include => src}/data/pokemon/item_effects.h | 0 .../data/pokemon/level_up_learnset_pointers.h | 0 .../data/pokemon/level_up_learnsets.h | 0 .../data/pokemon/tmhm_learnsets.h | 0 .../data/pokemon/trainer_class_lookups.h | 0 .../data/region_map/region_map_entries.h | 0 {include => src}/data/text/abilities.h | 0 .../data/text/item_descriptions.h | 0 47 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 include/data/bard_music/bard_sounds.h rename {include => src}/data/bard_music/actions.h (100%) rename {include => src}/data/bard_music/adjectives.h (100%) create mode 100644 src/data/bard_music/bard_sounds.h rename {include => src}/data/bard_music/battle.h (100%) rename {include => src}/data/bard_music/conditions.h (100%) rename {include => src}/data/bard_music/default_sound.h (100%) rename {include => src}/data/bard_music/endings.h (100%) rename {include => src}/data/bard_music/events.h (100%) rename {include => src}/data/bard_music/feelings.h (100%) rename {include => src}/data/bard_music/greetings.h (100%) rename {include => src}/data/bard_music/hobbies.h (100%) rename {include => src}/data/bard_music/length_table.h (100%) rename {include => src}/data/bard_music/lifestyle.h (100%) rename {include => src}/data/bard_music/misc.h (100%) rename {include => src}/data/bard_music/moves.h (100%) rename {include => src}/data/bard_music/people.h (100%) rename {include => src}/data/bard_music/pokemon.h (100%) rename {include => src}/data/bard_music/speech.h (100%) rename {include => src}/data/bard_music/status.h (100%) rename {include => src}/data/bard_music/time.h (100%) rename {include => src}/data/bard_music/trainer.h (100%) rename {include => src}/data/bard_music/trendysaying.h (100%) rename {include => src}/data/bard_music/voices.h (100%) rename {include => src}/data/bard_music/word_pitch.h (100%) rename {include => src}/data/battle_moves.h (100%) rename {include => src}/data/decoration/description.h (100%) rename {include => src}/data/decoration/header.h (100%) rename {include => src}/data/decoration/icon.h (100%) rename {include => src}/data/decoration/tilemaps.h (100%) rename {include => src}/data/decoration/tiles.h (100%) rename {include => src}/data/item_icon_table.h (100%) rename {include => src}/data/items.h (100%) rename {include => src}/data/pokedex_orders.h (100%) rename {include => src}/data/pokemon/base_stats.h (100%) rename {include => src}/data/pokemon/cry_ids.h (100%) rename {include => src}/data/pokemon/egg_moves.h (100%) rename {include => src}/data/pokemon/evolution.h (100%) rename {include => src}/data/pokemon/experience_tables.h (100%) rename {include => src}/data/pokemon/item_effects.h (100%) rename {include => src}/data/pokemon/level_up_learnset_pointers.h (100%) rename {include => src}/data/pokemon/level_up_learnsets.h (100%) rename {include => src}/data/pokemon/tmhm_learnsets.h (100%) rename {include => src}/data/pokemon/trainer_class_lookups.h (100%) rename {include => src}/data/region_map/region_map_entries.h (100%) rename {include => src}/data/text/abilities.h (100%) rename {include => src}/data/text/item_descriptions.h (100%) 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 similarity index 100% rename from include/data/bard_music/actions.h rename to src/data/bard_music/actions.h diff --git a/include/data/bard_music/adjectives.h b/src/data/bard_music/adjectives.h similarity index 100% rename from include/data/bard_music/adjectives.h rename to 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 similarity index 100% rename from include/data/bard_music/battle.h rename to src/data/bard_music/battle.h diff --git a/include/data/bard_music/conditions.h b/src/data/bard_music/conditions.h similarity index 100% rename from include/data/bard_music/conditions.h rename to src/data/bard_music/conditions.h diff --git a/include/data/bard_music/default_sound.h b/src/data/bard_music/default_sound.h similarity index 100% rename from include/data/bard_music/default_sound.h rename to src/data/bard_music/default_sound.h diff --git a/include/data/bard_music/endings.h b/src/data/bard_music/endings.h similarity index 100% rename from include/data/bard_music/endings.h rename to src/data/bard_music/endings.h diff --git a/include/data/bard_music/events.h b/src/data/bard_music/events.h similarity index 100% rename from include/data/bard_music/events.h rename to src/data/bard_music/events.h diff --git a/include/data/bard_music/feelings.h b/src/data/bard_music/feelings.h similarity index 100% rename from include/data/bard_music/feelings.h rename to src/data/bard_music/feelings.h diff --git a/include/data/bard_music/greetings.h b/src/data/bard_music/greetings.h similarity index 100% rename from include/data/bard_music/greetings.h rename to src/data/bard_music/greetings.h diff --git a/include/data/bard_music/hobbies.h b/src/data/bard_music/hobbies.h similarity index 100% rename from include/data/bard_music/hobbies.h rename to src/data/bard_music/hobbies.h diff --git a/include/data/bard_music/length_table.h b/src/data/bard_music/length_table.h similarity index 100% rename from include/data/bard_music/length_table.h rename to src/data/bard_music/length_table.h diff --git a/include/data/bard_music/lifestyle.h b/src/data/bard_music/lifestyle.h similarity index 100% rename from include/data/bard_music/lifestyle.h rename to src/data/bard_music/lifestyle.h diff --git a/include/data/bard_music/misc.h b/src/data/bard_music/misc.h similarity index 100% rename from include/data/bard_music/misc.h rename to src/data/bard_music/misc.h diff --git a/include/data/bard_music/moves.h b/src/data/bard_music/moves.h similarity index 100% rename from include/data/bard_music/moves.h rename to src/data/bard_music/moves.h diff --git a/include/data/bard_music/people.h b/src/data/bard_music/people.h similarity index 100% rename from include/data/bard_music/people.h rename to src/data/bard_music/people.h diff --git a/include/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h similarity index 100% rename from include/data/bard_music/pokemon.h rename to src/data/bard_music/pokemon.h diff --git a/include/data/bard_music/speech.h b/src/data/bard_music/speech.h similarity index 100% rename from include/data/bard_music/speech.h rename to src/data/bard_music/speech.h diff --git a/include/data/bard_music/status.h b/src/data/bard_music/status.h similarity index 100% rename from include/data/bard_music/status.h rename to src/data/bard_music/status.h diff --git a/include/data/bard_music/time.h b/src/data/bard_music/time.h similarity index 100% rename from include/data/bard_music/time.h rename to src/data/bard_music/time.h diff --git a/include/data/bard_music/trainer.h b/src/data/bard_music/trainer.h similarity index 100% rename from include/data/bard_music/trainer.h rename to src/data/bard_music/trainer.h diff --git a/include/data/bard_music/trendysaying.h b/src/data/bard_music/trendysaying.h similarity index 100% rename from include/data/bard_music/trendysaying.h rename to src/data/bard_music/trendysaying.h diff --git a/include/data/bard_music/voices.h b/src/data/bard_music/voices.h similarity index 100% rename from include/data/bard_music/voices.h rename to src/data/bard_music/voices.h diff --git a/include/data/bard_music/word_pitch.h b/src/data/bard_music/word_pitch.h similarity index 100% rename from include/data/bard_music/word_pitch.h rename to src/data/bard_music/word_pitch.h diff --git a/include/data/battle_moves.h b/src/data/battle_moves.h similarity index 100% rename from include/data/battle_moves.h rename to src/data/battle_moves.h diff --git a/include/data/decoration/description.h b/src/data/decoration/description.h similarity index 100% rename from include/data/decoration/description.h rename to src/data/decoration/description.h diff --git a/include/data/decoration/header.h b/src/data/decoration/header.h similarity index 100% rename from include/data/decoration/header.h rename to src/data/decoration/header.h diff --git a/include/data/decoration/icon.h b/src/data/decoration/icon.h similarity index 100% rename from include/data/decoration/icon.h rename to src/data/decoration/icon.h diff --git a/include/data/decoration/tilemaps.h b/src/data/decoration/tilemaps.h similarity index 100% rename from include/data/decoration/tilemaps.h rename to src/data/decoration/tilemaps.h diff --git a/include/data/decoration/tiles.h b/src/data/decoration/tiles.h similarity index 100% rename from include/data/decoration/tiles.h rename to src/data/decoration/tiles.h diff --git a/include/data/item_icon_table.h b/src/data/item_icon_table.h similarity index 100% rename from include/data/item_icon_table.h rename to src/data/item_icon_table.h diff --git a/include/data/items.h b/src/data/items.h similarity index 100% rename from include/data/items.h rename to src/data/items.h diff --git a/include/data/pokedex_orders.h b/src/data/pokedex_orders.h similarity index 100% rename from include/data/pokedex_orders.h rename to src/data/pokedex_orders.h diff --git a/include/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h similarity index 100% rename from include/data/pokemon/base_stats.h rename to src/data/pokemon/base_stats.h diff --git a/include/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h similarity index 100% rename from include/data/pokemon/cry_ids.h rename to src/data/pokemon/cry_ids.h diff --git a/include/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h similarity index 100% rename from include/data/pokemon/egg_moves.h rename to src/data/pokemon/egg_moves.h diff --git a/include/data/pokemon/evolution.h b/src/data/pokemon/evolution.h similarity index 100% rename from include/data/pokemon/evolution.h rename to src/data/pokemon/evolution.h diff --git a/include/data/pokemon/experience_tables.h b/src/data/pokemon/experience_tables.h similarity index 100% rename from include/data/pokemon/experience_tables.h rename to src/data/pokemon/experience_tables.h diff --git a/include/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h similarity index 100% rename from include/data/pokemon/item_effects.h rename to 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 similarity index 100% rename from include/data/pokemon/level_up_learnset_pointers.h rename to 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 similarity index 100% rename from include/data/pokemon/level_up_learnsets.h rename to src/data/pokemon/level_up_learnsets.h diff --git a/include/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h similarity index 100% rename from include/data/pokemon/tmhm_learnsets.h rename to src/data/pokemon/tmhm_learnsets.h diff --git a/include/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h similarity index 100% rename from include/data/pokemon/trainer_class_lookups.h rename to 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 similarity index 100% rename from include/data/region_map/region_map_entries.h rename to src/data/region_map/region_map_entries.h diff --git a/include/data/text/abilities.h b/src/data/text/abilities.h similarity index 100% rename from include/data/text/abilities.h rename to src/data/text/abilities.h diff --git a/include/data/text/item_descriptions.h b/src/data/text/item_descriptions.h similarity index 100% rename from include/data/text/item_descriptions.h rename to src/data/text/item_descriptions.h